diff gamelib/gamestate.py @ 111:bb76ce231ff9

Merge changes.
author Simon Cross <hodgestar@gmail.com>
date Wed, 09 May 2012 22:37:49 +0200
parents 4a44d133ad2e
children 685301e35f88
line wrap: on
line diff
--- a/gamelib/gamestate.py	Wed May 09 22:37:07 2012 +0200
+++ b/gamelib/gamestate.py	Wed May 09 22:37:49 2012 +0200
@@ -5,7 +5,7 @@
 
 from gamelib import missions, lab
 from gamelib.game_base import get_subclasses
-from gamelib.constants import NEW_SCIENCE, NEW_SCHEMATIC
+from gamelib.constants import NEW_SCIENCE, NEW_SCHEMATIC, M_VALS
 
 
 class Game(object):
@@ -33,7 +33,7 @@
 
     def start_turn(self):
         # Make more flexible?
-        self.points += 3
+        self.points += 1 + M_VALS[self.milestone] * 2
         self.turn += 1
         self.cur_missions = []
         self.cur_allocation = []
@@ -93,6 +93,7 @@
         data['milestone'] = self.milestone
         data['points'] = self.points
         data['lab'] = self.lab.save_data()
+        data['turn'] = self.turn
         # Save mission state
         data['missions'] = {}
         for mission in self.missions:
@@ -105,6 +106,7 @@
         self.money = data['money']
         self.reputation = data['reputation']
         self.points = data['points']
+        self.turn = data['turn']
         self.lab = lab.Lab(data['lab'])
         for mis_class in missions.Mission.__subclasses__():
             miss_name = mis_class.__name__