Changeset 6.1.44

Timestamp:

08/21/2016 04:08:39 AM (8 years ago)

Author:

David Owen <dsowen@fugue88.ws>

branch-nick:

state

revision id:

dsowen@fugue88.ws-20160821040839-xv2bnfiuxv5lyayg

Message:

Moved perform_mission() to state object

File:

• main.py (modified) (3 diffs)

main.py

@@ -100 +100 @@
         self.team = team
 
+    def perform_mission(self):
+        failures = 0
+        for i in self.team:
+            if self.shared.role_deck[i] == "SPY":
+                if not self.shared.players[i].perform_mission():
+                    failures = failures + 1
+
+        success = failures < required_failures(self.shared.player_count, self.shared.mission)
+
+        for p in self.shared.players:
+            p.observe_mission(success, failures)
+
+        if success:
+            print("Mission succeeded")
+            self.shared.wins += 1
+        else:
+            print("Mission had {} failures".format(failures))
+            self.shared.losses += 1
+
+        return AdvanceMission(self.shared)
+
 
 def main(player_count):
@@ -119 +140 @@
 
     shared = Shared(player_count, players, role_deck)
-
-    def perform_mission():
-        failures = 0
-        for i in state.team:
-            if state.shared.role_deck[i] == "SPY":
-                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 state.shared.players:
-            p.observe_mission(success, failures)
-
-        if success:
-            print("Mission succeeded")
-            state.shared.wins += 1
-        else:
-            print("Mission had {} failures".format(failures))
-            state.shared.losses += 1
-
-        return AdvanceMission(shared)
-
     state = AdvanceMission(shared)
 
@@ -149 +148 @@
             state = state.do()
         elif isinstance(state, PerformMission):
-            state = perform_mission()
+            state = state.perform_mission()
 
         if shared.team_failures == 5: