Fix for broken leader stuff

CityGenerator · Apr 7, 2014 · e140226 · e140226
1 parent d748c1b
commit e140226
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/data/leader.data b/data/leader.data
@@ -425,11 +425,11 @@ HSET  leadermayorcouncil_leader_description mayor { "male":"Mayor",      "female
 LPUSH leadercommission_leader commissioner
 HSET  leadercommission_leader_description commissioner { "male":"Commissioner",      "female":"Commissioner"      }
 
-LPUSH leadertownmeeting_leaderkind elder
-HSET  leadertownmeeting_leaderkind_description elder { "male":"Elder",      "female":"Elder"      }
+LPUSH leadertownmeeting_leader elder
+HSET  leadertownmeeting_leader_description elder { "male":"Elder",      "female":"Elder"      }
 
-LPUSH leadermagistrate_leaderkind magistrate
-HSET  leadermagistrate_leaderkind_description magistrate { "male":"Magistrate",      "female":"Magistrate"      }
+LPUSH leadermagistrate_leader magistrate
+HSET  leadermagistrate_leader_description magistrate { "male":"Magistrate",      "female":"Magistrate"      }
 
 #
 #

diff --git a/data/street.data b/data/street.data
@@ -170,6 +170,7 @@ LPUSH street_material dirt
 LPUSH street_material gravel
 LPUSH street_material cobblestone
 LPUSH street_material pavingstone
+LPUSH street_material flagstone
 
 
 

diff --git a/generators/Leader.py b/generators/Leader.py
@@ -29,5 +29,7 @@ def __init__(self, redis, features={}):
         self.set_title()
 
     def set_title(self):
-        self.name['title']=self.leaderkind_description[self.sex['name']]
+        print self.__dict__
+        print "stuff"
+        self.name['title']=self.leader_description[self.sex['name']]
         self.name['fulltitled']=self.name['title'] +" "+self.name['full']