Fix des problèmes lors du merge
This commit is contained in:
parent
323e190474
commit
989587379a
|
@ -52,6 +52,8 @@ class Engine:
|
||||||
|
|
||||||
new_time = time.time_ns()/10E8
|
new_time = time.time_ns()/10E8
|
||||||
delta = new_time-last_time
|
delta = new_time-last_time
|
||||||
|
if delta == 0.:
|
||||||
|
delta = 1/512 # Sécurité pour éviter les divisions par 0 si le delta baisse trop
|
||||||
last_time = new_time
|
last_time = new_time
|
||||||
|
|
||||||
def update(self, delta: float):
|
def update(self, delta: float):
|
||||||
|
|
|
@ -19,7 +19,7 @@ class Game(Engine):
|
||||||
self.load_boss_fight_assets()
|
self.load_boss_fight_assets()
|
||||||
self.spawn_mobs()
|
self.spawn_mobs()
|
||||||
|
|
||||||
self.DEBUG_MODE = False
|
self.DEBUG_MODE = True
|
||||||
|
|
||||||
self.game_state = GameState.MAIN_MENU
|
self.game_state = GameState.MAIN_MENU
|
||||||
|
|
||||||
|
@ -81,9 +81,6 @@ class Game(Engine):
|
||||||
player.link_animation("player_none")
|
player.link_animation("player_none")
|
||||||
player.collision_rect = [-6, -7, 6, 16]
|
player.collision_rect = [-6, -7, 6, 16]
|
||||||
|
|
||||||
player.set_default_life(15)
|
|
||||||
player.max_speed = 64.0
|
|
||||||
|
|
||||||
self.entity_manager.set_player_entity("player")
|
self.entity_manager.set_player_entity("player")
|
||||||
|
|
||||||
player.shadow = "player_shadow"
|
player.shadow = "player_shadow"
|
||||||
|
@ -91,7 +88,7 @@ class Game(Engine):
|
||||||
|
|
||||||
# On définit ses attributs
|
# On définit ses attributs
|
||||||
player.set_default_life(15)
|
player.set_default_life(15)
|
||||||
player.max_speed = 1.5
|
player.max_speed = 64.0
|
||||||
player.x = 220.
|
player.x = 220.
|
||||||
player.y = 767.
|
player.y = 767.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue