diff gamelib/gamestate.py @ 137:fb8037bc22f1

More flexible (and less boilerplatey) mission stuff.
author Jeremy Thurgood <firxen@gmail.com>
date Thu, 10 May 2012 20:56:40 +0200
parents 8d1cf98e39b5
children 14917385a0fd
line wrap: on
line diff
--- a/gamelib/gamestate.py	Thu May 10 19:20:57 2012 +0200
+++ b/gamelib/gamestate.py	Thu May 10 20:56:40 2012 +0200
@@ -65,7 +65,7 @@
         # Attempt the missions
         mission_results = []
         for mission, equipment in self.cur_missions:
-            mission_results.append(mission.attempt(equipment, self))
+            mission_results.append(mission.attempt_mission(equipment, self))
         if not self.cur_missions and self.reputation > 0:
             # If you're not doing stuff, you're not in the news
             self.reputation -= M_VALS[self.milestone]
@@ -80,7 +80,7 @@
         messages = []
         for result in mission_results:
             result.apply(self)
-            messages.append((result.outcome, result.message))
+            messages.append((result.outcome, result.text))
             if result.outcome == NEW_MILESTONE:
                 self.milestone = MILESTONES[M_VALS[self.milestone] + 1]
         for science in new_stuff: