diff --git a/audio/Music/CreepyForest_90BPM_Intro.wav b/audio/Music/CreepyForest_90BPM_Intro.wav new file mode 100644 index 0000000..ae0435e Binary files /dev/null and b/audio/Music/CreepyForest_90BPM_Intro.wav differ diff --git a/audio/Music/CreepyForest_90BPM_Intro.wav.import b/audio/Music/CreepyForest_90BPM_Intro.wav.import new file mode 100644 index 0000000..e1f48d8 --- /dev/null +++ b/audio/Music/CreepyForest_90BPM_Intro.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://vcv1hckwpf4j" +path="res://.godot/imported/CreepyForest_90BPM_Intro.wav-ac77ab017b924fdc37c78a363b9510f7.sample" + +[deps] + +source_file="res://audio/Music/CreepyForest_90BPM_Intro.wav" +dest_files=["res://.godot/imported/CreepyForest_90BPM_Intro.wav-ac77ab017b924fdc37c78a363b9510f7.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/audio/Music/CreepyForest_90BPM_Loop.wav b/audio/Music/CreepyForest_90BPM_Loop.wav new file mode 100644 index 0000000..4aea4eb Binary files /dev/null and b/audio/Music/CreepyForest_90BPM_Loop.wav differ diff --git a/audio/Music/CreepyForest_90BPM_Loop.wav.import b/audio/Music/CreepyForest_90BPM_Loop.wav.import new file mode 100644 index 0000000..9773d19 --- /dev/null +++ b/audio/Music/CreepyForest_90BPM_Loop.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bvjy52w673clv" +path="res://.godot/imported/CreepyForest_90BPM_Loop.wav-4a54c24ed7bd3d099be79fac1a2ee2bd.sample" + +[deps] + +source_file="res://audio/Music/CreepyForest_90BPM_Loop.wav" +dest_files=["res://.godot/imported/CreepyForest_90BPM_Loop.wav-4a54c24ed7bd3d099be79fac1a2ee2bd.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/scenes/Babushka_scene_forest_fight_1_2d.tscn b/scenes/Babushka_scene_forest_fight_1_2d.tscn index 7fcd136..8f0418f 100644 --- a/scenes/Babushka_scene_forest_fight_1_2d.tscn +++ b/scenes/Babushka_scene_forest_fight_1_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=69 format=3 uid="uid://dfyb4dckoltpw"] +[gd_scene load_steps=68 format=3 uid="uid://dfyb4dckoltpw"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_vl6d5"] [ext_resource type="PackedScene" uid="uid://bm21nqepnwaik" path="res://scenes/Babushka_scene_indoor_common_room.tscn" id="2_5evxf"] @@ -38,13 +38,13 @@ [ext_resource type="Texture2D" uid="uid://dgavbfci8x178" path="res://art/nature/grass/grass-1.png" id="41_2hsma"] [ext_resource type="Texture2D" uid="uid://h2b5aufaaw7w" path="res://art/nature/grass/grass-2.png" id="42_r01kr"] [ext_resource type="Texture2D" uid="uid://b644ofy7fml5w" path="res://art/nature/grass/grass-5.png" id="43_8vxd2"] +[ext_resource type="AudioStream" uid="uid://vcv1hckwpf4j" path="res://audio/Music/CreepyForest_90BPM_Intro.wav" id="43_55b52"] [ext_resource type="Texture2D" uid="uid://badnnid7dgnpk" path="res://art/nature/grass/grass-4.png" id="44_dh8gs"] [ext_resource type="Texture2D" uid="uid://ct7ea8ikor5rf" path="res://art/nature/grass/grass-3.png" id="45_30axv"] +[ext_resource type="AudioStream" uid="uid://bvjy52w673clv" path="res://audio/Music/CreepyForest_90BPM_Loop.wav" id="45_hfhye"] [ext_resource type="Texture2D" uid="uid://d3dwl6ph0pu1d" path="res://art/nature/grass/grass-6.png" id="46_kg80k"] [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="50_r0n5l"] -[ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="51_x7raj"] [ext_resource type="Script" uid="uid://clxb3n668oud3" path="res://scripts/CSharp/Common/Audio/AudioDebugger.cs" id="52_x1mmf"] -[ext_resource type="AudioStream" uid="uid://cfqg50am0swb7" path="res://audio/Music/Farming_90BPM_69Bars_Loop.wav" id="53_krhcq"] [ext_resource type="AudioStream" uid="uid://vcftvrpi6c7k" path="res://audio/sfx/Farming/SFX_Harke_03_Solo.wav" id="54_4l7ky"] [ext_resource type="AudioStream" uid="uid://bxh5m04vdo0sr" path="res://audio/sfx/Farming/SFX_Harke_04_Solo.wav" id="55_dk5xw"] [ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer.cs" id="56_bjj0f"] @@ -115,11 +115,6 @@ shader_parameter/distortion = 1.0 shader_parameter/heightOffset = 0.51 shader_parameter/offset = 1.0 -[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ceriq"] -loop = false -stream_count = 1 -stream_0 = ExtResource("51_x7raj") - [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ceriq"] streams_count = 2 stream_0/stream = ExtResource("54_4l7ky") @@ -1393,6 +1388,15 @@ texture = ExtResource("41_2hsma") region_enabled = true region_rect = Rect2(42, 16, 176, 163) +[node name="grass57" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/grass"] +modulate = Color(0.856076, 0.855033, 0.937369, 1) +z_index = -5 +position = Vector2(21102, 2021) +scale = Vector2(8.42127, 4.11668) +texture = ExtResource("41_2hsma") +region_enabled = true +region_rect = Rect2(42, 16, 176, 163) + [node name="grass55" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/grass"] modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 @@ -1405,7 +1409,7 @@ region_rect = Rect2(42, 16, 176, 163) [node name="grass45" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/grass"] modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 -position = Vector2(22407, 2639) +position = Vector2(22621, 2402) scale = Vector2(9.80195, 6.42344) texture = ExtResource("41_2hsma") region_enabled = true @@ -1414,7 +1418,7 @@ region_rect = Rect2(42, 16, 176, 163) [node name="grass46" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/grass"] modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 -position = Vector2(22344, 3309) +position = Vector2(22198, 3694) scale = Vector2(12.2062, 8.82233) texture = ExtResource("41_2hsma") region_enabled = true @@ -1688,7 +1692,7 @@ region_rect = Rect2(317, 219, 185, 159) [node name="grass11" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/grass"] z_index = -5 -position = Vector2(20001, 2295) +position = Vector2(20024, 2147) scale = Vector2(5.77602, 3.87779) texture = ExtResource("44_dh8gs") region_enabled = true @@ -1697,7 +1701,7 @@ region_rect = Rect2(147, 255, 218, 128) [node name="grass39" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/grass"] modulate = Color(0.954868, 0.882599, 0.798501, 1) z_index = -5 -position = Vector2(21659, 1975) +position = Vector2(21726, 1867) scale = Vector2(5.77602, 6.94382) texture = ExtResource("45_30axv") region_enabled = true @@ -1751,7 +1755,7 @@ region_rect = Rect2(29, 204, 219, 159) [node name="grass51" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/grass"] modulate = Color(0.856076, 0.855033, 0.937369, 1) z_index = -5 -position = Vector2(21331, 2417) +position = Vector2(21787, 2266) scale = Vector2(2.28071, 4.49236) texture = ExtResource("42_r01kr") region_enabled = true @@ -1921,7 +1925,7 @@ region_rect = Rect2(1419.55, -0.619019, 1148.74, 1222.26) [node name="TreeB4" type="Sprite2D" parent="YSorted/ForestVisuals/Static/greenery/trees"] z_index = 100 material = SubResource("ShaderMaterial_bcdgk") -position = Vector2(24646, 2605) +position = Vector2(24547, 1408) scale = Vector2(2.7776, 2.91263) texture = ExtResource("39_hfhye") region_enabled = true @@ -2088,7 +2092,7 @@ metadata/_edit_use_anchors_ = true [node name="Background Music Ramp up" type="AudioStreamPlayer2D" parent="Audio"] position = Vector2(4002, 2030) -stream = SubResource("AudioStreamPlaylist_ceriq") +stream = ExtResource("43_55b52") autoplay = true max_distance = 1e+06 bus = &"Music" @@ -2098,7 +2102,7 @@ script = ExtResource("52_x1mmf") [node name="Background Music loop" type="AudioStreamPlayer2D" parent="Audio"] position = Vector2(4002, 2030) -stream = ExtResource("53_krhcq") +stream = ExtResource("45_hfhye") max_distance = 1e+06 bus = &"Music" area_mask = 33