From ea656dfb7a157b94b8fbafae20f14de23e476d59 Mon Sep 17 00:00:00 2001 From: horbel Date: Wed, 14 May 2025 16:43:01 +0300 Subject: [PATCH] Name sorting update --- gml_Object_ba1_Mouse_7.gml | 4 ++-- gml_Object_ba2_Mouse_7.gml | 4 ++-- gml_Object_ba3_Mouse_7.gml | 4 ++-- gml_Object_ba4_Mouse_10.gml | 2 +- gml_Object_ba4_Mouse_7.gml | 9 +++++++-- gml_Object_ba5_Mouse_10.gml | 2 +- gml_Object_ba5_Mouse_7.gml | 7 +------ gml_Object_textx_Draw_0.gml | 18 +++++++++--------- gml_Object_textx_new_Draw_0.gml | 20 ++++++++++---------- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/gml_Object_ba1_Mouse_7.gml b/gml_Object_ba1_Mouse_7.gml index 2813423..a53fb0a 100644 --- a/gml_Object_ba1_Mouse_7.gml +++ b/gml_Object_ba1_Mouse_7.gml @@ -71,7 +71,7 @@ else if (global.recipemode == "f") else if (global.recipemode == "g") { global.indexphase = "home" - global.recipeindex = 4 + global.recipeindex = 7 } else if (global.recipemode == "m") { @@ -81,7 +81,7 @@ else if (global.recipemode == "m") else if (global.recipemode == "p") { global.indexphase = "home" - global.recipeindex = 22 + global.recipeindex = 4 } else if (global.recipemode == "s") { diff --git a/gml_Object_ba2_Mouse_7.gml b/gml_Object_ba2_Mouse_7.gml index 443b824..0b27d72 100644 --- a/gml_Object_ba2_Mouse_7.gml +++ b/gml_Object_ba2_Mouse_7.gml @@ -71,7 +71,7 @@ else if (global.recipemode == "f") else if (global.recipemode == "g") { global.indexphase = "home" - global.recipeindex = 7 + global.recipeindex = 19 } else if (global.recipemode == "m") { @@ -81,7 +81,7 @@ else if (global.recipemode == "m") else if (global.recipemode == "p") { global.indexphase = "home" - global.recipeindex = 23 + global.recipeindex = 22 } else if (global.recipemode == "s") { diff --git a/gml_Object_ba3_Mouse_7.gml b/gml_Object_ba3_Mouse_7.gml index e1b93cd..b9d706a 100644 --- a/gml_Object_ba3_Mouse_7.gml +++ b/gml_Object_ba3_Mouse_7.gml @@ -61,7 +61,7 @@ else if (global.recipemode == "c") else if (global.recipemode == "g") { global.indexphase = "home" - global.recipeindex = 19 + global.recipeindex = 13 } else if (global.recipemode == "m") { @@ -71,7 +71,7 @@ else if (global.recipemode == "m") else if (global.recipemode == "p") { global.indexphase = "home" - global.recipeindex = 20 + global.recipeindex = 23 } else if (global.recipemode == "s") { diff --git a/gml_Object_ba4_Mouse_10.gml b/gml_Object_ba4_Mouse_10.gml index ce0575f..549daa8 100644 --- a/gml_Object_ba4_Mouse_10.gml +++ b/gml_Object_ba4_Mouse_10.gml @@ -1,5 +1,5 @@ hover = 1 -if ((!hoversound) && global.recipemode != "index" && global.indexphase != "ex" && global.recipemode != "spicy" && global.recipemode != "classic" && global.recipemode != "b" && global.recipemode != "f" && global.recipemode != "p" && global.recipemode != "s" && global.recipemode != "z") +if ((!hoversound) && global.recipemode != "index" && global.indexphase != "ex" && global.recipemode != "spicy" && global.recipemode != "classic" && global.recipemode != "b" && global.recipemode != "f" && global.recipemode != "s" && global.recipemode != "z") { hoversound = 1 audio_play_sound(mouse_hover, 1, false) diff --git a/gml_Object_ba4_Mouse_7.gml b/gml_Object_ba4_Mouse_7.gml index 2693915..a067085 100644 --- a/gml_Object_ba4_Mouse_7.gml +++ b/gml_Object_ba4_Mouse_7.gml @@ -1,4 +1,4 @@ -if (global.recipemode != "index" && global.indexphase != "ex" && global.recipemode != "spicy" && global.recipemode != "classic" && global.recipemode != "b" && global.recipemode != "f" && global.recipemode != "p" && global.recipemode != "s" && global.recipemode != "z") +if (global.recipemode != "index" && global.indexphase != "ex" && global.recipemode != "spicy" && global.recipemode != "classic" && global.recipemode != "b" && global.recipemode != "f" && global.recipemode != "s" && global.recipemode != "z") { audio_play_sound(jukechange, 1, false) audio_sound_gain(jukechange, ((global.sfxvolume - 20) / 100), 0) @@ -51,10 +51,15 @@ else if (global.recipemode == "c") else if (global.recipemode == "g") { global.indexphase = "home" - global.recipeindex = 13 + global.recipeindex = 3 } else if (global.recipemode == "m") { global.indexphase = "home" global.recipeindex = 11 } +else if (global.recipemode == "p") +{ + global.indexphase = "home" + global.recipeindex = 20 +} diff --git a/gml_Object_ba5_Mouse_10.gml b/gml_Object_ba5_Mouse_10.gml index edd3b04..9720d0d 100644 --- a/gml_Object_ba5_Mouse_10.gml +++ b/gml_Object_ba5_Mouse_10.gml @@ -1,5 +1,5 @@ hover = 1 -if ((!hoversound) && global.recipemode != "index" && global.indexphase != "ex" && (global.recipemode == "g" || global.recipemode == "m" || global.recipemode == "sweet" || global.recipemode == "bitter" || global.recipemode == "sour" || global.recipemode == "girly" || global.recipemode == "manly" || global.recipemode == "classy" || global.recipemode == "promo")) +if ((!hoversound) && global.recipemode != "index" && global.indexphase != "ex" && (global.recipemode == "m" || global.recipemode == "sweet" || global.recipemode == "bitter" || global.recipemode == "sour" || global.recipemode == "girly" || global.recipemode == "manly" || global.recipemode == "classy" || global.recipemode == "promo")) { hoversound = 1 audio_play_sound(mouse_hover, 1, false) diff --git a/gml_Object_ba5_Mouse_7.gml b/gml_Object_ba5_Mouse_7.gml index 993e420..786e62d 100644 --- a/gml_Object_ba5_Mouse_7.gml +++ b/gml_Object_ba5_Mouse_7.gml @@ -1,4 +1,4 @@ -if (global.recipemode != "index" && global.indexphase != "ex" && (global.recipemode == "g" || global.recipemode == "m" || global.recipemode == "sweet" || global.recipemode == "bitter" || global.recipemode == "sour" || global.recipemode == "girly" || global.recipemode == "manly" || global.recipemode == "classy" || global.recipemode == "promo")) +if (global.recipemode != "index" && global.indexphase != "ex" && (global.recipemode == "m" || global.recipemode == "sweet" || global.recipemode == "bitter" || global.recipemode == "sour" || global.recipemode == "girly" || global.recipemode == "manly" || global.recipemode == "classy" || global.recipemode == "promo")) { audio_play_sound(jukechange, 2, false) audio_sound_gain(jukechange, ((global.sfxvolume - 20) / 100), 0) @@ -38,11 +38,6 @@ else if (global.recipemode == "promo") global.indexphase = "home" global.recipeindex = 18 } -else if (global.recipemode == "g") -{ - global.indexphase = "home" - global.recipeindex = 3 -} else if (global.recipemode == "m") { global.indexphase = "home" diff --git a/gml_Object_textx_Draw_0.gml b/gml_Object_textx_Draw_0.gml index a01b923..35c05a1 100644 --- a/gml_Object_textx_Draw_0.gml +++ b/gml_Object_textx_Draw_0.gml @@ -226,11 +226,11 @@ if (global.indexphase != "home") else if (global.recipemode == "f") draw_text((ba1.x + 5), (ba1.y + 3), string(global.fringeweaver_str)) else if (global.recipemode == "g") - draw_text((ba1.x + 5), (ba1.y + 3), string(global.bloomlight_str)) + draw_text((ba1.x + 5), (ba1.y + 3), string(global.cobaltvelvet_str)) else if (global.recipemode == "m") draw_text((ba1.x + 5), (ba1.y + 3), string(global.beer_str)) else if (global.recipemode == "p") - draw_text((ba1.x + 5), (ba1.y + 3), string(global.sunshinecloud_str)) + draw_text((ba1.x + 5), (ba1.y + 3), string(global.bloomlight_str)) else if (global.recipemode == "s") draw_text((ba1.x + 5), (ba1.y + 3), string(global.badtouch_str)) if ba2.hover @@ -264,11 +264,11 @@ if (global.indexphase != "home") else if (global.recipemode == "f") draw_text((ba2.x + 5), (ba2.y + 3), string(global.zenstar_str)) else if (global.recipemode == "g") - draw_text((ba2.x + 5), (ba2.y + 3), string(global.cobaltvelvet_str)) + draw_text((ba2.x + 5), (ba2.y + 3), string(global.piledriver_str)) else if (global.recipemode == "m") draw_text((ba2.x + 5), (ba2.y + 3), string(global.pianoman_str)) else if (global.recipemode == "p") - draw_text((ba2.x + 5), (ba2.y + 3), string(global.suplex_str)) + draw_text((ba2.x + 5), (ba2.y + 3), string(global.sunshinecloud_str)) else if (global.recipemode == "s") draw_text((ba2.x + 5), (ba2.y + 3), string(global.grizzlytemple_str)) if ba3.hover @@ -298,11 +298,11 @@ if (global.indexphase != "home") else if (global.recipemode == "c") draw_text((ba3.x + 5), (ba3.y + 3), string(global.moonblast_str)) else if (global.recipemode == "g") - draw_text((ba3.x + 5), (ba3.y + 3), string(global.piledriver_str)) + draw_text((ba3.x + 5), (ba3.y + 3), string(global.gutpunch_str)) else if (global.recipemode == "m") draw_text((ba3.x + 5), (ba3.y + 3), string(global.pianowoman_str)) else if (global.recipemode == "p") - draw_text((ba3.x + 5), (ba3.y + 3), string(global.sparklestar_str)) + draw_text((ba3.x + 5), (ba3.y + 3), string(global.suplex_str)) else if (global.recipemode == "s") draw_text((ba3.x + 5), (ba3.y + 3), string(global.sugarrush_str)) if ba4.hover @@ -328,7 +328,9 @@ if (global.indexphase != "home") else if (global.recipemode == "c") draw_text((ba4.x + 5), (ba4.y + 3), string(global.crevicespike_str)) else if (global.recipemode == "g") - draw_text((ba4.x + 5), (ba4.y + 3), string(global.gutpunch_str)) + draw_text((ba4.x + 5), (ba4.y + 3), string(global.bleedingjane_str)) + else if (global.recipemode == "p") + draw_text((ba4.x + 5), (ba4.y + 3), string(global.sparklestar_str)) else if (global.recipemode == "m") draw_text((ba4.x + 5), (ba4.y + 3), string(global.frothywater_str)) if ba5.hover @@ -349,8 +351,6 @@ if (global.indexphase != "home") draw_text((ba5.x + 5), (ba5.y + 3), string(global.mercuryblast_str)) else if (global.recipemode == "promo") draw_text((ba5.x + 5), (ba5.y + 3), string(global.pianowoman_str)) - else if (global.recipemode == "g") - draw_text((ba5.x + 5), (ba5.y + 3), string(global.bleedingjane_str)) else if (global.recipemode == "m") draw_text((ba5.x + 5), (ba5.y + 3), string(global.fluffydream_str)) if ba6.hover diff --git a/gml_Object_textx_new_Draw_0.gml b/gml_Object_textx_new_Draw_0.gml index 1f98149..6e6fe82 100644 --- a/gml_Object_textx_new_Draw_0.gml +++ b/gml_Object_textx_new_Draw_0.gml @@ -236,11 +236,11 @@ if (global.indexphase != "home") else if (global.recipemode == "f") draw_text((ba1.x + 5), (ba1.y + 3), string(global.fringeweaver_str)) else if (global.recipemode == "g") - draw_text((ba1.x + 5), (ba1.y + 3), string(global.bloomlight_str)) + draw_text((ba1.x + 5), (ba1.y + 3), string(global.cobaltvelvet_str)) else if (global.recipemode == "m") draw_text((ba1.x + 5), (ba1.y + 3), string(global.beer_str)) else if (global.recipemode == "p") - draw_text((ba1.x + 5), (ba1.y + 3), string(global.sunshinecloud_str)) + draw_text((ba1.x + 5), (ba1.y + 3), string(global.bloomlight_str)) else if (global.recipemode == "s") draw_text((ba1.x + 5), (ba1.y + 3), string(global.badtouch_str)) if ba2.hover @@ -274,11 +274,11 @@ if (global.indexphase != "home") else if (global.recipemode == "f") draw_text((ba2.x + 5), (ba2.y + 3), string(global.zenstar_str)) else if (global.recipemode == "g") - draw_text((ba2.x + 5), (ba2.y + 3), string(global.cobaltvelvet_str)) + draw_text((ba2.x + 5), (ba2.y + 3), string(global.piledriver_str)) else if (global.recipemode == "m") draw_text((ba2.x + 5), (ba2.y + 3), string(global.pianoman_str)) else if (global.recipemode == "p") - draw_text((ba2.x + 5), (ba2.y + 3), string(global.suplex_str)) + draw_text((ba2.x + 5), (ba2.y + 3), string(global.sunshinecloud_str)) else if (global.recipemode == "s") draw_text((ba2.x + 5), (ba2.y + 3), string(global.grizzlytemple_str)) if ba3.hover @@ -308,11 +308,11 @@ if (global.indexphase != "home") else if (global.recipemode == "c") draw_text((ba3.x + 5), (ba3.y + 3), string(global.moonblast_str)) else if (global.recipemode == "g") - draw_text((ba3.x + 5), (ba3.y + 3), string(global.piledriver_str)) + draw_text((ba3.x + 5), (ba3.y + 3), string(global.gutpunch_str)) else if (global.recipemode == "m") draw_text((ba3.x + 5), (ba3.y + 3), string(global.pianowoman_str)) else if (global.recipemode == "p") - draw_text((ba3.x + 5), (ba3.y + 3), string(global.sparklestar_str)) + draw_text((ba3.x + 5), (ba3.y + 3), string(global.suplex_str)) else if (global.recipemode == "s") draw_text((ba3.x + 5), (ba3.y + 3), string(global.sugarrush_str)) if ba4.hover @@ -335,10 +335,12 @@ if (global.indexphase != "home") draw_text((ba4.x + 5), (ba4.y + 3), string(global.fringeweaver_str)) else if (global.recipemode == "promo") draw_text((ba4.x + 5), (ba4.y + 3), string(global.pianoman_str)) - else if (global.recipemode == "c") + else if (global.recipemode == "c") draw_text((ba4.x + 5), (ba4.y + 3), string(global.crevicespike_str)) else if (global.recipemode == "g") - draw_text((ba4.x + 5), (ba4.y + 3), string(global.gutpunch_str)) + draw_text((ba4.x + 5), (ba4.y + 3), string(global.bleedingjane_str)) + else if (global.recipemode == "p") + draw_text((ba4.x + 5), (ba4.y + 3), string(global.sparklestar_str)) else if (global.recipemode == "m") draw_text((ba4.x + 5), (ba4.y + 3), string(global.frothywater_str)) if ba5.hover @@ -359,8 +361,6 @@ if (global.indexphase != "home") draw_text((ba5.x + 5), (ba5.y + 3), string(global.mercuryblast_str)) else if (global.recipemode == "promo") draw_text((ba5.x + 5), (ba5.y + 3), string(global.pianowoman_str)) - else if (global.recipemode == "g") - draw_text((ba5.x + 5), (ba5.y + 3), string(global.bleedingjane_str)) else if (global.recipemode == "m") draw_text((ba5.x + 5), (ba5.y + 3), string(global.fluffydream_str)) if ba6.hover