Merge de branche Nils et Zac
This commit is contained in:
@@ -15,6 +15,7 @@ const REGION_FIRST_PHASE = [
|
||||
]
|
||||
|
||||
const REGION_LOOP_PHASE = [
|
||||
"RegionForestLoop",
|
||||
"RegionForestLoop",
|
||||
"RegionForestLoop",
|
||||
"RegionMineLoop",
|
||||
@@ -42,7 +43,7 @@ func _on_change_scene(scene : Scene):
|
||||
stop_all_musics()
|
||||
elif scene is RegionScene:
|
||||
play_ambiance("Exterior", false)
|
||||
var region_level = GameInfo.game_data.current_region_data.region_level
|
||||
var region_level = GameInfo.game_data.current_run.level
|
||||
var first_phase = REGION_FIRST_PHASE[region_level % len(REGION_FIRST_PHASE)]
|
||||
var loop_phase = REGION_LOOP_PHASE[region_level % len(REGION_LOOP_PHASE)]
|
||||
play_music_alone(first_phase)
|
||||
@@ -61,10 +62,10 @@ func _on_change_scene(scene : Scene):
|
||||
play_ambiance_alone("Borea", false)
|
||||
elif scene is VendingMachineScene:
|
||||
stop_all_musics()
|
||||
play_ambiance_alone("Borea", false)
|
||||
play_ambiance_alone("VendingRoom", false)
|
||||
elif scene is RelayBaseScene:
|
||||
stop_all_musics()
|
||||
play_ambiance_alone("Borea", false)
|
||||
play_ambiance_alone("BaseRelais", false)
|
||||
|
||||
# Fonction s'exécutant à chaque début de timeline
|
||||
func _on_timeline_started():
|
||||
|
||||
Reference in New Issue
Block a user