diff --git a/Audio/songMaps/BossBlood.tres b/Audio/songMaps/BossBlood.tres index 95693782..ece02d0f 100644 --- a/Audio/songMaps/BossBlood.tres +++ b/Audio/songMaps/BossBlood.tres @@ -247,9 +247,9 @@ Length = 0.0 script = ExtResource("2_uhxkd") Bpm = 120 NumLoops = 5 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "Song1.ogg" -UpLaneData = Array[ExtResource("1_mc06a")]([SubResource("Resource_fjllr"), SubResource("Resource_y2wfd"), SubResource("Resource_cb61k"), SubResource("Resource_hbkgo"), SubResource("Resource_80wib"), SubResource("Resource_jsm3m"), SubResource("Resource_ryg8k"), SubResource("Resource_gj6xo"), SubResource("Resource_112dg"), SubResource("Resource_eguul"), SubResource("Resource_tdy7a"), SubResource("Resource_d7de0")]) -DownLaneData = Array[ExtResource("1_mc06a")]([SubResource("Resource_h1ijp"), SubResource("Resource_ysbfa"), SubResource("Resource_j4c1l"), SubResource("Resource_lktv3"), SubResource("Resource_b0kfm"), SubResource("Resource_xbckj"), SubResource("Resource_gs0vr"), SubResource("Resource_4ygvu"), SubResource("Resource_efsyh")]) -LeftLaneData = Array[ExtResource("1_mc06a")]([SubResource("Resource_mf3c7"), SubResource("Resource_f15o4"), SubResource("Resource_hsn40"), SubResource("Resource_fdk4c"), SubResource("Resource_1aoo3"), SubResource("Resource_wlcjv"), SubResource("Resource_i1n24"), SubResource("Resource_2jtmb"), SubResource("Resource_qx4ac"), SubResource("Resource_csfw3")]) -RightLaneData = Array[ExtResource("1_mc06a")]([SubResource("Resource_l3uo1"), SubResource("Resource_erw8g"), SubResource("Resource_alq0l"), SubResource("Resource_rkc43"), SubResource("Resource_tudf6"), SubResource("Resource_tlvlu"), SubResource("Resource_p167p"), SubResource("Resource_dc6jo"), SubResource("Resource_w3cuf"), SubResource("Resource_vjysj"), SubResource("Resource_aqpy1"), SubResource("Resource_ctve7"), SubResource("Resource_nl7kj"), SubResource("Resource_ogyoe"), SubResource("Resource_q33e3"), SubResource("Resource_vqw4k"), SubResource("Resource_s8jc0")]) +UpLaneData = [SubResource("Resource_fjllr"), SubResource("Resource_y2wfd"), SubResource("Resource_cb61k"), SubResource("Resource_hbkgo"), SubResource("Resource_80wib"), SubResource("Resource_jsm3m"), SubResource("Resource_ryg8k"), SubResource("Resource_gj6xo"), SubResource("Resource_112dg"), SubResource("Resource_eguul"), SubResource("Resource_tdy7a"), SubResource("Resource_d7de0")] +DownLaneData = [SubResource("Resource_h1ijp"), SubResource("Resource_ysbfa"), SubResource("Resource_j4c1l"), SubResource("Resource_lktv3"), SubResource("Resource_b0kfm"), SubResource("Resource_xbckj"), SubResource("Resource_gs0vr"), SubResource("Resource_4ygvu"), SubResource("Resource_efsyh")] +LeftLaneData = [SubResource("Resource_mf3c7"), SubResource("Resource_f15o4"), SubResource("Resource_hsn40"), SubResource("Resource_fdk4c"), SubResource("Resource_1aoo3"), SubResource("Resource_wlcjv"), SubResource("Resource_i1n24"), SubResource("Resource_2jtmb"), SubResource("Resource_qx4ac"), SubResource("Resource_csfw3")] +RightLaneData = [SubResource("Resource_l3uo1"), SubResource("Resource_erw8g"), SubResource("Resource_alq0l"), SubResource("Resource_rkc43"), SubResource("Resource_tudf6"), SubResource("Resource_tlvlu"), SubResource("Resource_p167p"), SubResource("Resource_dc6jo"), SubResource("Resource_w3cuf"), SubResource("Resource_vjysj"), SubResource("Resource_aqpy1"), SubResource("Resource_ctve7"), SubResource("Resource_nl7kj"), SubResource("Resource_ogyoe"), SubResource("Resource_q33e3"), SubResource("Resource_vqw4k"), SubResource("Resource_s8jc0")] diff --git a/Audio/songMaps/CyberFoxSong.tres b/Audio/songMaps/CyberFoxSong.tres index fa88c568..fc3ee873 100644 --- a/Audio/songMaps/CyberFoxSong.tres +++ b/Audio/songMaps/CyberFoxSong.tres @@ -117,7 +117,7 @@ Length = 0.0 script = ExtResource("2_s63u8") Bpm = 180 NumLoops = 1 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "CyberFoxSong.ogg" UpLaneData = [SubResource("Resource_50tbs"), SubResource("Resource_ttd2q"), SubResource("Resource_nnlde"), SubResource("Resource_rwedv"), SubResource("Resource_3eydr"), SubResource("Resource_83big")] DownLaneData = [SubResource("Resource_ljr32"), SubResource("Resource_bb3yp"), SubResource("Resource_852ml"), SubResource("Resource_38nu8"), SubResource("Resource_ct6sp"), SubResource("Resource_8ueh4"), SubResource("Resource_7lpnw")] diff --git a/Audio/songMaps/EcholaneSong.tres b/Audio/songMaps/EcholaneSong.tres index aac69093..52e00c04 100644 --- a/Audio/songMaps/EcholaneSong.tres +++ b/Audio/songMaps/EcholaneSong.tres @@ -222,7 +222,7 @@ Length = 0.0 script = ExtResource("2_ulihw") Bpm = 120 NumLoops = 4 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "EcholaneSong.ogg" UpLaneData = [SubResource("Resource_3lcfd"), SubResource("Resource_b1quw"), SubResource("Resource_lq0og"), SubResource("Resource_56y1a"), SubResource("Resource_jljr5"), SubResource("Resource_bxx88"), SubResource("Resource_bdoqu"), SubResource("Resource_cr07w")] DownLaneData = [SubResource("Resource_vkj58"), SubResource("Resource_ulihw"), SubResource("Resource_t8863"), SubResource("Resource_6g1by"), SubResource("Resource_m02wy"), SubResource("Resource_t1nlw"), SubResource("Resource_iknre"), SubResource("Resource_icwn4"), SubResource("Resource_vkj1q"), SubResource("Resource_g5inb")] diff --git a/Audio/songMaps/FrostWaltz.tres b/Audio/songMaps/FrostWaltz.tres index e604c168..47d5fa10 100644 --- a/Audio/songMaps/FrostWaltz.tres +++ b/Audio/songMaps/FrostWaltz.tres @@ -97,7 +97,7 @@ Length = 0.0 script = ExtResource("2_ipsne") Bpm = 99 NumLoops = 5 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "FrostWaltz.ogg" UpLaneData = [SubResource("Resource_ffi45"), SubResource("Resource_3tfr0"), SubResource("Resource_ipsne")] DownLaneData = [SubResource("Resource_dwqep"), SubResource("Resource_ukqut"), SubResource("Resource_x1mw3"), SubResource("Resource_54umo"), SubResource("Resource_o0hqd"), SubResource("Resource_8s5n5"), SubResource("Resource_bsuy3")] diff --git a/Audio/songMaps/GWS.tres b/Audio/songMaps/GWS.tres index e670a6ee..78318377 100644 --- a/Audio/songMaps/GWS.tres +++ b/Audio/songMaps/GWS.tres @@ -292,7 +292,7 @@ Length = 0.0 script = ExtResource("2_4vdmh") Bpm = 120 NumLoops = 1 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "Song3.ogg" UpLaneData = [SubResource("Resource_3gjtl"), SubResource("Resource_vdnsu"), SubResource("Resource_3wyug"), SubResource("Resource_6kji1"), SubResource("Resource_w6jqv"), SubResource("Resource_083mg"), SubResource("Resource_dsf4k"), SubResource("Resource_2woca"), SubResource("Resource_jsj5h"), SubResource("Resource_qoqm3"), SubResource("Resource_nob8r"), SubResource("Resource_a6epf"), SubResource("Resource_ekjhc")] DownLaneData = [SubResource("Resource_11qbm"), SubResource("Resource_hrrtc"), SubResource("Resource_rmog3"), SubResource("Resource_tnqsp"), SubResource("Resource_fldsc"), SubResource("Resource_ntp27"), SubResource("Resource_7nmxt"), SubResource("Resource_47jch"), SubResource("Resource_kp5f0"), SubResource("Resource_v8s33"), SubResource("Resource_hrafv"), SubResource("Resource_d50tw"), SubResource("Resource_a8amf"), SubResource("Resource_mbtm7"), SubResource("Resource_ynh6c"), SubResource("Resource_marsf")] diff --git a/Audio/songMaps/Gobbler.tres b/Audio/songMaps/Gobbler.tres index 9931c118..ab872abf 100644 --- a/Audio/songMaps/Gobbler.tres +++ b/Audio/songMaps/Gobbler.tres @@ -217,7 +217,7 @@ Length = 0.0 script = ExtResource("2_hfiht") Bpm = 120 NumLoops = 6 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "Gobbler.ogg" UpLaneData = [SubResource("Resource_8xjpx"), SubResource("Resource_wsgab"), SubResource("Resource_qwdig"), SubResource("Resource_66kxm"), SubResource("Resource_7ilo7"), SubResource("Resource_a20b3"), SubResource("Resource_pqrtt"), SubResource("Resource_pwr5v"), SubResource("Resource_rt0eg"), SubResource("Resource_8g5uo")] DownLaneData = [SubResource("Resource_i2qfq"), SubResource("Resource_clkmt"), SubResource("Resource_2yhqr"), SubResource("Resource_avloc"), SubResource("Resource_7ipoh"), SubResource("Resource_rc4vs"), SubResource("Resource_hsxfe"), SubResource("Resource_5uul0"), SubResource("Resource_20iwo")] diff --git a/Audio/songMaps/HoloRepeat.tres b/Audio/songMaps/HoloRepeat.tres index 72f2ed94..8c4f67cb 100644 --- a/Audio/songMaps/HoloRepeat.tres +++ b/Audio/songMaps/HoloRepeat.tres @@ -127,7 +127,7 @@ Length = 0.0 script = ExtResource("2_1kkot") Bpm = 130 NumLoops = 1 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "Holo_ThereItIs.ogg" UpLaneData = [SubResource("Resource_rclq0"), SubResource("Resource_d15sy"), SubResource("Resource_xylpo"), SubResource("Resource_c4e5y"), SubResource("Resource_7lbis"), SubResource("Resource_8usgo")] DownLaneData = [SubResource("Resource_wxfu7"), SubResource("Resource_cjafy"), SubResource("Resource_jdotv"), SubResource("Resource_per1x"), SubResource("Resource_lw4uc"), SubResource("Resource_nxcmx")] diff --git a/Audio/songMaps/KeythuluSong.tres b/Audio/songMaps/KeythuluSong.tres index 4e4f2257..5a162c18 100644 --- a/Audio/songMaps/KeythuluSong.tres +++ b/Audio/songMaps/KeythuluSong.tres @@ -207,9 +207,9 @@ Length = 0.0 script = ExtResource("2_s63u8") Bpm = 170 NumLoops = 9 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "KeythuluSong.ogg" -UpLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_vkfw6"), SubResource("Resource_5vawl"), SubResource("Resource_wqml3"), SubResource("Resource_knus5"), SubResource("Resource_iyhat"), SubResource("Resource_e231o"), SubResource("Resource_u1ybv"), SubResource("Resource_s63u8"), SubResource("Resource_rwedv")]) -DownLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_ljr32"), SubResource("Resource_bb3yp"), SubResource("Resource_852ml"), SubResource("Resource_38nu8"), SubResource("Resource_3eydr"), SubResource("Resource_ct6sp"), SubResource("Resource_yk705"), SubResource("Resource_uswjw"), SubResource("Resource_e1hbr"), SubResource("Resource_8ueh4")]) -LeftLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_gryrv"), SubResource("Resource_kwtfb"), SubResource("Resource_c2bxv"), SubResource("Resource_7lpnw"), SubResource("Resource_50tbs"), SubResource("Resource_ttd2q"), SubResource("Resource_nnlde"), SubResource("Resource_lrc4j"), SubResource("Resource_83big"), SubResource("Resource_oocdv")]) -RightLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_lfmd3"), SubResource("Resource_x1ijp"), SubResource("Resource_6jgy8"), SubResource("Resource_oxq2d"), SubResource("Resource_3102k"), SubResource("Resource_j4fdm"), SubResource("Resource_5raac"), SubResource("Resource_c27cp"), SubResource("Resource_pfqra"), SubResource("Resource_2nxl5"), SubResource("Resource_67x67")]) +UpLaneData = [SubResource("Resource_vkfw6"), SubResource("Resource_5vawl"), SubResource("Resource_wqml3"), SubResource("Resource_knus5"), SubResource("Resource_iyhat"), SubResource("Resource_e231o"), SubResource("Resource_u1ybv"), SubResource("Resource_s63u8"), SubResource("Resource_rwedv")] +DownLaneData = [SubResource("Resource_ljr32"), SubResource("Resource_bb3yp"), SubResource("Resource_852ml"), SubResource("Resource_38nu8"), SubResource("Resource_3eydr"), SubResource("Resource_ct6sp"), SubResource("Resource_yk705"), SubResource("Resource_uswjw"), SubResource("Resource_e1hbr"), SubResource("Resource_8ueh4")] +LeftLaneData = [SubResource("Resource_gryrv"), SubResource("Resource_kwtfb"), SubResource("Resource_c2bxv"), SubResource("Resource_7lpnw"), SubResource("Resource_50tbs"), SubResource("Resource_ttd2q"), SubResource("Resource_nnlde"), SubResource("Resource_lrc4j"), SubResource("Resource_83big"), SubResource("Resource_oocdv")] +RightLaneData = [SubResource("Resource_lfmd3"), SubResource("Resource_x1ijp"), SubResource("Resource_6jgy8"), SubResource("Resource_oxq2d"), SubResource("Resource_3102k"), SubResource("Resource_j4fdm"), SubResource("Resource_5raac"), SubResource("Resource_c27cp"), SubResource("Resource_pfqra"), SubResource("Resource_2nxl5"), SubResource("Resource_67x67")] diff --git a/Audio/songMaps/Mushroom.tres b/Audio/songMaps/Mushroom.tres index 7c6ac43d..c6b9aa65 100644 --- a/Audio/songMaps/Mushroom.tres +++ b/Audio/songMaps/Mushroom.tres @@ -77,7 +77,7 @@ Length = 0.0 script = ExtResource("2_0c8vj") Bpm = 100 NumLoops = 4 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "Mushroom.ogg" UpLaneData = [SubResource("Resource_ymucf"), SubResource("Resource_bmgju"), SubResource("Resource_sosma"), SubResource("Resource_3retf")] DownLaneData = [SubResource("Resource_pprmk"), SubResource("Resource_n1l5w"), SubResource("Resource_0c8vj")] diff --git a/Audio/songMaps/ParasiflyDouble.tres b/Audio/songMaps/ParasiflyDouble.tres index 6a4e498b..d070cdc9 100644 --- a/Audio/songMaps/ParasiflyDouble.tres +++ b/Audio/songMaps/ParasiflyDouble.tres @@ -122,7 +122,7 @@ Length = 0.0 script = ExtResource("2_p8lx2") Bpm = 120 NumLoops = 2 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "Song2.ogg" UpLaneData = [SubResource("Resource_3viwm"), SubResource("Resource_mcgpp"), SubResource("Resource_olklg"), SubResource("Resource_57g2b")] DownLaneData = [SubResource("Resource_svc5u"), SubResource("Resource_ienox"), SubResource("Resource_ax4q1"), SubResource("Resource_663rs"), SubResource("Resource_86xei"), SubResource("Resource_w3gx2"), SubResource("Resource_t01kg")] diff --git a/Audio/songMaps/ParasiflySingle.tres b/Audio/songMaps/ParasiflySingle.tres index c33068e5..94eddfa4 100644 --- a/Audio/songMaps/ParasiflySingle.tres +++ b/Audio/songMaps/ParasiflySingle.tres @@ -122,7 +122,7 @@ Length = 0.0 script = ExtResource("2_qfjvo") Bpm = 60 NumLoops = 1 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "Song2.ogg" UpLaneData = [SubResource("Resource_3viwm"), SubResource("Resource_mcgpp"), SubResource("Resource_olklg"), SubResource("Resource_57g2b")] DownLaneData = [SubResource("Resource_svc5u"), SubResource("Resource_ienox"), SubResource("Resource_ax4q1"), SubResource("Resource_663rs"), SubResource("Resource_86xei"), SubResource("Resource_w3gx2"), SubResource("Resource_t01kg")] diff --git a/Audio/songMaps/Shapes.tres b/Audio/songMaps/Shapes.tres index ac1ea63a..25119e0e 100644 --- a/Audio/songMaps/Shapes.tres +++ b/Audio/songMaps/Shapes.tres @@ -187,7 +187,7 @@ Length = 0.0 script = ExtResource("2_j6rk8") Bpm = 107 NumLoops = 7 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "Shapes.ogg" UpLaneData = [SubResource("Resource_20ma1"), SubResource("Resource_t2x17"), SubResource("Resource_hsyk0"), SubResource("Resource_txx7m"), SubResource("Resource_uic3e"), SubResource("Resource_fy78b"), SubResource("Resource_p1dmw"), SubResource("Resource_7k1m6"), SubResource("Resource_e223l")] DownLaneData = [SubResource("Resource_egl41"), SubResource("Resource_j6rk8"), SubResource("Resource_61fe8"), SubResource("Resource_dmlrl"), SubResource("Resource_xny5e"), SubResource("Resource_sybk5"), SubResource("Resource_cs7yi"), SubResource("Resource_xv7yd"), SubResource("Resource_pfidy"), SubResource("Resource_n0y2d")] diff --git a/Audio/songMaps/Spider.tres b/Audio/songMaps/Spider.tres index 816c1b3d..b33870ef 100644 --- a/Audio/songMaps/Spider.tres +++ b/Audio/songMaps/Spider.tres @@ -137,7 +137,7 @@ Length = 0.0 script = ExtResource("2_ojgcg") Bpm = 130 NumLoops = 3 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "Spider.ogg" UpLaneData = [SubResource("Resource_j42ns"), SubResource("Resource_kihon"), SubResource("Resource_j43rp"), SubResource("Resource_3j8yo"), SubResource("Resource_vk213"), SubResource("Resource_dsydf")] DownLaneData = [SubResource("Resource_kilos"), SubResource("Resource_ojgcg"), SubResource("Resource_e2i3v"), SubResource("Resource_bxgte"), SubResource("Resource_7c41j"), SubResource("Resource_ibasm"), SubResource("Resource_57q1g")] diff --git a/Audio/songMaps/SquirkelSong.tres b/Audio/songMaps/SquirkelSong.tres index 7fa60430..eaef9def 100644 --- a/Audio/songMaps/SquirkelSong.tres +++ b/Audio/songMaps/SquirkelSong.tres @@ -87,9 +87,9 @@ Length = 0.0 script = ExtResource("2_s63u8") Bpm = 180 NumLoops = 5 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "SquirkelSong.ogg" -UpLaneData = [SubResource("Resource_50tbs"), SubResource("Resource_ttd2q")] -DownLaneData = [SubResource("Resource_ljr32"), SubResource("Resource_bb3yp"), SubResource("Resource_852ml"), SubResource("Resource_38nu8"), SubResource("Resource_3eydr"), SubResource("Resource_ct6sp"), SubResource("Resource_yk705"), SubResource("Resource_oocdv")] -LeftLaneData = [] -RightLaneData = [SubResource("Resource_uswjw"), SubResource("Resource_e1hbr"), SubResource("Resource_gryrv"), SubResource("Resource_kwtfb"), SubResource("Resource_c2bxv"), SubResource("Resource_7lpnw")] +UpLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_50tbs"), SubResource("Resource_ttd2q")]) +DownLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_ljr32"), SubResource("Resource_bb3yp"), SubResource("Resource_852ml"), SubResource("Resource_38nu8"), SubResource("Resource_3eydr"), SubResource("Resource_ct6sp"), SubResource("Resource_yk705"), SubResource("Resource_oocdv")]) +LeftLaneData = Array[ExtResource("1_8ueh4")]([]) +RightLaneData = Array[ExtResource("1_8ueh4")]([SubResource("Resource_uswjw"), SubResource("Resource_e1hbr"), SubResource("Resource_gryrv"), SubResource("Resource_kwtfb"), SubResource("Resource_c2bxv"), SubResource("Resource_7lpnw")]) diff --git a/Audio/songMaps/TutorialBoss176_7.tres b/Audio/songMaps/TutorialBoss176_7.tres index fc22a24b..adebdd64 100644 --- a/Audio/songMaps/TutorialBoss176_7.tres +++ b/Audio/songMaps/TutorialBoss176_7.tres @@ -292,7 +292,7 @@ Length = 0.0 script = ExtResource("2_gbai3") Bpm = 176 NumLoops = 7 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "District_Four.ogg" UpLaneData = [SubResource("Resource_w1u0b"), SubResource("Resource_gbai3"), SubResource("Resource_bcwc6"), SubResource("Resource_0k2f6"), SubResource("Resource_tgoco"), SubResource("Resource_x1j4d"), SubResource("Resource_e76xg"), SubResource("Resource_vhygb"), SubResource("Resource_unq76"), SubResource("Resource_cn75w"), SubResource("Resource_3pobr"), SubResource("Resource_43v1q"), SubResource("Resource_2i0ix"), SubResource("Resource_eo1b6"), SubResource("Resource_ehfsr"), SubResource("Resource_05gdy"), SubResource("Resource_b164v"), SubResource("Resource_86j1n"), SubResource("Resource_p6bp3"), SubResource("Resource_7erhr"), SubResource("Resource_n6xrx"), SubResource("Resource_75ujr"), SubResource("Resource_mlxr3"), SubResource("Resource_5vw1o"), SubResource("Resource_suuru")] DownLaneData = [SubResource("Resource_sxt82"), SubResource("Resource_j5ca6"), SubResource("Resource_cfyig"), SubResource("Resource_oq2fs"), SubResource("Resource_bv13m"), SubResource("Resource_lg6ov"), SubResource("Resource_eg7rs"), SubResource("Resource_x3k65"), SubResource("Resource_d5g7d"), SubResource("Resource_1cpsm"), SubResource("Resource_giltv")] diff --git a/Audio/songMaps/TutorialSong.tres b/Audio/songMaps/TutorialSong.tres index fd0a10f4..eaa80232 100644 --- a/Audio/songMaps/TutorialSong.tres +++ b/Audio/songMaps/TutorialSong.tres @@ -107,7 +107,7 @@ Length = 0.0 script = ExtResource("2_bsw0b") Bpm = 90 NumLoops = 1 -SongSpeed = -1.0 +SongSpeed = 200.0 SongMapLocation = "TutorialSong.ogg" UpLaneData = [SubResource("Resource_bnbk2"), SubResource("Resource_t2mc0"), SubResource("Resource_xl4h8"), SubResource("Resource_7i220"), SubResource("Resource_txc3y"), SubResource("Resource_iixj3"), SubResource("Resource_5o1tj"), SubResource("Resource_l3ivu"), SubResource("Resource_d6d5y")] DownLaneData = [SubResource("Resource_a0ovt"), SubResource("Resource_ahash"), SubResource("Resource_6gc2p"), SubResource("Resource_tjsh3"), SubResource("Resource_s18ys"), SubResource("Resource_wcsgu"), SubResource("Resource_r81qg"), SubResource("Resource_roxhp")] diff --git a/Classes/Notes/Assets/Note_PlayerBrass.png b/Classes/Notes/Assets/Note_PlayerBrass.png new file mode 100644 index 00000000..743b18e3 Binary files /dev/null and b/Classes/Notes/Assets/Note_PlayerBrass.png differ diff --git a/Classes/Notes/Assets/Note_PlayerBrass.png.import b/Classes/Notes/Assets/Note_PlayerBrass.png.import new file mode 100644 index 00000000..2200c58c --- /dev/null +++ b/Classes/Notes/Assets/Note_PlayerBrass.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5eg3uodp8qjj" +path="res://.godot/imported/Note_PlayerBrass.png-cef5666b6abc9b5c518867ec908822bd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Classes/Notes/Assets/Note_PlayerBrass.png" +dest_files=["res://.godot/imported/Note_PlayerBrass.png-cef5666b6abc9b5c518867ec908822bd.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Classes/Relics/Assets/Relic_LootersLens.png b/Classes/Relics/Assets/Relic_LootersLens.png new file mode 100644 index 00000000..a83958ff Binary files /dev/null and b/Classes/Relics/Assets/Relic_LootersLens.png differ diff --git a/Classes/Relics/Assets/Relic_LootersLens.png.import b/Classes/Relics/Assets/Relic_LootersLens.png.import new file mode 100644 index 00000000..3a8c1cdd --- /dev/null +++ b/Classes/Relics/Assets/Relic_LootersLens.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b1kavqh73arsv" +path="res://.godot/imported/Relic_LootersLens.png-fbad200d69c23fb6df24a1cee6ad0bd2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Classes/Relics/Assets/Relic_LootersLens.png" +dest_files=["res://.godot/imported/Relic_LootersLens.png-fbad200d69c23fb6df24a1cee6ad0bd2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Classes/Relics/Assets/Relic_Quito.png b/Classes/Relics/Assets/Relic_Quito.png new file mode 100644 index 00000000..de3f34a5 Binary files /dev/null and b/Classes/Relics/Assets/Relic_Quito.png differ diff --git a/Classes/Relics/Assets/Relic_Quito.png.import b/Classes/Relics/Assets/Relic_Quito.png.import new file mode 100644 index 00000000..ab35bc65 --- /dev/null +++ b/Classes/Relics/Assets/Relic_Quito.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://fqipkj25gbym" +path="res://.godot/imported/Relic_Quito.png-5c7f1276f14d3faa906bdf363c28e4f8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Classes/Relics/Assets/Relic_Quito.png" +dest_files=["res://.godot/imported/Relic_Quito.png-5c7f1276f14d3faa906bdf363c28e4f8.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Classes/Relics/Assets/Relic_Soloist'sTriangle.png b/Classes/Relics/Assets/Relic_Soloist'sTriangle.png new file mode 100644 index 00000000..6c992a5c Binary files /dev/null and b/Classes/Relics/Assets/Relic_Soloist'sTriangle.png differ diff --git a/Classes/Relics/Assets/Relic_Soloist'sTriangle.png.import b/Classes/Relics/Assets/Relic_Soloist'sTriangle.png.import new file mode 100644 index 00000000..97c95cd1 --- /dev/null +++ b/Classes/Relics/Assets/Relic_Soloist'sTriangle.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://drq2grd4nh0c5" +path="res://.godot/imported/Relic_Soloist'sTriangle.png-b379020270ecace18bdeff6920a65ad7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Classes/Relics/Assets/Relic_Soloist'sTriangle.png" +dest_files=["res://.godot/imported/Relic_Soloist'sTriangle.png-b379020270ecace18bdeff6920a65ad7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Classes/Relics/Assets/Relic_Tinsel.png b/Classes/Relics/Assets/Relic_Tinsel.png new file mode 100644 index 00000000..3f04aaa9 Binary files /dev/null and b/Classes/Relics/Assets/Relic_Tinsel.png differ diff --git a/Classes/Relics/Assets/Relic_Tinsel.png.import b/Classes/Relics/Assets/Relic_Tinsel.png.import new file mode 100644 index 00000000..c5dc2a3b --- /dev/null +++ b/Classes/Relics/Assets/Relic_Tinsel.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1n8xbesrvua8" +path="res://.godot/imported/Relic_Tinsel.png-1250f95620196fce37933afc2a2856ec.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Classes/Relics/Assets/Relic_Tinsel.png" +dest_files=["res://.godot/imported/Relic_Tinsel.png-1250f95620196fce37933afc2a2856ec.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Classes/Relics/Assets/Relic_WarHorn.png b/Classes/Relics/Assets/Relic_WarHorn.png new file mode 100644 index 00000000..7a18dd6d Binary files /dev/null and b/Classes/Relics/Assets/Relic_WarHorn.png differ diff --git a/Classes/Relics/Assets/Relic_WarHorn.png.import b/Classes/Relics/Assets/Relic_WarHorn.png.import new file mode 100644 index 00000000..0cba51ca --- /dev/null +++ b/Classes/Relics/Assets/Relic_WarHorn.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dk0ri03m3tns" +path="res://.godot/imported/Relic_WarHorn.png-e617c4620279dcc6112d25b0abc021c7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Classes/Relics/Assets/Relic_WarHorn.png" +dest_files=["res://.godot/imported/Relic_WarHorn.png-e617c4620279dcc6112d25b0abc021c7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Globals/FunkEngineNameSpace.cs b/Globals/FunkEngineNameSpace.cs index 2c896daf..f4777cb0 100644 --- a/Globals/FunkEngineNameSpace.cs +++ b/Globals/FunkEngineNameSpace.cs @@ -290,13 +290,25 @@ public Room[] GetRooms() return _rooms; } + public static bool ForceEliteBattles = false; + public class Room { public int Idx { get; private set; } public int[] Children { get; private set; } = []; public int X { get; private set; } public int Y { get; private set; } - public Stages Type { get; private set; } + public Stages Type + { + get + { + if (ForceEliteBattles && _type == Stages.Battle) + return Stages.Elite; + return _type; + } + private set { _type = value; } + } + private Stages _type; public Room(int idx, int x, int y) { diff --git a/Globals/Scribe.cs b/Globals/Scribe.cs index 358c7a18..f9fb9caa 100644 --- a/Globals/Scribe.cs +++ b/Globals/Scribe.cs @@ -244,6 +244,31 @@ public partial class Scribe : Node director.AddStatus(Targetting.Player, StatusEffect.Poison, amt); } ), + new Note( + 18, + "PlayerBrass", + GD.Load("res://Classes/Notes/Assets/Note_PlayerBrass.png"), + 0, + (director, note, timing) => + { + if (note.GetBaseVal() == 0) //Setup, so it doesn't trigger on place. + { + note.SetBaseVal(2); + return; + } + if (timing == Timing.Miss) + { + director.AddStatus(Targetting.Player, StatusEffect.Mulligan, 1); + return; + } + director.DealDamage( + Targetting.First, + note.GetBaseVal() * director.NPB.ComboMult, + note.Owner + ); + director.NPB.ResetCurrentCombo(); + } + ), }; public static readonly RelicTemplate[] RelicDictionary = new[] @@ -549,7 +574,7 @@ e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs { new RelicEffect( BattleEffectTrigger.OnDamageInstance, - 10, + 5, (e, self, val) => { if ( @@ -580,6 +605,114 @@ e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs ), } ), + new RelicTemplate( + 18, + "War Horn", + Rarity.Epic, + GD.Load("res://Classes/Relics/Assets/Relic_WarHorn.png"), + new RelicEffect[] + { + new RelicEffect( + BattleEffectTrigger.OnPickup, + 1, + (e, self, val) => + { + MapGrid.ForceEliteBattles = true; + } + ), + } + ), + new RelicTemplate( + 19, + "Looter's Lens", + Rarity.Uncommon, + GD.Load("res://Classes/Relics/Assets/Relic_LootersLens.png"), + new RelicEffect[] + { + new RelicEffect( + BattleEffectTrigger.OnPickup, + 1, + (e, self, val) => + { + StageProducer.PlayerStats.RewardAmountModifier += val; + } + ), + } + ), + new RelicTemplate( + 20, + "Quito", + Rarity.Legendary, + GD.Load("res://Classes/Relics/Assets/Relic_Quito.png"), + new RelicEffect[] + { + new RelicEffect( + BattleEffectTrigger.NoteHit, + 1, + (e, self, val) => + { + if ( + e is BattleDirector.Harbinger.NoteHitArgs noteArgs + && noteArgs.Note.Owner == e.BD.Player + && noteArgs.Timing != Timing.Miss + ) + { + noteArgs.Note.OnHit(e.BD, Timing.Bad); + } + } + ), + } + ), + new RelicTemplate( + 21, + "Soloist's Triangle", + Rarity.Epic, + GD.Load("res://Classes/Relics/Assets/Relic_Soloist'sTriangle.png"), + new RelicEffect[] + { + new RelicEffect( + BattleEffectTrigger.OnPickup, + 2, + (e, self, val) => + { + StageProducer.PlayerStats.ChartSpeedMultiplier *= val; + StageProducer.PlayerStats.RewardAmountModifier += 3; + } + ), + } + ), + new RelicTemplate( + 22, + "Tinsel", + Rarity.Legendary, + GD.Load("res://Classes/Relics/Assets/Relic_Tinsel.png"), + new RelicEffect[] // all this combined might be OP, but just slowing down the speed felt boring for a legendary + { + new RelicEffect( + BattleEffectTrigger.OnPickup, + 2, + (e, self, val) => + { + StageProducer.PlayerStats.ChartSpeedMultiplier /= val; + } + ), + new RelicEffect( + BattleEffectTrigger.OnDamageInstance, + 1, + (e, self, val) => + { + if ( + e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs + && dmgArgs.Dmg.Target == e.BD.Player + && dmgArgs.Dmg.Damage > 1 + ) + { + dmgArgs.Dmg.ModifyDamage(-val); + } + } + ), + } + ), }; private static string DefaultNoteChartPath = "Audio/songMaps/"; diff --git a/Globals/StageProducer.cs b/Globals/StageProducer.cs index 396c1b9e..60bdba74 100644 --- a/Globals/StageProducer.cs +++ b/Globals/StageProducer.cs @@ -84,6 +84,7 @@ private void StartNewGame() EventScene.EventPool = null; Scribe.InitRelicPools(); IsInitialized = true; + MapGrid.ForceEliteBattles = false; } private bool LoadGame() diff --git a/Globals/Translations/Translations.csv b/Globals/Translations/Translations.csv index 48b4b286..8becc026 100644 --- a/Globals/Translations/Translations.csv +++ b/Globals/Translations/Translations.csv @@ -71,10 +71,12 @@ NOTE_PLAYERECHO_NAME,Echo Note,回音符 NOTE_PLAYERECHO_TOOLTIP,Deals more damage with each loop.,每次循环造成更多伤害。 NOTE_PLAYERPOISON_NAME,Poison Note,毒药音符 NOTE_PLAYERPOISON_TOOLTIP,Applies stacks of poison based on timing.,根据时机施加中毒层数。 -NOTE_PLAYERMONEY_NAME,Money Note,钱的便条 +NOTE_PLAYERMONEY_NAME,Money Note,金钱音符 NOTE_PLAYERMONEY_TOOLTIP,"Deals no damage, but gives you money when hit.",不会造成伤害，但命中时会获得金钱。 NOTE_PLAYERCOMBO_NAME,Combo Note,连击音符 NOTE_PLAYERCOMBO_TOOLTIP,"Deals no damage, but gives you double the combo bar charge when hit.",不会造成伤害，但命中时会获得双倍连击槽充能。 +NOTE_PLAYERBRASS_NAME,Brass Cannon Note,铜管加农炮音符 +NOTE_PLAYERBRASS_TOOLTIP,"Can be missed without penalty. When hit, deals double the multiplier in damage, then resets the current multiplier.",失误不计。命中时，造成双倍连击倍率伤害，并重置当前连击倍率。 RELIC_BREAKFAST_NAME,Breakfast,早餐 RELIC_BREAKFAST_TOOLTIP,Increases max hp.,提高最大生命值 RELIC_GOODVIBES_NAME,Good Vibes,良好消息 @@ -111,6 +113,16 @@ RELIC_BLOODMONEY_NAME,Blood Money,血腥钱袋 RELIC_BLOODMONEY_TOOLTIP,Gain money when taking damage below half health.,在生命值低于一半时受到伤害可获得金钱。 RELIC_COUPON_NAME,Coupon,优惠券 RELIC_COUPON_TOOLTIP,Get a 10% discount on notes and relics in the shop.,在商店购买音符和遗物时可享受9折优惠。 +RELIC_WARHORN_NAME,War Horn,战号 +RELIC_WARHORN_TOOLTIP,All normal battles are now elite battles.,所有普通战斗现在都会变为精英战斗。 +RELIC_LOOTER'SLENS_NAME,Looter's Lens,盗贼之镜片 +RELIC_LOOTER'SLENS_TOOLTIP,Can see one more item in reward selection screens.,在奖励选择界面上可以多看到一个物品。 +RELIC_QUITO_NAME,Quito,基多 +RELIC_QUITO_TOOLTIP,"Quito mimics the player, duplicating all of their notes with bad timing.",基多模仿玩家，"复制他们所有的音符，但时机很差。" +RELIC_SOLOIST'STRIANGLE_NAME,Soloist's Triangle,独奏者的三角铁 +RELIC_SOLOIST'STRIANGLE_TOOLTIP,"Charts move at double speed, reward selections have 3 additional options to choose from.","谱面移动速度加倍，奖励选择中额外提供3个选项。" +RELIC_TINSEL_NAME,Tinsel,廷瑟 +RELIC_TINSEL_TOOLTIP,"Become an aspect of the turtle. Charts move at half speed, and all damage taken is reduced by 1 (damage cannot be reduced below 1).","化身为龟之化身。图表移动速度减半，所受伤害减少1点（伤害最低为1点）。" INVENTORY_TAB_NOTES,Notes,乐谱 INVENTORY_TAB_RELICS,Relics,遗物 OPTIONS_VOLUME_LABEL,Master Volume,最终音量设置 diff --git a/Scenes/BattleDirector/Scripts/BattleDirector.cs b/Scenes/BattleDirector/Scripts/BattleDirector.cs index 7e9a4276..55c17661 100644 --- a/Scenes/BattleDirector/Scripts/BattleDirector.cs +++ b/Scenes/BattleDirector/Scripts/BattleDirector.cs @@ -236,7 +236,7 @@ public bool PlayerAddNote(ArrowType type, Beat beat) if (!NPB.CanPlaceNote()) return false; - Note noteToPlace = NPB.NotePlaced(); + Note noteToPlace = NPB.NotePlaced().Clone(); noteToPlace.OnHit(this, Timing.Okay); CD.AddPlayerNote(noteToPlace.SetOwner(Player), type, beat); diff --git a/Scenes/BattleDirector/Scripts/NotePlacementBar.cs b/Scenes/BattleDirector/Scripts/NotePlacementBar.cs index ad0f7cf7..d69e5314 100644 --- a/Scenes/BattleDirector/Scripts/NotePlacementBar.cs +++ b/Scenes/BattleDirector/Scripts/NotePlacementBar.cs @@ -48,7 +48,7 @@ private double CurrentBarValue private int _currentCombo; private int MaxComboMult; - private int ComboMult => + public int ComboMult => Math.Min(_currentCombo / _notesToIncreaseCombo + 1 + _bonusMult, MaxComboMult); private int _bonusMult; private int _notesToIncreaseCombo; diff --git a/Scenes/ChartViewport/Scripts/ChartManager.cs b/Scenes/ChartViewport/Scripts/ChartManager.cs index 2d28aaab..e4db9e61 100644 --- a/Scenes/ChartViewport/Scripts/ChartManager.cs +++ b/Scenes/ChartViewport/Scripts/ChartManager.cs @@ -84,7 +84,8 @@ public void Initialize(NoteChart songData, double songLen) double loopLen = songLen / songData.NumLoops; if (songData.SongSpeed > 0) - _chartLength = songData.SongSpeed * loopLen; + _chartLength = + songData.SongSpeed * loopLen * StageProducer.PlayerStats.ChartSpeedMultiplier; //99% sure chart length can never be less than (chart viewport width) * 2, //otherwise there isn't room for things to loop from off and on screen _chartLength = Math.Max( diff --git a/Scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs b/Scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs index 90d2f495..9198c3b9 100644 --- a/Scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs +++ b/Scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs @@ -8,9 +8,9 @@ public partial class P_BossBlood : EnemyPuppet public override void _Ready() { - MaxHealth = 225; + MaxHealth = 250; CurrentHealth = MaxHealth; - BaseMoney = 15; + BaseMoney = 50; InitialNote = (14, 3); base._Ready(); var enemTween = CreateTween(); @@ -26,7 +26,7 @@ public override void _Ready() new EnemyEffect( this, BattleEffectTrigger.OnLoop, - 20, + 30, (e, eff, val) => { eff.Owner.Heal(val); diff --git a/Scenes/Puppets/Enemies/CyberFox/P_CyberFox.cs b/Scenes/Puppets/Enemies/CyberFox/P_CyberFox.cs index 7e381731..985adf80 100644 --- a/Scenes/Puppets/Enemies/CyberFox/P_CyberFox.cs +++ b/Scenes/Puppets/Enemies/CyberFox/P_CyberFox.cs @@ -14,7 +14,7 @@ public override void _Ready() { MaxHealth = 130; CurrentHealth = MaxHealth; - BaseMoney = 5; + BaseMoney = 20; base._Ready(); var enemTween = CreateTween(); enemTween.TweenProperty(Sprite, "position", Vector2.Right * 10, 0.5f).AsRelative(); diff --git a/Scenes/Puppets/Enemies/Effigy/P_Effigy.cs b/Scenes/Puppets/Enemies/Effigy/P_Effigy.cs index 6373e338..fb510cd6 100644 --- a/Scenes/Puppets/Enemies/Effigy/P_Effigy.cs +++ b/Scenes/Puppets/Enemies/Effigy/P_Effigy.cs @@ -10,7 +10,7 @@ public partial class P_Effigy : EnemyPuppet public override void _Ready() { MaxHealth = 124; - BaseMoney = 99; + BaseMoney = 80; CurrentHealth = MaxHealth; base._Ready(); diff --git a/Scenes/Puppets/Enemies/Holograeme/P_Holograeme.cs b/Scenes/Puppets/Enemies/Holograeme/P_Holograeme.cs index 92925afd..49ff3cc8 100644 --- a/Scenes/Puppets/Enemies/Holograeme/P_Holograeme.cs +++ b/Scenes/Puppets/Enemies/Holograeme/P_Holograeme.cs @@ -27,7 +27,7 @@ public override void _Ready() Conductor.BeatSpawnOffsetModifier = 1; MaxHealth = 3; CurrentHealth = MaxHealth; - BaseMoney = 20; + BaseMoney = 40; base._Ready(); _hands[0] = _redHand; diff --git a/Scenes/Puppets/Enemies/Keythulu/P_Keythulu.cs b/Scenes/Puppets/Enemies/Keythulu/P_Keythulu.cs index 91fff8ea..fb91b3ac 100644 --- a/Scenes/Puppets/Enemies/Keythulu/P_Keythulu.cs +++ b/Scenes/Puppets/Enemies/Keythulu/P_Keythulu.cs @@ -14,7 +14,7 @@ public override void _Ready() { MaxHealth = 500; CurrentHealth = MaxHealth; - BaseMoney = 50; + BaseMoney = 80; base._Ready(); _effectSprite.Visible = false; @@ -32,7 +32,7 @@ public override void _Ready() new EnemyEffect( this, BattleEffectTrigger.OnBattleStart, - 7, + 6, (e, eff, val) => { e.BD.AddStatus(Targetting.Player, StatusEffect.MindCrush, val); diff --git a/Scenes/Puppets/Enemies/LWS/P_LWS.cs b/Scenes/Puppets/Enemies/LWS/P_LWS.cs index e02e0bd6..4da24ce9 100644 --- a/Scenes/Puppets/Enemies/LWS/P_LWS.cs +++ b/Scenes/Puppets/Enemies/LWS/P_LWS.cs @@ -10,7 +10,7 @@ public override void _Ready() { MaxHealth = 80; CurrentHealth = MaxHealth; - BaseMoney = 8; + BaseMoney = 10; InitialNote = (16, 3); base._Ready(); var enemyTween = CreateTween(); diff --git a/Scenes/Puppets/Enemies/Mushroom/P_Mushroom.cs b/Scenes/Puppets/Enemies/Mushroom/P_Mushroom.cs index b8b3283a..4ad1ce8c 100644 --- a/Scenes/Puppets/Enemies/Mushroom/P_Mushroom.cs +++ b/Scenes/Puppets/Enemies/Mushroom/P_Mushroom.cs @@ -9,9 +9,9 @@ public partial class P_Mushroom : EnemyPuppet public override void _Ready() { - MaxHealth = 200; + MaxHealth = 150; CurrentHealth = MaxHealth; - BaseMoney = 10; + BaseMoney = 20; InitialNote = (17, 1); base._Ready(); BattleEvents = new EnemyEffect[] diff --git a/Scenes/Puppets/Enemies/Parasifly/P_Parasifly.cs b/Scenes/Puppets/Enemies/Parasifly/P_Parasifly.cs index cd26339a..bf27cee0 100644 --- a/Scenes/Puppets/Enemies/Parasifly/P_Parasifly.cs +++ b/Scenes/Puppets/Enemies/Parasifly/P_Parasifly.cs @@ -8,9 +8,9 @@ public partial class P_Parasifly : EnemyPuppet public override void _Ready() { - MaxHealth = 100; + MaxHealth = 75; CurrentHealth = MaxHealth; - BaseMoney = 5; + BaseMoney = 7; InitialNote = (13, 2); base._Ready(); var enemTween = CreateTween(); diff --git a/Scenes/Puppets/Enemies/Shapes/P_Shapes.cs b/Scenes/Puppets/Enemies/Shapes/P_Shapes.cs index c3e75288..d8f249f3 100644 --- a/Scenes/Puppets/Enemies/Shapes/P_Shapes.cs +++ b/Scenes/Puppets/Enemies/Shapes/P_Shapes.cs @@ -10,7 +10,7 @@ public override void _Ready() { MaxHealth = 150; CurrentHealth = MaxHealth; - BaseMoney = 10; + BaseMoney = 20; base._Ready(); var enemTween = CreateTween(); enemTween.TweenProperty(Sprite, "position", Vector2.Right * 10, 3f).AsRelative(); diff --git a/Scenes/Puppets/Enemies/Spider/P_Spider.cs b/Scenes/Puppets/Enemies/Spider/P_Spider.cs index 256684ad..9febd0bd 100644 --- a/Scenes/Puppets/Enemies/Spider/P_Spider.cs +++ b/Scenes/Puppets/Enemies/Spider/P_Spider.cs @@ -8,7 +8,7 @@ public partial class P_Spider : EnemyPuppet public override void _Ready() { - MaxHealth = 100; + MaxHealth = 60; CurrentHealth = MaxHealth; BaseMoney = 5; InitialNote = (15, 2); diff --git a/Scenes/Puppets/Enemies/Squirkel/P_Squirkel.cs b/Scenes/Puppets/Enemies/Squirkel/P_Squirkel.cs index 8c6dbab7..fa903499 100644 --- a/Scenes/Puppets/Enemies/Squirkel/P_Squirkel.cs +++ b/Scenes/Puppets/Enemies/Squirkel/P_Squirkel.cs @@ -11,7 +11,7 @@ public override void _Ready() { MaxHealth = 90; CurrentHealth = MaxHealth; - BaseMoney = 5; + BaseMoney = 10; base._Ready(); var tween = CreateTween(); diff --git a/Scenes/Puppets/Enemies/Strawman/P_Strawman.cs b/Scenes/Puppets/Enemies/Strawman/P_Strawman.cs index 564f9a08..cfb99b03 100644 --- a/Scenes/Puppets/Enemies/Strawman/P_Strawman.cs +++ b/Scenes/Puppets/Enemies/Strawman/P_Strawman.cs @@ -13,7 +13,7 @@ public override void _Ready() { CurrentHealth = 40; MaxHealth = 40; - BaseMoney = 1; + BaseMoney = 5; base._Ready(); BattleEvents = new EnemyEffect[] diff --git a/Scenes/Puppets/Enemies/TheGWS/P_TheGWS.cs b/Scenes/Puppets/Enemies/TheGWS/P_TheGWS.cs index ebd3d242..b119fdbd 100644 --- a/Scenes/Puppets/Enemies/TheGWS/P_TheGWS.cs +++ b/Scenes/Puppets/Enemies/TheGWS/P_TheGWS.cs @@ -10,7 +10,7 @@ public override void _Ready() { MaxHealth = 150; CurrentHealth = MaxHealth; - BaseMoney = 10; + BaseMoney = 20; InitialNote = (10, 7); base._Ready(); var enemTween = CreateTween(); diff --git a/Scenes/Puppets/Enemies/TheGobbler/P_Gobbler.cs b/Scenes/Puppets/Enemies/TheGobbler/P_Gobbler.cs index a0fa417d..f620243c 100644 --- a/Scenes/Puppets/Enemies/TheGobbler/P_Gobbler.cs +++ b/Scenes/Puppets/Enemies/TheGobbler/P_Gobbler.cs @@ -11,7 +11,7 @@ public override void _Ready() { MaxHealth = 150; CurrentHealth = MaxHealth; - BaseMoney = 10; + BaseMoney = 20; base._Ready(); var enemTween = CreateTween(); enemTween.TweenProperty(Sprite, "position", Vector2.Right * 10, 3f).AsRelative(); diff --git a/Scenes/Puppets/Enemies/Turtle/P_Turtle.cs b/Scenes/Puppets/Enemies/Turtle/P_Turtle.cs index 5b25cc85..47ad8089 100644 --- a/Scenes/Puppets/Enemies/Turtle/P_Turtle.cs +++ b/Scenes/Puppets/Enemies/Turtle/P_Turtle.cs @@ -8,9 +8,9 @@ public partial class P_Turtle : EnemyPuppet public override void _Ready() { - MaxHealth = 150; + MaxHealth = 225; CurrentHealth = MaxHealth; - BaseMoney = 10; + BaseMoney = 40; base._Ready(); var enemTween = CreateTween(); enemTween.TweenProperty(Sprite, "position", Vector2.Right * 10, 3f).AsRelative(); diff --git a/Scenes/Puppets/Scripts/PlayerStats.cs b/Scenes/Puppets/Scripts/PlayerStats.cs index 3d3581f7..15556d34 100644 --- a/Scenes/Puppets/Scripts/PlayerStats.cs +++ b/Scenes/Puppets/Scripts/PlayerStats.cs @@ -16,6 +16,7 @@ public partial class PlayerStats : Resource public int Rerolls = 0; public int Shortcuts = 0; public int DiscountPercent = 0; + public float ChartSpeedMultiplier = 1f; //Array in order of descending rarities, Legendary -> ... Common. Int odds out of 100. public int[] RarityOdds = [1, 5, 10, 20, 100]; diff --git a/Scenes/ShopScene/Scripts/ShopScene.cs b/Scenes/ShopScene/Scripts/ShopScene.cs index 814b4334..2febce87 100644 --- a/Scenes/ShopScene/Scripts/ShopScene.cs +++ b/Scenes/ShopScene/Scripts/ShopScene.cs @@ -58,8 +58,8 @@ public partial class ShopScene : Control private ButtonGroup _bGroup; - private readonly int[] _priceByRarity = [100, 90, 80, 70, 60, 50, 9]; - const int NoteCost = 45; + private readonly int[] _priceByRarity = [200, 180, 160, 140, 120, 100, 18]; + const int NoteCost = 90; private List _shopItems = new List(); @@ -251,7 +251,7 @@ private void ChangeDescription(IDisplayable displayable) _descriptionLabel.Text = Tr(type + name + "_NAME") + ": " + Tr(type + name + "_TOOLTIP"); } - private const int RemovalCost = 50; + private const int RemovalCost = 75; private bool _hasRemoved; private void OpenRemovalPane() @@ -331,7 +331,7 @@ private void RemoveNote() } private bool _hasHealed; - private const int HealCost = 30; + private const int HealCost = 50; private int _healAmount = (StageProducer.PlayerStats.MaxHealth / 4); private void UpdateHealButton() diff --git a/Scenes/UI/Scripts/ScoringScreen.cs b/Scenes/UI/Scripts/ScoringScreen.cs index a37d24e2..1e327173 100644 --- a/Scenes/UI/Scripts/ScoringScreen.cs +++ b/Scenes/UI/Scripts/ScoringScreen.cs @@ -124,7 +124,7 @@ private void GenerateScore(ScoreGuide info) _perfectMulti = 1 + (float)info.TotalPerfects / (info.TotalHits - info.TotalPlaced); if (float.IsNaN(_perfectMulti)) _perfectMulti = 1; - _placedMulti = Math.Max(2 - (float)Math.Abs(info.TotalPlaced - info.BaseMoney) / 10, 1); + _placedMulti = Math.Min(1 + (float)info.TotalPlaced / 20, 2); _relicBonus = info.RelicBonus; DrawScoreLabels(); }