Skip to content

Commit 2f9bc98

Browse files
food-pleasefood-please
committed
Add two combat music tracks
1 parent 74eb424 commit 2f9bc98

File tree

9 files changed

+109
-20
lines changed

9 files changed

+109
-20
lines changed

‎assets/music/squashin_bugs_fixed.mp3‎

1.35 MB
Binary file not shown.

‎assets/music/squashin_bugs_fixed.mp3.import‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[remap]
2+
3+
importer="mp3"
4+
type="AudioStreamMP3"
5+
uid="uid://dagiejnj8dwqb"
6+
path="res://.godot/imported/squashin_bugs_fixed.mp3-2b24ce049fb783ff4ed6ca443f2919af.mp3str"
7+
8+
[deps]
9+
10+
source_file="res://assets/music/squashin_bugs_fixed.mp3"
11+
dest_files=["res://.godot/imported/squashin_bugs_fixed.mp3-2b24ce049fb783ff4ed6ca443f2919af.mp3str"]
12+
13+
[params]
14+
15+
loop=false
16+
loop_offset=0
17+
bpm=0
18+
beat_count=0
19+
bar_beats=4

‎assets/music/the_fun_run.mp3‎

1.82 MB
Binary file not shown.

‎assets/music/the_fun_run.mp3.import‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[remap]
2+
3+
importer="mp3"
4+
type="AudioStreamMP3"
5+
uid="uid://dj7yf3u7fdxdu"
6+
path="res://.godot/imported/the_fun_run.mp3-13f445e1c9bc6ca7d2d6d3cab74e9ee6.mp3str"
7+
8+
[deps]
9+
10+
source_file="res://assets/music/the_fun_run.mp3"
11+
dest_files=["res://.godot/imported/the_fun_run.mp3-13f445e1c9bc6ca7d2d6d3cab74e9ee6.mp3str"]
12+
13+
[params]
14+
15+
loop=false
16+
loop_offset=0
17+
bpm=0
18+
beat_count=0
19+
bar_beats=4

‎maps/test_combat_arena.tscn‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
[gd_scene load_steps=4 format=3 uid="uid://wivtmf75ic3f"]
1+
[gd_scene load_steps=5 format=3 uid="uid://wivtmf75ic3f"]
22

33
[ext_resource type="PackedScene" uid="uid://b3ciqydkjnkkx" path="res://src/combat/combat_arena.tscn" id="1_etpkf"]
44
[ext_resource type="Texture2D" uid="uid://w55nt3s833tb" path="res://assets/arenas/steppes.png" id="2_i30nm"]
5+
[ext_resource type="AudioStream" uid="uid://dagiejnj8dwqb" path="res://assets/music/squashin_bugs_fixed.mp3" id="2_vo8mp"]
56
[ext_resource type="Texture2D" uid="uid://e4b6flk7roy3" path="res://assets/battlers/bugcat.png" id="3_rfyrg"]
67

78
[node name="TestCombatArena" instance=ExtResource("1_etpkf")]
9+
music = ExtResource("2_vo8mp")
810

911
[node name="Background" parent="." index="0"]
1012
texture = ExtResource("2_i30nm")

‎maps/test_combat_arena2.tscn‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
[gd_scene load_steps=5 format=3 uid="uid://bq6b26pctmol4"]
1+
[gd_scene load_steps=6 format=3 uid="uid://bq6b26pctmol4"]
22

33
[ext_resource type="PackedScene" uid="uid://b3ciqydkjnkkx" path="res://src/combat/combat_arena.tscn" id="1_tqh6v"]
44
[ext_resource type="Texture2D" uid="uid://w55nt3s833tb" path="res://assets/arenas/steppes.png" id="2_5pnp5"]
5+
[ext_resource type="AudioStream" uid="uid://dj7yf3u7fdxdu" path="res://assets/music/the_fun_run.mp3" id="2_gvpi1"]
56
[ext_resource type="Texture2D" uid="uid://dr8cs6liv45hd" path="res://assets/battlers/wolf.png" id="3_d5gu6"]
67
[ext_resource type="Texture2D" uid="uid://cbgfjvlm8kx4k" path="res://assets/battlers/squirrel.png" id="4_kpf44"]
78

89
[node name="TestCombatArena" instance=ExtResource("1_tqh6v")]
10+
music = ExtResource("2_gvpi1")
911

1012
[node name="Background" parent="." index="0"]
1113
texture = ExtResource("2_5pnp5")

‎src/field/cutscenes/templates/doors/door.gd‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ class_name Door extends AreaTransition
1111
await ready
1212

1313
_blocking_area.get_node("CollisionShape2D").disabled = !is_locked
14+
15+
# Wait one frame for the physics server to update before rebuilding the pathfinders.
16+
await get_tree().physics_frame
1417
FieldEvents.terrain_changed.emit()
1518

