Author SHA1 Message Date
Nilou 0ef5b94651 suppression des ambiances de camion #99 2025-11-22 12:41:52 +01:00
Nilou 278277488e ajout du sample de recharge #51 2025-11-17 21:20:39 +01:00
Nilou 9c79bd8700 ajout du morceau de phase 4 #7 2025-11-17 20:34:03 +01:00
Nilou ba44506ef3 dernières modifications des morceaux #7 2025-11-16 22:25:06 +01:00
Nilou 58fc3f73f9 nouveau format des pistes d'ambiance #77 #99 2025-11-16 21:13:09 +01:00
Nilou b03b199b4b ajout des nouveaux morceaux #7 2025-11-16 19:54:41 +01:00
52 changed files with 69 additions and 405 deletions
-1
View File
@@ -15,7 +15,6 @@ Molette : Changer l'objet en main
X : Lâcher lobjet"
STORY,Story,Histoire
OK,Ok,Ok
GARDEN,Garden,Jardin
COMMA,", ",","
OR," or "," ou "
PAUSE,Pause,Pause
1 keys en fr
15 TAKE PACKAGE Take Crate Prendre Caisse de matériel
16 PACKAGE DESCRIPTION Crate Description Caisse de matériel Description
17 DESCRIPTION USE Description Use Description Utiliser
USE Use Utiliser
18 ON_MATURE On maturation Une fois mature
19 WHEN_HARVESTED When harvested A la récolte
20 EACH_DAY_WHEN_MATURE Each day, when mature, Chaque jour, après maturation,
+3 -3
View File
@@ -6,10 +6,10 @@ uid="uid://dfymfpql8yxwt"
[deps]
files=["res://translation/localization.en.translation", "res://translation/localization.fr.translation"]
files=["res://Translation/localization.en.translation", "res://Translation/localization.fr.translation"]
source_file="res://translation/localization.csv"
dest_files=["res://translation/localization.en.translation", "res://translation/localization.fr.translation"]
source_file="res://Translation/localization.csv"
dest_files=["res://Translation/localization.en.translation", "res://Translation/localization.fr.translation"]
[params]
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,19 +0,0 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://gjr7ruv7wfci"
path="res://.godot/imported/truck_ambience_phase_1.ogg-68cfb99a7f0a6b83abe32ff81d60f6ab.oggvorbisstr"
[deps]
source_file="res://common/music/assets/ambiance/truck_ambience_phase_1.ogg"
dest_files=["res://.godot/imported/truck_ambience_phase_1.ogg-68cfb99a7f0a6b83abe32ff81d60f6ab.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
@@ -1,19 +0,0 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://car7b6j0ihi30"
path="res://.godot/imported/truck_ambience_phase_2.ogg-e62a693ce667406e511b7afb0da84f79.oggvorbisstr"
[deps]
source_file="res://common/music/assets/ambiance/truck_ambience_phase_2.ogg"
dest_files=["res://.godot/imported/truck_ambience_phase_2.ogg-e62a693ce667406e511b7afb0da84f79.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
@@ -1,19 +0,0 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://dtcv4p3a03giu"
path="res://.godot/imported/truck_ambience_phase_3.ogg-9e9b82ea556ea85244bd2768bddbb340.oggvorbisstr"
[deps]
source_file="res://common/music/assets/ambiance/truck_ambience_phase_3.ogg"
dest_files=["res://.godot/imported/truck_ambience_phase_3.ogg-9e9b82ea556ea85244bd2768bddbb340.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
Binary file not shown.
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://clmnyg60wkdtq"
path="res://.godot/imported/bass_champ_arpeggio.wav-eefc85ecfb6e683cb056991c07a5882b.sample"
[deps]
source_file="res://common/music/assets/arpeges/bass_champ_arpeggio.wav"
dest_files=["res://.godot/imported/bass_champ_arpeggio.wav-eefc85ecfb6e683cb056991c07a5882b.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
Binary file not shown.
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://ceua3yhrecmwm"
path="res://.godot/imported/bass_chardi_arpeggio.wav-72420c7b155fad5db1f5667a4bfed73c.sample"
[deps]
source_file="res://common/music/assets/arpeges/bass_chardi_arpeggio.wav"
dest_files=["res://.godot/imported/bass_chardi_arpeggio.wav-72420c7b155fad5db1f5667a4bfed73c.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
Binary file not shown.
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://cjj28vtc1qskx"
path="res://.godot/imported/bass_maia_arpeggio.wav-042581fd552e8b60b8738ab60c5153f4.sample"
[deps]
source_file="res://common/music/assets/arpeges/bass_maia_arpeggio.wav"
dest_files=["res://.godot/imported/bass_maia_arpeggio.wav-042581fd552e8b60b8738ab60c5153f4.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
Binary file not shown.
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://cc6sax3jlhyas"
path="res://.godot/imported/bass_pili_arpeggio.wav-4401cd5fed95421e277c9ae5ba950192.sample"
[deps]
source_file="res://common/music/assets/arpeges/bass_pili_arpeggio.wav"
dest_files=["res://.godot/imported/bass_pili_arpeggio.wav-4401cd5fed95421e277c9ae5ba950192.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://dh7peiybu2d1i"
path="res://.godot/imported/melodic_champ_arpeggio.wav-f51dd6e765d9612ccf4555e660cc9d60.sample"
[deps]
source_file="res://common/music/assets/arpeges/melodic_champ_arpeggio.wav"
dest_files=["res://.godot/imported/melodic_champ_arpeggio.wav-f51dd6e765d9612ccf4555e660cc9d60.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://dwsrruj5pqadi"
path="res://.godot/imported/melodic_chardi_arpeggio.wav-591eae71ac0a68cd05aa804a988dacf1.sample"
[deps]
source_file="res://common/music/assets/arpeges/melodic_chardi_arpeggio.wav"
dest_files=["res://.godot/imported/melodic_chardi_arpeggio.wav-591eae71ac0a68cd05aa804a988dacf1.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://c4lmd1t2kn7lu"
path="res://.godot/imported/melodic_maia_arpeggio.wav-d55d26a1120794aa6ce59f0df8b63f81.sample"
[deps]
source_file="res://common/music/assets/arpeges/melodic_maia_arpeggio.wav"
dest_files=["res://.godot/imported/melodic_maia_arpeggio.wav-d55d26a1120794aa6ce59f0df8b63f81.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://18ov4d3r2wru"
path="res://.godot/imported/melodic_pili_arpeggio.wav-7acad74938f412860bb19b24566beef3.sample"
[deps]
source_file="res://common/music/assets/arpeges/melodic_pili_arpeggio.wav"
dest_files=["res://.godot/imported/melodic_pili_arpeggio.wav-7acad74938f412860bb19b24566beef3.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://dmdr13bdsk6up"
path="res://.godot/imported/rythmic_champ_arpeggio.wav-db92c2bba77e4832cf2facc59860f8ae.sample"
[deps]
source_file="res://common/music/assets/arpeges/rythmic_champ_arpeggio.wav"
dest_files=["res://.godot/imported/rythmic_champ_arpeggio.wav-db92c2bba77e4832cf2facc59860f8ae.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://dwpspwd6bnxm6"
path="res://.godot/imported/rythmic_chardi_arpeggio.wav-70af61051727e79d8f7b217950428d65.sample"
[deps]
source_file="res://common/music/assets/arpeges/rythmic_chardi_arpeggio.wav"
dest_files=["res://.godot/imported/rythmic_chardi_arpeggio.wav-70af61051727e79d8f7b217950428d65.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://ilinwxk13d30"
path="res://.godot/imported/rythmic_maia_arpeggio.wav-d601bf458d9a1476f6ba913f1e918a91.sample"
[deps]
source_file="res://common/music/assets/arpeges/rythmic_maia_arpeggio.wav"
dest_files=["res://.godot/imported/rythmic_maia_arpeggio.wav-d601bf458d9a1476f6ba913f1e918a91.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
@@ -1,24 +0,0 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://dbv61dwqx82qk"
path="res://.godot/imported/rythmic_pili_arpeggio.wav-8a302b14f9e3981daf9642815a95a994.sample"
[deps]
source_file="res://common/music/assets/arpeges/rythmic_pili_arpeggio.wav"
dest_files=["res://.godot/imported/rythmic_pili_arpeggio.wav-8a302b14f9e3981daf9642815a95a994.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
Binary file not shown.
@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/forest_phase_1.ogg-6bf54bf177c3c359a54aab9723
[params]
loop=true
loop=false
loop_offset=0.0
bpm=0.0
beat_count=0
Binary file not shown.
@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/forest_phase_2.ogg-0fc72a5b1a0f8f7e98246db80e
[params]
loop=true
loop=false
loop_offset=0.0
bpm=0.0
beat_count=0
Binary file not shown.
@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/forest_phase_3.ogg-55f42a1f5a8a4849a773f18490
[params]
loop=true
loop=false
loop_offset=0.0
bpm=0.0
beat_count=0
Binary file not shown.
@@ -0,0 +1,19 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://bujnhms77eyha"
path="res://.godot/imported/forest_phase_4.ogg-797ea0a17aecbe5b6044051bebd8e1dc.oggvorbisstr"
[deps]
source_file="res://common/music/assets/morceaux/forest_phase_4.ogg"
dest_files=["res://.godot/imported/forest_phase_4.ogg-797ea0a17aecbe5b6044051bebd8e1dc.oggvorbisstr"]
[params]
loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file not shown.
@@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://ckr8s80dqyo12"
path="res://.godot/imported/recharge.wav-aa73ba3e05aa83c0276eddf40b50b0ae.sample"
[deps]
source_file="res://common/music/assets/morceaux/recharge.wav"
dest_files=["res://.godot/imported/recharge.wav-aa73ba3e05aa83c0276eddf40b50b0ae.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2
+11 -10
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=12 format=3 uid="uid://b6hscxcrj065q"]
[gd_scene load_steps=13 format=3 uid="uid://b6hscxcrj065q"]
[ext_resource type="Script" uid="uid://2p5d6vogtn82" path="res://common/music/scripts/music.gd" id="1_ji160"]
[ext_resource type="AudioStream" uid="uid://diyefcv8tqa3r" path="res://common/music/assets/morceaux/forest_phase_1.ogg" id="1_stre8"]
@@ -8,6 +8,7 @@
[ext_resource type="AudioStream" uid="uid://dftxjfdqgsbd3" path="res://common/music/assets/ambiance/ambiance_phase_3.ogg" id="6_i5lxw"]
[ext_resource type="AudioStream" uid="uid://brtjlgjqnrvcb" path="res://common/music/assets/morceaux/truck_music.ogg" id="7_a71a3"]
[ext_resource type="AudioStream" uid="uid://d4lqhgf0lhgge" path="res://common/music/assets/morceaux/forest_phase_3.ogg" id="7_i5lxw"]
[ext_resource type="AudioStream" uid="uid://bujnhms77eyha" path="res://common/music/assets/morceaux/forest_phase_4.ogg" id="8_i0tje"]
[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_i5lxw"]
stream_count = 3
@@ -18,14 +19,13 @@ stream_1/volume = -60.0
stream_2/stream = ExtResource("6_i5lxw")
stream_2/volume = -60.0
[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_i0tje"]
stream_count = 3
stream_0/stream = ExtResource("1_stre8")
stream_0/volume = -60.0
stream_1/stream = ExtResource("2_ji160")
stream_1/volume = -60.0
stream_2/stream = ExtResource("7_i5lxw")
stream_2/volume = -60.0
[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_i5lxw"]
loop = false
stream_count = 4
stream_0 = ExtResource("1_stre8")
stream_1 = ExtResource("2_ji160")
stream_2 = ExtResource("7_i5lxw")
stream_3 = ExtResource("8_i0tje")
[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_w0e2r"]
stream_count = 1
@@ -53,7 +53,8 @@ unique_name_in_owner = true
[node name="Planet" type="AudioStreamPlayer" parent="Musics"]
unique_name_in_owner = true
stream = SubResource("AudioStreamSynchronized_i0tje")
stream = SubResource("AudioStreamPlaylist_i5lxw")
volume_db = -3.0
autoplay = true
[node name="Truck" type="AudioStreamPlayer" parent="Musics"]
@@ -1,19 +0,0 @@
extends InGameIndicator
class_name InGameBaseIndicator
@export var player : Player
# Called when the node enters the scene tree for the first time.
func _ready():
setup(tr("GARDEN"))
print(GameInfo.game_data.current_planet_data.garden_size/2)
follow_game_position(GameInfo.game_data.current_planet_data.garden_size/2)
func _process(_delta):
visible = player and (
player.global_position.x < 0
or player.global_position.x > GameInfo.game_data.current_planet_data.garden_size.x
or player.global_position.y < 0
or player.global_position.y > GameInfo.game_data.current_planet_data.garden_size.y
)
update()
@@ -1 +0,0 @@
uid://ds7ej47i3wsym
@@ -33,9 +33,7 @@ func follow_entity(entity : Node2D):
func _process(_d):
show()
update()
func update():
var camera = get_viewport().get_camera_2d()
var screen_size = get_viewport().get_visible_rect().size
+2 -2
View File
@@ -13,8 +13,8 @@ var indicators : Array[InGameIndicator]
TakeSeedStep.new(),
PlantSeedStep.new(),
RechargeStep.new(),
# WaitMaturePlant.new(),
# HarvestMaturePlant.new(),
WaitMaturePlant.new(),
HarvestMaturePlant.new(),
]
var actual_step : Step = null : set = pass_to_step
+7 -17
View File
@@ -1,12 +1,10 @@
[gd_scene load_steps=12 format=3 uid="uid://d28cp7a21kwou"]
[gd_scene load_steps=10 format=3 uid="uid://d28cp7a21kwou"]
[ext_resource type="PackedScene" uid="uid://12nak7amd1uq" path="res://gui/game/game_gui.tscn" id="1_yy1uy"]
[ext_resource type="PackedScene" uid="uid://v41hfc7haaye" path="res://gui/game/win/win.tscn" id="3_6guxm"]
[ext_resource type="PackedScene" uid="uid://doxm7uab8i3tq" path="res://gui/game/quota_reward/quota_reward.tscn" id="4_fbkgs"]
[ext_resource type="PackedScene" uid="uid://bgvbgeq46wee2" path="res://entities/player/player.tscn" id="4_g33f4"]
[ext_resource type="PackedScene" uid="uid://fh3dsuvn5h78" path="res://gui/game/tutorial/in_game_indicator/in_game_indicator.tscn" id="5_gisiu"]
[ext_resource type="PackedScene" uid="uid://dt6mptqg80dew" path="res://gui/game/tutorial/tutorial.tscn" id="5_orelw"]
[ext_resource type="Script" uid="uid://ds7ej47i3wsym" path="res://gui/game/tutorial/in_game_indicator/scripts/in_game_base_indicator.gd" id="6_cnjsq"]
[ext_resource type="PackedScene" uid="uid://tsi5j1uxppa4" path="res://stages/terrain/planet/planet.tscn" id="8_t31p7"]
[ext_resource type="PackedScene" uid="uid://cg1visg52i21a" path="res://entities/interactables/truck/ladder/truck_ladder.tscn" id="9_gisiu"]
[ext_resource type="PackedScene" uid="uid://d324mlmgls4fs" path="res://entities/interactables/truck/recharge/truck_recharge.tscn" id="10_cnjsq"]
@@ -17,12 +15,12 @@
[node name="Reward" parent="." instance=ExtResource("4_fbkgs")]
layer = 2
[node name="RootGui" parent="." node_paths=PackedStringArray("quota_reward") instance=ExtResource("1_yy1uy")]
quota_reward = NodePath("../Reward")
metadata/_edit_use_anchors_ = true
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="RootGui" parent="CanvasLayer" node_paths=PackedStringArray("quota_reward") instance=ExtResource("1_yy1uy")]
quota_reward = NodePath("../../Reward")
metadata/_edit_use_anchors_ = true
[node name="Win" parent="CanvasLayer" instance=ExtResource("3_6guxm")]
visible = false
@@ -30,14 +28,6 @@ visible = false
player = NodePath("../../Entities/Player")
planet = NodePath("../../Planet")
[node name="BaseIndicator" parent="CanvasLayer" node_paths=PackedStringArray("player") instance=ExtResource("5_gisiu")]
visible = false
offset_bottom = 91.0
size_flags_horizontal = 4
size_flags_vertical = 4
script = ExtResource("6_cnjsq")
player = NodePath("../../Entities/Player")
[node name="Entities" type="Node2D" parent="."]
y_sort_enabled = true
@@ -60,5 +50,5 @@ position = Vector2(2.22, 0)
following = NodePath("../Entities/Player")
[connection signal="day_limit_exceed" from="Planet" to="CanvasLayer/Win" method="_on_planet_day_limit_exceed"]
[connection signal="pass_day_ended" from="Planet" to="RootGui" method="_on_planet_pass_day_ended"]
[connection signal="pass_day_started" from="Planet" to="RootGui" method="_on_planet_pass_day_started"]
[connection signal="pass_day_ended" from="Planet" to="CanvasLayer/RootGui" method="_on_planet_pass_day_ended"]
[connection signal="pass_day_started" from="Planet" to="CanvasLayer/RootGui" method="_on_planet_pass_day_started"]
-2
View File
@@ -66,7 +66,6 @@ func plant(
)
plants.append(new_plant)
planet_data.score_by_plant.append(0)
new_plant.harvested.connect(_on_plant_harvested)
new_plant.state_changed.connect(_on_plant_state_changed)
return new_plant
@@ -81,7 +80,6 @@ func remove_plant(p: Plant):
var id = plants.find(p)
if id >= 0:
plants.remove_at(id)
planet_data.score_by_plant.remove_at(id)
update_garden_score()