Piles display and removing cards mostly working

[peach-cgt.git] / server.coffee

diff --git a/server.coffee b/server.coffee
index 46d48c5..089523a 100644 (file)
--- 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, owner: 'p2'}
-                       { text: "Wild beast 2/2", x: 360, 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'}
-                       { text: "Log 0/1", x: 660, y: 420, owner: 'p1'}
-                       { text: "Ent 0/5", x: 800, 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()