diff --git a/assets/audio/sfx/footsteps.ogg b/assets/audio/sfx/footsteps.ogg deleted file mode 100644 index 0bbe215..0000000 Binary files a/assets/audio/sfx/footsteps.ogg and /dev/null differ diff --git a/assets/audio/sfx/footsteps.ogg.import b/assets/audio/sfx/footsteps.ogg.import deleted file mode 100644 index 53971c7..0000000 --- a/assets/audio/sfx/footsteps.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://dfslsx3kt8pqt" -path="res://.godot/imported/footsteps.ogg-360e88fb8d63ecc4a78114a79239154b.oggvorbisstr" - -[deps] - -source_file="res://assets/audio/sfx/footsteps.ogg" -dest_files=["res://.godot/imported/footsteps.ogg-360e88fb8d63ecc4a78114a79239154b.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/assets/audio/sfx/iteract.ogg b/assets/audio/sfx/interact.ogg similarity index 100% rename from assets/audio/sfx/iteract.ogg rename to assets/audio/sfx/interact.ogg diff --git a/assets/audio/sfx/interact.ogg.import b/assets/audio/sfx/interact.ogg.import new file mode 100644 index 0000000..5918423 --- /dev/null +++ b/assets/audio/sfx/interact.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://brtuhpyeyj1fp" +path="res://.godot/imported/interact.ogg-a4afaf649a0eb6188284c4bb2e18cfcc.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/sfx/interact.ogg" +dest_files=["res://.godot/imported/interact.ogg-a4afaf649a0eb6188284c4bb2e18cfcc.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/sfx/iris_talking.ogg b/assets/audio/sfx/iris_talking.ogg deleted file mode 100644 index a25a4e5..0000000 Binary files a/assets/audio/sfx/iris_talking.ogg and /dev/null differ diff --git a/assets/audio/sfx/iris_talking.ogg.import b/assets/audio/sfx/iris_talking.ogg.import deleted file mode 100644 index 56a9aad..0000000 --- a/assets/audio/sfx/iris_talking.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://d1sfvsp37sf1c" -path="res://.godot/imported/iris_talking.ogg-e197f63669b871b7fba645862ffe301f.oggvorbisstr" - -[deps] - -source_file="res://assets/audio/sfx/iris_talking.ogg" -dest_files=["res://.godot/imported/iris_talking.ogg-e197f63669b871b7fba645862ffe301f.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/assets/audio/sfx/iteract.ogg.import b/assets/audio/sfx/iteract.ogg.import deleted file mode 100644 index 9a61ab0..0000000 --- a/assets/audio/sfx/iteract.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://bktodk0h2u1xo" -path="res://.godot/imported/iteract.ogg-f044ddc2b67a412af49013948df738f1.oggvorbisstr" - -[deps] - -source_file="res://assets/audio/sfx/iteract.ogg" -dest_files=["res://.godot/imported/iteract.ogg-f044ddc2b67a412af49013948df738f1.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/assets/audio/sfx/robot_talking.ogg b/assets/audio/sfx/robot_talking.ogg deleted file mode 100644 index fd8f76d..0000000 Binary files a/assets/audio/sfx/robot_talking.ogg and /dev/null differ diff --git a/assets/audio/sfx/robot_talking.ogg.import b/assets/audio/sfx/robot_talking.ogg.import deleted file mode 100644 index 4d476a8..0000000 --- a/assets/audio/sfx/robot_talking.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://r3c2gy6p43jm" -path="res://.godot/imported/robot_talking.ogg-f1f0839274a4e042af26aaa250a3a3ca.oggvorbisstr" - -[deps] - -source_file="res://assets/audio/sfx/robot_talking.ogg" -dest_files=["res://.godot/imported/robot_talking.ogg-f1f0839274a4e042af26aaa250a3a3ca.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/assets/audio/sfx/vrac_talking.ogg b/assets/audio/sfx/vrac_talking.ogg deleted file mode 100644 index 0cc6bea..0000000 Binary files a/assets/audio/sfx/vrac_talking.ogg and /dev/null differ diff --git a/assets/audio/sfx/vrac_talking.ogg.import b/assets/audio/sfx/vrac_talking.ogg.import deleted file mode 100644 index 58dab86..0000000 --- a/assets/audio/sfx/vrac_talking.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://dqinbgakcsurb" -path="res://.godot/imported/vrac_talking.ogg-64f29aedf2762b353d66c764f25377e6.oggvorbisstr" - -[deps] - -source_file="res://assets/audio/sfx/vrac_talking.ogg" -dest_files=["res://.godot/imported/vrac_talking.ogg-64f29aedf2762b353d66c764f25377e6.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/autoloads/audio_manager.gd b/autoloads/audio_manager.gd index 38bd492..20b3116 100644 --- a/autoloads/audio_manager.gd +++ b/autoloads/audio_manager.gd @@ -12,13 +12,10 @@ const AMBIANCES := { } const SFX := { - "footstep": preload("res://assets/audio/sfx/footsteps.ogg"), "item_pickup": preload("res://assets/audio/sfx/item_pickup.ogg"), - "interact": preload("res://assets/audio/sfx/iteract.ogg"), + "interact": preload("res://assets/audio/sfx/interact.ogg"), "door_unlock": preload("res://assets/audio/sfx/door_unlocking.ogg"), "repair_success": preload("res://assets/audio/sfx/succesful_repair.ogg"), - "vrac_talking": preload("res://assets/audio/sfx/vrac_talking.ogg"), - "iris_talking": preload("res://assets/audio/sfx/iris_talking.ogg"), } func _ready() -> void: diff --git a/entities/items/circuit/circuit.gd b/entities/items/circuit/circuit.gd index 6af6582..cd03385 100644 --- a/entities/items/circuit/circuit.gd +++ b/entities/items/circuit/circuit.gd @@ -2,10 +2,14 @@ class_name Circuit extends Area2D @export var item_id : String = "circuit" -@export var item_name : String = "Circui" +@export var item_name : String = "Circuit" @export var prompt_text : String = "[E] Take" func interact() -> void: GameState.add_item(item_id) print("Ramassé : ", item_name) + AudioManager.play_sfx("item_pickup") + var hud := get_tree().get_first_node_in_group("hud") + if hud and hud.has_method("show_log"): + hud.show_log("LOG %s picked up. Inventory updated." % item_id) queue_free() # supprime l'item de la scène diff --git a/entities/items/engrenage/engrenage.gd b/entities/items/engrenage/engrenage.gd index c82518a..3db7ccc 100644 --- a/entities/items/engrenage/engrenage.gd +++ b/entities/items/engrenage/engrenage.gd @@ -1,7 +1,7 @@ extends Area2D @export var item_id : String = "engrenage" -@export var item_name : String = "Engrenage" +@export var item_name : String = "Gear" @export var prompt_text : String = "[E] Take" func interact() -> void: diff --git a/entities/items/item.gd b/entities/items/item.gd index d12ae67..3f696a7 100644 --- a/entities/items/item.gd +++ b/entities/items/item.gd @@ -7,6 +7,7 @@ extends Area2D func interact() -> void: GameState.add_item(item_id) + AudioManager.play_sfx("item_pickup") var hud := get_tree().get_first_node_in_group("hud") if hud and hud.has_method("show_log"): hud.show_log("LOG %s picked up. Inventory updated." % item_id) diff --git a/entities/npcs/iris3/iris3.gd b/entities/npcs/iris3/iris3.gd index 557f1b2..41592d0 100644 --- a/entities/npcs/iris3/iris3.gd +++ b/entities/npcs/iris3/iris3.gd @@ -53,7 +53,8 @@ func interact() -> void: var dialogue_box := get_tree().get_first_node_in_group("dialogue_box") if not dialogue_box: return - + + AudioManager.play_sfx("interact") if GameState.get_flag("iris3_repaired"): dialogue_box.start(DIALOGUE_AFTER_REPAIR) return @@ -63,7 +64,7 @@ func interact() -> void: GameState.set_flag("iris3_met", true) dialogue_box.start(dlg) return - + dialogue_box.start(DIALOGUE_HAS_ITEM) dialogue_box.dialogue_finished.connect(_start_minigame, CONNECT_ONE_SHOT) @@ -154,7 +155,7 @@ func _show_choice() -> void: hbox.alignment = BoxContainer.ALIGNMENT_CENTER vbox.add_child(hbox) - var btn_partir := _make_button("Leave →", Color("#F0C87A")) + var btn_partir := _make_button("Leave ->", Color("#F0C87A")) var btn_rester := _make_button("Stay", Color("#7BD4C4")) hbox.add_child(btn_partir) hbox.add_child(btn_rester) diff --git a/entities/npcs/vrac7/vrac7.gd b/entities/npcs/vrac7/vrac7.gd index 3bd7540..10f9939 100644 --- a/entities/npcs/vrac7/vrac7.gd +++ b/entities/npcs/vrac7/vrac7.gd @@ -68,6 +68,7 @@ func interact() -> void: if not dialogue_box: return + AudioManager.play_sfx("interact") # État 1 — Déjà réparé, joueur revient après avoir visité l'atelier if GameState.get_flag("vrac7_repaired") and GameState.get_flag("visited_atelier"): dialogue_box.start(DIALOGUE_AFTER_ATELIER) @@ -91,6 +92,7 @@ func interact() -> void: return # État 5 — Revient sans les items + dialogue_box.start(DIALOGUE_MISSING_ITEMS) # ── Mini-jeu ────────────────────────────────────────────────────────────────── diff --git a/levels/atelier/panel.gd b/levels/atelier/panel.gd index ef47745..45f0f73 100644 --- a/levels/atelier/panel.gd +++ b/levels/atelier/panel.gd @@ -28,6 +28,7 @@ func interact() -> void: var dialogue_box := get_tree().get_first_node_in_group("dialogue_box") print("dialogue_box trouvé : ", dialogue_box) + AudioManager.play_sfx("interact") if dialogue_box: print("Lancement dialogue avec : ", DIALOGUE) dialogue_box.start(DIALOGUE) diff --git a/levels/atelier/repair_station.gd b/levels/atelier/repair_station.gd index 6bc56d9..04aad35 100644 --- a/levels/atelier/repair_station.gd +++ b/levels/atelier/repair_station.gd @@ -39,6 +39,7 @@ func interact() -> void: if not dialogue_box: return + AudioManager.play_sfx("interact") # Déjà réparé if GameState.get_flag("scrap09_repaired"): return diff --git a/levels/credits.gd b/levels/credits.gd index 0b2344c..275be13 100644 --- a/levels/credits.gd +++ b/levels/credits.gd @@ -17,7 +17,7 @@ const CREDITS: Array[String] = [ "", "", "TOOLS", - "Godot 4.6 • Aseprite • Bandlab • Pixel Studio", + "Godot 4.6 - Aseprite - Bandlab - Pixel Studio", "", "", "Thank you for playing.", diff --git a/levels/entrepot/door.gd b/levels/entrepot/door.gd index c76247e..9870ba9 100644 --- a/levels/entrepot/door.gd +++ b/levels/entrepot/door.gd @@ -20,3 +20,5 @@ func _update_state(is_open: bool) -> void: collision.disabled = is_open sprite.texture = open_sprite if is_open else locked_sprite + if sprite.texture == open_sprite: + AudioManager.play_sfx("door_unlock") diff --git a/levels/journal.gd b/levels/journal.gd index 19a06f6..b5a2422 100644 --- a/levels/journal.gd +++ b/levels/journal.gd @@ -26,6 +26,7 @@ func interact() -> void: var dialogue_box := get_tree().get_first_node_in_group("dialogue_box") print("dialogue_box trouvé : ", dialogue_box) + AudioManager.play_sfx("interact") if dialogue_box: print("Lancement dialogue avec : ", DIALOGUE) dialogue_box.start(DIALOGUE) diff --git a/ui/dialogue_box.tscn b/ui/dialogue_box.tscn index 4967334..dd8a438 100644 --- a/ui/dialogue_box.tscn +++ b/ui/dialogue_box.tscn @@ -53,6 +53,6 @@ fit_content = true visible = false layout_mode = 2 theme_override_font_sizes/font_size = 6 -text = "▼" +text = "v" horizontal_alignment = 2 vertical_alignment = 2 diff --git a/ui/minigame/repair_minigame.gd b/ui/minigame/repair_minigame.gd index 6829da8..9b3f62d 100644 --- a/ui/minigame/repair_minigame.gd +++ b/ui/minigame/repair_minigame.gd @@ -169,7 +169,7 @@ func _refresh_grid() -> void: if cell in paths[i]: var c := _color_for_path(i) var is_endpoint := (col == 0 or col == 3) - btn.text = "●" if is_endpoint else "■" + btn.text = "O" if is_endpoint else "+" btn.modulate = Color.WHITE btn.add_theme_stylebox_override("normal", _make_stylebox(c, 0.5)) btn.add_theme_color_override("font_color", c) @@ -184,11 +184,10 @@ func _refresh_grid() -> void: var ei = _entry_for_row(row) var xi = _exit_for_row(row) if col == 0 and ei >= 0: - btn.text = "●" + btn.text = "O" btn.add_theme_color_override("font_color", _color_for_path(ei)) elif col == 3 and xi >= 0: - btn.text = "●" - btn.add_theme_color_override("font_color", _color_for_path(xi)) + btn.text = "O" func _update_status() -> void: var count := solved_paths.count(true)