Skip to content

Commit 0a18b3b

Browse files
collectioncardcollectioncard
committed
Update fly song
Better loops, better mappings, what else could you want?
1 parent d191226 commit 0a18b3b

4 files changed

Lines changed: 74 additions & 104 deletions

File tree

‎Audio/Song2.ogg‎

252 KB
Binary file not shown.

‎Audio/Song2.ogg.import‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
importer="oggvorbisstr"
44
type="AudioStreamOggVorbis"
5-
uid="uid://dxp7blovqh1ba"
5+
uid="uid://bv7lgo2e8wu2j"
66
path="res://.godot/imported/Song2.ogg-b95c04f3512de6fa42e0f9c35aba831f.oggvorbisstr"
77

88
[deps]

‎Audio/songMaps/Song2.tres‎

Lines changed: 71 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,156 +1,126 @@
1-
[gd_resource type="Resource" load_steps=32 format=3]
1+
[gd_resource type="Resource" load_steps=26 format=3]
22

3-
[ext_resource type="Script" path="res://Classes/MidiMaestro/NoteInfo.cs" id="1_7gfc4"]
4-
[ext_resource type="Script" path="res://Classes/MidiMaestro/NoteChart.cs" id="2_12jpe"]
3+
[ext_resource type="Script" path="res://Classes/MidiMaestro/NoteInfo.cs" id="1_vo5rw"]
4+
[ext_resource type="Script" path="res://Classes/MidiMaestro/NoteChart.cs" id="2_hgwt2"]
55

6-
[sub_resource type="Resource" id="Resource_rxom0"]
7-
script = ExtResource("1_7gfc4")
8-
Beat = 1.0
6+
[sub_resource type="Resource" id="Resource_svc5u"]
7+
script = ExtResource("1_vo5rw")
8+
Beat = 2.0
99
Length = 0.0
1010

11-
[sub_resource type="Resource" id="Resource_asj20"]
12-
script = ExtResource("1_7gfc4")
11+
[sub_resource type="Resource" id="Resource_ienox"]
12+
script = ExtResource("1_vo5rw")
1313
Beat = 6.0
1414
Length = 0.0
1515

16-
[sub_resource type="Resource" id="Resource_hredl"]
17-
script = ExtResource("1_7gfc4")
16+
[sub_resource type="Resource" id="Resource_ax4q1"]
17+
script = ExtResource("1_vo5rw")
1818
Beat = 10.0
1919
Length = 0.0
2020

21-
[sub_resource type="Resource" id="Resource_iciyj"]
22-
script = ExtResource("1_7gfc4")
23-
Beat = 14.0
24-
Length = 0.0
25-
26-
[sub_resource type="Resource" id="Resource_1w85u"]
27-
script = ExtResource("1_7gfc4")
28-
Beat = 17.0
21+
[sub_resource type="Resource" id="Resource_663rs"]
22+
script = ExtResource("1_vo5rw")
23+
Beat = 15.0
2924
Length = 0.0
3025

31-
[sub_resource type="Resource" id="Resource_daxqs"]
32-
script = ExtResource("1_7gfc4")
33-
Beat = 22.0
26+
[sub_resource type="Resource" id="Resource_86xei"]
27+
script = ExtResource("1_vo5rw")
28+
Beat = 20.0
3429
Length = 0.0
3530

36-
[sub_resource type="Resource" id="Resource_6qbd8"]
37-
script = ExtResource("1_7gfc4")
38-
Beat = 25.0
31+
[sub_resource type="Resource" id="Resource_w3gx2"]
32+
script = ExtResource("1_vo5rw")
33+
Beat = 12.0
3934
Length = 0.0
4035

41-
[sub_resource type="Resource" id="Resource_54mir"]
42-
script = ExtResource("1_7gfc4")
43-
Beat = 30.0
36+
[sub_resource type="Resource" id="Resource_t01kg"]
37+
script = ExtResource("1_vo5rw")
38+
Beat = 18.0
4439
Length = 0.0
4540

46-
[sub_resource type="Resource" id="Resource_ijh26"]
47-
script = ExtResource("1_7gfc4")
48-
Beat = 2.0
41+
[sub_resource type="Resource" id="Resource_rnhdg"]
42+
script = ExtResource("1_vo5rw")
43+
Beat = 8.0
4944
Length = 0.0
5045