1619
@onready var _anim: = $AnimationPlayer as AnimationPlayer

‎src/field/cutscenes/templates/doors/door.tscn‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,19 +190,16 @@ monitoring = false
190190
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D/ClosedDoor/BlockingArea" index="0"]
191191
shape = SubResource("RectangleShape2D_xgpwx")
192192

193-
[node name="Destination" parent="." index="1"]
194-
position = Vector2(0, 0)
195-
196-
[node name="AnimationPlayer" type="AnimationPlayer" parent="." index="4"]
193+
[node name="AnimationPlayer" type="AnimationPlayer" parent="." index="3"]
197194
libraries = {
198195
"": SubResource("AnimationLibrary_k2tlp")
199196
}
200197
autoplay = "RESET"
201198

202-
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="5"]
199+
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="4"]
203200
bus = &"SFX"
204201

205-
[node name="LockedLabel" type="Label" parent="." index="6"]
202+
[node name="LockedLabel" type="Label" parent="." index="5"]
206203
visible = false
207204
z_index = 101
208205
offset_left = -17.0

‎src/main.tscn‎

Lines changed: 59 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=91 format=3 uid="uid://p01fb6nvi144"]
1+
[gd_scene load_steps=90 format=3 uid="uid://p01fb6nvi144"]
22

