Changeset 6.1.38

Timestamp:

08/20/2016 09:21:54 PM (8 years ago)

Author:

David Owen <dsowen@fugue88.ws>

branch-nick:

state

revision id:

dsowen@fugue88.ws-20160820212154-horha1cy20jzv10x

Message:

Copied players to shared state

File:

• main.py (modified) (6 diffs)

main.py

@@ -38 +38 @@
 class Shared(object):
 
-    def __init__(self, player_count):
+    def __init__(self, player_count, players):
         self.player_count = player_count
+        self.players = players
         self.mission = 0
         self.captain = 0
@@ -88 +89 @@
             players[i].reveal_spies(spy_nums)
 
-    shared = Shared(player_count)
+    shared = Shared(player_count, players)
 
     wins = 0
@@ -95 +96 @@
     def assemble_team():
         print("Captain is {}".format(state.shared.captain))
-        team = players[state.shared.captain].propose_team(state.team_size)
+        team = state.shared.players[state.shared.captain].propose_team(state.team_size)
         print("He proposed {}".format(team))
 
-        votes = [p.approve_team(team) for p in players]
+        votes = [p.approve_team(team) for p in state.shared.players]
         approvals = sum(votes)
         approved = approvals > state.team_size / 2
@@ -107 +108 @@
         ))
 
-        for p in players:
+        for p in state.shared.players:
             p.observe_team_vote(approved, votes)
 
@@ -125 +126 @@
         for i in state.team:
             if role_deck[i] == "SPY":
-                if not players[i].perform_mission():
+                if not state.shared.players[i].perform_mission():
                     failures = failures + 1
 
         success = failures < required_failures(state.shared.player_count, state.shared.mission)
 
-        for p in players:
+        for p in state.shared.players:
             p.observe_mission(success, failures)
 
@@ -154 +155 @@
         if shared.team_failures == 5:
             print("The spies won!")
-            for p in players:
+            for p in shared.players:
                 p.observe_game(False)
             return
         elif wins >= 3:
             print("The Resistance won!")
-            for p in players:
+            for p in shared.players:
                 p.observe_game(True)
             return
         elif losses >= 3:
             print("The Spies won!")
-            for p in players:
+            for p in shared.players:
                 p.observe_game(False)
             return