From 5e5f70bb208fb1f8a7e774ed5a172e78660be639 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Tue, 1 Nov 2011 02:02:16 -0400 Subject: [PATCH] start of piles implementation create blank for when pile is empty create caption (at init time) for each pile. Attach to blank or top card. --- client.coffee | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- server.coffee | 4 ++-- style.less | 11 +++++++++-- 3 files changed, 64 insertions(+), 8 deletions(-) diff --git a/client.coffee b/client.coffee index 24421f9..5a5341c 100644 --- a/client.coffee +++ b/client.coffee @@ -5,6 +5,7 @@ card_height = 0 state = null server_url = null top_card_z = 0 # css z-index of front-most card +$pile_captions = {} show_message = (txt) -> txt # FIXME implement chat box or something @@ -28,16 +29,22 @@ new_button = (text) -> $ $ "
#{text}
" # transform coordinates from client-side coords to server-side coords (or back) # this makes it so p2 view everything upside down (mirrored), but still sends coords rightside up +flip_y = (y) -> table_height - card_height - y transform_x = (x) -> x transform_y = (y) -> return y unless state.agent is 'p2' - return table_height - card_height - y + return flip_y y next_card_z = -> return top_card_z += 1 bring_card_to_front = (card) -> card.view.css "z-index": next_card_z() +new_blank_card = (x, y) -> + view = $ $ "
" + $table.append view + return view + instantiate_card = (card) -> text = card.text if card.owner is state.agent @@ -128,6 +135,49 @@ poll_for_updates = -> error_lag = 3 } +n_cards = (count) -> + return "#{count} cards" unless count is 1 + return "1 card" + +initialize_cards = () -> + # clear everything + $('.card').remove() + $('.blank_card').remove() + + # instantiate cards in play + for card in state.cards + instantiate_card card unless card.pile + + # build piles + piles = [ + {key: 'p2_draw', x: transform_x(160), y: transform_y(20), name: "Draw Pile"} + {key: 'p2_discard', x: transform_x(20), y: transform_y(20), name: "Discard Pile"} + {key: 'p1_draw', x: transform_x(160), y: transform_y(flip_y(20)), name: "Draw Pile"} + {key: 'p1_discard', x: transform_x(20), y: transform_y(flip_y(20)), name: "Discard Pile"} + ] + for pile in piles + pile.$blank = new_blank_card pile.x, pile.y + count = 0 + top = null + if state.piles[pile.key]?.length + count = state.piles[pile.key].length + top = state.piles[pile.key][0] + $caption = $ $ "
#{pile.name}:
#{n_cards count}
" + pile.$caption = $caption + if top? + top.x = pile.x + top.y = pile.y + instantiate_card top + top = top.view + else + top = pile.$blank + + top.append $caption + + #pile.drag_handler = top.bind 'dragstart', -> + # FIXME + + init = -> if window.location.hash? and window.location.hash.length > 0 me = window.location.hash.substr 1 @@ -143,6 +193,7 @@ init = -> if agent is me tell_server ['move', agent, card, x, y, z] else + # FIXME should we use the z from the server? Should p1 use odd numbers and p2 even? bring_card_to_front state.cards[card] state.cards[card].view.animate { left: "#{transform_x x}px", top: "#{transform_y y}px"}, 800 state.on 'mark', (agent, card, state) -> @@ -154,9 +205,7 @@ init = -> if agent is me tell_server ['flip', agent, card, state] state.on 'set_cards', (agent, cards) -> - $('.card').remove() - for card in cards - instantiate_card card + initialize_cards() if agent is me tell_server ['set_cards', agent, cards] diff --git a/server.coffee b/server.coffee index 80ad9c3..43e0bc6 100644 --- a/server.coffee +++ b/server.coffee @@ -185,14 +185,14 @@ test_init = -> timeout 4000, -> 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: "Log 0/1", x: 660, y: 420, owner: 'p1', pile: 'p1_draw'} { text: "Ent 0/5", x: 800, y: 420, owner: 'p1'} ] diff --git a/style.less b/style.less index c613024..2473abf 100644 --- a/style.less +++ b/style.less @@ -48,15 +48,22 @@ h1 { border: 2px solid #468; } -.card { +.card, .blank_card { width: @card-width; height: @card-height; padding: 2px; position: absolute; + border-radius: 4px; +} + +.blank_card { + border: 1px solid #777; +} + +.card { background: #fff; border: 2px solid #fff; .shadow(1px, 1px, 8px, 0.4); - border-radius: 4px; &:hover { z-index: 9999 !important; -- 1.7.10.4