X-Git-Url: https://jasonwoof.com/gitweb/?p=peach-cgt.git;a=blobdiff_plain;f=server.coffee;h=089523ad4d5116b8bcfae57a47c8351dbc49b892;hp=d3441d0466cd4624248a0e82258c5c4762067031;hb=078a999a7b7ed2ae37e27d88b3039221fbc1d90c;hpb=480b41bb7b13be95e5e0ed18c2a46692aedc11ad

diff --git a/server.coffee b/server.coffee
index d3441d0..089523a 100644
--- a/server.coffee
+++ b/server.coffee
@@ -161,8 +161,8 @@ new_game = (id) ->
 	game.p1_queue = []
 	game.p2_queue = []
 
-	game.on 'move', (agent, card, x, y) ->
-		forward_events.call this, 'move', agent, card, x, y
+	game.on 'move', (agent, card, x, y, z) ->
+		forward_events.call this, 'move', agent, card, x, y, z
 	game.on 'mark', (agent, card, state) ->
 		forward_events.call this, 'mark', agent, card, state
 	game.on 'flip', (agent, card, state) ->
@@ -182,18 +182,21 @@ new_game = (id) ->
 
 test_init = ->
 	test_game = new_game 'test'
-	timeout 4000, ->
+	timeout 2, ->
 		test_game.set_cards 'server', [
-			{ text: "Wildabeast 2/2", x: 220, y: 200}
-			{ text: "Wild beast 2/2", x: 350, y: 200}
-			{ text: "Angora bunny 1/1", x: 500, y: 200}
-			{ text: "Ambulatory Cactus 2/1", x: 650, y: 200}
-			{ text: "Ent 0/5", x: 800, y: 200}
-			{ text: "Carnivore 2/1", x: 220, y: 420}
-			{ text: "Herbivore 1/2", x: 350, y: 420}
-			{ text: "Stone Wall 0/10", x: 500, y: 420}
-			{ text: "Log 0/1", x: 650, y: 420}
-			{ text: "Ent 0/5", x: 800, y: 420}
+			{ text: "Wildabeast 2/2", x: 220, y: 200, owner: 'p2'}
+			{ text: "Boar 2/2", x: 360, y: 200, owner: 'p2', pile: 'p2_discard'}
+			{ text: "Angora bunny 1/1", x: 500, y: 200, owner: 'p2'}
+			{ text: "Ambulatory Cactus 2/1", x: 660, y: 200, owner: 'p2'}
+			{ text: "Ent 0/5", x: 800, y: 200, owner: 'p2'}
+			{ text: "Carnivore 2/1", x: 220, y: 420, owner: 'p1'}
+			{ text: "Herbivore 1/2", x: 360, y: 420, owner: 'p1'}
+			{ text: "Stone Wall 0/10", x: 500, y: 420, owner: 'p1', pile: 'p1_draw', flipped: true}
+			{ text: "Log 0/1", x: 660, y: 420, owner: 'p1', pile: 'p1_draw', flipped: true}
+			{ text: "Ent 0/5", x: 800, y: 420, owner: 'p1', pile: 'p1_draw', flipped: true}
+			{ text: "Barricade 0/10", x: 500, y: 420, owner: 'p1', pile: 'p1_draw', flipped: true}
+			{ text: "O(log(n)) 0/1", x: 660, y: 420, owner: 'p1', pile: 'p1_draw', flipped: true}
+			{ text: "Fence 0/5", x: 800, y: 420, owner: 'p1', pile: 'p1_draw', flipped: true}
 		]
 
 test_init()