X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=common.coffee;h=f57c4d4c6807800f6d520f9e5d9fb0d2c2181805;hb=e5d2d2f7c8ee13e32caebf343b6d4046ca802b11;hp=cec2bc5d78f4dd0d91d773c8106a473aec290a4e;hpb=17254bb57943dda8793cf80c37fb65db472de0ea;p=peach-cgt.git

diff --git a/common.coffee b/common.coffee
index cec2bc5..f57c4d4 100644
--- a/common.coffee
+++ b/common.coffee
@@ -12,7 +12,6 @@ class GameState
 		@agent = agent
 		@hooks = {}
 		@cards = []
-		@piles = {}
 	on: (event, callback) ->
 		unless @hooks[event]?
 			@hooks[event] = []
@@ -21,16 +20,19 @@ class GameState
 		return unless @hooks[event]?
 		for callback in @hooks[event]
 			callback.apply this, args
-	move: (agent, card, x, y) -> # FIXME add pile argument
+	move: (agent, card, x, y, z, pile) ->
 		# FIXME what to do on error?
-		return unless @cards[card]? #?.pile?
-		#cur_pile = cards[card].pile
-		#if pile isnt cur_pile
+		return unless @cards[card]?
 
 		@cards[card].x = x
 		@cards[card].y = y
+		@cards[card].z = z
+		if pile?
+			@cards[card].pile = pile
+		else if @cards[card].pile?
+			delete @cards[card].pile
 
-		@trigger 'move', agent, card, x, y # FIXME add pile argument
+		@trigger 'move', agent, card, x, y, z, pile
 
 	mark: (agent, card, state) ->
 		# FIXME what to do on error?
@@ -48,16 +50,19 @@ class GameState
 
 	set_cards: (agent, cards) ->
 		@cards = []
-		@piles = {}
 		for card in cards
-			card.number = @cards.length
+			card.number = @cards.length unless card.number
+			card.z = @cards.length unless card.z
 			@cards.push card
-			if card.pile?
-				unless @piles[card.pile]?
-					@piles[card.pile] = []
-				@piles[card.pile].push card
 		@trigger 'set_cards', agent, @cards
 
+	new_cards: (agent, cards) ->
+		for card in cards
+			card.number = @cards.length unless card.number
+			card.z = @cards.length unless card.z
+			@cards.push card
+		@trigger 'new_cards', agent, cards
+
 	send_state: (agent) ->
 		@trigger 'send_state', agent
 
@@ -67,7 +72,9 @@ class GameState
 			return typeof messages
 
 		for message in messages
-			unless message instanceof Array and message[0]? and message[0] in ['move', 'mark', 'flip', 'set_cards', 'send_state']
+			unless message instanceof Array and message[0]? and message[0] in ['move', 'mark', 'flip', 'set_cards', 'send_state', 'new_cards']
+				if console?.log?
+					console.log "Got unrecognized message: #{JSON.stringify message}"
 				# FIXME what to do on error?
 				return 2
 			method = message.shift()