Skip to content

Milestone 1 Finished! #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LifeHckr merged 45 commits into from
Apr 27, 2025
Merged

Milestone 1 Finished! #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
e85d3c7
Added two relics
cornerloan Mar 23, 2025
5fbe08d
Added block mechanic
cornerloan Mar 26, 2025
9c5b1d9
Merge branch 'BoredDuringBreak' into AlsoBoredDuringBreak
cornerloan Apr 1, 2025
cbbe0fa
Fixing errors from merge
cornerloan Apr 1, 2025
dbe44ae
Implemented Harbinger event system
LifeHckr Apr 5, 2025
21310f6
Make NPB fill with input color
LifeHckr Apr 6, 2025
9869787
Refactored Reward Selection
LifeHckr Apr 7, 2025
04c2172
Slight clean up
LifeHckr Apr 7, 2025
74a05b9
Merge remote-tracking branch 'origin/Milestone1' into AlsoBoredDuring…
cornerloan Apr 7, 2025
7953217
added 2 new relics, 1 new note type, block mechanic
cornerloan Apr 7, 2025
9201ab6
Handle Multiple Enemies
LifeHckr Apr 7, 2025
6132f32
Merge pull request #140 from Project-Funk-Engine/MultiEnemyFights
LifeHckr Apr 7, 2025
1b0aa23
Added rarities to items
cornerloan Apr 10, 2025
6b7b984
Updated to include Michael's relic
cornerloan Apr 10, 2025
45929fa
Merge remote-tracking branch 'origin/Milestone1' into AlsoBoredDuring…
cornerloan Apr 10, 2025
57fad07
Updated relics to work with multi-enemies
cornerloan Apr 10, 2025
335da05
removed debug statement, everything should be working now
cornerloan Apr 10, 2025
b660df5
WIP Replacing UI elements with new WIP sprites
LifeHckr Apr 11, 2025
626a869
Tweaking button theme
LifeHckr Apr 11, 2025
c4cff00
Finalizing new UI
LifeHckr Apr 12, 2025
4bd5355
Change map icon styling
LifeHckr Apr 12, 2025
9062544
Settled on a font, adjusted UI accordingly
LifeHckr Apr 15, 2025
ee53dd5
Update README.md
LifeHckr Apr 15, 2025
27235c3
Update Battle Start button to match theme
LifeHckr Apr 15, 2025
0ab882e
Merge pull request #152 from Project-Funk-Engine/NewUITesting
LifeHckr Apr 15, 2025
d6ad8c2
Auto pause pauseable scenes
LifeHckr Apr 16, 2025
8a6037b
Consume input when window unfocused
LifeHckr Apr 16, 2025
e7dc06a
Merge pull request #153 from Project-Funk-Engine/SteamFixes
LifeHckr Apr 17, 2025
66412c1
Merge branch 'Milestone1' into AlsoBoredDuringBreak
LifeHckr Apr 17, 2025
37ea9b8
Remove current implementation of block
LifeHckr Apr 17, 2025
e88ba7c
Merge pull request #148 from Project-Funk-Engine/AlsoBoredDuringBreak
LifeHckr Apr 17, 2025
e2f24af
Adjust Health bars and relics
LifeHckr Apr 17, 2025
f4cf6b8
Better rewards (#157)
LifeHckr Apr 18, 2025
40ca647
Custom remapping (#159)
cornerloan Apr 21, 2025
489869f
Status effects (#158)
LifeHckr Apr 21, 2025
74d7d64
New note types (#160)
cornerloan Apr 22, 2025
e058e35
Map abstraction (#161)
LifeHckr Apr 22, 2025
a99e615
Added all new relic sprites
LifeHckr Apr 22, 2025
da86fa2
Add current area to save file
LifeHckr Apr 23, 2025
8cdad30
Remove midi files! (#162)
collectioncard Apr 24, 2025
dea0894
Update CN translation label according to Lyssa
collectioncard Apr 25, 2025
a7451e9
Enhance NPB
LifeHckr Apr 25, 2025
1cc79c1
Fixed menu focusing bug (#164)
cornerloan Apr 27, 2025
6e2607e
Add license and update readme
collectioncard Apr 27, 2025
3b93e7f
Merge branch 'main' into Milestone1
collectioncard Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file removed Audio/Midi/Song1.mid
View file
Open in desktop
Binary file not shown.
Binary file removed Audio/Midi/Song2.mid
View file
Open in desktop
Binary file not shown.
Binary file removed Audio/Midi/Song3.mid
View file
Open in desktop
Binary file not shown.
Binary file removed Audio/Midi/florestan-subset.sf2
View file
Open in desktop
Binary file not shown.
216 changes: 216 additions & 0 deletions Audio/songMaps/Song1.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,216 @@
[gd_resource type="Resource" load_steps=44 format=3 uid="uid://djm7g0svpexde"]

[ext_resource type="Script" path="res://Classes/MidiMaestro/NoteInfo.cs" id="1_5ry1j"]
[ext_resource type="Script" path="res://Classes/MidiMaestro/NoteChart.cs" id="2_gbqfw"]

[sub_resource type="Resource" id="Resource_sycg1"]
script = ExtResource("1_5ry1j")
Beat = 16.0
Length = 0.0

[sub_resource type="Resource" id="Resource_vh0lg"]
script = ExtResource("1_5ry1j")
Beat = 24.0
Length = 0.0

[sub_resource type="Resource" id="Resource_4fym7"]
script = ExtResource("1_5ry1j")
Beat = 32.0
Length = 0.0

[sub_resource type="Resource" id="Resource_mf3c7"]
script = ExtResource("1_5ry1j")
Beat = 5.0
Length = 0.0

[sub_resource type="Resource" id="Resource_5kf2q"]
script = ExtResource("1_5ry1j")
Beat = 9.0
Length = 0.0

[sub_resource type="Resource" id="Resource_f15o4"]
script = ExtResource("1_5ry1j")
Beat = 13.0
Length = 0.0

[sub_resource type="Resource" id="Resource_oert5"]
script = ExtResource("1_5ry1j")
Beat = 17.0
Length = 0.0

[sub_resource type="Resource" id="Resource_kytyf"]
script = ExtResource("1_5ry1j")
Beat = 21.0
Length = 0.0

[sub_resource type="Resource" id="Resource_kmfoh"]
script = ExtResource("1_5ry1j")
Beat = 25.0
Length = 0.0

[sub_resource type="Resource" id="Resource_hsn40"]
script = ExtResource("1_5ry1j")
Beat = 29.0
Length = 0.0

[sub_resource type="Resource" id="Resource_fdk4c"]
script = ExtResource("1_5ry1j")
Beat = 33.0
Length = 0.0

[sub_resource type="Resource" id="Resource_1aoo3"]
script = ExtResource("1_5ry1j")
Beat = 37.0
Length = 0.0

[sub_resource type="Resource" id="Resource_wlcjv"]
script = ExtResource("1_5ry1j")
Beat = 41.0
Length = 0.0

[sub_resource type="Resource" id="Resource_i1n24"]
script = ExtResource("1_5ry1j")
Beat = 45.0
Length = 0.0

[sub_resource type="Resource" id="Resource_n2wrp"]
script = ExtResource("1_5ry1j")
Beat = 49.0
Length = 0.0

[sub_resource type="Resource" id="Resource_gmg26"]
script = ExtResource("1_5ry1j")
Beat = 53.0
Length = 0.0

[sub_resource type="Resource" id="Resource_2jtmb"]
script = ExtResource("1_5ry1j")
Beat = 57.0
Length = 0.0

[sub_resource type="Resource" id="Resource_l3uo1"]
script = ExtResource("1_5ry1j")
Beat = 32.0
Length = 0.0

[sub_resource type="Resource" id="Resource_ayat2"]
script = ExtResource("1_5ry1j")
Beat = 35.0
Length = 0.0

[sub_resource type="Resource" id="Resource_5hrj0"]
script = ExtResource("1_5ry1j")
Beat = 38.0
Length = 0.0

[sub_resource type="Resource" id="Resource_sbk3e"]
script = ExtResource("1_5ry1j")
Beat = 41.0
Length = 0.0

[sub_resource type="Resource" id="Resource_erw8g"]
script = ExtResource("1_5ry1j")
Beat = 44.0
Length = 0.0

[sub_resource type="Resource" id="Resource_ohcnr"]
script = ExtResource("1_5ry1j")
Beat = 47.0
Length = 0.0

[sub_resource type="Resource" id="Resource_1xng4"]
script = ExtResource("1_5ry1j")
Beat = 50.0
Length = 0.0

[sub_resource type="Resource" id="Resource_ullhh"]
script = ExtResource("1_5ry1j")
Beat = 53.0
Length = 0.0

[sub_resource type="Resource" id="Resource_jf4ph"]
script = ExtResource("1_5ry1j")
Beat = 56.0
Length = 0.0

[sub_resource type="Resource" id="Resource_l0ykb"]
script = ExtResource("1_5ry1j")
Beat = 59.0
Length = 0.0

[sub_resource type="Resource" id="Resource_o3ga4"]
script = ExtResource("1_5ry1j")
Beat = 4.0
Length = 0.0

[sub_resource type="Resource" id="Resource_j4bu6"]
script = ExtResource("1_5ry1j")
Beat = 8.0
Length = 0.0

[sub_resource type="Resource" id="Resource_3pmwc"]
script = ExtResource("1_5ry1j")
Beat = 12.0
Length = 0.0

[sub_resource type="Resource" id="Resource_8a8dw"]
script = ExtResource("1_5ry1j")
Beat = 16.0
Length = 0.0

[sub_resource type="Resource" id="Resource_sen1l"]
script = ExtResource("1_5ry1j")
Beat = 20.0
Length = 0.0

[sub_resource type="Resource" id="Resource_i8i3p"]
script = ExtResource("1_5ry1j")
Beat = 24.0
Length = 0.0

[sub_resource type="Resource" id="Resource_v6ql4"]
script = ExtResource("1_5ry1j")
Beat = 28.0
Length = 0.0

[sub_resource type="Resource" id="Resource_v3ixx"]
script = ExtResource("1_5ry1j")
Beat = 32.0
Length = 0.0

[sub_resource type="Resource" id="Resource_fjllr"]
script = ExtResource("1_5ry1j")
Beat = 36.0
Length = 0.0

[sub_resource type="Resource" id="Resource_kfijo"]
script = ExtResource("1_5ry1j")
Beat = 40.0
Length = 0.0

[sub_resource type="Resource" id="Resource_j42ns"]
script = ExtResource("1_5ry1j")
Beat = 44.0
Length = 0.0

[sub_resource type="Resource" id="Resource_c3aa2"]
script = ExtResource("1_5ry1j")
Beat = 48.0
Length = 0.0

[sub_resource type="Resource" id="Resource_a36fj"]
script = ExtResource("1_5ry1j")
Beat = 52.0
Length = 0.0

[sub_resource type="Resource" id="Resource_gwuir"]
script = ExtResource("1_5ry1j")
Beat = 56.0
Length = 0.0

[resource]
script = ExtResource("2_gbqfw")
UpLaneData = [SubResource("Resource_o3ga4"), SubResource("Resource_j4bu6"), SubResource("Resource_3pmwc"), SubResource("Resource_8a8dw"), SubResource("Resource_sen1l"), SubResource("Resource_i8i3p"), SubResource("Resource_v6ql4"), SubResource("Resource_v3ixx"), SubResource("Resource_fjllr"), SubResource("Resource_kfijo"), SubResource("Resource_j42ns"), SubResource("Resource_c3aa2"), SubResource("Resource_a36fj"), SubResource("Resource_gwuir")]
DownLaneData = [SubResource("Resource_sycg1"), SubResource("Resource_vh0lg"), SubResource("Resource_4fym7")]
LeftLaneData = [SubResource("Resource_mf3c7"), SubResource("Resource_5kf2q"), SubResource("Resource_f15o4"), SubResource("Resource_oert5"), SubResource("Resource_kytyf"), SubResource("Resource_kmfoh"), SubResource("Resource_hsn40"), SubResource("Resource_fdk4c"), SubResource("Resource_1aoo3"), SubResource("Resource_wlcjv"), SubResource("Resource_i1n24"), SubResource("Resource_n2wrp"), SubResource("Resource_gmg26"), SubResource("Resource_2jtmb")]
RightLaneData = [SubResource("Resource_l3uo1"), SubResource("Resource_ayat2"), SubResource("Resource_5hrj0"), SubResource("Resource_sbk3e"), SubResource("Resource_erw8g"), SubResource("Resource_ohcnr"), SubResource("Resource_1xng4"), SubResource("Resource_ullhh"), SubResource("Resource_jf4ph"), SubResource("Resource_l0ykb")]
156 changes: 156 additions & 0 deletions Audio/songMaps/Song2.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
[gd_resource type="Resource" load_steps=32 format=3]

[ext_resource type="Script" path="res://Classes/MidiMaestro/NoteInfo.cs" id="1_7gfc4"]
[ext_resource type="Script" path="res://Classes/MidiMaestro/NoteChart.cs" id="2_12jpe"]

[sub_resource type="Resource" id="Resource_rxom0"]
script = ExtResource("1_7gfc4")
Beat = 1.0
Length = 0.0

[sub_resource type="Resource" id="Resource_asj20"]
script = ExtResource("1_7gfc4")
Beat = 6.0
Length = 0.0

[sub_resource type="Resource" id="Resource_hredl"]
script = ExtResource("1_7gfc4")
Beat = 10.0
Length = 0.0

[sub_resource type="Resource" id="Resource_iciyj"]
script = ExtResource("1_7gfc4")
Beat = 14.0
Length = 0.0

[sub_resource type="Resource" id="Resource_1w85u"]
script = ExtResource("1_7gfc4")
Beat = 17.0
Length = 0.0

[sub_resource type="Resource" id="Resource_daxqs"]
script = ExtResource("1_7gfc4")
Beat = 22.0
Length = 0.0

[sub_resource type="Resource" id="Resource_6qbd8"]
script = ExtResource("1_7gfc4")
Beat = 25.0
Length = 0.0

[sub_resource type="Resource" id="Resource_54mir"]
script = ExtResource("1_7gfc4")
Beat = 30.0
Length = 0.0

[sub_resource type="Resource" id="Resource_ijh26"]
script = ExtResource("1_7gfc4")
Beat = 2.0
Length = 0.0

[sub_resource type="Resource" id="Resource_sstcx"]
script = ExtResource("1_7gfc4")
Beat = 4.0
Length = 0.0

[sub_resource type="Resource" id="Resource_ldqq5"]
script = ExtResource("1_7gfc4")
Beat = 5.0
Length = 0.0

[sub_resource type="Resource" id="Resource_eltqr"]
script = ExtResource("1_7gfc4")
Beat = 10.0
Length = 0.0

[sub_resource type="Resource" id="Resource_fxmce"]
script = ExtResource("1_7gfc4")
Beat = 12.0
Length = 0.0

[sub_resource type="Resource" id="Resource_l7bpk"]
script = ExtResource("1_7gfc4")
Beat = 14.0
Length = 0.0

[sub_resource type="Resource" id="Resource_do8wm"]
script = ExtResource("1_7gfc4")
Beat = 15.0
Length = 0.0

[sub_resource type="Resource" id="Resource_qvcn2"]
script = ExtResource("1_7gfc4")
Beat = 18.0
Length = 0.0

[sub_resource type="Resource" id="Resource_siock"]
script = ExtResource("1_7gfc4")
Beat = 20.0
Length = 0.0

[sub_resource type="Resource" id="Resource_lec0e"]
script = ExtResource("1_7gfc4")
Beat = 22.0
Length = 0.0

[sub_resource type="Resource" id="Resource_6wstj"]
script = ExtResource("1_7gfc4")
Beat = 25.0
Length = 0.0

[sub_resource type="Resource" id="Resource_uxbx5"]
script = ExtResource("1_7gfc4")
Beat = 26.0
Length = 0.0

[sub_resource type="Resource" id="Resource_chdui"]
script = ExtResource("1_7gfc4")
Beat = 28.0
Length = 1.0

[sub_resource type="Resource" id="Resource_t7pyo"]
script = ExtResource("1_7gfc4")
Beat = 8.0
Length = 0.0

[sub_resource type="Resource" id="Resource_1obgv"]
script = ExtResource("1_7gfc4")
Beat = 15.0
Length = 0.0

[sub_resource type="Resource" id="Resource_3ah33"]
script = ExtResource("1_7gfc4")
Beat = 24.0
Length = 0.0

[sub_resource type="Resource" id="Resource_87dqu"]
script = ExtResource("1_7gfc4")
Beat = 1.0
Length = 0.0

[sub_resource type="Resource" id="Resource_81s21"]
script = ExtResource("1_7gfc4")
Beat = 2.0
Length = 0.0

[sub_resource type="Resource" id="Resource_pyy5l"]
script = ExtResource("1_7gfc4")
Beat = 9.0
Length = 0.0

[sub_resource type="Resource" id="Resource_7lmg0"]
script = ExtResource("1_7gfc4")
Beat = 17.0
Length = 0.0

[sub_resource type="Resource" id="Resource_hgf3i"]
script = ExtResource("1_7gfc4")
Beat = 25.0
Length = 0.0

[resource]
script = ExtResource("2_12jpe")
UpLaneData = Array[ExtResource("1_7gfc4")]([SubResource("Resource_87dqu"), SubResource("Resource_81s21"), SubResource("Resource_pyy5l"), SubResource("Resource_7lmg0"), SubResource("Resource_hgf3i")])
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")])
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")])
RightLaneData = Array[ExtResource("1_7gfc4")]([SubResource("Resource_t7pyo"), SubResource("Resource_1obgv"), SubResource("Resource_3ah33")])
Loading