projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ctpug.org.za:tabakrolletjie
[tabakrolletjie.git]
/
tabakrolletjie
/
gamestate.py
diff --git
a/tabakrolletjie/gamestate.py
b/tabakrolletjie/gamestate.py
index 27762a6d7e086c3dae50bff4226cfe4ee085708a..9fe4fc85d3557ea0d991a48e664c3627b0912bf3 100644
(file)
--- a/
tabakrolletjie/gamestate.py
+++ b/
tabakrolletjie/gamestate.py
@@
-11,6
+11,7
@@
class GameState(object):
self.harvested = 0
self.eaten = 0
self.days = 0
self.harvested = 0
self.eaten = 0
self.days = 0
+ self.resistances = {}
@property
def station(self):
@property
def station(self):
@@
-28,8
+29,9
@@
class GameState(object):
def seeds(self):
if self._state["seeds"] is None:
if (self._state["station"] and
def seeds(self):
if self._state["seeds"] is None:
if (self._state["station"] and
- "seeds" in self._state["station"]["config"]):
- self._state["seeds"] = self._state["station"]["config"]["seeds"]
+ "seeds" in self._state["station"]["config"]):
+ self._state["seeds"] = (
+ self._state["station"]["config"]["seeds"])
else:
self._state["seeds"] = 0
return self._state["seeds"]
else:
self._state["seeds"] = 0
return self._state["seeds"]
@@
-42,9
+44,11
@@
class GameState(object):
self._state["station"] = station
self._state["turnips"] = []
self._state["seeds"] = None
self._state["station"] = station
self._state["turnips"] = []
self._state["seeds"] = None
+ self.resistances = {}
def get_spawn_positions(self):
return self._state["station"]["config"]["spawn positions"]
def get_spawn_positions(self):
return self._state["station"]["config"]["spawn positions"]
- def get_target(self):
+ @property
+ def turnip_target(self):
return self._state["station"]["config"]["turnip target"]
return self._state["station"]["config"]["turnip target"]