From 4ced613a49a22d55ecd2d40f9d7cd95b0575f658 Mon Sep 17 00:00:00 2001 From: Anna Date: Sat, 6 Sep 2025 22:09:08 -0400 Subject: [PATCH 1/2] feat: create Flashy fight setting --- objects/obj_decomp_settings/Other_11.gml | 6 ++++++ objects/obj_flowey_bgdraw/Draw_0.gml | 21 +++++++++++++++---- scripts/decomp_init/decomp_init.gml | 3 ++- .../set_default_decomp_vars.gml | 1 + 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/objects/obj_decomp_settings/Other_11.gml b/objects/obj_decomp_settings/Other_11.gml index 173131e61..4afa43388 100644 --- a/objects/obj_decomp_settings/Other_11.gml +++ b/objects/obj_decomp_settings/Other_11.gml @@ -31,6 +31,12 @@ array_push(categories, new menu_category("Battle", "General Battle Settings", new menu_checkbox_option("Demo Heart Fracture Delay", "DemoHeartFracture", "Restores the 500ms delay when the heart fractures", global.decomp_vars.DemoHeartFracture, true), new menu_slider_option("Heart Fracture Delay", "DemoHeartFractureDelay", "Delay amount (in ms) for the heart fracture", global.decomp_vars.DemoHeartFractureDelay, 500, 250, 1000, 1, 10) ])); + +array_push(categories, new menu_category("Accessibility", "Ease of Access Settings", + [ + new menu_checkbox_option("Remove Flashing from Flowey Fight","FlashyFloweyFight","Removes red flashing lights and Strobe effect on Flowey's body during the fight", global.decomp_vars.FlashyFloweyFight,false) +])); + array_push(categories, new menu_category("Save Data", "Save Data Settings", [ new menu_holdbutton_option("Wipe Trophy Data", "Hold to wipe all trophy data", 30 * 3, wipeTrophyData), diff --git a/objects/obj_flowey_bgdraw/Draw_0.gml b/objects/obj_flowey_bgdraw/Draw_0.gml index f836fa8c2..880c291a0 100644 --- a/objects/obj_flowey_bgdraw/Draw_0.gml +++ b/objects/obj_flowey_bgdraw/Draw_0.gml @@ -1,7 +1,20 @@ -for (i = 0; i < 8; i += 1) + +if(global.decomp_vars.FlashyFloweyFight) +{ + for (i = 0; i < 8; i += 1) + { + siner2 = (siner + i) + background_alpha_set(i, (0.5 + (sin((siner2 / 8)) * 0.4))) + background_x_set(i, (background_x_get(i) + (sin((siner2 / 8)) * 1))) + } +} +else { - siner2 = (siner + i) - background_alpha_set(i, (0.5 + (sin((siner2 / 8)) * 0.4))) - background_x_set(i, (background_x_get(i) + (sin((siner2 / 8)) * 1))) + for (i = 0; i < 8; i += 1) + { + siner2 = (siner + 8) + background_alpha_set(i,1) + background_x_set(i, (background_x_get(i) + (sin((siner2 / 8)) * 1))) + } } siner += 1 diff --git a/scripts/decomp_init/decomp_init.gml b/scripts/decomp_init/decomp_init.gml index a31dd8617..1d61efcd1 100644 --- a/scripts/decomp_init/decomp_init.gml +++ b/scripts/decomp_init/decomp_init.gml @@ -17,7 +17,8 @@ global.decomp_vars = { FixInputLatency : true, WristProtector : true, ForceSoSorry : false, - QwertzInput : true + QwertzInput : true, + FlashyFloweyFight: false } #macro trace show_debug_message diff --git a/scripts/set_default_decomp_vars/set_default_decomp_vars.gml b/scripts/set_default_decomp_vars/set_default_decomp_vars.gml index 76a987424..61defab57 100644 --- a/scripts/set_default_decomp_vars/set_default_decomp_vars.gml +++ b/scripts/set_default_decomp_vars/set_default_decomp_vars.gml @@ -19,4 +19,5 @@ function set_default_decomp_vars() global.decomp_vars.WristProtector = true; global.decomp_vars.ForceSoSorry = false; global.decomp_vars.QwertzInput = true; + global.decomp_vars.FlashyFloweyFight = false; } \ No newline at end of file From 27450e2fad51e8da349e6f123f226e031ef08b3c Mon Sep 17 00:00:00 2001 From: Anna Date: Fri, 14 Nov 2025 11:19:36 -0500 Subject: [PATCH 2/2] feat: control tv noise during fight --- NXTALE.yyp | 2 +- objects/obj_decomp_settings/Other_11.gml | 2 +- objects/obj_flowey_bgdraw/Draw_0.gml | 21 +++------------- objects/obj_floweyx_tv/Draw_0.gml | 25 ++++++++++++------- scripts/decomp_init/decomp_init.gml | 2 +- .../set_default_decomp_vars.gml | 2 +- 6 files changed, 24 insertions(+), 30 deletions(-) diff --git a/NXTALE.yyp b/NXTALE.yyp index b6909cabd..a68ed3f0b 100644 --- a/NXTALE.yyp +++ b/NXTALE.yyp @@ -625,7 +625,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.884", + "IDEVersion":"2024.14.0.207", }, "name":"NXTALE", "resources":[ diff --git a/objects/obj_decomp_settings/Other_11.gml b/objects/obj_decomp_settings/Other_11.gml index 4afa43388..962d85036 100644 --- a/objects/obj_decomp_settings/Other_11.gml +++ b/objects/obj_decomp_settings/Other_11.gml @@ -34,7 +34,7 @@ array_push(categories, new menu_category("Battle", "General Battle Settings", array_push(categories, new menu_category("Accessibility", "Ease of Access Settings", [ - new menu_checkbox_option("Remove Flashing from Flowey Fight","FlashyFloweyFight","Removes red flashing lights and Strobe effect on Flowey's body during the fight", global.decomp_vars.FlashyFloweyFight,false) + new menu_checkbox_option("Controls the TV Noise from Flowey Fight","DrawTVNoiseAnim","Enable to turn on the TV Noise during the Flowey Fight", global.decomp_vars.DrawTVNoiseAnim,false) ])); array_push(categories, new menu_category("Save Data", "Save Data Settings", diff --git a/objects/obj_flowey_bgdraw/Draw_0.gml b/objects/obj_flowey_bgdraw/Draw_0.gml index 880c291a0..f836fa8c2 100644 --- a/objects/obj_flowey_bgdraw/Draw_0.gml +++ b/objects/obj_flowey_bgdraw/Draw_0.gml @@ -1,20 +1,7 @@ - -if(global.decomp_vars.FlashyFloweyFight) -{ - for (i = 0; i < 8; i += 1) - { - siner2 = (siner + i) - background_alpha_set(i, (0.5 + (sin((siner2 / 8)) * 0.4))) - background_x_set(i, (background_x_get(i) + (sin((siner2 / 8)) * 1))) - } -} -else +for (i = 0; i < 8; i += 1) { - for (i = 0; i < 8; i += 1) - { - siner2 = (siner + 8) - background_alpha_set(i,1) - background_x_set(i, (background_x_get(i) + (sin((siner2 / 8)) * 1))) - } + siner2 = (siner + i) + background_alpha_set(i, (0.5 + (sin((siner2 / 8)) * 0.4))) + background_x_set(i, (background_x_get(i) + (sin((siner2 / 8)) * 1))) } siner += 1 diff --git a/objects/obj_floweyx_tv/Draw_0.gml b/objects/obj_floweyx_tv/Draw_0.gml index 4842e6d29..f2025489f 100644 --- a/objects/obj_floweyx_tv/Draw_0.gml +++ b/objects/obj_floweyx_tv/Draw_0.gml @@ -6,15 +6,22 @@ if (tvmode == 0) animspeed = (-animspeed) if (anim < (animchoice - 1)) animspeed = (-animspeed) - animtimer += 1 - if (animtimer > 100) - { - draw_sprite_ext(spr_noise, random(3), ((x + 20) + random(4)), ((y + 50) + random(4)), ((size + 0.8) + random(0.1)), ((size + random(0.1)) + 0.4), 0, c_white, 1) - animchoice = round(random(100)) - anim = animchoice - if (animtimer > 106) - animtimer = 0 - } + if(global.decomp_vars.DrawTVNoiseAnim) + { + animtimer += 1 + if (animtimer > 100) + { + draw_sprite_ext(spr_noise, random(3), ((x + 20) + random(4)), ((y + 50) + random(4)), ((size + 0.8) + random(0.1)), ((size + random(0.1)) + 0.4), 0, c_white, 1) + animchoice = round(random(100)) + anim = animchoice + if (animtimer > 106) + animtimer = 0 + } + } + else + { + draw_sprite_ext(spr_noise, random(3), ((x + 20) + random(4)), ((y + 50) + random(4)), ((size + 0.8) + random(0.1)), ((size + random(0.1)) + 0.4), 0, c_white, 1) + } draw_sprite(sprite_index, image_index, x, (y + (sin((siner / 3)) * 1))) siner += 1 } diff --git a/scripts/decomp_init/decomp_init.gml b/scripts/decomp_init/decomp_init.gml index 1d61efcd1..e00693f54 100644 --- a/scripts/decomp_init/decomp_init.gml +++ b/scripts/decomp_init/decomp_init.gml @@ -18,7 +18,7 @@ global.decomp_vars = { WristProtector : true, ForceSoSorry : false, QwertzInput : true, - FlashyFloweyFight: false + DrawTVNoiseAnim: false } #macro trace show_debug_message diff --git a/scripts/set_default_decomp_vars/set_default_decomp_vars.gml b/scripts/set_default_decomp_vars/set_default_decomp_vars.gml index 61defab57..6ca16f93b 100644 --- a/scripts/set_default_decomp_vars/set_default_decomp_vars.gml +++ b/scripts/set_default_decomp_vars/set_default_decomp_vars.gml @@ -19,5 +19,5 @@ function set_default_decomp_vars() global.decomp_vars.WristProtector = true; global.decomp_vars.ForceSoSorry = false; global.decomp_vars.QwertzInput = true; - global.decomp_vars.FlashyFloweyFight = false; + global.decomp_vars.DrawTVNoiseAnim = false; } \ No newline at end of file