33
[ext_resource type="Script" path="res://src/field/field.gd" id="2_bkxev"]
44
[ext_resource type="Script" path="res://src/field/field_cursor.gd" id="5_3guor"]
@@ -68,7 +68,6 @@
6868
[ext_resource type="AudioStream" uid="uid://b6c1p14bc20p1" path="res://addons/dialogic/Example Assets/sound-effects/typing1.wav" id="54_fh5dy"]
6969
[ext_resource type="AudioStream" uid="uid://c3uw4nft0de13" path="res://addons/dialogic/Example Assets/sound-effects/typing2.wav" id="55_8lvao"]
7070
[ext_resource type="Script" path="res://maps/opening_cutscene.gd" id="55_vsmkr"]
71-
[ext_resource type="Script" path="res://src/common/screen_transitions/screen_transition.gd" id="56_cx0l3"]
7271
[ext_resource type="AudioStream" uid="uid://dnboblpkf0fqi" path="res://addons/dialogic/Example Assets/sound-effects/typing3.wav" id="56_prbwr"]
7372
[ext_resource type="AudioStream" uid="uid://c2viukvbub6v6" path="res://addons/dialogic/Example Assets/sound-effects/typing4.wav" id="57_tomnb"]
7473
[ext_resource type="AudioStream" uid="uid://dwcre3fjf3cj8" path="res://addons/dialogic/Example Assets/sound-effects/typing5.wav" id="58_br2ni"]
@@ -181,7 +180,7 @@ tracks/0/keys = {
181180
tracks/1/type = "value"
182181
tracks/1/imported = false
183182
tracks/1/enabled = true
184-
tracks/1/path = NodePath("AnimationPlayer/ScreenTransition/ColorRect/VBoxContainer/VBoxContainer:modulate")
183+
tracks/1/path = NodePath("AnimationPlayer/WinScreen/ColorRect/VBoxContainer/VBoxContainer:modulate")
185184
tracks/1/interp = 1
186185
tracks/1/loop_wrap = true
187186
tracks/1/keys = {
@@ -190,6 +189,30 @@ tracks/1/keys = {
190189
"update": 0,
191190
"values": [Color(1, 1, 1, 0)]
192191
}
192+
tracks/2/type = "value"
193+
tracks/2/imported = false
194+
tracks/2/enabled = true
195+
tracks/2/path = NodePath("AnimationPlayer/WinScreen/ColorRect:visible")
196+
tracks/2/interp = 1
197+
tracks/2/loop_wrap = true
198+
tracks/2/keys = {
199+
"times": PackedFloat32Array(0),
200+
"transitions": PackedFloat32Array(1),
201+
"update": 1,
202+
"values": [false]
203+
}
204+
tracks/3/type = "value"
205+
tracks/3/imported = false
206+
tracks/3/enabled = true
207+
tracks/3/path = NodePath("AnimationPlayer/WinScreen/ColorRect:modulate")
208+
tracks/3/interp = 1
209+
tracks/3/loop_wrap = true
210+
tracks/3/keys = {
211+
"times": PackedFloat32Array(0),
212+
"transitions": PackedFloat32Array(1),
213+
"update": 0,
214+
"values": [Color(1, 1, 1, 0)]
215+
}
193216

194217
[sub_resource type="Animation" id="Animation_6j1bu"]
195218
resource_name = "lunge"
@@ -237,7 +260,7 @@ tracks/1/use_blend = true
237260
tracks/2/type = "method"
238261
tracks/2/imported = false
239262
tracks/2/enabled = true
240-
tracks/2/path = NodePath("AnimationPlayer/ScreenTransition")
263+
tracks/2/path = NodePath("AnimationPlayer/WinScreen")
241264
tracks/2/interp = 1
242265
tracks/2/loop_wrap = true
243266
tracks/2/keys = {
@@ -251,7 +274,7 @@ tracks/2/keys = {
251274
tracks/3/type = "value"
252275
tracks/3/imported = false
253276
tracks/3/enabled = true
254-
tracks/3/path = NodePath("AnimationPlayer/ScreenTransition/ColorRect/VBoxContainer/VBoxContainer:modulate")
277+
tracks/3/path = NodePath("AnimationPlayer/WinScreen/ColorRect/VBoxContainer/VBoxContainer:modulate")
255278
tracks/3/interp = 1
256279
tracks/3/loop_wrap = true
257280
tracks/3/keys = {
@@ -260,6 +283,30 @@ tracks/3/keys = {
260283
"update": 0,
261284
"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)]
262285
}
286+
tracks/4/type = "value"
287+
tracks/4/imported = false
288+
tracks/4/enabled = true
289+
tracks/4/path = NodePath("AnimationPlayer/WinScreen/ColorRect:visible")
290+
tracks/4/interp = 1
291+
tracks/4/loop_wrap = true
292+
tracks/4/keys = {
293+
"times": PackedFloat32Array(1.1),
294+
"transitions": PackedFloat32Array(1),
295+
"update": 1,
296+
"values": [true]
297+
}
298+
tracks/5/type = "value"
299+
tracks/5/imported = false
300+
tracks/5/enabled = true
301+
tracks/5/path = NodePath("AnimationPlayer/WinScreen/ColorRect:modulate")
302+
tracks/5/interp = 1
303+
tracks/5/loop_wrap = true
304+
tracks/5/keys = {
305+
"times": PackedFloat32Array(1.1, 1.4),
306+
"transitions": PackedFloat32Array(1, 1),
307+
"update": 0,
308+
"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)]
309+
}
263310

264311
[sub_resource type="AnimationLibrary" id="AnimationLibrary_d6ycm"]
265312
_data = {
@@ -608,11 +655,11 @@ libraries = {
608655
"": SubResource("AnimationLibrary_d6ycm")
609656
}
610657

611-
[node name="ScreenTransition" type="CanvasLayer" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer"]
612-
script = ExtResource("56_cx0l3")
658+
[node name="WinScreen" type="CanvasLayer" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer"]
613659

614-
[node name="ColorRect" type="ColorRect" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer/ScreenTransition"]
660+
[node name="ColorRect" type="ColorRect" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer/WinScreen"]
615661
visible = false
662+
modulate = Color(1, 1, 1, 0)
616663
anchors_preset = 15
617664
anchor_right = 1.0
618665
anchor_bottom = 1.0
@@ -621,24 +668,24 @@ grow_vertical = 2
621668
mouse_filter = 2
622669
color = Color(0, 0, 0, 1)
623670

624-
[node name="VBoxContainer" type="CenterContainer" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer/ScreenTransition/ColorRect"]
671+
[node name="VBoxContainer" type="CenterContainer" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer/WinScreen/ColorRect"]
625672
layout_mode = 1
626673
anchors_preset = 15
627674
anchor_right = 1.0
628675
anchor_bottom = 1.0
629676
grow_horizontal = 2
630677
grow_vertical = 2
631678

632-
[node name="VBoxContainer" type="VBoxContainer" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer/ScreenTransition/ColorRect/VBoxContainer"]
679+
[node name="VBoxContainer" type="VBoxContainer" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer/WinScreen/ColorRect/VBoxContainer"]
633680
modulate = Color(1, 1, 1, 0)
634681
layout_mode = 2
635682

636-
[node name="Label" type="Label" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer/ScreenTransition/ColorRect/VBoxContainer/VBoxContainer"]
683+
[node name="Label" type="Label" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer/WinScreen/ColorRect/VBoxContainer/VBoxContainer"]
637684
layout_mode = 2
638685
text = "THANK YOU FOR PLAYING!"
639686
label_settings = SubResource("LabelSettings_dkg5i")
640687

641-
[node name="Label2" type="Label" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer/ScreenTransition/ColorRect/VBoxContainer/VBoxContainer"]
688+
[node name="Label2" type="Label" parent="Field/Terrain/Gamepieces/Grove/Ghost/AnimationPlayer/WinScreen/ColorRect/VBoxContainer/VBoxContainer"]
642689
custom_minimum_size = Vector2(800, 0)
643690
layout_mode = 2
644691
text = "Find more info or ways to help out at

0 commit comments

Comments
 (0)