Skip to content

Finish Milestone 2 #220

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 33 commits into from
May 19, 2025
Merged

Finish Milestone 2 #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1197066
Now only escape and start close the popup (#166) (#171)
cornerloan Apr 29, 2025
bd62146
Update Quit game button (#178)
LifeHckr Apr 30, 2025
55f968f
Added simple money system (#191)
LifeHckr May 1, 2025
f026ef3
Rework Areas into MapLevels class (#192)
LifeHckr May 2, 2025
e2b9542
Added Tutorial and related tweak (#194)
LifeHckr May 4, 2025
ab38bd9
Update README.md
LifeHckr May 4, 2025
2d293e6
Numerical balancing (#193)
cornerloan May 4, 2025
9624468
Rebalance tutorial enemies health
LifeHckr May 4, 2025
f526687
Remove redundant tooltips
LifeHckr May 4, 2025
1224d20
Fix Effigy bugs
LifeHckr May 6, 2025
39488e8
New relics (#197)
cornerloan May 7, 2025
aaadd6c
Update Health Bars (#196)
LifeHckr May 7, 2025
a40e11e
Added Enemy notes (#195)
LifeHckr May 7, 2025
a62ad13
New milestone 2 notes (#200)
cornerloan May 8, 2025
f40dfeb
Took the simple approach, but at least it's done (#201)
cornerloan May 8, 2025
bc6f004
Add support for Steam Achievements (#202)
collectioncard May 9, 2025
34c6d88
Add Credits Scene (#203)
LifeHckr May 11, 2025
15ec83b
Wave Bar Shader (#204)
LifeHckr May 11, 2025
0a5ee21
New stages integration (#205)
LifeHckr May 12, 2025
db5c9b6
Added Shop Stage (#206)
LifeHckr May 12, 2025
cf8e11a
Event rooms (#207)
cornerloan May 12, 2025
9118231
Reset note placement bar on battle start
collectioncard May 13, 2025
3100410
Modify shop scene to use global background audio player
collectioncard May 13, 2025
d65979c
Background audio player now supports pausing kinda
collectioncard May 13, 2025
d658df2
Add temporary hold note end sprite
collectioncard May 14, 2025
d0c7518
Final relic changes (#210)
cornerloan May 14, 2025
749d3e4
Coupon bugfix (#212)
cornerloan May 14, 2025
c07c741
Hacky fix for titlescreen animation
collectioncard May 15, 2025
426c806
Add multiple new enemies to the game. Also fixes some existing songs …
collectioncard May 15, 2025
5fb9519
First Post Playtest Fixes and Tweaks
LifeHckr May 15, 2025
bfc04e6
Added medic art
cornerloan May 17, 2025
e1f52e2
Added Screenshot Button
LifeHckr May 17, 2025
e756171
Re-add hacky fix for the second 'i' on the titlescreen
collectioncard May 19, 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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
*.DotSettings.user
export_presets.cfg
*.translation
addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll
Binary file added Audio/CyberFoxSong.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/CyberFoxSong.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://cth4pjufelmd6"
path="res://.godot/imported/CyberFoxSong.ogg-b284af6a3d3aac22904e516894dd5aae.oggvorbisstr"

[deps]

source_file="res://Audio/CyberFoxSong.ogg"
dest_files=["res://.godot/imported/CyberFoxSong.ogg-b284af6a3d3aac22904e516894dd5aae.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file added Audio/District_Four.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/District_Four.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://bffy1ysxfrte6"
path="res://.godot/imported/District_Four.ogg-f8fbac641cef73b68aacab4d4b38fbd8.oggvorbisstr"

[deps]

source_file="res://Audio/District_Four.ogg"
dest_files=["res://.godot/imported/District_Four.ogg-f8fbac641cef73b68aacab4d4b38fbd8.oggvorbisstr"]

[params]

loop=false
loop_offset=0
Copy link

Copilot AI May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Other import files use a float literal for loop_offset (e.g., 0.0). For consistency, consider using 0.0 here as well.

Suggested change
loop_offset=0
loop_offset=0.0

Copilot uses AI. Check for mistakes.
bpm=0
beat_count=0
bar_beats=4
Binary file added Audio/EcholaneSong.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/EcholaneSong.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://cotvgtk627cp6"
path="res://.godot/imported/EcholaneSong.ogg-98376f334d8ef68ec1401c46cae3d881.oggvorbisstr"

[deps]

source_file="res://Audio/EcholaneSong.ogg"
dest_files=["res://.godot/imported/EcholaneSong.ogg-98376f334d8ef68ec1401c46cae3d881.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file added Audio/FrostWaltz.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/FrostWaltz.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://cqqek08at2dln"
path="res://.godot/imported/FrostWaltz.ogg-ac1d837e419d8005c75f8f58778c7de5.oggvorbisstr"

[deps]

source_file="res://Audio/FrostWaltz.ogg"
dest_files=["res://.godot/imported/FrostWaltz.ogg-ac1d837e419d8005c75f8f58778c7de5.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file added Audio/Gobbler.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/Gobbler.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://dy1hwvtaqkkq3"
path="res://.godot/imported/Gobbler.ogg-03b09f5b2bf0ffd7ccfd23009bd2f39b.oggvorbisstr"

[deps]

source_file="res://Audio/Gobbler.ogg"
dest_files=["res://.godot/imported/Gobbler.ogg-03b09f5b2bf0ffd7ccfd23009bd2f39b.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file added Audio/Holo_ThereItIs.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/Holo_ThereItIs.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://bh13g4kvv2ouu"
path="res://.godot/imported/Holo_ThereItIs.ogg-9a4ef5e03ac86b17b0162d2b30577004.oggvorbisstr"

[deps]

source_file="res://Audio/Holo_ThereItIs.ogg"
dest_files=["res://.godot/imported/Holo_ThereItIs.ogg-9a4ef5e03ac86b17b0162d2b30577004.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file added Audio/KeythuluSong.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/KeythuluSong.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://dsb5qtnub2hb5"
path="res://.godot/imported/KeythuluSong.ogg-c74318e887a116e4b45c0227012de733.oggvorbisstr"

[deps]

source_file="res://Audio/KeythuluSong.ogg"
dest_files=["res://.godot/imported/KeythuluSong.ogg-c74318e887a116e4b45c0227012de733.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file added Audio/Mushroom.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/Mushroom.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://ccsdu3vec8qnm"
path="res://.godot/imported/Mushroom.ogg-2e906fe7afb72b7bb85b71f5dd19ef51.oggvorbisstr"

[deps]

source_file="res://Audio/Mushroom.ogg"
dest_files=["res://.godot/imported/Mushroom.ogg-2e906fe7afb72b7bb85b71f5dd19ef51.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file added Audio/Shapes.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/Shapes.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://dfw74cqw22wbw"
path="res://.godot/imported/Shapes.ogg-b889800a7203ea0955a099c677ed4dac.oggvorbisstr"

[deps]

source_file="res://Audio/Shapes.ogg"
dest_files=["res://.godot/imported/Shapes.ogg-b889800a7203ea0955a099c677ed4dac.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file modified Audio/Song2.ogg
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Audio/Song2.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://dxp7blovqh1ba"
uid="uid://bv7lgo2e8wu2j"
path="res://.godot/imported/Song2.ogg-b95c04f3512de6fa42e0f9c35aba831f.oggvorbisstr"

[deps]
Expand Down
Binary file added Audio/Spider.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/Spider.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://dw5w7swc7f3wm"
path="res://.godot/imported/Spider.ogg-38620b0d976e425d22012e6c4fbbe76d.oggvorbisstr"

[deps]

source_file="res://Audio/Spider.ogg"
dest_files=["res://.godot/imported/Spider.ogg-38620b0d976e425d22012e6c4fbbe76d.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file added Audio/SquirkelSong.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/SquirkelSong.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://p56exjkpdsj6"
path="res://.godot/imported/SquirkelSong.ogg-63e52521d8bfbd38d4a31f84e995c7b1.oggvorbisstr"

[deps]

source_file="res://Audio/SquirkelSong.ogg"
dest_files=["res://.godot/imported/SquirkelSong.ogg-63e52521d8bfbd38d4a31f84e995c7b1.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Binary file added Audio/TutorialSong.ogg
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions Audio/TutorialSong.ogg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://cr3ehxww3eg5o"
path="res://.godot/imported/TutorialSong.ogg-00527cc92390b837058f07c9a386e555.oggvorbisstr"

[deps]

source_file="res://Audio/TutorialSong.ogg"
dest_files=["res://.godot/imported/TutorialSong.ogg-00527cc92390b837058f07c9a386e555.oggvorbisstr"]

[params]

loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
121 changes: 121 additions & 0 deletions Audio/songMaps/CyberFoxSong.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
[gd_resource type="Resource" load_steps=25 format=3]

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

[sub_resource type="Resource" id="Resource_ljr32"]
script = ExtResource("1_8ueh4")
Beat = 2.0
Length = 9.0

[sub_resource type="Resource" id="Resource_bb3yp"]
script = ExtResource("1_8ueh4")
Beat = 14.0
Length = 9.0

[sub_resource type="Resource" id="Resource_852ml"]
script = ExtResource("1_8ueh4")
Beat = 30.0
Length = 9.0

[sub_resource type="Resource" id="Resource_38nu8"]
script = ExtResource("1_8ueh4")
Beat = 55.0
Length = 0.0

[sub_resource type="Resource" id="Resource_ct6sp"]
script = ExtResource("1_8ueh4")
Beat = 78.0
Length = 9.0

[sub_resource type="Resource" id="Resource_8ueh4"]
script = ExtResource("1_8ueh4")
Beat = 62.0
Length = 9.0

[sub_resource type="Resource" id="Resource_7lpnw"]
script = ExtResource("1_8ueh4")
Beat = 94.0
Length = 0.0

[sub_resource type="Resource" id="Resource_yk705"]
script = ExtResource("1_8ueh4")
Beat = 14.0
Length = 9.0

[sub_resource type="Resource" id="Resource_oocdv"]
script = ExtResource("1_8ueh4")
Beat = 30.0
Length = 9.0

[sub_resource type="Resource" id="Resource_uswjw"]
script = ExtResource("1_8ueh4")
Beat = 46.0
Length = 9.0

[sub_resource type="Resource" id="Resource_e1hbr"]
script = ExtResource("1_8ueh4")
Beat = 78.0
Length = 9.0

[sub_resource type="Resource" id="Resource_gryrv"]
script = ExtResource("1_8ueh4")
Beat = 2.0
Length = 9.0

[sub_resource type="Resource" id="Resource_kwtfb"]
script = ExtResource("1_8ueh4")
Beat = 30.0
Length = 9.0

[sub_resource type="Resource" id="Resource_c2bxv"]
script = ExtResource("1_8ueh4")
Beat = 46.0
Length = 9.0

[sub_resource type="Resource" id="Resource_s63u8"]
script = ExtResource("1_8ueh4")
Beat = 62.0
Length = 9.0

[sub_resource type="Resource" id="Resource_lrc4j"]
script = ExtResource("1_8ueh4")
Beat = 94.0
Length = 0.0

[sub_resource type="Resource" id="Resource_50tbs"]
script = ExtResource("1_8ueh4")
Beat = 2.0
Length = 9.0

[sub_resource type="Resource" id="Resource_ttd2q"]
script = ExtResource("1_8ueh4")
Beat = 14.0
Length = 9.0

[sub_resource type="Resource" id="Resource_nnlde"]
script = ExtResource("1_8ueh4")
Beat = 46.0
Length = 9.0

[sub_resource type="Resource" id="Resource_rwedv"]
script = ExtResource("1_8ueh4")
Beat = 78.0
Length = 9.0

[sub_resource type="Resource" id="Resource_3eydr"]
script = ExtResource("1_8ueh4")
Beat = 62.0
Length = 9.0

[sub_resource type="Resource" id="Resource_83big"]
script = ExtResource("1_8ueh4")
Beat = 94.0
Length = 0.0

[resource]
script = ExtResource("2_s63u8")
UpLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_50tbs"), SubResource("Resource_ttd2q"), SubResource("Resource_nnlde"), SubResource("Resource_rwedv"), SubResource("Resource_3eydr"), SubResource("Resource_83big")])
DownLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_ljr32"), SubResource("Resource_bb3yp"), SubResource("Resource_852ml"), SubResource("Resource_38nu8"), SubResource("Resource_ct6sp"), SubResource("Resource_8ueh4"), SubResource("Resource_7lpnw")])
LeftLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_yk705"), SubResource("Resource_oocdv"), SubResource("Resource_uswjw"), SubResource("Resource_e1hbr")])
RightLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_gryrv"), SubResource("Resource_kwtfb"), SubResource("Resource_c2bxv"), SubResource("Resource_s63u8"), SubResource("Resource_lrc4j")])
Loading