diff --git a/entities/plants/resources/plants/default.tres b/entities/plants/resources/plants/default.tres index 94b7522..55de1f9 100644 --- a/entities/plants/resources/plants/default.tres +++ b/entities/plants/resources/plants/default.tres @@ -1,8 +1,8 @@ -[gd_resource type="Resource" script_class="PlantType" load_steps=7 format=3 uid="uid://dmbu538b3utec"] +[gd_resource type="Resource" script_class="PlantType" load_steps=7 format=3 uid="uid://b04vho33bl52b"] [ext_resource type="Texture2D" uid="uid://c7mp7tkkkk6o5" path="res://entities/plants/assets/sprites/default/growing.png" id="1_fp5j6"] -[ext_resource type="Script" uid="uid://jnye5pe1bgqw" path="res://entities/plants/scripts/plant_type.gd" id="1_moyj3"] -[ext_resource type="Script" uid="uid://cgscbuxe4dawb" path="res://entities/plants/scripts/plant_effects/decontaminate_terrain_effect.gd" id="2_cky1j"] +[ext_resource type="Script" path="res://entities/plants/scripts/plant_type.gd" id="1_moyj3"] +[ext_resource type="Script" path="res://entities/plants/scripts/plant_effects/decontaminate_terrain_effect.gd" id="2_cky1j"] [ext_resource type="Texture2D" uid="uid://bupl1y0cfj21q" path="res://entities/plants/assets/sprites/default/mature.png" id="3_ffarr"] [ext_resource type="Texture2D" uid="uid://ba413oun7ry78" path="res://entities/plants/assets/sprites/default/planted.png" id="4_2s6re"] @@ -13,6 +13,7 @@ metadata/_custom_type_script = "uid://cgscbuxe4dawb" [resource] script = ExtResource("1_moyj3") +name = "" growing_time = 2 planted_texture = ExtResource("4_2s6re") growing_texture = ExtResource("1_fp5j6") diff --git a/entities/player/player.tscn b/entities/player/player.tscn index 65e6a31..9f5d5a1 100644 --- a/entities/player/player.tscn +++ b/entities/player/player.tscn @@ -1,7 +1,20 @@ -[gd_scene load_steps=5 format=3 uid="uid://bgvbgeq46wee2"] +[gd_scene load_steps=22 format=3 uid="uid://bgvbgeq46wee2"] [ext_resource type="Script" uid="uid://das7twcy5153p" path="res://entities/player/scripts/player.gd" id="1_abrql"] [ext_resource type="Texture2D" uid="uid://c7ff87jniga5m" path="res://entities/player/assets/sprites/robot.png" id="1_symyc"] +[ext_resource type="AudioStream" uid="uid://dfrp66a4isnt6" path="res://entities/player/sounds/dig/dig_1.wav" id="3_gx6sm"] +[ext_resource type="AudioStream" uid="uid://bdxkvaciw4mb3" path="res://entities/player/sounds/dig/dig_2.wav" id="4_yqrof"] +[ext_resource type="AudioStream" uid="uid://llxrlwfccywb" path="res://entities/player/sounds/dig/dig_3.wav" id="5_3wlsy"] +[ext_resource type="AudioStream" uid="uid://6qmm1lmkft13" path="res://entities/player/sounds/harvest/harvest_1.wav" id="6_b2kln"] +[ext_resource type="AudioStream" uid="uid://cfwqjs2koxyi8" path="res://entities/player/sounds/harvest/harvest_2.wav" id="7_we0b7"] +[ext_resource type="AudioStream" uid="uid://xiif55xgsoxs" path="res://entities/player/sounds/harvest/harvest_3.wav" id="8_mtric"] +[ext_resource type="AudioStream" uid="uid://bc803023sso65" path="res://entities/player/sounds/harvest/harvest_4.wav" id="9_eyb6c"] +[ext_resource type="AudioStream" uid="uid://bv65uncyiu3dc" path="res://entities/player/sounds/harvest/harvest_5.wav" id="10_221hk"] +[ext_resource type="AudioStream" uid="uid://b0hxscxlo241f" path="res://entities/player/sounds/harvest/harvest_6.wav" id="11_ghoj8"] +[ext_resource type="AudioStream" uid="uid://bkitf5nhaa36p" path="res://entities/player/sounds/pick_up/pick_up_1.wav" id="12_t1t22"] +[ext_resource type="AudioStream" uid="uid://dx58x1sg61mrv" path="res://entities/player/sounds/pick_up/pick_up_2.wav" id="13_50fht"] +[ext_resource type="AudioStream" uid="uid://c0fw77uiiwnfb" path="res://entities/player/sounds/pick_up/pick_up_3.wav" id="14_wuv6x"] +[ext_resource type="AudioStream" uid="uid://b4sxly5jsvlkr" path="res://entities/player/sounds/movement/movement.wav" id="15_qpopc"] [sub_resource type="CircleShape2D" id="CircleShape2D_sglur"] radius = 27.0 @@ -9,6 +22,35 @@ radius = 27.0 [sub_resource type="CircleShape2D" id="CircleShape2D_abrql"] radius = 40.0 +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_wq0jh"] +random_pitch = 1.5 +streams_count = 3 +stream_0/stream = ExtResource("3_gx6sm") +stream_1/stream = ExtResource("4_yqrof") +stream_2/stream = ExtResource("5_3wlsy") + +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_gt4e4"] +random_pitch = 1.5 +streams_count = 6 +stream_0/stream = ExtResource("6_b2kln") +stream_1/stream = ExtResource("7_we0b7") +stream_2/stream = ExtResource("8_mtric") +stream_3/stream = ExtResource("9_eyb6c") +stream_4/stream = ExtResource("10_221hk") +stream_5/stream = ExtResource("11_ghoj8") + +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_24ehl"] +random_pitch = 1.5 +streams_count = 3 +stream_0/stream = ExtResource("12_t1t22") +stream_1/stream = ExtResource("13_50fht") +stream_2/stream = ExtResource("14_wuv6x") + +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_bwdx1"] +random_pitch = 1.5 +streams_count = 1 +stream_0/stream = ExtResource("15_qpopc") + [node name="Player" type="CharacterBody2D"] script = ExtResource("1_abrql") @@ -26,3 +68,17 @@ position = Vector2(0, -14) [node name="CollisionShape2D" type="CollisionShape2D" parent="InteractArea2D"] shape = SubResource("CircleShape2D_abrql") + +[node name="Audio" type="Node2D" parent="."] + +[node name="AudioStreamPlayer_dig" type="AudioStreamPlayer" parent="Audio"] +stream = SubResource("AudioStreamRandomizer_wq0jh") + +[node name="AudioStreamPlayer_harvest" type="AudioStreamPlayer" parent="Audio"] +stream = SubResource("AudioStreamRandomizer_gt4e4") + +[node name="AudioStreamPlayer_pick_up" type="AudioStreamPlayer" parent="Audio"] +stream = SubResource("AudioStreamRandomizer_24ehl") + +[node name="AudioStreamPlayer_movement" type="AudioStreamPlayer" parent="Audio"] +stream = SubResource("AudioStreamRandomizer_bwdx1") diff --git a/entities/player/scripts/player.gd b/entities/player/scripts/player.gd index 8e81655..6cf236f 100644 --- a/entities/player/scripts/player.gd +++ b/entities/player/scripts/player.gd @@ -37,6 +37,7 @@ func _on_inventory_updated(_inventory: Inventory): func get_input(): if controlling_player: + var old_velocity=velocity calculate_direction() if Input.is_action_just_pressed("action") and energy > 0: @@ -46,6 +47,8 @@ func get_input(): if Input.is_action_just_pressed("drop") and inventory.lenght() > 0: var item_to_drop = inventory.pop_item() planet.drop_item(item_to_drop, global_position) + if old_velocity.length()==0 and velocity.length()!=0: + $Audio/AudioStreamPlayer_movement.play() func calculate_direction(): var input_direction: Vector2 = Input.get_vector("move_left", "move_right", "move_up", "move_down") diff --git a/entities/player/sounds/dig_1.wav b/entities/player/sounds/dig/dig_1.wav similarity index 100% rename from entities/player/sounds/dig_1.wav rename to entities/player/sounds/dig/dig_1.wav diff --git a/entities/player/sounds/dig_1.wav.import b/entities/player/sounds/dig/dig_1.wav.import similarity index 55% rename from entities/player/sounds/dig_1.wav.import rename to entities/player/sounds/dig/dig_1.wav.import index f13a1d2..6acf7e5 100644 --- a/entities/player/sounds/dig_1.wav.import +++ b/entities/player/sounds/dig/dig_1.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://dfrp66a4isnt6" -path="res://.godot/imported/dig_1.wav-7ad072dab09b362a7e8becc6a8e9d649.sample" +path="res://.godot/imported/dig_1.wav-76555a8720a69a7ba42f82311d7beaf8.sample" [deps] -source_file="res://entities/player/sounds/dig_1.wav" -dest_files=["res://.godot/imported/dig_1.wav-7ad072dab09b362a7e8becc6a8e9d649.sample"] +source_file="res://entities/player/sounds/dig/dig_1.wav" +dest_files=["res://.godot/imported/dig_1.wav-76555a8720a69a7ba42f82311d7beaf8.sample"] [params] diff --git a/entities/player/sounds/dig_2.wav b/entities/player/sounds/dig/dig_2.wav similarity index 100% rename from entities/player/sounds/dig_2.wav rename to entities/player/sounds/dig/dig_2.wav diff --git a/entities/player/sounds/dig_2.wav.import b/entities/player/sounds/dig/dig_2.wav.import similarity index 55% rename from entities/player/sounds/dig_2.wav.import rename to entities/player/sounds/dig/dig_2.wav.import index 413f268..4b96c3c 100644 --- a/entities/player/sounds/dig_2.wav.import +++ b/entities/player/sounds/dig/dig_2.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://bdxkvaciw4mb3" -path="res://.godot/imported/dig_2.wav-2f707145e043039106f8e3bee1ed8e77.sample" +path="res://.godot/imported/dig_2.wav-4085353199cf7c47c8a581183b92f4a4.sample" [deps] -source_file="res://entities/player/sounds/dig_2.wav" -dest_files=["res://.godot/imported/dig_2.wav-2f707145e043039106f8e3bee1ed8e77.sample"] +source_file="res://entities/player/sounds/dig/dig_2.wav" +dest_files=["res://.godot/imported/dig_2.wav-4085353199cf7c47c8a581183b92f4a4.sample"] [params] diff --git a/entities/player/sounds/dig_3.wav b/entities/player/sounds/dig/dig_3.wav similarity index 100% rename from entities/player/sounds/dig_3.wav rename to entities/player/sounds/dig/dig_3.wav diff --git a/entities/player/sounds/dig_3.wav.import b/entities/player/sounds/dig/dig_3.wav.import similarity index 55% rename from entities/player/sounds/dig_3.wav.import rename to entities/player/sounds/dig/dig_3.wav.import index 3326ad8..efb8f12 100644 --- a/entities/player/sounds/dig_3.wav.import +++ b/entities/player/sounds/dig/dig_3.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://llxrlwfccywb" -path="res://.godot/imported/dig_3.wav-e440fc7357505855b3b56d72821d8a95.sample" +path="res://.godot/imported/dig_3.wav-0c0bb89a725edb73ca5a10e31a6cc9ce.sample" [deps] -source_file="res://entities/player/sounds/dig_3.wav" -dest_files=["res://.godot/imported/dig_3.wav-e440fc7357505855b3b56d72821d8a95.sample"] +source_file="res://entities/player/sounds/dig/dig_3.wav" +dest_files=["res://.godot/imported/dig_3.wav-0c0bb89a725edb73ca5a10e31a6cc9ce.sample"] [params] diff --git a/entities/player/sounds/harvest_1.wav b/entities/player/sounds/harvest/harvest_1.wav similarity index 100% rename from entities/player/sounds/harvest_1.wav rename to entities/player/sounds/harvest/harvest_1.wav diff --git a/entities/player/sounds/harvest_1.wav.import b/entities/player/sounds/harvest/harvest_1.wav.import similarity index 53% rename from entities/player/sounds/harvest_1.wav.import rename to entities/player/sounds/harvest/harvest_1.wav.import index b3c9e89..b22963b 100644 --- a/entities/player/sounds/harvest_1.wav.import +++ b/entities/player/sounds/harvest/harvest_1.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://6qmm1lmkft13" -path="res://.godot/imported/harvest_1.wav-ba207989e74395ee730e7c4943696c32.sample" +path="res://.godot/imported/harvest_1.wav-556288586fc74dbc9e6e114c8da94313.sample" [deps] -source_file="res://entities/player/sounds/harvest_1.wav" -dest_files=["res://.godot/imported/harvest_1.wav-ba207989e74395ee730e7c4943696c32.sample"] +source_file="res://entities/player/sounds/harvest/harvest_1.wav" +dest_files=["res://.godot/imported/harvest_1.wav-556288586fc74dbc9e6e114c8da94313.sample"] [params] diff --git a/entities/player/sounds/harvest_2.wav b/entities/player/sounds/harvest/harvest_2.wav similarity index 100% rename from entities/player/sounds/harvest_2.wav rename to entities/player/sounds/harvest/harvest_2.wav diff --git a/entities/player/sounds/harvest_2.wav.import b/entities/player/sounds/harvest/harvest_2.wav.import similarity index 53% rename from entities/player/sounds/harvest_2.wav.import rename to entities/player/sounds/harvest/harvest_2.wav.import index c30517e..d8d50b2 100644 --- a/entities/player/sounds/harvest_2.wav.import +++ b/entities/player/sounds/harvest/harvest_2.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://cfwqjs2koxyi8" -path="res://.godot/imported/harvest_2.wav-158fd873c16237044d07d7079edc5abf.sample" +path="res://.godot/imported/harvest_2.wav-725aa211bb996cf5e7c0f8044f1a0596.sample" [deps] -source_file="res://entities/player/sounds/harvest_2.wav" -dest_files=["res://.godot/imported/harvest_2.wav-158fd873c16237044d07d7079edc5abf.sample"] +source_file="res://entities/player/sounds/harvest/harvest_2.wav" +dest_files=["res://.godot/imported/harvest_2.wav-725aa211bb996cf5e7c0f8044f1a0596.sample"] [params] diff --git a/entities/player/sounds/harvest_3.wav b/entities/player/sounds/harvest/harvest_3.wav similarity index 100% rename from entities/player/sounds/harvest_3.wav rename to entities/player/sounds/harvest/harvest_3.wav diff --git a/entities/player/sounds/harvest_3.wav.import b/entities/player/sounds/harvest/harvest_3.wav.import similarity index 53% rename from entities/player/sounds/harvest_3.wav.import rename to entities/player/sounds/harvest/harvest_3.wav.import index a70c3a9..678444c 100644 --- a/entities/player/sounds/harvest_3.wav.import +++ b/entities/player/sounds/harvest/harvest_3.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://xiif55xgsoxs" -path="res://.godot/imported/harvest_3.wav-ba1f76ac9d83e08f35513c7dbeb090f5.sample" +path="res://.godot/imported/harvest_3.wav-311bb1444da6f3ce34003b61b417f328.sample" [deps] -source_file="res://entities/player/sounds/harvest_3.wav" -dest_files=["res://.godot/imported/harvest_3.wav-ba1f76ac9d83e08f35513c7dbeb090f5.sample"] +source_file="res://entities/player/sounds/harvest/harvest_3.wav" +dest_files=["res://.godot/imported/harvest_3.wav-311bb1444da6f3ce34003b61b417f328.sample"] [params] diff --git a/entities/player/sounds/harvest_4.wav b/entities/player/sounds/harvest/harvest_4.wav similarity index 100% rename from entities/player/sounds/harvest_4.wav rename to entities/player/sounds/harvest/harvest_4.wav diff --git a/entities/player/sounds/harvest_4.wav.import b/entities/player/sounds/harvest/harvest_4.wav.import similarity index 53% rename from entities/player/sounds/harvest_4.wav.import rename to entities/player/sounds/harvest/harvest_4.wav.import index b6c8a69..529ea0d 100644 --- a/entities/player/sounds/harvest_4.wav.import +++ b/entities/player/sounds/harvest/harvest_4.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://bc803023sso65" -path="res://.godot/imported/harvest_4.wav-35e3d63c56e7a1d73bee6cc87ace3be8.sample" +path="res://.godot/imported/harvest_4.wav-7e79f33b699be1fa97bd3397f39b13b8.sample" [deps] -source_file="res://entities/player/sounds/harvest_4.wav" -dest_files=["res://.godot/imported/harvest_4.wav-35e3d63c56e7a1d73bee6cc87ace3be8.sample"] +source_file="res://entities/player/sounds/harvest/harvest_4.wav" +dest_files=["res://.godot/imported/harvest_4.wav-7e79f33b699be1fa97bd3397f39b13b8.sample"] [params] diff --git a/entities/player/sounds/harvest_5.wav b/entities/player/sounds/harvest/harvest_5.wav similarity index 100% rename from entities/player/sounds/harvest_5.wav rename to entities/player/sounds/harvest/harvest_5.wav diff --git a/entities/player/sounds/harvest_5.wav.import b/entities/player/sounds/harvest/harvest_5.wav.import similarity index 53% rename from entities/player/sounds/harvest_5.wav.import rename to entities/player/sounds/harvest/harvest_5.wav.import index ea24683..74d75e2 100644 --- a/entities/player/sounds/harvest_5.wav.import +++ b/entities/player/sounds/harvest/harvest_5.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://bv65uncyiu3dc" -path="res://.godot/imported/harvest_5.wav-2a7c17a378f34ee56ecf2d841af1dcf5.sample" +path="res://.godot/imported/harvest_5.wav-39f01e30ca86bf5c233491f011175058.sample" [deps] -source_file="res://entities/player/sounds/harvest_5.wav" -dest_files=["res://.godot/imported/harvest_5.wav-2a7c17a378f34ee56ecf2d841af1dcf5.sample"] +source_file="res://entities/player/sounds/harvest/harvest_5.wav" +dest_files=["res://.godot/imported/harvest_5.wav-39f01e30ca86bf5c233491f011175058.sample"] [params] diff --git a/entities/player/sounds/harvest_6.wav b/entities/player/sounds/harvest/harvest_6.wav similarity index 100% rename from entities/player/sounds/harvest_6.wav rename to entities/player/sounds/harvest/harvest_6.wav diff --git a/entities/player/sounds/harvest_6.wav.import b/entities/player/sounds/harvest/harvest_6.wav.import similarity index 53% rename from entities/player/sounds/harvest_6.wav.import rename to entities/player/sounds/harvest/harvest_6.wav.import index 37564d2..d376c08 100644 --- a/entities/player/sounds/harvest_6.wav.import +++ b/entities/player/sounds/harvest/harvest_6.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://b0hxscxlo241f" -path="res://.godot/imported/harvest_6.wav-2836dc15776824ff43e7c447a4e48c92.sample" +path="res://.godot/imported/harvest_6.wav-2e0a40cb05e9420a9f46463c9b5ddae3.sample" [deps] -source_file="res://entities/player/sounds/harvest_6.wav" -dest_files=["res://.godot/imported/harvest_6.wav-2836dc15776824ff43e7c447a4e48c92.sample"] +source_file="res://entities/player/sounds/harvest/harvest_6.wav" +dest_files=["res://.godot/imported/harvest_6.wav-2e0a40cb05e9420a9f46463c9b5ddae3.sample"] [params] diff --git a/entities/player/sounds/movement/movement.wav b/entities/player/sounds/movement/movement.wav new file mode 100644 index 0000000..50e3c6a Binary files /dev/null and b/entities/player/sounds/movement/movement.wav differ diff --git a/entities/player/sounds/movement/movement.wav.import b/entities/player/sounds/movement/movement.wav.import new file mode 100644 index 0000000..45bd41c --- /dev/null +++ b/entities/player/sounds/movement/movement.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://b4sxly5jsvlkr" +path="res://.godot/imported/movement.wav-eff57eb45a7ca8b1e138ffe135ccf98e.sample" + +[deps] + +source_file="res://entities/player/sounds/movement/movement.wav" +dest_files=["res://.godot/imported/movement.wav-eff57eb45a7ca8b1e138ffe135ccf98e.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 diff --git a/entities/player/sounds/pick_up_1.wav b/entities/player/sounds/pick_up/pick_up_1.wav similarity index 100% rename from entities/player/sounds/pick_up_1.wav rename to entities/player/sounds/pick_up/pick_up_1.wav diff --git a/entities/player/sounds/pick_up_1.wav.import b/entities/player/sounds/pick_up/pick_up_1.wav.import similarity index 53% rename from entities/player/sounds/pick_up_1.wav.import rename to entities/player/sounds/pick_up/pick_up_1.wav.import index 598eb6d..e1954ac 100644 --- a/entities/player/sounds/pick_up_1.wav.import +++ b/entities/player/sounds/pick_up/pick_up_1.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://bkitf5nhaa36p" -path="res://.godot/imported/pick_up_1.wav-35d486c68a4148d6f225129804209371.sample" +path="res://.godot/imported/pick_up_1.wav-0e258b69af06c5691f2997179a1bf36b.sample" [deps] -source_file="res://entities/player/sounds/pick_up_1.wav" -dest_files=["res://.godot/imported/pick_up_1.wav-35d486c68a4148d6f225129804209371.sample"] +source_file="res://entities/player/sounds/pick_up/pick_up_1.wav" +dest_files=["res://.godot/imported/pick_up_1.wav-0e258b69af06c5691f2997179a1bf36b.sample"] [params] diff --git a/entities/player/sounds/pick_up_2.wav b/entities/player/sounds/pick_up/pick_up_2.wav similarity index 100% rename from entities/player/sounds/pick_up_2.wav rename to entities/player/sounds/pick_up/pick_up_2.wav diff --git a/entities/player/sounds/pick_up_2.wav.import b/entities/player/sounds/pick_up/pick_up_2.wav.import similarity index 53% rename from entities/player/sounds/pick_up_2.wav.import rename to entities/player/sounds/pick_up/pick_up_2.wav.import index 7e9100c..95030d4 100644 --- a/entities/player/sounds/pick_up_2.wav.import +++ b/entities/player/sounds/pick_up/pick_up_2.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://dx58x1sg61mrv" -path="res://.godot/imported/pick_up_2.wav-8b13148dd5bc8870c5578d85f90542eb.sample" +path="res://.godot/imported/pick_up_2.wav-ccfd626b41684f4735889c5b2d905e6f.sample" [deps] -source_file="res://entities/player/sounds/pick_up_2.wav" -dest_files=["res://.godot/imported/pick_up_2.wav-8b13148dd5bc8870c5578d85f90542eb.sample"] +source_file="res://entities/player/sounds/pick_up/pick_up_2.wav" +dest_files=["res://.godot/imported/pick_up_2.wav-ccfd626b41684f4735889c5b2d905e6f.sample"] [params] diff --git a/entities/player/sounds/pick_up_3.wav b/entities/player/sounds/pick_up/pick_up_3.wav similarity index 100% rename from entities/player/sounds/pick_up_3.wav rename to entities/player/sounds/pick_up/pick_up_3.wav diff --git a/entities/player/sounds/pick_up_3.wav.import b/entities/player/sounds/pick_up/pick_up_3.wav.import similarity index 53% rename from entities/player/sounds/pick_up_3.wav.import rename to entities/player/sounds/pick_up/pick_up_3.wav.import index 5983ac7..b3d5622 100644 --- a/entities/player/sounds/pick_up_3.wav.import +++ b/entities/player/sounds/pick_up/pick_up_3.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://c0fw77uiiwnfb" -path="res://.godot/imported/pick_up_3.wav-4925e1a793c7954804fab43c81d2df3e.sample" +path="res://.godot/imported/pick_up_3.wav-1c884c9c43e4320c0a87534d4376e4e0.sample" [deps] -source_file="res://entities/player/sounds/pick_up_3.wav" -dest_files=["res://.godot/imported/pick_up_3.wav-4925e1a793c7954804fab43c81d2df3e.sample"] +source_file="res://entities/player/sounds/pick_up/pick_up_3.wav" +dest_files=["res://.godot/imported/pick_up_3.wav-1c884c9c43e4320c0a87534d4376e4e0.sample"] [params] diff --git a/root.tscn b/root.tscn index 76bc108..f7baffa 100644 --- a/root.tscn +++ b/root.tscn @@ -3,9 +3,9 @@ [ext_resource type="PackedScene" uid="uid://12nak7amd1uq" path="res://gui/root_gui.tscn" id="1_jnlp7"] [ext_resource type="PackedScene" uid="uid://tsi5j1uxppa4" path="res://stages/terrain/planet/planet.tscn" id="1_pyidc"] [ext_resource type="PackedScene" uid="uid://bgvbgeq46wee2" path="res://entities/player/player.tscn" id="2_vvh5c"] -[ext_resource type="Resource" uid="uid://dmbu538b3utec" path="res://entities/plants/resources/plants/default.tres" id="3_jnlp7"] +[ext_resource type="Resource" uid="uid://b04vho33bl52b" path="res://entities/plants/resources/plants/default.tres" id="3_jnlp7"] [ext_resource type="PackedScene" uid="uid://dj7gp3crtg2yt" path="res://entities/camera/camera.tscn" id="3_vvh5c"] -[ext_resource type="PackedScene" uid="uid://cd3re3552pt7m" path="res://entities/interactables/item_object/item_object.tscn" id="4_vyht1"] +[ext_resource type="PackedScene" path="res://entities/interactables/item_object/item_object.tscn" id="4_vyht1"] [ext_resource type="Resource" uid="uid://bb8etgye1qtfx" path="res://common/inventory/resources/items/shovel.tres" id="5_bf3um"] [ext_resource type="Resource" uid="uid://dbja8xm7ehw1v" path="res://common/inventory/resources/items/water_can.tres" id="6_bf3um"] diff --git a/stages/terrain/planet/music/fin_de_cycle_phase_1.ogg b/stages/terrain/planet/music/fin_de_cycle_phase_1.ogg new file mode 100644 index 0000000..72cf83f Binary files /dev/null and b/stages/terrain/planet/music/fin_de_cycle_phase_1.ogg differ diff --git a/stages/terrain/planet/music/fin_de_cycle_phase_1.ogg.import b/stages/terrain/planet/music/fin_de_cycle_phase_1.ogg.import new file mode 100644 index 0000000..c848c26 --- /dev/null +++ b/stages/terrain/planet/music/fin_de_cycle_phase_1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://eoocn1djnep8" +path="res://.godot/imported/fin_de_cycle_phase_1.ogg-0ff8ce8f81c800fde9f50f867d824b2b.oggvorbisstr" + +[deps] + +source_file="res://stages/terrain/planet/music/fin_de_cycle_phase_1.ogg" +dest_files=["res://.godot/imported/fin_de_cycle_phase_1.ogg-0ff8ce8f81c800fde9f50f867d824b2b.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/stages/terrain/planet/music/niveau_forestier_phase_1.ogg b/stages/terrain/planet/music/niveau_forestier_phase_1.ogg new file mode 100644 index 0000000..04904d9 Binary files /dev/null and b/stages/terrain/planet/music/niveau_forestier_phase_1.ogg differ diff --git a/stages/terrain/planet/music/niveau_forestier_phase_1.ogg.import b/stages/terrain/planet/music/niveau_forestier_phase_1.ogg.import new file mode 100644 index 0000000..e725e05 --- /dev/null +++ b/stages/terrain/planet/music/niveau_forestier_phase_1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dnskjv3wty2ms" +path="res://.godot/imported/niveau_forestier_phase_1.ogg-dbd624eb1808fe51c6958b8897206d5f.oggvorbisstr" + +[deps] + +source_file="res://stages/terrain/planet/music/niveau_forestier_phase_1.ogg" +dest_files=["res://.godot/imported/niveau_forestier_phase_1.ogg-dbd624eb1808fe51c6958b8897206d5f.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4