Changeset 6.1.28

Timestamp:

08/20/2016 08:58:20 PM (8 years ago)

Author:

David Owen <dsowen@fugue88.ws>

branch-nick:

state

revision id:

dsowen@fugue88.ws-20160820205820-d9bci6m3gdn1yu8k

Message:

Moved team_size into state

File:

• main.py (modified) (4 diffs)

main.py

@@ -50 +50 @@
 class AssembleTeam(object):
 
-    def __init__(self, shared):
+    def __init__(self, shared, team_size):
         self.shared = shared
+        self.team_size = team_size
 
 
@@ -86 +87 @@
     team = None
     approved = None
-    team_size = None
 
     def advance_mission():
-        nonlocal team_size
         team_size = mission_size(player_count, mission)
         print("Mission {} needs {} members".format(mission, team_size))
-        return AssembleTeam(shared)
+        return AssembleTeam(shared, team_size)
 
     def assemble_team():
@@ -98 +97 @@
 
         print("Captain is {}".format(captain))
-        team = players[captain].propose_team(team_size)
+        team = players[captain].propose_team(state.team_size)
         print("He proposed {}".format(team))
 
         votes = [p.approve_team(team) for p in players]
         approvals = sum(votes)
-        approved = approvals > team_size / 2
+        approved = approvals > state.team_size / 2
 
         print("Team {}: {} for, {} against".format(
@@ -120 +119 @@
         else:
             team_failures += 1
-            return AssembleTeam(shared)
+            return AssembleTeam(shared, state.team_size)
 
     def perform_mission():