51-
[sub_resource type="Resource" id="Resource_sstcx"]
52-
script = ExtResource("1_7gfc4")
53-
Beat = 4.0
46+
[sub_resource type="Resource" id="Resource_of7dy"]
47+
script = ExtResource("1_vo5rw")
48+
Beat = 22.0
5449
Length = 0.0
5550

56-
[sub_resource type="Resource" id="Resource_ldqq5"]
57-
script = ExtResource("1_7gfc4")
58-
Beat = 5.0
51+
[sub_resource type="Resource" id="Resource_xq1dl"]
52+
script = ExtResource("1_vo5rw")
53+
Beat = 11.0
5954
Length = 0.0
6055

61-
[sub_resource type="Resource" id="Resource_eltqr"]
62-
script = ExtResource("1_7gfc4")
63-
Beat = 10.0
56+
[sub_resource type="Resource" id="Resource_ym0tj"]
57+
script = ExtResource("1_vo5rw")
58+
Beat = 4.0
6459
Length = 0.0
6560

66-
[sub_resource type="Resource" id="Resource_fxmce"]
67-
script = ExtResource("1_7gfc4")
68-
Beat = 12.0
61+
[sub_resource type="Resource" id="Resource_1vvgc"]
62+
script = ExtResource("1_vo5rw")
63+
Beat = 11.0
6964
Length = 0.0
7065

71-
[sub_resource type="Resource" id="Resource_l7bpk"]
72-
script = ExtResource("1_7gfc4")
66+
[sub_resource type="Resource" id="Resource_wjmqy"]
67+
script = ExtResource("1_vo5rw")
7368
Beat = 14.0
7469
Length = 0.0
7570

76-
[sub_resource type="Resource" id="Resource_do8wm"]
77-
script = ExtResource("1_7gfc4")
78-
Beat = 15.0
71+
[sub_resource type="Resource" id="Resource_64q4o"]
72+
script = ExtResource("1_vo5rw")
73+
Beat = 16.0
7974
Length = 0.0
8075

81-
[sub_resource type="Resource" id="Resource_qvcn2"]
82-
script = ExtResource("1_7gfc4")
83-
Beat = 18.0
76+
[sub_resource type="Resource" id="Resource_rubmr"]
77+
script = ExtResource("1_vo5rw")
78+
Beat = 19.0
8479
Length = 0.0
8580

86-
[sub_resource type="Resource" id="Resource_siock"]
87-
script = ExtResource("1_7gfc4")
81+
[sub_resource type="Resource" id="Resource_ejow0"]
82+
script = ExtResource("1_vo5rw")
8883
Beat = 20.0
8984
Length = 0.0
9085

91-
[sub_resource type="Resource" id="Resource_lec0e"]
92-
script = ExtResource("1_7gfc4")
93-
Beat = 22.0
94-
Length = 0.0
95-
96-
[sub_resource type="Resource" id="Resource_6wstj"]
97-
script = ExtResource("1_7gfc4")
98-
Beat = 25.0
99-
Length = 0.0
100-
101-
[sub_resource type="Resource" id="Resource_uxbx5"]
102-
script = ExtResource("1_7gfc4")
103-
Beat = 26.0
104-
Length = 0.0
105-
106-
[sub_resource type="Resource" id="Resource_chdui"]
107-
script = ExtResource("1_7gfc4")
108-
Beat = 28.0
109-
Length = 1.0
110-
111-
[sub_resource type="Resource" id="Resource_t7pyo"]
112-
script = ExtResource("1_7gfc4")
86+
[sub_resource type="Resource" id="Resource_pbett"]
87+
script = ExtResource("1_vo5rw")
11388
Beat = 8.0
11489
Length = 0.0
11590

116-
[sub_resource type="Resource" id="Resource_1obgv"]
117-
script = ExtResource("1_7gfc4")
118-
Beat = 15.0
119-
Length = 0.0
120-
121-
[sub_resource type="Resource" id="Resource_3ah33"]
122-
script = ExtResource("1_7gfc4")
123-
Beat = 24.0
91+
[sub_resource type="Resource" id="Resource_gru0r"]
92+
script = ExtResource("1_vo5rw")
93+
Beat = 22.0
12494
Length = 0.0
12595

126-
[sub_resource type="Resource" id="Resource_87dqu"]
127-
script = ExtResource("1_7gfc4")
128-
Beat = 1.0
96+
[sub_resource type="Resource" id="Resource_wljiu"]
97+
script = ExtResource("1_vo5rw")
98+
Beat = 10.0
12999
Length = 0.0
130100

