fixes

Author: scooterman

server/rules/war/wargame.py

@@ -22,7 +22,7 @@
 import copy
 
 class Wargame(broadcastable.Broadcastable):
-    TURN_TIMER = 30
+    TURN_TIMER = 120
 
     LANDS = [
       'Alaska' ,
@@ -317,6 +317,7 @@ def handle_wargame_add_piece(self, session, message):
             return
 
         session['land_data'][to_land]['turn_pieces'] += quantity
+        session['remaining_pieces'] -= quantity
 
         self.broadcast(None, { 'action' : 'wargame_status_update' , 'status' : 'player added piece', 'user' : session.username , 'where' : to_land, 'quantity' : message['quantity'] })
 
@@ -342,6 +343,7 @@ def handle_wargame_remove_piece(self, session, message):
             return
 
         session['land_data'][to_land]['turn_pieces'] -= quantity
+        session['remaining_pieces'] += quantity
 
         self.broadcast(None, { 'action' : 'wargame_status_update' , 'status' : 'player removed a piece', 'user' : session.username , 'where' : from_land, 'quantity' : message['quantity'] })            
 

test/simple_server_tester.py

@@ -47,8 +47,8 @@ def __init__(self, ip, port, sock = None):
                                 ('set ready' , { 'action' : 'wargame_lobby_set_self_ready', 'fields' : [ ('ready', str, True) ] }),
                                 ('start game', { 'action' : 'wargame_lobby_start_game' , 'fields' : [] } )]
 
-        in_game_actions = [ ('remove a piece', {'action' : 'wargame_remove_piece', 'fields' : [ ('from', str, True) ] } ),
-                            ('add a piece', {'action' : 'wargame_add_piece', 'fields' : [ ('to', str, True) ] } ),
+        in_game_actions = [ ('remove a piece', {'action' : 'wargame_remove_piece', 'fields' : [ ('from', str, True) , ('quantity', int, True ) ] } ),
+                            ('add a piece', {'action' : 'wargame_add_piece', 'fields' : [ ('to', str, True) , ('quantity', int, True ) ] } ),
                             ('say something' , { 'action' : 'wargame_chat', 'fields' : [ ('message', str, True ) ] } ),
                             ('attack a land', {'action' : 'wargame_attack_land', 'fields' : [ ('quantity', str, True), ('from', str, True), ('to', str, True) ] } ),
                             ('end turn' , { 'action' : 'wargame_end_turn', 'fields' : [] }  ) ]                                               
@@ -94,6 +94,7 @@ def respawn():
         return
 
       reqd = { True : ' (required) ', False : ' (enter to proceed) ' }
+      
       for param in self.menu[self.current_state][value][1]['fields']:
         item_value = raw_input('{0}{1}: '.format(param[0], reqd[param[2]]))        
         params[param[0]] = param[1](item_value)