add server and websocket comms

6 files changed, 28 insertions, 17 deletions

diff --git a/data/characters.go b/data/characters.go
index 6ad9e62..9b6bc8a 100644
--- a/data/characters.go
+++ b/data/characters.go
@@ -5,10 +5,10 @@ import (
 	"sakura/data/dummy"
 	"sakura/data/marisa"
 	"sakura/data/reimu"
-	"sakura/engine/character"
+	"sakura/engine"
 )
 
-var Characters = []*character.Character{
+var Characters = []*engine.Character{
 	marisa.Marisa,
 	reimu.Reimu,
 	cirno.Cirno,
diff --git a/data/cirno/cirno.go b/data/cirno/cirno.go
index 3d9bf4b..d0d89c3 100644
--- a/data/cirno/cirno.go
+++ b/data/cirno/cirno.go
@@ -1,8 +1,10 @@
 package cirno
 
-import "sakura/engine/character"
+import (
+	"sakura/engine"
+)
 
-var Cirno = &character.Character{
+var Cirno = &engine.Character{
 	Name:      "Cirno",
 	Cards:     nil,
 	Ultimates: nil,
diff --git a/data/dummy/cards.go b/data/dummy/cards.go
index 04342b2..7fde0c8 100644
--- a/data/dummy/cards.go
+++ b/data/dummy/cards.go
@@ -1,18 +1,21 @@
 package dummy
 
-import "sakura/engine/card"
+import (
+	"sakura/engine"
+	"sakura/engine/card"
+)
 
-var Cards = []card.IsCard{
+var Cards = []engine.IsCard{
 	&card.Attack{
-		Card: &card.Card{
+		Card: &engine.Card{
 			Name:   "Tap",
 			AllOut: true,
 			Text:   "Attack a little",
 			Flavor: "",
 		},
-		MinDistance:  card.NoMinimumRange,
-		MaxDistance:  card.NoMaximumRange,
-		AuraDamage:   1,
-		HealthDamage: 1,
+		MinDistance: card.NoMinimumRange,
+		MaxDistance: card.NoMaximumRange,
+		AuraDamage:  1,
+		LifeDamage:  1,
 	},
 }
diff --git a/data/dummy/dummy.go b/data/dummy/dummy.go
index aaf98e4..3b56303 100644
--- a/data/dummy/dummy.go
+++ b/data/dummy/dummy.go
@@ -1,8 +1,10 @@
 package dummy
 
-import "sakura/engine/character"
+import (
+	"sakura/engine"
+)
 
-var Dummy = &character.Character{
+var Dummy = &engine.Character{
 	Name:      "Dummy",
 	Cards:     Cards,
 	Ultimates: nil,
diff --git a/data/marisa/marisa.go b/data/marisa/marisa.go
index 45f6f00..5e4f290 100644
--- a/data/marisa/marisa.go
+++ b/data/marisa/marisa.go
@@ -1,8 +1,10 @@
 package marisa
 
-import "sakura/engine/character"
+import (
+	"sakura/engine"
+)
 
-var Marisa = &character.Character{
+var Marisa = &engine.Character{
 	Name:      "Marisa",
 	Cards:     nil,
 	Ultimates: nil,
diff --git a/data/reimu/reimu.go b/data/reimu/reimu.go
index ead2e5e..a94749a 100644
--- a/data/reimu/reimu.go
+++ b/data/reimu/reimu.go
@@ -1,8 +1,10 @@
 package reimu
 
-import "sakura/engine/character"
+import (
+	"sakura/engine"
+)
 
-var Reimu = &character.Character{
+var Reimu = &engine.Character{
 	Name:      "Reimu",
 	Cards:     nil,
 	Ultimates: nil,