Commits

dryatu desk  committed 5569d4a

New intro music, new physics feel, fixed typos.

  • Participants
  • Parent commits 314efd5
  • Branches advanced-physics

Comments (0)

Files changed (8)

File FatxFast/config.py

     def __init__(self, *args, **kwargs): 
         self.hotkeys = OrderedDict()
         self.version = __version__
-        self.hotkeys["player1-up"] = pygame.K_UP
-        self.hotkeys["player1-down"] = pygame.K_DOWN
-        self.hotkeys["player1-left"] = pygame.K_LEFT
-        self.hotkeys["player1-right"] = pygame.K_RIGHT
-        self.hotkeys["player1-walk"] = pygame.K_RSHIFT
-        self.hotkeys["player2-up"] = pygame.K_w
-        self.hotkeys["player2-down"] = pygame.K_s
-        self.hotkeys["player2-left"] = pygame.K_a
-        self.hotkeys["player2-right"] = pygame.K_d
-        self.hotkeys["player2-walk"] = pygame.K_LSHIFT
+        self.hotkeys["player1-up"] = pygame.K_w
+        self.hotkeys["player1-down"] = pygame.K_s
+        self.hotkeys["player1-left"] = pygame.K_a
+        self.hotkeys["player1-right"] = pygame.K_d
+        self.hotkeys["player1-turbo"] = pygame.K_LSHIFT
+        self.hotkeys["player2-up"] = pygame.K_UP
+        self.hotkeys["player2-down"] = pygame.K_DOWN
+        self.hotkeys["player2-left"] = pygame.K_LEFT
+        self.hotkeys["player2-right"] = pygame.K_RIGHT
+        self.hotkeys["player2-turbo"] = pygame.K_RSHIFT
         self.hotkeys["map-zoom-in"] = pygame.K_PLUS
         self.hotkeys["map-zoom-out"] = pygame.K_MINUS
-        self.hotkeys["player1-map"] = pygame.K_m
-        self.hotkeys["player2-map"] = pygame.K_z
+        self.hotkeys["player1-map"] = pygame.K_z
+        self.hotkeys["player2-map"] = pygame.K_m
         #self.hotkeys["solve"] = pygame.K_o
         self.mapstyle = "auto"
         self.fullscreen = False

File FatxFast/modes/mode.py

             player1.set_accel(x=Physics.accelspeed)
         else:
             player1.set_accel(x=0)
-        if keys[self.hotkeys["player1-walk"]]:
+        if keys[self.hotkeys["player1-turbo"]]:
             player1.turbo()
         return keys
 

File FatxFast/modes/multimode.py

             player2.set_accel(x=Physics.accelspeed)
         else:
             player2.set_accel(x=0)  
-        if keys[self.hotkeys["player2-walk"]]:
+        if keys[self.hotkeys["player2-turbo"]]:
             self.player2.turbo()
     
     def key_pressed(self, key, utf, mod):

File FatxFast/objects/player.py

         if self._turboing:
             return False
         self._turboing = True
-        self._delay = self._delay/2
         self.physics.maxspeed = self.physics.get_default_maxspeed()*1.5
 
     def set_turbo(self, amount):
         if not self._turboing:
             return False
         self._turboing = False 
-        self._delay = self._delay*2
         self.physics.maxspeed = self.physics.get_default_maxspeed()
 
     def update(self, dt):

File FatxFast/physics/physics.py

     """
     maxspeed = 1.30
     minspeed = 0.3
-    accelspeed = 3
+    accelspeed = 0.8
     bb_rect_component_relations = {"x":"width", "y":"height"}
     def __init__(self, entity, worldmap, collides=True):
         self.collides = collides
         self.worldmap = worldmap
         self._xmove = axismoving.MoveOnXAxis(self)
         self._ymove = axismoving.MoveOnYAxis(self)
-        self._speed_down_factor = 0.8
+        self._speed_down_factor = 0.4
 
     def get_collision_tile(self, x, y):
         return self.worldmap.sprite_layers[COLLIDE_LAYER].content2D[y][x]

File FatxFast/rsc/beaten.mp3

Binary file removed.

File FatxFast/rsc/intro_cosmos.mp3

Binary file added.

File FatxFast/scenes/menuscenes.py

     def __init__(self, manager, **kwargs):
         manager.clear()
         super(IntroScene, self).__init__(manager, **kwargs)
-        self.manager.game.audio.load_music("beaten.mp3")
+        self.manager.game.audio.load_music("intro_cosmos.mp3")
         self.manager.game.audio.play_music(-1) 
     
     def key_pressed(self, key, utf, mod):