refactoring

menu/driverpage.py

@@ -60,10 +60,11 @@ def build_page(self):
         names = names[:9]
         name = OnscreenText(_('Write your name:'), pos=(-.1, .6), scale=.06,
                             align=TextNode.A_right, **t_a)
+        player_name = game.options['settings']['player_name']
         self.ent = DirectEntry(
             scale=.08, pos=(0, 1, .6), entryFont=menu_args.font, width=12,
             frameColor=menu_args.btn_color,
-            initialText=game.options['settings']['player_name'] or _('your name'))
+            initialText=player_name or _('your name'))
         self.ent.onscreenText['fg'] = (.75, .75, .25, 1)
         self.widgets += [name, self.ent]
         self.drivers = []

menu/exitmenu/exitpage.py

@@ -11,11 +11,12 @@ class ExitPageGui(PageGui):
     def build_page(self):
         self.frm = DirectFrame(
             frameSize=(-1.5, 1.5, -.9, .9), frameColor=(.95, .95, .7, .85))
+        font_path = 'assets/fonts/Hanken-Book.ttf'
         txt = _(
             'Please, visit our site after exiting!\n\nIt helps us! Thank you!')
-        self.txt = OnscreenText(text=txt, pos=(0, .64), scale=.08, wordwrap=32,
-            fg=(.75, .75, .25, 1),
-            font=eng.font_mgr.load_font('assets/fonts/Hanken-Book.ttf'))
+        self.txt = OnscreenText(
+            text=txt, pos=(0, .64), scale=.08, wordwrap=32,
+            fg=(.75, .75, .25, 1), font=eng.font_mgr.load_font(font_path))
         menu_data = [
             ('visit our site after exiting', _('visit our site after exiting'),
              lambda: self.on_end(True)),
@@ -24,7 +25,7 @@ def build_page(self):
              lambda: self.on_end(False))]
         self.widgets = [self.frm, self.txt]
         btn_args = {
-            'text_font': eng.font_mgr.load_font('assets/fonts/Hanken-Book.ttf'),
+            'text_font': eng.font_mgr.load_font(font_path),
             'text_fg': (.75, .75, .25, 1),
             'frameColor': (0, 0, 0, .2),
             'relief': FLAT,

menu/ingamemenu/ingamepage.py

@@ -12,16 +12,16 @@ def build_page(self):
             frameSize=(-1.5, 1.5, -.9, .9), frameColor=(.95, .95, .7, .85))
         txt = _(
             "What do you want to do?\n\nNB Use 'p' for pausing the game.")
-        self.txt = OnscreenText(text=txt, pos=(0, .64), scale=.08, wordwrap=32,
-            fg=(.75, .75, .25, 1),
-            font=eng.font_mgr.load_font('assets/fonts/Hanken-Book.ttf'))
+        font_path = 'assets/fonts/Hanken-Book.ttf'
+        self.txt = OnscreenText(
+            text=txt, pos=(0, .64), scale=.08, wordwrap=32,
+            fg=(.75, .75, .25, 1), font=eng.font_mgr.load_font(font_path))
         menu_data = [
             ('back to the game', _('back to the game'),
              lambda: self.on_end(True)),
             ('back to the main menu', _('back to the main menu'),
              lambda: self.on_end(False))]
         self.widgets = [self.frm, self.txt]
-        font_path = 'assets/fonts/Hanken-Book.ttf'
         btn_args = {
             'text_font': eng.font_mgr.load_font(font_path),
             'text_fg': (.75, .75, .25, 1),

yorg/fsm.py

@@ -27,18 +27,19 @@ def __init__(self, mdt):
         self.curr_load_txt = None
         self.__menu = None
         self.race = None
+        self.__exit_menu = None
 
     def enterMenu(self):
         eng.log_mgr.log('entering Menu state')
         self.__menu = YorgMenu()
         self.mdt.audio.menu_music.play()
-        for file in os.listdir('.'):
-            if file.endswith('.bam'):
+        for file_ in os.listdir('.'):
+            if file_.endswith('.bam'):
                 curr_version = eng.logic.version
-                file_version = file[:-4].split('_')[-1]
+                file_version = file_[:-4].split('_')[-1]
                 if curr_version != file_version:
-                    eng.log_mgr.log('removing ' + file)
-                    os.remove(file)
+                    eng.log_mgr.log('removing ' + file_)
+                    os.remove(file_)
 
     def exitMenu(self):
         eng.log_mgr.log('exiting Menu state')
@@ -62,9 +63,20 @@ def enterRace(self, track_path='', car_path='', player_cars=[],
         elif eng.client.is_active:
             self.race = RaceClient(keys, joystick, sounds)
         else:
+            wheel_names = [['EmptyWheelFront', 'EmptyWheelFront.001',
+                            'EmptyWheelRear', 'EmptyWheelRear.001'],
+                           ['EmptyWheel', 'EmptyWheel.001', 'EmptyWheel.002',
+                            'EmptyWheel.003']]
+            tuning = self.mdt.logic.season.logic.tuning.logic.tuning
             self.race = RaceSinglePlayer(
                 keys, joystick, sounds, (.75, .75, .25, 1), (.75, .75, .75, 1),
-                'assets/fonts/Hanken-Book.ttf')  # use global template args
+                'assets/fonts/Hanken-Book.ttf', 'capsule', 'Capsule',
+                'assets/models/cars', 'phys.yml', wheel_names,
+                tuning['engine'], tuning['tires'], tuning['suspensions'],
+                'Road', 'assets/models/cars', 'car',
+                ['cardamage1', 'cardamage2'],
+                ['wheelfront', 'wheelrear', 'wheel'],
+                'assets/particles/sparks.ptf')  # use global template args
         eng.log_mgr.log('selected drivers: ' + str(drivers))
         self.race.logic.drivers = drivers
         self.race.fsm.demand('Loading', track_path, car_path, player_cars,