From 48ecc5d2b4db9e56de8effad0f03f0050e80d3af Mon Sep 17 00:00:00 2001 From: horbel Date: Fri, 12 Jan 2024 02:36:02 +0200 Subject: [PATCH] Sort by name update --- gml_Object_ba1_Mouse_7.gml | 4 ++-- gml_Object_ba2_Mouse_7.gml | 8 ++++---- gml_Object_ba3_Mouse_10.gml | 2 +- gml_Object_ba3_Mouse_7.gml | 13 ++++--------- gml_Object_ba4_Mouse_10.gml | 2 +- gml_Object_ba4_Mouse_7.gml | 19 +++++++----------- gml_Object_ba5_Mouse_10.gml | 2 +- gml_Object_ba5_Mouse_7.gml | 11 ++++++++--- gml_Object_textx_Draw_0.gml | 32 +++++++++++++++---------------- gml_Object_textx_new_Draw_0.gml | 34 ++++++++++++++++----------------- 10 files changed, 61 insertions(+), 66 deletions(-) diff --git a/gml_Object_ba1_Mouse_7.gml b/gml_Object_ba1_Mouse_7.gml index fbe2086..2813423 100644 --- a/gml_Object_ba1_Mouse_7.gml +++ b/gml_Object_ba1_Mouse_7.gml @@ -66,7 +66,7 @@ else if (global.recipemode == "c") else if (global.recipemode == "f") { global.indexphase = "home" - global.recipeindex = 19 + global.recipeindex = 10 } else if (global.recipemode == "g") { @@ -81,7 +81,7 @@ else if (global.recipemode == "m") else if (global.recipemode == "p") { global.indexphase = "home" - global.recipeindex = 7 + global.recipeindex = 22 } else if (global.recipemode == "s") { diff --git a/gml_Object_ba2_Mouse_7.gml b/gml_Object_ba2_Mouse_7.gml index 27781e6..443b824 100644 --- a/gml_Object_ba2_Mouse_7.gml +++ b/gml_Object_ba2_Mouse_7.gml @@ -66,12 +66,12 @@ else if (global.recipemode == "c") else if (global.recipemode == "f") { global.indexphase = "home" - global.recipeindex = 11 + global.recipeindex = 24 } else if (global.recipemode == "g") { global.indexphase = "home" - global.recipeindex = 13 + global.recipeindex = 7 } else if (global.recipemode == "m") { @@ -81,10 +81,10 @@ else if (global.recipemode == "m") else if (global.recipemode == "p") { global.indexphase = "home" - global.recipeindex = 21 + global.recipeindex = 23 } else if (global.recipemode == "s") { global.indexphase = "home" - global.recipeindex = 10 + global.recipeindex = 12 } diff --git a/gml_Object_ba3_Mouse_10.gml b/gml_Object_ba3_Mouse_10.gml index 586ec5f..002b05c 100644 --- a/gml_Object_ba3_Mouse_10.gml +++ b/gml_Object_ba3_Mouse_10.gml @@ -1,5 +1,5 @@ hover = 1 -if ((!hoversound) && global.recipemode != "index" && global.indexphase != "ex" && global.recipemode != "b" && global.recipemode != "z") +if ((!hoversound) && global.recipemode != "index" && global.indexphase != "ex" && global.recipemode != "b" && global.recipemode != "z" && global.recipemode != "f") { hoversound = 1 audio_play_sound(mouse_hover, 1, false) diff --git a/gml_Object_ba3_Mouse_7.gml b/gml_Object_ba3_Mouse_7.gml index c82ea55..e1b93cd 100644 --- a/gml_Object_ba3_Mouse_7.gml +++ b/gml_Object_ba3_Mouse_7.gml @@ -1,4 +1,4 @@ -if (global.recipemode != "index" && global.indexphase != "ex" && global.recipemode != "b" && global.recipemode != "z") +if (global.recipemode != "index" && global.indexphase != "ex" && global.recipemode != "b" && global.recipemode != "z" && global.recipemode != "f") { audio_play_sound(jukechange, 1, false) audio_sound_gain(jukechange, ((global.sfxvolume - 20) / 100), 0) @@ -58,15 +58,10 @@ else if (global.recipemode == "c") global.indexphase = "home" global.recipeindex = 16 } -else if (global.recipemode == "f") -{ - global.indexphase = "home" - global.recipeindex = 24 -} else if (global.recipemode == "g") { global.indexphase = "home" - global.recipeindex = 3 + global.recipeindex = 19 } else if (global.recipemode == "m") { @@ -76,10 +71,10 @@ else if (global.recipemode == "m") else if (global.recipemode == "p") { global.indexphase = "home" - global.recipeindex = 22 + global.recipeindex = 20 } else if (global.recipemode == "s") { global.indexphase = "home" - global.recipeindex = 12 + global.recipeindex = 21 } diff --git a/gml_Object_ba4_Mouse_10.gml b/gml_Object_ba4_Mouse_10.gml index 1dc524c..ce0575f 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 != "g" && 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 != "p" && 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 4c1d441..2693915 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 != "g" && 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 != "p" && global.recipemode != "s" && global.recipemode != "z") { audio_play_sound(jukechange, 1, false) audio_sound_gain(jukechange, ((global.sfxvolume - 20) / 100), 0) @@ -48,18 +48,13 @@ else if (global.recipemode == "c") global.indexphase = "home" global.recipeindex = 8 } +else if (global.recipemode == "g") +{ + global.indexphase = "home" + global.recipeindex = 13 +} else if (global.recipemode == "m") { global.indexphase = "home" - global.recipeindex = 9 -} -else if (global.recipemode == "p") -{ - global.indexphase = "home" - global.recipeindex = 23 -} -else if (global.recipemode == "s") -{ - global.indexphase = "home" - global.recipeindex = 23 + global.recipeindex = 11 } diff --git a/gml_Object_ba5_Mouse_10.gml b/gml_Object_ba5_Mouse_10.gml index 6227caa..edd3b04 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 == "p" || 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 == "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")) { 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 c90d7a1..993e420 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 == "p" || 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 == "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")) { audio_play_sound(jukechange, 2, false) audio_sound_gain(jukechange, ((global.sfxvolume - 20) / 100), 0) @@ -38,8 +38,13 @@ else if (global.recipemode == "promo") global.indexphase = "home" global.recipeindex = 18 } -else if (global.recipemode == "p") +else if (global.recipemode == "g") { global.indexphase = "home" - global.recipeindex = 20 + global.recipeindex = 3 +} +else if (global.recipemode == "m") +{ + global.indexphase = "home" + global.recipeindex = 9 } diff --git a/gml_Object_textx_Draw_0.gml b/gml_Object_textx_Draw_0.gml index e025779..a01b923 100644 --- a/gml_Object_textx_Draw_0.gml +++ b/gml_Object_textx_Draw_0.gml @@ -224,13 +224,13 @@ if (global.indexphase != "home") else if (global.recipemode == "c") draw_text((ba1.x + 5), (ba1.y + 3), string(global.marsblast_str)) else if (global.recipemode == "f") - draw_text((ba1.x + 5), (ba1.y + 3), string(global.piledriver_str)) + 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)) 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.cobaltvelvet_str)) + draw_text((ba1.x + 5), (ba1.y + 3), string(global.sunshinecloud_str)) else if (global.recipemode == "s") draw_text((ba1.x + 5), (ba1.y + 3), string(global.badtouch_str)) if ba2.hover @@ -262,15 +262,15 @@ if (global.indexphase != "home") else if (global.recipemode == "c") draw_text((ba2.x + 5), (ba2.y + 3), string(global.mercuryblast_str)) else if (global.recipemode == "f") - draw_text((ba2.x + 5), (ba2.y + 3), string(global.frothywater_str)) + 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.gutpunch_str)) + draw_text((ba2.x + 5), (ba2.y + 3), string(global.cobaltvelvet_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.sugarrush_str)) + draw_text((ba2.x + 5), (ba2.y + 3), string(global.suplex_str)) else if (global.recipemode == "s") - draw_text((ba2.x + 5), (ba2.y + 3), string(global.fringeweaver_str)) + draw_text((ba2.x + 5), (ba2.y + 3), string(global.grizzlytemple_str)) if ba3.hover draw_set_color(c_white) else @@ -297,16 +297,14 @@ if (global.indexphase != "home") draw_text((ba3.x + 5), (ba3.y + 3), string(global.zenstar_str)) else if (global.recipemode == "c") draw_text((ba3.x + 5), (ba3.y + 3), string(global.moonblast_str)) - else if (global.recipemode == "f") - draw_text((ba3.x + 5), (ba3.y + 3), string(global.zenstar_str)) else if (global.recipemode == "g") - draw_text((ba3.x + 5), (ba3.y + 3), string(global.bleedingjane_str)) + draw_text((ba3.x + 5), (ba3.y + 3), string(global.piledriver_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.sunshinecloud_str)) + draw_text((ba3.x + 5), (ba3.y + 3), string(global.sparklestar_str)) else if (global.recipemode == "s") - draw_text((ba3.x + 5), (ba3.y + 3), string(global.grizzlytemple_str)) + draw_text((ba3.x + 5), (ba3.y + 3), string(global.sugarrush_str)) if ba4.hover draw_set_color(c_white) else @@ -329,10 +327,10 @@ if (global.indexphase != "home") draw_text((ba4.x + 5), (ba4.y + 3), string(global.pianoman_str)) 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)) else if (global.recipemode == "m") - draw_text((ba4.x + 5), (ba4.y + 3), string(global.fluffydream_str)) - else if (global.recipemode == "p") - draw_text((ba4.x + 5), (ba4.y + 3), string(global.suplex_str)) + draw_text((ba4.x + 5), (ba4.y + 3), string(global.frothywater_str)) if ba5.hover draw_set_color(c_white) else @@ -351,8 +349,10 @@ 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 == "p") - draw_text((ba5.x + 5), (ba5.y + 3), string(global.sparklestar_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 draw_set_color(c_white) else diff --git a/gml_Object_textx_new_Draw_0.gml b/gml_Object_textx_new_Draw_0.gml index a4822c1..1f98149 100644 --- a/gml_Object_textx_new_Draw_0.gml +++ b/gml_Object_textx_new_Draw_0.gml @@ -234,13 +234,13 @@ if (global.indexphase != "home") else if (global.recipemode == "c") draw_text((ba1.x + 5), (ba1.y + 3), string(global.marsblast_str)) else if (global.recipemode == "f") - draw_text((ba1.x + 5), (ba1.y + 3), string(global.piledriver_str)) + 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)) 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.cobaltvelvet_str)) + draw_text((ba1.x + 5), (ba1.y + 3), string(global.sunshinecloud_str)) else if (global.recipemode == "s") draw_text((ba1.x + 5), (ba1.y + 3), string(global.badtouch_str)) if ba2.hover @@ -272,15 +272,15 @@ if (global.indexphase != "home") else if (global.recipemode == "c") draw_text((ba2.x + 5), (ba2.y + 3), string(global.mercuryblast_str)) else if (global.recipemode == "f") - draw_text((ba2.x + 5), (ba2.y + 3), string(global.frothywater_str)) + 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.gutpunch_str)) + draw_text((ba2.x + 5), (ba2.y + 3), string(global.cobaltvelvet_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.sugarrush_str)) + draw_text((ba2.x + 5), (ba2.y + 3), string(global.suplex_str)) else if (global.recipemode == "s") - draw_text((ba2.x + 5), (ba2.y + 3), string(global.fringeweaver_str)) + draw_text((ba2.x + 5), (ba2.y + 3), string(global.grizzlytemple_str)) if ba3.hover draw_set_color(c_white) else @@ -307,16 +307,14 @@ if (global.indexphase != "home") draw_text((ba3.x + 5), (ba3.y + 3), string(global.zenstar_str)) else if (global.recipemode == "c") draw_text((ba3.x + 5), (ba3.y + 3), string(global.moonblast_str)) - else if (global.recipemode == "f") - draw_text((ba3.x + 5), (ba3.y + 3), string(global.zenstar_str)) else if (global.recipemode == "g") - draw_text((ba3.x + 5), (ba3.y + 3), string(global.bleedingjane_str)) + draw_text((ba3.x + 5), (ba3.y + 3), string(global.piledriver_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.sunshinecloud_str)) + draw_text((ba3.x + 5), (ba3.y + 3), string(global.sparklestar_str)) else if (global.recipemode == "s") - draw_text((ba3.x + 5), (ba3.y + 3), string(global.grizzlytemple_str)) + draw_text((ba3.x + 5), (ba3.y + 3), string(global.sugarrush_str)) if ba4.hover draw_set_color(c_white) else @@ -337,12 +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)) else if (global.recipemode == "m") - draw_text((ba4.x + 5), (ba4.y + 3), string(global.fluffydream_str)) - else if (global.recipemode == "p") - draw_text((ba4.x + 5), (ba4.y + 3), string(global.suplex_str)) + draw_text((ba4.x + 5), (ba4.y + 3), string(global.frothywater_str)) if ba5.hover draw_set_color(c_white) else @@ -361,8 +359,10 @@ 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 == "p") - draw_text((ba5.x + 5), (ba5.y + 3), string(global.sparklestar_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 draw_set_color(c_white) else