131-
[sub_resource type="Resource" id="Resource_81s21"]
132-
script = ExtResource("1_7gfc4")
101+
[sub_resource type="Resource" id="Resource_3viwm"]
102+
script = ExtResource("1_vo5rw")
133103
Beat = 2.0
134104
Length = 0.0
135105

136-
[sub_resource type="Resource" id="Resource_pyy5l"]
137-
script = ExtResource("1_7gfc4")
138-
Beat = 9.0
106+
[sub_resource type="Resource" id="Resource_mcgpp"]
107+
script = ExtResource("1_vo5rw")
108+
Beat = 4.0
139109
Length = 0.0
140110

141-
[sub_resource type="Resource" id="Resource_7lmg0"]
142-
script = ExtResource("1_7gfc4")
143-
Beat = 17.0
111+
[sub_resource type="Resource" id="Resource_olklg"]
112+
script = ExtResource("1_vo5rw")
113+
Beat = 12.0
144114
Length = 0.0
145115

146-
[sub_resource type="Resource" id="Resource_hgf3i"]
147-
script = ExtResource("1_7gfc4")
148-
Beat = 25.0
116+
[sub_resource type="Resource" id="Resource_57g2b"]
117+
script = ExtResource("1_vo5rw")
118+
Beat = 18.0
149119
Length = 0.0
150120

151121
[resource]
152-
script = ExtResource("2_12jpe")
153-
UpLaneData = Array[ExtResource("1_7gfc4")]([SubResource("Resource_87dqu"), SubResource("Resource_81s21"), SubResource("Resource_pyy5l"), SubResource("Resource_7lmg0"), SubResource("Resource_hgf3i")])
154-
DownLaneData = Array[ExtResource("1_7gfc4")]([SubResource("Resource_rxom0"), SubResource("Resource_asj20"), SubResource("Resource_hredl"), SubResource("Resource_iciyj"), SubResource("Resource_1w85u"), SubResource("Resource_daxqs"), SubResource("Resource_6qbd8"), SubResource("Resource_54mir")])
155-
LeftLaneData = Array[ExtResource("1_7gfc4")]([SubResource("Resource_ijh26"), SubResource("Resource_sstcx"), SubResource("Resource_ldqq5"), SubResource("Resource_eltqr"), SubResource("Resource_fxmce"), SubResource("Resource_l7bpk"), SubResource("Resource_do8wm"), SubResource("Resource_qvcn2"), SubResource("Resource_siock"), SubResource("Resource_lec0e"), SubResource("Resource_6wstj"), SubResource("Resource_uxbx5"), SubResource("Resource_chdui")])
156-
RightLaneData = Array[ExtResource("1_7gfc4")]([SubResource("Resource_t7pyo"), SubResource("Resource_1obgv"), SubResource("Resource_3ah33")])
122+
script = ExtResource("2_hgwt2")
123+
UpLaneData = Array[ExtResource("1_vo5rw")]([SubResource("Resource_3viwm"), SubResource("Resource_mcgpp"), SubResource("Resource_olklg"), SubResource("Resource_57g2b")])
124+
DownLaneData = Array[ExtResource("1_vo5rw")]([SubResource("Resource_svc5u"), SubResource("Resource_ienox"), SubResource("Resource_ax4q1"), SubResource("Resource_663rs"), SubResource("Resource_86xei"), SubResource("Resource_w3gx2"), SubResource("Resource_t01kg")])
125+
LeftLaneData = Array[ExtResource("1_vo5rw")]([SubResource("Resource_rnhdg"), SubResource("Resource_of7dy"), SubResource("Resource_xq1dl")])
126+
RightLaneData = Array[ExtResource("1_vo5rw")]([SubResource("Resource_ym0tj"), SubResource("Resource_1vvgc"), SubResource("Resource_wjmqy"), SubResource("Resource_64q4o"), SubResource("Resource_rubmr"), SubResource("Resource_ejow0"), SubResource("Resource_pbett"), SubResource("Resource_gru0r"), SubResource("Resource_wljiu")])

‎Globals/Scribe.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,9 +585,9 @@ e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs
585585
new SongTemplate(
586586
new SongData
587587
{
588-
Bpm = 60,
588+
Bpm = 120,
589589
SongLength = -1,
590-
NumLoops = 1,
590+
NumLoops = 2,
591591
},
592592
"Song2",
593593
"Audio/Song2.ogg",

0 commit comments

Comments
 (0)