From 0792a6469120e1b8c5de0c1af3b0b7850d80754a Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Sat, 10 Jan 2026 13:49:41 -0800 Subject: [PATCH 01/56] MADE CATERPILLAR POSITION OFFSETS MODULAR FOR EASIER CONTROL OVER THEIR OFFSETS --- DELTAModKit.yyp | 10 ++- objects/obj_caterpillarchara/Create_0.gml | 6 +- objects/obj_caterpillarchara/Step_2.gml | 64 ++++++++++--------- objects/obj_darkcontroller/Create_0.gml | 22 ++++--- scripts/instance_create/instance_create.gml | 6 +- .../scr_heroes_config/scr_heroes_config.gml | 44 ++++++++++--- 6 files changed, 94 insertions(+), 58 deletions(-) diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index fbd5a285..2ce7f7aa 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -159,11 +159,17 @@ {"$GMFolder":"","%Name":"Chapter 1","folderPath":"folders/DELTARUNE/Tilesets/Dark World/Tilesets/Chapter 1.yy","name":"Chapter 1","resourceType":"GMFolder","resourceVersion":"2.0",}, ], "ForcedPrefabProjectReferences":[], - "IncludedFiles":[], + "IncludedFiles":[ + {"$GMIncludedFile":"","%Name":"balnwonknu_sum.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"balnwonknu_sum.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"castletown_empty.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"castletown_empty.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"quiet_autumn.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"quiet_autumn.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"THE_HOLY.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"THE_HOLY.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"wind.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"wind.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + ], "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.2.936", + "IDEVersion":"2024.1400.0.911", }, "name":"DELTAModKit", "resources":[ diff --git a/objects/obj_caterpillarchara/Create_0.gml b/objects/obj_caterpillarchara/Create_0.gml index 3b5c6bc3..c2932189 100644 --- a/objects/obj_caterpillarchara/Create_0.gml +++ b/objects/obj_caterpillarchara/Create_0.gml @@ -1,8 +1,7 @@ scr_depth(); image_speed = 0; -if (global.darkzone) - scr_darksize(id); +if (global.darkzone) scr_darksize(id); walk = 0; fun = 0; @@ -47,8 +46,9 @@ mywidth = sprite_width; myheight = sprite_height; xoffset = 0; yoffset = 0; -init = 0; +init = false; forget = 0; ignoredepth = 0; halign = 6; valign = 16; +characterslot = 0 \ No newline at end of file diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index cd2017f8..1efd70e6 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -1,37 +1,39 @@ -if (!init) -{ - ignoredepth = 0; - init = 1; - - if (name == "susie") - { - if (scr_havechar("no") && global.darkzone == 0) - target = 8; +if (!init) { + ignoredepth = false; + init = true; + + scr_character_set_caterpillar_offsets(characterslot) + + var uselegacyinit = false // Reverses it to Deltarune's Init. + + if uselegacyinit { + if (name == "susie") { + if (scr_havechar("no") && global.darkzone == 0) + target = 8; - halign = (global.darkzone == 0) ? 3 : 6; - valign = (global.darkzone == 0) ? 6 : 16; - } - - if (name == "noelle") - { - //usprite = (global.darkzone == 1) ? spr_noelle_walk_up_dw : spr_noelle_walk_up_lw; - //rsprite = (global.darkzone == 1) ? spr_noelle_walk_right_dw : spr_noelle_walk_right_lw; - //lsprite = (global.darkzone == 1) ? spr_noelle_walk_left_dw : spr_noelle_walk_left_lw; - //dsprite = (global.darkzone == 1) ? spr_noelle_walk_down_dw : spr_noelle_walk_down_lw; + halign = (global.darkzone == 0) ? 3 : 6; + valign = (global.darkzone == 0) ? 6 : 16; + } + + if (name == "noelle") { + //usprite = (global.darkzone == 1) ? spr_noelle_walk_up_dw : spr_noelle_walk_up_lw; + //rsprite = (global.darkzone == 1) ? spr_noelle_walk_right_dw : spr_noelle_walk_right_lw; + //lsprite = (global.darkzone == 1) ? spr_noelle_walk_left_dw : spr_noelle_walk_left_lw; + //dsprite = (global.darkzone == 1) ? spr_noelle_walk_down_dw : spr_noelle_walk_down_lw; - if (global.darkzone == 0) - target = scr_havechar("su") ? 17 : 12; + if (global.darkzone == 0) + target = scr_havechar("su") ? 17 : 12; - halign = (global.darkzone == 0) ? 2 : 4; - valign = (global.darkzone == 0) ? 9 : 18; - } - - if (name == "ralsei") - { - climbsprite = 4220; - halign = 2; - valign = 12; - } + halign = (global.darkzone == 0) ? 2 : 4; + valign = (global.darkzone == 0) ? 9 : 18; + } + + if (name == "ralsei") { + climbsprite = 4220; + halign = 2; + valign = 12; + } + } } if (!ignoredepth) diff --git a/objects/obj_darkcontroller/Create_0.gml b/objects/obj_darkcontroller/Create_0.gml index 87c7e607..9c1f04be 100644 --- a/objects/obj_darkcontroller/Create_0.gml +++ b/objects/obj_darkcontroller/Create_0.gml @@ -43,23 +43,25 @@ for (var i = 0; i < 36; i += 1) global.cinstance[0] = 4343434343; global.cinstance[1] = 343434343434; -for (var i = 0; i < 3; i += 1) -{ +for (var i = 0; i < 3; i += 1) { + var char = global.char[i] global.faceaction[i] = 0; - if (global.char[i] == DRCharacter.None) continue; + if (char == DRCharacter.None) continue; chartotal++; - havechar[global.char[i] - 1] = 1; - charpos[global.char[i] - 1] = i; + havechar[char - 1] = 1; + charpos[char - 1] = i; - if (i > 0 )//&& global.char[i] != DRCharacter.Kris) - { - global.cinstance[i - 1] = instance_create(obj_mainchara.x, obj_mainchara.y, obj_caterpillarchara); + if (i > 0) { + scr_character_set_caterpillar_offsets(char) + global.cinstance[i - 1] = instance_create(obj_mainchara.x - halign, obj_mainchara.y - valign, obj_caterpillarchara); global.cinstance[i - 1].target = i * 12; + global.cinstance[i - 1].characterslot = char - with (global.cinstance[i - 1]) - scr_character_set_caterpillar_sprites(global.char[i]); + with (global.cinstance[i - 1]) { + scr_character_set_caterpillar_sprites(char); + } } } diff --git a/scripts/instance_create/instance_create.gml b/scripts/instance_create/instance_create.gml index e1c78a2a..76141144 100644 --- a/scripts/instance_create/instance_create.gml +++ b/scripts/instance_create/instance_create.gml @@ -1,6 +1,6 @@ -function instance_create(arg0, arg1, arg2){ - var myDepth = object_get_depth(arg2); - return instance_create_depth(arg0, arg1, myDepth, arg2); +function instance_create(x, y, object){ + var myDepth = object_get_depth(object); + return instance_create_depth(x, y, myDepth, object); } function d_make(arg0 = -1, arg1 = -1, arg2 = -1, arg3 = -1, arg4 = -1) diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index af940613..8f065814 100644 --- a/scripts/scr_heroes_config/scr_heroes_config.gml +++ b/scripts/scr_heroes_config/scr_heroes_config.gml @@ -325,9 +325,6 @@ function scr_character_set_caterpillar_sprites(charIdx) { rsprite = global.darkzone ? (global.chapter >= 2 ? spr_susie_walk_right_dw : spr_susier_dark) : spr_susie_walk_right_lw; lsprite = global.darkzone ? (global.chapter >= 2 ? spr_susie_walk_left_dw : spr_susiel_dark) : spr_susie_walk_left_lw; - x -= (global.darkzone == 1) ? 6 : 3; - y -= (global.darkzone == 1) ? 16 : 6; - break; } @@ -344,9 +341,6 @@ function scr_character_set_caterpillar_sprites(charIdx) { rsprite_blush = spr_ralsei_walk_right_blush; lsprite_blush = spr_ralsei_walk_left_blush; - x -= 2; - y -= 12; - break; } @@ -359,9 +353,6 @@ function scr_character_set_caterpillar_sprites(charIdx) { lsprite = (global.darkzone == 1) ? spr_noelle_walk_left_dw : spr_noelle_walk_left_lw; dsprite = (global.darkzone == 1) ? spr_noelle_walk_down_dw : spr_noelle_walk_down_lw; - x -= (global.darkzone == 1) ? 4 : 6; - y -= (global.darkzone == 1) ? 20 : 9; - break; } @@ -377,6 +368,41 @@ function scr_character_set_caterpillar_sprites(charIdx) { } } +function scr_character_set_caterpillar_offsets(charIdx) { + // All Alignment Values have been Changed for Lightworld Scale, and will be Resized to Dark At the end of This Script. + #region Default Caterpillar + depthbonus = 5 + halign = 3 + valign = 6; + var autoresizeoffsets = true + #endregion + switch charIdx { + case DRCharacter.Susie: { // Susie Uses Default Horizontal alignment and Vertical Alignment + if global.darkzone == true depthbonus -= 60; + break + } + case DRCharacter.Ralsei: { + depthbonus -= 80 + halign = 1; + valign = 6; + break + } + case DRCharacter.Noelle: { + depthbonus -= 5 + halign = 2 + valign = 9 + break + } + + // Starwalker Uses Default. + } + + if autoresizeoffsets && global.darkzone { + halign *= 2 + valign *= 2 + } +} + function scr_character_get_max_hp(charIdx) { var chapter = global.chapter; var defaultChapterIncreaseFormula = (chapter > 1 ? 30 : 0) + (chapter - 1) * 40; From 743f5833f5279ce3532995d0bb1789aeef884f45 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Sun, 11 Jan 2026 14:09:32 -0800 Subject: [PATCH 02/56] ADDED THE ABILITY FOR CHARACTERS TO HAVE MORE THAN 4 WALK FRAMES --- objects/obj_caterpillarchara/Create_0.gml | 2 +- objects/obj_caterpillarchara/Step_2.gml | 65 +++++++---------- objects/obj_mainchara/Create_0.gml | 3 +- objects/obj_mainchara/Step_0.gml | 69 +++++++------------ scripts/scr_havechar/scr_havechar.gml | 3 +- .../scr_heroes_config/scr_heroes_config.gml | 1 + 6 files changed, 53 insertions(+), 90 deletions(-) diff --git a/objects/obj_caterpillarchara/Create_0.gml b/objects/obj_caterpillarchara/Create_0.gml index c2932189..d550d27c 100644 --- a/objects/obj_caterpillarchara/Create_0.gml +++ b/objects/obj_caterpillarchara/Create_0.gml @@ -25,7 +25,7 @@ rsprite = spr_susier_dark; lsprite = spr_susiel_dark; slidesprite = spr_susied_dark; climbsprite = spr_susieu_dark; - +timebetweenwalkframes = 10 parent = obj_mainchara; pd = parent.dsprite; pr = parent.rsprite; diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index 1efd70e6..4a338eb4 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -109,50 +109,31 @@ if (x != nowx) if (y != nowy) walk = 1; -if (walk == 1) - walkbuffer = 6; - -if (walkbuffer > 3 && fun == 0) -{ - walktimer += 1.5; - - if (runmove == 1) - walktimer += 1.5; - - if (walktimer >= 40) - walktimer -= 40; - - if (walktimer < 10) - image_index = 0; - - if (walktimer >= 10) - image_index = 1; - - if (walktimer >= 20) - image_index = 2; - - if (walktimer >= 30) - image_index = 3; +if (walk == true) walkbuffer = 6 + +if (walkbuffer > 3 && fun == false) { + walktimer += 1.5 + if (runmove == true) walktimer += 1.5 + + + if (walktimer >= (image_number * timebetweenwalkframes)) + walktimer -= (image_number * timebetweenwalkframes) + + image_index = floor(walktimer / timebetweenwalkframes) } - -if (walkbuffer <= 0 && fun == 0) -{ - if (walktimer < 10) - walktimer = 9.5; - - if (walktimer >= 10 && walktimer < 20) - walktimer = 19.5; - - if (walktimer >= 20 && walktimer < 30) - walktimer = 29.5; - - if (walktimer >= 30) - walktimer = 39.5; - - image_index = 0; + +if (walkbuffer <= 0 && fun == false) { + if (walktimer < timebetweenwalkframes) walktimer = 9.5 + + var current = floor(walktimer / timebetweenwalkframes) * timebetweenwalkframes + var next = current + timebetweenwalkframes + + if (walktimer >= current && walktimer < next) walktimer = next - 0.5 + + image_index = 0 } - -walkbuffer -= 0.75; + +walkbuffer -= 0.75 if (fun == 0 && slided == 0) { diff --git a/objects/obj_mainchara/Create_0.gml b/objects/obj_mainchara/Create_0.gml index 470a297e..66f39314 100644 --- a/objects/obj_mainchara/Create_0.gml +++ b/objects/obj_mainchara/Create_0.gml @@ -63,6 +63,7 @@ rsprite = spr_krisr; usprite = spr_krisu; lsprite = spr_krisl; climbsprite = 3707; +timebetweenwalkframes = 10 if darkmode { dsprite = spr_krisd_dark; @@ -301,4 +302,4 @@ nudgex = 0; nudgey = 0; nudgelerp = 0.1; -noclip = false; \ No newline at end of file +noclip = false; diff --git a/objects/obj_mainchara/Step_0.gml b/objects/obj_mainchara/Step_0.gml index 828d30a9..c92a9508 100644 --- a/objects/obj_mainchara/Step_0.gml +++ b/objects/obj_mainchara/Step_0.gml @@ -690,50 +690,31 @@ if (fun == 0) if (y != nowy && nopress == 0) walk = 1; - if (walk == 1) - walkbuffer = 6; - - if (walkbuffer > 3 && fun == 0) - { - walktimer += 1.5; - - if (runmove == 1) - walktimer += 1.5; - - if (walktimer >= 40) - walktimer -= 40; - - if (walktimer < 10) - image_index = 0; - - if (walktimer >= 10) - image_index = 1; - - if (walktimer >= 20) - image_index = 2; - - if (walktimer >= 30) - image_index = 3; - } - - if (walkbuffer <= 0 && fun == 0 && climbing == 0) - { - if (walktimer < 10) - walktimer = 9.5; - - if (walktimer >= 10 && walktimer < 20) - walktimer = 19.5; - - if (walktimer >= 20 && walktimer < 30) - walktimer = 29.5; - - if (walktimer >= 30) - walktimer = 39.5; - - image_index = 0; - } - - walkbuffer -= 0.75; + if (walk == true) walkbuffer = 6 + + if (walkbuffer > 3 && fun == false) { + walktimer += 1.5 + if (runmove == true) walktimer += 1.5 + + + if (walktimer >= (image_number * timebetweenwalkframes)) + walktimer -= (image_number * timebetweenwalkframes) + + image_index = floor(walktimer / timebetweenwalkframes) + } + + if (walkbuffer <= 0 && fun == false && climbing == false) { + if (walktimer < timebetweenwalkframes) walktimer = 9.5 + + var current = floor(walktimer / timebetweenwalkframes) * timebetweenwalkframes + var next = current + timebetweenwalkframes + + if (walktimer >= current && walktimer < next) walktimer = next - 0.5 + + image_index = 0 + } + + walkbuffer -= 0.75 } if (fun == 0) diff --git a/scripts/scr_havechar/scr_havechar.gml b/scripts/scr_havechar/scr_havechar.gml index 0d92519d..96c3c7bb 100644 --- a/scripts/scr_havechar/scr_havechar.gml +++ b/scripts/scr_havechar/scr_havechar.gml @@ -98,8 +98,7 @@ function scr_refresh_party() { } } -function scr_makecaterpillar(xx, yy, characterId, idx) -{ +function scr_makecaterpillar(xx, yy, characterId, idx) { global.cinstance[idx] = instance_create(xx, yy, obj_caterpillarchara); global.cinstance[idx].target = 12 + idx * 12; diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index 8f065814..d9efff62 100644 --- a/scripts/scr_heroes_config/scr_heroes_config.gml +++ b/scripts/scr_heroes_config/scr_heroes_config.gml @@ -374,6 +374,7 @@ function scr_character_set_caterpillar_offsets(charIdx) { depthbonus = 5 halign = 3 valign = 6; + timebetweenwalkframes = 10; var autoresizeoffsets = true #endregion switch charIdx { From da88fb3d323130ec87c5d109fa6e5e06f906180c Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Sun, 11 Jan 2026 14:13:28 -0800 Subject: [PATCH 03/56] REMOVED REFERENCES TO THE MUS FOLDER BY REMOVING THE FILES FROM MY MUSIC FOLDER. --- DELTAModKit.yyp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index 2ce7f7aa..e0432c25 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -159,13 +159,7 @@ {"$GMFolder":"","%Name":"Chapter 1","folderPath":"folders/DELTARUNE/Tilesets/Dark World/Tilesets/Chapter 1.yy","name":"Chapter 1","resourceType":"GMFolder","resourceVersion":"2.0",}, ], "ForcedPrefabProjectReferences":[], - "IncludedFiles":[ - {"$GMIncludedFile":"","%Name":"balnwonknu_sum.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"balnwonknu_sum.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"castletown_empty.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"castletown_empty.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"quiet_autumn.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"quiet_autumn.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"THE_HOLY.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"THE_HOLY.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - {"$GMIncludedFile":"","%Name":"wind.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"wind.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - ], + "IncludedFiles":[], "isEcma":false, "LibraryEmitters":[], "MetaData":{ From 4ea86f880fe4e9289d84a83cc1793d9c7eeec02f Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Sun, 11 Jan 2026 15:02:58 -0800 Subject: [PATCH 04/56] FORGOT TO UNHARDCODE A NUMBER. --- objects/obj_caterpillarchara/Step_2.gml | 2 +- objects/obj_mainchara/Step_0.gml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index 4a338eb4..654aa57d 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -123,7 +123,7 @@ if (walkbuffer > 3 && fun == false) { } if (walkbuffer <= 0 && fun == false) { - if (walktimer < timebetweenwalkframes) walktimer = 9.5 + if (walktimer < timebetweenwalkframes) walktimer = timebetweenwalkframes - 0.5 var current = floor(walktimer / timebetweenwalkframes) * timebetweenwalkframes var next = current + timebetweenwalkframes diff --git a/objects/obj_mainchara/Step_0.gml b/objects/obj_mainchara/Step_0.gml index c92a9508..c0f5cd4f 100644 --- a/objects/obj_mainchara/Step_0.gml +++ b/objects/obj_mainchara/Step_0.gml @@ -704,7 +704,7 @@ if (fun == 0) } if (walkbuffer <= 0 && fun == false && climbing == false) { - if (walktimer < timebetweenwalkframes) walktimer = 9.5 + if (walktimer < timebetweenwalkframes) walktimer = timebetweenwalkframes - 0.5 var current = floor(walktimer / timebetweenwalkframes) * timebetweenwalkframes var next = current + timebetweenwalkframes From c2429b7428312fdaa47c5e245708fd7d9ae2a177 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Sun, 11 Jan 2026 18:52:56 -0800 Subject: [PATCH 05/56] MERGED REUSED OR SIMILAR OVERWORLD CODE INTO NEW "SCR_SHARED_OVERWORLD" SCRIPT ALONG WITH A FEW OTHER ADDITIONS MAINCHARA WILL NOW CHANGE INTO WHAT EVER CHARACTER IS IN global.char[0] (USUALLY KRIS) "scr_shared_overworld" SCRIPT HAS BEEN CREATED MAINCHARA AND CATERPILLAR WALKING CODE HAS BEEN MOVED SHARED OVERWORLD AS THEY USE THE SAME CODE AS EACHOTHER. --- DELTAModKit.yyp | 1 + objects/obj_caterpillarchara/Create_0.gml | 6 +- objects/obj_caterpillarchara/Step_2.gml | 100 +++--------------- objects/obj_darkcontroller/Create_0.gml | 22 +--- objects/obj_mainchara/Create_0.gml | 6 ++ objects/obj_mainchara/Step_0.gml | 56 +--------- objects/obj_overworldc/Create_0.gml | 15 +-- .../scr_heroes_config/scr_heroes_config.gml | 18 ++++ .../scr_shared_overworld.gml | 69 ++++++++++++ .../scr_shared_overworld.yy | 13 +++ 10 files changed, 134 insertions(+), 172 deletions(-) create mode 100644 scripts/scr_shared_overworld/scr_shared_overworld.gml create mode 100644 scripts/scr_shared_overworld/scr_shared_overworld.yy diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index e0432c25..1e28e099 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -456,6 +456,7 @@ {"id":{"name":"scr_script_repeat","path":"scripts/scr_script_repeat/scr_script_repeat.yy",},}, {"id":{"name":"scr_set_facing_sprites","path":"scripts/scr_set_facing_sprites/scr_set_facing_sprites.yy",},}, {"id":{"name":"scr_shakeobj","path":"scripts/scr_shakeobj/scr_shakeobj.yy",},}, + {"id":{"name":"scr_shared_overworld","path":"scripts/scr_shared_overworld/scr_shared_overworld.yy",},}, {"id":{"name":"scr_speaker","path":"scripts/scr_speaker/scr_speaker.yy",},}, {"id":{"name":"scr_spell","path":"scripts/scr_spell/scr_spell.yy",},}, {"id":{"name":"scr_spellinfo","path":"scripts/scr_spellinfo/scr_spellinfo.yy",},}, diff --git a/objects/obj_caterpillarchara/Create_0.gml b/objects/obj_caterpillarchara/Create_0.gml index d550d27c..39099c3c 100644 --- a/objects/obj_caterpillarchara/Create_0.gml +++ b/objects/obj_caterpillarchara/Create_0.gml @@ -18,7 +18,6 @@ shadow_force_off = false; name = "susie"; target = 12; sprite_init = false; -target = 12; usprite = spr_susieu_dark; dsprite = spr_susied_dark; rsprite = spr_susier_dark; @@ -26,6 +25,8 @@ lsprite = spr_susiel_dark; slidesprite = spr_susied_dark; climbsprite = spr_susieu_dark; timebetweenwalkframes = 10 +characterslot = 0 +depthbonus = 5 parent = obj_mainchara; pd = parent.dsprite; pr = parent.rsprite; @@ -50,5 +51,4 @@ init = false; forget = 0; ignoredepth = 0; halign = 6; -valign = 16; -characterslot = 0 \ No newline at end of file +valign = 16; \ No newline at end of file diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index 654aa57d..6543a49b 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -36,43 +36,27 @@ if (!init) { } } -if (!ignoredepth) -{ +if (!ignoredepth) { scr_depth(); - depth += 5; - - if (name == "ralsei") - depth -= 80; - - if (name == "susie" && global.darkzone == 1) - depth -= 60; - - if (name == "noelle") - depth -= 5; + depth += depthbonus; } nowx = x; nowy = y; -moved = 0; -walk = 0; -runmove = 0; -slided = 0; - -if (obj_mainchara.x != remx[0]) - moved = 1; +moved = false; +walk = false; +runmove = false; +slided = false; -if (obj_mainchara.y != remy[0]) - moved = 1; +if (obj_mainchara.x != remx[0]) || (obj_mainchara.y != remy[0]) + moved = true; -if (sliding[target] == 1) - moved = 1; +if (sliding[target] == true) moved = true; -if (moved == 1 && follow == 1) -{ +if (moved == true && follow == true) { blushtimer = 0; - for (i = 75; i > 0; i -= 1) - { + for (i = 75; i > 0; i -= 1) { remx[i] = remx[i - 1]; remy[i] = remy[i - 1]; facing[i] = facing[i - 1]; @@ -83,72 +67,22 @@ if (moved == 1 && follow == 1) remy[0] = obj_mainchara.y; sliding[0] = obj_mainchara.sliding; facing[0] = global.facing; - x = remx[target] - halign; - y = remy[target] - valign; + x = remx[target] - halign + obj_mainchara.halign; + y = remy[target] - valign + obj_mainchara.valign; - if (sliding[target] == 1) - { + if (sliding[target] == true) { x = remx[target]; y = remy[target]; sprite_index = slidesprite; - slided = 1; + slided = true; } - if (abs(remx[target + 1] - remx[target]) > 4) - runmove = 1; - - if (abs(remy[target + 1] - remy[target]) > 4) - runmove = 1; + if (abs(remy[target + 1] - remy[target]) > 4) runmove = true; dir = facing[target]; } -if (x != nowx) - walk = 1; - -if (y != nowy) - walk = 1; - -if (walk == true) walkbuffer = 6 - -if (walkbuffer > 3 && fun == false) { - walktimer += 1.5 - if (runmove == true) walktimer += 1.5 - - - if (walktimer >= (image_number * timebetweenwalkframes)) - walktimer -= (image_number * timebetweenwalkframes) - - image_index = floor(walktimer / timebetweenwalkframes) -} - -if (walkbuffer <= 0 && fun == false) { - if (walktimer < timebetweenwalkframes) walktimer = timebetweenwalkframes - 0.5 - - var current = floor(walktimer / timebetweenwalkframes) * timebetweenwalkframes - var next = current + timebetweenwalkframes - - if (walktimer >= current && walktimer < next) walktimer = next - 0.5 - - image_index = 0 -} - -walkbuffer -= 0.75 - -if (fun == 0 && slided == 0) -{ - if (facing[target] == 0) - sprite_index = dsprite; - - if (facing[target] == 1) - sprite_index = rsprite; - - if (facing[target] == 2) - sprite_index = usprite; - - if (facing[target] == 3) - sprite_index = lsprite; -} +scr_overworldcharwalking_shared(facing[target]) if ((/*dsprite == spr_ralseid || */dsprite == spr_ralsei_walk_down) && global.interact == 0 && fun == 0) { diff --git a/objects/obj_darkcontroller/Create_0.gml b/objects/obj_darkcontroller/Create_0.gml index 9c1f04be..bd2a5906 100644 --- a/objects/obj_darkcontroller/Create_0.gml +++ b/objects/obj_darkcontroller/Create_0.gml @@ -43,27 +43,7 @@ for (var i = 0; i < 36; i += 1) global.cinstance[0] = 4343434343; global.cinstance[1] = 343434343434; -for (var i = 0; i < 3; i += 1) { - var char = global.char[i] - global.faceaction[i] = 0; - - if (char == DRCharacter.None) continue; - - chartotal++; - havechar[char - 1] = 1; - charpos[char - 1] = i; - - if (i > 0) { - scr_character_set_caterpillar_offsets(char) - global.cinstance[i - 1] = instance_create(obj_mainchara.x - halign, obj_mainchara.y - valign, obj_caterpillarchara); - global.cinstance[i - 1].target = i * 12; - global.cinstance[i - 1].characterslot = char - - with (global.cinstance[i - 1]) { - scr_character_set_caterpillar_sprites(char); - } - } -} +scr_overworldcontrollers_spawncharacters(true) global.charinstance[0] = obj_mainchara; global.charinstance[1] = global.cinstance[0]; diff --git a/objects/obj_mainchara/Create_0.gml b/objects/obj_mainchara/Create_0.gml index 66f39314..0bb5bfc7 100644 --- a/objects/obj_mainchara/Create_0.gml +++ b/objects/obj_mainchara/Create_0.gml @@ -64,6 +64,9 @@ usprite = spr_krisu; lsprite = spr_krisl; climbsprite = 3707; timebetweenwalkframes = 10 +halign = 0 +valign = 0 +depthbonus = 0 if darkmode { dsprite = spr_krisd_dark; @@ -76,6 +79,9 @@ if darkmode { image_yscale = 2; } +scr_character_set_caterpillar_offsets(global.char[0]) +scr_character_set_caterpillar_sprites(global.char[0]) + init_clothes = false; swordfacing = 1; diff --git a/objects/obj_mainchara/Step_0.gml b/objects/obj_mainchara/Step_0.gml index c0f5cd4f..859b6741 100644 --- a/objects/obj_mainchara/Step_0.gml +++ b/objects/obj_mainchara/Step_0.gml @@ -680,59 +680,9 @@ if (global.interact == 0 && freeze == 0) y += py; } -if (fun == 0) -{ - walk = 0; - - if (x != nowx && nopress == 0) - walk = 1; - - if (y != nowy && nopress == 0) - walk = 1; - - if (walk == true) walkbuffer = 6 - - if (walkbuffer > 3 && fun == false) { - walktimer += 1.5 - if (runmove == true) walktimer += 1.5 - - - if (walktimer >= (image_number * timebetweenwalkframes)) - walktimer -= (image_number * timebetweenwalkframes) - - image_index = floor(walktimer / timebetweenwalkframes) - } - - if (walkbuffer <= 0 && fun == false && climbing == false) { - if (walktimer < timebetweenwalkframes) walktimer = timebetweenwalkframes - 0.5 - - var current = floor(walktimer / timebetweenwalkframes) * timebetweenwalkframes - var next = current + timebetweenwalkframes - - if (walktimer >= current && walktimer < next) walktimer = next - 0.5 - - image_index = 0 - } - - walkbuffer -= 0.75 -} - -if (fun == 0) -{ - if (global.facing == 0) - sprite_index = dsprite; - - if (global.facing == 1) - sprite_index = rsprite; - - if (global.facing == 2) - sprite_index = usprite; - - if (global.facing == 3) - sprite_index = lsprite; - - if (climbing == 1) - sprite_index = climbsprite; +if (fun == false) { + scr_overworldcharwalking_shared(global.facing) + if (climbing == true) sprite_index = climbsprite; } if (stepping == 1 && fun == 0) diff --git a/objects/obj_overworldc/Create_0.gml b/objects/obj_overworldc/Create_0.gml index 5dc5c0cd..6340e32c 100644 --- a/objects/obj_overworldc/Create_0.gml +++ b/objects/obj_overworldc/Create_0.gml @@ -6,16 +6,7 @@ depth = 10; threebuffer = 0; hasitems = false; -if (global.chapter >= 2) -{ +if (global.chapter >= 2) { // light world characters - var skippedchars = 1; - for (pipis = 1; pipis < 3; pipis++) { - if global.char[pipis] == DRCharacter.None { skippedchars++; continue; } - if !scr_character_is_lightner(global.char[pipis]) { skippedchars++; continue; } - - global.cinstance[pipis - skippedchars] = instance_create(obj_mainchara.x, obj_mainchara.y, obj_caterpillarchara); - with (global.cinstance[pipis - skippedchars]) - scr_character_set_caterpillar_sprites(global.char[other.pipis]); - } -} + scr_overworldcontrollers_spawncharacters(false) +} \ No newline at end of file diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index d9efff62..8a4f692b 100644 --- a/scripts/scr_heroes_config/scr_heroes_config.gml +++ b/scripts/scr_heroes_config/scr_heroes_config.gml @@ -316,6 +316,17 @@ function scr_hero_set_sprites(heroObject) { function scr_character_set_caterpillar_sprites(charIdx) { switch (charIdx) { + case DRCharacter.Kris: { + name = "kris"; + + usprite = global.darkzone ? spr_krisu_dark : spr_krisu + dsprite = global.darkzone ? spr_krisd_dark : spr_krisd + rsprite = global.darkzone ? spr_krisr_dark : spr_krisr + lsprite = global.darkzone ? spr_krisl_dark : spr_krisl + + break; + } + default: case DRCharacter.Susie: { name = "susie"; @@ -378,6 +389,13 @@ function scr_character_set_caterpillar_offsets(charIdx) { var autoresizeoffsets = true #endregion switch charIdx { + case DRCharacter.Kris: { + halign = 0 + valign = 0 + depthbonus = 0 + break + } + case DRCharacter.Susie: { // Susie Uses Default Horizontal alignment and Vertical Alignment if global.darkzone == true depthbonus -= 60; break diff --git a/scripts/scr_shared_overworld/scr_shared_overworld.gml b/scripts/scr_shared_overworld/scr_shared_overworld.gml new file mode 100644 index 00000000..6fe8fed8 --- /dev/null +++ b/scripts/scr_shared_overworld/scr_shared_overworld.gml @@ -0,0 +1,69 @@ +function scr_overworldcharwalking_shared(facing = 0) { + + walk = false; + + if ((y != nowy) || (x != nowx)) && (variable_instance_exists(id, "nopress") ? nopress == 0 : true) + walk = true; + + if (walk == true) walkbuffer = 6 + + if (walkbuffer > 3 && fun == false) { + walktimer += 1.5 + if (runmove == true) walktimer += 1.5 + + + if (walktimer >= (image_number * timebetweenwalkframes)) + walktimer -= (image_number * timebetweenwalkframes) + + image_index = floor(walktimer / timebetweenwalkframes) + } + + if (walkbuffer <= 0 && fun == false && (variable_instance_exists(id, "climbing") ? climbing == false : true)) { + if (walktimer < timebetweenwalkframes) walktimer = timebetweenwalkframes - 0.5 + + var current = floor(walktimer / timebetweenwalkframes) * timebetweenwalkframes + var next = current + timebetweenwalkframes + + if (walktimer >= current && walktimer < next) walktimer = next - 0.5 + + image_index = 0 + } + + walkbuffer -= 0.75 + + if (facing == 0) sprite_index = dsprite; + if (facing == 1) sprite_index = rsprite; + if (facing == 2) sprite_index = usprite; + if (facing == 3) sprite_index = lsprite; +} + +function scr_overworldcontrollers_spawncharacters(spawndarkners = true) { + chartotal = 0 + for (var i = 0; i < DRCharacter.__MAX__; ++i) { + havechar[i] = false + charpos[i] = 0 + } + + for (var i = 1; i < array_length(global.char); i += 1) { + var char = global.char[i] + global.faceaction[i] = 0; + + if (char == DRCharacter.None) continue; + if !spawndarkners && !scr_character_is_lightner(char) continue; + + chartotal++; + havechar[char - 1] = true; + charpos[char - 1] = i; + + if (i > 0) { + scr_character_set_caterpillar_offsets(char) + global.cinstance[i - 1] = instance_create(obj_mainchara.x - halign + obj_mainchara.halign, obj_mainchara.y - valign + obj_mainchara.valign, obj_caterpillarchara); + global.cinstance[i - 1].target = chartotal * 12; + global.cinstance[i - 1].characterslot = char + + with (global.cinstance[i - 1]) { + scr_character_set_caterpillar_sprites(char); + } + } + } +} \ No newline at end of file diff --git a/scripts/scr_shared_overworld/scr_shared_overworld.yy b/scripts/scr_shared_overworld/scr_shared_overworld.yy new file mode 100644 index 00000000..9de3aa17 --- /dev/null +++ b/scripts/scr_shared_overworld/scr_shared_overworld.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_shared_overworld", + "isCompatibility":false, + "isDnD":false, + "name":"scr_shared_overworld", + "parent":{ + "name":"World", + "path":"folders/DELTARUNE/Scripts/World.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file From 004cdce412189e126e234c0669f69bc7657ed404 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 12 Jan 2026 00:33:57 -0800 Subject: [PATCH 06/56] MULTIPLE MINOR CHANGES TO THE HAVE/LOSE/GET SCRIPT, SHOULD ACT THE SAME AS NORMAL OUTSIDE OF SPECIFIC CASES --- scripts/scr_havechar/scr_havechar.gml | 73 +++++++++++++++------------ 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/scripts/scr_havechar/scr_havechar.gml b/scripts/scr_havechar/scr_havechar.gml index 96c3c7bb..4c66ce6b 100644 --- a/scripts/scr_havechar/scr_havechar.gml +++ b/scripts/scr_havechar/scr_havechar.gml @@ -1,4 +1,4 @@ -function scr_havechar(charname){ +function scr_havechar(charname, giveslot = false){ var checker = charname; // for legacy purposes @@ -11,13 +11,22 @@ function scr_havechar(charname){ if (checker == "noelle" || checker == "no" || checker == "n") checker = DRCharacter.Noelle; - return global.char[0] == checker || global.char[1] == checker || global.char[2] == checker; + var found = giveslot ? [0, false] : false + + for (var i = 0; i < array_length(global.char); ++i) { + if global.char[i] == checker { + found = giveslot ? [true, i] : true + break + } + } + + return found; } -function scr_losechar() -{ - global.char[2] = 0; - global.char[1] = 0; +function scr_losechar() { + for (var i = 1; i < array_length(global.char); ++i) { + global.char[i] = DRCharacter.None + } scr_refresh_party(); @@ -28,11 +37,9 @@ function scr_losechar() global.submenucoord[i] = 0; } -function scr_getchar(charid) -{ +function scr_getchar(charid, force = false) { // for legacy purposes - switch (charid) - { + switch (charid) { case "kr": case "kris": charid = DRCharacter.Kris; @@ -55,25 +62,24 @@ function scr_getchar(charid) } var characterToGet = charid; - getchar = 0; - - if (global.char[0] == 0) - { - global.char[0] = characterToGet; - getchar = 1; - } - - if (global.char[1] == 0 && getchar == 0) - { - global.char[1] = characterToGet; - getchar = 1; - } + getchar = false; - if (global.char[2] == 0 && getchar == 0) - { - global.char[2] = characterToGet; - getchar = 1; - } + for (var i = 0; i < array_length(global.char) && getchar == false; ++i) { + if global.char[i] == DRCharacter.None { + global.char[i] = characterToGet; + getchar = true + } + } + + if getchar == false { + var charname = "UnknownCharacter | " + string(characterToGet) + try { charname = global.charname[characterToGet] } catch (ex) {} // Incase if that charname does not Exist. + show_debug_message("Tried to add '{0}' to the party, {1}", charname, force ? "Forcing in anyways." : "But the party was full.") + + if force { + array_push(global.char, characterToGet) + } + } scr_refresh_party(); } @@ -86,7 +92,7 @@ function scr_refresh_party() { havechar[i] = 0; } - for (i = 0; i < 3; i++) { + for (i = 0; i < array_length(global.char); i++) { c = global.char[i]; if c == DRCharacter.None continue; @@ -99,11 +105,14 @@ function scr_refresh_party() { } function scr_makecaterpillar(xx, yy, characterId, idx) { - global.cinstance[idx] = instance_create(xx, yy, obj_caterpillarchara); + scr_character_set_caterpillar_offsets(characterId) + global.cinstance[idx] = instance_create(xx - halign, yy - valign, obj_caterpillarchara); global.cinstance[idx].target = 12 + idx * 12; - - with (global.cinstance[idx]) + global.cinstance[idx].characterslot = characterId + + with (global.cinstance[idx]) { scr_character_set_caterpillar_sprites(characterId); + } return global.cinstance[idx]; } \ No newline at end of file From fd77bc974fb87fb39f25f80d1226869476057cb3 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 12 Jan 2026 12:39:42 -0800 Subject: [PATCH 07/56] Moved Cloned Code To Shared Overworld OBJ_HEART (Old version of obj_mainchara Collision) and OBJ_MAINCHARA Will both Reference scr_defaultprimarycollisioncode instead of using the Same lines of Code over and over --- .../obj_heart/Collision_obj_collidebullet.gml | 3 +- objects/obj_heart/Step_0.gml | 204 +----------------- objects/obj_mainchara/Step_0.gml | 175 +-------------- .../scr_shared_overworld.gml | 142 +++++++++++- 4 files changed, 153 insertions(+), 371 deletions(-) diff --git a/objects/obj_heart/Collision_obj_collidebullet.gml b/objects/obj_heart/Collision_obj_collidebullet.gml index 0fce9709..923451d7 100644 --- a/objects/obj_heart/Collision_obj_collidebullet.gml +++ b/objects/obj_heart/Collision_obj_collidebullet.gml @@ -1,2 +1 @@ -with (other) - event_user(5); \ No newline at end of file +with (other) event_user(5); \ No newline at end of file diff --git a/objects/obj_heart/Step_0.gml b/objects/obj_heart/Step_0.gml index 0c54c25b..60e78364 100644 --- a/objects/obj_heart/Step_0.gml +++ b/objects/obj_heart/Step_0.gml @@ -23,8 +23,7 @@ if (down_h()) px = 0; py = 0; -if (canmove) -{ +if (canmove) { if (press_r == 1) px = wspeed; @@ -52,206 +51,25 @@ if (canmove) } remove_slow_z_buffer += 0.5; -xmeet = 0; -ymeet = 0; -xymeet = 0; - -if (place_meeting(x + px, y + py, obj_battlesolid)) - xymeet = 1; - -if (place_meeting(x + px, y, obj_battlesolid)) -{ - if (place_meeting(x + px, y, obj_battlesolid)) - { - for (g = wspeed; g > 0; g -= 1) - { - mvd = 0; - - if (press_d == 0 && !place_meeting(x + px, y - g, obj_battlesolid)) - { - y -= g; - py = 0; - mvd = 1; - break; - } - - if (press_u == 0 && mvd == 0 && !place_meeting(x + px, y + g, obj_battlesolid)) - { - y += g; - py = 0; - break; - } - } - } - - xmeet = 1; - bkx = 0; - - if (px > 0) - { - for (i = px; i >= 0; i -= 1) - { - if (!place_meeting(x + i, y, obj_battlesolid)) - { - px = i; - bkx = 1; - break; - } - } - } - - if (px < 0) - { - for (i = px; i <= 0; i += 1) - { - if (!place_meeting(x + i, y, obj_battlesolid)) - { - px = i; - bkx = 1; - break; - } - } - } - - if (bkx == 0) - px = 0; -} - -if (place_meeting(x, y + py, obj_battlesolid)) -{ - ymeet = 1; - bky = 0; - - if (place_meeting(x, y + py, obj_battlesolid)) - { - for (g = wspeed; g > 0; g -= 1) - { - mvd = 0; - - if (press_r == 0 && !place_meeting(x - g, y + py, obj_battlesolid)) - { - x -= g; - px = 0; - mvd = 1; - break; - } - - if (mvd == 0 && press_l == 0 && !place_meeting(x + g, y + py, obj_battlesolid)) - { - x += g; - px = 0; - break; - } - } - } - - if (py > 0) - { - for (i = py; i >= 0; i -= 1) - { - if (!place_meeting(x, y + i, obj_battlesolid)) - { - py = i; - bky = 1; - break; - } - } - } - - if (py < 0) - { - for (i = py; i <= 0; i += 1) - { - if (!place_meeting(x, y + i, obj_battlesolid)) - { - py = i; - bky = 1; - break; - } - } - } - - if (bky == 0) - py = 0; -} - -if (place_meeting(x + px, y + py, obj_battlesolid)) -{ - xymeet = 1; - bkxy = 0; - i = px; - j = py; - - while (j != 0 || i != 0) - { - if (!place_meeting(x + i, y + j, obj_battlesolid)) - { - px = i; - py = j; - bkxy = 1; - break; - } - - if (abs(j) >= 1) - { - if (j > 0) - j -= 1; - - if (j < 0) - j += 1; - } - else - { - j = 0; - } - - if (abs(i) >= 1) - { - if (i > 0) - i -= 1; - - if (i < 0) - i += 1; - } - else - { - i = 0; - } - } - - if (bkxy == 0) - { - px = 0; - py = 0; - } -} - -if ((x + px) >= ((__view_get(e__VW.XView, 0) + 640) - sprite_width)) - px = (__view_get(e__VW.XView, 0) + 640) - sprite_width - x; +scr_defaultprimarycollisioncode(obj_battlesolid) -if ((x + px) <= 0) - px = -x; - -if ((y + py) <= 0) - py = -y; - -if ((y + py) >= (((__view_get(e__VW.YView, 0) + 320) - sprite_height) + boundaryup)) - py = ((__view_get(e__VW.YView, 0) + 320) - sprite_height - y) + boundaryup; +if ((x + px) >= ((camerax() + camerawidth()) - sprite_width)) px = (camerax() + camerawidth()) - sprite_width - x; +if ((x + px) <= 0) px = -x; +if ((y + py) <= 0) py = -y; +if ((y + py) >= (((cameray() + cameraheight()) - sprite_height) + boundaryup)) py = ((cameray() + cameraheight()) - sprite_height - y) + boundaryup; x += px; y += py; -if (dmgnoise == 1) -{ - dmgnoise = 0; +if (dmgnoise == true) { + dmgnoise = false; snd_stop(snd_hurt1); snd_play(snd_hurt1); } global.inv -= 1; -if (global.inv > 0) -{ +if (global.inv > 0) { image_speed = 0.25; } else @@ -260,8 +78,8 @@ else image_index = 0; } -global.heartx = (x + 2) - __view_get(e__VW.XView, 0); -global.hearty = (y + 2) - __view_get(e__VW.YView, 0); +global.heartx = (x + 2) - camerax(); +global.hearty = (y + 2) - cameray(); /*if (color == 1) { diff --git a/objects/obj_mainchara/Step_0.gml b/objects/obj_mainchara/Step_0.gml index 859b6741..bcf0cc90 100644 --- a/objects/obj_mainchara/Step_0.gml +++ b/objects/obj_mainchara/Step_0.gml @@ -276,180 +276,7 @@ if (global.interact == 0 && freeze == 0) if (checkcol) { - if (place_meeting(x + px, y + py, obj_solidblock)) - { - xymeet = 1; - - if (scr_debug() && noclip) - xymeet = 0; - } - - if (place_meeting(x + px, y, obj_solidblock)) - { - if (place_meeting(x + px, y, obj_solidblock)) - { - for (g = wspeed; g > 0; g -= 1) - { - mvd = 0; - - if (press_d == 0 && !place_meeting(x + px, y - g, obj_solidblock)) - { - y -= g; - py = 0; - mvd = 1; - break; - } - - if (press_u == 0 && mvd == 0 && !place_meeting(x + px, y + g, obj_solidblock)) - { - y += g; - py = 0; - break; - } - } - } - - xmeet = 1; - bkx = 0; - - if (px > 0) - { - for (var i = px; i >= 0; i -= 1) - { - if (!place_meeting(x + i, y, obj_solidblock)) - { - px = i; - bkx = 1; - break; - } - } - } - - if (px < 0) - { - for (var i = px; i <= 0; i += 1) - { - if (!place_meeting(x + i, y, obj_solidblock)) - { - px = i; - bkx = 1; - break; - } - } - } - - if (bkx == 0) - px = 0; - } - - if (place_meeting(x, y + py, obj_solidblock)) - { - ymeet = 1; - bky = 0; - - if (place_meeting(x, y + py, obj_solidblock)) - { - for (g = wspeed; g > 0; g -= 1) - { - mvd = 0; - - if (press_r == 0 && !place_meeting(x - g, y + py, obj_solidblock)) - { - x -= g; - px = 0; - mvd = 1; - break; - } - - if (mvd == 0 && press_l == 0 && !place_meeting(x + g, y + py, obj_solidblock)) - { - x += g; - px = 0; - break; - } - } - } - - if (py > 0) - { - for (var i = py; i >= 0; i -= 1) - { - if (!place_meeting(x, y + i, obj_solidblock)) - { - py = i; - bky = 1; - break; - } - } - } - - if (py < 0) - { - for (var i = py; i <= 0; i += 1) - { - if (!place_meeting(x, y + i, obj_solidblock)) - { - py = i; - bky = 1; - break; - } - } - } - - if (bky == 0) - py = 0; - } - - if (place_meeting(x + px, y + py, obj_solidblock)) - { - xymeet = 1; - bkxy = 0; - var i = px; - j = py; - - while (j != 0 || i != 0) - { - if (!place_meeting(x + i, y + j, obj_solidblock)) - { - px = i; - py = j; - bkxy = 1; - break; - } - - if (abs(j) >= 1) - { - if (j > 0) - j -= 1; - - if (j < 0) - j += 1; - } - else - { - j = 0; - } - - if (abs(i) >= 1) - { - if (i > 0) - i -= 1; - - if (i < 0) - i += 1; - } - else - { - i = 0; - } - } - - if (bkxy == 0) - { - px = 0; - py = 0; - } - } + scr_defaultprimarycollisioncode(obj_solidblock) } } else diff --git a/scripts/scr_shared_overworld/scr_shared_overworld.gml b/scripts/scr_shared_overworld/scr_shared_overworld.gml index 6fe8fed8..4f7e615f 100644 --- a/scripts/scr_shared_overworld/scr_shared_overworld.gml +++ b/scripts/scr_shared_overworld/scr_shared_overworld.gml @@ -1,5 +1,5 @@ -function scr_overworldcharwalking_shared(facing = 0) { - +// @description Merged for Mainchara and Caterpillarchara +function scr_overworldcharwalking_shared(facing = 0) { walk = false; if ((y != nowy) || (x != nowx)) && (variable_instance_exists(id, "nopress") ? nopress == 0 : true) @@ -37,6 +37,7 @@ function scr_overworldcharwalking_shared(facing = 0) { if (facing == 3) sprite_index = lsprite; } +// @description Merged for darkcontroller and overworldcontroller function scr_overworldcontrollers_spawncharacters(spawndarkners = true) { chartotal = 0 for (var i = 0; i < DRCharacter.__MAX__; ++i) { @@ -66,4 +67,141 @@ function scr_overworldcontrollers_spawncharacters(spawndarkners = true) { } } } +} + +// @description Merged for Heart and Mainchara +function scr_defaultprimarycollisioncode(_solidobjecttype = obj_solidblock) { + xmeet = false; + ymeet = false; + xymeet = false; + + if (place_meeting(x + px, y + py, _solidobjecttype)) { + xymeet = true; + + if (scr_debug() && (variable_instance_exists(id, "noclip") && noclip)) + xymeet = false; + } + + if (place_meeting(x + px, y, _solidobjecttype)) { + if (place_meeting(x + px, y, _solidobjecttype)) { + for (g = wspeed; g > 0; g -= 1) { + mvd = false; + + if (press_d == false && !place_meeting(x + px, y - g, _solidobjecttype)) { + y -= g; + py = 0; + mvd = true; + break; + } + + if (press_u == 0 && mvd == false && !place_meeting(x + px, y + g, _solidobjecttype)) { + y += g; + py = 0; + break; + } + } + } + + xmeet = true; + bkx = false; + + if (px > 0) { + for (var i = px; i >= 0; i -= 1) { + if (!place_meeting(x + i, y, _solidobjecttype)) { + px = i; + bkx = true; + break; + } + } + } + + if (px < 0) { + for (var i = px; i <= 0; i += 1) { + if (!place_meeting(x + i, y, _solidobjecttype)) { + px = i; + bkx = true; + break; + } + } + } + + if (bkx == 0) px = 0; + } + + if (place_meeting(x, y + py, _solidobjecttype)) { + ymeet = true; + bky = false; + + if (place_meeting(x, y + py, _solidobjecttype)) { + for (g = wspeed; g > 0; g -= 1) { + mvd = false; + + if (press_r == 0 && !place_meeting(x - g, y + py, _solidobjecttype)) { + x -= g; + px = 0; + mvd = true; + break; + } + + if (mvd == 0 && press_l == 0 && !place_meeting(x + g, y + py, _solidobjecttype)) { + x += g; + px = 0; + break; + } + } + } + + if (py > 0) { + for (var i = py; i >= 0; i -= 1) { + if (!place_meeting(x, y + i, _solidobjecttype)) { + py = i; + bky = true; + break; + } + } + } + + if (py < 0) { + for (var i = py; i <= 0; i += 1) { + if (!place_meeting(x, y + i, _solidobjecttype)) { + py = i; + bky = true; + break; + } + } + } + + if (bky == false) py = 0; + } + + if (place_meeting(x + px, y + py, _solidobjecttype)) { + xymeet = true; + bkxy = false; + var i = px; + j = py; + + while (j != 0 || i != 0) { + if (!place_meeting(x + i, y + j, _solidobjecttype)) { + px = i; + py = j; + bkxy = true; + break; + } + + if (abs(j) >= 1) { + if (j > 0) j -= 1; + if (j < 0) j += 1; + } else j = 0; + + if (abs(i) >= 1) { + if (i > 0) i -= 1; + if (i < 0) i += 1; + } else i = 0; + } + + if (bkxy == false) { + px = 0; + py = 0; + } + } } \ No newline at end of file From ba26ea5dc777d7446125bc05f1d2f37ceda9b04f Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 12 Jan 2026 12:52:31 -0800 Subject: [PATCH 08/56] Fixed Minor Issue --- objects/obj_darkcontroller/Draw_0.gml | 2 +- scripts/scr_shared_overworld/scr_shared_overworld.gml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/objects/obj_darkcontroller/Draw_0.gml b/objects/obj_darkcontroller/Draw_0.gml index c7234f60..cad4a9b9 100644 --- a/objects/obj_darkcontroller/Draw_0.gml +++ b/objects/obj_darkcontroller/Draw_0.gml @@ -305,7 +305,7 @@ if (global.menuno == 4) draw_set_font(global.mainbig_font); draw_text(xx + 130, yy + 105, string_hash_to_newline(global.charname[charcoord])); - for (i = 0; i < 3; i += 1) + for (i = 0; i < array_length(global.char); i += 1) { chosen = 0.4; diff --git a/scripts/scr_shared_overworld/scr_shared_overworld.gml b/scripts/scr_shared_overworld/scr_shared_overworld.gml index 4f7e615f..100593a8 100644 --- a/scripts/scr_shared_overworld/scr_shared_overworld.gml +++ b/scripts/scr_shared_overworld/scr_shared_overworld.gml @@ -45,7 +45,7 @@ function scr_overworldcontrollers_spawncharacters(spawndarkners = true) { charpos[i] = 0 } - for (var i = 1; i < array_length(global.char); i += 1) { + for (var i = 0; i < array_length(global.char); i += 1) { var char = global.char[i] global.faceaction[i] = 0; @@ -94,7 +94,7 @@ function scr_defaultprimarycollisioncode(_solidobjecttype = obj_solidblock) { break; } - if (press_u == 0 && mvd == false && !place_meeting(x + px, y + g, _solidobjecttype)) { + if (press_u == false && mvd == false && !place_meeting(x + px, y + g, _solidobjecttype)) { y += g; py = 0; break; @@ -136,14 +136,14 @@ function scr_defaultprimarycollisioncode(_solidobjecttype = obj_solidblock) { for (g = wspeed; g > 0; g -= 1) { mvd = false; - if (press_r == 0 && !place_meeting(x - g, y + py, _solidobjecttype)) { + if (press_r == false && !place_meeting(x - g, y + py, _solidobjecttype)) { x -= g; px = 0; mvd = true; break; } - if (mvd == 0 && press_l == 0 && !place_meeting(x + g, y + py, _solidobjecttype)) { + if (mvd == false && press_l == false && !place_meeting(x + g, y + py, _solidobjecttype)) { x += g; px = 0; break; From 1c09551fb3617e94d0e148fadafa34dedc6e9526 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 12 Jan 2026 12:54:42 -0800 Subject: [PATCH 09/56] Fixed Another Minor Issue: Caterpillars Follow Too Far Behind --- scripts/scr_shared_overworld/scr_shared_overworld.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_shared_overworld/scr_shared_overworld.gml b/scripts/scr_shared_overworld/scr_shared_overworld.gml index 100593a8..8c115396 100644 --- a/scripts/scr_shared_overworld/scr_shared_overworld.gml +++ b/scripts/scr_shared_overworld/scr_shared_overworld.gml @@ -59,7 +59,7 @@ function scr_overworldcontrollers_spawncharacters(spawndarkners = true) { if (i > 0) { scr_character_set_caterpillar_offsets(char) global.cinstance[i - 1] = instance_create(obj_mainchara.x - halign + obj_mainchara.halign, obj_mainchara.y - valign + obj_mainchara.valign, obj_caterpillarchara); - global.cinstance[i - 1].target = chartotal * 12; + global.cinstance[i - 1].target = (chartotal - 1) * 12; global.cinstance[i - 1].characterslot = char with (global.cinstance[i - 1]) { From bc645c227b9464d519f8514b1f732fe68b365311 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 12 Jan 2026 14:10:57 -0800 Subject: [PATCH 10/56] Fixed Minor Issue: If too Many Caterpillars are created they Pass the Max Target Value of 75 Made the Max Target Value a Variable, Which if Target Passes it upon Char Initialization the Max Target will be Increased --- objects/obj_caterpillarchara/Create_0.gml | 5 +++-- objects/obj_caterpillarchara/Step_2.gml | 14 +++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/objects/obj_caterpillarchara/Create_0.gml b/objects/obj_caterpillarchara/Create_0.gml index 39099c3c..7562f9e9 100644 --- a/objects/obj_caterpillarchara/Create_0.gml +++ b/objects/obj_caterpillarchara/Create_0.gml @@ -33,8 +33,9 @@ pr = parent.rsprite; pl = parent.lsprite; pu = parent.usprite; -for (i = 0; i < 75; i += 1) -{ +maxtarget = 75 * array_length(global.char) + +for (i = 0; i < maxtarget; i += 1) { remx[i] = parent.x; remy[i] = parent.y; facing[i] = global.facing; diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index 6543a49b..d2bb062b 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -34,6 +34,18 @@ if (!init) { valign = 12; } } + + if target > maxtarget { + var previousmax = maxtarget + maxtarget = target * 2 + for (i = previousmax; i < maxtarget; i += 1) { + remx[i] = remx[previousmax]; + remy[i] = remy[previousmax]; + facing[i] = facing[previousmax] + sliding[i] = sliding[previousmax] + special[i] = special[previousmax] + } + } } if (!ignoredepth) { @@ -56,7 +68,7 @@ if (sliding[target] == true) moved = true; if (moved == true && follow == true) { blushtimer = 0; - for (i = 75; i > 0; i -= 1) { + for (i = maxtarget; i > 0; i -= 1) { remx[i] = remx[i - 1]; remy[i] = remy[i - 1]; facing[i] = facing[i - 1]; From 1abb88379e5d4faf1720abe15aa628d7d2803f83 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 12 Jan 2026 15:01:04 -0800 Subject: [PATCH 11/56] Cleaned up obj_mainchara's leftover heightfloor stuff, despite the object for it not being implemented --- DELTAModKit.yyp | 4 +- objects/obj_mainchara/Create_0.gml | 49 +++------ objects/obj_mainchara/Step_0.gml | 165 ++++++++++------------------- 3 files changed, 78 insertions(+), 140 deletions(-) diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index 1e28e099..21c2c827 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -159,7 +159,9 @@ {"$GMFolder":"","%Name":"Chapter 1","folderPath":"folders/DELTARUNE/Tilesets/Dark World/Tilesets/Chapter 1.yy","name":"Chapter 1","resourceType":"GMFolder","resourceVersion":"2.0",}, ], "ForcedPrefabProjectReferences":[], - "IncludedFiles":[], + "IncludedFiles":[ + {"$GMIncludedFile":"","%Name":"ch5_shop.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"ch5_shop.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + ], "isEcma":false, "LibraryEmitters":[], "MetaData":{ diff --git a/objects/obj_mainchara/Create_0.gml b/objects/obj_mainchara/Create_0.gml index 0bb5bfc7..8b539842 100644 --- a/objects/obj_mainchara/Create_0.gml +++ b/objects/obj_mainchara/Create_0.gml @@ -88,17 +88,10 @@ swordfacing = 1; swordsprite = rsprite; fun = 0; -if (global.facing == 0) - sprite_index = dsprite; - -if (global.facing == 1) - sprite_index = rsprite; - -if (global.facing == 2) - sprite_index = usprite; - -if (global.facing == 3) - sprite_index = lsprite; +if (global.facing == 0) sprite_index = dsprite; +if (global.facing == 1) sprite_index = rsprite; +if (global.facing == 2) sprite_index = usprite; +if (global.facing == 3) sprite_index = lsprite; onebuffer = 0; twobuffer = 0; @@ -110,8 +103,7 @@ for (i = 0; i < 10; i += 1) cameFromEntrance = global.entrance; -if (global.interact == 3) -{ +if (global.interact == 3) { noentrancefound = 0; if (global.entrance > 0) @@ -261,45 +253,38 @@ initht = sprite_height; mywidth = sprite_width; myheight = sprite_height; -function check_heightfloor(arg0, arg1, arg2) -{ +// @desc Checks if kris and the floorobject is on the Same Height (Only Defined in obj_mainchara so it can only be used in that Scope.) +function check_heightfloor(xcheck, ycheck, floorobject) { var __onfloor = 0; - var __inst = instance_position(bbox_right + arg0, bbox_top + arg1, arg2); + var __inst = instance_position(bbox_right + xcheck, bbox_top + ycheck, floorobject); - if (__inst != -4) - { + if (__inst != noone) { if (__inst.floorheight == floorheight) __onfloor++; } - __inst = instance_position(bbox_right + arg0, bbox_bottom + arg1, arg2); - - if (__inst != -4) - { + __inst = instance_position(bbox_right + xcheck, bbox_bottom + ycheck, floorobject); + if (__inst != noone) { if (__inst.floorheight == floorheight) __onfloor++; } - __inst = instance_position(bbox_left + arg0, bbox_top + arg1, arg2); - - if (__inst != -4) - { + __inst = instance_position(bbox_left + xcheck, bbox_top + ycheck, floorobject); + if (__inst != noone) { if (__inst.floorheight == floorheight) __onfloor++; } - __inst = instance_position(bbox_left + arg0, bbox_bottom + arg1, arg2); - - if (__inst != -4) - { + __inst = instance_position(bbox_left + xcheck, bbox_bottom + ycheck, floorobject); + if (__inst != noone) { if (__inst.floorheight == floorheight) __onfloor++; } if (__onfloor == 4) - __onfloor = 1; + __onfloor = true; else - __onfloor = 0; + __onfloor = false; return __onfloor; } diff --git a/objects/obj_mainchara/Step_0.gml b/objects/obj_mainchara/Step_0.gml index bcf0cc90..6f6c652a 100644 --- a/objects/obj_mainchara/Step_0.gml +++ b/objects/obj_mainchara/Step_0.gml @@ -278,61 +278,49 @@ if (global.interact == 0 && freeze == 0) { scr_defaultprimarycollisioncode(obj_solidblock) } - } - else - { + } else { var _hedge = bbox_right; var _vedge = bbox_bottom; var _goingright = 0; var _goingdown = 0; - var _checkobj = 535; + var _checkobj = asset_get_index("obj_heightfloor"); - if (px > 0) - { + if (px > 0) { _goingright = 1; _hedge = bbox_right; } - if (px < 0) - { + if (px < 0) { _goingright = -1; _hedge = bbox_left; } - if (py > 0) - { + if (py > 0) { _goingdown = 1; _vedge = bbox_bottom; } - if (py < 0) - { + if (py < 0) { _goingdown = -1; _vedge = bbox_top; } - if (!check_heightfloor(px, 0, _checkobj)) - { - for (g = wspeed; g > 0; g -= 1) - { - mvd = 0; + if (!check_heightfloor(px, 0, _checkobj)) { + for (g = wspeed; g > 0; g -= 1) { + mvd = false; - if (press_d == 0) - { - if (check_heightfloor(px, -g, _checkobj)) - { + if (press_d == false) { + if (check_heightfloor(px, -g, _checkobj)) { y -= g; py = 0; _vedge = bbox_top; - mvd = 1; + mvd = true; break; } - } + } - if (press_u == 0) - { - if (check_heightfloor(px, g, _checkobj)) - { + if (press_u == false) { + if (check_heightfloor(px, g, _checkobj)) { y += g; py = 0; _vedge = bbox_bottom; @@ -341,59 +329,50 @@ if (global.interact == 0 && freeze == 0) } } - xmeet = 1; - bkx = 0; + xmeet = true; + bkx = false; - if (px > 0) - { - for (var i = px; i >= 0; i -= 1) - { + if (px > 0) { + for (var i = px; i >= 0; i -= 1) { if (check_heightfloor(i, 0, _checkobj)) { px = i; - bkx = 1; + bkx = true; break; } } } - if (px < 0) - { - for (var i = px; i <= 0; i += 1) - { + if (px < 0) { + for (var i = px; i <= 0; i += 1) { if (check_heightfloor(i, 0, _checkobj)) { px = i; - bkx = 1; + bkx = true; break; } } } - if (bkx == 0) - px = 0; + if (bkx == false) px = 0; } - if (!check_heightfloor(0, py, _checkobj)) - { - ymeet = 1; - bky = 0; + if (!check_heightfloor(0, py, _checkobj)) { + ymeet = true; + bky = false; - for (g = wspeed; g > 0; g -= 1) - { - mvd = 0; + for (g = wspeed; g > 0; g -= 1) { + mvd = false; - if (press_r == 0 && check_heightfloor(-g, py, _checkobj)) - { + if (press_r == false && check_heightfloor(-g, py, _checkobj)) { x -= g; px = 0; _hedge = bbox_left; - mvd = 1; + mvd = true; break; } - if (mvd == 0 && press_l == 0 && check_heightfloor(g, py, _checkobj)) - { + if (mvd == false && press_l == false && check_heightfloor(g, py, _checkobj)) { x += g; px = 0; _hedge = bbox_right; @@ -401,92 +380,64 @@ if (global.interact == 0 && freeze == 0) } } - if (py > 0) - { - for (var i = py; i >= 0; i -= 1) - { - if (check_heightfloor(0, i, _checkobj)) - { + if (py > 0) { + for (var i = py; i >= 0; i -= 1) { + if (check_heightfloor(0, i, _checkobj)) { py = i; - bky = 1; + bky = true; break; } } } - if (py < 0) - { - for (var i = py; i <= 0; i += 1) - { - if (check_heightfloor(0, i, _checkobj)) - { + if (py < 0) { + for (var i = py; i <= 0; i += 1) { + if (check_heightfloor(0, i, _checkobj)) { py = i; - bky = 1; + bky = true; break; } } } - if (bky == 0) - py = 0; + if (bky == false) py = 0; } - if (!check_heightfloor(px, 0, _checkobj)) - { - xymeet = 1; - bkxy = 0; + if (!check_heightfloor(px, 0, _checkobj)) { + xymeet = true; + bkxy = false; var i = px; j = py; - while (j != 0 || i != 0) - { - if (check_heightfloor(i, j, _checkobj)) - { + while (j != 0 || i != 0) { + if (check_heightfloor(i, j, _checkobj)) { px = i; py = j; - bkxy = 1; + bkxy = true; break; } - if (abs(j) >= 1) - { - if (j > 0) - j -= 1; - - if (j < 0) - j += 1; - } - else - { - j = 0; - } + if (abs(j) >= 1) { + if (j > 0) j -= 1; + if (j < 0) j += 1; + } else j = 0; - if (abs(i) >= 1) - { - if (i > 0) - i -= 1; - - if (i < 0) - i += 1; - } - else - { - i = 0; - } + if (abs(i) >= 1) { + if (i > 0) i -= 1; + if (i < 0) i += 1; + } else i = 0; } - if (bkxy == 0) - { + if (bkxy == false) { px = 0; py = 0; } } } - runmove = 0; + runmove = false; - if (run == 1 && xmeet == 0 && ymeet == 0 && xymeet == 0) - { + if (run == 1 && xmeet == 0 && ymeet == 0 && xymeet == 0) { if (abs(px) > 0 || abs(py) > 0) { runmove = 1; From 14532d2772781f26743bc005d71836254b7d9b29 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 12 Jan 2026 16:50:07 -0800 Subject: [PATCH 12/56] REMOVED HARDCODING FROM RUNNING --- DELTAModKit.yyp | 4 +- objects/obj_mainchara/Create_0.gml | 5 ++ objects/obj_mainchara/Step_0.gml | 139 ++++++++++------------------- 3 files changed, 52 insertions(+), 96 deletions(-) diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index 21c2c827..1e28e099 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -159,9 +159,7 @@ {"$GMFolder":"","%Name":"Chapter 1","folderPath":"folders/DELTARUNE/Tilesets/Dark World/Tilesets/Chapter 1.yy","name":"Chapter 1","resourceType":"GMFolder","resourceVersion":"2.0",}, ], "ForcedPrefabProjectReferences":[], - "IncludedFiles":[ - {"$GMIncludedFile":"","%Name":"ch5_shop.ogg","CopyToMask":-1,"filePath":"datafiles/mus","name":"ch5_shop.ogg","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, - ], + "IncludedFiles":[], "isEcma":false, "LibraryEmitters":[], "MetaData":{ diff --git a/objects/obj_mainchara/Create_0.gml b/objects/obj_mainchara/Create_0.gml index 8b539842..4a8fcd94 100644 --- a/objects/obj_mainchara/Create_0.gml +++ b/objects/obj_mainchara/Create_0.gml @@ -288,9 +288,14 @@ function check_heightfloor(xcheck, ycheck, floorobject) { return __onfloor; } + + nudgex = 0; nudgey = 0; nudgelerp = 0.1; noclip = false; + +darkrunmultiplierchangeamt = 0.8 // Default == 0.8 +runspeedadder = 1 // Default == 1 \ No newline at end of file diff --git a/objects/obj_mainchara/Step_0.gml b/objects/obj_mainchara/Step_0.gml index 6f6c652a..ebec2586 100644 --- a/objects/obj_mainchara/Step_0.gml +++ b/objects/obj_mainchara/Step_0.gml @@ -110,127 +110,81 @@ if (global.interact == 0 && freeze == 0) } } - if (!canrun) - run = 0; - - if (run == 1) - { - if (darkmode == 0) - { - wspeed = bwspeed + 1; - - if (runtimer > 10) - wspeed = bwspeed + 2; - - if (runtimer > 60) - wspeed = bwspeed + 3; - } - - if (darkmode == 1) - { - wspeed = bwspeed + 2; - - if (runtimer > 10) - wspeed = bwspeed + 4; - - if (runtimer > 60) - wspeed = bwspeed + 5; - } + if (!canrun) run = false; + + if (run == true) { + var multiply = 1 + if darkmode multiply += darkrunmultiplierchangeamt + + var changeamt = runspeedadder + if (runtimer > 10) changeamt += runspeedadder; + if (runtimer > 60) changeamt += runspeedadder; + + wspeed = bwspeed + round(changeamt * multiply) } - if (run == 0) - wspeed = bwspeed; - - if (climbing == 1) - wspeed = ceil(wspeed * 0.7); + if (run == false) wspeed = bwspeed; + if (climbing == true) wspeed = ceil(wspeed * 0.7); - if (left_h()) - press_l = 1; - - if (right_h()) - press_r = 1; - - if (up_h()) - press_u = 1; - - if (down_h()) - press_d = 1; + if left_h() press_l = true; + if right_h() press_r = true; + if up_h() press_u = true; + if down_h() press_d = true; px = 0; py = 0; pressdir = -1; - if (press_r == 1) - { + if (press_r == true) { px = wspeed; pressdir = 1; } - if (press_l == 1) - { + if (press_l == true) { px = -wspeed; pressdir = 3; } - if (press_d == 1) - { + if (press_d == true) { py = wspeed; pressdir = 0; } - if (press_u == 1) - { + if (press_u == true) { py = -wspeed; pressdir = 2; } - if (nopress == 1 && pressdir != -1) + if (nopress == true && pressdir != -1) global.facing = pressdir; - if (global.facing == 2) - { - if (press_d == 1) - global.facing = 0; - - if (press_u == 0 && pressdir != -1) - global.facing = pressdir; + if (global.facing == 2) { + if (press_d == 1) global.facing = 0; + if (press_u == 0 && pressdir != -1) global.facing = pressdir; } - if (global.facing == 0) - { - if (press_u == 1) - global.facing = 2; - - if (press_d == 0 && pressdir != -1) - global.facing = pressdir; + if (global.facing == 0) { + if (press_u == true) global.facing = 2; + if (press_d == false && pressdir != -1) global.facing = pressdir; } - if (global.facing == 3) - { - if (press_r == 1) - global.facing = 1; - - if (press_l == 0 && pressdir != -1) - global.facing = pressdir; + if (global.facing == 3) { + if (press_r == true) global.facing = 1; + if (press_l == false && pressdir != -1) global.facing = pressdir; } - if (global.facing == 1) - { - if (press_l == 1) + if (global.facing == 1) { + if (press_l == true) global.facing = 3; - if (press_r == 0 && pressdir != -1) + if (press_r == false && pressdir != -1) global.facing = pressdir; } - if (press_r == 1) - swordfacing = 1; - - if (press_l == 1) - swordfacing = -1; + if (press_r == true) swordfacing = 1; + if (press_l == true) swordfacing = -1; - if (swordmode == 1) - { + if (swordmode == true) { if (button1_p() && swordcon == 0 && global.interact == 0) { global.interact = 4; @@ -252,23 +206,22 @@ if (global.interact == 0 && freeze == 0) image_speed = 0.5; swordtimer = 0; swordcon = 1; - press_l = 0; - press_r = 0; - press_u = 0; - press_d = 0; + press_l = false; + press_r = false; + press_u = false; + press_d = false; //swordhitbox = instance_create(slashmarker.x, slashmarker.y, obj_swordhitbox); //swordhitbox.image_xscale = slashmarker.image_xscale; //swordhitbox.image_yscale = image_yscale; } } - nopress = 0; - xmeet = 0; - ymeet = 0; - xymeet = 0; + nopress = false; + xmeet = false; + ymeet = false; + xymeet = false; - if (floorheight == 0) - { + if (floorheight == 0) { var checkcol = true; if (scr_debug() && noclip) From 860c6c6061542156520c9ee1ae93cbe17834cbef Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 13 Jan 2026 00:41:04 -0800 Subject: [PATCH 13/56] MINOR CHANGE --- objects/obj_mainchara/Create_0.gml | 2 -- scripts/scr_flag/scr_flag.gml | 17 +++++++---------- scripts/scr_gameover/scr_gameover.gml | 12 ++++-------- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/objects/obj_mainchara/Create_0.gml b/objects/obj_mainchara/Create_0.gml index 4a8fcd94..7112fd21 100644 --- a/objects/obj_mainchara/Create_0.gml +++ b/objects/obj_mainchara/Create_0.gml @@ -288,8 +288,6 @@ function check_heightfloor(xcheck, ycheck, floorobject) { return __onfloor; } - - nudgex = 0; nudgey = 0; diff --git a/scripts/scr_flag/scr_flag.gml b/scripts/scr_flag/scr_flag.gml index 9696a3c0..b9952e67 100644 --- a/scripts/scr_flag/scr_flag.gml +++ b/scripts/scr_flag/scr_flag.gml @@ -1,11 +1,7 @@ -function global_flagname_init() -{ +function global_flagname_init() { global.flagname = []; - repeat (9999) - { - array_push(global.flagname, undefined) - } + repeat (9999) array_push(global.flagname, undefined) global.flagname[6] = "disable text skip [Broken]" global.flagname[8] = "Simplify VFX" @@ -52,11 +48,13 @@ function global_flagname_init() global.flagname[407] = "Blue Checkmark 2" global.flagname[420] = "Blue Checkmark 3" // Battles + global.flagname[13] = "Multikey Attack" + global.flagname[14] = "Remember Last Option [Battle]" global.flagname[22] = "Block Soul Slow" global.flagname[34] = "CharAction" + global.flagname[36] = "Failed Dojo" global.flagname[37] = "Dojo Battle" - global.flagname[13] = "Multikey Attack" - global.flagname[14] = "Remember Last Option [Battle]" + global.flagname[39] = "Technically Won/Force Win" global.flagname[40] = "Fled Or Fatal Kill Enemies" global.flagname[41] = "Spared Enemies" global.flagname[42] = "Pacified Enemies" @@ -72,8 +70,7 @@ function global_flagname_init() global.flagname[1045] = "Sus Heal Strength" } -function global_flagname_menu_init(arg0, arg1, arg2, arg3) -{ +function global_flagname_menu_init(arg0, arg1, arg2, arg3) { return show_message("FlagName Menu No longer exists as most Debugging features are now being commented out before release [or getting replaced with return].") } diff --git a/scripts/scr_gameover/scr_gameover.gml b/scripts/scr_gameover/scr_gameover.gml index c4e94806..68a677b9 100644 --- a/scripts/scr_gameover/scr_gameover.gml +++ b/scripts/scr_gameover/scr_gameover.gml @@ -1,7 +1,5 @@ -function scr_gameover() -{ - if (global.flag[35] == 0) - { +function scr_gameover() { + if (global.flag[35] == 0) { audio_stop_all(); snd_play(snd_hurt1); @@ -10,15 +8,13 @@ function scr_gameover() room_goto(room_gameover); } - if (global.flag[35] == 1) - { + if (global.flag[35] == 1) { global.turntimer = -1; global.flag[36] = 1; global.flag[39] = 1; } - if (global.flag[35] == 2) - { + if (global.flag[35] == 2) { audio_stop_all(); snd_play(snd_hurt1); snd_free_all(); From ce75b416df29f90177d2e868501070713c26c379 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 13 Jan 2026 01:31:08 -0800 Subject: [PATCH 14/56] Updated Camera Functions in MainChara to use Ch2+ Versions rather than Autogenerated the GameMakerStudio -> GameMakerStudio2 originally Used, Along with other Changes SCR_NEXTHERO AND SCR_PREVHERO NO LONGER USE HARDCODED PARTY SIZES, ADDED AN "if object_exists" RELATED TO LANCER KEY ITEM --- objects/obj_darkcontroller/Step_0.gml | 8 +- objects/obj_mainchara/Step_2.gml | 94 ++++++---------- scripts/scr_turn/scr_turn.gml | 152 ++++++++++---------------- 3 files changed, 96 insertions(+), 158 deletions(-) diff --git a/objects/obj_darkcontroller/Step_0.gml b/objects/obj_darkcontroller/Step_0.gml index a99d2f9c..d5ddcc5b 100644 --- a/objects/obj_darkcontroller/Step_0.gml +++ b/objects/obj_darkcontroller/Step_0.gml @@ -1228,14 +1228,12 @@ if (global.interact == 5) selectnoise = 1; deschaver = 1; - /*if (global.chapter == 2 || global.chapter == 3) - { - if (scr_keyitemcheck(DRKeyIte.Lancer)) - { + if (global.chapter == 2 || global.chapter == 3) && object_exists(asset_get_index("obj_lancergotchi")) { + if (scr_keyitemcheck(DRKeyItem.Lancer)) { if (!instance_exists(obj_lancergotchi)) instance_create(x, y, obj_lancergotchi); } - }*/ + } } if (global.submenu == 2 || global.submenu == 3) diff --git a/objects/obj_mainchara/Step_2.gml b/objects/obj_mainchara/Step_2.gml index 9658aa1c..185265e7 100644 --- a/objects/obj_mainchara/Step_2.gml +++ b/objects/obj_mainchara/Step_2.gml @@ -1,69 +1,47 @@ -if (global.darkzone == 1) -{ - if (false/*instance_exists(obj_camera_advanced)*/) - { - //obj_camera_advanced.cutscene = cutscene; +if (global.darkzone == true) { + if object_exists(asset_get_index("obj_camera_advanced")) && (instance_exists(obj_camera_advanced)) { + obj_camera_advanced.cutscene = cutscene; - //with (obj_camera_advanced) - // event_user(0); - } - else if (cutscene == 0 && !instance_exists(obj_shake)) - { - wd = x - floor((__view_get(e__VW.WView, 0) / 2) - (initwd / 2)); - ht = y - floor((__view_get(e__VW.HView, 0) / 2) - (initht / 2)); - __view_set(e__VW.XView, 0, wd); - __view_set(e__VW.YView, 0, ht); - - if (__view_get(e__VW.XView, 0) < 0) - __view_set(e__VW.XView, 0, 0); - - if (__view_get(e__VW.XView, 0) > (room_width - __view_get(e__VW.WView, 0))) - __view_set(e__VW.XView, 0, room_width - __view_get(e__VW.WView, 0)); + with (obj_camera_advanced) + event_user(0); + } else if (cutscene == false && !instance_exists(obj_shake)) { + wd = x - floor((camerawidth() / 2) - (initwd / 2)); + ht = y - floor((cameraheight() / 2) - (initht / 2)); + camerax_set(wd); + cameray_set(ht); - if (__view_get(e__VW.YView, 0) < 0) - __view_set(e__VW.YView, 0, 0); + if camerax() < 0 camerax_set(0) + if camerax() > (room_width - camerawidth()) camerax_set(room_width - camerawidth()); - if (__view_get(e__VW.YView, 0) > (room_height - __view_get(e__VW.HView, 0))) - __view_set(e__VW.YView, 0, room_height - __view_get(e__VW.HView, 0)); + if cameray() < 0 cameray_set(0) + if cameray() > (room_height - cameraheight()) cameray_set(room_height - cameraheight()); } } -if (global.darkzone == 0) -{ - if (global.plot >= 245 || global.chapter >= 2) - { - if (false/*instance_exists(obj_camera_advanced)*/) - { - //obj_camera_advanced.cutscene = cutscene; - - //with (obj_camera_advanced) - // event_user(0); - } - else if (cutscene == 0 && !instance_exists(obj_shake)) - { - __view_set(e__VW.Object, 0, -4); - wd = (x - floor(__view_get(e__VW.WView, 0) / 2)) + 11; - ht = (y - floor(__view_get(e__VW.HView, 0) / 2)) + 17; - __view_set(e__VW.XView, 0, wd); - __view_set(e__VW.YView, 0, ht); - - if (__view_get(e__VW.XView, 0) < 0) - __view_set(e__VW.XView, 0, 0); - - if (__view_get(e__VW.XView, 0) > (room_width - __view_get(e__VW.WView, 0))) - __view_set(e__VW.XView, 0, room_width - __view_get(e__VW.WView, 0)); - - if (__view_get(e__VW.YView, 0) < 0) - __view_set(e__VW.YView, 0, 0); - - if (__view_get(e__VW.YView, 0) > (room_height - __view_get(e__VW.HView, 0))) - __view_set(e__VW.YView, 0, room_height - __view_get(e__VW.HView, 0)); +if (global.darkzone == false) { + if (global.plot >= 245 || global.chapter >= 2) { + if object_exists(asset_get_index("obj_camera_advanced")) && (instance_exists(obj_camera_advanced)) { + obj_camera_advanced.cutscene = cutscene; + + with (obj_camera_advanced) + event_user(0); + } else if (cutscene == false && !instance_exists(obj_shake)) { + __view_set(e__VW.Object, 0, noone); + wd = (x - floor(camerawidth() / 2)) + 11; + ht = (y - floor(cameraheight() / 2)) + 17; + camerax_set(wd); + cameray_set(ht); + + if camerax() < 0 camerax_set(0) + if camerax() > (room_width - camerawidth()) camerax_set(room_width - camerawidth()); + + if cameray() < 0 cameray_set(0) + if cameray() > (room_height - cameraheight()) cameray_set(room_height - cameraheight()); } } } -if (bg == 1) -{ - //with (obj_backgrounderparent) - // event_user(0); +if (bg == true) && object_exists(asset_get_index("obj_backgrounderparent")) { + with (obj_backgrounderparent) + event_user(0); } \ No newline at end of file diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 1936a7b3..b29f7f13 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -280,55 +280,39 @@ function scr_retarget_spell() } } -function scr_ambush() -{ - with (obj_writer) - instance_destroy(); +function scr_ambush() { + with (obj_writer) instance_destroy(); + with (obj_face) instance_destroy(); - with (obj_face) - instance_destroy(); - - global.charturn = 3; + global.charturn = array_length(global.charmove); global.mnfight = 1; global.myfight = -1; - with (obj_monsterparent) - ambushed = 1; + with (obj_monsterparent) ambushed = true; } -function scr_nexthero() -{ +function scr_nexthero() { moveswapped = 0; prevturn = global.charturn; - if (global.charturn == 0) - { - moveswapped = 1; - - if (global.charmove[1] == 1 && scr_charcan(1)) - global.charturn = 1; - else if (global.charmove[2] == 1 && scr_charcan(2)) - global.charturn = 2; - else - scr_endturn(); - } - - if (global.charturn == 1 && moveswapped == 0) - { - moveswapped = 1; - - if (scr_charcan(2) && global.acting[1] == 0) - global.charturn = 2; - else - scr_endturn(); - } + for (var i = global.charturn + 1; i <= array_length(global.charmove) && !moveswapped; ++i) { + if i >= array_length(global.charmove) { + moveswapped = true + scr_endturn() + } else if global.charmove[i] == true && scr_charcan(i) && global.acting[i] == false { + global.charturn = i + moveswapped = true + } else { + break + } + } var endturn = false; - if ((global.charturn == 2 && moveswapped == 0) || endturn == true) + if (endturn == true) scr_endturn(); - if (moveswapped == 1) + if (moveswapped == true) global.bmenuno = 0; if (global.charturn > 0) @@ -340,36 +324,24 @@ function scr_nexthero() } } -function scr_prevhero() -{ +function scr_prevhero() { prevturn = global.charturn; - moveswapped = 0; - - if (global.charturn == 1) - { - if (global.charmove[0] == 1) - { - global.charturn = 0; - moveswapped = 1; - } - } - - if (global.charturn == 2) - { - moveswapped = 1; - - if (global.charmove[1] == 1 && global.acting[1] == 0) - global.charturn = 1; - else if (global.charmove[0] == 1) - global.charturn = 0; - } + moveswapped = false; + + for (var i = global.charturn - 1; i >= 0; --i) { + if i >= 0 { + if global.charmove[i] == true && global.acting[i] == false { + global.charturn = i + moveswapped = true + break + } + } else break + } - if (moveswapped == 1) - { + if (moveswapped == true) { global.bmenuno = 0; - with (obj_monsterparent) - acting[global.char[global.charturn]] = 0; + with (obj_monsterparent) acting[global.char[global.charturn]] = false; global.actingsingle[global.charturn] = 0; global.actingsimul[global.charturn] = 0; @@ -377,54 +349,45 @@ function scr_prevhero() global.chartarget[global.charturn] = 0; global.charaction[global.charturn] = 0; global.charspecial[global.charturn] = 0; - movenoise = 1; + movenoise = true; } - if (idefendedthisturn > 0) - { + if (idefendedthisturn > 0) { idefendedthisturn--; mercytotal -= 40; } - if (global.charturn == 0) - { + if (global.charturn == 0) { with (obj_monsterparent) for (i = 0; i < DRCharacter.__MAX__; i++) - acting[i] = 0; - - global.acting[0] = 0; - global.acting[1] = 0; - global.acting[2] = 0; - global.faceaction[1] = 0; - global.chartarget[1] = 0; - global.charaction[1] = 0; - global.charspecial[1] = 0; - global.faceaction[2] = 0; + acting[i] = false; // Clears All Acts (Enemy Side) + + for (var i = 0; i < array_length(global.acting); ++i) { // Clears all Acts (Hero Side) + global.acting[i] = false + global.chartarget[i] = 0 + global.charspecial[i] = 0 + global.faceaction[i] = 0 + } + global.tension = global.temptension[0]; - for (i = 0; i < 12; i += 1) - tempitem[i][0] = global.item[i]; - } - else - { - global.tension = global.temptension[global.charturn]; - - for (i = 0; i < 12; i += 1) - tempitem[i][global.charturn] = tempitem[i][global.charturn - 1]; + for (i = 0; i < 12; i += 1) tempitem[i][0] = global.item[i]; + } else { + for (i = 0; i < 12; i += 1) tempitem[i][global.charturn] = tempitem[i][global.charturn - 1]; } + global.tension = global.temptension[global.charturn]; } -function scr_actselect(arg0, arg1) -{ - if (i_ex(global.monsterinstance[arg0])) - global.monsterinstance[arg0].acting[global.char[global.charturn]] = arg1 + 1; +function scr_actselect(star, action) { + if (i_ex(global.monsterinstance[star])) + global.monsterinstance[star].acting[global.char[global.charturn]] = action + 1; /*if (global.char[global.charturn] == DRCharacter.Kris) { - global.actingsimul[0] = actsimul[arg1]; + global.actingsimul[0] = actsimul[action]; global.acting[0] = 1; global.actingsingle[0] = 1; - global.actingtarget[global.charturn] = arg0; + global.actingtarget[global.charturn] = star; for (i = 0; i < 3; i += 1) { @@ -437,16 +400,15 @@ function scr_actselect(arg0, arg1) } else*/ { - global.actingtarget[global.charturn] = arg0; + global.actingtarget[global.charturn] = star; global.actingsingle[global.charturn] = 1; - global.actingsimul[global.charturn] = actsimul[arg1]; + global.actingsimul[global.charturn] = actsimul[action]; global.faceaction[global.charturn] = 6; global.charaction[global.charturn] = 9; } } -function scr_nextact() -{ +function scr_nextact() { show_debug_message("------------ scr_nextact") global.currentactingchar = 0; From a1cb69cfe4fc4e6565ede56a79c05ba4b1f9e30a Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 13 Jan 2026 13:30:19 -0800 Subject: [PATCH 15/56] Made Dark Transition More Controllable Haven't fully Learned how it works, otherwise the Door would be fully Moveable. --- objects/obj_dw_transition/Create_0.gml | 8 -------- objects/obj_dw_transition/Draw_0.gml | 14 ++++---------- objects/obj_dw_transition/obj_dw_transition.yy | 13 ++++++++++++- .../obj_dw_transition_interactable/Other_10.gml | 3 +-- .../obj_dw_transition_interactable/Step_0.gml | 16 +++++++++++----- .../obj_dw_transition_interactable.yy | 16 +++++++++++++++- rooms/room_lw_test/room_lw_test.yy | 12 +++++++++++- 7 files changed, 54 insertions(+), 28 deletions(-) diff --git a/objects/obj_dw_transition/Create_0.gml b/objects/obj_dw_transition/Create_0.gml index b8aa7069..47172ffb 100644 --- a/objects/obj_dw_transition/Create_0.gml +++ b/objects/obj_dw_transition/Create_0.gml @@ -8,10 +8,6 @@ index = 0; sus_v = 0; sus_f = 0; dz = 1 + global.darkzone; -kris_x = 134 + camerax(); -kris_y = 94 + cameray(); -sus_x = 162 + camerax(); -sus_y = 86 + cameray(); sus_draw = 1; sus_sprite = 0; sus_index = 0; @@ -23,10 +19,6 @@ linetimer = 0; rect_draw = 0; fake_screenshake = 0; fake_shakeamount = 0; -rx1 = 138; -ry1 = 64; -rx2 = 182; -ry2 = 118; quick_mode = 0; soundtimer = 0; diff --git a/objects/obj_dw_transition/Draw_0.gml b/objects/obj_dw_transition/Draw_0.gml index a80c52a6..21a02999 100644 --- a/objects/obj_dw_transition/Draw_0.gml +++ b/objects/obj_dw_transition/Draw_0.gml @@ -526,20 +526,14 @@ if (con == 33) { if (skiprunback == 1) { - var _offset = 13; - - //if (room == room_schooldoor) - // _offset = 0; + var _offset = transtimeoffset_baseval + transtimeoffset_addskiprunback; if (timer == (36 + _offset)) snd_play(snd_dtrans_flip); } else { - var _offset = 10; - - //if (room == room_schooldoor) - // _offset = 0; + var _offset = transtimeoffset_baseval; if (timer == (39 + _offset)) snd_play(snd_dtrans_flip); @@ -686,11 +680,11 @@ if (con == 34) if (sus_draw == 1) { - /*if (instance_exists(obj_kris_headobj)) + if object_exists(asset_get_index("obj_kris_headobj")) && (instance_exists(obj_kris_headobj)) { obj_kris_headobj.x = kris_x + 14; obj_kris_headobj.y = kris_y - 2; - }*/ + } if (global.darkzone == 0) { diff --git a/objects/obj_dw_transition/obj_dw_transition.yy b/objects/obj_dw_transition/obj_dw_transition.yy index 193cf019..0a792cb8 100644 --- a/objects/obj_dw_transition/obj_dw_transition.yy +++ b/objects/obj_dw_transition/obj_dw_transition.yy @@ -28,7 +28,18 @@ "physicsShape":1, "physicsShapePoints":[], "physicsStartAwake":true, - "properties":[], + "properties":[ + {"$GMObjectProperty":"v2","%Name":"transtimeoffset_baseval","filters":[],"listItems":[],"multiselect":false,"name":"transtimeoffset_baseval","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"10","varType":1,}, + {"$GMObjectProperty":"v2","%Name":"transtimeoffset_addskiprunback","filters":[],"listItems":[],"multiselect":false,"name":"transtimeoffset_addskiprunback","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"3","varType":1,}, + {"$GMObjectProperty":"v2","%Name":"rx1","filters":[],"listItems":[],"multiselect":false,"name":"rx1","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"138","varType":1,}, + {"$GMObjectProperty":"v2","%Name":"ry1","filters":[],"listItems":[],"multiselect":false,"name":"ry1","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"64","varType":1,}, + {"$GMObjectProperty":"v2","%Name":"rx2","filters":[],"listItems":[],"multiselect":false,"name":"rx2","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"182","varType":1,}, + {"$GMObjectProperty":"v2","%Name":"ry2","filters":[],"listItems":[],"multiselect":false,"name":"ry2","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"118","varType":1,}, + {"$GMObjectProperty":"v2","%Name":"kris_x","filters":[],"listItems":[],"multiselect":false,"name":"kris_x","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"134 + camerax()","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"kris_y","filters":[],"listItems":[],"multiselect":false,"name":"kris_y","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"94 + cameray()","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"sus_x","filters":[],"listItems":[],"multiselect":false,"name":"sus_x","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"162 + camerax()","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"sus_y","filters":[],"listItems":[],"multiselect":false,"name":"sus_y","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"86 + cameray()","varType":4,}, + ], "resourceType":"GMObject", "resourceVersion":"2.0", "solid":false, diff --git a/objects/obj_dw_transition_interactable/Other_10.gml b/objects/obj_dw_transition_interactable/Other_10.gml index 865b8bc2..e9e5d906 100644 --- a/objects/obj_dw_transition_interactable/Other_10.gml +++ b/objects/obj_dw_transition_interactable/Other_10.gml @@ -1,7 +1,6 @@ talking = 0; -if (!instance_exists(obj_persistentfadein)) -{ +if (!instance_exists(obj_persistentfadein)) { myinteract = 1; global.interact = 1; con = 1; diff --git a/objects/obj_dw_transition_interactable/Step_0.gml b/objects/obj_dw_transition_interactable/Step_0.gml index 242f0665..dd6d1558 100644 --- a/objects/obj_dw_transition_interactable/Step_0.gml +++ b/objects/obj_dw_transition_interactable/Step_0.gml @@ -14,12 +14,12 @@ if (con == 1) with (obj_mainchara) { cutscene = 1; - idealx = 300; + idealx = other.kris_x_jumpprepare_nosus; if (scr_havechar(2)) - idealx = 285; + idealx = other.kris_x_jumpprepare_sus; - scr_move_to_point_over_time(idealx, 100, 6); + scr_move_to_point_over_time(idealx, other.kris_y_jumpprepare, 6); } if (instance_exists(obj_caterpillarchara)) @@ -30,14 +30,14 @@ if (con == 1) { scr_depth(); image_speed = 0.25; - scr_move_to_point_over_time(313, 86, 6); + scr_move_to_point_over_time(other.sus_x_jumpprepare, other.sus_y_jumpprepare, 6); } with (obj_caterpillarchara) instance_destroy(); } - scr_pan_lerp(151, 0, 6); + scr_pan_lerp(camerapantox, camerapantoy, 6); con = 2; alarm[4] = 7; } @@ -65,6 +65,12 @@ if (con == 3) kris_y = obj_mainchara.y; kris_only = 1; } + transtimeoffset_baseval = other.transtimeoffset_baseval + transtimeoffset_addskiprunback = other.transtimeoffset_addskiprunback + rx1 = other.rx1 + ry1 = other.ry1 + rx2 = other.rx2 + ry2 = other.ry2 } con = 4; diff --git a/objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy b/objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy index 01105911..2850283c 100644 --- a/objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy +++ b/objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy @@ -31,7 +31,21 @@ "physicsShape":1, "physicsShapePoints":[], "physicsStartAwake":true, - "properties":[], + "properties":[ + {"$GMObjectProperty":"v2","%Name":"transtimeoffset_baseval","filters":[],"listItems":[],"multiselect":false,"name":"transtimeoffset_baseval","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"10","varType":1,}, + {"$GMObjectProperty":"v2","%Name":"transtimeoffset_addskiprunback","filters":[],"listItems":[],"multiselect":false,"name":"transtimeoffset_addskiprunback","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"3","varType":1,}, + {"$GMObjectProperty":"v2","%Name":"rx1","filters":[],"listItems":[],"multiselect":false,"name":"rx1","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"138","varType":1,}, + {"$GMObjectProperty":"v2","%Name":"ry1","filters":[],"listItems":[],"multiselect":false,"name":"ry1","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"64","varType":1,}, + {"$GMObjectProperty":"v2","%Name":"rx2","filters":[],"listItems":[],"multiselect":false,"name":"rx2","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"182","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"ry2","filters":[],"listItems":[],"multiselect":false,"name":"ry2","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"118","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"sus_x_jumpprepare","filters":[],"listItems":[],"multiselect":false,"name":"sus_x_jumpprepare","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"313","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"sus_y_jumpprepare","filters":[],"listItems":[],"multiselect":false,"name":"sus_y_jumpprepare","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"86","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"kris_x_jumpprepare_nosus","filters":[],"listItems":[],"multiselect":false,"name":"kris_x_jumpprepare_nosus","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"300","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"kris_x_jumpprepare_sus","filters":[],"listItems":[],"multiselect":false,"name":"kris_x_jumpprepare_sus","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"285","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"kris_y_jumpprepare","filters":[],"listItems":[],"multiselect":false,"name":"kris_y_jumpprepare","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"100","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"camerapantox","filters":[],"listItems":[],"multiselect":false,"name":"camerapantox","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"151","varType":4,}, + {"$GMObjectProperty":"v2","%Name":"camerapantoy","filters":[],"listItems":[],"multiselect":false,"name":"camerapantoy","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"0","varType":4,}, + ], "resourceType":"GMObject", "resourceVersion":"2.0", "solid":false, diff --git a/rooms/room_lw_test/room_lw_test.yy b/rooms/room_lw_test/room_lw_test.yy index 1050aa6e..904a4337 100644 --- a/rooms/room_lw_test/room_lw_test.yy +++ b/rooms/room_lw_test/room_lw_test.yy @@ -20,6 +20,7 @@ {"name":"inst_7DFFBAFB","path":"rooms/room_lw_test/room_lw_test.yy",}, {"name":"inst_5D6B8668","path":"rooms/room_lw_test/room_lw_test.yy",}, {"name":"inst_249A6179","path":"rooms/room_lw_test/room_lw_test.yy",}, + {"name":"inst_7BAC1794","path":"rooms/room_lw_test/room_lw_test.yy",}, ], "isDnd":false, "layers":[ @@ -43,7 +44,15 @@ {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"mod_obj_marker_b","path":"objects/mod_obj_marker_b/mod_obj_marker_b.yy",},"propertyId":{"name":"sprite_index","path":"objects/mod_obj_marker_b/mod_obj_marker_b.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"spr_susie_walk_left_lw",}, ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":200.0,"y":97.0,}, {"$GMRInstance":"v4","%Name":"inst_5820CAD6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5820CAD6","objectId":{"name":"mod_obj_marker_k","path":"objects/mod_obj_marker_k/mod_obj_marker_k.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":100.0,}, - {"$GMRInstance":"v4","%Name":"inst_60B95317","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_60B95317","objectId":{"name":"obj_dw_transition_interactable","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":3.0,"scaleY":1.0,"x":280.0,"y":100.0,}, + {"$GMRInstance":"v4","%Name":"inst_60B95317","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_60B95317","objectId":{"name":"obj_dw_transition_interactable","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"properties":[ + {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_dw_transition_interactable","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"propertyId":{"name":"sus_x_jumpprepare","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"(obj_darkdoor.x + obj_darkdoor.sprite_width/2) + 3",}, + {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_dw_transition_interactable","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"propertyId":{"name":"sus_y_jumpprepare","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"obj_darkdoor.bbox_bottom - 32",}, + {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_dw_transition_interactable","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"propertyId":{"name":"kris_x_jumpprepare_nosus","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"(obj_darkdoor.x + obj_darkdoor.sprite_width/2) - 10",}, + {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_dw_transition_interactable","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"propertyId":{"name":"kris_x_jumpprepare_sus","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"(obj_darkdoor.x + obj_darkdoor.sprite_width/2) - 25",}, + {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_dw_transition_interactable","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"propertyId":{"name":"kris_y_jumpprepare","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"obj_darkdoor.bbox_bottom - 18",}, + {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_dw_transition_interactable","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"propertyId":{"name":"camerapantox","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"(obj_darkdoor.x + obj_darkdoor.sprite_width/2) - (camerawidth() / 2)",}, + {"$GMOverriddenProperty":"v1","%Name":"","name":"","objectId":{"name":"obj_dw_transition_interactable","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"propertyId":{"name":"camerapantoy","path":"objects/obj_dw_transition_interactable/obj_dw_transition_interactable.yy",},"resourceType":"GMOverriddenProperty","resourceVersion":"2.0","value":"obj_darkdoor.y - 62",}, + ],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":3.0,"scaleY":1.0,"x":280.0,"y":100.0,}, ],"layers":[],"name":"BackgroundInstances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Collision","depth":50000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ {"$GMRInstance":"v4","%Name":"inst_172C9857","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_172C9857","objectId":{"name":"obj_solidblock","path":"objects/obj_solidblock/obj_solidblock.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":48.0,"scaleY":1.0,"x":0.0,"y":0.0,}, @@ -53,6 +62,7 @@ ],"layers":[],"name":"Collision","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Instances_Depth_900000","depth":900000,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ {"$GMRInstance":"v4","%Name":"inst_24776549","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_24776549","objectId":{"name":"obj_darkdoor","path":"objects/obj_darkdoor/obj_darkdoor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":288.0,"y":62.0,}, + {"$GMRInstance":"v4","%Name":"inst_7BAC1794","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7BAC1794","objectId":{"name":"obj_actor","path":"objects/obj_actor/obj_actor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":310.0,"y":118.0,}, ],"layers":[],"name":"Instances_Depth_900000","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4288256409,"depth":16777216,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Background","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, ], From f96b17c27ba63d089941a2a4a05fc16995fa4c0b Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 13 Jan 2026 13:33:03 -0800 Subject: [PATCH 16/56] Removed Leftover Placement Helper Actor (I used this Actor as Reference to Figure out the Bottom Center of the Door's Default Position, Which is: door center x = 310 door bottom y = 118 ) --- rooms/room_lw_test/room_lw_test.yy | 2 -- 1 file changed, 2 deletions(-) diff --git a/rooms/room_lw_test/room_lw_test.yy b/rooms/room_lw_test/room_lw_test.yy index 904a4337..87620e8b 100644 --- a/rooms/room_lw_test/room_lw_test.yy +++ b/rooms/room_lw_test/room_lw_test.yy @@ -20,7 +20,6 @@ {"name":"inst_7DFFBAFB","path":"rooms/room_lw_test/room_lw_test.yy",}, {"name":"inst_5D6B8668","path":"rooms/room_lw_test/room_lw_test.yy",}, {"name":"inst_249A6179","path":"rooms/room_lw_test/room_lw_test.yy",}, - {"name":"inst_7BAC1794","path":"rooms/room_lw_test/room_lw_test.yy",}, ], "isDnd":false, "layers":[ @@ -62,7 +61,6 @@ ],"layers":[],"name":"Collision","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Instances_Depth_900000","depth":900000,"effectEnabled":true,"effectType":null,"gridX":16,"gridY":16,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ {"$GMRInstance":"v4","%Name":"inst_24776549","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_24776549","objectId":{"name":"obj_darkdoor","path":"objects/obj_darkdoor/obj_darkdoor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":288.0,"y":62.0,}, - {"$GMRInstance":"v4","%Name":"inst_7BAC1794","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7BAC1794","objectId":{"name":"obj_actor","path":"objects/obj_actor/obj_actor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":310.0,"y":118.0,}, ],"layers":[],"name":"Instances_Depth_900000","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4288256409,"depth":16777216,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Background","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, ], From dfd4bc891745273ec434fc0bc58187dfce2e0047 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 13 Jan 2026 15:29:09 -0800 Subject: [PATCH 17/56] ADDED THE ABILITY TO OVERRIDE FACING SPRITE CODE FOR CATERPILLARS. --- objects/obj_caterpillarchara/Create_0.gml | 4 +++- objects/obj_caterpillarchara/Step_2.gml | 8 +++++++- scripts/scr_polyfills/scr_polyfills.gml | 15 ++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/objects/obj_caterpillarchara/Create_0.gml b/objects/obj_caterpillarchara/Create_0.gml index 7562f9e9..bfdfab80 100644 --- a/objects/obj_caterpillarchara/Create_0.gml +++ b/objects/obj_caterpillarchara/Create_0.gml @@ -52,4 +52,6 @@ init = false; forget = 0; ignoredepth = 0; halign = 6; -valign = 16; \ No newline at end of file +valign = 16; + +facingcodeoverride = -1 \ No newline at end of file diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index d2bb062b..f6fd7846 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -94,7 +94,13 @@ if (moved == true && follow == true) { dir = facing[target]; } -scr_overworldcharwalking_shared(facing[target]) +var hascustomcode = is_method(facingcodeoverride) + +scr_overworldcharwalking_shared(hascustomcode ? -1 : facing[target]) + +if hascustomcode { + facingcodeoverride() +} if ((/*dsprite == spr_ralseid || */dsprite == spr_ralsei_walk_down) && global.interact == 0 && fun == 0) { diff --git a/scripts/scr_polyfills/scr_polyfills.gml b/scripts/scr_polyfills/scr_polyfills.gml index 951d8fc4..7f00d1ce 100644 --- a/scripts/scr_polyfills/scr_polyfills.gml +++ b/scripts/scr_polyfills/scr_polyfills.gml @@ -61,4 +61,17 @@ function arr_pop(arr) { function arr_length(arr) { return array_length(arr); } // string -function stringsetloc(str, code) { return str; } \ No newline at end of file +function stringsetloc(str, code) { return str; } +/// @func stringsetsubloc(string, ..., localizationkey) +/// @arg 0 englishstring +/// @arg 1+ replacements +function stringsetsubloc() { + var len = argument_count; + var args; + + for (var i = 0; i < len; i++) + args[i] = argument[i]; + + var str = script_execute_ext(stringsetsub, args); + return str; +} \ No newline at end of file From 20a1f9c0948418df1b481f583a8305561270ac59 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 13 Jan 2026 16:25:24 -0800 Subject: [PATCH 18/56] READDED "FUN" & "SLIDING" CHECKS TO CATERPILLAR AS THOSE WERE FORGOTTEN --- objects/obj_caterpillarchara/Step_2.gml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index f6fd7846..25e5e949 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -94,12 +94,15 @@ if (moved == true && follow == true) { dir = facing[target]; } -var hascustomcode = is_method(facingcodeoverride) +if fun == false { -scr_overworldcharwalking_shared(hascustomcode ? -1 : facing[target]) + var hascustomcode = is_method(facingcodeoverride) -if hascustomcode { - facingcodeoverride() + scr_overworldcharwalking_shared((hascustomcode || slided) ? -1 : facing[target]) + + if hascustomcode && !slided { + facingcodeoverride() + } } if ((/*dsprite == spr_ralseid || */dsprite == spr_ralsei_walk_down) && global.interact == 0 && fun == 0) From e5ce7c07cec6696fc50db5a9cda33aa79bc6d34c Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Thu, 15 Jan 2026 18:46:15 -0800 Subject: [PATCH 19/56] Minor Changes --- DELTAModKit.yyp | 5 +- objects/obj_battlecontroller/Step_0.gml | 17 ++--- objects/obj_caterpillarchara/Step_2.gml | 2 +- objects/obj_initializer2/Create_0.gml | 9 ++- objects/obj_initializer2/Step_0.gml | 41 +++++------ scripts/macros/macros.gml | 4 + scripts/macros/macros.yy | 13 ++++ scripts/scr_charcan/scr_charcan.gml | 26 ++----- .../scr_debugging_config.gml | 2 +- scripts/scr_flag/scr_flag.gml | 4 +- .../scr_heroes_config/scr_heroes_config.gml | 4 +- scripts/scr_turn/scr_turn.gml | 73 ++++++++++--------- 12 files changed, 100 insertions(+), 100 deletions(-) create mode 100644 scripts/macros/macros.gml create mode 100644 scripts/macros/macros.yy diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index 1e28e099..6755f554 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -6,7 +6,9 @@ {"$GMAudioGroup":"v1","%Name":"audio_sfx","exportDir":"","name":"audio_sfx","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, ], "configs":{ - "children":[], + "children":[ + {"children":[],"name":"Debug",}, + ], "name":"Default", }, "defaultScriptType":1, @@ -382,6 +384,7 @@ {"id":{"name":"game_restart_true","path":"scripts/game_restart_true/game_restart_true.yy",},}, {"id":{"name":"i_ex","path":"scripts/i_ex/i_ex.yy",},}, {"id":{"name":"instance_create","path":"scripts/instance_create/instance_create.yy",},}, + {"id":{"name":"macros","path":"scripts/macros/macros.yy",},}, {"id":{"name":"msgset","path":"scripts/msgset/msgset.yy",},}, {"id":{"name":"ossafe","path":"scripts/ossafe/ossafe.yy",},}, {"id":{"name":"scr_actinfo","path":"scripts/scr_actinfo/scr_actinfo.yy",},}, diff --git a/objects/obj_battlecontroller/Step_0.gml b/objects/obj_battlecontroller/Step_0.gml index 65afb8ef..a2d89164 100644 --- a/objects/obj_battlecontroller/Step_0.gml +++ b/objects/obj_battlecontroller/Step_0.gml @@ -204,21 +204,14 @@ if (global.myfight == 0) } } - if (button2_p() == 1 && onebuffer < 0 && global.charturn > 0) - { + if (button2_p() == 1 && onebuffer < 0 && global.charturn > 0) { twobuffer = 1; - movenoise = 1; - scr_prevhero(); + if scr_prevhero() movenoise = true; } - with (battlewriter) - depth = 3; - - with (obj_face) - depth = 3; - - with (obj_smallface) - depth = 3; + with (battlewriter) depth = 3; + with (obj_face) depth = 3; + with (obj_smallface) depth = 3; } if (global.bmenuno == 2 && global.flag[34] == 1) // Spells diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index 25e5e949..269ebe64 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -37,7 +37,7 @@ if (!init) { if target > maxtarget { var previousmax = maxtarget - maxtarget = target * 2 + maxtarget = floor(target * 1.5) for (i = previousmax; i < maxtarget; i += 1) { remx[i] = remx[previousmax]; remy[i] = remy[previousmax]; diff --git a/objects/obj_initializer2/Create_0.gml b/objects/obj_initializer2/Create_0.gml index 48ccc4b5..198d074c 100644 --- a/objects/obj_initializer2/Create_0.gml +++ b/objects/obj_initializer2/Create_0.gml @@ -1,9 +1,12 @@ global.is_console = /*scr_is_switch_os() || */os_type == os_ps4 || os_type == os_ps5; -if (!global.is_console) - window_enable_borderless_fullscreen(true); +global.charname = []; +repeat DRCharacter.__MAX__ array_push(global.charname, "???") +scr_character_set_names() -global.debug = 0; +if (!global.is_console) window_enable_borderless_fullscreen(true); + +global.debug = DEBUGMODE; var launch_data = scr_init_launch_parameters(); global.launcher = launch_data.is_launcher; textures_loaded = false; diff --git a/objects/obj_initializer2/Step_0.gml b/objects/obj_initializer2/Step_0.gml index 941e3c29..3c5858ae 100644 --- a/objects/obj_initializer2/Step_0.gml +++ b/objects/obj_initializer2/Step_0.gml @@ -1,8 +1,6 @@ -if (!instance_exists(obj_time)) - scr_input_manager_process(); +if (!instance_exists(obj_time)) scr_input_manager_process(); -if (global.is_console) -{ +if (global.is_console) { if (global.savedata_async_id >= 0) exit; @@ -20,30 +18,26 @@ if (global.is_console) var CH = string(global.chapter); -/*if (audio_group_is_loaded(1)) -{*/ +if (audio_group_is_loaded(1)) +{ roomchoice = room_legend;//PLACE_CONTACT; menu_go = 0; - if (scr_chapter_save_file_exists(global.chapter) || ossafe_file_exists("dr.ini")) - menu_go = 1; - - if (scr_completed_chapter_any_slot(global.chapter)) - menu_go = 2; + if (scr_chapter_save_file_exists(global.chapter) || ossafe_file_exists("dr.ini")) menu_go = 1; + if (scr_completed_chapter_any_slot(global.chapter)) menu_go = 2; + if (scr_debug()) menu_go = 3; - if (scr_debug()) - menu_go = 3; - - if (menu_go == 0 || menu_go == 1) - { + if (menu_go == 0 || menu_go == 1) { if (global.is_console) global.screen_border_alpha = 0; - roomchoice = room_intro; + if array_length(room_get_info(room_intro).instances) <= 0 { + menu_go = 2 + show_debug_message("Intro room has no Instances, Ignoring the possibility of going there in favor of Legend.") + } else roomchoice = room_intro; } - if (menu_go == 2) - { + if (menu_go == 2) { if (global.is_console) global.screen_border_alpha = 1; @@ -58,15 +52,14 @@ var CH = string(global.chapter); if (global.is_console) global.screen_border_alpha = 0; - global.darkzone = 0; + global.darkzone = false; roomchoice = scr_debug_get_start_room(); } room_goto(roomchoice); -//} +} -/*if (scr_debug()) -{ +if (scr_debug()) { if (!instance_exists(obj_debugProfiler)) instance_create_depth(0, 0, 0, obj_debugProfiler); -}*/ +} diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml new file mode 100644 index 00000000..480a5cf8 --- /dev/null +++ b/scripts/macros/macros.gml @@ -0,0 +1,4 @@ +function macros(){ + #macro DEBUGMODE true + #macro Debug:DEBUGMODE true +} \ No newline at end of file diff --git a/scripts/macros/macros.yy b/scripts/macros/macros.yy new file mode 100644 index 00000000..ee82e7d1 --- /dev/null +++ b/scripts/macros/macros.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"macros", + "isCompatibility":false, + "isDnD":false, + "name":"macros", + "parent":{ + "name":"Configs", + "path":"folders/Custom/Scripts/Configs.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_charcan/scr_charcan.gml b/scripts/scr_charcan/scr_charcan.gml index b91e52bb..1b88483b 100644 --- a/scripts/scr_charcan/scr_charcan.gml +++ b/scripts/scr_charcan/scr_charcan.gml @@ -1,21 +1,11 @@ -function scr_charcan(arg0) -{ - charcan = 1; - - if (global.hp[global.char[arg0]] <= 0) - charcan = 0; - - if (global.acting[arg0] == 1) - charcan = 0; - - if (global.char[arg0] == 0) - charcan = 0; - - if (global.charmove[arg0] == 0) - charcan = 0; - - if (global.charauto[global.char[arg0]] == 1) - charcan = 0; +function scr_charcan(partyslot) { + charcan = true; + + if (global.hp[global.char[partyslot]] <= 0) charcan = false; + if (global.acting[partyslot] == true) charcan = false; + if (global.char[partyslot] == DRCharacter.None) charcan = false; + if (global.charmove[partyslot] == false) charcan = false; + if (global.charauto[global.char[partyslot]] == true) charcan = false; return charcan; } diff --git a/scripts/scr_debugging_config/scr_debugging_config.gml b/scripts/scr_debugging_config/scr_debugging_config.gml index 67b8b449..734d5701 100644 --- a/scripts/scr_debugging_config/scr_debugging_config.gml +++ b/scripts/scr_debugging_config/scr_debugging_config.gml @@ -1,2 +1,2 @@ -function scr_debug() { return true; } +function scr_debug() { return DEBUGMODE; } function scr_debug_get_start_room() { global.darkzone = true; return keyboard_check_direct(vk_anykey) ? PLACE_MENU : room_dw_test; } \ No newline at end of file diff --git a/scripts/scr_flag/scr_flag.gml b/scripts/scr_flag/scr_flag.gml index b9952e67..d43c6d1f 100644 --- a/scripts/scr_flag/scr_flag.gml +++ b/scripts/scr_flag/scr_flag.gml @@ -1,7 +1,5 @@ function global_flagname_init() { - global.flagname = []; - - repeat (9999) array_push(global.flagname, undefined) + global.flagname = array_create(9999, undefined); global.flagname[6] = "disable text skip [Broken]" global.flagname[8] = "Simplify VFX" diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index 8a4f692b..2029c71d 100644 --- a/scripts/scr_heroes_config/scr_heroes_config.gml +++ b/scripts/scr_heroes_config/scr_heroes_config.gml @@ -642,7 +642,7 @@ function scr_character_has_magic(charIdx) { function scr_character_get_act_name_override(charIdx) { switch (charIdx) { default: - case DRCharacter.Kris: return ""; + case DRCharacter.Kris: return "Action"; case DRCharacter.Susie: return "S-Action"; case DRCharacter.Ralsei: return "R-Action"; @@ -654,7 +654,7 @@ function scr_character_get_act_name_override(charIdx) { function scr_character_set_names() { global.lcharname = "Kris"; - global.charname[DRCharacter.None] = " "; + global.charname[DRCharacter.None] = " "; global.charname[DRCharacter.Kris] = "Kris"; global.charname[DRCharacter.Susie] = "Susie"; global.charname[DRCharacter.Ralsei] = "Ralsei"; diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index b29f7f13..26845a1d 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -295,28 +295,27 @@ function scr_nexthero() { moveswapped = 0; prevturn = global.charturn; + var endturn = false; + for (var i = global.charturn + 1; i <= array_length(global.charmove) && !moveswapped; ++i) { if i >= array_length(global.charmove) { moveswapped = true - scr_endturn() + endturn = true } else if global.charmove[i] == true && scr_charcan(i) && global.acting[i] == false { global.charturn = i moveswapped = true - } else { - break + } else if global.char[i] > DRCharacter.None { + show_debug_message(stringsetsub("Hero '~1' Cannot Move.", global.charname[global.char[i]])) } } - var endturn = false; - if (endturn == true) scr_endturn(); if (moveswapped == true) global.bmenuno = 0; - if (global.charturn > 0) - { + if (global.charturn > 0) { global.temptension[global.charturn] = global.tension; for (i = 0; i < 12; i += 1) @@ -328,14 +327,16 @@ function scr_prevhero() { prevturn = global.charturn; moveswapped = false; - for (var i = global.charturn - 1; i >= 0; --i) { - if i >= 0 { - if global.charmove[i] == true && global.acting[i] == false { - global.charturn = i - moveswapped = true - break - } - } else break + if global.charturn > 0 { // No need to run Calculations if we know it'll fail anyways. + for (var i = global.charturn - 1; i >= 0; --i) { + if i >= 0 { + if scr_charcan(i) { + global.charturn = i + moveswapped = true + break + } + } else break + } } if (moveswapped == true) { @@ -350,32 +351,34 @@ function scr_prevhero() { global.charaction[global.charturn] = 0; global.charspecial[global.charturn] = 0; movenoise = true; - } - if (idefendedthisturn > 0) { - idefendedthisturn--; - mercytotal -= 40; - } + if (idefendedthisturn > 0) { + idefendedthisturn--; + mercytotal -= 40; + } - if (global.charturn == 0) { - with (obj_monsterparent) - for (i = 0; i < DRCharacter.__MAX__; i++) - acting[i] = false; // Clears All Acts (Enemy Side) + if (global.charturn == 0) { + with (obj_monsterparent) + for (i = 0; i < DRCharacter.__MAX__; i++) + acting[i] = false; // Clears All Acts (Enemy Side) - for (var i = 0; i < array_length(global.acting); ++i) { // Clears all Acts (Hero Side) - global.acting[i] = false - global.chartarget[i] = 0 - global.charspecial[i] = 0 - global.faceaction[i] = 0 - } + for (var i = 0; i < array_length(global.acting); ++i) { // Clears all Acts (Hero Side) + global.acting[i] = false + global.chartarget[i] = 0 + global.charspecial[i] = 0 + global.faceaction[i] = 0 + } - global.tension = global.temptension[0]; + global.tension = global.temptension[0]; - for (i = 0; i < 12; i += 1) tempitem[i][0] = global.item[i]; - } else { - for (i = 0; i < 12; i += 1) tempitem[i][global.charturn] = tempitem[i][global.charturn - 1]; + for (i = 0; i < 12; i += 1) tempitem[i][0] = global.item[i]; + } else { + for (i = 0; i < 12; i += 1) tempitem[i][global.charturn] = tempitem[i][global.charturn - 1]; + } + global.tension = global.temptension[global.charturn]; } - global.tension = global.temptension[global.charturn]; + + return moveswapped } function scr_actselect(star, action) { From f1c434832304b2f074cc02925be8c54e64dbef04 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Thu, 15 Jan 2026 18:47:34 -0800 Subject: [PATCH 20/56] Undid a Change I forgot about when I Discarded the Changes that fix it. --- objects/obj_initializer2/Step_0.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_initializer2/Step_0.gml b/objects/obj_initializer2/Step_0.gml index 3c5858ae..65302319 100644 --- a/objects/obj_initializer2/Step_0.gml +++ b/objects/obj_initializer2/Step_0.gml @@ -18,7 +18,7 @@ if (global.is_console) { var CH = string(global.chapter); -if (audio_group_is_loaded(1)) +//if (audio_group_is_loaded(1)) { roomchoice = room_legend;//PLACE_CONTACT; menu_go = 0; From 8450e11ec5fcb6fcc4b8a532ac841ff7fafba9d6 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Thu, 15 Jan 2026 18:54:16 -0800 Subject: [PATCH 21/56] Fixed Minor Issue Caused by Differences between GMS2-LTS and GMS2-BETA which for some reason Caused 150 room speed to end up as 60 room speed --- objects/obj_time/Step_1.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_time/Step_1.gml b/objects/obj_time/Step_1.gml index b8bf709e..cb585a51 100644 --- a/objects/obj_time/Step_1.gml +++ b/objects/obj_time/Step_1.gml @@ -239,7 +239,7 @@ if (scr_debug()) if (sunkus_kb_check_pressed(192)) { if (room_speed == 30) - room_speed = 150 - (140 * sunkus_kb_check(17)); + room_speed = 150 - (140 * real(sunkus_kb_check(17))); else room_speed = 30; } From 219d6a84f7c45c7063987a27c90ab906e80064c9 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Sat, 24 Jan 2026 12:39:54 -0800 Subject: [PATCH 22/56] Minor Menu Changes Currently Only Affects things on Visual Level. --- objects/obj_caterpillarchara/Create_0.gml | 2 +- objects/obj_darkcontroller/Draw_0.gml | 104 ++++++------------ .../scr_heroes_config/scr_heroes_config.gml | 46 ++++++++ scripts/scr_turn/scr_turn.gml | 59 ++++------ 4 files changed, 101 insertions(+), 110 deletions(-) diff --git a/objects/obj_caterpillarchara/Create_0.gml b/objects/obj_caterpillarchara/Create_0.gml index bfdfab80..9bf22960 100644 --- a/objects/obj_caterpillarchara/Create_0.gml +++ b/objects/obj_caterpillarchara/Create_0.gml @@ -53,5 +53,5 @@ forget = 0; ignoredepth = 0; halign = 6; valign = 16; +facingcodeoverride = -1 -facingcodeoverride = -1 \ No newline at end of file diff --git a/objects/obj_darkcontroller/Draw_0.gml b/objects/obj_darkcontroller/Draw_0.gml index cad4a9b9..dbe09720 100644 --- a/objects/obj_darkcontroller/Draw_0.gml +++ b/objects/obj_darkcontroller/Draw_0.gml @@ -512,76 +512,40 @@ if (global.menuno == 2) if (global.submenu == 10) draw_sprite(spr_heart_harrows, menusiner / 20, 100 + xx + (coord * 50), 142 + yy); - if (global.submenu != 11) - { - bicon = charcoord - 1; - - if (charcoord == 4) - bicon = 5; - - draw_sprite_ext(spr_dmenu_equip, bicon, xx + 302, yy + 108, 2, 2, 0, c_white, 1); - draw_sprite_ext(spr_dmenu_equip, 3, xx + 302, yy + 142, 2, 2, 0, c_white, 1); - draw_sprite_ext(spr_dmenu_equip, 4, xx + 302, yy + 172, 2, 2, 0, c_white, 1); - } - - if (global.submenu == 11) - { - bicon = charcoord - 1; - - if (charcoord == 4) - bicon = 5; - - if (global.submenucoord[11] == 0) - draw_sprite(spr_heart, 0, xx + 308, yy + 122); - else - draw_sprite_ext(spr_dmenu_equip, bicon, xx + 302, yy + 108, 2, 2, 0, c_white, 1); - - if (global.submenucoord[11] == 1) - draw_sprite(spr_heart, 0, xx + 308, yy + 152); - else - draw_sprite_ext(spr_dmenu_equip, 3, xx + 302, yy + 142, 2, 2, 0, c_white, 1); - - if (global.submenucoord[11] == 2) - draw_sprite(spr_heart, 0, xx + 308, yy + 182); - else - draw_sprite_ext(spr_dmenu_equip, 4, xx + 302, yy + 172, 2, 2, 0, c_white, 1); - } - - if (charweaponname[charcoord] != " ") - { - draw_text(xx + 365, yy + 112, string_hash_to_newline(charweaponname[charcoord])); - draw_item_icon(xx + 343, yy + 118, charweaponicon[charcoord]); - } - else - { - draw_set_color(c_dkgray); - draw_text(xx + 365, yy + 112, string_hash_to_newline("(Nothing)")); - draw_set_color(c_white); - } - - if (global.chararmor1[charcoord] != 0) - { - draw_text(xx + 365, yy + 142, string_hash_to_newline(chararmor1name[charcoord])); - draw_item_icon(xx + 343, yy + 148, chararmor1icon[charcoord]); - } - else - { - draw_set_color(c_dkgray); - draw_text(xx + 365, yy + 142, string_hash_to_newline("(Nothing)")); - draw_set_color(c_white); - } - - if (global.chararmor2[charcoord] != 0) - { - draw_text(xx + 365, yy + 172, string_hash_to_newline(chararmor2name[charcoord])); - draw_item_icon(xx + 343, yy + 178, chararmor2icon[charcoord]); - } - else - { - draw_set_color(c_dkgray); - draw_text(xx + 365, yy + 172, string_hash_to_newline("(Nothing)")); - draw_set_color(c_white); - } + var slots = scr_character_darkmenu_geticondatareader(charcoord) + + for (var i = 0; i < array_length(slots); ++i) { + try { + var slot = slots[i] + var sprite = slot.sprite + var offset_x = slot.spriteoffset[0] + var offset_y = slot.spriteoffset[1] + var image = slot.imageindex + var _x = xx + 365 + var _y = yy + 112 + (30 * i) + var scale = slot.scale + var text = slot.text + if global.submenu == 11 && global.submenucoord[11] == i { + sprite = spr_heart + offset_x = -57 + offset_y = 10 + image = 0 + scale = 1 + } + + draw_sprite_ext(sprite, image, _x + offset_x, _y + offset_y, scale, scale, 0, c_white, 1) + + if text != " " { + draw_text(_x, _y, string_hash_to_newline(text)); + draw_item_icon(_x - 22, _y + 6, slot.weaponicon); + } else { + draw_set_color(c_dkgray); + draw_text(_x, _y, string_hash_to_newline("(Nothing)")); + draw_set_color(c_white); + } + } catch (ex) { + show_debug_message("Failed to render icon {0}, reason: {1}", i, ex.longMessage)} + } var eq_xoff = langopt(0, -6); diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index 2029c71d..aa559210 100644 --- a/scripts/scr_heroes_config/scr_heroes_config.gml +++ b/scripts/scr_heroes_config/scr_heroes_config.gml @@ -661,4 +661,50 @@ function scr_character_set_names() { global.charname[DRCharacter.Noelle] = "Noelle"; global.charname[DRCharacter.Starwalker] = "Starwalker"; +} + +function scr_character_get_primaryweapon_icon(charIdx) { + switch charIdx { + default: return charIdx - 1 // Keeps it how it Originally was, Change if you want. + case DRCharacter.Noelle: return 5 + } +} + +function scr_character_get_armoricons(charIdx) { + switch charIdx { + default: return [3, 4] + } +} + +function scr_character_darkmenu_geticondatareader(charIdx) { + switch charIdx { + default: + var slots = [ + { + sprite: spr_dmenu_equip, + spriteoffset: [-63, -4], + text: string_hash_to_newline(charweaponname[charIdx]), + imageindex: scr_character_get_primaryweapon_icon(charIdx), + scale: 2, + weaponicon: charweaponicon[charIdx] + } + ] + + var icons = scr_character_get_armoricons(charIdx) + for (var i = 0; i < array_length(icons); ++i) { + try { + array_push(slots, { + sprite: spr_dmenu_equip, + spriteoffset: [-63, 0], + text: string_hash_to_newline(variable_struct_get(self, "chararmor" + string(i + 1) + "name")[charIdx]), + imageindex: icons[i], + scale: 2, + weaponicon: variable_struct_get(self, "chararmor" + string(i + 1) + "icon")[charIdx] + }) + } catch (ex) { + show_debug_message("Failed to add data for armor icon {0}, reason: {1}", i, ex.longMessage) + } + } + return slots + } } \ No newline at end of file diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 26845a1d..53c8943a 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -248,36 +248,17 @@ function scr_retarget(arg0) global.chartarget[arg0] = thistarget; } -function scr_retarget_spell() -{ - cancelattack = 0; - - if (star == 0) - { - if (global.monster[0] == 0) - star = 1; - } - - if (star == 1) - { - if (global.monster[1] == 0) - star = 2; - } - - if (star == 2) - { - if (global.monster[2] == 0) - star = 3; - - if (star == 3 && global.monster[0] == 1) - star = 0; - - if (star == 3 && global.monster[1] == 1) - star = 1; - - if (star == 3) - cancelattack = 1; - } +function scr_retarget_spell() { + cancelattack = true; + + for (var i = 0; i < array_length(global.monster); ++i) { + var truei = (star + i) % array_length(global.monster) + if global.monster[truei] == true{ + cancelattack = false + star = truei + break + } + } } function scr_ambush() { @@ -292,23 +273,23 @@ function scr_ambush() { } function scr_nexthero() { - moveswapped = 0; + moveswapped = false; prevturn = global.charturn; var endturn = false; for (var i = global.charturn + 1; i <= array_length(global.charmove) && !moveswapped; ++i) { - if i >= array_length(global.charmove) { - moveswapped = true - endturn = true - } else if global.charmove[i] == true && scr_charcan(i) && global.acting[i] == false { - global.charturn = i - moveswapped = true - } else if global.char[i] > DRCharacter.None { + moveswapped = true + if i >= array_length(global.charmove) endturn = true // No one Left + else if global.charmove[i] == true && scr_charcan(i) && global.acting[i] == false { + global.charturn = i + } else if global.char[i] > DRCharacter.None { // This Character Cannot Move. (Try Next Character) + moveswapped = false show_debug_message(stringsetsub("Hero '~1' Cannot Move.", global.charname[global.char[i]])) } + show_debug_message(moveswapped) } - + if (endturn == true) scr_endturn(); From 168d3b8ff4a1f85c89963dab7fa885d3533f3bbc Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Sun, 25 Jan 2026 22:12:22 -0800 Subject: [PATCH 23/56] Minor Changes, Added Three variations of scr_wrap in a new scr_wrap script (Two of which are in Normal Deltarune and the other being the one I made and use most of the time but with safeguards added) Added scr_wrap Script Added scr_wrap Function to Script (Normal Deltarune) Added scr_wrap_new Function to Script (Ch3+) Added scr_wrap_newer Function To Script (Custom, Normally one Line but Modified to add Safe Guards) Labeled Example Choice in scr_text using a Macro, Slightly Commented darkcontroller, Added Emergency Check in scr_chapterswitch for if the game is compiled in with the yo yo compiler, Which is unable to use game_change --- DELTAModKit.yyp | 1 + objects/obj_darkcontroller/Draw_0.gml | 104 +++++++---------- objects/obj_darkcontroller/Step_0.gml | 154 ++++++++++---------------- scripts/ossafe/ossafe.gml | 29 ++--- scripts/scr_text/scr_text.gml | 8 +- scripts/scr_wrap/scr_wrap.gml | 65 +++++++++++ scripts/scr_wrap/scr_wrap.yy | 13 +++ scripts/texttype/texttype.gml | 16 +-- 8 files changed, 193 insertions(+), 197 deletions(-) create mode 100644 scripts/scr_wrap/scr_wrap.gml create mode 100644 scripts/scr_wrap/scr_wrap.yy diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index 6755f554..5783e02c 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -470,6 +470,7 @@ {"id":{"name":"scr_turn","path":"scripts/scr_turn/scr_turn.yy",},}, {"id":{"name":"scr_weaponinfo","path":"scripts/scr_weaponinfo/scr_weaponinfo.yy",},}, {"id":{"name":"scr_weapons_config","path":"scripts/scr_weapons_config/scr_weapons_config.yy",},}, + {"id":{"name":"scr_wrap","path":"scripts/scr_wrap/scr_wrap.yy",},}, {"id":{"name":"snd_play","path":"scripts/snd_play/snd_play.yy",},}, {"id":{"name":"substring","path":"scripts/substring/substring.yy",},}, {"id":{"name":"texttype","path":"scripts/texttype/texttype.yy",},}, diff --git a/objects/obj_darkcontroller/Draw_0.gml b/objects/obj_darkcontroller/Draw_0.gml index dbe09720..9826e832 100644 --- a/objects/obj_darkcontroller/Draw_0.gml +++ b/objects/obj_darkcontroller/Draw_0.gml @@ -3,8 +3,7 @@ yy = __view_get(e__VW.YView, 0); tpoff = (tp - tpy) + yy; bpoff = -bp + bpy + yy; -if (drawchar == 1) -{ +if (drawchar == true) { draw_set_color(c_black); draw_rectangle(xx - 10, (yy + 480) - bp - 1, xx + 650, yy + 500, false); draw_set_color(c_black); @@ -12,10 +11,9 @@ if (drawchar == 1) scr_charbox(); if (global.menuno == 0) - deschaver = 0; + deschaver = false; // Restore Top Menu Visibility - if (deschaver == 0) - { + if (deschaver == false) { draw_sprite_ext(menu_sprite, global.menucoord[0], xx + 20, (yy + tp) - 56, 2, 2, 0, c_white, 1); msprite[0] = spr_darkitembt; msprite[1] = spr_darkequipbt; @@ -23,23 +21,16 @@ if (drawchar == 1) msprite[3] = spr_darktechbt; msprite[4] = spr_darkconfigbt; - for (i = 0; i < 5; i += 1) - { - off = 1; - - if (global.menucoord[0] == i) - off = 0; - - if ((global.menuno - 1) == i) - off = 2; + var spacing = 100 + + for (i = 0; i < 5; i += 1) { + off = 1; // Default + if (global.menucoord[0] == i) off = 0; // Hovering Option + if ((global.menuno - 1) == i) off = 2; // In Menu. spritemx = 0; - - if (i >= 2) - spritemx = -100; - - if (i != 2) - draw_sprite_ext(msprite[i], off, xx + 120 + (i * 100) + spritemx, (yy + tp) - 60, 2, 2, 0, c_white, 1); + if (i >= 2) spritemx = -spacing; // Remove Talk Button Visually. + if (i != 2) draw_sprite_ext(msprite[i], off, xx + 120 + (i * spacing) + spritemx, (yy + tp) - 60, 2, 2, 0, c_white, 1); } var ymod = 0; @@ -56,8 +47,7 @@ if (drawchar == 1) } } -if (global.menuno == 5) -{ +if (global.menuno == 5) { var lang_off = langopt([90, 410, 420], [85, 412, 422]); draw_set_color(c_black); draw_rectangle(xx + 60, yy + lang_off[0], xx + 580, yy + lang_off[1], false); @@ -72,27 +62,12 @@ if (global.menuno == 5) draw_text(xx + 270, yy + 100, string_hash_to_newline("CONFIG")); audvol = string(round(abs(global.flag[17] * 100))) + "%"; musvol = string(round(abs(global.flag[16] * 100))) + "%"; - runoff = "OFF"; + runoff = global.flag[11] ? "ON" : "OFF"; + flashoff = global.flag[8] ? "ON" : "OFF"; + shakeoff = global.flag[12] ? "ON" : "OFF"; - if (global.flag[11] == 1) - runoff = "ON"; - - flashoff = "OFF"; - - if (global.flag[8] == 1) - flashoff = "ON"; - - shakeoff = "OFF"; - - if (global.flag[12] == 1) - shakeoff = "ON"; - - if (!global.is_console) - { - fullscreenoff = "OFF"; - - if (window_get_fullscreen()) - fullscreenoff = "ON"; + if (!global.is_console){ + fullscreenoff = window_get_fullscreen() ? "ON" : "OFF"; } draw_sprite(spr_heart, 0, _heartXPos, yy + 160 + (global.submenucoord[30] * 35)); @@ -134,9 +109,11 @@ if (global.menuno == 5) } } - if (global.submenu == 34) - { - } + if (global.submenu == 34) { + // Survey Program Code, In Release Deltarune these Lines were completely deleted (Not just Commented Out, but Deleted, Brought over incase if someone wanted to Restore this.) + //draw_set_color(c_white) + //draw_text(xx + 200, yy + 150, string_hash_to_newline(stringsetsubloc("Hold ESC at any time#to quit the program.# # #Press [~1] to return.", global.asc_def[global.input_k[5]], "obj_darkcontroller_slash_Draw_0_gml_101_0"))) + } if (global.submenu == 35) { @@ -408,36 +385,29 @@ if (global.menuno == 4) draw_text(xx + 230, ch_y[2], string_hash_to_newline(floor(magsum))); var spell_xoff = langopt(0, -10); - for (i = 0; i < 6; i += 1) - { - if (global.spell[charcoord][i] > DRSpell.None) - { + for (i = 0; i < 6; i += 1) { + if (global.spell[charcoord][i] > DRSpell.None) { g = 0; - if (global.spellusable[charcoord][i] == 0) + if (global.spellusable[charcoord][i] == false) g = 1; if (global.spellcost[charcoord][i] > global.tension) g = 1; - if (g == 0) - draw_set_color(c_white); + if (g == 0) draw_set_color(c_white); + if (g == 1) draw_set_color(c_gray); // Can't Cast Right now (Low Overworld TP or Unusable Spell) - if (g == 1) - draw_set_color(c_gray); - - if (g == 0) - draw_set_color(c_white); - - if (global.lang == "ja") - draw_text(xx + 310, ch_y[i], string_hash_to_newline(string(round((global.spellcost[charcoord][i] / global.maxtension) * 100)) + "%")); - else - draw_text(xx + 340, ch_y[i], string_hash_to_newline(string(round((global.spellcost[charcoord][i] / global.maxtension) * 100)) + "%")); - - if (global.lang == "ja") - draw_text(xx + 390 + spell_xoff, ch_y[i], string_hash_to_newline(global.spellname[charcoord][i])); - else - draw_text(xx + 410 + spell_xoff, ch_y[i], string_hash_to_newline(global.spellname[charcoord][i])); + var costX = 340 + var nameX = 410 + + if global.lang == "ja" { + costX = 120 + nameX = 390 + } + + draw_text(xx + costX, ch_y[i], string_hash_to_newline(string(round((global.spellcost[charcoord][i] / global.maxtension) * 100)) + "%")); + draw_text(xx + nameX + spell_xoff, ch_y[i], string_hash_to_newline(global.spellname[charcoord][i])); } } diff --git a/objects/obj_darkcontroller/Step_0.gml b/objects/obj_darkcontroller/Step_0.gml index d5ddcc5b..db7d14b6 100644 --- a/objects/obj_darkcontroller/Step_0.gml +++ b/objects/obj_darkcontroller/Step_0.gml @@ -1,47 +1,37 @@ -if (global.interact == 5) -{ - charcon = 1; +if (global.interact == 5) { // If Menu is Open + charcon = true; - if (global.submenu == 5 || global.submenu == 22) - { + if (global.submenu == 5 || global.submenu == 22) { global.charselect = global.submenucoord[global.submenu]; global.faceaction[0] = 0; global.faceaction[1] = 0; global.faceaction[2] = 0; global.faceaction[global.charselect] = 7; - if (left_p()) - { - movenoise = 1; - - if (global.submenucoord[global.submenu] > 0) - global.submenucoord[global.submenu] -= 1; - else - global.submenucoord[global.submenu] = chartotal - 1; + var moveamt = 0 + + if (left_p()) { // Go Left! + movenoise = true; + moveamt-- } - if (right_p()) - { - movenoise = 1; - - if (global.submenucoord[global.submenu] < (chartotal - 1)) - global.submenucoord[global.submenu] += 1; - else - global.submenucoord[global.submenu] = 0; + if (right_p()) { // Go Right! + movenoise = true; + moveamt++ } + if abs(moveamt > 0) && chartotal > 0 { + global.submenucoord[global.submenu] = scr_wrap_newer(global.submenucoord[global.submenu] + moveamt, 0, chartotal) + } - if (button1_p() && onebuffer < 0 && twobuffer < 0) - { + if (button1_p() && onebuffer < 0 && twobuffer < 0) { onebuffer = 2; - if (global.submenu == 5) - { + if (global.submenu == 5) { scr_itemuse(global.item[global.submenucoord[2]]); - if (usable == 1) - { + if (usable == true) { //with (obj_event_manager) - // trigger_event(GameEvent.Zero, GameEvent.Eleven); + // trigger_event(TrophySystem.AwardTrophy, TrophySystem.TrophyItemCh3); } if (usable == 1 && replaceable == 0) @@ -55,11 +45,15 @@ if (global.interact == 5) global.charselect = -1; } - if (global.submenu == 22) - { + if (global.submenu == 22) { // unused - //scr_spell_overworld(global.spell[global.char[global.submenucoord[20]]][global.submenucoord[21]]); - //global.tension -= global.spellcost[global.char[global.submenucoord[20]]][global.submenucoord[21]]; + if script_exists(asset_get_index("scr_spell_overworld")) { + scr_spell_overworld(global.spell[global.char[global.submenucoord[20]]][global.submenucoord[21]]); + global.tension -= global.spellcost[global.char[global.submenucoord[20]]][global.submenucoord[21]]; + } else { + global.submenu = 21 + snd_play(snd_error) + } } } @@ -68,8 +62,7 @@ if (global.interact == 5) if (button2_p() && twobuffer < 0 && onebuffer < 0) close = 1; - if (global.submenu == 22) - { + if (global.submenu == 22) { if (global.spellcost[global.char[global.submenucoord[20]]][global.submenucoord[21]] > global.tension) close = 1; } @@ -1632,25 +1625,18 @@ if (global.interact == 5) } } - close = 0; - - if (button2_p() && twobuffer < 0) - close = 1; - - if (button3_p() && threebuffer < 0) - close = 1; + close = false; + if (button2_p() && twobuffer < 0) close = true; + if (button3_p() && threebuffer < 0) close = true; - if (close == 1) - { - if (global.menuno == 0) - { + if (close == true) { + if (global.menuno == 0) { global.menuno = -1; global.interact = 0; charcon = 0; deschaver = 0; - with (obj_mainchara) - { + with (obj_mainchara) { threebuffer = 2; twobuffer = 2; } @@ -1659,92 +1645,64 @@ if (global.interact == 5) } } -if (global.interact == 6) -{ - if (!instance_exists(obj_dialoguer)) - global.interact = 0; -} +if (global.interact == 6 && !instance_exists(obj_dialoguer)) // If State == MenuTextbox without any Textboxes, Free Kris from their Prison of standing still. + global.interact = false; -if (charcon == 1) -{ - drawchar = 1; - bpy = 60; - tpy = 80; +if (charcon == true) { + drawchar = true; // Render Character Bar + bpy = 60; // Set Target Character Bar y + tpy = 80; // Set Target TensionBar Y - if (global.interact == 5) - { - if (tp < (tpy - 1)) - { + if (global.interact == 5) { + if (tp < (tpy - 1)) { if ((tpy - tp) <= 40) tp += round((tpy - tp) / 2.5); else tp += 30; } - else - { - tp = tpy; - } + else tp = tpy; } - if (bp < (bpy - 1) && charcon == 1) - { + if (bp < (bpy - 1)) { // Slide Chars Onscreen if ((bpy - bp) <= 40) bp += round((bpy - bp) / 2.5); else bp += 30; } - else - { - bp = bpy; - } + else bp = bpy; } -if (charcon == 0) -{ - if (tp > 0) - { +if (charcon == false) { + if (tp > 0) { // If TP Bar is Visible (Despite DMK having that ability commented out) Slide out of View if (tp >= 80) tp -= round(tp / 2.5); else tp -= 30; - } - else - { - tp = 0; - } + } else tp = 0; - if (bp > 0) - { + if (bp > 0) { // Slide CharBar offscreen if (bp >= 40) bp -= round(bp / 2.5); else bp -= 30; - } - else - { - bp = 0; - } + } else bp = 0; - if (bp == 0) - drawchar = 0; + if (bp == 0) drawchar = false; } -if (movenoise == 1) -{ +if (movenoise == true) { snd_play(snd_menumove); - movenoise = 0; + movenoise = false; } -if (selectnoise == 1) -{ +if (selectnoise == true) { snd_play(snd_select); - selectnoise = 0; + selectnoise = false; } -if (cancelnoise == 1) -{ +if (cancelnoise == true) { snd_play(snd_smallswing); - cancelnoise = 0; + cancelnoise = false; } onebuffer -= 1; diff --git a/scripts/ossafe/ossafe.gml b/scripts/ossafe/ossafe.gml index 244df260..a5ee6581 100644 --- a/scripts/ossafe/ossafe.gml +++ b/scripts/ossafe/ossafe.gml @@ -390,17 +390,15 @@ function ossafe_file_text_close(arg0) } } -function langopt(arg0, arg1) -{ - return (global.lang == "ja") ? arg1 : arg0; +function langopt(en, ja) { + return (global.lang == "ja") ? ja : en; } -function scr_timedisp(arg0) -{ - var minutes = floor(arg0 / 1800); +function scr_timedisp(frames) { + var minutes = floor(frames / 1800); var remmins = minutes % 60; var hours = (minutes - remmins) / 60; - var seconds = floor((arg0 / 30) - (minutes * 60)); + var seconds = floor((frames / 30) - (minutes * 60)); var hourstring = string(hours) + ":"; var minstring = string(remmins) + ":"; @@ -416,12 +414,10 @@ function scr_timedisp(arg0) return timedisp; } -function scr_chapterswitch(arg0 = 0) -{ +function scr_chapterswitch(chapter = 0) { var parameters = get_chapter_switch_parameters(); - - if (arg0 == 0) - { + if code_is_compiled() return show_message("YoYoCompiled Games are not Compatible with game_change due to all code being in the exe, Chapter Switching Cannot Continue."); + if (chapter == 0) { switch (os_type) { case os_windows: @@ -440,12 +436,9 @@ function scr_chapterswitch(arg0 = 0) game_change("..", parameters); break; } - } - else - { - var chapstring = string(arg0); - switch (os_type) - { + } else { + var chapstring = string(chapter); + switch (os_type) { case os_windows: game_change("/../chapter" + chapstring + "_windows", "-game data.win" + parameters); break; diff --git a/scripts/scr_text/scr_text.gml b/scripts/scr_text/scr_text.gml index d3252d11..cf7f9472 100644 --- a/scripts/scr_text/scr_text.gml +++ b/scripts/scr_text/scr_text.gml @@ -6,7 +6,7 @@ function scr_text_extra(msc){ // begin it at 10000 to not interfere with any original scr_text data if you plan on porting // that from deltarune - case 10000: { + case SCRTEXT_Choices_ExampleChoice: { scr_speaker("no_name"); global.choicemsg[0] = "#Choicers"; global.choicemsg[1] = "#Are done#like this"; @@ -17,7 +17,7 @@ function scr_text_extra(msc){ break; } - case 10001: { + case SCRTEXT_Choices_ExampleChoice+1: { msgset(0, "* (You chose the option \"" + string_replace(global.choicemsg[global.choice], "#", " ") + "\")/%"); break; } @@ -34,4 +34,6 @@ function scr_text_extra(msc){ function scr_text(msc) { // !MOD! !PATCH! patch this func scr_text_extra(msc); -} \ No newline at end of file +} + +#macro SCRTEXT_Choices_ExampleChoice 10000 \ No newline at end of file diff --git a/scripts/scr_wrap/scr_wrap.gml b/scripts/scr_wrap/scr_wrap.gml new file mode 100644 index 00000000..cb535a39 --- /dev/null +++ b/scripts/scr_wrap/scr_wrap.gml @@ -0,0 +1,65 @@ +function scr_wrap(value, _min, _max) { + var _val = value + var _range = abs(_max - _min) + + if (_max <= _min) { + show_debug_message("wrap error, min higher than max!") + return value; + } else { + while (_val < _min) + _val += _range + + while (_val > _max) + _val -= _range + + return _val; + } +} + +function scr_wrap_new() { + var _val = argument[0] + var _max = argument[2] + var _min = argument[1] + + if ((_val % 1) == 0) { + while (_val > _max || _val < _min) { + if (_val > _max) + _val = (_min + _val) - _max - 1 + else if (_val < _min) + _val = ((_max + _val) - _min) + 1 + else { + // Likely some sort of Commented out Code. + } + } + + return _val; + } else { + var _old = argument[0] + 1 + + while (_val != _old) { + _old = _val + + if (_val < _min) + _val = _max - (_min - _val) + else if (_val > _max) + _val = _min + (_val - _max) + else { + // Likely the Same Commented Out Code. + } + } + + return _val; + } +} + + +function scr_wrap_newer(_val, _min, _max){ + try { + if _min > _max { + var _oldmin = _min + _min = _max + _max = _oldmin + } + return _max - ((_max - (_val % (_max + 1))) % (_max - _min + 1)); + } catch (ex) {return 0} +} \ No newline at end of file diff --git a/scripts/scr_wrap/scr_wrap.yy b/scripts/scr_wrap/scr_wrap.yy new file mode 100644 index 00000000..49f8bde5 --- /dev/null +++ b/scripts/scr_wrap/scr_wrap.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_wrap", + "isCompatibility":false, + "isDnD":false, + "name":"scr_wrap", + "parent":{ + "name":"Engine", + "path":"folders/DELTARUNE/Scripts/Engine.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/texttype/texttype.gml b/scripts/texttype/texttype.gml index e9c22274..06bc33cd 100644 --- a/scripts/texttype/texttype.gml +++ b/scripts/texttype/texttype.gml @@ -539,21 +539,15 @@ function scr_textsound() } // Lower the Amount of If Statements (Also allows for Easily adding more letters to the blacklist, rather than having to do a lot of CtrlC+CtrlV) - var soundblacklist = [" ", "^", "!", ".", "?", ",", ":", "/", "\\", "|", "*"]; + var soundblacklist = [" ", "^", "!", ".", "?", ",", ":", "/", "\\", "|", "*"]; var i = 0 - while i < array_length(soundblacklist) - { - if getchar == soundblacklist[i] - { - play = false; - break; + while i < array_length(soundblacklist) && play == true { + if getchar == soundblacklist[i] play = false; + i++ } - i++ - } - if (play == true) - { + if (play == true) { var textname = audio_get_name(textsound) if (textname == "snd_txtq") { From adb9beafbe275c75065ce962e9302634a8d0c9f6 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Sun, 25 Jan 2026 22:38:03 -0800 Subject: [PATCH 24/56] Minor Changes, Moved Reused Code for Bursting a Bolt to scr_boltburstsharedcode --- scripts/scr_boltcheck/scr_boltcheck.gml | 162 ++++-------------- scripts/scr_charcan/scr_charcan.gml | 8 +- .../scr_set_facing_sprites.gml | 120 ++++++------- scripts/snd_play/snd_play.gml | 2 +- 4 files changed, 93 insertions(+), 199 deletions(-) diff --git a/scripts/scr_boltcheck/scr_boltcheck.gml b/scripts/scr_boltcheck/scr_boltcheck.gml index bf03cc2f..829e0e94 100644 --- a/scripts/scr_boltcheck/scr_boltcheck.gml +++ b/scripts/scr_boltcheck/scr_boltcheck.gml @@ -1,90 +1,43 @@ -function scr_boltcheck(arg0) -{ - pressbuffer[global.char[arg0]] = 5; +function scr_boltcheck(partyslot){ + pressbuffer[global.char[partyslot]] = 5; qualifybolt = -1; close = 99; topclose = 99; - for (i = 0; i < bolttotal; i += 1) - { - if (boltchar[i] == arg0 && boltalive[i] == 1) - { + for (i = 0; i < bolttotal; i += 1) + if (boltchar[i] == partyslot && boltalive[i] == true) { close = boltframe[i] - boltx; - if (close < 15 && close > -5) - { - if (close < topclose) - { - topclose = close; - qualifybolt = i; - } + if (close < 15 && close > -5) && (close < topclose) { + topclose = close; + qualifybolt = i; } } - } - if (qualifybolt != -1) - { - p = abs(topclose); - burstbolt = instance_create((x + 80 + (boltframe[qualifybolt] * boltspeed)) - (boltx * boltspeed), y + (38 * arg0), obj_burstbolt); - - if (p == 0) - { - points[arg0] += 150; - - with (burstbolt) - image_blend = c_yellow; - - with (burstbolt) - mag = 0.2; - } - - if (p == 1) - points[arg0] += 120; - - if (p == 2) - points[arg0] += 110; - - if (p >= 3) - { - points[arg0] += 100 - (abs(topclose) * 2); - burstbolt.image_blend = boltcolor[arg0]; - } - - if (p >= 15) - burstbolt.image_blend = charcolor[arg0]; - - boltalive[qualifybolt] = 0; + if (qualifybolt != -1) { + scr_boltburstsharedcode(qualifybolt, partyslot) } } -function scr_boltcheck_onebutton() -{ +function scr_boltcheck_onebutton(){ dualbolt = -1; dualboltid = -1; - pressbuffer[0] = 5; - pressbuffer[1] = 5; - pressbuffer[2] = 5; - pressbuffer[3] = 5; + for (var i = 0; i < DRCharacter.__MAX__; ++i) pressbuffer[i] = 5; qualifybolt = -1; close = 99; topclose = 999; - for (i = 0; i < bolttotal; i += 1) - { - if (boltalive[i] == 1) - { + for (i = 0; i < bolttotal; i += 1) { + if (boltalive[i] == true){ close = boltframe[i] - boltx; - if (close < 15 && close > -5) - { - if (close == topclose) - { - dualbolt = 1; + if (close < 15 && close > -5) { + if (close == topclose) { + dualbolt = true; dualboltid = i; } - if (close < topclose) - { + if (close < topclose) { topclose = close; qualifybolt = i; } @@ -92,73 +45,26 @@ function scr_boltcheck_onebutton() } } - if (qualifybolt != -1) - { + if (qualifybolt != -1) { bc = boltchar[qualifybolt]; - p = abs(topclose); - burstbolt = instance_create((x + 80 + (boltframe[qualifybolt] * boltspeed)) - (boltx * boltspeed), y + (38 * bc), obj_burstbolt); - - if (p == 0) - { - points[bc] += 150; - - with (burstbolt) - image_blend = c_yellow; - - with (burstbolt) - mag = 0.2; - } - - if (p == 1) - points[bc] += 120; - - if (p == 2) - points[bc] += 110; + scr_boltburstsharedcode(qualifybolt, bc) + if (dualbolt == true) scr_boltburstsharedcode(dualboltid, boltchar[dualboltid]) + } +} + +function scr_boltburstsharedcode(boltid, boltchar) { + p = abs(topclose); + burstbolt = instance_create((x + 80 + (boltframe[boltid] * boltspeed)) - (boltx * boltspeed), y + (38 * boltchar), obj_burstbolt); - if (p >= 3) - { - points[bc] += 100 - (abs(topclose) * 2); - burstbolt.image_blend = boltcolor[bc]; + if (p == 0) { + points[boltchar] += 150; + with (burstbolt) {image_blend = c_yellow; mag = 0.2;} } - if (p >= 15) - burstbolt.image_blend = charcolor[bc]; + if (p == 1) points[boltchar] += 120; + if (p == 2) points[boltchar] += 110; + if (p >= 3){points[boltchar] += 100 - (abs(boltchar) * 2); burstbolt.image_blend = boltcolor[boltchar];} + if (p >= 15) burstbolt.image_blend = charcolor[boltchar]; - boltalive[qualifybolt] = 0; - - if (dualbolt == 1) - { - bc = boltchar[dualboltid]; - p = abs(topclose); - burstbolt = instance_create((x + 80 + (boltframe[dualboltid] * boltspeed)) - (boltx * boltspeed), y + (38 * bc), obj_burstbolt); - - if (p == 0) - { - points[bc] += 150; - - with (burstbolt) - image_blend = c_yellow; - - with (burstbolt) - mag = 0.2; - } - - if (p == 1) - points[bc] += 120; - - if (p == 2) - points[bc] += 110; - - if (p >= 3) - { - points[bc] += 100 - (abs(topclose) * 2); - burstbolt.image_blend = boltcolor[bc]; - } - - if (p >= 15) - burstbolt.image_blend = charcolor[bc]; - - boltalive[dualboltid] = 0; - } - } + boltalive[boltid] = false; } \ No newline at end of file diff --git a/scripts/scr_charcan/scr_charcan.gml b/scripts/scr_charcan/scr_charcan.gml index 1b88483b..c6962829 100644 --- a/scripts/scr_charcan/scr_charcan.gml +++ b/scripts/scr_charcan/scr_charcan.gml @@ -1,10 +1,10 @@ function scr_charcan(partyslot) { charcan = true; - if (global.hp[global.char[partyslot]] <= 0) charcan = false; - if (global.acting[partyslot] == true) charcan = false; - if (global.char[partyslot] == DRCharacter.None) charcan = false; - if (global.charmove[partyslot] == false) charcan = false; + if (global.hp[global.char[partyslot]] <= 0) charcan = false; + if (global.acting[partyslot] == true) charcan = false; + if (global.char[partyslot] == DRCharacter.None) charcan = false; + if (global.charmove[partyslot] == false) charcan = false; if (global.charauto[global.char[partyslot]] == true) charcan = false; return charcan; diff --git a/scripts/scr_set_facing_sprites/scr_set_facing_sprites.gml b/scripts/scr_set_facing_sprites/scr_set_facing_sprites.gml index a86529eb..dacf4c30 100644 --- a/scripts/scr_set_facing_sprites/scr_set_facing_sprites.gml +++ b/scripts/scr_set_facing_sprites/scr_set_facing_sprites.gml @@ -163,7 +163,7 @@ function scr_set_facing_sprites(arg0) specialsprite[4] = spr_susie_shock_r; specialsprite[5] = spr_susie_shock; - } + }*/ if (_actorname == "noellelight") { @@ -180,7 +180,7 @@ function scr_set_facing_sprites(arg0) rsprite = spr_noelle_walk_right_dw; dsprite = spr_noelle_walk_down_dw; } - + /* if (_actorname == "berdlylight") { usprite = spr_berdly_walk_up_lw; @@ -316,8 +316,7 @@ function scr_set_facing_sprites(arg0) ltsprite = lsprite; } -function scr_createfacingsprites(nameidentifier, down,left,up,right) -{ +function scr_createfacingsprites(nameidentifier, down, left, up, right){ var facingdata = {} facingdata.name = nameidentifier facingdata.down = down @@ -328,90 +327,79 @@ function scr_createfacingsprites(nameidentifier, down,left,up,right) return facingdata } -function scr_createfacingspritessubname(name, nameidentifier) -{ +function scr_createfacingspritessubname(name, nameidentifier){ variable_struct_set(variable_global_get("%%ACTORNAMECHANGER%%"), name, nameidentifier) } -function scr_getfacingspritessubname(name) -{ +function scr_getfacingspritessubname(name){ var face = variable_global_get("%%ACTORNAMECHANGER%%") - if variable_struct_exists(variable_global_get("%%ACTORNAMECHANGER%%"), name) - { + if variable_struct_exists(variable_global_get("%%ACTORNAMECHANGER%%"), name) { var data = variable_struct_get(variable_global_get("%%ACTORNAMECHANGER%%"), name) if is_string(data) return data; - else if is_method(data) - { - var data_convert = method(id, data) + else if is_method(data) { + var data_convert = method(self, data) return data_convert() } } return name } -function scr_getfacingsprites(nameidentifier) -{ +function scr_getfacingsprites(nameidentifier){ var face = variable_global_get("%%ACTORDEFAULTFACINGSPRITES%%"); nameidentifier = scr_getfacingspritessubname(nameidentifier); // Just In Case if variable_struct_exists(face, nameidentifier) - { return variable_struct_get(face, nameidentifier); - } else return noone; } -// Base Deltarune -scr_createfacingsprites("krislight", spr_krisd, spr_krisl, spr_krisu, spr_krisr) -scr_createfacingsprites("krisdark", spr_krisd_dark, spr_krisl_dark, spr_krisu_dark, spr_krisr_dark) - -scr_createfacingsprites("susielighteyes", spr_susie_walk_down_lw, spr_susie_walk_left_lw, spr_susie_walk_up_lw, spr_susie_walk_right_lw) -scr_createfacingspritessubname("susielight", "susielighteyes") // Doesn't Exist in DELTAMODKIT -scr_createfacingspritessubname("susie", function() { - var _actorname = "susiedark" - if (global.darkzone == 0) - { - _actorname = "susielighteyes"; - } - - if (global.darkzone == 1) - { - if (global.chapter == 1) - { - _actorname = "susiedark"; - } - - if (global.chapter >= 2) - { - _actorname = "susiedarkeyes"; - } - } - return _actorname -}) -scr_createfacingsprites("susiedark", spr_susied_dark, spr_susiel_dark, spr_susieu_dark, spr_susier_dark) -scr_createfacingsprites("susiedarkeyes", spr_susie_walk_down_dw, spr_susie_walk_left_dw, spr_susie_walk_up_dw, spr_susie_walk_right_dw) -scr_createfacingspritessubname("susieunhappy", function() { -if global.darkzone == true - return "susiedarkeyes" -return "susielighteyes" -}) // Doesn't Exist in DELTAMODKIT - -scr_createfacingspritessubname("kris", function() { -if global.darkzone == true - return "krisdark" -return "krislight" -}) +#region Base Deltarune + #region Lightners + #region Kris + scr_createfacingspritessubname("kris",function() {return global.darkzone ? "krisdark" : "krislight" }) + scr_createfacingsprites("krislight", spr_krisd, spr_krisl, spr_krisu, spr_krisr) + scr_createfacingsprites("krisdark", spr_krisd_dark, spr_krisl_dark, spr_krisu_dark, spr_krisr_dark) + #endregion Kris + #region Susie + scr_createfacingsprites("susielighteyes", spr_susie_walk_down_lw, spr_susie_walk_left_lw, spr_susie_walk_up_lw, spr_susie_walk_right_lw) + scr_createfacingspritessubname("susielight", "susielighteyes") // Doesn't Exist in DELTAMODKIT + scr_createfacingspritessubname("susie", function() { + var _actorname = "susiedark" + if (global.darkzone == 0) _actorname = "susielighteyes"; + if (global.darkzone == 1) { + if (global.chapter <= 1) _actorname = "susiedark"; + else _actorname = "susiedarkeyes"; + } + return _actorname + }) + scr_createfacingsprites("susiedark", spr_susied_dark, spr_susiel_dark, spr_susieu_dark, spr_susier_dark) + scr_createfacingsprites("susiedarkeyes", spr_susie_walk_down_dw, spr_susie_walk_left_dw, spr_susie_walk_up_dw, spr_susie_walk_right_dw) + scr_createfacingspritessubname("susieunhappy", function() {return global.darkzone ? "susiedarkeyes" : "susielighteyes"}) // Doesn't Exist in DELTAMODKIT + #endregion Susie + #region Noelle + scr_createfacingsprites("noellelight", spr_noelle_walk_down_lw, spr_noelle_walk_left_lw, spr_noelle_walk_up_lw, spr_noelle_walk_right_lw) + scr_createfacingsprites("noelledark", spr_noelle_walk_down_dw, spr_noelle_walk_left_dw, spr_noelle_walk_up_dw, spr_noelle_walk_right_dw) + scr_createfacingspritessubname("noelle", function() {return global.darkzone ? "noelledark" : "noellelight"}) + #endregion Noelle + + #region Berdly + scr_createfacingspritessubname("berdly", function() {return global.darkzone ? "berdlydark" : "berdlylight"}) + #endregion Berdly + #endregion -scr_createfacingspritessubname("noelle", function() {return global.darkzone ? "noelledark" : "noellelight"}) -scr_createfacingspritessubname("berdly", function() {return global.darkzone ? "berdlydark" : "berdlylight"}) -scr_createfacingspritessubname("ralsei", function() {return global.chapter <= 1 ? "ralseihat" : "ralseinohat"}) + #region Ralsei + scr_createfacingsprites("ralseinohat", spr_ralsei_walk_down, spr_ralsei_walk_left, spr_ralsei_walk_up, spr_ralsei_walk_right) + scr_createfacingspritessubname("ralseihat", "ralseinohat") // Doesn't Exist yet in DELTAMODKIT, So it'll default to Ralsei's Nohat sprite + scr_createfacingspritessubname("ralsei", function() {return global.chapter <= 1 ? "ralseihat" : "ralseinohat"}) + #endregion -scr_createfacingsprites("ralseinohat", spr_ralsei_walk_down, spr_ralsei_walk_left, spr_ralsei_walk_up, spr_ralsei_walk_right) -scr_createfacingspritessubname("ralseihat", "ralseinohat") // Doesn't Exist yet in DELTAMODKIT, So it'll default to Ralsei's Nohat sprite + #region Missing from Base DMK + if sprite_exists(asset_get_index("spr_toriel_u")) // We can assume Toriel Exists + scr_createfacingsprites("toriel", spr_toriel_d, spr_toriel_l, spr_toriel_u, spr_toriel_r) + if sprite_exists(asset_get_index("spr_torcar_u")) // We can assume Toriel's Car Exists + scr_createfacingsprites("car", spr_torcar_d, spr_torcar_l, spr_torcar_u, spr_torcar_r) + #endregion -if sprite_exists(asset_get_index("spr_toriel_u")) // We can assume Toriel Exists - scr_createfacingsprites("toriel", spr_toriel_d, spr_toriel_l, spr_toriel_u, spr_toriel_r) -if sprite_exists(asset_get_index("spr_torcar_u")) // We can assume Toriel's Car Exists - scr_createfacingsprites("car", spr_torcar_d, spr_torcar_l, spr_torcar_u, spr_torcar_r) +#endregion \ No newline at end of file diff --git a/scripts/snd_play/snd_play.gml b/scripts/snd_play/snd_play.gml index afeed510..f0447ca5 100644 --- a/scripts/snd_play/snd_play.gml +++ b/scripts/snd_play/snd_play.gml @@ -1,6 +1,6 @@ function scr_load_audio() { - var audio_groups = [1, 0]; + var audio_groups = [audio_sfx, audiogroup_default]; for (var i = 0; i < array_length(audio_groups); i++) { From 1342a36a1050d8f1f127c488cdcc40e263e24ae0 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Sun, 25 Jan 2026 23:45:51 -0800 Subject: [PATCH 25/56] More Minor Changes, and Added Defeat Run Animations the bottom of Enemy Config Script. --- objects/obj_initializer2/Create_0.gml | 7 +- objects/obj_initializer2/Other_72.gml | 1 + scripts/scr_battledebug/scr_battledebug.gml | 143 ++++-------------- scripts/scr_boltcheck/scr_boltcheck.gml | 2 +- scripts/scr_enemy_config/scr_enemy_config.gml | 28 +++- scripts/scr_turn/scr_turn.gml | 121 +++++++-------- 6 files changed, 120 insertions(+), 182 deletions(-) diff --git a/objects/obj_initializer2/Create_0.gml b/objects/obj_initializer2/Create_0.gml index 198d074c..25b732d7 100644 --- a/objects/obj_initializer2/Create_0.gml +++ b/objects/obj_initializer2/Create_0.gml @@ -83,6 +83,7 @@ else global_flagname_init(); // flagnames are stripped //scr_84_init_localization(); // no translations im too lazy //pal_swap_init_system(18); // ts gives me nightmares + scr_enemy_defeatrunanimations() global.damagefont = font_add_sprite_ext(spr_numbersfontbig, "0123456789", 20, 0); global.damagefontgold = font_add_sprite_ext(spr_numbersfontbig_gold, "0123456789+-%", 20, 0); global.hpfont = font_add_sprite_ext(spr_numbersfontsmall, "0123456789-+", 0, 2); @@ -106,9 +107,9 @@ else loadtex = -4; -//if (global.is_console) -// loadtex = instance_create(0, 0, obj_prefetchtex); -//else +if (global.is_console) + loadtex = instance_create(0, 0, obj_prefetchtex); +else scr_prefetch_textures(); textures_loaded = false; diff --git a/objects/obj_initializer2/Other_72.gml b/objects/obj_initializer2/Other_72.gml index 240ac121..f78dd527 100644 --- a/objects/obj_initializer2/Other_72.gml +++ b/objects/obj_initializer2/Other_72.gml @@ -25,6 +25,7 @@ if (ds_map_find_value(async_load, "id") == global.savedata_async_id) global_flagname_init(); //scr_84_init_localization(); //scr_84_load_ini(); + scr_enemy_defeatrunanimations() scr_gamestart(); //pal_swap_init_system(18); global.game_won = scr_completed_chapter_any_slot(global.chapter); diff --git a/scripts/scr_battledebug/scr_battledebug.gml b/scripts/scr_battledebug/scr_battledebug.gml index edb355ed..57fd2d8f 100644 --- a/scripts/scr_battledebug/scr_battledebug.gml +++ b/scripts/scr_battledebug/scr_battledebug.gml @@ -1,110 +1,63 @@ -function scr_debug_fullheal() -{ +function scr_debug_fullheal() { caster = 0; - with (obj_dmgwriter) - { - if (delaytimer >= 1) - { - killactive = true; - } - } + with (obj_dmgwriter) if (delaytimer >= 1) killactive = true; scr_healallitemspell(999); - for (i = 0; i < 3; i++) - { - with (global.charinstance[i]) - { - tu--; - } - } + for (i = 0; i < 3; i++) with (global.charinstance[i]) tu--; } -function scr_raise_party() -{ +function scr_raise_party() { caster = 0; - with (obj_dmgwriter) - { - if (delaytimer >= 1) - { - killactive = true; - } - } + with (obj_dmgwriter) if (delaytimer >= 1) killactive = true; - for (i = 0; i < 3; i++) - { - if (global.char[i] == 0) - { - continue; - } + for (i = 0; i < 3; i++) { + if (global.char[i] == DRCharacter.None) continue; var _hltarget = global.char[i]; var _curhp = global.hp[_hltarget]; var _healpower; if (_curhp <= 0) - { _healpower = -_curhp + 5; - } else - { _healpower = 1; - } scr_heal(i, _healpower); - with (global.charinstance[i]) - { + with (global.charinstance[i]) { ha = instance_create(x, y, obj_healanim); ha.target = id; dmgwr = scr_dmgwriter_selfchar(); - with (dmgwr) - { + with (dmgwr) { delay = 8; type = 3; damage = _healpower; } if (global.hp[global.char[myself]] >= global.maxhp[global.char[myself]]) - { - with (dmgwr) - { - specialmessage = 3; - } - } - + with (dmgwr) specialmessage = 3; + tu += 1; } } - for (i = 0; i < 3; i++) - { - with (global.charinstance[i]) - { - tu--; - } - } + for (i = 0; i < 3; i++) with (global.charinstance[i]) tu--; } -function scr_weaken_enemies() -{ +function scr_weaken_enemies(){ for (i = 0; i < 3; i++) { - if (!global.monster[i]) - { - continue; - } + if (!global.monster[i]) continue; dm = instance_create(global.monsterx[i], (global.monstery[i] + 20) - (global.hittarget[i] * 20), obj_dmgwriter); dm.damage = global.monsterhp[i] - 1; var _miss = global.monsterhp[i] == 1; global.monsterhp[i] = 1; - with (global.monsterinstance[i]) - { - if sprite_exists(asset_get_index("spr_realisticexplosion")) - { + with (global.monsterinstance[i]) { + if sprite_exists(asset_get_index("spr_realisticexplosion")) { var _ex = instance_create(x + (sprite_width / 2), y + (sprite_height / 2), obj_animation_dx); _ex.sprite_index = spr_realisticexplosion; _ex.image_xscale = 2; @@ -112,8 +65,7 @@ function scr_weaken_enemies() _ex.depth = obj_dmgwriter.depth + 1; } - if (!_miss) - { + if (!_miss) { shakex = 9; state = 3; hurttimer = 30; @@ -122,82 +74,49 @@ function scr_weaken_enemies() } } -function scr_weaken_party() -{ +function scr_weaken_party(){ var _writedamage = false; - if (argument_count == 1 && argument[0] == true) - { - _writedamage = true; - } + if (argument_count == 1 && argument[0] == true) _writedamage = true; var _didhit = false; - if (_writedamage) - { - with (obj_dmgwriter) - { - if (delaytimer >= 1) - { - killactive = true; - } - } + if (_writedamage) { + with (obj_dmgwriter) if (delaytimer >= 1) killactive = true; } - for (i = 0; i < 3; i++) - { - if (global.char[i] == 0) - { - continue; - } + for (i = 0; i < 3; i++) { + if (global.char[i] == DRCharacter.None) continue; var _chartarget = global.char[i]; - if (_writedamage) - { + if (_writedamage) { var __hpdiff = max(0, global.hp[_chartarget] - 1); - if (__hpdiff > 0) - { - with (global.charinstance[i]) - { + if (__hpdiff > 0) with (global.charinstance[i]) { hurt = true; hurttimer = 0; - } } dmgwriter = instance_create(global.charinstance[i].x, (global.charinstance[i].y + global.charinstance[i].myheight) - 24, obj_dmgwriter); dmgwriter.damage = __hpdiff; - if (__hpdiff > 0) - { - _didhit = true; - } + if (__hpdiff > 0) _didhit = true; } - if (global.hp[_chartarget] > 0) - { - global.hp[_chartarget] = 1; - } + if (global.hp[_chartarget] > 0) global.hp[_chartarget] = 1; } global.inv = global.invc * 40; - if (_didhit) - { + if (_didhit) { snd_play(snd_hurt1); - - if (!instance_exists(obj_shake)) - { - instance_create(0, 0, obj_shake); - } + if (!instance_exists(obj_shake)) instance_create(0, 0, obj_shake); } } -function scr_turn_skip() -{ - if (scr_debug && scr_debug_keycheck(ord("V")) && global.turntimer > 0 && instance_exists(obj_growtangle) && scr_isphase("bullets")) - { +function scr_turn_skip(){ + if (scr_debug && scr_debug_keycheck(ord("V")) && global.turntimer > 0 && instance_exists(obj_growtangle) && scr_isphase("bullets")) { global.turntimer = 0; scr_debug_print("Attack skipped"); } diff --git a/scripts/scr_boltcheck/scr_boltcheck.gml b/scripts/scr_boltcheck/scr_boltcheck.gml index 829e0e94..23812df2 100644 --- a/scripts/scr_boltcheck/scr_boltcheck.gml +++ b/scripts/scr_boltcheck/scr_boltcheck.gml @@ -22,7 +22,7 @@ function scr_boltcheck(partyslot){ function scr_boltcheck_onebutton(){ dualbolt = -1; dualboltid = -1; - for (var i = 0; i < DRCharacter.__MAX__; ++i) pressbuffer[i] = 5; + for (i = 0; i < DRCharacter.__MAX__; ++i) pressbuffer[i] = 5; qualifybolt = -1; close = 99; topclose = 999; diff --git a/scripts/scr_enemy_config/scr_enemy_config.gml b/scripts/scr_enemy_config/scr_enemy_config.gml index c0c95123..6722377d 100644 --- a/scripts/scr_enemy_config/scr_enemy_config.gml +++ b/scripts/scr_enemy_config/scr_enemy_config.gml @@ -163,7 +163,8 @@ function scr_enemy_process_phase(enemyId, phase) { rtimer++; if rtimer != 12 break; - global.monsterattackname[myself] = ["HomingDiamonds", "RisingDiamonds", "SwordThrow"][myattackchoice]; + var _attacks = ["HomingDiamonds", "RisingDiamonds", "SwordThrow"] // Moved to here to stop GameMakerStudio2-Beta's Main Code Viewer from Complaining. + global.monsterattackname[myself] = _attacks[myattackchoice]; dc = scr_bulletspawner(x, y, obj_dbulletcontroller); dc.type = myattackchoice; @@ -296,4 +297,29 @@ function scr_enemy_process_phase(enemyId, phase) { break; } } +} + +function scr_enemy_defeatrunanimations(){ + #region Base Deltarune + scr_createdefeatanimation(obj_defeatanim, function() { return true }) // Lowest Priorty, Default Battle Run + scr_createdefeatanimation(obj_deathanim, function() { return fatal }, 10) // Only seen on Slaying Titan Spawns or using Snowgrave on Regular Enemies. + scr_createdefeatanimation(obj_frozennpc, function() { return __frozen }, 60, function(instance) { instance.depth = depth instance.inbattle = true }) // Frozen Solid. + #endregion +} + +// Defeat Run System Core Data Config init +variable_global_set("@@DefeatAnimationData@@", []) + +function scr_createdefeatanimation(object, condition = function() { return false }, priority = 0, postcreate = function(instance) {}) { + var defeatanimdata = {} + defeatanimdata.object = object + defeatanimdata.condition = condition + defeatanimdata.priority = priority + defeatanimdata.postcreate = postcreate + array_push(scr_getdefeatanimationdataarray(), defeatanimdata) +} + +function scr_getdefeatanimationdataarray() { + if !variable_global_exists("@@DefeatAnimationData@@") variable_global_set("@@DefeatAnimationData@@", []) + return variable_global_get("@@DefeatAnimationData@@") } \ No newline at end of file diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 53c8943a..c5c98491 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -396,15 +396,14 @@ function scr_nextact() { show_debug_message("------------ scr_nextact") global.currentactingchar = 0; - global.acting[0] = 0; - global.acting[1] = 0; - global.acting[2] = 0; + global.acting[0] = false; + global.acting[1] = false; + global.acting[2] = false; //global.actingsingle[global.currentactingchar] = 0; __minstance = global.monsterinstance[global.actingtarget[global.currentactingchar]]; - with (__minstance) - { + with (__minstance) { //acting[DRCharacter.Kris] = 0; for (i = 1; i < DRCharacter.__MAX__; i++) { //acting[i] = 0; @@ -414,8 +413,7 @@ function scr_nextact() { var singleactcomplete = 0; show_debug_message("global.currentactingchar = {0}", global.currentactingchar); - while (global.currentactingchar < 3) - { + while (global.currentactingchar < 3) { show_debug_message("global.actingsingle[{0}] = {1}", global.currentactingchar, global.actingsingle[global.currentactingchar]); if (global.actingsingle[global.currentactingchar] == 1) { @@ -427,7 +425,7 @@ function scr_nextact() { show_debug_message("actcon[{0}] = {1}", global.char[global.currentactingchar], 1); //if (global.actingsimul[global.currentactingchar] == 0) - singleactcomplete = 1; + singleactcomplete = true; global.actingsingle[global.currentactingchar] = 0; break; @@ -550,8 +548,7 @@ function scr_damage_enemy(arg0, arg1) } } -function scr_turntimer(arg0) -{ +function scr_turntimer(arg0){ if (global.turntimer < arg0) global.turntimer = arg0; } @@ -625,60 +622,61 @@ function scr_enemy_hurt() } } -function scr_defeatrun() -{ - var __frozen; +function scr_defeatrun(){ - if (object_is_ancestor(object_index, obj_monsterparent)) - { - __frozen = 0; - - if (global.flag[51 + myself] == 6) - __frozen = 1; + __frozen = false; + + if (object_is_ancestor(object_index, obj_monsterparent)) { + if (global.flag[51 + myself] == 6) __frozen = true; - if (__frozen == 1) - { + if (__frozen == true) { _rtext = instance_create(global.monsterx[myself], global.monstery[myself] - 40, obj_recruitanim); _rtext.image_index = 12; - if (recruitable == 1) + if (recruitable == true) global.flag[global.monstertype[myself] + 600] = -1; - global.flag[63] = 1; - } - - if (recruitable == 1 && global.flag[61] == 0 && __frozen == 0) - { - global.flag[63] = 1; + global.flag[63] = true; + } else if (recruitable == true && global.flag[61] == false) { + global.flag[63] = true; - if (global.flag[global.monstertype[myself] + 600] != -1) - { + if (global.flag[global.monstertype[myself] + 600] != -1) { global.flag[global.monstertype[myself] + 600] = -1; _rtext = instance_create(global.monsterx[myself], global.monstery[myself] - 40, obj_recruitanim); _rtext.image_index = 7; } } } - else - { - fatal = 0; - } - + else fatal = false + + + var highestpriority_id = 0 + var highestpriority = 0 + + var animdat = scr_getdefeatanimationdataarray() + + //var debugrandomchoice = true + //if debugrandomchoice highestpriority_id = irandom(array_length(animdat)) + //else + for (var i = 0; i < array_length(animdat); ++i) { + with animdat[i] { + try { + if highestpriority <= priority && method(other, condition)() { + highestpriority_id = i + highestpriority = priority + } + } catch (ex) { + show_debug_message("Animation with object index of " + string(object) + " Had an Error when trying to get, Removing from List.\n----------------------------\n{0}", ex.longMessage) + array_delete(animdat, i, 1) + i-- + } + } + } + + var defeatanim_data = animdat[highestpriority_id] + var defeatanim = instance_create(x, y, defeatanim_data.object) + with defeatanim_data method(other, postcreate)(defeatanim) - if (!__frozen) - { - if (fatal == 1) - defeatanim = instance_create(x, y, obj_deathanim); - else - defeatanim = instance_create(x, y, obj_defeatanim); - } - else - { - defeatanim = instance_create(x, y, obj_frozennpc); - defeatanim.depth = depth; - defeatanim.inbattle = 1; - } - defeatanim.sprite_index = sprite_index; defeatanim.sprite_index = hurtsprite; defeatanim.image_index = 0; @@ -687,24 +685,17 @@ function scr_defeatrun() instance_destroy(); } -function scr_randomtarget_old() -{ - abletotarget = 1; +function scr_randomtarget_old() { + abletotarget = false; - if (global.charcantarget[0] == 0 && global.charcantarget[1] == 0 && global.charcantarget[2] == 0) - abletotarget = 0; + for (var i = 0; i < array_length(global.charcantarget); ++i) { + if global.charcantarget[i] abletotarget = true + } - mytarget = choose(0, 1, 2); + mytarget = irandom(array_length(global.charcantarget)-1); - if (abletotarget == 1) - { - while (global.charcantarget[mytarget] == 0) - mytarget = choose(0, 1, 2); - } - else - { - mytarget = 3; - } + if (abletotarget == true) while (global.charcantarget[mytarget] == false) mytarget = irandom(array_length(global.charcantarget)-1); + else mytarget = 3; - global.targeted[mytarget] = 1; + global.targeted[mytarget] = true; } \ No newline at end of file From 5b5dc3bd4a8153e26a9978d320b875ae65318aee Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 26 Jan 2026 10:58:13 -0800 Subject: [PATCH 26/56] Unlocked Snowgrave Spell X Position --- objects/obj_spell_snowgrave/Create_0.gml | 7 +++++++ objects/obj_spell_snowgrave/Draw_0.gml | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/objects/obj_spell_snowgrave/Create_0.gml b/objects/obj_spell_snowgrave/Create_0.gml index 02221b98..6ebdff47 100644 --- a/objects/obj_spell_snowgrave/Create_0.gml +++ b/objects/obj_spell_snowgrave/Create_0.gml @@ -11,3 +11,10 @@ con = 0; //if (global.encounterno == 82) // altpath = 1; + +//spellanimationcenterx = xx + 500 +spellparticlespawnerpositiondifference = 45 + +if global.fighting { + x = camerax() + (camerawidth()/2 + 180) +} \ No newline at end of file diff --git a/objects/obj_spell_snowgrave/Draw_0.gml b/objects/obj_spell_snowgrave/Draw_0.gml index 4aec5e14..86ddc35b 100644 --- a/objects/obj_spell_snowgrave/Draw_0.gml +++ b/objects/obj_spell_snowgrave/Draw_0.gml @@ -150,12 +150,11 @@ if (timer >= 0) if (timer == 1) audio_play_sound(snd_snowgrave, 50, 0); -if (timer >= 20 && timer <= (75 + (altpath * 30))) -{ +if (timer >= 20 && timer <= (75 + (altpath * 30))) { stimer++; - snowflake[0] = instance_create(xx + 455, yy + 560, obj_spell_snowgrave_snowflake); - snowflake[1] = instance_create(xx + 500, yy + 600, obj_spell_snowgrave_snowflake); - snowflake[2] = instance_create(xx + 545, yy + 520, obj_spell_snowgrave_snowflake); + snowflake[0] = instance_create(x - spellparticlespawnerpositiondifference, yy + 560, obj_spell_snowgrave_snowflake); + snowflake[1] = instance_create(x, yy + 600, obj_spell_snowgrave_snowflake); + snowflake[2] = instance_create(x + spellparticlespawnerpositiondifference, yy + 520, obj_spell_snowgrave_snowflake); for (i = 0; i < 3; i++) { From 82a66d3ed174b8a9a10218e5d0d0859136c66f3e Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 26 Jan 2026 11:09:46 -0800 Subject: [PATCH 27/56] Increased ModKit version number from v0.90 to v0.901 --- scripts/scr_chapter_config/scr_chapter_config.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_chapter_config/scr_chapter_config.gml b/scripts/scr_chapter_config/scr_chapter_config.gml index 15f517f3..e14854dd 100644 --- a/scripts/scr_chapter_config/scr_chapter_config.gml +++ b/scripts/scr_chapter_config/scr_chapter_config.gml @@ -1,6 +1,6 @@ function scr_chapter_config() { global.chapter = 4; - global.versionno = "v0.90-modkit-3"; + global.versionno = "v0.901-modkit-3"; global.newFileStartingRoom = room_lw_test; global.isStartingRoomDarkWorld = false; From be2f8ad8ef7827ea7f24999c022d5fda51dc56db Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 26 Jan 2026 11:24:11 -0800 Subject: [PATCH 28/56] Minor changes --- objects/obj_dw_leave/Create_0.gml | 4 -- objects/obj_dw_leave/Step_0.gml | 37 ++++++++++++------- objects/obj_dw_leave/obj_dw_leave.yy | 6 ++- .../scr_chapter_config/scr_chapter_config.gml | 7 +--- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/objects/obj_dw_leave/Create_0.gml b/objects/obj_dw_leave/Create_0.gml index b3dc092a..6ccb2b71 100644 --- a/objects/obj_dw_leave/Create_0.gml +++ b/objects/obj_dw_leave/Create_0.gml @@ -18,10 +18,6 @@ kris_y = y - 80; sus_x = x - 60; sus_y = y - 94; unlock_mode = global.plot >= 242; -nextroom = room_lw_test; - -//if (unlock_mode) -// nextroom = 261; if (scr_havechar(DRCharacter.Susie)) { diff --git a/objects/obj_dw_leave/Step_0.gml b/objects/obj_dw_leave/Step_0.gml index b8a83b91..4009c940 100644 --- a/objects/obj_dw_leave/Step_0.gml +++ b/objects/obj_dw_leave/Step_0.gml @@ -36,23 +36,34 @@ if (con == 10) visible = 0; } - /*with (obj_caterpillarchara) - { - if (visible == 1) - { - me = scr_dark_marker_depth(x, y, 510000, sprite_index); - visible = 0; + with (obj_caterpillarchara) { + if (visible == true && !fun) { + follow = false + fun = true + ignoredepth = true + image_index = 0 + depth += 510000 + //me = scr_dark_marker_depth(x, y, 510000, sprite_index); + //visible = false; - if (name == "ralsei") - { - me.sprite_index = spr_ralsei_wave_start; - me.image_speed = 0.2; + if (name == "ralsei") { + if sprite_exists(asset_get_index("spr_ralsei_wave_start")) && sprite_exists(asset_get_index("spr_ralsei_wave_down")) && script_exists(asset_get_index("scr_script_delayed")) && script_exists(asset_get_index("scr_var")) { + sprite_index = spr_ralsei_wave_start; + image_speed = 0.2; - with (me) - scr_script_delayed(scr_var, 15, "sprite_index", spr_ralsei_wave_down); + scr_script_delayed(scr_var, 15, "sprite_index", spr_ralsei_wave_down); + } else { + //if room == room_dw_castle_area_1 { + // if x > 320 + 120 hspeed = -1 + // if x < 320 - 120 hspeed = 1 + // sprite_index = usprite + // image_speed = 0.1 + // vspeed = -2 + //} + } } } - }*/ + } contimer = 0; con = 11; diff --git a/objects/obj_dw_leave/obj_dw_leave.yy b/objects/obj_dw_leave/obj_dw_leave.yy index 60667997..4c05fb8c 100644 --- a/objects/obj_dw_leave/obj_dw_leave.yy +++ b/objects/obj_dw_leave/obj_dw_leave.yy @@ -28,7 +28,11 @@ "physicsShape":1, "physicsShapePoints":[], "physicsStartAwake":true, - "properties":[], + "properties":[ + {"$GMObjectProperty":"v2","%Name":"nextroom","filters":[ + "GMRoom", + ],"listItems":[],"multiselect":false,"name":"nextroom","rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"resource":{"name":"room_lw_test","path":"rooms/room_lw_test/room_lw_test.yy",},"resourceType":"GMObjectProperty","resourceVersion":"2.0","value":"room_lw_test","varType":5,}, + ], "resourceType":"GMObject", "resourceVersion":"2.0", "solid":false, diff --git a/scripts/scr_chapter_config/scr_chapter_config.gml b/scripts/scr_chapter_config/scr_chapter_config.gml index e14854dd..a3830ea0 100644 --- a/scripts/scr_chapter_config/scr_chapter_config.gml +++ b/scripts/scr_chapter_config/scr_chapter_config.gml @@ -7,7 +7,6 @@ function scr_chapter_config() { } function scr_chapter_get_recruit_color(chapter) { - switch (chapter) { case 1: return c_purple; case 2: return c_aqua; @@ -18,8 +17,7 @@ function scr_chapter_get_recruit_color(chapter) { return c_black; } -function scr_gamestart_chapter_override() -{ +function scr_gamestart_chapter_override(){ global.plot = 0; global.char[0] = DRCharacter.Kris; global.char[1] = DRCharacter.Susie; @@ -53,8 +51,7 @@ function scr_gamestart_chapter_override() if (global.flag[64] < 24) global.flag[64] = 24; - if (global.chapter == 3) - { + if (global.chapter == 3) { global.flag[1173] = 0; global.flag[1174] = 0; global.flag[1194] = 0; From ec35b0e60f25c1f197129a32aa976b11a4ba31f5 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 26 Jan 2026 12:03:41 -0800 Subject: [PATCH 29/56] Added Ralsei Wave Sprites, scr_var, and the other scr_script functions --- DELTAModKit.yyp | 5 +- objects/obj_dw_leave/Step_0.gml | 18 +-- objects/obj_script_delayed/Other_10.gml | 71 +----------- scripts/scr_script/scr_script.gml | 53 +++++++++ .../scr_script.yy} | 4 +- .../scr_script_repeat/scr_script_repeat.gml | 16 --- scripts/scr_var/scr_var.gml | 3 + scripts/scr_var/scr_var.yy | 13 +++ .../4ac93b26-bf21-4f6c-b3f6-0946468dc3a4.png | Bin 0 -> 651 bytes .../936aec4d-16d5-44e7-9c5f-0d2a1642e718.png | Bin 0 -> 651 bytes .../b659d47b-67b4-4b7d-a253-be06fd87009d.png | Bin 0 -> 651 bytes .../f322c253-6c30-42ba-91e9-5aba402f7382.png | Bin 0 -> 648 bytes .../5fd967eb-d70a-4f9d-bca4-1be1c622e095.png | Bin 0 -> 651 bytes .../5fd967eb-d70a-4f9d-bca4-1be1c622e095.png | Bin 0 -> 651 bytes .../5fd967eb-d70a-4f9d-bca4-1be1c622e095.png | Bin 0 -> 651 bytes .../5fd967eb-d70a-4f9d-bca4-1be1c622e095.png | Bin 0 -> 648 bytes .../spr_ralsei_wave_down.yy | 105 ++++++++++++++++++ .../8e9a682a-1f42-40ef-a08a-91b5ec7a292c.png | Bin 0 -> 644 bytes .../b42acab5-e651-465e-bac5-763cc0db2ff6.png | Bin 0 -> 649 bytes .../ebbf2240-5728-445e-96aa-6528e7cd6aff.png | Bin 0 -> 659 bytes .../a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png | Bin 0 -> 644 bytes .../a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png | Bin 0 -> 649 bytes .../a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png | Bin 0 -> 659 bytes .../spr_ralsei_wave_start.yy | 101 +++++++++++++++++ 24 files changed, 294 insertions(+), 95 deletions(-) create mode 100644 scripts/scr_script/scr_script.gml rename scripts/{scr_script_repeat/scr_script_repeat.yy => scr_script/scr_script.yy} (77%) delete mode 100644 scripts/scr_script_repeat/scr_script_repeat.gml create mode 100644 scripts/scr_var/scr_var.gml create mode 100644 scripts/scr_var/scr_var.yy create mode 100644 sprites/spr_ralsei_wave_down/4ac93b26-bf21-4f6c-b3f6-0946468dc3a4.png create mode 100644 sprites/spr_ralsei_wave_down/936aec4d-16d5-44e7-9c5f-0d2a1642e718.png create mode 100644 sprites/spr_ralsei_wave_down/b659d47b-67b4-4b7d-a253-be06fd87009d.png create mode 100644 sprites/spr_ralsei_wave_down/f322c253-6c30-42ba-91e9-5aba402f7382.png create mode 100644 sprites/spr_ralsei_wave_down/layers/4ac93b26-bf21-4f6c-b3f6-0946468dc3a4/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png create mode 100644 sprites/spr_ralsei_wave_down/layers/936aec4d-16d5-44e7-9c5f-0d2a1642e718/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png create mode 100644 sprites/spr_ralsei_wave_down/layers/b659d47b-67b4-4b7d-a253-be06fd87009d/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png create mode 100644 sprites/spr_ralsei_wave_down/layers/f322c253-6c30-42ba-91e9-5aba402f7382/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png create mode 100644 sprites/spr_ralsei_wave_down/spr_ralsei_wave_down.yy create mode 100644 sprites/spr_ralsei_wave_start/8e9a682a-1f42-40ef-a08a-91b5ec7a292c.png create mode 100644 sprites/spr_ralsei_wave_start/b42acab5-e651-465e-bac5-763cc0db2ff6.png create mode 100644 sprites/spr_ralsei_wave_start/ebbf2240-5728-445e-96aa-6528e7cd6aff.png create mode 100644 sprites/spr_ralsei_wave_start/layers/8e9a682a-1f42-40ef-a08a-91b5ec7a292c/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png create mode 100644 sprites/spr_ralsei_wave_start/layers/b42acab5-e651-465e-bac5-763cc0db2ff6/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png create mode 100644 sprites/spr_ralsei_wave_start/layers/ebbf2240-5728-445e-96aa-6528e7cd6aff/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png create mode 100644 sprites/spr_ralsei_wave_start/spr_ralsei_wave_start.yy diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index 5783e02c..05e66d93 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -456,7 +456,7 @@ {"id":{"name":"scr_save_point_text","path":"scripts/scr_save_point_text/scr_save_point_text.yy",},}, {"id":{"name":"scr_savefile","path":"scripts/scr_savefile/scr_savefile.yy",},}, {"id":{"name":"scr_screen_border","path":"scripts/scr_screen_border/scr_screen_border.yy",},}, - {"id":{"name":"scr_script_repeat","path":"scripts/scr_script_repeat/scr_script_repeat.yy",},}, + {"id":{"name":"scr_script","path":"scripts/scr_script/scr_script.yy",},}, {"id":{"name":"scr_set_facing_sprites","path":"scripts/scr_set_facing_sprites/scr_set_facing_sprites.yy",},}, {"id":{"name":"scr_shakeobj","path":"scripts/scr_shakeobj/scr_shakeobj.yy",},}, {"id":{"name":"scr_shared_overworld","path":"scripts/scr_shared_overworld/scr_shared_overworld.yy",},}, @@ -468,6 +468,7 @@ {"id":{"name":"scr_tension","path":"scripts/scr_tension/scr_tension.yy",},}, {"id":{"name":"scr_text","path":"scripts/scr_text/scr_text.yy",},}, {"id":{"name":"scr_turn","path":"scripts/scr_turn/scr_turn.yy",},}, + {"id":{"name":"scr_var","path":"scripts/scr_var/scr_var.yy",},}, {"id":{"name":"scr_weaponinfo","path":"scripts/scr_weaponinfo/scr_weaponinfo.yy",},}, {"id":{"name":"scr_weapons_config","path":"scripts/scr_weapons_config/scr_weapons_config.yy",},}, {"id":{"name":"scr_wrap","path":"scripts/scr_wrap/scr_wrap.yy",},}, @@ -941,6 +942,8 @@ {"id":{"name":"spr_ralsei_walk_right_blush","path":"sprites/spr_ralsei_walk_right_blush/spr_ralsei_walk_right_blush.yy",},}, {"id":{"name":"spr_ralsei_walk_right","path":"sprites/spr_ralsei_walk_right/spr_ralsei_walk_right.yy",},}, {"id":{"name":"spr_ralsei_walk_up","path":"sprites/spr_ralsei_walk_up/spr_ralsei_walk_up.yy",},}, + {"id":{"name":"spr_ralsei_wave_down","path":"sprites/spr_ralsei_wave_down/spr_ralsei_wave_down.yy",},}, + {"id":{"name":"spr_ralsei_wave_start","path":"sprites/spr_ralsei_wave_start/spr_ralsei_wave_start.yy",},}, {"id":{"name":"spr_ribbick_Idle","path":"sprites/spr_ribbick_Idle/spr_ribbick_Idle.yy",},}, {"id":{"name":"spr_rudebuster_beam_red","path":"sprites/spr_rudebuster_beam_red/spr_rudebuster_beam_red.yy",},}, {"id":{"name":"spr_rudebuster_beam","path":"sprites/spr_rudebuster_beam/spr_rudebuster_beam.yy",},}, diff --git a/objects/obj_dw_leave/Step_0.gml b/objects/obj_dw_leave/Step_0.gml index 4009c940..40c60915 100644 --- a/objects/obj_dw_leave/Step_0.gml +++ b/objects/obj_dw_leave/Step_0.gml @@ -47,19 +47,21 @@ if (con == 10) //visible = false; if (name == "ralsei") { - if sprite_exists(asset_get_index("spr_ralsei_wave_start")) && sprite_exists(asset_get_index("spr_ralsei_wave_down")) && script_exists(asset_get_index("scr_script_delayed")) && script_exists(asset_get_index("scr_var")) { + if script_exists(asset_get_index("scr_var")) { sprite_index = spr_ralsei_wave_start; image_speed = 0.2; scr_script_delayed(scr_var, 15, "sprite_index", spr_ralsei_wave_down); } else { - //if room == room_dw_castle_area_1 { - // if x > 320 + 120 hspeed = -1 - // if x < 320 - 120 hspeed = 1 - // sprite_index = usprite - // image_speed = 0.1 - // vspeed = -2 - //} + if room == room_dw_castle_area_1 { + scr_script_delayed(function() { + if x > 320 + 120 hspeed = -1 + if x < 320 - 120 hspeed = 1 + sprite_index = usprite + image_speed = 0.1 + vspeed = -2 + }, 15) + } } } } diff --git a/objects/obj_script_delayed/Other_10.gml b/objects/obj_script_delayed/Other_10.gml index bf317cc0..8219a613 100644 --- a/objects/obj_script_delayed/Other_10.gml +++ b/objects/obj_script_delayed/Other_10.gml @@ -1,73 +1,8 @@ -if (i_ex(target)) -{ +if (i_ex(target)) { target.__scipt = script; for (i = 0; i < 10; i++) target.__scipt_arg[i] = script_arg[i]; - if (arg_count == 0) - { - with (target) - script_execute(__scipt); - } - - if (arg_count == 1) - { - with (target) - script_execute(__scipt, __scipt_arg[0]); - } - - if (arg_count == 2) - { - with (target) - script_execute(__scipt, __scipt_arg[0], __scipt_arg[1]); - } - - if (arg_count == 3) - { - with (target) - script_execute(__scipt, __scipt_arg[0], __scipt_arg[1], __scipt_arg[2]); - } - - if (arg_count == 4) - { - with (target) - script_execute(__scipt, __scipt_arg[0], __scipt_arg[1], __scipt_arg[2], __scipt_arg[3]); - } - - if (arg_count == 5) - { - with (target) - script_execute(__scipt, __scipt_arg[0], __scipt_arg[1], __scipt_arg[2], __scipt_arg[3], __scipt_arg[4]); - } - - if (arg_count == 6) - { - with (target) - script_execute(__scipt, __scipt_arg[0], __scipt_arg[1], __scipt_arg[2], __scipt_arg[3], __scipt_arg[4], __scipt_arg[5]); - } - - if (arg_count == 7) - { - with (target) - script_execute(__scipt, __scipt_arg[0], __scipt_arg[1], __scipt_arg[2], __scipt_arg[3], __scipt_arg[4], __scipt_arg[5], __scipt_arg[6]); - } - - if (arg_count == 8) - { - with (target) - script_execute(__scipt, __scipt_arg[0], __scipt_arg[1], __scipt_arg[2], __scipt_arg[3], __scipt_arg[4], __scipt_arg[5], __scipt_arg[6], __scipt_arg[7]); - } - - if (arg_count == 9) - { - with (target) - script_execute(__scipt, __scipt_arg[0], __scipt_arg[1], __scipt_arg[2], __scipt_arg[3], __scipt_arg[4], __scipt_arg[5], __scipt_arg[6], __scipt_arg[7], __scipt_arg[8]); - } - - if (arg_count == 10) - { - with (target) - script_execute(__scipt, __scipt_arg[0], __scipt_arg[1], __scipt_arg[2], __scipt_arg[3], __scipt_arg[4], __scipt_arg[5], __scipt_arg[6], __scipt_arg[7], __scipt_arg[8], __scipt_arg[9]); - } -} + with target scr_script_execute_name(__scipt, __scipt_arg) +} \ No newline at end of file diff --git a/scripts/scr_script/scr_script.gml b/scripts/scr_script/scr_script.gml new file mode 100644 index 00000000..2fdbea00 --- /dev/null +++ b/scripts/scr_script/scr_script.gml @@ -0,0 +1,53 @@ +function scr_script_delayed(){ + var __scriptdelay = instance_create(0, 0, obj_script_delayed) + __scriptdelay.script = argument[0] + __scriptdelay.alarm[0] = argument[1] + __scriptdelay.target = id + + for (var __i = 0; __i < (argument_count - 2); __i++) + __scriptdelay.script_arg[__i] = argument[__i + 2] + + __scriptdelay.arg_count = argument_count - 2 + return __scriptdelay; +} + +function scr_script_repeat() { + var __scriptdelay = instance_create(0, 0, obj_script_delayed) + __scriptdelay.script = argument[0] + __scriptdelay.alarm[0] = -2 + __scriptdelay.max_time = argument[1] + __scriptdelay.rate = argument[2] + __scriptdelay.constant = true + __scriptdelay.target = id + + for (var __i = 0; __i < (argument_count - 3); __i++) + __scriptdelay.script_arg[__i] = argument[__i + 3] + + __scriptdelay.arg_count = argument_count - 3 + return __scriptdelay; +} + +function scr_script_repeat_stop(){ + var _myid = id + + with (obj_script_delayed) if (target == _myid) { + max_time = -300 + alarm[0] = -5 + instance_destroy() + } +} + +function scr_script_execute_name(argument0, argument1 = [], argument2 = 0) { + var scriptname = argument0 + var scriptarguments = argument1 + var offset = argument2 + var script = asset_get_index(scriptname) + if (is_real(scriptname) || is_method(scriptname) || script_exists(scriptname)) && script == -1 script = scriptname + + if (script_exists(script)) + return script_execute_ext(script, scriptarguments, offset); + else if is_method(script) { + return method_call(method(self, script), scriptarguments, offset) + } else return false; +} + diff --git a/scripts/scr_script_repeat/scr_script_repeat.yy b/scripts/scr_script/scr_script.yy similarity index 77% rename from scripts/scr_script_repeat/scr_script_repeat.yy rename to scripts/scr_script/scr_script.yy index 0c742080..ff4ee3ab 100644 --- a/scripts/scr_script_repeat/scr_script_repeat.yy +++ b/scripts/scr_script/scr_script.yy @@ -1,9 +1,9 @@ { "$GMScript":"v1", - "%Name":"scr_script_repeat", + "%Name":"scr_script", "isCompatibility":false, "isDnD":false, - "name":"scr_script_repeat", + "name":"scr_script", "parent":{ "name":"Engine", "path":"folders/DELTARUNE/Scripts/Engine.yy", diff --git a/scripts/scr_script_repeat/scr_script_repeat.gml b/scripts/scr_script_repeat/scr_script_repeat.gml deleted file mode 100644 index 77e494bd..00000000 --- a/scripts/scr_script_repeat/scr_script_repeat.gml +++ /dev/null @@ -1,16 +0,0 @@ -function scr_script_repeat() -{ - var __scriptdelay = instance_create(0, 0, obj_script_delayed); - __scriptdelay.script = argument[0]; - __scriptdelay.alarm[0] = -2; - __scriptdelay.max_time = argument[1]; - __scriptdelay.rate = argument[2]; - __scriptdelay.constant = 1; - __scriptdelay.target = id; - - for (var __i = 0; __i < (argument_count - 3); __i++) - __scriptdelay.script_arg[__i] = argument[__i + 3]; - - __scriptdelay.arg_count = argument_count - 3; - return __scriptdelay; -} diff --git a/scripts/scr_var/scr_var.gml b/scripts/scr_var/scr_var.gml new file mode 100644 index 00000000..6f8cff05 --- /dev/null +++ b/scripts/scr_var/scr_var.gml @@ -0,0 +1,3 @@ +function scr_var(name, val) { + variable_instance_set(id, name, val) +} \ No newline at end of file diff --git a/scripts/scr_var/scr_var.yy b/scripts/scr_var/scr_var.yy new file mode 100644 index 00000000..b7f3f02c --- /dev/null +++ b/scripts/scr_var/scr_var.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_var", + "isCompatibility":false, + "isDnD":false, + "name":"scr_var", + "parent":{ + "name":"Engine", + "path":"folders/DELTARUNE/Scripts/Engine.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/sprites/spr_ralsei_wave_down/4ac93b26-bf21-4f6c-b3f6-0946468dc3a4.png b/sprites/spr_ralsei_wave_down/4ac93b26-bf21-4f6c-b3f6-0946468dc3a4.png new file mode 100644 index 0000000000000000000000000000000000000000..8d93c6bf4d4a96b66987b149f339eaef9988c1b6 GIT binary patch literal 651 zcmV;60(AX}P){hzu=MHVIdc0Xx4ziuioA$r?L3lfxYbUIRW!E|)9SOTR zX7;0=r|RMiwLO=DLTc@p&QF7R?Ys$=1=UXu{}LGt2wxcL)8=*x$SB6x==7s|rD;OQuL)>ngP(A_WT4!^X?# zQnl)iBD*?DY7LUG9Mk|s{&&JX6u|iC1_1E5yN9RFzMt^}b0hw0a3B-O>49l5;e4F|lQE<*+Ge zdE+-j&Z%CvAm$l4x&C&2a2d`0`~C+2u%0eG%z}i6^_*J(z=y9NBg5;1%b>|h5E3oN z0e^)HaByWTTF(DXQR%+(lcc05qm9Qtm}GMp5cK(*v~q@U8#=002ovPDHLkV1liMG=cyC literal 0 HcmV?d00001 diff --git a/sprites/spr_ralsei_wave_down/936aec4d-16d5-44e7-9c5f-0d2a1642e718.png b/sprites/spr_ralsei_wave_down/936aec4d-16d5-44e7-9c5f-0d2a1642e718.png new file mode 100644 index 0000000000000000000000000000000000000000..097e2affaa0917638508becec5eafe1cc75180e1 GIT binary patch literal 651 zcmV;60(AX}P)YHi42FL`hiz90)d2OJDu@% zIt$LDu=;|Ia-BHl|&VUgd_$p21!T8I0)ANQCi;1_7DI-L?8Ev$gL9* zhzQH}5a%yroWG3iP7#Ae%lqeZ3%$+A{kP8{xZT)Jg&@-34DmBu0>1@h9vk;`aP zwQLV-dL~NB21!^7nhQGcZODUhcLe}=J3PXB>$970y}#zR9;-yPVvv0d0C0Mb!?!>B zFx^_hmRY<~ybwEsKCdSWf49n6Ep-oPPG4RDoz6-_oWbe6XBdO1vjH=sGw9=F=)b=z z4UuQV-IeF831a1GJg*yc27Uc4z}#KAf%>-s1K^MyM7z@W>Og~SG`|R8hpC=Qd7J;zV@1|1R>A~ zVjz~g3V}jW0;_g~l$S6vkgFGI6^Ax_m{&FR& z*X3GqG*V1-+3P9sy0>hGy8G@c(XSxgflGEDl4P%Y8qaZJ4m{ZUcZp~{S&&Va{{hzu=MHVIdc0Xx4ziuioA$r?L3lfxYbUIRW!E|)9SOTR zX7;0=r|RMiwLO=DLTc@p&QF7R?Ys$=1=UXu{}LGt2wxcL)8=*x$SB6x==7s|rD;OQuL)>ngP(A_WT4!^X?# zQnl)iBD*?DY7LUG9Mk|s{&&JX6u|iC1_1E5yN9RFzMt^}b0hw0a3B-O>49l5;e4F|lQE<*+Ge zdE+-j&Z%CvAm$l4x&C&2a2d`0`~C+2u%0eG%z}i6^_*J(z=y9NBg5;1%b>|h5E3oN z0e^)HaByWTTF(DXQR%+(lcc05qm9Qtm}GMp5cK(*v~q@U8#=002ovPDHLkV1liMG=cyC literal 0 HcmV?d00001 diff --git a/sprites/spr_ralsei_wave_down/f322c253-6c30-42ba-91e9-5aba402f7382.png b/sprites/spr_ralsei_wave_down/f322c253-6c30-42ba-91e9-5aba402f7382.png new file mode 100644 index 0000000000000000000000000000000000000000..68345f7aa0c667a4278da269eb7fcb4a3e8c2b2c GIT binary patch literal 648 zcmV;30(bq1P)5Ph@o1uP&}aM}P$u}UEW>0HPs2v%vGYBvXwR4J___ySQ1xk}-}77Q6k8($%S zeFIGzk|JmMS;~IELfqkyZ{Bb?S|AQq&#O_yNcQtZYW=GN;r)CeH(~LF{5mU=N?6;N z**wZl#ka3e{+vtXvZ{^gYV6qM<|(o$k%}DrV|lRIWA1)DK_XiLU5(#_%p=5){d~du z`NC^QX7zbD>Vj+{iP3JtqunG)l%vW^;zNi$o5kkf*+8arxFa9MUQQO;s} zzN{;3XDdoMd()uXkIz=tl}Vrajl$^+I=XjXKC~Qvef;h;*?-r60063plI5u#*iMm; z$cG%V;#iVgUq?~SLa8jJ$~hxF=t^o4BvaQyT)sw0000{hzu=MHVIdc0Xx4ziuioA$r?L3lfxYbUIRW!E|)9SOTR zX7;0=r|RMiwLO=DLTc@p&QF7R?Ys$=1=UXu{}LGt2wxcL)8=*x$SB6x==7s|rD;OQuL)>ngP(A_WT4!^X?# zQnl)iBD*?DY7LUG9Mk|s{&&JX6u|iC1_1E5yN9RFzMt^}b0hw0a3B-O>49l5;e4F|lQE<*+Ge zdE+-j&Z%CvAm$l4x&C&2a2d`0`~C+2u%0eG%z}i6^_*J(z=y9NBg5;1%b>|h5E3oN z0e^)HaByWTTF(DXQR%+(lcc05qm9Qtm}GMp5cK(*v~q@U8#=002ovPDHLkV1liMG=cyC literal 0 HcmV?d00001 diff --git a/sprites/spr_ralsei_wave_down/layers/936aec4d-16d5-44e7-9c5f-0d2a1642e718/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png b/sprites/spr_ralsei_wave_down/layers/936aec4d-16d5-44e7-9c5f-0d2a1642e718/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png new file mode 100644 index 0000000000000000000000000000000000000000..097e2affaa0917638508becec5eafe1cc75180e1 GIT binary patch literal 651 zcmV;60(AX}P)YHi42FL`hiz90)d2OJDu@% zIt$LDu=;|Ia-BHl|&VUgd_$p21!T8I0)ANQCi;1_7DI-L?8Ev$gL9* zhzQH}5a%yroWG3iP7#Ae%lqeZ3%$+A{kP8{xZT)Jg&@-34DmBu0>1@h9vk;`aP zwQLV-dL~NB21!^7nhQGcZODUhcLe}=J3PXB>$970y}#zR9;-yPVvv0d0C0Mb!?!>B zFx^_hmRY<~ybwEsKCdSWf49n6Ep-oPPG4RDoz6-_oWbe6XBdO1vjH=sGw9=F=)b=z z4UuQV-IeF831a1GJg*yc27Uc4z}#KAf%>-s1K^MyM7z@W>Og~SG`|R8hpC=Qd7J;zV@1|1R>A~ zVjz~g3V}jW0;_g~l$S6vkgFGI6^Ax_m{&FR& z*X3GqG*V1-+3P9sy0>hGy8G@c(XSxgflGEDl4P%Y8qaZJ4m{ZUcZp~{S&&Va{{hzu=MHVIdc0Xx4ziuioA$r?L3lfxYbUIRW!E|)9SOTR zX7;0=r|RMiwLO=DLTc@p&QF7R?Ys$=1=UXu{}LGt2wxcL)8=*x$SB6x==7s|rD;OQuL)>ngP(A_WT4!^X?# zQnl)iBD*?DY7LUG9Mk|s{&&JX6u|iC1_1E5yN9RFzMt^}b0hw0a3B-O>49l5;e4F|lQE<*+Ge zdE+-j&Z%CvAm$l4x&C&2a2d`0`~C+2u%0eG%z}i6^_*J(z=y9NBg5;1%b>|h5E3oN z0e^)HaByWTTF(DXQR%+(lcc05qm9Qtm}GMp5cK(*v~q@U8#=002ovPDHLkV1liMG=cyC literal 0 HcmV?d00001 diff --git a/sprites/spr_ralsei_wave_down/layers/f322c253-6c30-42ba-91e9-5aba402f7382/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png b/sprites/spr_ralsei_wave_down/layers/f322c253-6c30-42ba-91e9-5aba402f7382/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png new file mode 100644 index 0000000000000000000000000000000000000000..68345f7aa0c667a4278da269eb7fcb4a3e8c2b2c GIT binary patch literal 648 zcmV;30(bq1P)5Ph@o1uP&}aM}P$u}UEW>0HPs2v%vGYBvXwR4J___ySQ1xk}-}77Q6k8($%S zeFIGzk|JmMS;~IELfqkyZ{Bb?S|AQq&#O_yNcQtZYW=GN;r)CeH(~LF{5mU=N?6;N z**wZl#ka3e{+vtXvZ{^gYV6qM<|(o$k%}DrV|lRIWA1)DK_XiLU5(#_%p=5){d~du z`NC^QX7zbD>Vj+{iP3JtqunG)l%vW^;zNi$o5kkf*+8arxFa9MUQQO;s} zzN{;3XDdoMd()uXkIz=tl}Vrajl$^+I=XjXKC~Qvef;h;*?-r60063plI5u#*iMm; z$cG%V;#iVgUq?~SLa8jJ$~hxF=t^o4BvaQyT)sw0000":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_ralsei_wave_down", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"936aec4d-16d5-44e7-9c5f-0d2a1642e718","path":"sprites/spr_ralsei_wave_down/spr_ralsei_wave_down.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c485d487-168e-46da-b006-51c6fedbf8bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b659d47b-67b4-4b7d-a253-be06fd87009d","path":"sprites/spr_ralsei_wave_down/spr_ralsei_wave_down.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0cb905c6-7eb4-4ce6-a866-67377d04e8ee","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f322c253-6c30-42ba-91e9-5aba402f7382","path":"sprites/spr_ralsei_wave_down/spr_ralsei_wave_down.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1312bf85-4496-4c3f-925c-821ccc00a602","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ac93b26-bf21-4f6c-b3f6-0946468dc3a4","path":"sprites/spr_ralsei_wave_down/spr_ralsei_wave_down.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e75a0385-0fc9-4f6a-839f-f6f0bbce41c6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":-4, + }, + "swatchColours":null, + "swfPrecision":2.525, + "tags":[ + "ralsei", + ], + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":26, +} \ No newline at end of file diff --git a/sprites/spr_ralsei_wave_start/8e9a682a-1f42-40ef-a08a-91b5ec7a292c.png b/sprites/spr_ralsei_wave_start/8e9a682a-1f42-40ef-a08a-91b5ec7a292c.png new file mode 100644 index 0000000000000000000000000000000000000000..900bee8d947f81915a6382ca6fe16d7c67f438b1 GIT binary patch literal 644 zcmV-~0(v%?_)Ke!*cHYW;Spncl~7xwlnG8c)uV>X7*FH4cBg!gR+ zW|qSYoT{vdIndQi--&~4h$1bZP{+3`%hnT)BT`kUBqkwU%`C+!;C+lt^^6r$5b7;RH#8j;OVZx_v5){ z6TV_T1gq*&7LD<@DrvG^Sof|u71?J*MA)|-zI^y=?OLSk+wV6ht}k8ZM_EKErEdC# zh@72)nYEHO0%dK+RAi~b`QzdG@};$D!w-n~S#Wu4Jbly#NlN4>L^ zK9Md}i8&7duXisHYsN zQOKzMSI?iU=Nyb~L4y^E?)%(?KY-883a9;9=A=-P_z<%VO5N#vW?eVSHM!{-wl0e1D!8h}*PR_acdKy780=hhZ6Rai>TQ<`f zZ>BR-kId>b9i>P%NK0=$;@*1H2+E1dgjnLivq92PvDpOcXXKXmvNHq#5YhHMB8qk* z0uf=^8RG0|jI*b4I4Lx&vAn8Dk#`fE$!8BzN-3(9`6&Z)L*NaGy^3H|Nv@VcV=eftvtu$n9)OhYQ5khQSk-RBP#?h>pyQ%Dkg6Nrei4n>ttOUPNbPr7l9gAABn5K0beqWvlJd zmK}{0*-BFEmYCgJcHhwQ-ztqQNVoiy(_6BavgmO<$5C400000NkvXXu0mjf{o60X literal 0 HcmV?d00001 diff --git a/sprites/spr_ralsei_wave_start/ebbf2240-5728-445e-96aa-6528e7cd6aff.png b/sprites/spr_ralsei_wave_start/ebbf2240-5728-445e-96aa-6528e7cd6aff.png new file mode 100644 index 0000000000000000000000000000000000000000..8fea8f8c7e64183dd668083662224f87381affc1 GIT binary patch literal 659 zcmV;E0&M+>P)B$0U`ddkY+Jwn<^E#c@3xl*C{F`T~6h0+@wv9>!H>2@x zJ)U{}bVyY;CG0X1Q|1b^H)E z>+v+p8z*!IVh0^R01u_KKBiPn9quPVytR2cbLvztLX<2B1iB zLKh8Lj?fT-a5_*0R!zMV#K_&jl?aiPHnzFY_nS8$CrU8wVh35t8!dS)1hcMcYIy#7 zV(Z`k{x2u9%Gy0V5d<2z>2dbJHUl#7a1$ur-^<1x#VKX6$we1u- tV=?`umlfg%l!LAG}eC`~w*Q1FUk!LmU7A002ovPDHLkV1hL}DhdDq literal 0 HcmV?d00001 diff --git a/sprites/spr_ralsei_wave_start/layers/8e9a682a-1f42-40ef-a08a-91b5ec7a292c/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png b/sprites/spr_ralsei_wave_start/layers/8e9a682a-1f42-40ef-a08a-91b5ec7a292c/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png new file mode 100644 index 0000000000000000000000000000000000000000..900bee8d947f81915a6382ca6fe16d7c67f438b1 GIT binary patch literal 644 zcmV-~0(v%?_)Ke!*cHYW;Spncl~7xwlnG8c)uV>X7*FH4cBg!gR+ zW|qSYoT{vdIndQi--&~4h$1bZP{+3`%hnT)BT`kUBqkwU%`C+!;C+lt^^6r$5b7;RH#8j;OVZx_v5){ z6TV_T1gq*&7LD<@DrvG^Sof|u71?J*MA)|-zI^y=?OLSk+wV6ht}k8ZM_EKErEdC# zh@72)nYEHO0%dK+RAi~b`QzdG@};$D!w-n~S#Wu4Jbly#NlN4>L^ zK9Md}i8&7duXisHYsN zQOKzMSI?iU=Nyb~L4y^E?)%(?KY-883a9;9=A=-P_z<%VO5N#vW?eVSHM!{-wl0e1D!8h}*PR_acdKy780=hhZ6Rai>TQ<`f zZ>BR-kId>b9i>P%NK0=$;@*1H2+E1dgjnLivq92PvDpOcXXKXmvNHq#5YhHMB8qk* z0uf=^8RG0|jI*b4I4Lx&vAn8Dk#`fE$!8BzN-3(9`6&Z)L*NaGy^3H|Nv@VcV=eftvtu$n9)OhYQ5khQSk-RBP#?h>pyQ%Dkg6Nrei4n>ttOUPNbPr7l9gAABn5K0beqWvlJd zmK}{0*-BFEmYCgJcHhwQ-ztqQNVoiy(_6BavgmO<$5C400000NkvXXu0mjf{o60X literal 0 HcmV?d00001 diff --git a/sprites/spr_ralsei_wave_start/layers/ebbf2240-5728-445e-96aa-6528e7cd6aff/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png b/sprites/spr_ralsei_wave_start/layers/ebbf2240-5728-445e-96aa-6528e7cd6aff/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png new file mode 100644 index 0000000000000000000000000000000000000000..8fea8f8c7e64183dd668083662224f87381affc1 GIT binary patch literal 659 zcmV;E0&M+>P)B$0U`ddkY+Jwn<^E#c@3xl*C{F`T~6h0+@wv9>!H>2@x zJ)U{}bVyY;CG0X1Q|1b^H)E z>+v+p8z*!IVh0^R01u_KKBiPn9quPVytR2cbLvztLX<2B1iB zLKh8Lj?fT-a5_*0R!zMV#K_&jl?aiPHnzFY_nS8$CrU8wVh35t8!dS)1hcMcYIy#7 zV(Z`k{x2u9%Gy0V5d<2z>2dbJHUl#7a1$ur-^<1x#VKX6$we1u- tV=?`umlfg%l!LAG}eC`~w*Q1FUk!LmU7A002ovPDHLkV1hL}DhdDq literal 0 HcmV?d00001 diff --git a/sprites/spr_ralsei_wave_start/spr_ralsei_wave_start.yy b/sprites/spr_ralsei_wave_start/spr_ralsei_wave_start.yy new file mode 100644 index 00000000..0036deb2 --- /dev/null +++ b/sprites/spr_ralsei_wave_start/spr_ralsei_wave_start.yy @@ -0,0 +1,101 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_ralsei_wave_start", + "bboxMode":0, + "bbox_bottom":39, + "bbox_left":0, + "bbox_right":25, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8e9a682a-1f42-40ef-a08a-91b5ec7a292c","name":"8e9a682a-1f42-40ef-a08a-91b5ec7a292c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebbf2240-5728-445e-96aa-6528e7cd6aff","name":"ebbf2240-5728-445e-96aa-6528e7cd6aff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b42acab5-e651-465e-bac5-763cc0db2ff6","name":"b42acab5-e651-465e-bac5-763cc0db2ff6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":40, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a0a508d4-7fe0-44b7-8840-e6f0c9ee1088","blendMode":0,"displayName":"default","isLocked":false,"name":"a0a508d4-7fe0-44b7-8840-e6f0c9ee1088","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_ralsei_wave_start", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"Dark", + "path":"folders/DELTARUNE/Sprites/Characters/Ralsei/Dark.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_ralsei_wave_start", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":3.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_ralsei_wave_start", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e9a682a-1f42-40ef-a08a-91b5ec7a292c","path":"sprites/spr_ralsei_wave_start/spr_ralsei_wave_start.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"cc76e0ef-06c9-4563-8702-9b84d3b49256","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebbf2240-5728-445e-96aa-6528e7cd6aff","path":"sprites/spr_ralsei_wave_start/spr_ralsei_wave_start.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b29c1f63-27fd-4352-9606-0c2809d4e1b3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b42acab5-e651-465e-bac5-763cc0db2ff6","path":"sprites/spr_ralsei_wave_start/spr_ralsei_wave_start.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3e40ced6-794c-4e35-843a-6e3db20f5226","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":-3, + }, + "swatchColours":null, + "swfPrecision":2.525, + "tags":[ + "ralsei", + ], + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":26, +} \ No newline at end of file From 8b32f2021654a63099f8f0ffcd17c2d0d9db3d30 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 26 Jan 2026 12:05:40 -0800 Subject: [PATCH 30/56] Removed Unused Code I made. --- objects/obj_dw_leave/Step_0.gml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/objects/obj_dw_leave/Step_0.gml b/objects/obj_dw_leave/Step_0.gml index 40c60915..b654c481 100644 --- a/objects/obj_dw_leave/Step_0.gml +++ b/objects/obj_dw_leave/Step_0.gml @@ -47,22 +47,10 @@ if (con == 10) //visible = false; if (name == "ralsei") { - if script_exists(asset_get_index("scr_var")) { - sprite_index = spr_ralsei_wave_start; - image_speed = 0.2; + sprite_index = spr_ralsei_wave_start; + image_speed = 0.2; - scr_script_delayed(scr_var, 15, "sprite_index", spr_ralsei_wave_down); - } else { - if room == room_dw_castle_area_1 { - scr_script_delayed(function() { - if x > 320 + 120 hspeed = -1 - if x < 320 - 120 hspeed = 1 - sprite_index = usprite - image_speed = 0.1 - vspeed = -2 - }, 15) - } - } + scr_script_delayed(scr_var, 15, "sprite_index", spr_ralsei_wave_down); } } } From 4304285604022efd1cc2a3a07b5a5dd8824cee09 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 26 Jan 2026 12:24:29 -0800 Subject: [PATCH 31/56] Minor Spare Fixes --- objects/obj_battlecontroller/Step_0.gml | 4 +-- scripts/scr_turn/scr_turn.gml | 40 +++++++------------------ 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/objects/obj_battlecontroller/Step_0.gml b/objects/obj_battlecontroller/Step_0.gml index a2d89164..3514e8cd 100644 --- a/objects/obj_battlecontroller/Step_0.gml +++ b/objects/obj_battlecontroller/Step_0.gml @@ -204,7 +204,7 @@ if (global.myfight == 0) } } - if (button2_p() == 1 && onebuffer < 0 && global.charturn > 0) { + if (button2_p() && onebuffer < 0) { twobuffer = 1; if scr_prevhero() movenoise = true; } @@ -937,7 +937,7 @@ if (global.myfight == 0) global.faceaction[global.charturn] = 10; global.chartarget[global.charturn] = global.bmenucoord[global.bmenuno][global.charturn]; global.charaction[global.charturn] = 2; - global.charspecial[global.charturn] = 100; + global.charspecial[global.charturn] = DRSpell.Spare; scr_nexthero(); } diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index c5c98491..995a48d7 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -287,20 +287,14 @@ function scr_nexthero() { moveswapped = false show_debug_message(stringsetsub("Hero '~1' Cannot Move.", global.charname[global.char[i]])) } - show_debug_message(moveswapped) } - if (endturn == true) - scr_endturn(); + if (endturn == true) scr_endturn(); + if (moveswapped == true) global.bmenuno = 0; - if (moveswapped == true) - global.bmenuno = 0; - - if (global.charturn > 0) { + if (global.charturn >= 0) { global.temptension[global.charturn] = global.tension; - - for (i = 0; i < 12; i += 1) - tempitem[i][global.charturn] = tempitem[i][prevturn]; + for (i = 0; i < 12; i += 1) tempitem[i][global.charturn] = tempitem[i][prevturn]; } } @@ -323,7 +317,8 @@ function scr_prevhero() { if (moveswapped == true) { global.bmenuno = 0; - with (obj_monsterparent) acting[global.char[global.charturn]] = false; + //with (obj_monsterparent) acting[global.char[global.charturn]] = false; + with (obj_monsterparent) for (i = global.charturn; i < array_length(global.char); i++) acting[global.char[i]] = false global.actingsingle[global.charturn] = 0; global.actingsimul[global.charturn] = 0; @@ -337,25 +332,12 @@ function scr_prevhero() { idefendedthisturn--; mercytotal -= 40; } - - if (global.charturn == 0) { - with (obj_monsterparent) - for (i = 0; i < DRCharacter.__MAX__; i++) - acting[i] = false; // Clears All Acts (Enemy Side) - - for (var i = 0; i < array_length(global.acting); ++i) { // Clears all Acts (Hero Side) - global.acting[i] = false - global.chartarget[i] = 0 - global.charspecial[i] = 0 - global.faceaction[i] = 0 - } - global.tension = global.temptension[0]; - - for (i = 0; i < 12; i += 1) tempitem[i][0] = global.item[i]; - } else { - for (i = 0; i < 12; i += 1) tempitem[i][global.charturn] = tempitem[i][global.charturn - 1]; - } + global.acting[prevturn] = false + global.faceaction[prevturn] = 0 + global.charspecial[prevturn] = 0 + global.chartarget[prevturn] = 0 + for (i = 0; i < 12; i += 1) tempitem[i][0] = global.item[i]; global.tension = global.temptension[global.charturn]; } From 6c01e71407462363c74a5e3b6d4ce0771af9040e Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 26 Jan 2026 12:27:53 -0800 Subject: [PATCH 32/56] minor adjustment --- scripts/scr_turn/scr_turn.gml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 995a48d7..4d58e622 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -316,9 +316,8 @@ function scr_prevhero() { if (moveswapped == true) { global.bmenuno = 0; - - //with (obj_monsterparent) acting[global.char[global.charturn]] = false; - with (obj_monsterparent) for (i = global.charturn; i < array_length(global.char); i++) acting[global.char[i]] = false + with (obj_monsterparent) acting[global.char[global.charturn]] = false; + with (obj_monsterparent) acting[global.char[other.prevturn]] = false; global.actingsingle[global.charturn] = 0; global.actingsimul[global.charturn] = 0; @@ -605,7 +604,6 @@ function scr_enemy_hurt() } function scr_defeatrun(){ - __frozen = false; if (object_is_ancestor(object_index, obj_monsterparent)) { @@ -614,9 +612,7 @@ function scr_defeatrun(){ if (__frozen == true) { _rtext = instance_create(global.monsterx[myself], global.monstery[myself] - 40, obj_recruitanim); _rtext.image_index = 12; - - if (recruitable == true) - global.flag[global.monstertype[myself] + 600] = -1; + if (recruitable == true) global.flag[global.monstertype[myself] + 600] = -1; global.flag[63] = true; } else if (recruitable == true && global.flag[61] == false) { From 7f2fc08b8199cb8b258f8640c4c5e6fe3e0b5757 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 26 Jan 2026 12:44:43 -0800 Subject: [PATCH 33/56] Minor Spell Changes - if someone Casts Nothing (Spell ID 0 normally) it'll say "cast nothing?!" - added spare "spell" info just because. - Made it so if a Spell gets cheaper when the user of that spell equips a specific Weapon if it can see who it's looking at this info for it'll check their weapon instead of what the character it normally checks the weapon of --- .../scr_spells_config/scr_spells_config.gml | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/scripts/scr_spells_config/scr_spells_config.gml b/scripts/scr_spells_config/scr_spells_config.gml index 50944407..bb05f17c 100644 --- a/scripts/scr_spells_config/scr_spells_config.gml +++ b/scripts/scr_spells_config/scr_spells_config.gml @@ -78,8 +78,9 @@ function scr_spellinfo(spellid) spelltarget = 2; cost = 125; - if (global.charweapon[DRCharacter.Susie] == 7) - cost = 100; + var tocheck = global.charweapon[DRCharacter.Susie] + if variable_instance_exists(self, "caster") tocheck = global.char[caster] + if (tocheck == DRWeapon.Devilsknife) cost = 100; spellusable = 0; break; @@ -136,8 +137,9 @@ function scr_spellinfo(spellid) spelltarget = 2; cost = 40; - if (global.charweapon[DRCharacter.Noelle] == 13) - cost *= 0.5; + var tocheck = global.charweapon[DRCharacter.Noelle] + if variable_instance_exists(self, "caster") tocheck = global.char[caster] + if (tocheck == DRWeapon.ThornRing) cost *= 0.5; spellusable = 0; break; @@ -149,9 +151,10 @@ function scr_spellinfo(spellid) spelldesc = "Deals the fatal damage to#all of the enemies."; spelltarget = 0; cost = global.maxtension * 2; - - if (global.charweapon[DRCharacter.Noelle] == 13) - cost *= 0.5; + + var tocheck = global.charweapon[DRCharacter.Noelle] + if variable_instance_exists(self, "caster") tocheck = global.char[caster] + if (tocheck == DRWeapon.ThornRing) cost *= 0.5; spellusable = 0; break; @@ -165,6 +168,17 @@ function scr_spellinfo(spellid) cost = 225 - round(global.flag[1045] * 2.5); spellusable = 0; break; + + + case DRSpell.Spare: + spellname = "Spare"; + spellnameb = "Spare"; + spelldescb = "Spares#enemy"; + spelldesc = "The spare button."; + spelltarget = 0; + cost = 0; + spellusable = 0; + break; } } @@ -177,6 +191,11 @@ function scr_spell_get_battle_use_text(spellid) { break; } + case DRSpell.None: { + msgset(0, stringsetsub("* ~1 cast nothing?!/%", global.charname[global.char[caster]])); + break; + } + // these spells use the word 'used' instead of 'cast' case DRSpell.RudeBuster: case DRSpell.RedBuster: { @@ -246,6 +265,7 @@ function scr_spell_use_action(casterid, spellid) { switch (spell) { default: case DRSpell.None: + global.spelldelay = 10 break; case DRSpell.RudeSword: { From 117087d2edd9fcbdad2e1a5f922bd2dc99862eca Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 26 Jan 2026 17:10:47 -0800 Subject: [PATCH 34/56] Minor Modifications --- scripts/scr_enemy_config/scr_enemy_config.gml | 43 +++++++++++++ scripts/scr_flag/scr_flag.gml | 2 +- scripts/scr_monster/scr_monster.gml | 60 +++---------------- scripts/scr_turn/scr_turn.gml | 11 ++-- 4 files changed, 60 insertions(+), 56 deletions(-) diff --git a/scripts/scr_enemy_config/scr_enemy_config.gml b/scripts/scr_enemy_config/scr_enemy_config.gml index 6722377d..d3ece141 100644 --- a/scripts/scr_enemy_config/scr_enemy_config.gml +++ b/scripts/scr_enemy_config/scr_enemy_config.gml @@ -304,6 +304,14 @@ function scr_enemy_defeatrunanimations(){ scr_createdefeatanimation(obj_defeatanim, function() { return true }) // Lowest Priorty, Default Battle Run scr_createdefeatanimation(obj_deathanim, function() { return fatal }, 10) // Only seen on Slaying Titan Spawns or using Snowgrave on Regular Enemies. scr_createdefeatanimation(obj_frozennpc, function() { return __frozen }, 60, function(instance) { instance.depth = depth instance.inbattle = true }) // Frozen Solid. + scr_createdefeatanimation(obj_spareanim, function() { return _spared }, 100, function(instance) { _spritetochangeto = sparedsprite }) // Frozen Solid. + + //spareanim = instance_create(x, y, obj_spareanim); + //spareanim.sprite_index = sprite_index; + //spareanim.sprite_index = sparedsprite; + //spareanim.image_index = 0; + //spareanim.image_xscale = image_xscale; + //spareanim.image_yscale = image_yscale; #endregion } @@ -322,4 +330,39 @@ function scr_createdefeatanimation(object, condition = function() { return false function scr_getdefeatanimationdataarray() { if !variable_global_exists("@@DefeatAnimationData@@") variable_global_set("@@DefeatAnimationData@@", []) return variable_global_get("@@DefeatAnimationData@@") +} + +function scr_monster_get_defeattypes(mode = "init", monsterslotbattleendflag = global.flag[51 + self.myself]) { + #macro MONSTERS_DEFEATTYPES_None 0 + #macro MONSTERS_DEFEATTYPES_Violence 1 + #macro MONSTERS_DEFEATTYPES_Spare 2 + #macro MONSTERS_DEFEATTYPES_Pacify 3 + #macro MONSTERS_DEFEATTYPES_Frozen 6 + if mode == "all" || mode == "init" { + _amt_add = 0; + _frozened = 0; + _violenced = 0; + _spared = 0; + _pacified = 0; + } + if mode == "all" || mode == "tally" { + _amt_add++ + switch monsterslotbattleendflag { + case MONSTERS_DEFEATTYPES_None: _amt_add-- break + case MONSTERS_DEFEATTYPES_Violence: _violenced++ break + case MONSTERS_DEFEATTYPES_Spare: _spared++ break + case MONSTERS_DEFEATTYPES_Pacify: _pacified++ break + case MONSTERS_DEFEATTYPES_Frozen: _frozened++ break + } + } + if mode == "all" || mode == "updatebattleendflags" { + if (_frozened > 0) global.flag[50] = MONSTERS_DEFEATTYPES_Frozen; + if (_pacified > 0) global.flag[50] = MONSTERS_DEFEATTYPES_Pacify; + if (_spared > 0) global.flag[50] = MONSTERS_DEFEATTYPES_Spare; + if (_violenced > 0) global.flag[50] = MONSTERS_DEFEATTYPES_Violence; + + switch global.flag[50] { + case MONSTERS_DEFEATTYPES_Frozen: global.flag[926]++ break + } + } } \ No newline at end of file diff --git a/scripts/scr_flag/scr_flag.gml b/scripts/scr_flag/scr_flag.gml index d43c6d1f..e1dcfd66 100644 --- a/scripts/scr_flag/scr_flag.gml +++ b/scripts/scr_flag/scr_flag.gml @@ -58,7 +58,7 @@ function global_flagname_init() { global.flagname[42] = "Pacified Enemies" global.flagname[43] = "Susie Attacks" global.flagname[44] = "Total Kills" - global.flagname[54] = "Encounter Flag" + global.flagname[54] = "EncounterEnd Flag Result Flag" // Weird Name, since it is a Flag that Points to what Flag the Encounter End Results with be put into. global.flagname[50] = "Battle End Result" global.flagname[51] = "End of Battle Enemy Stats [0]" global.flagname[52] = "End of Battle Enemy Stats [1]" diff --git a/scripts/scr_monster/scr_monster.gml b/scripts/scr_monster/scr_monster.gml index e02b1d46..ad963f0a 100644 --- a/scripts/scr_monster/scr_monster.gml +++ b/scripts/scr_monster/scr_monster.gml @@ -54,14 +54,9 @@ function scr_monster_add(arg0, arg1) return __returnid; } -function scr_spareanim() -{ - spareanim = instance_create(x, y, obj_spareanim); - spareanim.sprite_index = sprite_index; - spareanim.sprite_index = sparedsprite; - spareanim.image_index = 0; - spareanim.image_xscale = image_xscale; - spareanim.image_yscale = image_yscale; +function scr_spareanim() { + _spared = true + scr_defeatrun() } function scr_monster_makeinstance(monsterid) @@ -121,49 +116,12 @@ function scr_monsterdefeat() global.monstergold[3] += 24; } - if (scr_monsterpop() == 0) - { - _amt_add = 0; - _frozened = 0; - _violenced = 0; - _spared = 0; - _pacified = 0; - - for (d_i = 0; d_i < 3; d_i += 1) - { - if (global.flag[51 + d_i] != 0) - _amt_add += 1; - - if (global.flag[51 + d_i] == 1) - _violenced += 1; - - if (global.flag[51 + d_i] == 2) - _spared += 1; - - if (global.flag[51 + d_i] == 3) - _pacified += 1; - - if (global.flag[51 + d_i] == 6) - _frozened += 1; - } - - if (_frozened > 0) - global.flag[50] = 6; - - if (_pacified > 0) - global.flag[50] = 3; - - if (_spared > 0) - global.flag[50] = 2; - - if (_violenced > 0) - global.flag[50] = 1; - - if (global.flag[50] == 6) - global.flag[926]++; - - if (global.flag[54] != 0) - { + if (scr_monsterpop() == 0) { + scr_monster_get_defeattypes("init") + for (d_i = 0; d_i < 3; d_i += 1) scr_monster_get_defeattypes("tally", global.flag[51 + d_i]) + scr_monster_get_defeattypes("updatebattleendflags") + + if (global.flag[54] != 0) { global.flag[global.flag[54]] = global.flag[50]; show_debug_message("=====Encounter Results====="); show_debug_message("encounter flag: global.flag[" + string(global.flag[54]) + "]=" + string(global.flag[50])); diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 4d58e622..75634723 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -605,9 +605,12 @@ function scr_enemy_hurt() function scr_defeatrun(){ __frozen = false; - - if (object_is_ancestor(object_index, obj_monsterparent)) { + _spared = false + if !variable_struct_exists(self, "fatal") fatal = false + + if (object_is_ancestor(object_index, obj_monsterparent)) { if (global.flag[51 + myself] == 6) __frozen = true; + if global.flag[51 + myself] == 2 _spared = true if (__frozen == true) { _rtext = instance_create(global.monsterx[myself], global.monstery[myself] - 40, obj_recruitanim); @@ -650,13 +653,13 @@ function scr_defeatrun(){ } } } + _spritetochangeto = hurtsprite var defeatanim_data = animdat[highestpriority_id] var defeatanim = instance_create(x, y, defeatanim_data.object) with defeatanim_data method(other, postcreate)(defeatanim) - defeatanim.sprite_index = sprite_index; - defeatanim.sprite_index = hurtsprite; + defeatanim.sprite_index = _spritetochangeto; defeatanim.image_index = 0; defeatanim.image_xscale = image_xscale; defeatanim.image_yscale = image_yscale; From e012be508152b2f34c5098d223d54a39a8f83437 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 26 Jan 2026 22:33:06 -0800 Subject: [PATCH 35/56] Minor Changes, Added scr_character_autotype to character configs --- DELTAModKit.yyp | 1 + objects/obj_attackpress/Create_0.gml | 37 +++--- objects/obj_attackpress/Draw_0.gml | 36 +++--- objects/obj_battle_cleanup/Alarm_0.gml | 2 +- objects/obj_battlecontroller/Step_0.gml | 6 +- objects/obj_spellphase/Create_0.gml | 3 +- objects/obj_spellphase/Step_0.gml | 5 +- options/android/options_android.yy | 2 +- options/html5/options_html5.yy | 2 +- options/ios/options_ios.yy | 2 +- options/linux/options_linux.yy | 2 +- options/mac/options_mac.yy | 2 +- options/main/options_main.yy | 2 +- options/operagx/options_operagx.yy | 2 +- options/tvos/options_tvos.yy | 2 +- options/windows/options_windows.yy | 2 +- scripts/scr_charbox/scr_charbox.gml | 3 +- .../scr_debugging_config.gml | 2 +- scripts/scr_defend/scr_defend.gml | 9 ++ scripts/scr_defend/scr_defend.yy | 13 +++ scripts/scr_encounter/scr_encounter.gml | 37 ++---- scripts/scr_gamestart/scr_gamestart.gml | 2 +- .../scr_heroes_config/scr_heroes_config.gml | 16 +++ scripts/scr_turn/scr_turn.gml | 109 ++++++++---------- 24 files changed, 154 insertions(+), 145 deletions(-) create mode 100644 scripts/scr_defend/scr_defend.gml create mode 100644 scripts/scr_defend/scr_defend.yy diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index 05e66d93..0e8314e4 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -413,6 +413,7 @@ {"id":{"name":"scr_darksize","path":"scripts/scr_darksize/scr_darksize.yy",},}, {"id":{"name":"scr_debug","path":"scripts/scr_debug/scr_debug.yy",},}, {"id":{"name":"scr_debugging_config","path":"scripts/scr_debugging_config/scr_debugging_config.yy",},}, + {"id":{"name":"scr_defend","path":"scripts/scr_defend/scr_defend.yy",},}, {"id":{"name":"scr_depth","path":"scripts/scr_depth/scr_depth.yy",},}, {"id":{"name":"scr_dmenu","path":"scripts/scr_dmenu/scr_dmenu.yy",},}, {"id":{"name":"scr_dmgwriter","path":"scripts/scr_dmgwriter/scr_dmgwriter.yy",},}, diff --git a/objects/obj_attackpress/Create_0.gml b/objects/obj_attackpress/Create_0.gml index efefaa95..c5fcbb78 100644 --- a/objects/obj_attackpress/Create_0.gml +++ b/objects/obj_attackpress/Create_0.gml @@ -229,27 +229,20 @@ if (my_method == 2) } } -haveauto = 0; -autoed = 0; - -if (global.charauto[DRCharacter.Susie] == 1) -{ - if (global.char[0] == DRCharacter.Susie || global.char[1] == DRCharacter.Susie || global.char[2] == DRCharacter.Susie) - { - sus = 0; - - if (global.char[1] == DRCharacter.Susie) - sus = 1; - - if (global.char[2] == DRCharacter.Susie) - sus = 2; - - if (global.hp[DRCharacter.Susie] >= 0 && global.charmove[sus] == 1) - { - haveauto = 1; +for (i = 0; i < array_length(global.char); ++i) { + haveauto[i] = false + autoed[i] = false + autopoints[i] = 0 + var character = global.char[i] + if global.charauto[character] == true { + var autotype = scr_character_autotype(character) + if autotype[0] == 1 { + if (global.hp[character] >= 0 && global.charmove[i] == true) { + haveauto[i] = true; + autopoints[i] = autotype[1] - if (timermax == 3) - timermax = 50; - } - } + if (timermax == 3) timermax = 50; + } + } + } } diff --git a/objects/obj_attackpress/Draw_0.gml b/objects/obj_attackpress/Draw_0.gml index 7afb7537..26cd8b76 100644 --- a/objects/obj_attackpress/Draw_0.gml +++ b/objects/obj_attackpress/Draw_0.gml @@ -183,23 +183,25 @@ if (active == 1) { posttimer += 1; - if (posttimer > (timermax - 35) && haveauto == 1 && autoed == 0 && scr_monsterpop() > 0) - { - global.charinstance[sus].points = 160; - - if (global.automiss[global.chartarget[sus]] == 1) - global.charinstance[sus].points = 0; - - with (global.charinstance[sus]) - { - state = 1; - attacktimer = 0; - is_auto_susie = 1; - } - - posttimer -= 25; - autoed = 1; - } + for (i = 0; i < array_length(haveauto); ++i) { + if haveauto[i] == true { + if (posttimer > (timermax - 35) && autoed[i] == false && scr_monsterpop() > 0) { + global.charinstance[i].points = autopoints[i]; + + if (global.automiss[global.chartarget[i]] == true) + global.charinstance[i].points = 0; + + with (global.charinstance[i]) { + state = 1; + attacktimer = 0; + is_auto_susie = true; + } + + posttimer -= 25; + autoed[i] = true; + } + } + } if (posttimer > timermax) { diff --git a/objects/obj_battle_cleanup/Alarm_0.gml b/objects/obj_battle_cleanup/Alarm_0.gml index 90de2cdd..8f269053 100644 --- a/objects/obj_battle_cleanup/Alarm_0.gml +++ b/objects/obj_battle_cleanup/Alarm_0.gml @@ -1,5 +1,5 @@ if (sprite_exists(custom_box_sprite)) - sprite_destroy(custom_box_sprite); + sprite_delete(custom_box_sprite); if (instance_exists(self)) instance_destroy(); \ No newline at end of file diff --git a/objects/obj_battlecontroller/Step_0.gml b/objects/obj_battlecontroller/Step_0.gml index 3514e8cd..14352c79 100644 --- a/objects/obj_battlecontroller/Step_0.gml +++ b/objects/obj_battlecontroller/Step_0.gml @@ -195,11 +195,7 @@ if (global.myfight == 0) break; case 4: // DEFEND - scr_tensionheal(40); - - global.faceaction[global.charturn] = 4; - global.charaction[global.charturn] = 10; - scr_nexthero(); + scr_defend() break; } } diff --git a/objects/obj_spellphase/Create_0.gml b/objects/obj_spellphase/Create_0.gml index c1c358cf..e43b7f15 100644 --- a/objects/obj_spellphase/Create_0.gml +++ b/objects/obj_spellphase/Create_0.gml @@ -4,5 +4,6 @@ spelltotal = 0; char = 0; castyet = 0; re_castyet = 0; -active = 0; +active = false; +spellwriter = noone alarm[0] = 5; diff --git a/objects/obj_spellphase/Step_0.gml b/objects/obj_spellphase/Step_0.gml index 7b69766b..447a1b6a 100644 --- a/objects/obj_spellphase/Step_0.gml +++ b/objects/obj_spellphase/Step_0.gml @@ -1,5 +1,4 @@ -if (active == 1) -{ +if (active == 1){ spelltimer += 1; if (spelltimer >= global.spelldelay && i_ex(spellwriter) == false) @@ -72,4 +71,4 @@ if (active == 1) instance_destroy(); } } -} +} \ No newline at end of file diff --git a/options/android/options_android.yy b/options/android/options_android.yy index e98feda9..b41d2cb7 100644 --- a/options/android/options_android.yy +++ b/options/android/options_android.yy @@ -82,4 +82,4 @@ "option_android_version":"1.0.0.0", "resourceType":"GMAndroidOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy index 2bcb9635..c150e79a 100644 --- a/options/html5/options_html5.yy +++ b/options/html5/options_html5.yy @@ -32,4 +32,4 @@ "option_html5_webgl":2, "resourceType":"GMHtml5Options", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index 8fa17d9b..3e04c84c 100644 --- a/options/ios/options_ios.yy +++ b/options/ios/options_ios.yy @@ -46,4 +46,4 @@ "option_ios_version":"1.0.0.0", "resourceType":"GMiOSOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index de5a1b89..1591b8a0 100644 --- a/options/linux/options_linux.yy +++ b/options/linux/options_linux.yy @@ -23,4 +23,4 @@ "option_linux_version":"1.0.0.0", "resourceType":"GMLinuxOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index 63739eca..52df0242 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -35,4 +35,4 @@ "option_mac_x86_64":true, "resourceType":"GMMacOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 7d988953..39290614 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -26,4 +26,4 @@ "option_window_colour":255, "resourceType":"GMMainOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy index 44ffa0f0..7e611090 100644 --- a/options/operagx/options_operagx.yy +++ b/options/operagx/options_operagx.yy @@ -27,4 +27,4 @@ "option_operagx_version":"1.0.0.0", "resourceType":"GMOperaGXOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy index abd6ee8b..06825875 100644 --- a/options/tvos/options_tvos.yy +++ b/options/tvos/options_tvos.yy @@ -28,4 +28,4 @@ "option_tvos_version":"1.0.0.0", "resourceType":"GMtvOSOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 683960fb..08d667c0 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -34,4 +34,4 @@ "option_windows_vsync":false, "resourceType":"GMWindowsOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/scripts/scr_charbox/scr_charbox.gml b/scripts/scr_charbox/scr_charbox.gml index e8eb88f3..cf6aa93d 100644 --- a/scripts/scr_charbox/scr_charbox.gml +++ b/scripts/scr_charbox/scr_charbox.gml @@ -1,5 +1,4 @@ -function scr_charbox() -{ +function scr_charbox(){ for (c = 0; c < DRHero.__MAX__; c += 1) { if (havechar[c] == 1) diff --git a/scripts/scr_debugging_config/scr_debugging_config.gml b/scripts/scr_debugging_config/scr_debugging_config.gml index 734d5701..83e03f79 100644 --- a/scripts/scr_debugging_config/scr_debugging_config.gml +++ b/scripts/scr_debugging_config/scr_debugging_config.gml @@ -1,2 +1,2 @@ function scr_debug() { return DEBUGMODE; } -function scr_debug_get_start_room() { global.darkzone = true; return keyboard_check_direct(vk_anykey) ? PLACE_MENU : room_dw_test; } \ No newline at end of file +function scr_debug_get_start_room() { global.charauto[2] = true global.charauto[3] = true global.darkzone = true; return keyboard_check_direct(vk_anykey) ? PLACE_MENU : room_dw_test; } \ No newline at end of file diff --git a/scripts/scr_defend/scr_defend.gml b/scripts/scr_defend/scr_defend.gml new file mode 100644 index 00000000..74db71a5 --- /dev/null +++ b/scripts/scr_defend/scr_defend.gml @@ -0,0 +1,9 @@ +// Script assets have changed for v2.3.0 see +// https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information +function scr_defend(char = global.charturn, nexthero = true){ + scr_tensionheal(40); + + global.faceaction[char] = 4; + global.charaction[char] = 10; + if nexthero scr_nexthero() +} \ No newline at end of file diff --git a/scripts/scr_defend/scr_defend.yy b/scripts/scr_defend/scr_defend.yy new file mode 100644 index 00000000..36d5ec21 --- /dev/null +++ b/scripts/scr_defend/scr_defend.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_defend", + "isCompatibility":false, + "isDnD":false, + "name":"scr_defend", + "parent":{ + "name":"System", + "path":"folders/DELTARUNE/Scripts/Battle/System.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_encounter/scr_encounter.gml b/scripts/scr_encounter/scr_encounter.gml index c8e2b269..fe98ecc2 100644 --- a/scripts/scr_encounter/scr_encounter.gml +++ b/scripts/scr_encounter/scr_encounter.gml @@ -112,37 +112,24 @@ function scr_isphase(arg0) return __isphase; } -function scr_randomtarget() -{ - abletotarget = 1; - - if (global.charcantarget[0] == 0 && global.charcantarget[1] == 0 && global.charcantarget[2] == 0) - abletotarget = 0; +function scr_randomtarget(){ + abletotarget = false; + for (var i = 0; i < array_length(global.charcantarget) && !abletotarget; ++i) { + if global.charcantarget[i] abletotarget = true + } - mytarget = choose(0, 1, 2); + mytarget = irandom(array_length(global.charcantarget)-1); - if (abletotarget == 1) - { - while (global.charcantarget[mytarget] == 0) - mytarget = choose(0, 1, 2); - } + if (abletotarget) + while (global.charcantarget[mytarget] == false) mytarget = irandom(array_length(global.charcantarget)-1); else - { mytarget = 3; - } - global.targeted[mytarget] = 1; + global.targeted[mytarget] = true; - if (global.chapter >= 2 && mytarget != 3) - { - if (global.charcantarget[0]) - global.targeted[0] = 1; - - if (global.charcantarget[1]) - global.targeted[1] = 1; - - if (global.charcantarget[2]) - global.targeted[2] = 1; + if (global.chapter >= 2 && mytarget != 3) { + for (var i = 0; i < array_length(global.charcantarget); ++i) + if global.charcantarget[i] global.targeted[i] = true mytarget = 4; } diff --git a/scripts/scr_gamestart/scr_gamestart.gml b/scripts/scr_gamestart/scr_gamestart.gml index 55b41b36..140120ae 100644 --- a/scripts/scr_gamestart/scr_gamestart.gml +++ b/scripts/scr_gamestart/scr_gamestart.gml @@ -95,7 +95,7 @@ function scr_gamestart() { global.heromakex[i] = 100; global.heromakey[i] = 200; - global.charauto[i] = 0; + global.charauto[i] = false; global.charmove[i] = 0; global.charcantarget[i] = 0; global.chardead[i] = 0; diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index aa559210..cba80d30 100644 --- a/scripts/scr_heroes_config/scr_heroes_config.gml +++ b/scripts/scr_heroes_config/scr_heroes_config.gml @@ -707,4 +707,20 @@ function scr_character_darkmenu_geticondatareader(charIdx) { } return slots } +} + +function scr_character_autotype(charIdx) { + /* ==== Auto Types ==== + 0: Idle, No Argument, + 1: Attack, DamagePoints, + 2: Spell, Slot, + 3: Item, ItemSlot, (Not Implemented) + 4: Defend, No Argument + 6: Action, ActId, (Not Implemented) + 10: Spare, No Argument, + */ + switch charIdx { + default: return [0] // Idle. + case DRCharacter.Susie: return [1, 160] + } } \ No newline at end of file diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 75634723..68a12517 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -68,20 +68,8 @@ function scr_mnendturn() } } - if (global.charmove[0] == 0 || global.charauto[global.char[0]] == 1) - global.charturn = 1; - - if (global.charturn == 1) - { - if (global.charmove[1] == 0 || global.charauto[global.char[1]] == 1) - global.charturn = 2; - } - - if (global.charturn == 2) - { - if (global.charmove[2] == 0 || global.charauto[global.char[2]] == 1) - skip = 1; - } + global.charturn = -1 + scr_nexthero() for (i = 0; i < 3; i += 1) { @@ -108,9 +96,8 @@ function scr_mnendturn() acting[i] = 0; } - if (skip == 1) - { - if (global.char[0] == DRCharacter.Susie && global.charauto[DRCharacter.Susie] == 1) + if (skip == 1) { + if (global.char[0] == DRCharacter.Susie && global.charauto[DRCharacter.Susie] == 1) { global.acting[0] = 1; global.myfight = 3; @@ -127,48 +114,55 @@ function scr_mnendturn() } } -function scr_endturn() -{ - for (i = 0; i < 12; i += 1) - global.item[i] = tempitem[i][global.charturn]; +function scr_endturn(){ + if global.charturn < array_length(tempitem[i]) + for (i = 0; i < 12; i += 1) global.item[i] = tempitem[i][global.charturn]; for (i = 0; i < 12; i += 1) - { for (j = 0; j < 3; j += 1) tempitem[i][j] = global.item[i]; - } - - moveswapped = 0; - with (obj_writer) - instance_destroy(); - - with (obj_face) - instance_destroy(); + moveswapped = false; - with (obj_smallface) - instance_destroy(); + with (obj_writer) instance_destroy(); + with (obj_face) instance_destroy(); + with (obj_smallface) instance_destroy(); - global.attacking = 0; + global.attacking = false; - for (i = 0; i < 3; i += 1) - { + for (i = 0; i < 3; i += 1) { global.monsterattackname[i] = " "; + var character = global.char[i] - if (global.charauto[global.char[i]] == 1 && global.hp[global.char[i]] > 0) - { - if (global.monster[2] == 1) - global.chartarget[i] = 2; - - if (global.monster[1] == 1) - global.chartarget[i] = 1; - - if (global.monster[0] == 1) - global.chartarget[i] = 0; + if (global.charauto[character] == true && global.hp[character] > 0 && character > 0) { + var dat = scr_character_autotype(character) + global.charaction[i] = dat[0] + global.acting[i] = true + switch dat[0] { + default: break case 1: + global.charaction[i] = 0 + for (j = 0; j < array_length(global.monster); ++j) { if global.monster[j] global.chartarget[i] = j break } + break case 2: + global.charspecial[i] = global.spell[character][scr_wrap_newer(dat[1], 0, array_length(global.spell[character]))] + var lowesthp = int64(99999999) + for (j = 0; j < array_length(global.char); ++j) { + if lowesthp > global.hp[global.char[j]] { global.chartarget[i] = j lowesthp = global.hp[global.char[j]]} + } + break case 4: scr_defend(i, false) + break case 10: + global.charspecial[i] = DRSpell.Spare + global.charaction[i] = 2 + var foundone = false + for (j = 0; j < array_length(global.monster) && !foundone; ++j) { + if (global.mercymod[j] >= 100 && global.monster[j]) {foundone = true global.chartarget[i] = j} + } + if !foundone global.charaction[i] = 0 + break + } } if (global.charaction[i] == 1) - global.attacking = 1; + global.attacking = true; } __noactors = 1; @@ -280,9 +274,9 @@ function scr_nexthero() { for (var i = global.charturn + 1; i <= array_length(global.charmove) && !moveswapped; ++i) { moveswapped = true - if i >= array_length(global.charmove) endturn = true // No one Left - else if global.charmove[i] == true && scr_charcan(i) && global.acting[i] == false { - global.charturn = i + if i >= array_length(global.charmove) {endturn = true global.charturn = i} // No one Left + else if scr_charcan(i) { + global.charturn = i } else if global.char[i] > DRCharacter.None { // This Character Cannot Move. (Try Next Character) moveswapped = false show_debug_message(stringsetsub("Hero '~1' Cannot Move.", global.charname[global.char[i]])) @@ -292,10 +286,12 @@ function scr_nexthero() { if (endturn == true) scr_endturn(); if (moveswapped == true) global.bmenuno = 0; - if (global.charturn >= 0) { + if (prevturn >= 0 && !endturn) { global.temptension[global.charturn] = global.tension; for (i = 0; i < 12; i += 1) tempitem[i][global.charturn] = tempitem[i][prevturn]; } + + return endturn } function scr_prevhero() { @@ -303,14 +299,11 @@ function scr_prevhero() { moveswapped = false; if global.charturn > 0 { // No need to run Calculations if we know it'll fail anyways. - for (var i = global.charturn - 1; i >= 0; --i) { - if i >= 0 { - if scr_charcan(i) { - global.charturn = i - moveswapped = true - break - } - } else break + for (var i = global.charturn - 1; i >= 0 && !moveswapped; --i) { + if scr_charcan(i) { + global.charturn = i + moveswapped = true + } } } From aef93863b16550ff7205db1ce3cfd0ce2ee0611b Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 27 Jan 2026 12:10:28 -0800 Subject: [PATCH 36/56] Removed The Two Char Auto Sets that were forgotten about from Testing, removed commented out spareanim creation Code --- scripts/scr_debugging_config/scr_debugging_config.gml | 2 +- scripts/scr_enemy_config/scr_enemy_config.gml | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/scr_debugging_config/scr_debugging_config.gml b/scripts/scr_debugging_config/scr_debugging_config.gml index 83e03f79..734d5701 100644 --- a/scripts/scr_debugging_config/scr_debugging_config.gml +++ b/scripts/scr_debugging_config/scr_debugging_config.gml @@ -1,2 +1,2 @@ function scr_debug() { return DEBUGMODE; } -function scr_debug_get_start_room() { global.charauto[2] = true global.charauto[3] = true global.darkzone = true; return keyboard_check_direct(vk_anykey) ? PLACE_MENU : room_dw_test; } \ No newline at end of file +function scr_debug_get_start_room() { global.darkzone = true; return keyboard_check_direct(vk_anykey) ? PLACE_MENU : room_dw_test; } \ No newline at end of file diff --git a/scripts/scr_enemy_config/scr_enemy_config.gml b/scripts/scr_enemy_config/scr_enemy_config.gml index d3ece141..f2b97c92 100644 --- a/scripts/scr_enemy_config/scr_enemy_config.gml +++ b/scripts/scr_enemy_config/scr_enemy_config.gml @@ -304,14 +304,7 @@ function scr_enemy_defeatrunanimations(){ scr_createdefeatanimation(obj_defeatanim, function() { return true }) // Lowest Priorty, Default Battle Run scr_createdefeatanimation(obj_deathanim, function() { return fatal }, 10) // Only seen on Slaying Titan Spawns or using Snowgrave on Regular Enemies. scr_createdefeatanimation(obj_frozennpc, function() { return __frozen }, 60, function(instance) { instance.depth = depth instance.inbattle = true }) // Frozen Solid. - scr_createdefeatanimation(obj_spareanim, function() { return _spared }, 100, function(instance) { _spritetochangeto = sparedsprite }) // Frozen Solid. - - //spareanim = instance_create(x, y, obj_spareanim); - //spareanim.sprite_index = sprite_index; - //spareanim.sprite_index = sparedsprite; - //spareanim.image_index = 0; - //spareanim.image_xscale = image_xscale; - //spareanim.image_yscale = image_yscale; + scr_createdefeatanimation(obj_spareanim, function() { return _spared }, 100,function(instance) { _spritetochangeto = sparedsprite }) // Frozen Solid. #endregion } From 4bb00dc1b7f818422bbdd72398a2d805c4e851df Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 27 Jan 2026 12:16:56 -0800 Subject: [PATCH 37/56] Remembered to make it so you cannot Lose recruits from scr_defeatrun if it was called via sparing --- scripts/scr_turn/scr_turn.gml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 68a12517..92226675 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -605,6 +605,7 @@ function scr_defeatrun(){ if (global.flag[51 + myself] == 6) __frozen = true; if global.flag[51 + myself] == 2 _spared = true + if !_spared if (__frozen == true) { _rtext = instance_create(global.monsterx[myself], global.monstery[myself] - 40, obj_recruitanim); _rtext.image_index = 12; From bc919b86962284442d17117becf0addab77e3237 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 27 Jan 2026 12:38:24 -0800 Subject: [PATCH 38/56] Minor Edits --- objects/obj_battlecontroller/Step_0.gml | 2 +- .../scr_attack_config/scr_attack_config.gml | 19 ++++---- scripts/scr_encounter/scr_encounter.gml | 43 ++++++------------- scripts/scr_turn/scr_turn.gml | 37 ++++++++-------- 4 files changed, 43 insertions(+), 58 deletions(-) diff --git a/objects/obj_battlecontroller/Step_0.gml b/objects/obj_battlecontroller/Step_0.gml index 14352c79..75c370bd 100644 --- a/objects/obj_battlecontroller/Step_0.gml +++ b/objects/obj_battlecontroller/Step_0.gml @@ -51,7 +51,7 @@ if (victory == 1 && victoried == 0) if (global.flag[37] == 1) global.battlemsg[0] = "* You won the battle!/%"; - if (global.flag[63] == 1) + if (global.flag[63] == true) { var gainedstats = scr_levelup(); diff --git a/scripts/scr_attack_config/scr_attack_config.gml b/scripts/scr_attack_config/scr_attack_config.gml index ecb0c37f..139ee654 100644 --- a/scripts/scr_attack_config/scr_attack_config.gml +++ b/scripts/scr_attack_config/scr_attack_config.gml @@ -21,13 +21,13 @@ function scr_bullet_pattern(bulletPatternId) { var yy = lengthdir_y(radius, dir); // bullet maker, check out obj_dbullet_maker which you can use as a base - bm = instance_create(obj_heart.x + 8 + xx, obj_heart.y + 8 + yy, obj_dbullet_maker); - bm.grazepoints = grazepoints; - bm.damage = damage; - bm.target = target; + if i_ex(obj_heart) { + bm = instance_create(obj_heart.x + 8 + xx, obj_heart.y + 8 + yy, obj_dbullet_maker); + scr_bullet_inherit(bm) - if bm.y < __view_get(e__VW.YView, 0) + 40 - bm.y = __view_get(e__VW.YView, 0) + 40; + if bm.y < cameray() + 40 + bm.y = cameray() + 40; + } break; } @@ -41,9 +41,10 @@ function scr_bullet_pattern(bulletPatternId) { if choose(0, 1, 2, 3) == 3 xx = -10 + random(20); - d = instance_create(obj_heart.x + 8 + xx, obj_heart.y + 8 + yy, obj_dbullet_vert); - d.damage = damage; - d.target = target; + if i_ex(obj_heart) { + d = instance_create(obj_heart.x + 8 + xx, obj_heart.y + 8 + yy, obj_dbullet_vert); + scr_bullet_inherit(d) + } break; } diff --git a/scripts/scr_encounter/scr_encounter.gml b/scripts/scr_encounter/scr_encounter.gml index fe98ecc2..1fe8da49 100644 --- a/scripts/scr_encounter/scr_encounter.gml +++ b/scripts/scr_encounter/scr_encounter.gml @@ -354,38 +354,21 @@ function scr_blconskip(arg0) } } -function scr_bullet_inherit(arg0) -{ - if (i_ex(arg0)) - { - if (damage != -1) - arg0.damage = damage; - - if (grazepoints != -1) - arg0.grazepoints = grazepoints; - - if (timepoints != -1) - arg0.timepoints = timepoints; - - if (inv != -1) - arg0.inv = inv; - - if (target != -1) - arg0.target = target; - - if (grazed != -1) - arg0.grazed = 0; - - if (grazetimer != -1) - arg0.grazetimer = 0; - - if (object_index == obj_dbulletcontroller) - { - arg0.creatorid = creatorid; - arg0.creator = creator; +function scr_bullet_inherit(bulletinstance) { + if (i_ex(bulletinstance)) { + if (damage != -1) bulletinstance.damage = damage; + if (grazepoints != -1) bulletinstance.grazepoints = grazepoints; + if (timepoints != -1) bulletinstance.timepoints = timepoints; + if (inv != -1) bulletinstance.inv = inv; + if (target != -1) bulletinstance.target = target; + if (grazed != -1) bulletinstance.grazed = 0; + if (grazetimer != -1) bulletinstance.grazetimer = 0; + if (object_index == obj_dbulletcontroller) { + bulletinstance.creatorid = creatorid; + bulletinstance.creator = creator; } - arg0.element = element; + bulletinstance.element = element; } } diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 92226675..1a4b3998 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -600,27 +600,28 @@ function scr_defeatrun(){ __frozen = false; _spared = false if !variable_struct_exists(self, "fatal") fatal = false + if variable_struct_exists(self, "myself") { + if global.flag[51 + myself] == 6 __frozen = true + if global.flag[51 + myself] == 2 _spared = true + } if (object_is_ancestor(object_index, obj_monsterparent)) { - if (global.flag[51 + myself] == 6) __frozen = true; - if global.flag[51 + myself] == 2 _spared = true - if !_spared - if (__frozen == true) { - _rtext = instance_create(global.monsterx[myself], global.monstery[myself] - 40, obj_recruitanim); - _rtext.image_index = 12; - if (recruitable == true) global.flag[global.monstertype[myself] + 600] = -1; - - global.flag[63] = true; - } else if (recruitable == true && global.flag[61] == false) { - global.flag[63] = true; - - if (global.flag[global.monstertype[myself] + 600] != -1) { - global.flag[global.monstertype[myself] + 600] = -1; - _rtext = instance_create(global.monsterx[myself], global.monstery[myself] - 40, obj_recruitanim); - _rtext.image_index = 7; - } - } + var messageanimindex = -1 + var brokenbond = true // By default a Bond is likely broken. + + if __frozen messageanimindex = 12 // Make Status Text "Frozen." + if _spared brokenbond = false + + if brokenbond { + if messageanimindex < 0 messageanimindex = 7 + global.flag[63] = true; + if (global.flag[global.monstertype[myself] + 600] != -1 && recruitable) global.flag[global.monstertype[myself] + 600] = -1; + } + if messageanimindex >= 0 { + _rtext = instance_create(global.monsterx[myself], global.monstery[myself] - 40, obj_recruitanim); + _rtext.image_index = messageanimindex; + } } else fatal = false From c33b4c07e70b44b6d2ecc19b013618712ea73fcf Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 27 Jan 2026 17:21:02 -0800 Subject: [PATCH 39/56] Minor Changes, Readded the ability for weapons to have Multiple Bolts --- objects/obj_attackpress/Create_0.gml | 49 ++++------- objects/obj_attackpress/Draw_0.gml | 83 ++++++------------- objects/obj_attackpress/Other_11.gml | 9 +- scripts/ossafe/ossafe.gml | 79 +++++++----------- scripts/scr_darksize/scr_darksize.gml | 8 +- scripts/scr_marker/scr_marker.gml | 32 +++---- scripts/scr_weaponinfo/scr_weaponinfo.gml | 5 +- .../scr_weapons_config/scr_weapons_config.gml | 3 +- 8 files changed, 92 insertions(+), 176 deletions(-) diff --git a/objects/obj_attackpress/Create_0.gml b/objects/obj_attackpress/Create_0.gml index c5fcbb78..8145e113 100644 --- a/objects/obj_attackpress/Create_0.gml +++ b/objects/obj_attackpress/Create_0.gml @@ -128,33 +128,24 @@ if (havechar[1] == 1 && havechar[2] == 0) boltgap = 20; boltspeed = 8; boltx = 0; -points[0] = 0; -points[1] = 0; -points[2] = 0; -pressbuffer[0] = 0; -pressbuffer[1] = 0; -pressbuffer[2] = 0; -pressbuffer[3] = 0; -charbolt[0] = 1; -charbolt[1] = 1; -charbolt[2] = 1; - -for (i = 0; i < 3; i += 1) -{ - if (havechar[i] == 0) - charbolt[i] = 0; + +for (var i = 1; i < DRCharacter.__MAX__; ++i) { + pressbuffer[i-1] = 0; +} + +bolttotal = 0 +for (var i = 0; i < array_length(global.char); ++i) { + boltuse[i] = 0 + points[i] = 0 + charbolt[i] = 0 + if havechar[i] charbolt[i] = global.itembolts[global.char[i]][0] + attacked[i] = false + bolttotal += charbolt[i] } -attacked[0] = 0; -attacked[1] = 0; -attacked[2] = 0; -bolttotal = charbolt[0] + charbolt[1] + charbolt[2]; boltxoff = 0; my_method = 1; boltnum = 1; -boltuse[0] = 0; -boltuse[1] = 0; -boltuse[2] = 0; lastbolt = -1; boltchar[0] = -1; diff = 10; @@ -164,20 +155,16 @@ if (global.flag[13] == 0) if (my_method == 1) { - for (i = 0; i < bolttotal; i += 1) - { - boltalive[i] = 1; + for (i = 0; i < bolttotal; i += 1) { + boltalive[i] = true; c = choose(0, 1, 2); - while (havechar[c] == 0) - c = choose(0, 1, 2); + while (havechar[c] == 0) c = choose(0, 1, 2); - while (boltuse[c] >= charbolt[c]) - { + while (boltuse[c] >= charbolt[c]) { c = choose(0, 1, 2); - while (havechar[c] == 0) - c = choose(0, 1, 2); + while (havechar[c] == 0) c = choose(0, 1, 2); } boltchar[i] = c; diff --git a/objects/obj_attackpress/Draw_0.gml b/objects/obj_attackpress/Draw_0.gml index 26cd8b76..88c49f70 100644 --- a/objects/obj_attackpress/Draw_0.gml +++ b/objects/obj_attackpress/Draw_0.gml @@ -29,18 +29,16 @@ if (maxdelaytimer >= maxdelay) if (active == 1) { - for (i = 0; i < 3; i += 1) - { + for (i = 0; i < 3; i += 1) { + if (havechar[0] == 1 || havechar[1] == 1 || havechar[2] == 1) { draw_set_color(bcolor); - if (i == 1 || i == 2) - draw_rectangle(x + 77, y + (38 * i), x + 300, y + (38 * i) + 1, false); + if (i == 1 || i == 2) draw_rectangle(x + 77, y + (38 * i), x + 300, y + (38 * i) + 1, false); } - if (global.char[i] != DRCharacter.None && global.charauto[global.char[i]] == 0 && havechar[i] == 1) - { + if (global.char[i] != DRCharacter.None && global.charauto[global.char[i]] == false && havechar[i] == true) { draw_set_color(bcolor); j = global.char[i]; fullbox = 0; @@ -48,8 +46,7 @@ if (active == 1) var _col = scr_hero_get_attackbackground_color(j - 1); draw_set_color(_col); - if (pressbuffer[clamp(j, 0, 3)]) - draw_set_color(merge_color(_col, c_white, pressbuffer[clamp(j, 0, 3)] / 5)); + if (pressbuffer[clamp(j, 0, 3)]) draw_set_color(merge_color(_col, c_white, pressbuffer[clamp(j, 0, 3)] / 5)); draw_rectangle(x + 78, y + (38 * i) + 1, x + 80 + (15 * boltspeed), y + (38 * i) + 36, true); draw_rectangle(x + 79, y + (38 * i) + 2, (x + 80 + (15 * boltspeed)) - 1, y + (38 * i) + 35, true); @@ -58,11 +55,7 @@ if (active == 1) scr_hero_get_nameplate(j - 1); draw_sprite(headspr, 0, x + 4, y + (38 * i) + 7); - if (global.flag[13] == 0) - draw_sprite(spr_pressfront_b, 0, x, y + (38 * i)); - - if (global.flag[13] == 1) - draw_sprite(spr_pressfront_b, i, x, y + (38 * i)); + draw_sprite(spr_pressfront_b, i * real(global.flag[13]), x, y + (38 * i)); //draw_sprite(spr_pressspot, j - 1, x + 80, y + (38 * i)); //draw_sprite(spr_pressspot, 4, x + 80, y + (38 * i)); @@ -87,12 +80,10 @@ if (active == 1) if (my_method == 1) { - for (i = 0; i < bolttotal; i += 1) - { + for (i = 0; i < bolttotal; i += 1) { offset = boltchar[i]; - if ((boltframe[i] - boltx) < -5) - boltalive[i] = 0; + if ((boltframe[i] - boltx) < -5) boltalive[i] = false; boltalpha = 1; @@ -111,18 +102,15 @@ if (active == 1) } } - if (boltalive[i] == 1) - { + if (boltalive[i] == true) { draw_sprite_ext(spr_attackspot, 0, (x + 80 + (boltframe[i] * boltspeed)) - (boltx * boltspeed), y + (38 * offset), 1, 1, 0, c_white, boltalpha); boltcount[boltchar[i]] += 1; } } - for (i = 0; i < 3; i += 1) - { - if (boltcount[i] == 0 && havechar[i] == 1 && attacked[i] == 0) - { - attacked[i] = 1; + for (i = 0; i < 3; i += 1) { + if (boltcount[i] == 0 && havechar[i] == true && attacked[i] == false) { + attacked[i] = true; target = i; event_user(1); } @@ -131,21 +119,12 @@ if (active == 1) if (scr_monsterpop() > 0) { - if (global.flag[13] == 1) - { - if (button1_p() && havechar[0] == 1) - scr_boltcheck(0); - - if (button2_p() && havechar[1] == 1) - scr_boltcheck(1); - - if (button3_p() && havechar[2] == 1) - scr_boltcheck(2); - } - else if (button1_p()) - { - scr_boltcheck_onebutton(); + if (global.flag[13] == true) { // Scrapped ZXC Attacking. + if (button1_p() && havechar[0] == true) scr_boltcheck(0); + if (button2_p() && havechar[1] == true) scr_boltcheck(1); + if (button3_p() && havechar[2] == true) scr_boltcheck(2); } + else if (button1_p()) scr_boltcheck_onebutton(); } else { @@ -157,30 +136,20 @@ if (active == 1) imagetimer += 1; boltx += 1; - pressbuffer[0] -= 1; - pressbuffer[1] -= 1; - pressbuffer[2] -= 1; - pressbuffer[3] -= 1; + + for (var i = 0; i < array_length(pressbuffer); ++i) pressbuffer[i]-- - if (imagetimer > 1) - imagetimer = 0; + if (imagetimer > 1) imagetimer = 0; - goahead = 0; + goahead = true; - if (attacked[0] == 1 || havechar[0] == 0) - { - if (attacked[1] == 1 || havechar[1] == 0) - { - if (attacked[2] == 1 || havechar[2] == 0) - goahead = 1; - } - } + for (var i = 0; i < array_length(havechar) && goahead; ++i) { + if havechar[i] && !attacked[i] goahead = false // Let AutoChars Attack + } - if (scr_monsterpop() == 0) - goahead = 1; + if (scr_monsterpop() == 0) goahead = true; - if (goahead == 1) - { + if (goahead == true) { posttimer += 1; for (i = 0; i < array_length(haveauto); ++i) { diff --git a/objects/obj_attackpress/Other_11.gml b/objects/obj_attackpress/Other_11.gml index e88f4256..58f590da 100644 --- a/objects/obj_attackpress/Other_11.gml +++ b/objects/obj_attackpress/Other_11.gml @@ -1,7 +1,8 @@ -if (scr_monsterpop() > 0) -{ - for (i = 0; i < 3; i += 1) - { +if (scr_monsterpop() > 0) { + if target > 0 && target < array_length(global.charinstance) { + + } + for (i = 0; i < 3; i += 1) { if (target == i) { if (i_ex(global.charinstance[i])) diff --git a/scripts/ossafe/ossafe.gml b/scripts/ossafe/ossafe.gml index a5ee6581..c6792f65 100644 --- a/scripts/ossafe/ossafe.gml +++ b/scripts/ossafe/ossafe.gml @@ -1,5 +1,4 @@ -function ossafe_fill_rectangle(arg0, arg1, arg2, arg3, arg4) -{ +function ossafe_fill_rectangle(arg0, arg1, arg2, arg3, arg4){ var x1 = arg0; var y1 = arg1; var x2 = arg2; @@ -32,10 +31,9 @@ function ossafe_fill_rectangle(arg0, arg1, arg2, arg3, arg4) draw_rectangle(x1, y1, x2, y2, outline); } -function setxy(arg0, arg1) -{ - x = arg0; - y = arg1; +function setxy(x, y){ + self.x = x; + self.y = y; } function draw_background_tiled_ext(arg0, arg1, arg2, arg3, arg4, arg5, arg6) @@ -43,14 +41,12 @@ function draw_background_tiled_ext(arg0, arg1, arg2, arg3, arg4, arg5, arg6) draw_sprite_tiled_ext(arg0, 0, arg1, arg2, arg3, arg4, arg5, arg6); } -function scr_moveheart() -{ +function scr_moveheart(){ global.inv = 0; return instance_create(obj_herokris.x + 10, obj_herokris.y + 40, obj_moveheart); } -function ossafe_ini_open(arg0) -{ +function ossafe_ini_open(arg0){ if (!global.is_console) { ini_open(arg0); @@ -84,9 +80,8 @@ function ossafe_ini_close() } } -function draw_background_ext(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) -{ - draw_sprite_ext(arg0, 0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); +function draw_background_ext(sprite, x, y, xscale, yscale, rot = 0, col = c_white, alpha = 1){ + draw_sprite_ext(sprite, 0, x, y, xscale, yscale, rot, col, alpha); } function ossafe_file_text_open_read(arg0) @@ -227,13 +222,8 @@ function scr_ds_list_read(arg0) return new_list; } -function safe_delete(arg0) -{ - if (i_ex(arg0)) - { - with (arg0) - instance_destroy(); - } +function safe_delete(instance) { + if i_ex(instance) with (instance) instance_destroy(); } function ossafe_file_delete(arg0) @@ -402,13 +392,11 @@ function scr_timedisp(frames) { var hourstring = string(hours) + ":"; var minstring = string(remmins) + ":"; - if (remmins < 10) - minstring = "0" + minstring; + if (remmins < 10) minstring = "0" + minstring; var secstring = string(floor(seconds)); - if (seconds < 10) - secstring = "0" + secstring; + if (seconds < 10) secstring = "0" + secstring; var timedisp = hourstring + minstring + secstring; return timedisp; @@ -418,8 +406,7 @@ function scr_chapterswitch(chapter = 0) { var parameters = get_chapter_switch_parameters(); if code_is_compiled() return show_message("YoYoCompiled Games are not Compatible with game_change due to all code being in the exe, Chapter Switching Cannot Continue."); if (chapter == 0) { - switch (os_type) - { + switch (os_type) { case os_windows: game_change("/../", "-game data.win" + parameters); break; @@ -486,54 +473,44 @@ function scr_prefetch_textures() } } -function scr_windowcaption(ch1_title) -{ +function scr_windowcaption(ch1_title){ if (global.tempflag[10] != 1 && global.chapter == 1) window_set_caption(ch1_title); else window_set_caption("DELTARUNE Chapter " + string(global.chapter)); } -function d_arrow(arg0, arg1, arg2, arg3, arg4) -{ +function d_arrow(x1, y1, x2, y2, size){ var off = (os_type == os_ps4 || os_type == os_ps5) ? 1 : 0; - draw_arrow(arg0 + off, arg1 + off, arg2 + off, arg3 + off, arg4); + draw_arrow(x1 + off, y1 + off, x2 + off, y2 + off, size); } -function d_circle(arg0, arg1, arg2, arg3) -{ +function d_circle(x, y, radius, outline){ var off = (os_type == os_ps4 || os_type == os_ps5) ? 1 : 0; - draw_circle(arg0 + off, arg1 + off, arg2, arg3); + draw_circle(x + off, y + off, radius, outline); } -function d_circle_color(arg0, arg1, arg2, arg3, arg4, arg5) -{ +function d_circle_color(x, y, radius, color1, color2, outline){ var off = (os_type == os_ps4 || os_type == os_ps5) ? 1 : 0; - draw_circle_color(arg0 + off, arg1 + off, arg2, arg3, arg4, arg5); + draw_circle_color(x + off, y + off, radius, color1, color2, outline); } -function d_circle_colour(arg0, arg1, arg2, arg3, arg4, arg5) -{ - var off = (os_type == os_ps4 || os_type == os_ps5) ? 1 : 0; - draw_circle_colour(arg0 + off, arg1 + off, arg2, arg3, arg4, arg5); +function d_circle_colour(x, y, radius, color1, color2, outline){ + return d_circle_color(x, y, radius, color1, color2, outline) } -function d_ellipse(arg0, arg1, arg2, arg3, arg4) -{ +function d_ellipse(x1, y1, x2, y2, outline){ var off = (os_type == os_ps4 || os_type == os_ps5) ? 1 : 0; - draw_ellipse(arg0 + off, arg1 + off, arg2 + off, arg3 + off, arg4); + draw_ellipse(x1 + off, y1 + off, x2 + off, y2 + off, outline); } -function d_ellipse_color(arg0, arg1, arg2, arg3, arg4, arg5, arg6) -{ +function d_ellipse_color(x1, y1, x2, y2, color1, color2, outline){ var off = (os_type == os_ps4 || os_type == os_ps5) ? 1 : 0; - draw_ellipse_color(arg0 + off, arg1 + off, arg2 + off, arg3 + off, arg4, arg5, arg6); + draw_ellipse_color(x1 + off, y1 + off, x2 + off, y2 + off, color1, color2, outline); } -function d_ellipse_colour(arg0, arg1, arg2, arg3, arg4, arg5, arg6) -{ - var off = (os_type == os_ps4 || os_type == os_ps5) ? 1 : 0; - draw_ellipse_colour(arg0 + off, arg1 + off, arg2 + off, arg3 + off, arg4, arg5, arg6); +function d_ellipse_colour(x1, y1, x2, y2, color1, color2, outline){ + return d_ellipse_color(x1, y1, x2, y2, color1, color2, outline); } function d_line(arg0, arg1, arg2, arg3) diff --git a/scripts/scr_darksize/scr_darksize.gml b/scripts/scr_darksize/scr_darksize.gml index b544dab5..e37d7353 100644 --- a/scripts/scr_darksize/scr_darksize.gml +++ b/scripts/scr_darksize/scr_darksize.gml @@ -1,10 +1,4 @@ -function scr_darksize() -{ - var inst = id; - - if (argument_count) - inst = argument0; - +function scr_darksize(inst = id){ inst.image_xscale = 2; inst.image_yscale = 2; } diff --git a/scripts/scr_marker/scr_marker.gml b/scripts/scr_marker/scr_marker.gml index 53d5f072..26405c73 100644 --- a/scripts/scr_marker/scr_marker.gml +++ b/scripts/scr_marker/scr_marker.gml @@ -1,27 +1,17 @@ -function scr_marker(arg0, arg1, arg2) -{ - thismarker = instance_create(arg0, arg1, obj_marker); +function scr_marker(x, y, sprite){ + thismarker = instance_create(x, y, obj_marker); - with (thismarker) - { - sprite_index = arg2; - image_speed = 0; - } + with (thismarker){ + sprite_index = sprite; + image_speed = 0; + } - return thismarker; + return thismarker; } -function scr_dark_marker(arg0, arg1, arg2) -{ - thismarker = instance_create(arg0, arg1, obj_marker); +function scr_dark_marker(x, y, sprite){ + thismarker = scr_marker(x, y, sprite); + scr_darksize(thismarker) - with (thismarker) - { - sprite_index = arg2; - image_speed = 0; - image_xscale = 2; - image_yscale = 2; - } - - return thismarker; + return thismarker; } diff --git a/scripts/scr_weaponinfo/scr_weaponinfo.gml b/scripts/scr_weaponinfo/scr_weaponinfo.gml index 52c29bdc..e03c5f8b 100644 --- a/scripts/scr_weaponinfo/scr_weaponinfo.gml +++ b/scripts/scr_weaponinfo/scr_weaponinfo.gml @@ -1,8 +1,7 @@ function scr_weaponinfo_mine() { - for (i = 0; i < 6; i += 1) - { - scr_weaponinfo(global.charweapon[i]); + for (i = 0; i < DRCharacter.__MAX__; i += 1) { + scr_weaponinfo(global.charweapon[i], i); charweaponname[i] = weaponnametemp; charweapondesc[i] = weapondesctemp; charweaponat[i] = weaponattemp; diff --git a/scripts/scr_weapons_config/scr_weapons_config.gml b/scripts/scr_weapons_config/scr_weapons_config.gml index e6eb7129..c7b560a4 100644 --- a/scripts/scr_weapons_config/scr_weapons_config.gml +++ b/scripts/scr_weapons_config/scr_weapons_config.gml @@ -41,8 +41,7 @@ enum DRWeapon { AbsorbAx = 54, } -function scr_weaponinfo(weaponid) -{ +function scr_weaponinfo(weaponid, character = -1){ weaponnametemp = " "; weapondesctemp = " "; From 4a561007eb914b617f57692696e1454260364704 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 27 Jan 2026 20:48:31 -0800 Subject: [PATCH 40/56] Updated Default Game Icon to not use GMS2-Beta GMS2Project Icon, but instead use the Icon Deltarune Normally Uses --- options/android/icons/hdpi.png | Bin 0 -> 1041 bytes options/android/icons/ldpi.png | Bin 0 -> 732 bytes options/android/icons/mdpi.png | Bin 0 -> 1014 bytes options/android/icons/xhdpi.png | Bin 0 -> 811 bytes options/android/icons/xxhdpi.png | Bin 0 -> 1418 bytes options/android/icons/xxxhdpi.png | Bin 0 -> 1175 bytes options/android/options_android.yy | 14 +++---- options/html5/fav.ico | Bin 0 -> 1253 bytes options/html5/options_html5.yy | 2 +- options/ios/icons/app/ipad_152.png | Bin 0 -> 1426 bytes options/ios/icons/app/ipad_76.png | Bin 0 -> 974 bytes options/ios/icons/app/ipad_pro_167.png | Bin 0 -> 2396 bytes options/ios/icons/app/iphone_120.png | Bin 0 -> 1274 bytes options/ios/icons/app/iphone_180.png | Bin 0 -> 2559 bytes options/ios/icons/itunes/itunes_1024.png | Bin 0 -> 19191 bytes options/ios/icons/notification/ipad_20.png | Bin 0 -> 490 bytes options/ios/icons/notification/ipad_40.png | Bin 0 -> 863 bytes options/ios/icons/notification/iphone_40.png | Bin 0 -> 863 bytes options/ios/icons/notification/iphone_60.png | Bin 0 -> 868 bytes options/ios/icons/settings/ipad_29.png | Bin 0 -> 571 bytes options/ios/icons/settings/ipad_58.png | Bin 0 -> 983 bytes options/ios/icons/settings/iphone_58.png | Bin 0 -> 983 bytes options/ios/icons/settings/iphone_87.png | Bin 0 -> 1270 bytes options/ios/icons/spotlight/ipad_40.png | Bin 0 -> 863 bytes options/ios/icons/spotlight/ipad_80.png | Bin 0 -> 1117 bytes options/ios/icons/spotlight/iphone_120.png | Bin 0 -> 1274 bytes options/ios/icons/spotlight/iphone_80.png | Bin 0 -> 1117 bytes options/ios/options_ios.yy | 38 +++++++++---------- options/linux/icons/64.png | Bin 0 -> 621 bytes options/linux/options_linux.yy | 2 +- options/mac/icons/1024.png | Bin 0 -> 19191 bytes options/mac/options_mac.yy | 4 +- options/mac/splash/installer_background.png | Bin 0 -> 5020 bytes options/main/options_main.yy | 2 +- options/main/template_icon.png | Bin 0 -> 2388 bytes options/tvos/icons/1280.png | Bin 0 -> 8783 bytes options/tvos/icons/400.png | Bin 0 -> 1790 bytes options/tvos/icons/400_2x.png | Bin 0 -> 6145 bytes options/tvos/options_tvos.yy | 6 +-- options/windows/icons/icon.ico | Bin 0 -> 1253 bytes options/windows/options_windows.yy | 2 +- 41 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 options/android/icons/hdpi.png create mode 100644 options/android/icons/ldpi.png create mode 100644 options/android/icons/mdpi.png create mode 100644 options/android/icons/xhdpi.png create mode 100644 options/android/icons/xxhdpi.png create mode 100644 options/android/icons/xxxhdpi.png create mode 100644 options/html5/fav.ico create mode 100644 options/ios/icons/app/ipad_152.png create mode 100644 options/ios/icons/app/ipad_76.png create mode 100644 options/ios/icons/app/ipad_pro_167.png create mode 100644 options/ios/icons/app/iphone_120.png create mode 100644 options/ios/icons/app/iphone_180.png create mode 100644 options/ios/icons/itunes/itunes_1024.png create mode 100644 options/ios/icons/notification/ipad_20.png create mode 100644 options/ios/icons/notification/ipad_40.png create mode 100644 options/ios/icons/notification/iphone_40.png create mode 100644 options/ios/icons/notification/iphone_60.png create mode 100644 options/ios/icons/settings/ipad_29.png create mode 100644 options/ios/icons/settings/ipad_58.png create mode 100644 options/ios/icons/settings/iphone_58.png create mode 100644 options/ios/icons/settings/iphone_87.png create mode 100644 options/ios/icons/spotlight/ipad_40.png create mode 100644 options/ios/icons/spotlight/ipad_80.png create mode 100644 options/ios/icons/spotlight/iphone_120.png create mode 100644 options/ios/icons/spotlight/iphone_80.png create mode 100644 options/linux/icons/64.png create mode 100644 options/mac/icons/1024.png create mode 100644 options/mac/splash/installer_background.png create mode 100644 options/main/template_icon.png create mode 100644 options/tvos/icons/1280.png create mode 100644 options/tvos/icons/400.png create mode 100644 options/tvos/icons/400_2x.png create mode 100644 options/windows/icons/icon.ico diff --git a/options/android/icons/hdpi.png b/options/android/icons/hdpi.png new file mode 100644 index 0000000000000000000000000000000000000000..a4fedad9c3c11bf0daaefa08ccacade262c87289 GIT binary patch literal 1041 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!3dtTpz6=aiY77hwEes65fI|H*Yfq|LD)5S5Q;?~>QZwnV2 z2(-o9gg01QmM2&hSWOCuPvW-f&;Onl{oHXkFDY5E<%?b&(+_u!yZ z-(IfY{nuv=yTCT{omS81NiCTCH^(Bo;M~f#J-miYryMWKI`3h0xL*25*S5bn&*5L5 zUzY5p$0pl8{&%|cT48Dmmr_L0h3qrW-$igZrmiUoH|#f#+?vIqm?GNir$()xF<)cW*e6D6@q3&(@8KZUs(>QFA-K|7E-MT63xF zG6kkEp02&#TP>x$Yo~p=D&lgWNI;!USI1>`Y)f%o+Wsr)o<63mf*XsrEQo0Kenj1nzJo7E0|gPR`kU> z=|}ACXWyrt&VBgn&B29J)c9`gT6TAnTOLmd>a4J< z-_-o9;8kLN1*`hzyh_zQ;_Snep5bx7eaaU>vm>`QuF9)z(cRplWXLL5AiKr$YzDvA z)_J~&&YmX)&JZM!7W7>qPaeZ>@kkFM-<4ifIy|Kbbzwx8J|aY&jz^hp3jgMwFx^mZVxG7o`Fz1|tI_GhG8iT_cMS z0~0F~Gb9nO2Eg!v{Yq R;SW#`gQu&X%Q~loCIA~Wwln|$ literal 0 HcmV?d00001 diff --git a/options/android/icons/ldpi.png b/options/android/icons/ldpi.png new file mode 100644 index 0000000000000000000000000000000000000000..8c2c9a707c7915a29e278a7c1b130854f3fcf03e GIT binary patch literal 732 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_HUsu3@kvn$XBD8ZKG?e4NH);+>YehT_s6(`FZaICMgy^S)Z)J)X%Q^)A`jDt0pb=UKC6?cp-xH|-N- zGZmChTQVmo1-)H+z;CIs64x1?w6@}Py9&~~cfV&3(wVpVTPD9?tC5EK)SKohG3&3d zYPnaPb6f3uCBuYohHfnatG>B>`B1&R-#;k)(#04fR#&T8+Dk)MJz<$Sr!Vk?$k|)( zx4p|f<=hylWID&Iv_r%F&*U5YrF>G7#vuetW7$BfXjoiTF%)-Ag3zj`5`z?9S@ zcR;;C|K~le-lbs)7PVI9ds}8L*|Pbf)Pif})raDD@%Bu3sd~jXYw8(}g=(6ISIp)y zxVEzWn0Ky@jIYLIuZhvC-pp=4vBn{HUfAW=2P=-Fv^`+xjmieJAw)ADx*w z>Chr0{qB5zT^E6w&tu$xk*!+d8c~vxSdwa$T$Bo=7>o>z%ybP5b&V`S3{0#{%&d$| zv<(cb3=EEL`8gj&LvDUbW?Cg~4O?D1Dg!lWz-=hW%uOvWNz5(4t>^Kdgg-z%44$rj JF6*2UngH-;Dx?4a literal 0 HcmV?d00001 diff --git a/options/android/icons/mdpi.png b/options/android/icons/mdpi.png new file mode 100644 index 0000000000000000000000000000000000000000..80c72577b6ffc173fe01ec1a7297ba8d50c8a47b GIT binary patch literal 1014 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 G&;$T$|H6L& literal 0 HcmV?d00001 diff --git a/options/android/options_android.yy b/options/android/options_android.yy index b41d2cb7..596a5684 100644 --- a/options/android/options_android.yy +++ b/options/android/options_android.yy @@ -36,12 +36,12 @@ "option_android_icon_adaptive_xhdpi":"${base_options_dir}/android/icons_adaptive/xhdpi.png", "option_android_icon_adaptive_xxhdpi":"${base_options_dir}/android/icons_adaptive/xxhdpi.png", "option_android_icon_adaptive_xxxhdpi":"${base_options_dir}/android/icons_adaptive/xxxhdpi.png", - "option_android_icon_hdpi":"${base_options_dir}/android/icons/hdpi.png", - "option_android_icon_ldpi":"${base_options_dir}/android/icons/ldpi.png", - "option_android_icon_mdpi":"${base_options_dir}/android/icons/mdpi.png", - "option_android_icon_xhdpi":"${base_options_dir}/android/icons/xhdpi.png", - "option_android_icon_xxhdpi":"${base_options_dir}/android/icons/xxhdpi.png", - "option_android_icon_xxxhdpi":"${base_options_dir}/android/icons/xxxhdpi.png", + "option_android_icon_hdpi":"${options_dir}/android/icons/hdpi.png", + "option_android_icon_ldpi":"${options_dir}/android/icons/ldpi.png", + "option_android_icon_mdpi":"${options_dir}/android/icons/mdpi.png", + "option_android_icon_xhdpi":"${options_dir}/android/icons/xhdpi.png", + "option_android_icon_xxhdpi":"${options_dir}/android/icons/xxhdpi.png", + "option_android_icon_xxxhdpi":"${options_dir}/android/icons/xxxhdpi.png", "option_android_install_location":0, "option_android_interpolate_pixels":false, "option_android_launchscreen_fill":0, @@ -66,7 +66,7 @@ "option_android_scale":0, "option_android_screen_depth":0, "option_android_sleep_margin":4, - "option_android_splashscreen_background_colour":255, + "option_android_splashscreen_background_colour":4278190080, "option_android_splash_screens_landscape":"${base_options_dir}/android/splash/landscape.png", "option_android_splash_screens_portrait":"${base_options_dir}/android/splash/portrait.png", "option_android_splash_time":0, diff --git a/options/html5/fav.ico b/options/html5/fav.ico new file mode 100644 index 0000000000000000000000000000000000000000..32608b84031b21ec96da0b8acc4de8cb4161ae39 GIT binary patch literal 1253 zcmZQzU<5)CU}R8WIM2esAO>W22Kc%2a!GLknY^AJEbEVcb`{`|e{C-2`s?N9h+{N<)YNVMUjLfeh|ysN13J2)Ue@DX{pjxZ1DD^` z?X%loUHjmtUM+(f1BWmMs!nguIKO}6ukT;W%fDMP3Ny5DVxYfs_c6Rn?LV)L)r8;w zr2g&O|DCg7)AIkn4Y9iC$8Uyp-=?g7zcv2v&n)# ze!aim{N4Yj@&;I~|Ms4FhS}cseZTkqF28^O%jebDU8z28!##0^|1aOY{~eDt1ZR9_ zymQ8~aWi;|LyxPiZ$pe-QT@G z>-+QFI2CTYm$>hwWux@le>HyhKVuJo8yBt5nOmwCeE56y`=4+h1_3n;H0@sFzLzhG znf%kw*Xv{T`OS&ziv1EAZU5_FmtJ^Jzt-=-y#F_`nxA&uD*tsc)3-m^liCc~H=ldw z32%6AKO1Xsyvg{!y~OW9mn|;i+pG6&ZDy!*?@Pl{1^^2sFlb=@!<-iO_tv(>??9y( NgQu&X%Q~loCIHu%$728h literal 0 HcmV?d00001 diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy index c150e79a..1bcddf45 100644 --- a/options/html5/options_html5.yy +++ b/options/html5/options_html5.yy @@ -13,7 +13,7 @@ "option_html5_foldername":"html5game", "option_html5_google_analytics_enable":false, "option_html5_google_tracking_id":"", - "option_html5_icon":"${base_options_dir}/html5/fav.ico", + "option_html5_icon":"${options_dir}/html5/fav.ico", "option_html5_index":"", "option_html5_interpolate_pixels":false, "option_html5_jsprepend":"", diff --git a/options/ios/icons/app/ipad_152.png b/options/ios/icons/app/ipad_152.png new file mode 100644 index 0000000000000000000000000000000000000000..9dd0a7dc1a7438fc3b0f1c5706580d230f9b781b GIT binary patch literal 1426 zcmeAS@N?(olHy`uVBq!ia0vp^GeDSw4M<8HQcwg^3dtTpz6=aiY77hwEes65fI+Ri#zMl<5 zS|3IqVaQ>UR*^p7=I55woWgvgh49r*5<93rtdU+@yK(=>gWIK+~xoFSFzG=@rFuC zWr-ymFtmqpcZ9{6xm)@kNBr@9=GSm`yGG@?ze>TkEc$N7cj*)-&JyGaVu7O2J8K#Y zp0iY(cQ4p_Y#o1k>M>R~0}nwka-HrYf69Po>+B8HEN{e3>q;%8{3cFNN&um%4QF08 zm|piuVEPnnf5vDCC7xc3x-UyU)M&?f(&-Cz^Ht`?XTT-wfwJ=Ug^P zwJoEt?L*sLVcusX4}u~Sg1#oCEr0s(&I_kg z#iu9hu6{pp{Z_Yk%GdjxIKAa_nk=poNj^UNH;*JG4LbvPJ6dJ++SmlRxj*?mr8Uft9hkTio6q z*i*As*Vh~h`KBnXHdiFer zkz?^igXzwhclTPQ=Shj*WP_&)VA{C4gJb<>HnSkjzfTt(`+f561{EQA0?aydaNe0W zKcCA7c};%aIdSQs?5EeGy*AX(TK00$pQxMPvX2$U>|5w>{F^KLM4yQMelvGXZ|Hy0<&S%SxuYaHpP|7{w>S*8mL| z#{DnW6p0?2cKGJCb!F=L2Vs6$nI`^X&b&2^pR)U_b&Ky+AGj8y^ZfdbcSX+9d|zi4 zbhUuf9W#@N?*4n#GmBM_eR|jXz>=re-L;GRO7t0>RbjbC<49;-EkDqH30PwJ8nK&^ z_ve=P)`@@2c@96R$=m-aYJ+v8@4W-N=lI*l9fT!HPzmzjJO8hu>d6ZWgKh(PswJ)w zB`Jv|saDBFsX&Us$iT=<*T7KM$RfnR#LC3X%E(mPz`)ADAo=hoZ4?c;`6-!cmAEws n&GVWL)Sv;kp(HamwYVfPw*a>u*Y0c&pdJQKS3j3^P6|H*Yfr06ur;B4q#jUrq9!`9$ zz|(s4oY;oBF`S<1H|DCU#;9L+e0N;e&dJ~zC*!>{ztetfjFaYms>t2Qp_u-3VUD=7 zv>tESiXReB?rd-5dwrz)%hrnb(aVlsF1}a2Rdx}NXo$p#iH8sAS617|37J2iv#PUW zNv&sO?#5M@pI<3kQd{{xKWJfv7SEBlG5b3_K2%LBjSbb`6Sux-=bQHK(%AJM@2g6` z`@Z{5-tPZ;kM^$L_%QDF{osWAoLAD;iuCX^ZH?@kJ*ixR) z=C?($a=Y-tLkV{2(i4oF135w@IAqyADbCcfI(N$T-&38!vcG;VGyj$8ZkOVyTXe`_ zPR(-Rja6Qa+m~$G%>HK1+pWpG-vbjBLitwrCT6lGxSctDGhmad_~BWyZvULy8xJ_z zyPv&sxz0o9cZQ^R^FE=ihc6tM$Gz@FyW(DX-xa!cZXpsKyP`JgcwgOWoRB*`Qd8pY z^qjlFYwk|pBGF%iThMz*)S*b~0>JqmHAF7L|%s|zJoCd@cowW9RcGaga4P0u$hk5Fq07h`%^e0r0~ zY9$-_^@6%@P9Is9)jm=7g~0^9_P_~E^E_(J;xFfWuiVR~wMO{1h4?4SXB7! zXWu&ckGD%*=M#U^Z2ypcwdp4A>dWf8Pt0FzXA-!vQodNs+RXV_u~*X;kHtG5tT_8^ z>-&?UEP*Qw1Xe%zEONa{^Q=SU*~d!{IlM3scwKYg&x{Gv7L}UYI*?{xgG19lP$V)zyx6YHd8DF}02} z;N3P2?P#Oj+iG@vd$ZTf<>3^TnQJ#3IDMTq8;ZLBvgV2zhpOTqYiCcrvJg@0M4H|G8N-}d(i%Sx73vlak?auZ9>S6G7^>bP0 Hl+XkK7J;8< literal 0 HcmV?d00001 diff --git a/options/ios/icons/app/ipad_pro_167.png b/options/ios/icons/app/ipad_pro_167.png new file mode 100644 index 0000000000000000000000000000000000000000..451029383dcb3401b45a6b03c54c142ba30c3f2f GIT binary patch literal 2396 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 literal 0 HcmV?d00001 diff --git a/options/ios/icons/app/iphone_120.png b/options/ios/icons/app/iphone_120.png new file mode 100644 index 0000000000000000000000000000000000000000..ed55e5ce1cd3e894232ac0e185dd69b959a46e8f GIT binary patch literal 1274 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q{^bg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G(@^*J&_z!{$_AZ~yz`*?0)5S5Q;?~=_cXQVm z2(+Ge+ul$zsf0mRMOMnu7k|j|e;oR7I)EfSTzq;^yTW2!i$Gr7fqWb9edZN{P6gG^Cv>a1Gfhqw zwJ3|M2w`|ov~$OlE5*(n%sKCJt=90Ytghb5zJKn_SEtYFMT`0Lv49kBR{5Zlv!Tbc z_WthBTSoH|6K7rcbnk)d{qM`l`6LcGMH*NN&5+^z(_%9xkL66}hQr>^wxmx@O`KKS zrUMlB@ypw_p=#GU>s?&!PWl_tZR*&bEIK*yz>_@(3`)g|^<6bSMZO9@ePs<;G0;YJ zZJ(~=si!U8%&fC!Ub#=}run9XA{CG&b95SuA3bPYy59YJ_e=q&O}^9iX<6=9;08Hz zvZz{QP~o)V+uP>;-ImgFYn$ukoZIzgeadZ#5w-tHG&*0$Y_c!fsKZ_uZ55mq>3eRS zTXyyLtjSCFek|OX0Wv?2>3E_upLgQnFA?W%Tr0i%>iLwM$>|XqVB?h=PZmap-uzx` zR9CxA)y{pXd+Na_9$*CNcG-_ne|o_p`2eEjR5r4132UsxL3 zLe#FhQ)AZmI4xW{es{_Immdpd!sl1N-cac8r!>I*uJ!oAjEY%bR$PhJ{kj3-XXVDDJl-{7Ia~h)UhWmMDQ~=EnQjWvaJ9wL z()#PN>rv$#ekX6voUvJXliHnQ4}zZbw5tBk-~Fn;5AqOuPrdc63oCv(D&--X37?;e>RtG;HqtDO5l>icepg5}+HtRKF8 zS8g#_;&;w-{n3?f*}FdWCrYHPJQh@1b>Uv7>VC#QIdu`LAv^CJ&;GY3<&-`-@N40wJ1bA@4XU#|(F95~9tnjUyk#@4ZJE|u zW#V3b%NC+O>u=Wy?J_UZWeFZXuWA*X(UJHT^Dnu^@9ST6ao;``vCv18veuYBo!$)d z&GR)(;@+n76rWB%9LXxC4Kdkj(#m7T%l;HiV4Vz%@0HJzm$3dk_P#BP!Qp!8;X^-j zOLRq-_q^@VVLg1MRsn3T6Nh3;!2^3q{zd%1R~0<~76qy$t`Q|Ei6yC4$wjF^iowXh z$V}J3P}j&J#K6SL#LUXbRNKJ7%D^D`@F#5)4Y~O#nQ4`{H3-e~nhw;U0k@$fGdH!k ZBr&%Dw;tE-Y!9Fw22WQ%mvv4FO#pl2C42w? literal 0 HcmV?d00001 diff --git a/options/ios/icons/app/iphone_180.png b/options/ios/icons/app/iphone_180.png new file mode 100644 index 0000000000000000000000000000000000000000..eb48ed51afc23861962e4c612aa82ccb6ac82a5b GIT binary patch literal 2559 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 literal 0 HcmV?d00001 diff --git a/options/ios/icons/notification/ipad_20.png b/options/ios/icons/notification/ipad_20.png new file mode 100644 index 0000000000000000000000000000000000000000..c77debab48bf4e5a0b871973ca979eca3a29a530 GIT binary patch literal 490 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZOnXdAqwX{0G4WdzViJirn>daSX9Iy*DJ9@2~>T z=IW+<9C>0EmER0+I4RV6&R*&jTHy0&32R*ki-WF<3*(B1D>``Ql+9B!6x_(fE|?98)~W+c2r6qa|fhdy>+n^HZ-a)}G2TwN}4;S-s2J z4f`{WzP$0Lcj=UcqO;emYBrsg&6+tmYi%+&`}?h7_iwfvtUWXL_`BCvHqE~`^~R~g znQK;c1)X}buwT+g>i6Vr(dXn={aSx4{PFo0-_&kBc$%jt_V1dwz_yi*oy#LCZzc5` z@|@y-V0h;Im;V)vHZyK7>Mad61$tDq#5JNMC9x#cD!C{XNHG{07@6rB80s2Xgcz7u znV4A_nQ9vtSQ!{3AO56`q9HdwB{QuOw+5kkUekdZG~hOrWag$8mn7yE;MU{Xo$UeC O!{F)a=d#Wzp$PyfJ+j6C literal 0 HcmV?d00001 diff --git a/options/ios/icons/notification/ipad_40.png b/options/ios/icons/notification/ipad_40.png new file mode 100644 index 0000000000000000000000000000000000000000..b23fa52b8d9f1ae9bb9a02583bbccce4fea261c4 GIT binary patch literal 863 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dE3dtTpz6=aiY77hwEes65fI|H*Yfq^N=)5S3);_%go(}jl> z1Zu;A9J~tH3)vSjFK;Q?bfGi)gRc9F120u}K6T@}rX|$I%5u^ozwP4&q0^V^4j!;S z&T)WyvB;#pz^ES@0*43uCd!6qbELZ*D8HA zC4I%@)|YR3+mk&vaYntK_v*sj1U;2)2@V3r2W0%~ zyI9!ew?0rx2;X#HN%f_C5%=^>E0^S`xwveeSI|G@`XVu&=32{eFUE-DvxB%E?^wrk z&N3o9{7FS_)_jp9QQIgxp;(n$g-*4WvWB$`e-sSUr>pGC`qvxjl)bk~eW|jzQPNDq zV`tXAnR|1or+Li%v(v@%+!t<5GTN5l(UdB*bHSZAtGKroziSgX9kFg}Td}>m`ZWF2 ztvhbV?O~apHp?tSwf%vKa@xj>PhCr1&P{MNU3Fz{P_9oze(Nfg&QfNjT`#2^_Ut~g zDJb0l&U4V8A)g^` zYEY8;jrZSI@7yZ3{Ice*wvL3gt;K#1t6u(p^`Q6DrOjKHlqg0P<(;YZ;N3aPZ<4Rf z%O#hT6};4pI^u}T#CA#xlZlo-G|{;M`9mK%UxTUI7yB<3z*(i zOI#yLQW8s2t&)pUffR$0fsvW6fuXLEMTmikm5G^^k*T(Uft7(l^5IX~C>nC}Q!>*k qacdBo=QSOuK?80>NoH|H*Yfq^N=)5S3);_%go(}jl> z1Zu;A9J~tH3)vSjFK;Q?bfGi)gRc9F120u}K6T@}rX|$I%5u^ozwP4&q0^V^4j!;S z&T)WyvB;#pz^ES@0*43uCd!6qbELZ*D8HA zC4I%@)|YR3+mk&vaYntK_v*sj1U;2)2@V3r2W0%~ zyI9!ew?0rx2;X#HN%f_C5%=^>E0^S`xwveeSI|G@`XVu&=32{eFUE-DvxB%E?^wrk z&N3o9{7FS_)_jp9QQIgxp;(n$g-*4WvWB$`e-sSUr>pGC`qvxjl)bk~eW|jzQPNDq zV`tXAnR|1or+Li%v(v@%+!t<5GTN5l(UdB*bHSZAtGKroziSgX9kFg}Td}>m`ZWF2 ztvhbV?O~apHp?tSwf%vKa@xj>PhCr1&P{MNU3Fz{P_9oze(Nfg&QfNjT`#2^_Ut~g zDJb0l&U4V8A)g^` zYEY8;jrZSI@7yZ3{Ice*wvL3gt;K#1t6u(p^`Q6DrOjKHlqg0P<(;YZ;N3aPZ<4Rf z%O#hT6};4pI^u}T#CA#xlZlo-G|{;M`9mK%UxTUI7yB<3z*(i zOI#yLQW8s2t&)pUffR$0fsvW6fuXLEMTmikm5G^^k*T(Uft7(l^5IX~C>nC}Q!>*k qacdBo=QSOuK?80>NoH8dh~+iMcNx1J(GGn@fkwAxW6h}TiF5ocr_DIM z{QiTB6_uBzIy_b%D$*BRd93Ns=2gKKDIZ*19-H`XI4hx?$8cbNYkcNw+dpwvBmP7x zNeOSObwcQNZcZ`ak;2c zRrgM1)0;qzI+?G!=7yO z1p|3@AGva64fD?VAHQBqifA$ktJKMyxAD8@=lWB(7T${bRx7{fUiaF^YVwy=RONI9 zrc?wy%UHjDM!)YdiLZ~I-rM{vZqKiUFTH=w4?kLFlM;4*3)2C~hitQ-bN{psJGw1X zb4{puaZ<3<>-!CrMOV4flUJ8d(XlaUJ(wif@!X&9{;RLG^OsyQ@jdP5wY#(=?Ai1i zyplCpo2FzYyD}-v%P;<-xX`LKxkTf`U-k0hXX1bCWIj)nZqWbEJ^z_@lINW(=Jkeu z*gj0o+K@WEcAMD!I?I-_XE$HR=L>tS2+n-7BJZNt*R!!&bNAT=P1$PFIyEP(N`pwtOq zqEjt#jVMV;EJ?LWE=mPb3`Pb!X~+6D$z1_sH8KWU?A$jwj5 tOsmALL1>=Wbf5+exD6$lxv9k^iMa*1^|*FtdjRz?c)I$ztaD0e0sv8qYPkRa literal 0 HcmV?d00001 diff --git a/options/ios/icons/settings/ipad_29.png b/options/ios/icons/settings/ipad_29.png new file mode 100644 index 0000000000000000000000000000000000000000..21266b723263ea89bdb52aa00babc67d91899bb3 GIT binary patch literal 571 zcmeAS@N?(olHy`uVBq!ia0vp^vLMXC1|-8Kr}G0Tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G(@^*J&_z!{$_AZ~yz`&^I>EamTar|glAYZcq z2kYjFY4sAPf3_y8l91HuFD&z2UYBJG*K zlGFa$++ud9b<||#nmV_ZVZk)fY3ccFXRo|IG;>q>w^N@_@mbt|yrBC@|*wfKB)9vOtCE3OP0f)U0>b^fSslfQH>)N;ZPmRxRtI4s@eZDO>Q(>*$sY_S8 zJFN3>zDcWk{C+~F)YGZo6>sns9S{Cny7Asdrmb&6{zvK@n(b`jv^d)+d)}8{hE6u# zHgywlo2WrrO+fb63n_66wm|K8bk85|f2T%`#r>mdKI;Vst0Lla01poj5 literal 0 HcmV?d00001 diff --git a/options/ios/icons/settings/ipad_58.png b/options/ios/icons/settings/ipad_58.png new file mode 100644 index 0000000000000000000000000000000000000000..bac755d7b1a2e816ca6b14c33d29806d4a8609f1 GIT binary patch literal 983 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 literal 0 HcmV?d00001 diff --git a/options/ios/icons/spotlight/ipad_40.png b/options/ios/icons/spotlight/ipad_40.png new file mode 100644 index 0000000000000000000000000000000000000000..b23fa52b8d9f1ae9bb9a02583bbccce4fea261c4 GIT binary patch literal 863 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dE3dtTpz6=aiY77hwEes65fI|H*Yfq^N=)5S3);_%go(}jl> z1Zu;A9J~tH3)vSjFK;Q?bfGi)gRc9F120u}K6T@}rX|$I%5u^ozwP4&q0^V^4j!;S z&T)WyvB;#pz^ES@0*43uCd!6qbELZ*D8HA zC4I%@)|YR3+mk&vaYntK_v*sj1U;2)2@V3r2W0%~ zyI9!ew?0rx2;X#HN%f_C5%=^>E0^S`xwveeSI|G@`XVu&=32{eFUE-DvxB%E?^wrk z&N3o9{7FS_)_jp9QQIgxp;(n$g-*4WvWB$`e-sSUr>pGC`qvxjl)bk~eW|jzQPNDq zV`tXAnR|1or+Li%v(v@%+!t<5GTN5l(UdB*bHSZAtGKroziSgX9kFg}Td}>m`ZWF2 ztvhbV?O~apHp?tSwf%vKa@xj>PhCr1&P{MNU3Fz{P_9oze(Nfg&QfNjT`#2^_Ut~g zDJb0l&U4V8A)g^` zYEY8;jrZSI@7yZ3{Ice*wvL3gt;K#1t6u(p^`Q6DrOjKHlqg0P<(;YZ;N3aPZ<4Rf z%O#hT6};4pI^u}T#CA#xlZlo-G|{;M`9mK%UxTUI7yB<3z*(i zOI#yLQW8s2t&)pUffR$0fsvW6fuXLEMTmikm5G^^k*T(Uft7(l^5IX~C>nC}Q!>*k qacdBo=QSOuK?80>NoH|H*Yfq^-|)5S5Q;?~c2)8jW-)}nkihHbZ_c4 z&IKB(nJv%Dn~L=(&R^Q0dxEIgc?N@HXIAz~9^bhC?+@_<`@3=zFF(|d5##zDb>ha(xbU62F-))dc4qG3Zbeij{gW|f5EjK(aJ+@FYKPGXwDqb`CTTANHB`X6?8Qv*ads6KA zkJt#4mexOdxeP}w`XUdRu)S(@lDhNgXNlF`x#ypke?NNqX;bAq#v1j|?>8>K_$?Rv zed@g&mL11+E}PWGtiSI6+d6x0sMXBp5{ktO6m?o`8+|X|xovlPla1{9Cd0NZcWckB z5MFU%!*s(imtXtR_nu#RWm3xOO$+B8wtbeoIh=`?vDHO!+gU9o&JSXOSv-d~RIc;A zRDHHdx9}0yRBgU!pvX_3i|PRj1+N~8N!%FVIVi9r5Sw@PkS&AHepLPAY^FS9qCS6~)gY4vd1lA7aj+CD|L&wr$C4swq0*u?qe=IjrmV!!`IR2vFi zVQ%gC=a-`G+5V=qVDi58?r%A#Zh7^f=*Fv-=+b};4snIZ$EMFYA~yv969(r?t8E=O zzHtdkd#|ybEz)$*RYzx|*|nX{N)jScho(;0lXfolaZw<@h*0+HRjw?Fg}3AS?{Av* z{HLD8q^_k)5(+$(bWAzeTH6YaimZ$X;$my9S}mZ4?Ymm(OJsU?Bx7|VMEJOHi)8V7mcWj zf5}JZYe>ZGc)KR+f`FYyd7`6hljA};jU{Y?3o{CZ#n?r8Tq8fq3$w0p-*@`@Heha3 zEpd$~Nl7e8wMs5Z1yT$~21aJO28Oyu79j>ERwiavMyA>Z237_J$%j8_qiD#@PsvQH r#H~SSp4W7s1`W6kC7HRY#U+Wk1-SLNc4vD4^)Pt4`njxgN@xNA)xX`7 literal 0 HcmV?d00001 diff --git a/options/ios/icons/spotlight/iphone_120.png b/options/ios/icons/spotlight/iphone_120.png new file mode 100644 index 0000000000000000000000000000000000000000..ed55e5ce1cd3e894232ac0e185dd69b959a46e8f GIT binary patch literal 1274 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q{^bg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G(@^*J&_z!{$_AZ~yz`*?0)5S5Q;?~=_cXQVm z2(+Ge+ul$zsf0mRMOMnu7k|j|e;oR7I)EfSTzq;^yTW2!i$Gr7fqWb9edZN{P6gG^Cv>a1Gfhqw zwJ3|M2w`|ov~$OlE5*(n%sKCJt=90Ytghb5zJKn_SEtYFMT`0Lv49kBR{5Zlv!Tbc z_WthBTSoH|6K7rcbnk)d{qM`l`6LcGMH*NN&5+^z(_%9xkL66}hQr>^wxmx@O`KKS zrUMlB@ypw_p=#GU>s?&!PWl_tZR*&bEIK*yz>_@(3`)g|^<6bSMZO9@ePs<;G0;YJ zZJ(~=si!U8%&fC!Ub#=}run9XA{CG&b95SuA3bPYy59YJ_e=q&O}^9iX<6=9;08Hz zvZz{QP~o)V+uP>;-ImgFYn$ukoZIzgeadZ#5w-tHG&*0$Y_c!fsKZ_uZ55mq>3eRS zTXyyLtjSCFek|OX0Wv?2>3E_upLgQnFA?W%Tr0i%>iLwM$>|XqVB?h=PZmap-uzx` zR9CxA)y{pXd+Na_9$*CNcG-_ne|o_p`2eEjR5r4132UsxL3 zLe#FhQ)AZmI4xW{es{_Immdpd!sl1N-cac8r!>I*uJ!oAjEY%bR$PhJ{kj3-XXVDDJl-{7Ia~h)UhWmMDQ~=EnQjWvaJ9wL z()#PN>rv$#ekX6voUvJXliHnQ4}zZbw5tBk-~Fn;5AqOuPrdc63oCv(D&--X37?;e>RtG;HqtDO5l>icepg5}+HtRKF8 zS8g#_;&;w-{n3?f*}FdWCrYHPJQh@1b>Uv7>VC#QIdu`LAv^CJ&;GY3<&-`-@N40wJ1bA@4XU#|(F95~9tnjUyk#@4ZJE|u zW#V3b%NC+O>u=Wy?J_UZWeFZXuWA*X(UJHT^Dnu^@9ST6ao;``vCv18veuYBo!$)d z&GR)(;@+n76rWB%9LXxC4Kdkj(#m7T%l;HiV4Vz%@0HJzm$3dk_P#BP!Qp!8;X^-j zOLRq-_q^@VVLg1MRsn3T6Nh3;!2^3q{zd%1R~0<~76qy$t`Q|Ei6yC4$wjF^iowXh z$V}J3P}j&J#K6SL#LUXbRNKJ7%D^D`@F#5)4Y~O#nQ4`{H3-e~nhw;U0k@$fGdH!k ZBr&%Dw;tE-Y!9Fw22WQ%mvv4FO#pl2C42w? literal 0 HcmV?d00001 diff --git a/options/ios/icons/spotlight/iphone_80.png b/options/ios/icons/spotlight/iphone_80.png new file mode 100644 index 0000000000000000000000000000000000000000..7b3b9c958459ef2c45a783389726c364f658f552 GIT binary patch literal 1117 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)3dtTpz6=aiY77hwEes65fI|H*Yfq^-|)5S5Q;?~c2)8jW-)}nkihHbZ_c4 z&IKB(nJv%Dn~L=(&R^Q0dxEIgc?N@HXIAz~9^bhC?+@_<`@3=zFF(|d5##zDb>ha(xbU62F-))dc4qG3Zbeij{gW|f5EjK(aJ+@FYKPGXwDqb`CTTANHB`X6?8Qv*ads6KA zkJt#4mexOdxeP}w`XUdRu)S(@lDhNgXNlF`x#ypke?NNqX;bAq#v1j|?>8>K_$?Rv zed@g&mL11+E}PWGtiSI6+d6x0sMXBp5{ktO6m?o`8+|X|xovlPla1{9Cd0NZcWckB z5MFU%!*s(imtXtR_nu#RWm3xOO$+B8wtbeoIh=`?vDHO!+gU9o&JSXOSv-d~RIc;A zRDHHdx9}0yRBgU!pvX_3i|PRj1+N~8N!%FVIVi9r5Sw@PkS&AHepLPAY^FS9qCS6~)gY4vd1lA7aj+CD|L&wr$C4swq0*u?qe=IjrmV!!`IR2vFi zVQ%gC=a-`G+5V=qVDi58?r%A#Zh7^f=*Fv-=+b};4snIZ$EMFYA~yv969(r?t8E=O zzHtdkd#|ybEz)$*RYzx|*|nX{N)jScho(;0lXfolaZw<@h*0+HRjw?Fg}3AS?{Av* z{HLD8q^_k)5(+$(bWAzeTH6YaimZ$X;$my9S}mZ4?Ymm(OJsU?Bx7|VMEJOHi)8V7mcWj zf5}JZYe>ZGc)KR+f`FYyd7`6hljA};jU{Y?3o{CZ#n?r8Tq8fq3$w0p-*@`@Heha3 zEpd$~Nl7e8wMs5Z1yT$~21aJO28Oyu79j>ERwiavMyA>Z237_J$%j8_qiD#@PsvQH r#H~SSp4W7s1`W6kC7HRY#U+Wk1-SLNc4vD4^)Pt4`njxgN@xNA)xX`7 literal 0 HcmV?d00001 diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index 3e04c84c..1179ba28 100644 --- a/options/ios/options_ios.yy +++ b/options/ios/options_ios.yy @@ -9,24 +9,24 @@ "option_ios_display_name":"deltarunetest", "option_ios_enable_broadcast":false, "option_ios_half_ipad1_textures":false, - "option_ios_icon_ipad_app_152":"${base_options_dir}/ios/icons/app/ipad_152.png", - "option_ios_icon_ipad_app_76":"${base_options_dir}/ios/icons/app/ipad_76.png", - "option_ios_icon_ipad_notification_20":"${base_options_dir}/ios/icons/notification/ipad_20.png", - "option_ios_icon_ipad_notification_40":"${base_options_dir}/ios/icons/notification/ipad_40.png", - "option_ios_icon_ipad_pro_app_167":"${base_options_dir}/ios/icons/app/ipad_pro_167.png", - "option_ios_icon_ipad_settings_29":"${base_options_dir}/ios/icons/settings/ipad_29.png", - "option_ios_icon_ipad_settings_58":"${base_options_dir}/ios/icons/settings/ipad_58.png", - "option_ios_icon_ipad_spotlight_40":"${base_options_dir}/ios/icons/spotlight/ipad_40.png", - "option_ios_icon_ipad_spotlight_80":"${base_options_dir}/ios/icons/spotlight/ipad_80.png", - "option_ios_icon_iphone_app_120":"${base_options_dir}/ios/icons/app/iphone_120.png", - "option_ios_icon_iphone_app_180":"${base_options_dir}/ios/icons/app/iphone_180.png", - "option_ios_icon_iphone_notification_40":"${base_options_dir}/ios/icons/notification/iphone_40.png", - "option_ios_icon_iphone_notification_60":"${base_options_dir}/ios/icons/notification/iphone_60.png", - "option_ios_icon_iphone_settings_58":"${base_options_dir}/ios/icons/settings/iphone_58.png", - "option_ios_icon_iphone_settings_87":"${base_options_dir}/ios/icons/settings/iphone_87.png", - "option_ios_icon_iphone_spotlight_120":"${base_options_dir}/ios/icons/spotlight/iphone_120.png", - "option_ios_icon_iphone_spotlight_80":"${base_options_dir}/ios/icons/spotlight/iphone_80.png", - "option_ios_icon_itunes_artwork_1024":"${base_options_dir}/ios/icons/itunes/itunes_1024.png", + "option_ios_icon_ipad_app_152":"${options_dir}/ios/icons/app/ipad_152.png", + "option_ios_icon_ipad_app_76":"${options_dir}/ios/icons/app/ipad_76.png", + "option_ios_icon_ipad_notification_20":"${options_dir}/ios/icons/notification/ipad_20.png", + "option_ios_icon_ipad_notification_40":"${options_dir}/ios/icons/notification/ipad_40.png", + "option_ios_icon_ipad_pro_app_167":"${options_dir}/ios/icons/app/ipad_pro_167.png", + "option_ios_icon_ipad_settings_29":"${options_dir}/ios/icons/settings/ipad_29.png", + "option_ios_icon_ipad_settings_58":"${options_dir}/ios/icons/settings/ipad_58.png", + "option_ios_icon_ipad_spotlight_40":"${options_dir}/ios/icons/spotlight/ipad_40.png", + "option_ios_icon_ipad_spotlight_80":"${options_dir}/ios/icons/spotlight/ipad_80.png", + "option_ios_icon_iphone_app_120":"${options_dir}/ios/icons/app/iphone_120.png", + "option_ios_icon_iphone_app_180":"${options_dir}/ios/icons/app/iphone_180.png", + "option_ios_icon_iphone_notification_40":"${options_dir}/ios/icons/notification/iphone_40.png", + "option_ios_icon_iphone_notification_60":"${options_dir}/ios/icons/notification/iphone_60.png", + "option_ios_icon_iphone_settings_58":"${options_dir}/ios/icons/settings/iphone_58.png", + "option_ios_icon_iphone_settings_87":"${options_dir}/ios/icons/settings/iphone_87.png", + "option_ios_icon_iphone_spotlight_120":"${options_dir}/ios/icons/spotlight/iphone_120.png", + "option_ios_icon_iphone_spotlight_80":"${options_dir}/ios/icons/spotlight/iphone_80.png", + "option_ios_icon_itunes_artwork_1024":"${options_dir}/ios/icons/itunes/itunes_1024.png", "option_ios_interpolate_pixels":false, "option_ios_launchscreen_fill":0, "option_ios_launchscreen_image":"${base_options_dir}/ios/splash/launchscreen.png", @@ -40,7 +40,7 @@ "option_ios_podfile_lock_path":"${options_dir}/ios/Podfile.lock", "option_ios_podfile_path":"${options_dir}/ios/Podfile", "option_ios_scale":0, - "option_ios_splashscreen_background_colour":255, + "option_ios_splashscreen_background_colour":4278190080, "option_ios_team_id":"", "option_ios_texture_page":"2048x2048", "option_ios_version":"1.0.0.0", diff --git a/options/linux/icons/64.png b/options/linux/icons/64.png new file mode 100644 index 0000000000000000000000000000000000000000..8504ec84d48d986dc169c3ac01c9dd3e4c20bb2c GIT binary patch literal 621 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1SD0tpLGH$g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(GZ3GxdD(m;^6jC~@IVoUONcVYMsf(!O8pUl9( z=;!I;7?N@C?Mz3pW(6MBt?R$<-xRxqyJo@%W)|L*X}WGF9Rw`<6mHBG&Mb)yx4ppG zDkb+hdFsr_4Y5APEh$Wy`GS}CHWuxl$hfL2L2z+vEq!$tZL@? z-4_;b(tCXGfPD8Z!{;~eNGCjJ=zS1#XwJmm@C~KB1;Pi`?K=Hm@3&saOy)|pPw^9` zRrst^J-&-A=!0R_#h^5P=1jFU)6;WPi}M#`+aFlV>5-cm?Vn^{(0)25F8$NA#bJft z*|_$kt2fw8t!8Gnx{#JLCH*^_)_u39Q5UzxUyj@Qy3WDv-g?FOu`K;mxdu zJGG_E6>9T#Ev{zn>b$?rNF?uO;Md|ZBZn^)60@t5?3r7xHM_p!{LZ#(gZ1B|H*Yft zT5l?ENH2LaJ5*waa{Bd0Yt4A3%&2_#{$9hwjk}L_7WGv#J8rPH-`r|=CGGuvNnlv3 zmbgZgq$HN4S|t~y0x1R~10yqC14CUSix2}7D-$y-BQtFS11kfAAnh01P&DM`r(~v8 p;?|&C763{l8gLs*GJ(NUl9*e7TTe-H;Z>j>22WQ%mvv4FO#rOe>L~yK literal 0 HcmV?d00001 diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index 1591b8a0..164f6633 100644 --- a/options/linux/options_linux.yy +++ b/options/linux/options_linux.yy @@ -9,7 +9,7 @@ "option_linux_display_splash":false, "option_linux_enable_steam":false, "option_linux_homepage":"http://www.yoyogames.com", - "option_linux_icon":"${base_options_dir}/linux/icons/64.png", + "option_linux_icon":"${options_dir}/linux/icons/64.png", "option_linux_interpolate_pixels":false, "option_linux_long_desc":"", "option_linux_maintainer_email":"", diff --git a/options/mac/icons/1024.png b/options/mac/icons/1024.png new file mode 100644 index 0000000000000000000000000000000000000000..3183df5c507fcf06aa151b199977aab990119be5 GIT binary patch literal 19191 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 literal 0 HcmV?d00001 diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index 52df0242..4bc499e2 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -17,8 +17,8 @@ "option_mac_display_name":"DELTARUNE", "option_mac_enable_retina":false, "option_mac_enable_steam":false, - "option_mac_icon_png":"${base_options_dir}/mac/icons/1024.png", - "option_mac_installer_background_png":"${base_options_dir}/mac/splash/installer_background.png", + "option_mac_icon_png":"${options_dir}/mac/icons/1024.png", + "option_mac_installer_background_png":"${options_dir}/mac/splash/installer_background.png", "option_mac_interpolate_pixels":false, "option_mac_menu_dock":false, "option_mac_min_version":"10.10", diff --git a/options/mac/splash/installer_background.png b/options/mac/splash/installer_background.png new file mode 100644 index 0000000000000000000000000000000000000000..5e8add1ca41e16b3874992b537377910bb5eb7b3 GIT binary patch literal 5020 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 literal 0 HcmV?d00001 diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 39290614..e10bf7fe 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -21,7 +21,7 @@ "option_spine_licence":false, "option_steam_app_id":"0", "option_template_description":"DELTAModKit is a project created to make modding DELTARUNE easier.\n\nThis version of DELTAModKit includes rewritten handlers for ITEMS, KEY ITEMS, CHARACTERS, ACTS and SPELLS.", - "option_template_icon":"${base_options_dir}/main/template_icon.png", + "option_template_icon":"${options_dir}/main/template_icon.png", "option_template_image":"${base_options_dir}/main/template_image.png", "option_window_colour":255, "resourceType":"GMMainOptions", diff --git a/options/main/template_icon.png b/options/main/template_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6f12e670d0dc7a24d0bd6bf38832068345f6fbe0 GIT binary patch literal 2388 zcmZ`)dpy(YAO9-F>8B`CDwKmP%vv}#O0+1qa%XOHHw>VKhEp>dcL36^Zh=b_w#u^pZDkeL|--3*}dz~E&u>_U%mu4 z=GxMY!M~IHo;;~D%r!@yE*TpDz)e{I2)hdaZ0@J9X#ntt0KjJ?0Kn1!;DB#tqmerI z$4*B*9XP<*cygO@NdUmFa~ZB_8Zg2fCHhcbiFf>^Bz|U>%GpW@k=_q2*i?Pchk-k` z7v`M>DZ=ql`z_4BX=F}0j9fxo0dw|7f>hPiedyLG+gD~vNtz6)_oEpYD~ zBRegPEv3+vK0Mm4C{dIUq4qxU_%?0?fL#1kBahU(1Bs7XzjDmr>$7ZGOLke*YRkvv z?R&+Z5q>K-xG3#s`Q4TtCh%RHUQ)z3Tshgub6%8Jv{=Zp@SX1{Kwr$t4z02*RZ7(x zYG~=sQoC{J28-rD5=rrzWUD5VZu$!GYK|Kd>Alctx!8f_l{Er6Xg_cG*A@laZG~FM zKX-*koZ!NV?6o9+_yCQOssb^w*6O|2&EYSLvy4QdSt|uCZK%kgg{dX_3PF;RZ4b|+ zm0+KvLn_#7>-otL--!d8(fq)&8fukwRaz(G*S&jlG*Y=k?Kux0A73@m=MT_WAT5+n z!@fC`v;KLaCp9F47`im)z-hU|N954z?QCtkCMNQ0f(G1`$Geh_ z*ACgCf1?;wfEw>}cV1g;{Rm-UaOn?K<1_u5R2q4&M!eA4zwLi!{0iozqBNWkTCK04 z00R?eEIb|c9tsSyJ&>eeLR%&MSY&#v@@m_%NzI6XtT3wX3$3=+Qo-gAi?iD@$bNVm zicStA3e2;yhzpw%8Rhj-o<%1T@p$~Q!6=*E7}w!cA~;H+BxYr0!JC=%3#o>q7tO=NW`D?;;tx#-{J;a1zYd!A%haXdj%1H5`&Cogf}T5Oxv z{e*;`XUZyIF!(9O>((NjH9L!t^kmz;>Fu5P@}+c+aYCk&N~N|hPc(UHBrOz4-Me=$ z1r2gx+tHc=O}g>ZTOok*1rJ9$l;0X389|iu+=&X*d)pL3t!Cf#_Zo7ndZ2EdertI? ze@->TjM86$&I5-uU zZQAzThQON2)>h7v=f6$Dxw+LmUH~gw)gsCe=i*S^S9PuJqdIdwrToGR8MKJg5zOPA zP_sRa)s^B$A{^3&Tcms3BqSud+u9-q=sB60os6Lh;f4A;dD?l$xFt957`*mE=3(gD ziC~X<1(#rlg5Fovplo8$XViF6pT&54 zdzUsyH{aoQeWSQSVw{%7CXtNz4vIgyHelKPy0{Ix^R@yrPcEOuugct}Z)B z+!TW!{aQ3Z$jF{ro1`@d5nnP41P8?>C3~Eqpr+jgI71v6_3_HHH?F5p4b*n_lYI0k z4;Ux-90wHh#NO*%gKk~0hic4|x8EWjllFzad@g4;JAfF#4-O7is}t;c&T9RXg(4S8 zbNHmxyp-J;iG%d2yCwtRq23|a(Ng}7N&?18DP z>wjZ4)YreO7YlJHEGZWzlJ=1!^7`a@8efz2MwI;`XWkg=w)?kxyp;*tP=9V(wUFU4 zS-J#^&xJ~|po%b<|C-B0o6=TOa+&oRrjpTi-q9rX>vGdI4CY(HQh0%)Y%f=7R#)FI zs94S{+?=28%Y!$gVqYx>uO~^T@Liy+|0;iZA#N^|nEnd0S z#0O+e1*UkDQSwZOj%4g;r(#t%v62~pszdBkG7`DWE!-yrB13-&*=Rn*RO&gwCn_KH zkKX6LB8*!*rI++OsOcLlMQmPXo5%T6SCKAgT_ySS30j-7N7$u%g`ER0VqnwKe>wDi z*XGymk&CS``W_SEUx-HP_cBCLmawa0|te5xsGu_`~J7j*eY_B>jPZAXb3OYLf-yA D8{u`7 literal 0 HcmV?d00001 diff --git a/options/tvos/icons/1280.png b/options/tvos/icons/1280.png new file mode 100644 index 0000000000000000000000000000000000000000..ebb57e653cbcbadaa77c143efbe24a6a8436cc01 GIT binary patch literal 8783 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 F_+OZX!MOkc literal 0 HcmV?d00001 diff --git a/options/tvos/icons/400.png b/options/tvos/icons/400.png new file mode 100644 index 0000000000000000000000000000000000000000..fa67f52ac0b9b2bb56242b9b5f3a47f5e186e3ae GIT binary patch literal 1790 zcmeAS@N?(olHy`uVBq!ia0y~yV4MJCf8byOk_+ROmI5h-WRD45bDP46hOx7_4S6Fo+k-*%fF5lwd0f@(TviK#;eLeIk%zOY(MiVfYV%3-&Ib z%)r2U-_yl0q~g}wyBB*Oc}TPdZl2X}f+5|(W5$FN3`Ppd-xh|io_Ort!drT~*I7O< zY?*Orfqz8k-^(DUpn^9S5?`~{thoMq>sO&&>t6G<@8NIo{(kb`%_>HQ_d+@fZ3&Eq zEZiN65e_^DnUZeIiaqnR=w=mXY3%yzUgzIj`lxm=%ID(G1#W&HO*TDqo3`<{>HCIg zCp2vwVh8GC^`>8+vG#iC-50C%tel=+`upS3$D`)x7I26O9G0J0zdYk{<#%P5SGk9G zm+Zg&_v!+%~UGFMv=AD0TF8`;(=H2(-^Z(mfbtSwy_$KK7_vM#gp0Ag;{b~61 zLE!e=Z-3V0{r#13SgF~LC*&aeN;7O$wk7C3GgvnJ#!|gaU$uW{xY~1H@vY~HXh8`y zr~~Ru(+wBb```awyEJ{?BlDa(^ZFBx7p*P6CggK@uQC@+sf~_5y)EZ&-k&GFlC^A) zQ}^vqWl2J~9_T}GWMmt*-)u{qvA?Hk_M_f6zxtz|B%E52DDiCn=Fig)iUT7FLrc%} zn{Im}O%`_@oA;%*-fFJdeyRTBkL&jD|M|d8Pj=11dz$k!P19$dv1JJTayaa(&s^Et zRk8mge{N3Pb4DDiw~HfgYe-oJl?u=OKa=^g-F$BdW#XOLlWMeU3lbAx}Mbw6CUTKsXCvSGUsCp{BO1UgH2{6K7FXt zt1)Zhrhh5(+N2bBQy~qdEnqLj%ur}haCshg|Q^l$JeiMpD5ma z*X@68NqX(yMy5+%a!&6fZB-tD}e?x!=ob8bIiN8~|7^jhTXZTPEkOJ~0Q zwc79%FhCZFV%+V#XyAtTFdE zb=$>H1(UwAU+;-Z;qaL_?Y>BcpR#-1vS}MPef3{zx`}7s!)XGrG6C+M14U9d^VXL) zB|a6ubmF66-2tq*yJ99oZ;!2HtQ#;R+~5C`=lk#4lB6@Ivgaiw@m#rdB5~28NR!?< zvc`sL)3KBz4AMW(^!{<z0;{+3|#@wA*|Kq?B ziL_7H%bT|HtJ3oml6W?>ty~pAwZt`|BqgyV z)hf9t6-Y4{85o)A8W`#tS%esvSeckv8JTGt7+4t?1Zlt6hN2-iKP5A*61N8BvH(!6 ir2)60Br`X)xFj*R0Jol!qu literal 0 HcmV?d00001 diff --git a/options/tvos/icons/400_2x.png b/options/tvos/icons/400_2x.png new file mode 100644 index 0000000000000000000000000000000000000000..178692fbaf868a3a65ee74f7329b32be203fd340 GIT binary patch literal 6145 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 literal 0 HcmV?d00001 diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy index 06825875..27e74390 100644 --- a/options/tvos/options_tvos.yy +++ b/options/tvos/options_tvos.yy @@ -7,9 +7,9 @@ "option_tvos_display_cursor":false, "option_tvos_display_name":"deltarunetest", "option_tvos_enable_broadcast":false, - "option_tvos_icon_1280":"${base_options_dir}/tvos/icons/1280.png", - "option_tvos_icon_400":"${base_options_dir}/tvos/icons/400.png", - "option_tvos_icon_400_2x":"${base_options_dir}/tvos/icons/400_2x.png", + "option_tvos_icon_1280":"${options_dir}/tvos/icons/1280.png", + "option_tvos_icon_400":"${options_dir}/tvos/icons/400.png", + "option_tvos_icon_400_2x":"${options_dir}/tvos/icons/400_2x.png", "option_tvos_interpolate_pixels":false, "option_tvos_min_version":"10.0", "option_tvos_output_dir":"~/GameMakerStudio2/tvOS", diff --git a/options/windows/icons/icon.ico b/options/windows/icons/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..32608b84031b21ec96da0b8acc4de8cb4161ae39 GIT binary patch literal 1253 zcmZQzU<5)CU}R8WIM2esAO>W22Kc%2a!GLknY^AJEbEVcb`{`|e{C-2`s?N9h+{N<)YNVMUjLfeh|ysN13J2)Ue@DX{pjxZ1DD^` z?X%loUHjmtUM+(f1BWmMs!nguIKO}6ukT;W%fDMP3Ny5DVxYfs_c6Rn?LV)L)r8;w zr2g&O|DCg7)AIkn4Y9iC$8Uyp-=?g7zcv2v&n)# ze!aim{N4Yj@&;I~|Ms4FhS}cseZTkqF28^O%jebDU8z28!##0^|1aOY{~eDt1ZR9_ zymQ8~aWi;|LyxPiZ$pe-QT@G z>-+QFI2CTYm$>hwWux@le>HyhKVuJo8yBt5nOmwCeE56y`=4+h1_3n;H0@sFzLzhG znf%kw*Xv{T`OS&ziv1EAZU5_FmtJ^Jzt-=-y#F_`nxA&uD*tsc)3-m^liCc~H=ldw z32%6AKO1Xsyvg{!y~OW9mn|;i+pG6&ZDy!*?@Pl{1^^2sFlb=@!<-iO_tv(>??9y( NgQu&X%Q~loCIHu%$728h literal 0 HcmV?d00001 diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 08d667c0..ecf55da3 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -14,7 +14,7 @@ "option_windows_display_name":"DELTARUNE", "option_windows_enable_steam":false, "option_windows_executable_name":"${project_name}.exe", - "option_windows_icon":"${base_options_dir}/windows/icons/icon.ico", + "option_windows_icon":"${options_dir}/windows/icons/icon.ico", "option_windows_installer_finished":"${base_options_dir}/windows/installer/finished.bmp", "option_windows_installer_header":"${base_options_dir}/windows/installer/header.bmp", "option_windows_interpolate_pixels":false, From eae0918aec0353d7186995342806c23a3bd77a23 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 27 Jan 2026 21:40:02 -0800 Subject: [PATCH 41/56] Minor Fix to scr_turn to have the LOST text not appear every time you violence an Enemy, and Minor visual code cleanup to attackpress that should not modify what ASM it compiles the GML to --- objects/obj_attackpress/Create_0.gml | 30 ++++++++++++---------------- scripts/scr_turn/scr_turn.gml | 6 ++++-- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/objects/obj_attackpress/Create_0.gml b/objects/obj_attackpress/Create_0.gml index 8145e113..44310d50 100644 --- a/objects/obj_attackpress/Create_0.gml +++ b/objects/obj_attackpress/Create_0.gml @@ -16,41 +16,37 @@ spelldelay[2] = 10; maxdelay = 0; maxdelaytimer = 0; -if (spelluse == 0) -{ - for (xyz = 0; xyz < 3; xyz += 1) - { - havechar[xyz] = 0; - charitem[xyz] = 0; - charspell[xyz] = 0; +if (spelluse == false){ + for (xyz = 0; xyz < 3; xyz += 1) { + havechar[xyz] = false; + charitem[xyz] = false; + charspell[xyz] = false; - if (global.charaction[xyz] == 1) - havechar[xyz] = 1; + if (global.charaction[xyz] == 1) // Attacking + havechar[xyz] = true; - if (global.charaction[xyz] == 4 || global.charaction[xyz] == 2) - { + if (global.charaction[xyz] == 4 || global.charaction[xyz] == 2) { // Spell or Item if (maxdelay == 0) maxdelay = 25; maxdelay += 15; - if (xyz == 2 && spelluse == 1) - { + if (xyz == 2 && spelluse == true) { if (spelldelay[1] == 25) spelldelay[2] = 45; else spelldelay[2] = 25; } - if (xyz == 1 && spelluse == 1) + if (xyz == 1 && spelluse == true) spelldelay[1] = 25; - spelluse = 1; + spelluse = true; if (global.charaction[xyz] == 4) - charitem[xyz] = 1; + charitem[xyz] = true; else - charspell[xyz] = 1; + charspell[xyz] = true; } } } diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 1a4b3998..d7c4913e 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -614,9 +614,11 @@ function scr_defeatrun(){ if _spared brokenbond = false if brokenbond { - if messageanimindex < 0 messageanimindex = 7 global.flag[63] = true; - if (global.flag[global.monstertype[myself] + 600] != -1 && recruitable) global.flag[global.monstertype[myself] + 600] = -1; + if (global.flag[global.monstertype[myself] + 600] != -1 && recruitable) { + global.flag[global.monstertype[myself] + 600] = -1; + if messageanimindex < 0 messageanimindex = 7 + } } if messageanimindex >= 0 { _rtext = instance_create(global.monsterx[myself], global.monstery[myself] - 40, obj_recruitanim); From 23aab45a94a6e08a33cd3041320d9b7b425295d4 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Wed, 28 Jan 2026 10:15:26 -0800 Subject: [PATCH 42/56] Minor Code Cleanup --- scripts/scr_turn/scr_turn.gml | 72 +++++++++++++---------------------- 1 file changed, 26 insertions(+), 46 deletions(-) diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index d7c4913e..6eaf5942 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -431,8 +431,7 @@ function scr_nextact() { } } -function scr_act_simul() -{ +function scr_act_simul(){ show_debug_message("------------ scr_act_simul") __simulcount = 0; @@ -464,9 +463,8 @@ function scr_act_simul() show_debug_message("------------") } -function scr_damage_enemy(arg0, arg1) -{ - dm = instance_create(global.monsterx[arg0], (global.monstery[arg0] + 20) - (global.hittarget[arg0] * 20), obj_dmgwriter); +function scr_damage_enemy(star, damage){ + dm = instance_create(global.monsterx[star], (global.monstery[star] + 20) - (global.hittarget[star] * 20), obj_dmgwriter); /*if (caster < 4) { @@ -481,55 +479,48 @@ function scr_damage_enemy(arg0, arg1) dm.type = 0; dm.char = global.char[caster]; - dm.damage = arg1; - global.monsterhp[arg0] -= arg1; + dm.damage = damage; + global.monsterhp[star] -= damage; - if (arg1 > 0) - { - with (global.monsterinstance[arg0]) + if (damage > 0) { + with (global.monsterinstance[star]) { shakex = 9; state = 3; hurttimer = 30; } - if (i_ex(global.monsterinstance[arg0])) - global.monsterinstance[arg0].hurtamt = arg1; + if (i_ex(global.monsterinstance[star])) global.monsterinstance[star].hurtamt = damage; } - global.hittarget[arg0] += 1; + global.hittarget[star] += 1; - if (arg1 == 0) - { - with (global.monsterinstance[arg0]) - { + if (damage == 0) { + with (global.monsterinstance[star]) { hurtamt = 0; - if (hurttimer <= 15 && candodge == 1) - { + if (hurttimer <= 15 && candodge == true) { dodgetimer = 0; state = 4; } } } - var a = 0; + var a = false; // if A is not false it WILL not allow death. - if (global.monsterhp[arg0] <= 0 && a == 0) - { - with (global.monsterinstance[arg0]) + if (global.monsterhp[star] <= 0 && a == false) { + with (global.monsterinstance[star]) scr_monsterdefeat(); } } -function scr_turntimer(arg0){ - if (global.turntimer < arg0) - global.turntimer = arg0; +function scr_turntimer(time){ + if (global.turntimer < time) + global.turntimer = time; } -function scr_bulletspawner(arg0, arg1, arg2) -{ - __dc = instance_create(arg0, arg1, arg2); +function scr_bulletspawner(x, y, obj){ + __dc = instance_create(x, y, obj); __dc.creator = myself; __dc.creatorid = id; __dc.target = mytarget; @@ -537,8 +528,7 @@ function scr_bulletspawner(arg0, arg1, arg2) return __dc; } -function scr_simultext(arg0) -{ +function scr_simultext(arg0){ __yoffset = simulorder[arg0] * 30; global.typer = 4; battlewriter = instance_create(xx + 30, yy + 376 + __yoffset, obj_writer); @@ -567,28 +557,18 @@ function scr_enemyhurt_tired_after_damage(arg0) scr_monster_make_tired(myself); } -function scr_enemy_hurt() -{ +function scr_enemy_hurt(){ hurttimer -= 1; if (hurttimer < 0) - { state = 0; - } - else - { - if (global.monster[myself] == 0) - scr_defeatrun(); + else { + if (global.monster[myself] == 0) scr_defeatrun(); hurtshake += 1; - if (hurtshake > 1) - { - if (shakex > 0) - shakex -= 1; - - if (shakex < 0) - shakex += 1; + if (hurtshake > 1) { + if abs(shakex) > 0 shakex -= sign(shakex) shakex = -shakex; hurtshake = 0; From b3cc8ab9969b2219cf825e242f2ef9e370f526f0 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Wed, 28 Jan 2026 13:07:57 -0800 Subject: [PATCH 43/56] Replaced multiple instances of AutoGenerated GMS1 -> GMS2 Camera get function calls to Chapter 2+ Version --- objects/obj_battleback/Draw_0.gml | 4 +- objects/obj_battlecontroller/Draw_0.gml | 4 +- objects/obj_custommenu/Create_0.gml | 4 +- objects/obj_custommenu/Draw_0.gml | 4 +- objects/obj_darkcontroller/Create_0.gml | 4 +- objects/obj_darkcontroller/Draw_0.gml | 4 +- objects/obj_darkener/Draw_0.gml | 2 +- objects/obj_dbullet_vert/Create_0.gml | 8 +-- objects/obj_dbullet_vert/Draw_0.gml | 4 +- objects/obj_fusionmenu/Step_0.gml | 4 +- objects/obj_moveheart/Create_0.gml | 4 +- objects/obj_pacifyspell/Create_0.gml | 4 +- objects/obj_panner/Create_0.gml | 4 +- objects/obj_panner/Step_0.gml | 4 +- objects/obj_regularbullet/Step_0.gml | 8 +-- objects/obj_spell_snowgrave/Draw_0.gml | 4 +- objects/obj_tensionbar/Create_0.gml | 4 +- objects/obj_tensionbar/Draw_0.gml | 2 +- scripts/camera/camera.gml | 50 +++++++++++-------- scripts/scr_battlecursor/scr_battlecursor.gml | 4 +- scripts/scr_encounter/scr_encounter.gml | 4 +- scripts/scr_enemy_config/scr_enemy_config.gml | 6 +-- 22 files changed, 75 insertions(+), 65 deletions(-) diff --git a/objects/obj_battleback/Draw_0.gml b/objects/obj_battleback/Draw_0.gml index e7ea48da..654c84a3 100644 --- a/objects/obj_battleback/Draw_0.gml +++ b/objects/obj_battleback/Draw_0.gml @@ -1,5 +1,5 @@ -xx = __view_get(e__VW.XView, 0); -yy = __view_get(e__VW.YView, 0); +xx = camerax(); +yy = cameray(); siner += (bgspeed / 2); siner2 += bgspeed; diff --git a/objects/obj_battlecontroller/Draw_0.gml b/objects/obj_battlecontroller/Draw_0.gml index 20d4cd2e..9b83dd92 100644 --- a/objects/obj_battlecontroller/Draw_0.gml +++ b/objects/obj_battlecontroller/Draw_0.gml @@ -1,5 +1,5 @@ -xx = __view_get(e__VW.XView, 0); -yy = __view_get(e__VW.YView, 0); +xx = camerax(); +yy = cameray(); tpoff = (tp - tpy) + yy; bpoff = -bp + bpy + yy; diff --git a/objects/obj_custommenu/Create_0.gml b/objects/obj_custommenu/Create_0.gml index 6817ab39..bd2adf78 100644 --- a/objects/obj_custommenu/Create_0.gml +++ b/objects/obj_custommenu/Create_0.gml @@ -66,8 +66,8 @@ for (i = 0; i < menuMax; i++) menuSpacingY[i] = 40; menuTextOffsetX[i] = 30; menuTextOffsetY[i] = 0; - menuX[i] = __view_get(e__VW.XView, 0); - menuY[i] = __view_get(e__VW.YView, 0); + menuX[i] = camerax(); + menuY[i] = cameray(); menuBoxDraw[i] = 1; menuBoxDrawX1[i] = menuX[i] - 20; menuBoxDrawX2[i] = menuX[i] + (menuSpacingX[i] * menuWidth[i]) + 20; diff --git a/objects/obj_custommenu/Draw_0.gml b/objects/obj_custommenu/Draw_0.gml index 3dd5d3ea..374cbde5 100644 --- a/objects/obj_custommenu/Draw_0.gml +++ b/objects/obj_custommenu/Draw_0.gml @@ -1,5 +1,5 @@ -xx = __view_get(e__VW.XView, 0); -yy = __view_get(e__VW.YView, 0); +xx = camerax(); +yy = cameray(); for (m = 0; m < menuMax; m++) { diff --git a/objects/obj_darkcontroller/Create_0.gml b/objects/obj_darkcontroller/Create_0.gml index bd2a5906..3c7eb40e 100644 --- a/objects/obj_darkcontroller/Create_0.gml +++ b/objects/obj_darkcontroller/Create_0.gml @@ -3,8 +3,8 @@ alarm[0] = 1; charcon = 0; chartimer = 0; tp = 0; -xx = __view_get(e__VW.XView, 0); -yy = __view_get(e__VW.YView, 0); +xx = camerax(); +yy = cameray(); global.fighting = 0; movenoise = 0; selectnoise = 0; diff --git a/objects/obj_darkcontroller/Draw_0.gml b/objects/obj_darkcontroller/Draw_0.gml index 9826e832..5ea6d068 100644 --- a/objects/obj_darkcontroller/Draw_0.gml +++ b/objects/obj_darkcontroller/Draw_0.gml @@ -1,5 +1,5 @@ -xx = __view_get(e__VW.XView, 0); -yy = __view_get(e__VW.YView, 0); +xx = camerax(); +yy = cameray(); tpoff = (tp - tpy) + yy; bpoff = -bp + bpy + yy; diff --git a/objects/obj_darkener/Draw_0.gml b/objects/obj_darkener/Draw_0.gml index 63ad2b72..4cc9d2d1 100644 --- a/objects/obj_darkener/Draw_0.gml +++ b/objects/obj_darkener/Draw_0.gml @@ -32,5 +32,5 @@ if (darken == 0) draw_set_alpha(darkamt / 20); draw_set_color(c_black); -draw_rectangle(__view_get(e__VW.XView, 0) - 40, __view_get(e__VW.YView, 0) - 40, __view_get(e__VW.XView, 0) + 680, __view_get(e__VW.YView, 0) + 520, false); +draw_rectangle(camerax() - 40, cameray() - 40, camerax() + 680, cameray() + 520, false); draw_set_alpha(1); \ No newline at end of file diff --git a/objects/obj_dbullet_vert/Create_0.gml b/objects/obj_dbullet_vert/Create_0.gml index 4cb0d1f1..abba0428 100644 --- a/objects/obj_dbullet_vert/Create_0.gml +++ b/objects/obj_dbullet_vert/Create_0.gml @@ -3,11 +3,11 @@ grazepoints = 5; timepoints = 5; active = 0; -if (y < (__view_get(e__VW.YView, 0) + 20)) - y = __view_get(e__VW.YView, 0) + 20; +if (y < (cameray() + 20)) + y = cameray() + 20; -if (y > (__view_get(e__VW.YView, 0) + 460)) - y = __view_get(e__VW.YView, 0) + 460; +if (y > (cameray() + 460)) + y = cameray() + 460; dont = 1; difficulty = 1; diff --git a/objects/obj_dbullet_vert/Draw_0.gml b/objects/obj_dbullet_vert/Draw_0.gml index 18c09dd3..cf0ff72d 100644 --- a/objects/obj_dbullet_vert/Draw_0.gml +++ b/objects/obj_dbullet_vert/Draw_0.gml @@ -42,10 +42,10 @@ if (dont == 0) speed = 8; } - if (y > (__view_get(e__VW.YView, 0) + 500)) + if (y > (cameray() + 500)) instance_destroy(); - if (y < (__view_get(e__VW.YView, 0) - 20)) + if (y < (cameray() - 20)) instance_destroy(); } diff --git a/objects/obj_fusionmenu/Step_0.gml b/objects/obj_fusionmenu/Step_0.gml index 12fa8b11..e4376efd 100644 --- a/objects/obj_fusionmenu/Step_0.gml +++ b/objects/obj_fusionmenu/Step_0.gml @@ -1,7 +1,7 @@ if (init == 0) { - xx = __view_get(e__VW.XView, 0); - yy = __view_get(e__VW.YView, 0); + xx = camerax(); + yy = cameray(); customxy = 0; // Fuse Items if (type == 1) diff --git a/objects/obj_moveheart/Create_0.gml b/objects/obj_moveheart/Create_0.gml index f292b6f1..f1755b67 100644 --- a/objects/obj_moveheart/Create_0.gml +++ b/objects/obj_moveheart/Create_0.gml @@ -10,8 +10,8 @@ if (instance_exists(obj_heartmarker)) } else if (!instance_exists(obj_growtangle)) { - distx = __view_get(e__VW.XView, 0) + 310; - disty = __view_get(e__VW.YView, 0) + 160; + distx = camerax() + 310; + disty = cameray() + 160; } else { diff --git a/objects/obj_pacifyspell/Create_0.gml b/objects/obj_pacifyspell/Create_0.gml index d5e0028e..3ff4ab8a 100644 --- a/objects/obj_pacifyspell/Create_0.gml +++ b/objects/obj_pacifyspell/Create_0.gml @@ -1,8 +1,8 @@ target = 439493; con = 1; siner = 0; -xx = __view_get(e__VW.XView, 0); -yy = __view_get(e__VW.YView, 0); +xx = camerax(); +yy = cameray(); alarm[4] = 50; fail = 0; flashcolor = c_blue; diff --git a/objects/obj_panner/Create_0.gml b/objects/obj_panner/Create_0.gml index 8f797e8e..3f428c66 100644 --- a/objects/obj_panner/Create_0.gml +++ b/objects/obj_panner/Create_0.gml @@ -1,7 +1,7 @@ panx = 0; pany = 0; -startx = __view_get(e__VW.XView, 0); -starty = __view_get(e__VW.YView, 0); +startx = camerax(); +starty = cameray(); finalx = x; finaly = y; panmax = 1; diff --git a/objects/obj_panner/Step_0.gml b/objects/obj_panner/Step_0.gml index cfcccd39..58b7310d 100644 --- a/objects/obj_panner/Step_0.gml +++ b/objects/obj_panner/Step_0.gml @@ -1,7 +1,7 @@ if (type == 0) { - __view_set(e__VW.XView, 0, __view_get(e__VW.XView, 0) + panx); - __view_set(e__VW.YView, 0, __view_get(e__VW.YView, 0) + pany); + __view_set(e__VW.XView, 0, camerax() + panx); + __view_set(e__VW.YView, 0, cameray() + pany); } pantimer += 1; diff --git a/objects/obj_regularbullet/Step_0.gml b/objects/obj_regularbullet/Step_0.gml index 93230358..6bd8c82e 100644 --- a/objects/obj_regularbullet/Step_0.gml +++ b/objects/obj_regularbullet/Step_0.gml @@ -1,15 +1,15 @@ if (wall_destroy == 1) { - if (x < (__view_get(e__VW.XView, 0) - 80)) + if (x < (camerax() - 80)) instance_destroy(); - if (x > (__view_get(e__VW.XView, 0) + 760)) + if (x > (camerax() + 760)) instance_destroy(); - if (y < (__view_get(e__VW.YView, 0) - 80)) + if (y < (cameray() - 80)) instance_destroy(); - if (y > (__view_get(e__VW.YView, 0) + 580)) + if (y > (cameray() + 580)) instance_destroy(); } diff --git a/objects/obj_spell_snowgrave/Draw_0.gml b/objects/obj_spell_snowgrave/Draw_0.gml index 86ddc35b..ccb28502 100644 --- a/objects/obj_spell_snowgrave/Draw_0.gml +++ b/objects/obj_spell_snowgrave/Draw_0.gml @@ -1,5 +1,5 @@ -xx = __view_get(e__VW.XView, 0); -yy = __view_get(e__VW.YView, 0); +xx = camerax(); +yy = cameray(); if (init == 0) { diff --git a/objects/obj_tensionbar/Create_0.gml b/objects/obj_tensionbar/Create_0.gml index d515824f..af59c519 100644 --- a/objects/obj_tensionbar/Create_0.gml +++ b/objects/obj_tensionbar/Create_0.gml @@ -6,8 +6,8 @@ change = 0; changetimer = 15; red = 0; redtimer = 0; -xx = __view_get(e__VW.XView, 0); -yy = __view_get(e__VW.YView, 0); +xx = camerax(); +yy = cameray(); y = yy + 40; x = xx - 40; hspeed = 13; diff --git a/objects/obj_tensionbar/Draw_0.gml b/objects/obj_tensionbar/Draw_0.gml index d2dc677b..45244271 100644 --- a/objects/obj_tensionbar/Draw_0.gml +++ b/objects/obj_tensionbar/Draw_0.gml @@ -9,7 +9,7 @@ if (i_ex(obj_battlecontroller) && obj_battlecontroller.rouxlsgridenabled == true else yoffset = lerp(yoffset, 0, 0.25); -yy = __view_get(e__VW.YView, 0); +yy = cameray(); y = yy + 40 + yoffset; draw_sprite(spr_tensionbar, 1, 0, 0); diff --git a/scripts/camera/camera.gml b/scripts/camera/camera.gml index 0db3cd72..cf47e3a5 100644 --- a/scripts/camera/camera.gml +++ b/scripts/camera/camera.gml @@ -1,31 +1,41 @@ -function camerax() -{ - return camera_get_view_x(view_camera[0]); +// GET CAMERA +function camerax(cameraid = 0) { + return camera_get_view_x(view_camera[0]); } -function camerax_set(arg0) -{ - var __xpos = arg0; - var __ypos = camera_get_view_y(view_camera[0]); - camera_set_view_pos(view_camera[0], __xpos, __ypos); +function cameray(cameraid = 0) { + return camera_get_view_y(view_camera[cameraid]); } -function cameray() -{ - return camera_get_view_y(view_camera[0]); +function camerawidth(cameraid = 0) { + return camera_get_view_width(view_camera[cameraid]); } -function camerawidth() { - return __view_get(e__VW.WView, 0); +function cameraheight(cameraid = 0) { + return camera_get_view_height(view_camera[cameraid]); } -function cameraheight() { - return __view_get(e__VW.HView, 0); +// SET CAMERA +function camerax_set(camx, cameraid = 0) { + var __xpos = camx + var __ypos = camera_get_view_y(view_camera[cameraid]) + camera_set_view_pos(view_camera[cameraid], __xpos, __ypos) } -function cameray_set(arg0) -{ - var __xpos = camera_get_view_x(view_camera[0]); - var __ypos = arg0; - camera_set_view_pos(view_camera[0], __xpos, __ypos); +function cameray_set(camy, cameraid = 0) { + var __xpos = camera_get_view_x(view_camera[cameraid]) + var __ypos = camy + camera_set_view_pos(view_camera[cameraid], __xpos, __ypos) +} + +function camerawidth_set(camwidth, cameraid = 0) { + var __width = camwidth + var __height = camwidth(cameraid) + return camera_set_view_size(view_camera[cameraid], __width, __height); +} + +function cameraheight_set(camheight, cameraid = 0) { + var __width = camerawidth(cameraid) + var __height = camheight + return camera_set_view_size(view_camera[cameraid], __width, __height); } diff --git a/scripts/scr_battlecursor/scr_battlecursor.gml b/scripts/scr_battlecursor/scr_battlecursor.gml index 4aa0814a..8c7b76cf 100644 --- a/scripts/scr_battlecursor/scr_battlecursor.gml +++ b/scripts/scr_battlecursor/scr_battlecursor.gml @@ -12,8 +12,8 @@ function scr_battlecursor_memory_reset() function scr_battletext() { - xx = __view_get(e__VW.XView, 0); - yy = __view_get(e__VW.YView, 0); + xx = camerax(); + yy = cameray(); battlewriter = instance_create(xx + 30, yy + 376, obj_writer); myface = instance_create(xx + 26, yy + 380, obj_face); diff --git a/scripts/scr_encounter/scr_encounter.gml b/scripts/scr_encounter/scr_encounter.gml index 1fe8da49..66782d34 100644 --- a/scripts/scr_encounter/scr_encounter.gml +++ b/scripts/scr_encounter/scr_encounter.gml @@ -1,7 +1,7 @@ function scr_encountersetup(encounterid) { - xx = __view_get(e__VW.XView, 0); - yy = __view_get(e__VW.YView, 0); + xx = camerax(); + yy = cameray(); for (i = 0; i < 3; i += 1) { diff --git a/scripts/scr_enemy_config/scr_enemy_config.gml b/scripts/scr_enemy_config/scr_enemy_config.gml index f2b97c92..526513ea 100644 --- a/scripts/scr_enemy_config/scr_enemy_config.gml +++ b/scripts/scr_enemy_config/scr_enemy_config.gml @@ -145,7 +145,7 @@ function scr_enemy_process_phase(enemyId, phase) { if !scr_attackpriority(myattackpriority + 1) break; show_debug_message("My Attack Priority, pass: {0}", myattackpriority); - if !instance_exists(obj_growtangle) instance_create(__view_get(e__VW.XView, 0) + 320, __view_get(e__VW.YView, 0) + 170, obj_growtangle); + if !instance_exists(obj_growtangle) instance_create(camerax() + 320, cameray() + 170, obj_growtangle); if myattackchoice == DRBulletPattern.SwordThrow { obj_growtangle.x = camerax() + 240; @@ -185,8 +185,8 @@ function scr_enemy_process_phase(enemyId, phase) { } case DREncounterPhase.Acting: { - xx = __view_get(e__VW.XView, 0); - yy = __view_get(e__VW.YView, 0); + xx = camerax(); + yy = cameray(); // acting[charId] == actId (as defined in enemy config) // from what i can tell, actcon is just a helper value to make sure things get called correctly From 3407bac7d3563b4f14c3b595eecf330c4983dabf Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Wed, 28 Jan 2026 19:25:46 -0800 Subject: [PATCH 44/56] Minor Cleanup, and Fix to ArmorInfo_Mine --- scripts/scr_armorinfo/scr_armorinfo.gml | 6 ++---- scripts/scr_weaponinfo/scr_weaponinfo.gml | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/scr_armorinfo/scr_armorinfo.gml b/scripts/scr_armorinfo/scr_armorinfo.gml index d5699d06..7135aa64 100644 --- a/scripts/scr_armorinfo/scr_armorinfo.gml +++ b/scripts/scr_armorinfo/scr_armorinfo.gml @@ -1,7 +1,5 @@ -function scr_armorinfo_mine() -{ - for (i = 0; i < 6; i += 1) - { +function scr_armorinfo_mine(){ + for (i = 0; i < DRCharacter.__MAX__; i += 1) { scr_armorinfo(global.chararmor1[i]); chararmor1name[i] = armornametemp; chararmor1desc[i] = armordesctemp; diff --git a/scripts/scr_weaponinfo/scr_weaponinfo.gml b/scripts/scr_weaponinfo/scr_weaponinfo.gml index e03c5f8b..b5d0fc58 100644 --- a/scripts/scr_weaponinfo/scr_weaponinfo.gml +++ b/scripts/scr_weaponinfo/scr_weaponinfo.gml @@ -1,5 +1,4 @@ -function scr_weaponinfo_mine() -{ +function scr_weaponinfo_mine(){ for (i = 0; i < DRCharacter.__MAX__; i += 1) { scr_weaponinfo(global.charweapon[i], i); charweaponname[i] = weaponnametemp; @@ -23,8 +22,7 @@ function scr_weaponinfo_mine() } } -function scr_weaponinfo_all() -{ +function scr_weaponinfo_all(){ for (i = 0; i < 48; i += 1) { scr_weaponinfo(global.weapon[i]); From 7e1d2212e56e3baff5d63e4b8ee1fdd1c6c6b5f8 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Wed, 28 Jan 2026 19:33:12 -0800 Subject: [PATCH 45/56] Added the ability to Change the Max Weapon Inventory Size (By Default Same as Normal, 48) --- scripts/macros/macros.gml | 2 ++ scripts/scr_armorinfo/scr_armorinfo.gml | 26 ++++++++----------- scripts/scr_gamestart/scr_gamestart.gml | 2 +- .../scr_load_previous_chapter.gml | 2 +- scripts/scr_savefile/scr_savefile.gml | 8 +++--- scripts/scr_weaponinfo/scr_weaponinfo.gml | 17 ++++++------ 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml index 480a5cf8..a6a57219 100644 --- a/scripts/macros/macros.gml +++ b/scripts/macros/macros.gml @@ -1,4 +1,6 @@ function macros(){ #macro DEBUGMODE true #macro Debug:DEBUGMODE true + + #macro INVENTORYMAX_ARMORANDWEAPONS 48 } \ No newline at end of file diff --git a/scripts/scr_armorinfo/scr_armorinfo.gml b/scripts/scr_armorinfo/scr_armorinfo.gml index 7135aa64..9c7f336d 100644 --- a/scripts/scr_armorinfo/scr_armorinfo.gml +++ b/scripts/scr_armorinfo/scr_armorinfo.gml @@ -47,9 +47,8 @@ function scr_armorinfo_mine(){ } } -function scr_armorinfo_all() -{ - for (i = 0; i < 48; i += 1) +function scr_armorinfo_all(){ + for (i = 0; i < INVENTORYMAX_ARMORANDWEAPONS; i += 1) { scr_armorinfo(global.armor[i]); armorname[i] = armornametemp; @@ -120,7 +119,7 @@ function scr_armorget(arg0) var __itemcount = 0; __armor[0] = arg0; - for (__i = 0; __i < 48; __i++) + for (__i = 0; __i < INVENTORYMAX_ARMORANDWEAPONS; __i++) { if (global.armor[__i] != 0) { @@ -129,13 +128,13 @@ function scr_armorget(arg0) } } - if (__itemcount >= 48) + if (__itemcount >= INVENTORYMAX_ARMORANDWEAPONS) { noroom = 1; } else { - for (__i = 0; __i < 48; __i++) + for (__i = 0; __i < INVENTORYMAX_ARMORANDWEAPONS; __i++) { if (__i <= __itemcount) global.armor[__i] = __armor[__i]; @@ -146,20 +145,17 @@ function scr_armorget(arg0) } else if (legacy) { - loop = 1; - global.armor[48] = 999; + loop = true; + global.armor[INVENTORYMAX_ARMORANDWEAPONS] = 999; - while (loop == 1) - { - if (global.armor[__i] == 0) - { + while (loop) { + if (global.armor[__i] == 0) { global.armor[__i] = arg0; break; } - if (__i == 48) - { - noroom = 1; + if (__i == INVENTORYMAX_ARMORANDWEAPONS) { + noroom = true; break; } diff --git a/scripts/scr_gamestart/scr_gamestart.gml b/scripts/scr_gamestart/scr_gamestart.gml index 140120ae..9ac4d7e0 100644 --- a/scripts/scr_gamestart/scr_gamestart.gml +++ b/scripts/scr_gamestart/scr_gamestart.gml @@ -122,7 +122,7 @@ function scr_gamestart() for (i = 0; i < 72; i++) global.pocketitem[i] = DRItem.None; - for (i = 0; i < 48; i++) + for (i = 0; i < INVENTORYMAX_ARMORANDWEAPONS; i++) { global.weapon[i] = DRWeapon.None; global.armor[i] = DRArmor.None; diff --git a/scripts/scr_load_previous_chapter/scr_load_previous_chapter.gml b/scripts/scr_load_previous_chapter/scr_load_previous_chapter.gml index c3c8c47f..867ba484 100644 --- a/scripts/scr_load_previous_chapter/scr_load_previous_chapter.gml +++ b/scripts/scr_load_previous_chapter/scr_load_previous_chapter.gml @@ -570,7 +570,7 @@ function scr_load_chapter2() ossafe_file_text_readln(myfileid); } - for (j = 0; j < 48; j += 1) + for (j = 0; j < INVENTORYMAX_ARMORANDWEAPONS; j += 1) { global.weapon[j] = ossafe_file_text_read_real(myfileid); ossafe_file_text_readln(myfileid); diff --git a/scripts/scr_savefile/scr_savefile.gml b/scripts/scr_savefile/scr_savefile.gml index e8e3270a..996e3d94 100644 --- a/scripts/scr_savefile/scr_savefile.gml +++ b/scripts/scr_savefile/scr_savefile.gml @@ -472,9 +472,9 @@ function scr_saveprocess(arg0) { ossafe_file_text_writeln(myfileid); scr_ds_list_write(global.keyitem, 13); ossafe_file_text_writeln(myfileid); - scr_ds_list_write(global.weapon, 48); + scr_ds_list_write(global.weapon, INVENTORYMAX_ARMORANDWEAPONS); ossafe_file_text_writeln(myfileid); - scr_ds_list_write(global.armor, 48); + scr_ds_list_write(global.armor, INVENTORYMAX_ARMORANDWEAPONS); ossafe_file_text_writeln(myfileid); scr_ds_list_write(global.pocketitem, 72); ossafe_file_text_writeln(myfileid); @@ -489,7 +489,7 @@ function scr_saveprocess(arg0) { ossafe_file_text_writeln(myfileid); } - for (j = 0; j < 48; j++) + for (j = 0; j < INVENTORYMAX_ARMORANDWEAPONS; j++) { ossafe_file_text_write_real(myfileid, global.weapon[j]); ossafe_file_text_writeln(myfileid); @@ -804,7 +804,7 @@ function scr_load() { ossafe_file_text_readln(myfileid); } - for (j = 0; j < 48; j += 1) + for (j = 0; j < INVENTORYMAX_ARMORANDWEAPONS; j += 1) { global.weapon[j] = ossafe_file_text_read_real(myfileid); ossafe_file_text_readln(myfileid); diff --git a/scripts/scr_weaponinfo/scr_weaponinfo.gml b/scripts/scr_weaponinfo/scr_weaponinfo.gml index b5d0fc58..4a034007 100644 --- a/scripts/scr_weaponinfo/scr_weaponinfo.gml +++ b/scripts/scr_weaponinfo/scr_weaponinfo.gml @@ -23,8 +23,7 @@ function scr_weaponinfo_mine(){ } function scr_weaponinfo_all(){ - for (i = 0; i < 48; i += 1) - { + for (i = 0; i < INVENTORYMAX_ARMORANDWEAPONS; i += 1){ scr_weaponinfo(global.weapon[i]); weaponname[i] = weaponnametemp; weapondesc[i] = weapondesctemp; @@ -51,7 +50,7 @@ function scr_weaponcheck_inventory(arg0) haveit = 0; itemcount = 0; - for (i = 0; i < 48; i += 1) + for (i = 0; i < INVENTORYMAX_ARMORANDWEAPONS; i += 1) { if (global.weapon[i] == arg0) haveit = 1; @@ -94,7 +93,7 @@ function scr_weaponget(arg0) var __itemcount = 0; __weapon[0] = arg0; - for (__i = 0; __i < 48; __i++) + for (__i = 0; __i < INVENTORYMAX_ARMORANDWEAPONS; __i++) { if (global.weapon[__i] != 0) { @@ -103,13 +102,13 @@ function scr_weaponget(arg0) } } - if (__itemcount >= 48) + if (__itemcount >= INVENTORYMAX_ARMORANDWEAPONS) { - noroom = 1; + noroom = true; } else { - for (__i = 0; __i < 48; __i++) + for (__i = 0; __i < INVENTORYMAX_ARMORANDWEAPONS; __i++) { if (__i <= __itemcount) global.weapon[__i] = __weapon[__i]; @@ -121,7 +120,7 @@ function scr_weaponget(arg0) else if (legacy) { loop = 1; - global.weapon[48] = 999; + global.weapon[INVENTORYMAX_ARMORANDWEAPONS] = 999; while (loop == 1) { @@ -131,7 +130,7 @@ function scr_weaponget(arg0) break; } - if (__i == 48) + if (__i == INVENTORYMAX_ARMORANDWEAPONS) { noroom = 1; break; From 69a51638cb4049a1c1f410fd77b626252acc95b2 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Wed, 28 Jan 2026 22:24:19 -0800 Subject: [PATCH 46/56] PACIFY DEFEAT TYPE can now Spare Enemies just like with the Spare Defeat Type --- scripts/scr_monster/scr_monster.gml | 9 +++------ scripts/scr_turn/scr_turn.gml | 8 ++++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/scr_monster/scr_monster.gml b/scripts/scr_monster/scr_monster.gml index ad963f0a..1b8c7835 100644 --- a/scripts/scr_monster/scr_monster.gml +++ b/scripts/scr_monster/scr_monster.gml @@ -101,16 +101,13 @@ function scr_monsterdefeat() global.flag[44]++; } - if (global.flag[51 + myself] == 2) - global.flag[41] += 1; - - if (global.flag[51 + myself] == 3) - global.flag[42] += 1; + if (global.flag[51 + myself] == MONSTERS_DEFEATTYPES_Spare) global.flag[41] += 1; + if (global.flag[51 + myself] == MONSTERS_DEFEATTYPES_Pacify) global.flag[42] += 1; if (global.flag[51 + myself] == 5) global.flag[43] += 1; - if (global.flag[51 + myself] == 6) + if (global.flag[51 + myself] == MONSTERS_DEFEATTYPES_Frozen) { global.flag[45] += 1; global.monstergold[3] += 24; diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 6eaf5942..f0e83b0f 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -581,8 +581,12 @@ function scr_defeatrun(){ _spared = false if !variable_struct_exists(self, "fatal") fatal = false if variable_struct_exists(self, "myself") { - if global.flag[51 + myself] == 6 __frozen = true - if global.flag[51 + myself] == 2 _spared = true + switch global.flag[51 + myself] { + case MONSTERS_DEFEATTYPES_Frozen: __frozen = true break; + + case MONSTERS_DEFEATTYPES_Pacify: + case MONSTERS_DEFEATTYPES_Spare: _spared = true break; + } } if (object_is_ancestor(object_index, obj_monsterparent)) { From ae4c6a092d9652d5d35fc9913eb05bb4d84606ba Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Wed, 28 Jan 2026 22:30:58 -0800 Subject: [PATCH 47/56] Added Minor Change to not set a Defeat Value if it was already Set by some other method --- scripts/scr_turn/scr_turn.gml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/scr_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index f0e83b0f..f44b354f 100644 --- a/scripts/scr_turn/scr_turn.gml +++ b/scripts/scr_turn/scr_turn.gml @@ -577,9 +577,9 @@ function scr_enemy_hurt(){ } function scr_defeatrun(){ - __frozen = false; - _spared = false - if !variable_struct_exists(self, "fatal") fatal = false + if !variable_struct_exists(self, "__frozen") __frozen = false + if !variable_struct_exists(self, "_spared") _spared = false + if !variable_struct_exists(self, "fatal") fatal = false if variable_struct_exists(self, "myself") { switch global.flag[51 + myself] { case MONSTERS_DEFEATTYPES_Frozen: __frozen = true break; From a16fbcd7824916e33ec97f25496af40dc3e43d31 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Fri, 30 Jan 2026 09:28:00 -0800 Subject: [PATCH 48/56] Very Minor Changes Made Variable "parent" in Caterpillar Chara more important (Technically also now allows you to change what the Caterpillar follows.) Made it so if darkcontroller was Spawned before Mainchara it'll wait until mainchara is Initialized before attempting to try to spawn the Caterpillar chara again (Currently only in Dark Controller.) --- objects/obj_caterpillarchara/Step_2.gml | 18 ++++++++++-------- objects/obj_darkcontroller/Create_0.gml | 6 +++++- objects/obj_darkcontroller/Draw_76.gml | 4 ++++ .../obj_darkcontroller/obj_darkcontroller.yy | 1 + 4 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 objects/obj_darkcontroller/Draw_76.gml diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index 269ebe64..41b06c14 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -1,3 +1,5 @@ +if !i_ex(parent) exit; + if (!init) { ignoredepth = false; init = true; @@ -60,7 +62,7 @@ walk = false; runmove = false; slided = false; -if (obj_mainchara.x != remx[0]) || (obj_mainchara.y != remy[0]) +if (parent.x != remx[0]) || (parent.y != remy[0]) moved = true; if (sliding[target] == true) moved = true; @@ -75,12 +77,12 @@ if (moved == true && follow == true) { sliding[i] = sliding[i - 1]; } - remx[0] = obj_mainchara.x; - remy[0] = obj_mainchara.y; - sliding[0] = obj_mainchara.sliding; + remx[0] = parent.x; + remy[0] = parent.y; + sliding[0] = parent.sliding; facing[0] = global.facing; - x = remx[target] - halign + obj_mainchara.halign; - y = remy[target] - valign + obj_mainchara.valign; + x = remx[target] - halign + parent.halign; + y = remy[target] - valign + parent.valign; if (sliding[target] == true) { x = remx[target]; @@ -107,8 +109,8 @@ if fun == false { if ((/*dsprite == spr_ralseid || */dsprite == spr_ralsei_walk_down) && global.interact == 0 && fun == 0) { - distfrommcx = obj_mainchara.x - (x + 2); - distfrommcy = obj_mainchara.y - (y + 12); + distfrommcx = parent.x - (x + 2); + distfrommcy = parent.y - (y + 12); if (abs(distfrommcy) <= 14 && abs(distfrommcx) <= 20) { diff --git a/objects/obj_darkcontroller/Create_0.gml b/objects/obj_darkcontroller/Create_0.gml index 3c7eb40e..b6999571 100644 --- a/objects/obj_darkcontroller/Create_0.gml +++ b/objects/obj_darkcontroller/Create_0.gml @@ -43,7 +43,11 @@ for (var i = 0; i < 36; i += 1) global.cinstance[0] = 4343434343; global.cinstance[1] = 343434343434; -scr_overworldcontrollers_spawncharacters(true) +spawnedfollowers = false +if i_ex(obj_mainchara) && variable_instance_exists(obj_mainchara, "dsprite") { + spawnedfollowers = true + scr_overworldcontrollers_spawncharacters(true) +} global.charinstance[0] = obj_mainchara; global.charinstance[1] = global.cinstance[0]; diff --git a/objects/obj_darkcontroller/Draw_76.gml b/objects/obj_darkcontroller/Draw_76.gml new file mode 100644 index 00000000..88bd337a --- /dev/null +++ b/objects/obj_darkcontroller/Draw_76.gml @@ -0,0 +1,4 @@ +if i_ex(obj_mainchara) && variable_instance_exists(obj_mainchara, "dsprite") && !spawnedfollowers { + spawnedfollowers = true + scr_overworldcontrollers_spawncharacters(true) +} \ No newline at end of file diff --git a/objects/obj_darkcontroller/obj_darkcontroller.yy b/objects/obj_darkcontroller/obj_darkcontroller.yy index 88d5a44c..99d5a13b 100644 --- a/objects/obj_darkcontroller/obj_darkcontroller.yy +++ b/objects/obj_darkcontroller/obj_darkcontroller.yy @@ -5,6 +5,7 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":76,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"obj_darkcontroller", From 90c79a2f094923d12d00554541a8c49cd13c76e9 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Fri, 30 Jan 2026 09:34:16 -0800 Subject: [PATCH 49/56] Added Some of Deltarune's Shaders --- DELTAModKit.yyp | 8 ++++++ shaders/shd_dissolve/shd_dissolve.fsh | 30 +++++++++++++++++++++ shaders/shd_dissolve/shd_dissolve.vsh | 19 +++++++++++++ shaders/shd_dissolve/shd_dissolve.yy | 12 +++++++++ shaders/shd_fade/shd_fade.fsh | 12 +++++++++ shaders/shd_fade/shd_fade.vsh | 19 +++++++++++++ shaders/shd_fade/shd_fade.yy | 12 +++++++++ shaders/shd_grayscale/shd_grayscale.fsh | 8 ++++++ shaders/shd_grayscale/shd_grayscale.vsh | 10 +++++++ shaders/shd_grayscale/shd_grayscale.yy | 12 +++++++++ shaders/shd_hsl/shd_hsl.fsh | 10 +++++++ shaders/shd_hsl/shd_hsl.vsh | 36 +++++++++++++++++++++++++ shaders/shd_hsl/shd_hsl.yy | 12 +++++++++ shaders/shd_hue/shd_hue.fsh | 23 ++++++++++++++++ shaders/shd_hue/shd_hue.vsh | 19 +++++++++++++ shaders/shd_hue/shd_hue.yy | 12 +++++++++ 16 files changed, 254 insertions(+) create mode 100644 shaders/shd_dissolve/shd_dissolve.fsh create mode 100644 shaders/shd_dissolve/shd_dissolve.vsh create mode 100644 shaders/shd_dissolve/shd_dissolve.yy create mode 100644 shaders/shd_fade/shd_fade.fsh create mode 100644 shaders/shd_fade/shd_fade.vsh create mode 100644 shaders/shd_fade/shd_fade.yy create mode 100644 shaders/shd_grayscale/shd_grayscale.fsh create mode 100644 shaders/shd_grayscale/shd_grayscale.vsh create mode 100644 shaders/shd_grayscale/shd_grayscale.yy create mode 100644 shaders/shd_hsl/shd_hsl.fsh create mode 100644 shaders/shd_hsl/shd_hsl.vsh create mode 100644 shaders/shd_hsl/shd_hsl.yy create mode 100644 shaders/shd_hue/shd_hue.fsh create mode 100644 shaders/shd_hue/shd_hue.vsh create mode 100644 shaders/shd_hue/shd_hue.yy diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index 0e8314e4..1e82a84b 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -71,6 +71,9 @@ {"$GMFolder":"","%Name":"Menus","folderPath":"folders/DELTARUNE/Scripts/Menus.yy","name":"Menus","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Party","folderPath":"folders/DELTARUNE/Scripts/Party.yy","name":"Party","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"World","folderPath":"folders/DELTARUNE/Scripts/World.yy","name":"World","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Shaders","folderPath":"folders/DELTARUNE/Shaders.yy","name":"Shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Ch2+","folderPath":"folders/DELTARUNE/Shaders/Ch2+.yy","name":"Ch2+","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Ch4+","folderPath":"folders/DELTARUNE/Shaders/Ch4+.yy","name":"Ch4+","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Sounds","folderPath":"folders/DELTARUNE/Sounds.yy","name":"Sounds","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Contact","folderPath":"folders/DELTARUNE/Sounds/Contact.yy","name":"Contact","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Dark","folderPath":"folders/DELTARUNE/Sounds/Dark.yy","name":"Dark","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -476,6 +479,11 @@ {"id":{"name":"snd_play","path":"scripts/snd_play/snd_play.yy",},}, {"id":{"name":"substring","path":"scripts/substring/substring.yy",},}, {"id":{"name":"texttype","path":"scripts/texttype/texttype.yy",},}, + {"id":{"name":"shd_dissolve","path":"shaders/shd_dissolve/shd_dissolve.yy",},}, + {"id":{"name":"shd_fade","path":"shaders/shd_fade/shd_fade.yy",},}, + {"id":{"name":"shd_grayscale","path":"shaders/shd_grayscale/shd_grayscale.yy",},}, + {"id":{"name":"shd_hsl","path":"shaders/shd_hsl/shd_hsl.yy",},}, + {"id":{"name":"shd_hue","path":"shaders/shd_hue/shd_hue.yy",},}, {"id":{"name":"AUDIO_APPEARANCE","path":"sounds/AUDIO_APPEARANCE/AUDIO_APPEARANCE.yy",},}, {"id":{"name":"AUDIO_INTRONOISE","path":"sounds/AUDIO_INTRONOISE/AUDIO_INTRONOISE.yy",},}, {"id":{"name":"snd_break1","path":"sounds/snd_break1/snd_break1.yy",},}, diff --git a/shaders/shd_dissolve/shd_dissolve.fsh b/shaders/shd_dissolve/shd_dissolve.fsh new file mode 100644 index 00000000..6c4476a8 --- /dev/null +++ b/shaders/shd_dissolve/shd_dissolve.fsh @@ -0,0 +1,30 @@ + + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; +uniform sampler2D DissolveTex; +uniform float Dissolve; +uniform float Edge; +uniform vec2 DissolveUV; +uniform vec2 DefaultUV; +uniform vec3 C1; +uniform vec3 C2; +void main() +{ + vec2 ConvertedUV = v_vTexcoord - DefaultUV; + vec4 DissolveCol = texture2D( DissolveTex, DissolveUV + ConvertedUV); + + float Dissolve = (Dissolve * (1.0 + Edge)); + Dissolve = (Dissolve - 1.0); + + vec4 pixcolor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); + gl_FragColor = pixcolor; + gl_FragColor.a = min(DissolveCol.r + Dissolve, gl_FragColor.a); + + if (gl_FragColor.a <= Edge) + { + gl_FragColor.rgb = mix(C1,C2,gl_FragColor.a/Edge); + } + gl_FragColor.a = min(ceil(gl_FragColor.a),pixcolor.a); +} + diff --git a/shaders/shd_dissolve/shd_dissolve.vsh b/shaders/shd_dissolve/shd_dissolve.vsh new file mode 100644 index 00000000..3900c20f --- /dev/null +++ b/shaders/shd_dissolve/shd_dissolve.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/shd_dissolve/shd_dissolve.yy b/shaders/shd_dissolve/shd_dissolve.yy new file mode 100644 index 00000000..92bd2c1f --- /dev/null +++ b/shaders/shd_dissolve/shd_dissolve.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"shd_dissolve", + "name":"shd_dissolve", + "parent":{ + "name":"Ch4+", + "path":"folders/DELTARUNE/Shaders/Ch4+.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/shd_fade/shd_fade.fsh b/shaders/shd_fade/shd_fade.fsh new file mode 100644 index 00000000..19d07104 --- /dev/null +++ b/shaders/shd_fade/shd_fade.fsh @@ -0,0 +1,12 @@ +// +// Simple passthrough fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; +uniform float iAlpha; + +void main() +{ + gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); + gl_FragColor.a *= iAlpha; +} diff --git a/shaders/shd_fade/shd_fade.vsh b/shaders/shd_fade/shd_fade.vsh new file mode 100644 index 00000000..3900c20f --- /dev/null +++ b/shaders/shd_fade/shd_fade.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/shd_fade/shd_fade.yy b/shaders/shd_fade/shd_fade.yy new file mode 100644 index 00000000..df09606c --- /dev/null +++ b/shaders/shd_fade/shd_fade.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"shd_fade", + "name":"shd_fade", + "parent":{ + "name":"Ch4+", + "path":"folders/DELTARUNE/Shaders/Ch4+.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/shd_grayscale/shd_grayscale.fsh b/shaders/shd_grayscale/shd_grayscale.fsh new file mode 100644 index 00000000..da9d6e96 --- /dev/null +++ b/shaders/shd_grayscale/shd_grayscale.fsh @@ -0,0 +1,8 @@ +varying vec2 v_texcoord; + +void main() +{ + float gray = dot(texture2D(gm_BaseTexture,v_texcoord).rgb, vec3(0.21, 0.71, 0.07)); + + gl_FragColor = vec4(vec3(gray), texture2D(gm_BaseTexture,v_texcoord).a); +} diff --git a/shaders/shd_grayscale/shd_grayscale.vsh b/shaders/shd_grayscale/shd_grayscale.vsh new file mode 100644 index 00000000..3b2ef872 --- /dev/null +++ b/shaders/shd_grayscale/shd_grayscale.vsh @@ -0,0 +1,10 @@ +attribute vec3 in_Position; +attribute vec2 in_TextureCoord; + +varying vec2 v_texcoord; + +void main() +{ + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * vec4(in_Position, 1.0); + v_texcoord = in_TextureCoord; +} diff --git a/shaders/shd_grayscale/shd_grayscale.yy b/shaders/shd_grayscale/shd_grayscale.yy new file mode 100644 index 00000000..67cce7a4 --- /dev/null +++ b/shaders/shd_grayscale/shd_grayscale.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"shd_grayscale", + "name":"shd_grayscale", + "parent":{ + "name":"Ch2+", + "path":"folders/DELTARUNE/Shaders/Ch2+.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/shd_hsl/shd_hsl.fsh b/shaders/shd_hsl/shd_hsl.fsh new file mode 100644 index 00000000..e28a1789 --- /dev/null +++ b/shaders/shd_hsl/shd_hsl.fsh @@ -0,0 +1,10 @@ +// +// Simple passthrough fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); +} diff --git a/shaders/shd_hsl/shd_hsl.vsh b/shaders/shd_hsl/shd_hsl.vsh new file mode 100644 index 00000000..0c780a20 --- /dev/null +++ b/shaders/shd_hsl/shd_hsl.vsh @@ -0,0 +1,36 @@ +// +// Simple passthrough fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +uniform vec3 _hsl; + +const mat3 rgb2yiq = mat3(0.299, 0.587, 0.114, 0.595716, -0.274453, -0.321263, 0.211456, -0.522591, 0.311135); +const mat3 yiq2rgb = mat3(1.0, 0.9563, 0.6210, 1.0, -0.2721, -0.6474, 1.0, -1.1070, 1.7046); +const float PI = 3.14159265; + +void main() +{ + vec4 tColor = texture2D(gm_BaseTexture, v_vTexcoord); + vec3 yColor = (tColor.rgb * v_vColour.rgb) * rgb2yiq; + + + //change hue + float originalHue = atan(yColor.b, yColor.g); + float finalHue = originalHue + _hsl.r*PI; + + float chroma = sqrt(yColor.b * yColor.b + yColor.g * yColor.g); + + //change saturation + chroma = chroma+_hsl.g; + //chroma = clamp(chroma+_hsl.g,0,1); + + //change luminosity + float luma = yColor.r + _hsl.b; + //float luma = clamp(yColor.r+_hsl.b,0,1); + + vec3 yFinalColor = vec3(luma, chroma * cos(finalHue), chroma * sin(finalHue)); + + gl_FragColor = vec4(yFinalColor * yiq2rgb, tColor.a * v_vColour.a); +} diff --git a/shaders/shd_hsl/shd_hsl.yy b/shaders/shd_hsl/shd_hsl.yy new file mode 100644 index 00000000..6c13c73e --- /dev/null +++ b/shaders/shd_hsl/shd_hsl.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"shd_hsl", + "name":"shd_hsl", + "parent":{ + "name":"Ch4+", + "path":"folders/DELTARUNE/Shaders/Ch4+.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/shd_hue/shd_hue.fsh b/shaders/shd_hue/shd_hue.fsh new file mode 100644 index 00000000..97fa5d2b --- /dev/null +++ b/shaders/shd_hue/shd_hue.fsh @@ -0,0 +1,23 @@ +varying vec2 v_vTexcoord; +varying vec4 v_vColour; +uniform float u_Position; + +// https://en.wikipedia.org/wiki/YIQ + +const mat3 rgb2yiq = mat3(0.299, 0.587, 0.114, 0.595716, -0.274453, -0.321263, 0.211456, -0.522591, 0.311135); +const mat3 yiq2rgb = mat3(1.0, 0.9563, 0.6210, 1.0, -0.2721, -0.6474, 1.0, -1.1070, 1.7046); + +void main() +{ + vec4 tColor = texture2D(gm_BaseTexture, v_vTexcoord); + vec3 yColor = (tColor.rgb * v_vColour.rgb) * rgb2yiq; + + float originalHue = atan(yColor.b, yColor.g); + float finalHue = originalHue + u_Position; + + float chroma = sqrt(yColor.b * yColor.b + yColor.g * yColor.g); + + vec3 yFinalColor = vec3(yColor.r, chroma * cos(finalHue), chroma * sin(finalHue)); + + gl_FragColor = vec4(yFinalColor * yiq2rgb, tColor.a * v_vColour.a); +} diff --git a/shaders/shd_hue/shd_hue.vsh b/shaders/shd_hue/shd_hue.vsh new file mode 100644 index 00000000..13663624 --- /dev/null +++ b/shaders/shd_hue/shd_hue.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4(in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/shd_hue/shd_hue.yy b/shaders/shd_hue/shd_hue.yy new file mode 100644 index 00000000..0bc16750 --- /dev/null +++ b/shaders/shd_hue/shd_hue.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"shd_hue", + "name":"shd_hue", + "parent":{ + "name":"Ch2+", + "path":"folders/DELTARUNE/Shaders/Ch2+.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file From 6441805127996b87c6a2306cf293545653cf6ae4 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Fri, 30 Jan 2026 14:10:23 -0800 Subject: [PATCH 50/56] Minor Dark Controller Change, Fixed Copy&Paste Issue from copying shaders over from Deltarune. --- objects/obj_darkcontroller/Draw_0.gml | 17 ++++----- .../scr_heroes_config/scr_heroes_config.gml | 7 ++++ shaders/shd_hsl/shd_hsl.fsh | 28 +++++++++++++- shaders/shd_hsl/shd_hsl.vsh | 37 +++++-------------- 4 files changed, 52 insertions(+), 37 deletions(-) diff --git a/objects/obj_darkcontroller/Draw_0.gml b/objects/obj_darkcontroller/Draw_0.gml index 5ea6d068..4bb7ad86 100644 --- a/objects/obj_darkcontroller/Draw_0.gml +++ b/objects/obj_darkcontroller/Draw_0.gml @@ -282,14 +282,13 @@ if (global.menuno == 4) draw_set_font(global.mainbig_font); draw_text(xx + 130, yy + 105, string_hash_to_newline(global.charname[charcoord])); - for (i = 0; i < array_length(global.char); i += 1) - { + for (i = 0; i < array_length(global.char); i += 1) { chosen = 0.4; if (i == coord) chosen = 1; - - draw_sprite_ext(spr_equipchar_ch2, global.char[i], 90 + xx + (i * 50), 160 + yy, 2, 2, 0, c_white, chosen); + var headspritedata = scr_character_getdarkheadsprite(global.char[i]) + draw_sprite_ext(headspritedata[0], headspritedata[1], 90 + xx + (i * 50), 160 + yy, 2, 2, 0, c_white, chosen); } if (global.submenu == 20) @@ -469,14 +468,14 @@ if (global.menuno == 2) var charname_xoff = langopt(0, -25); draw_text(xx + 135 + charname_xoff, yy + 107, string_hash_to_newline(global.charname[charcoord])); - for (i = 0; i < 3; i += 1) - { + for (i = 0; i < 3; i += 1) { chosen = 0.4; - if (i == coord) - chosen = 1; + if (i == coord) chosen = 1; + + var headspritedata = scr_character_getdarkheadsprite(global.char[i]) - draw_sprite_ext(spr_equipchar_ch2, global.char[i], 90 + xx + (i * 50), 160 + yy, 2, 2, 0, c_white, chosen); + draw_sprite_ext(headspritedata[0], headspritedata[1], 90 + xx + (i * 50), 160 + yy, 2, 2, 0, c_white, chosen); } if (global.submenu == 10) diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index cba80d30..69c593bf 100644 --- a/scripts/scr_heroes_config/scr_heroes_config.gml +++ b/scripts/scr_heroes_config/scr_heroes_config.gml @@ -723,4 +723,11 @@ function scr_character_autotype(charIdx) { default: return [0] // Idle. case DRCharacter.Susie: return [1, 160] } +} + +function scr_character_getdarkheadsprite(charIdx) { + // Format: [{SpriteToCallFrom}, {ImageIndex}] + switch charIdx { + default: return [spr_equipchar_ch2, -1]//charIdx] + } } \ No newline at end of file diff --git a/shaders/shd_hsl/shd_hsl.fsh b/shaders/shd_hsl/shd_hsl.fsh index e28a1789..0c780a20 100644 --- a/shaders/shd_hsl/shd_hsl.fsh +++ b/shaders/shd_hsl/shd_hsl.fsh @@ -4,7 +4,33 @@ varying vec2 v_vTexcoord; varying vec4 v_vColour; +uniform vec3 _hsl; + +const mat3 rgb2yiq = mat3(0.299, 0.587, 0.114, 0.595716, -0.274453, -0.321263, 0.211456, -0.522591, 0.311135); +const mat3 yiq2rgb = mat3(1.0, 0.9563, 0.6210, 1.0, -0.2721, -0.6474, 1.0, -1.1070, 1.7046); +const float PI = 3.14159265; + void main() { - gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); + vec4 tColor = texture2D(gm_BaseTexture, v_vTexcoord); + vec3 yColor = (tColor.rgb * v_vColour.rgb) * rgb2yiq; + + + //change hue + float originalHue = atan(yColor.b, yColor.g); + float finalHue = originalHue + _hsl.r*PI; + + float chroma = sqrt(yColor.b * yColor.b + yColor.g * yColor.g); + + //change saturation + chroma = chroma+_hsl.g; + //chroma = clamp(chroma+_hsl.g,0,1); + + //change luminosity + float luma = yColor.r + _hsl.b; + //float luma = clamp(yColor.r+_hsl.b,0,1); + + vec3 yFinalColor = vec3(luma, chroma * cos(finalHue), chroma * sin(finalHue)); + + gl_FragColor = vec4(yFinalColor * yiq2rgb, tColor.a * v_vColour.a); } diff --git a/shaders/shd_hsl/shd_hsl.vsh b/shaders/shd_hsl/shd_hsl.vsh index 0c780a20..3900c20f 100644 --- a/shaders/shd_hsl/shd_hsl.vsh +++ b/shaders/shd_hsl/shd_hsl.vsh @@ -1,36 +1,19 @@ // -// Simple passthrough fragment shader +// Simple passthrough vertex shader // +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + varying vec2 v_vTexcoord; varying vec4 v_vColour; -uniform vec3 _hsl; - -const mat3 rgb2yiq = mat3(0.299, 0.587, 0.114, 0.595716, -0.274453, -0.321263, 0.211456, -0.522591, 0.311135); -const mat3 yiq2rgb = mat3(1.0, 0.9563, 0.6210, 1.0, -0.2721, -0.6474, 1.0, -1.1070, 1.7046); -const float PI = 3.14159265; - void main() { - vec4 tColor = texture2D(gm_BaseTexture, v_vTexcoord); - vec3 yColor = (tColor.rgb * v_vColour.rgb) * rgb2yiq; - - - //change hue - float originalHue = atan(yColor.b, yColor.g); - float finalHue = originalHue + _hsl.r*PI; - - float chroma = sqrt(yColor.b * yColor.b + yColor.g * yColor.g); - - //change saturation - chroma = chroma+_hsl.g; - //chroma = clamp(chroma+_hsl.g,0,1); - - //change luminosity - float luma = yColor.r + _hsl.b; - //float luma = clamp(yColor.r+_hsl.b,0,1); - - vec3 yFinalColor = vec3(luma, chroma * cos(finalHue), chroma * sin(finalHue)); + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; - gl_FragColor = vec4(yFinalColor * yiq2rgb, tColor.a * v_vColour.a); + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; } From 0b6677141226a22a3755de2aad38b958df34823e Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Tue, 3 Feb 2026 21:09:15 -0800 Subject: [PATCH 51/56] Added Noelle Battle Intro Animations, Added Function for checking asset existence, Added Battle Intros to Hero CONFIG --- DELTAModKit.yyp | 4 + objects/obj_encounterbasic/Create_0.gml | 73 +++------ objects/obj_encounterbasic/Step_0.gml | 26 +--- scripts/scr_asset_exists/scr_asset_exists.gml | 4 + scripts/scr_asset_exists/scr_asset_exists.yy | 13 ++ .../scr_heroes_config/scr_heroes_config.gml | 33 ++++ .../0712194f-08c9-458f-9c95-ce298c243ca6.png | Bin 0 -> 941 bytes .../09905c92-d295-439f-9207-8122dd91a6e1.png | Bin 0 -> 774 bytes .../15449b53-5888-41ae-ab0d-33cbb0f9c4bb.png | Bin 0 -> 815 bytes .../1acf3d9b-5ecf-426c-bdc3-1e2aef79d438.png | Bin 0 -> 809 bytes .../1b9023bd-6273-4e8e-98b7-3c1b1a001b31.png | Bin 0 -> 941 bytes .../38ff8503-1cd5-4ab7-b07d-f186055f3c25.png | Bin 0 -> 770 bytes .../5c7a7e27-f41c-4c34-8687-92e63baec044.png | Bin 0 -> 941 bytes .../72322e26-681b-4cbb-8852-3fa8227d2224.png | Bin 0 -> 973 bytes .../81f38d17-202d-41ec-bcc8-c430f6b8b943.png | Bin 0 -> 716 bytes .../9766496b-b20d-4c71-ab2d-b287642ddb30.png | Bin 0 -> 875 bytes .../cb6211cc-47b4-400f-962c-f354c0c160f5.png | Bin 0 -> 941 bytes .../e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8.png | Bin 0 -> 721 bytes .../f122b631-d4bf-4d49-a58b-bc074561f262.png | Bin 0 -> 973 bytes .../f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe.png | Bin 0 -> 973 bytes .../fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae.png | Bin 0 -> 973 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 941 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 774 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 815 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 809 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 941 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 770 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 941 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 973 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 716 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 875 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 941 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 721 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 973 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 973 bytes .../d2127cef-4b38-450e-8162-be3eeba20ed3.png | Bin 0 -> 973 bytes .../spr_noelleb_battleintro.yy | 146 ++++++++++++++++++ .../0e70563e-c2bc-47a3-bbdb-adb36cb93f53.png | Bin 0 -> 938 bytes .../38005f93-8b8a-4ebe-8d2e-00d4dc1a951a.png | Bin 0 -> 870 bytes .../42d1a74a-b9aa-46a6-ba2f-c9db2b517506.png | Bin 0 -> 938 bytes .../49954b19-785a-41cb-a914-4b35364e534d.png | Bin 0 -> 938 bytes .../548d30db-aa73-4744-8cbd-6ff871b5681f.png | Bin 0 -> 783 bytes .../650026c9-fa6b-41de-a60b-fba3d901b25b.png | Bin 0 -> 968 bytes .../a94460b6-2373-4c3c-8893-55f8720eab39.png | Bin 0 -> 767 bytes .../bb85fb7d-4277-4c3d-859b-e5e03638c634.png | Bin 0 -> 975 bytes .../c0386448-dfc8-4e28-8865-12b2d62ea14c.png | Bin 0 -> 975 bytes .../e9c71e60-1779-4505-86ef-a50a7c049954.png | Bin 0 -> 740 bytes .../f5800514-d536-463d-a7c1-393309b6547c.png | Bin 0 -> 968 bytes .../fe80eb11-7ef9-4faf-8770-6a423a6fecbf.png | Bin 0 -> 975 bytes .../fee5e780-d105-4173-a878-801064ea22a7.png | Bin 0 -> 968 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 938 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 870 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 938 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 938 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 783 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 968 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 767 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 975 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 975 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 740 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 968 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 975 bytes .../e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png | Bin 0 -> 968 bytes .../spr_noelleb_battleintro_l.yy | 138 +++++++++++++++++ .../1f3091de-a351-4965-a54b-f91f337ad48b.png | Bin 0 -> 810 bytes .../486869be-fd45-4fe3-bc52-037519c30ebb.png | Bin 0 -> 728 bytes .../4dfafad1-5571-462d-bc70-42e7cc4fbe4f.png | Bin 0 -> 719 bytes .../507c3c4b-7ca2-4044-a213-449aaf00f413.png | Bin 0 -> 755 bytes .../517212a0-14c3-4fd4-8142-c7cf44933975.png | Bin 0 -> 867 bytes .../541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611.png | Bin 0 -> 755 bytes .../69551cfc-8a5c-46ea-b634-fb9efd428c1a.png | Bin 0 -> 799 bytes .../72c13161-4909-4cac-94f9-8b54b06bf9ef.png | Bin 0 -> 746 bytes .../7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303.png | Bin 0 -> 728 bytes .../7bad117d-0920-41dc-a93b-a11bbecbfdf9.png | Bin 0 -> 796 bytes .../aa8813e1-3ba3-4df4-bb4a-5286efae8ed4.png | Bin 0 -> 746 bytes .../b7cbdd79-ba5b-4c3b-90da-bd38594f6b17.png | Bin 0 -> 843 bytes .../c8f0bb7f-959a-44ca-9858-a1660d4bcf58.png | Bin 0 -> 821 bytes .../d799e4f2-2a3d-4929-b5ce-d2b80905fb21.png | Bin 0 -> 719 bytes .../e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d.png | Bin 0 -> 812 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 810 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 728 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 719 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 755 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 867 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 755 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 799 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 746 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 728 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 796 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 746 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 843 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 821 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 719 bytes .../12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png | Bin 0 -> 812 bytes .../spr_noelleb_battleintro_sideb.yy | 146 ++++++++++++++++++ .../spr_npc_originalstarwalker.yy | 4 +- 96 files changed, 511 insertions(+), 76 deletions(-) create mode 100644 scripts/scr_asset_exists/scr_asset_exists.gml create mode 100644 scripts/scr_asset_exists/scr_asset_exists.yy create mode 100644 sprites/spr_noelleb_battleintro/0712194f-08c9-458f-9c95-ce298c243ca6.png create mode 100644 sprites/spr_noelleb_battleintro/09905c92-d295-439f-9207-8122dd91a6e1.png create mode 100644 sprites/spr_noelleb_battleintro/15449b53-5888-41ae-ab0d-33cbb0f9c4bb.png create mode 100644 sprites/spr_noelleb_battleintro/1acf3d9b-5ecf-426c-bdc3-1e2aef79d438.png create mode 100644 sprites/spr_noelleb_battleintro/1b9023bd-6273-4e8e-98b7-3c1b1a001b31.png create mode 100644 sprites/spr_noelleb_battleintro/38ff8503-1cd5-4ab7-b07d-f186055f3c25.png create mode 100644 sprites/spr_noelleb_battleintro/5c7a7e27-f41c-4c34-8687-92e63baec044.png create mode 100644 sprites/spr_noelleb_battleintro/72322e26-681b-4cbb-8852-3fa8227d2224.png create mode 100644 sprites/spr_noelleb_battleintro/81f38d17-202d-41ec-bcc8-c430f6b8b943.png create mode 100644 sprites/spr_noelleb_battleintro/9766496b-b20d-4c71-ab2d-b287642ddb30.png create mode 100644 sprites/spr_noelleb_battleintro/cb6211cc-47b4-400f-962c-f354c0c160f5.png create mode 100644 sprites/spr_noelleb_battleintro/e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8.png create mode 100644 sprites/spr_noelleb_battleintro/f122b631-d4bf-4d49-a58b-bc074561f262.png create mode 100644 sprites/spr_noelleb_battleintro/f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe.png create mode 100644 sprites/spr_noelleb_battleintro/fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae.png create mode 100644 sprites/spr_noelleb_battleintro/layers/0712194f-08c9-458f-9c95-ce298c243ca6/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/09905c92-d295-439f-9207-8122dd91a6e1/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/15449b53-5888-41ae-ab0d-33cbb0f9c4bb/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/1acf3d9b-5ecf-426c-bdc3-1e2aef79d438/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/1b9023bd-6273-4e8e-98b7-3c1b1a001b31/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/38ff8503-1cd5-4ab7-b07d-f186055f3c25/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/5c7a7e27-f41c-4c34-8687-92e63baec044/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/72322e26-681b-4cbb-8852-3fa8227d2224/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/81f38d17-202d-41ec-bcc8-c430f6b8b943/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/9766496b-b20d-4c71-ab2d-b287642ddb30/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/cb6211cc-47b4-400f-962c-f354c0c160f5/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/f122b631-d4bf-4d49-a58b-bc074561f262/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/layers/fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae/d2127cef-4b38-450e-8162-be3eeba20ed3.png create mode 100644 sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy create mode 100644 sprites/spr_noelleb_battleintro_l/0e70563e-c2bc-47a3-bbdb-adb36cb93f53.png create mode 100644 sprites/spr_noelleb_battleintro_l/38005f93-8b8a-4ebe-8d2e-00d4dc1a951a.png create mode 100644 sprites/spr_noelleb_battleintro_l/42d1a74a-b9aa-46a6-ba2f-c9db2b517506.png create mode 100644 sprites/spr_noelleb_battleintro_l/49954b19-785a-41cb-a914-4b35364e534d.png create mode 100644 sprites/spr_noelleb_battleintro_l/548d30db-aa73-4744-8cbd-6ff871b5681f.png create mode 100644 sprites/spr_noelleb_battleintro_l/650026c9-fa6b-41de-a60b-fba3d901b25b.png create mode 100644 sprites/spr_noelleb_battleintro_l/a94460b6-2373-4c3c-8893-55f8720eab39.png create mode 100644 sprites/spr_noelleb_battleintro_l/bb85fb7d-4277-4c3d-859b-e5e03638c634.png create mode 100644 sprites/spr_noelleb_battleintro_l/c0386448-dfc8-4e28-8865-12b2d62ea14c.png create mode 100644 sprites/spr_noelleb_battleintro_l/e9c71e60-1779-4505-86ef-a50a7c049954.png create mode 100644 sprites/spr_noelleb_battleintro_l/f5800514-d536-463d-a7c1-393309b6547c.png create mode 100644 sprites/spr_noelleb_battleintro_l/fe80eb11-7ef9-4faf-8770-6a423a6fecbf.png create mode 100644 sprites/spr_noelleb_battleintro_l/fee5e780-d105-4173-a878-801064ea22a7.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/0e70563e-c2bc-47a3-bbdb-adb36cb93f53/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/38005f93-8b8a-4ebe-8d2e-00d4dc1a951a/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/42d1a74a-b9aa-46a6-ba2f-c9db2b517506/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/49954b19-785a-41cb-a914-4b35364e534d/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/548d30db-aa73-4744-8cbd-6ff871b5681f/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/650026c9-fa6b-41de-a60b-fba3d901b25b/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/a94460b6-2373-4c3c-8893-55f8720eab39/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/bb85fb7d-4277-4c3d-859b-e5e03638c634/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/c0386448-dfc8-4e28-8865-12b2d62ea14c/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/e9c71e60-1779-4505-86ef-a50a7c049954/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/f5800514-d536-463d-a7c1-393309b6547c/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/fe80eb11-7ef9-4faf-8770-6a423a6fecbf/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/layers/fee5e780-d105-4173-a878-801064ea22a7/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png create mode 100644 sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy create mode 100644 sprites/spr_noelleb_battleintro_sideb/1f3091de-a351-4965-a54b-f91f337ad48b.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/486869be-fd45-4fe3-bc52-037519c30ebb.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/4dfafad1-5571-462d-bc70-42e7cc4fbe4f.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/507c3c4b-7ca2-4044-a213-449aaf00f413.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/517212a0-14c3-4fd4-8142-c7cf44933975.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/69551cfc-8a5c-46ea-b634-fb9efd428c1a.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/72c13161-4909-4cac-94f9-8b54b06bf9ef.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/7bad117d-0920-41dc-a93b-a11bbecbfdf9.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/aa8813e1-3ba3-4df4-bb4a-5286efae8ed4.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/b7cbdd79-ba5b-4c3b-90da-bd38594f6b17.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/c8f0bb7f-959a-44ca-9858-a1660d4bcf58.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/d799e4f2-2a3d-4929-b5ce-d2b80905fb21.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/1f3091de-a351-4965-a54b-f91f337ad48b/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/486869be-fd45-4fe3-bc52-037519c30ebb/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/4dfafad1-5571-462d-bc70-42e7cc4fbe4f/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/507c3c4b-7ca2-4044-a213-449aaf00f413/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/517212a0-14c3-4fd4-8142-c7cf44933975/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/69551cfc-8a5c-46ea-b634-fb9efd428c1a/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/72c13161-4909-4cac-94f9-8b54b06bf9ef/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/7bad117d-0920-41dc-a93b-a11bbecbfdf9/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/aa8813e1-3ba3-4df4-bb4a-5286efae8ed4/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/b7cbdd79-ba5b-4c3b-90da-bd38594f6b17/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/c8f0bb7f-959a-44ca-9858-a1660d4bcf58/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/d799e4f2-2a3d-4929-b5ce-d2b80905fb21/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/layers/e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png create mode 100644 sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index 1e82a84b..fd47ef7b 100644 --- a/DELTAModKit.yyp +++ b/DELTAModKit.yyp @@ -100,6 +100,7 @@ {"$GMFolder":"","%Name":"Light","folderPath":"folders/DELTARUNE/Sprites/Characters/Kris/Light.yy","name":"Light","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Noelle","folderPath":"folders/DELTARUNE/Sprites/Characters/Noelle.yy","name":"Noelle","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Battle","folderPath":"folders/DELTARUNE/Sprites/Characters/Noelle/Battle.yy","name":"Battle","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"SideB","folderPath":"folders/DELTARUNE/Sprites/Characters/Noelle/Battle/SideB.yy","name":"SideB","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Dark","folderPath":"folders/DELTARUNE/Sprites/Characters/Noelle/Dark.yy","name":"Dark","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Light","folderPath":"folders/DELTARUNE/Sprites/Characters/Noelle/Light.yy","name":"Light","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Ralsei","folderPath":"folders/DELTARUNE/Sprites/Characters/Ralsei.yy","name":"Ralsei","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -397,6 +398,7 @@ {"id":{"name":"scr_animate","path":"scripts/scr_animate/scr_animate.yy",},}, {"id":{"name":"scr_armorinfo","path":"scripts/scr_armorinfo/scr_armorinfo.yy",},}, {"id":{"name":"scr_armors_config","path":"scripts/scr_armors_config/scr_armors_config.yy",},}, + {"id":{"name":"scr_asset_exists","path":"scripts/scr_asset_exists/scr_asset_exists.yy",},}, {"id":{"name":"scr_attack_config","path":"scripts/scr_attack_config/scr_attack_config.yy",},}, {"id":{"name":"scr_battle","path":"scripts/scr_battle/scr_battle.yy",},}, {"id":{"name":"scr_battlecursor","path":"scripts/scr_battlecursor/scr_battlecursor.yy",},}, @@ -899,6 +901,8 @@ {"id":{"name":"spr_noelleb_actready","path":"sprites/spr_noelleb_actready/spr_noelleb_actready.yy",},}, {"id":{"name":"spr_noelleb_attack","path":"sprites/spr_noelleb_attack/spr_noelleb_attack.yy",},}, {"id":{"name":"spr_noelleb_attackready","path":"sprites/spr_noelleb_attackready/spr_noelleb_attackready.yy",},}, + {"id":{"name":"spr_noelleb_battleintro_sideb","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},}, + {"id":{"name":"spr_noelleb_battleintro","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},}, {"id":{"name":"spr_noelleb_defeat","path":"sprites/spr_noelleb_defeat/spr_noelleb_defeat.yy",},}, {"id":{"name":"spr_noelleb_defend","path":"sprites/spr_noelleb_defend/spr_noelleb_defend.yy",},}, {"id":{"name":"spr_noelleb_hurt","path":"sprites/spr_noelleb_hurt/spr_noelleb_hurt.yy",},}, diff --git a/objects/obj_encounterbasic/Create_0.gml b/objects/obj_encounterbasic/Create_0.gml index df0c9576..64b3a082 100644 --- a/objects/obj_encounterbasic/Create_0.gml +++ b/objects/obj_encounterbasic/Create_0.gml @@ -5,61 +5,28 @@ if (global.flag[9] == 1) scr_encountersetup(global.encounterno); -with (obj_mainchara) - visible = 0; - -with (global.cinstance[0]) - visible = 0; - -with (global.cinstance[1]) - visible = 0; - -with (obj_mainchara) - fun = 0; - -with (obj_caterpillarchara) - fun = 0; - -count = 0; -c[0] = scr_dark_marker(obj_mainchara.x, obj_mainchara.y, spr_kris_sword_jump_down); - -if (i_ex(global.cinstance[0])) -{ - count += 1; - c[1] = scr_dark_marker(global.cinstance[0].x, global.cinstance[0].y, global.cinstance[0].rsprite); - - if (global.cinstance[0].rsprite == spr_susier_dark) - c[1].sprite_index = spr_susier_wall; - - /*if (global.cinstance[0].name == "noelle") - { - var _sideb = scr_sideb_get_phase(); - c[1].sprite_index = spr_noelleb_battleintro; - - if (_sideb >= 2) - c[1].sprite_index = spr_noelleb_battleintro_sideb; - - c[1].image_speed = 0.5; - }*/ -} - -if (i_ex(global.cinstance[1])) -{ - count += 1; - c[2] = scr_dark_marker(global.cinstance[1].x, global.cinstance[1].y, global.cinstance[1].rsprite); - - if (global.cinstance[1].rsprite == spr_susier_dark) - c[2].sprite_index = spr_susier_wall; - - /*if (global.cinstance[1].name == "noelle") - { - c[2].sprite_index = spr_noelleb_battleintro; - c[2].image_speed = 0.5; - }*/ +count = -1; +for (var i = 0; i < array_length(global.cinstance) + 1 && i < array_length(global.char); ++i) { + var instance = obj_mainchara + var cateri = i - 1 + if cateri >= 0 instance = global.cinstance[cateri] + + if !i_ex(instance) continue + instance.visible = false + instance.fun = false + + _sprite = instance.sprite_index + _imagespeed = 1 + if variable_instance_exists(instance, "rsprite") _sprite = instance.rsprite + + scr_character_getbattleintro(global.char[i]) + + c[i] = scr_dark_marker(instance.x, instance.y, _sprite); + c[i].image_speed = _imagespeed + count++ } -for (i = 0; i < (count + 1); i += 1) -{ +for (i = 0; i < (count + 1) && i < array_length(global.heromakex) && i < array_length(global.heromakey); i += 1){ c[i].direction = point_direction(c[i].x, c[i].y, global.heromakex[i], global.heromakey[i]); c[i].speed = point_distance(c[i].x, c[i].y, global.heromakex[i], global.heromakey[i]) / 10; c[i].depth = 200 - (i * 20); diff --git a/objects/obj_encounterbasic/Step_0.gml b/objects/obj_encounterbasic/Step_0.gml index b9844856..4e347cae 100644 --- a/objects/obj_encounterbasic/Step_0.gml +++ b/objects/obj_encounterbasic/Step_0.gml @@ -27,28 +27,12 @@ if (fightcon == 1) snd_volume(wp2, 0.8, 0); } - for (i = 0; i < (count + 1); i += 1) - { + for (i = 0; i < (count + 1); i += 1) { c[i].speed = 0; - - if (global.char[i] != 4) - c[i].image_index = 0; - - if (global.char[i] == 1) - c[i].sprite_index = spr_krisb_attack; - - if (global.char[i] == 2) - { - c[i].sprite_index = spr_susieb_attack; - - if (global.charweapon[global.char[i]] == 0) - c[i].sprite_index = spr_susieb_attack_unarmed; - } - - if (global.char[i] == 3) - c[i].sprite_index = spr_ralsei_battleintro; - - c[i].image_speed = 0.5; + with c[i] { + parent = other.id + scr_character_getbattleintroland(global.char[other.i]) + } } fightcon = 2; diff --git a/scripts/scr_asset_exists/scr_asset_exists.gml b/scripts/scr_asset_exists/scr_asset_exists.gml new file mode 100644 index 00000000..6c1ea08c --- /dev/null +++ b/scripts/scr_asset_exists/scr_asset_exists.gml @@ -0,0 +1,4 @@ +function scr_asset_exists(assetname){ + var asset = asset_get_index(assetname) + return asset != -1 +} \ No newline at end of file diff --git a/scripts/scr_asset_exists/scr_asset_exists.yy b/scripts/scr_asset_exists/scr_asset_exists.yy new file mode 100644 index 00000000..7edd6f0a --- /dev/null +++ b/scripts/scr_asset_exists/scr_asset_exists.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_asset_exists", + "isCompatibility":false, + "isDnD":false, + "name":"scr_asset_exists", + "parent":{ + "name":"Engine", + "path":"folders/DELTARUNE/Scripts/Engine.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index 69c593bf..ae0e0d17 100644 --- a/scripts/scr_heroes_config/scr_heroes_config.gml +++ b/scripts/scr_heroes_config/scr_heroes_config.gml @@ -46,6 +46,39 @@ function scr_hero_uses_acts_instead_of_spells(heroIdx) { } } +function scr_character_getbattleintro(charIdx) { + switch charIdx { + default: + break case DRCharacter.Kris: _sprite = spr_kris_sword_jump_down; + break case DRCharacter.Susie: _sprite = spr_susier_wall; + break case DRCharacter.Noelle: { + if scr_asset_exists("spr_noelleb_battleintro") + _sprite = spr_noelleb_battleintro + + if scr_asset_exists("scr_sideb_get_phase") && scr_asset_exists("spr_noelleb_battleintro_sideb") { + var _sideb = scr_sideb_get_phase(); + if _sideb >= 2 _sprite = spr_noelleb_battleintro_sideb + } + + _imagespeed = 0.5 + } + break + } +} + +function scr_character_getbattleintroland(charIdx) { + var originalimageindex = image_index + image_index = 0 + image_speed = 0.5 + switch charIdx { + default: + break case DRCharacter.Kris: sprite_index = spr_krisb_attack; + break case DRCharacter.Susie: sprite_index = spr_susieb_attack; if (global.charweapon[DRCharacter.Susie] == DRWeapon.None) { sprite_index = spr_susieb_attack_unarmed; } + break case DRCharacter.Noelle: image_index = originalimageindex + break case DRCharacter.Ralsei: sprite_index = spr_ralsei_battleintro + } +} + function scr_hero_get_color(heroIdx) { switch (heroIdx) { case DRHero.Kris: return c_aqua; diff --git a/sprites/spr_noelleb_battleintro/0712194f-08c9-458f-9c95-ce298c243ca6.png b/sprites/spr_noelleb_battleintro/0712194f-08c9-458f-9c95-ce298c243ca6.png new file mode 100644 index 0000000000000000000000000000000000000000..d7caf1b22cf8d2cb39ec3eec6e7645d7cb56b175 GIT binary patch literal 941 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/1acf3d9b-5ecf-426c-bdc3-1e2aef79d438.png b/sprites/spr_noelleb_battleintro/1acf3d9b-5ecf-426c-bdc3-1e2aef79d438.png new file mode 100644 index 0000000000000000000000000000000000000000..606d4f145705aa84935c5d3678a9c6318afe8fc8 GIT binary patch literal 809 zcmV+^1J?YBP)eyfxs*p)koba_x%CNOlniE z*_1X#Ns8A`8#%}8l63!~p{kNw-zrQet!cSt_wh12p7&Oc1e-9ib@?H2-b3@}e65*v zY2S_Owl18Ikqu8JWEugcQa53n1U63SyKx;St!eI>p3Kd#3z772wbN63g-S{&^x^Fr zeEs%)8`oPYL&(A;KT(nr03sraX+hxwNxPU9L|L3@Msb<{Slf|`l9Xl?lkWv25Ys{u z5=2xoMTD$MTRnLheZjNi=Kz22Z?4*?p^aKj0i6_A(0N4xyrN9t z3(7JVP|ChqWps!2#EO!(+K?A1qK8fE$d$YjA+>CKhxs2rjsI@6PFr={;x}#| zYlX>cO9oIRkCL?14Mn>=*C1ps6Up}iy6+FSH{?`CHAPN9U_%`Wl(^VLk1iDA>5G9Y)C7r48; zsEVOHj15jYwT}u}%&wR^zqzgCcDbCP_>-ygo7+<7<%Oa3aE$eEEQ9L_&Tno_0Ct78 zG~LS?o3#{!Xa!;4982wH7xUFDF>Xs!9H}!`+`=%_Zgv46Q7r}x0l;Jt0RTF!O(K8; zhMo07zBPZaC1~sd@zw9Nu?CzhBJ@rg6i=+ri6OnpRoV>5Zurz`Z5WugG%a-NtT`jx z;6z3c_F+rVr%{CWR}JR`MRF)}P`lZs`DzANr96$2Zb`7B$?UsL1i%a8a>4|x0tS4~ z0pMX-&kPoXeGm~>ALm%ASGkmBA-PJJT>yafaI8UeV5Rg0iLu2>+a?zXPtFtDoPAi< z(L2$3#3f(Y8E1Q!Akqob8T0%scWllW%`FwoD+%?mtfSM~y^J7yd>uPH)>Eb&lGUVmq9b+Yt)4AS6M3S+zFi~w_#rV?g4n*hU>HaNP`#6e zhH`-^rJ$73PT=bR!M~?WXJeogm6)DuJ_BWtTWV zhzLq41YzHMOKfs3l(O@RJ|P@?6<3R|@0ehNnjWVI+e(`gnc}?(hzQqzcL#gN$E)NEd|*hRogBpa$)ZgkqAScR3>=lv0W~IZcOLnk*s&apIfnm`kM|Z~5v( zYfriG^IcuvN}CIDg(d#eCbDG@~PeIQus&|KH87-F#!5+ zSrA~i>+^yX(Y`QNcWiEmE7zYqK)JS^Qs$2CNADAU|M_L+0)S-6^D)k;K~1k?dMjEK zM#X_O4H4mfxl2&lV{EIoOm16ysN#JbnJ$<>{0e2hn%Q=J-i5NL^aH*Gkq|`!RVDp8 zg|4fE4t*g6RlUNHmm-l!PCk-~;%8D3g{BR_UPyA<@v1hAq>qlxk3ll^8_o zQ0xb6bW%B&4zD;(L7V!yX_LX|kFC}*yt3_DSFor>>2z8U8) zNnm0EX-e1-5!d`@4HGE~8u5G|;`u&2X&px9FrC`SR6=h)m9_uJTR`RnHuVw{fpgT# ztjsb9;nm8S@x6t>2JUl46h(_T zOpogl8r7|4Agk@mXKnlhbC0=Lna6c0F_);8j{|tWo=;luqNdlVZjFS}(5{uO@6IJd z0B9M6vXbKAQ5&1*_u%hl!aQTW2~$e?CE@y0u;-&Q(V6 zLTY$ab&8^e?qVdz-Ngvq#R&cRM25)LpR%0V1RP3KCGqZUAN~16j^nw(C9TXm`8p8M zqS}e;?+EQ%p*dC$Q%@&n6ycJ~m0*=PL9rtYZ-upDhzLRmR@eEpQ|qXM8(>8*SkcQt z4MY2v#0_wM9NeLRI}|jhaZ>({SRJRJ!)DFk_x_GFJ081MMgYLq_10<-sc;gUgsELC zb7KBi&@u>RNaEmd_&btzwh%cXW6F_b5YjRT<#U|0ZLy2Kn`~vuA>;Rk5IQ+1j}keC zh?vt3EQAmQ{H>P3jc%Y;*oSHf5BQCTpM~^AGm_C%;)k^RZTp0?$u(#*98V!Z literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/5c7a7e27-f41c-4c34-8687-92e63baec044.png b/sprites/spr_noelleb_battleintro/5c7a7e27-f41c-4c34-8687-92e63baec044.png new file mode 100644 index 0000000000000000000000000000000000000000..d7caf1b22cf8d2cb39ec3eec6e7645d7cb56b175 GIT binary patch literal 941 zcmV;e15*5nP)SH{?`CHAPN9U_%`Wl(^VLk1iDA>5G9Y)C7r48; zsEVOHj15jYwT}u}%&wR^zqzgCcDbCP_>-ygo7+<7<%Oa3aE$eEEQ9L_&Tno_0Ct78 zG~LS?o3#{!Xa!;4982wH7xUFDF>Xs!9H}!`+`=%_Zgv46Q7r}x0l;Jt0RTF!O(K8; zhMo07zBPZaC1~sd@zw9Nu?CzhBJ@rg6i=+ri6OnpRoV>5Zurz`Z5WugG%a-NtT`jx z;6z3c_F+rVr%{CWR}JR`MRF)}P`lZs`DzANr96$2Zb`7B$?UsL1i%a8a>4|x0tS4~ z0pMX-&kPoXeGm~>ALm%ASGkmBA-PJJT>yafaI8UeV5Rg0iLu2>+a?zXPtFtDoPAi< z(L2$3#3f(Y8E1Q!Akqob8T0%scWllW%`FwoD+%?mtfSM~y^J7yd>uPH)>Eb&lGUVmq9b+Yt)4AS6M3S+zFi~w_#rV?g4n*hU>HaNP`#6e zhH`-^rJ$73PT=bR!M~?WXJeogm6)DuJ_BWtTWV zhzLq41YzHMOKfs3l(O@RJ|P@?6<3R|@0ehNnjWVI+e(`gnc}?(hzQqzcL#gN$E)NEd|*hRogBpa$)ZgkqAScR3>=lv0W~IZcOLnk*s&apIfnm`kM|Z~5v( zYfriG^IcuvN}CIDg(d#eCbDG@~PeIQus&|KH87-F#!5+ zSrA~i>+^yX(Y`QNcWiEmE7zYqK)JS^Qs$2CNADAU|M_L+0)S-6^D)k;K~1k?dMjEK zM#X_O4H4mfxl2&lV{EIoOm16ysN#JbnJ$<>{0e2hn%Q=J-i5NL^aH*Gkq|`!RVDp8 zgAaeQA?H8onfe( z$0s|8X+eD)imQ!*f-oA8(P5+B#Aq^bHd++Mjv1PEdboLf%Bn*EFq#YyClYZYv7kN{ z)PEOv(ch38?B~1AY2aSA}HjHYJ_8A+UcPdwbV4&dh1F6!2W$T z%N_6P48a&`)SLA6`!}y645N#|RzPYXq3QEFqbuZ!E{-j|4nu_o?}{10jV-8;IFT5R zD^?vq9Y7u(7}IHkX!oh0=9n=kwP15@0T-t;2(j$Q*vme*QHxrbraR6hSDqn;SWw@a zc^A}2Xj9!(&ZWJKkMM@Le_vHum;pG5L$0jK8L{JA^TbfYaYfBNJ7&A})|D#z0#Goz zY_N7&l?%cE0IiZ0hzMVPuOD=dh2|i<`Gcpi7PSnRb{RT!J{V3^JYpS)_2JLVaLxu{ z=|Dah-{Fc}n;kczi$SKHo;RTL%DI~Ip6FaI=u>06(k`zDi7x) zl{Tf(&o1XDm-zAX)p*8oB|RZT=6<#5$0D)pQy3k;jAsx+1QTEAII)fIapZG?f8!4c zqshRv>=nbt)8rYDF=WoZzONaad;Wzp%ArQRscuG-0rY$REvw&cIOCP)W0Kc^cYW=& vJ8^U_9GAa=Et`?+)5lIb?X=TQJ7wrEcpJMycX{j^00000NkvXXu0mjfj{nRL literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/81f38d17-202d-41ec-bcc8-c430f6b8b943.png b/sprites/spr_noelleb_battleintro/81f38d17-202d-41ec-bcc8-c430f6b8b943.png new file mode 100644 index 0000000000000000000000000000000000000000..28a7bc4b794ee42a969fc17fba7bdb54de39397f GIT binary patch literal 716 zcmV;-0yF)IP)_2j2FLv07;PbJ^p?v0%x6d)>#$N@qp+0q4zdGWFT2>o--PzHkIK{0^9Gok4iNQOQ`CIFJlh4pkaPyx%Ab$IzhM zVwDWBN`{zR9RTEHF7=z*3O1HA93seh+c(}uI(dcwkV-**IPi*fuoesl334LO^(m(3 z3XoM8{wW*eFGfAr7w0iO7oe;H$%cuD=8qYb?{O$D>)ug$1vUB81*UhOS#Or?`f`N3 zzZFPp4(Osn?v$_J#51z)KT2dZ?f%$*8iA}#?eJ5-{$_M)XS1JLzc=QYHjtaA?c2d{ z@qL<8Nv;+#7W(uWUC)S@2RVs}U8nhDR``u+7;d1GzJ6|A5gN%ExeGr`M))%SBd!<8 z7K`MNylr2V+NC|Yx~PQb=4p#XQhe_Ea>P&VF0%M?f-fyR*B6`B(x!E*jFtAoWW={! y0YK~#zh*UW zW3=1r(mjenDhx`ZHhAIcmB0^ia(-d;@yYoG0zZ`AD#LY~Dl0c^gUvSpI^HIgK$}6X zWJIA4lvlr^1OPB!4B#COE8|R)xoSq6*o($kQ6h-|z|p}SR+J!4vqmCak)b%v)UY;! zNdhemRpl#76nxtNi4~G>3S|oj+ z7Kwyn5Sj^6dBpMAr}Q9QYUAey#n6R z8UShub&kLf=`lbNFW)m*KdzpUxLn-fg%F7Db6YLkVls-5y0_y z%O2r&vMf%{J1$$d1s5G^?csaHgX%jYoX$SH{?`CHAPN9U_%`Wl(^VLk1iDA>5G9Y)C7r48; zsEVOHj15jYwT}u}%&wR^zqzgCcDbCP_>-ygo7+<7<%Oa3aE$eEEQ9L_&Tno_0Ct78 zG~LS?o3#{!Xa!;4982wH7xUFDF>Xs!9H}!`+`=%_Zgv46Q7r}x0l;Jt0RTF!O(K8; zhMo07zBPZaC1~sd@zw9Nu?CzhBJ@rg6i=+ri6OnpRoV>5Zurz`Z5WugG%a-NtT`jx z;6z3c_F+rVr%{CWR}JR`MRF)}P`lZs`DzANr96$2Zb`7B$?UsL1i%a8a>4|x0tS4~ z0pMX-&kPoXeGm~>ALm%ASGkmBA-PJJT>yafaI8UeV5Rg0iLu2>+a?zXPtFtDoPAi< z(L2$3#3f(Y8E1Q!Akqob8T0%scWllW%`FwoD+%?mtfSM~y^J7yd>uPH)>Eb&lGUVmq9b+Yt)4AS6M3S+zFi~w_#rV?g4n*hU>HaNP`#6e zhH`-^rJ$73PT=bR!M~?WXJeogm6)DuJ_BWtTWV zhzLq41YzHMOKfs3l(O@RJ|P@?6<3R|@0ehNnjWVI+e(`gnc}?(hzQqzcL#gN$E)NEd|*hRogBpa$)ZgkqAScR3>=lv0W~IZcOLnk*s&apIfnm`kM|Z~5v( zYfriG^IcuvN}CIDg(d#eCbDG@~PeIQus&|KH87-F#!5+ zSrA~i>+^yX(Y`QNcWiEmE7zYqK)JS^Qs$2CNADAU|M_L+0)S-6^D)k;K~1k?dMjEK zM#X_O4H4mfxl2&lV{EIoOm16ysN#JbnJ$<>{0e2hn%Q=J-i5NL^aH*Gkq|`!RVDp8 zgc~O6o&sj;_WH9)B{PVw=!9cBAwQAL>RqOwdaD0C%Q_Cd`y^bCL0Ik6d z03h%~0Kj5BHP-#=$_*|I04kLF{=a}p73cFJ`r-mchbk&pnIRqK`;VVktf#p(T{$BF z2o5d)EY?%b3uS%DNoG`cSReF~oHs<**z!(?Nd+)zw)D{NG!qVIFvmbtHAEKxgl%RB zpEHmPvK`CJYt{kY7p5xiVGAP~qN@T?6lec(c4a%3Mu(~xCMZC-Xm8LE-PCamj%Cx@ z1OQPianarYNOw=!+1D0kUwl*Ovw6W~_ngeYAM^rs_GPsOH=o|0Ej>OJr_M9R_MI)g zWXSTIVW8L1g9>Lo&tSInazm(3TAF*8JT;Q6&o7iOn)puBF{J0wnO?enus%vTctK(FoL{Ol3{Fkej&#S;Ba zGjqjO!>h|?)g~fJK<=KO&};AVBKC$em|ob>_LXcQD2inQ0RY4I!^P3J^zGG+IuS8+ zHQSiL52=iB*m9V*9&Y~~u;lm=a{QP$leKPH!|2_lYWThbDXNoU0zag?=O^4=U1x%n zm6bCbT<$27Op7DWD>k)LuBeJ)Nr4|y6iXr^8oZ^Czz;J+TbVPeLp)@&j7IJ71W z-Y7T3m0QL0kFMLR>!XiET!`2uK1acSoKBxYl&$p_A1A-+0@MMr00000NkvXXu0mjf DhapKH literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/f122b631-d4bf-4d49-a58b-bc074561f262.png b/sprites/spr_noelleb_battleintro/f122b631-d4bf-4d49-a58b-bc074561f262.png new file mode 100644 index 0000000000000000000000000000000000000000..f1c9feccb0a66b66106f60b24342c3608ba504b6 GIT binary patch literal 973 zcmV;;12X)HP)AaeQA?H8onfe( z$0s|8X+eD)imQ!*f-oA8(P5+B#Aq^bHd++Mjv1PEdboLf%Bn*EFq#YyClYZYv7kN{ z)PEOv(ch38?B~1AY2aSA}HjHYJ_8A+UcPdwbV4&dh1F6!2W$T z%N_6P48a&`)SLA6`!}y645N#|RzPYXq3QEFqbuZ!E{-j|4nu_o?}{10jV-8;IFT5R zD^?vq9Y7u(7}IHkX!oh0=9n=kwP15@0T-t;2(j$Q*vme*QHxrbraR6hSDqn;SWw@a zc^A}2Xj9!(&ZWJKkMM@Le_vHum;pG5L$0jK8L{JA^TbfYaYfBNJ7&A})|D#z0#Goz zY_N7&l?%cE0IiZ0hzMVPuOD=dh2|i<`Gcpi7PSnRb{RT!J{V3^JYpS)_2JLVaLxu{ z=|Dah-{Fc}n;kczi$SKHo;RTL%DI~Ip6FaI=u>06(k`zDi7x) zl{Tf(&o1XDm-zAX)p*8oB|RZT=6<#5$0D)pQy3k;jAsx+1QTEAII)fIapZG?f8!4c zqshRv>=nbt)8rYDF=WoZzONaad;Wzp%ArQRscuG-0rY$REvw&cIOCP)W0Kc^cYW=& vJ8^U_9GAa=Et`?+)5lIb?X=TQJ7wrEcpJMycX{j^00000NkvXXu0mjfj{nRL literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe.png b/sprites/spr_noelleb_battleintro/f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe.png new file mode 100644 index 0000000000000000000000000000000000000000..f1c9feccb0a66b66106f60b24342c3608ba504b6 GIT binary patch literal 973 zcmV;;12X)HP)AaeQA?H8onfe( z$0s|8X+eD)imQ!*f-oA8(P5+B#Aq^bHd++Mjv1PEdboLf%Bn*EFq#YyClYZYv7kN{ z)PEOv(ch38?B~1AY2aSA}HjHYJ_8A+UcPdwbV4&dh1F6!2W$T z%N_6P48a&`)SLA6`!}y645N#|RzPYXq3QEFqbuZ!E{-j|4nu_o?}{10jV-8;IFT5R zD^?vq9Y7u(7}IHkX!oh0=9n=kwP15@0T-t;2(j$Q*vme*QHxrbraR6hSDqn;SWw@a zc^A}2Xj9!(&ZWJKkMM@Le_vHum;pG5L$0jK8L{JA^TbfYaYfBNJ7&A})|D#z0#Goz zY_N7&l?%cE0IiZ0hzMVPuOD=dh2|i<`Gcpi7PSnRb{RT!J{V3^JYpS)_2JLVaLxu{ z=|Dah-{Fc}n;kczi$SKHo;RTL%DI~Ip6FaI=u>06(k`zDi7x) zl{Tf(&o1XDm-zAX)p*8oB|RZT=6<#5$0D)pQy3k;jAsx+1QTEAII)fIapZG?f8!4c zqshRv>=nbt)8rYDF=WoZzONaad;Wzp%ArQRscuG-0rY$REvw&cIOCP)W0Kc^cYW=& vJ8^U_9GAa=Et`?+)5lIb?X=TQJ7wrEcpJMycX{j^00000NkvXXu0mjfj{nRL literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae.png b/sprites/spr_noelleb_battleintro/fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae.png new file mode 100644 index 0000000000000000000000000000000000000000..f1c9feccb0a66b66106f60b24342c3608ba504b6 GIT binary patch literal 973 zcmV;;12X)HP)AaeQA?H8onfe( z$0s|8X+eD)imQ!*f-oA8(P5+B#Aq^bHd++Mjv1PEdboLf%Bn*EFq#YyClYZYv7kN{ z)PEOv(ch38?B~1AY2aSA}HjHYJ_8A+UcPdwbV4&dh1F6!2W$T z%N_6P48a&`)SLA6`!}y645N#|RzPYXq3QEFqbuZ!E{-j|4nu_o?}{10jV-8;IFT5R zD^?vq9Y7u(7}IHkX!oh0=9n=kwP15@0T-t;2(j$Q*vme*QHxrbraR6hSDqn;SWw@a zc^A}2Xj9!(&ZWJKkMM@Le_vHum;pG5L$0jK8L{JA^TbfYaYfBNJ7&A})|D#z0#Goz zY_N7&l?%cE0IiZ0hzMVPuOD=dh2|i<`Gcpi7PSnRb{RT!J{V3^JYpS)_2JLVaLxu{ z=|Dah-{Fc}n;kczi$SKHo;RTL%DI~Ip6FaI=u>06(k`zDi7x) zl{Tf(&o1XDm-zAX)p*8oB|RZT=6<#5$0D)pQy3k;jAsx+1QTEAII)fIapZG?f8!4c zqshRv>=nbt)8rYDF=WoZzONaad;Wzp%ArQRscuG-0rY$REvw&cIOCP)W0Kc^cYW=& vJ8^U_9GAa=Et`?+)5lIb?X=TQJ7wrEcpJMycX{j^00000NkvXXu0mjfj{nRL literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/layers/0712194f-08c9-458f-9c95-ce298c243ca6/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/0712194f-08c9-458f-9c95-ce298c243ca6/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 0000000000000000000000000000000000000000..d7caf1b22cf8d2cb39ec3eec6e7645d7cb56b175 GIT binary patch literal 941 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/layers/1acf3d9b-5ecf-426c-bdc3-1e2aef79d438/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/1acf3d9b-5ecf-426c-bdc3-1e2aef79d438/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 0000000000000000000000000000000000000000..606d4f145705aa84935c5d3678a9c6318afe8fc8 GIT binary patch literal 809 zcmV+^1J?YBP)eyfxs*p)koba_x%CNOlniE z*_1X#Ns8A`8#%}8l63!~p{kNw-zrQet!cSt_wh12p7&Oc1e-9ib@?H2-b3@}e65*v zY2S_Owl18Ikqu8JWEugcQa53n1U63SyKx;St!eI>p3Kd#3z772wbN63g-S{&^x^Fr zeEs%)8`oPYL&(A;KT(nr03sraX+hxwNxPU9L|L3@Msb<{Slf|`l9Xl?lkWv25Ys{u z5=2xoMTD$MTRnLheZjNi=Kz22Z?4*?p^aKj0i6_A(0N4xyrN9t z3(7JVP|ChqWps!2#EO!(+K?A1qK8fE$d$YjA+>CKhxs2rjsI@6PFr={;x}#| zYlX>cO9oIRkCL?14Mn>=*C1ps6Up}iy6+FSH{?`CHAPN9U_%`Wl(^VLk1iDA>5G9Y)C7r48; zsEVOHj15jYwT}u}%&wR^zqzgCcDbCP_>-ygo7+<7<%Oa3aE$eEEQ9L_&Tno_0Ct78 zG~LS?o3#{!Xa!;4982wH7xUFDF>Xs!9H}!`+`=%_Zgv46Q7r}x0l;Jt0RTF!O(K8; zhMo07zBPZaC1~sd@zw9Nu?CzhBJ@rg6i=+ri6OnpRoV>5Zurz`Z5WugG%a-NtT`jx z;6z3c_F+rVr%{CWR}JR`MRF)}P`lZs`DzANr96$2Zb`7B$?UsL1i%a8a>4|x0tS4~ z0pMX-&kPoXeGm~>ALm%ASGkmBA-PJJT>yafaI8UeV5Rg0iLu2>+a?zXPtFtDoPAi< z(L2$3#3f(Y8E1Q!Akqob8T0%scWllW%`FwoD+%?mtfSM~y^J7yd>uPH)>Eb&lGUVmq9b+Yt)4AS6M3S+zFi~w_#rV?g4n*hU>HaNP`#6e zhH`-^rJ$73PT=bR!M~?WXJeogm6)DuJ_BWtTWV zhzLq41YzHMOKfs3l(O@RJ|P@?6<3R|@0ehNnjWVI+e(`gnc}?(hzQqzcL#gN$E)NEd|*hRogBpa$)ZgkqAScR3>=lv0W~IZcOLnk*s&apIfnm`kM|Z~5v( zYfriG^IcuvN}CIDg(d#eCbDG@~PeIQus&|KH87-F#!5+ zSrA~i>+^yX(Y`QNcWiEmE7zYqK)JS^Qs$2CNADAU|M_L+0)S-6^D)k;K~1k?dMjEK zM#X_O4H4mfxl2&lV{EIoOm16ysN#JbnJ$<>{0e2hn%Q=J-i5NL^aH*Gkq|`!RVDp8 zg|4fE4t*g6RlUNHmm-l!PCk-~;%8D3g{BR_UPyA<@v1hAq>qlxk3ll^8_o zQ0xb6bW%B&4zD;(L7V!yX_LX|kFC}*yt3_DSFor>>2z8U8) zNnm0EX-e1-5!d`@4HGE~8u5G|;`u&2X&px9FrC`SR6=h)m9_uJTR`RnHuVw{fpgT# ztjsb9;nm8S@x6t>2JUl46h(_T zOpogl8r7|4Agk@mXKnlhbC0=Lna6c0F_);8j{|tWo=;luqNdlVZjFS}(5{uO@6IJd z0B9M6vXbKAQ5&1*_u%hl!aQTW2~$e?CE@y0u;-&Q(V6 zLTY$ab&8^e?qVdz-Ngvq#R&cRM25)LpR%0V1RP3KCGqZUAN~16j^nw(C9TXm`8p8M zqS}e;?+EQ%p*dC$Q%@&n6ycJ~m0*=PL9rtYZ-upDhzLRmR@eEpQ|qXM8(>8*SkcQt z4MY2v#0_wM9NeLRI}|jhaZ>({SRJRJ!)DFk_x_GFJ081MMgYLq_10<-sc;gUgsELC zb7KBi&@u>RNaEmd_&btzwh%cXW6F_b5YjRT<#U|0ZLy2Kn`~vuA>;Rk5IQ+1j}keC zh?vt3EQAmQ{H>P3jc%Y;*oSHf5BQCTpM~^AGm_C%;)k^RZTp0?$u(#*98V!Z literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/layers/5c7a7e27-f41c-4c34-8687-92e63baec044/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/5c7a7e27-f41c-4c34-8687-92e63baec044/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 0000000000000000000000000000000000000000..d7caf1b22cf8d2cb39ec3eec6e7645d7cb56b175 GIT binary patch literal 941 zcmV;e15*5nP)SH{?`CHAPN9U_%`Wl(^VLk1iDA>5G9Y)C7r48; zsEVOHj15jYwT}u}%&wR^zqzgCcDbCP_>-ygo7+<7<%Oa3aE$eEEQ9L_&Tno_0Ct78 zG~LS?o3#{!Xa!;4982wH7xUFDF>Xs!9H}!`+`=%_Zgv46Q7r}x0l;Jt0RTF!O(K8; zhMo07zBPZaC1~sd@zw9Nu?CzhBJ@rg6i=+ri6OnpRoV>5Zurz`Z5WugG%a-NtT`jx z;6z3c_F+rVr%{CWR}JR`MRF)}P`lZs`DzANr96$2Zb`7B$?UsL1i%a8a>4|x0tS4~ z0pMX-&kPoXeGm~>ALm%ASGkmBA-PJJT>yafaI8UeV5Rg0iLu2>+a?zXPtFtDoPAi< z(L2$3#3f(Y8E1Q!Akqob8T0%scWllW%`FwoD+%?mtfSM~y^J7yd>uPH)>Eb&lGUVmq9b+Yt)4AS6M3S+zFi~w_#rV?g4n*hU>HaNP`#6e zhH`-^rJ$73PT=bR!M~?WXJeogm6)DuJ_BWtTWV zhzLq41YzHMOKfs3l(O@RJ|P@?6<3R|@0ehNnjWVI+e(`gnc}?(hzQqzcL#gN$E)NEd|*hRogBpa$)ZgkqAScR3>=lv0W~IZcOLnk*s&apIfnm`kM|Z~5v( zYfriG^IcuvN}CIDg(d#eCbDG@~PeIQus&|KH87-F#!5+ zSrA~i>+^yX(Y`QNcWiEmE7zYqK)JS^Qs$2CNADAU|M_L+0)S-6^D)k;K~1k?dMjEK zM#X_O4H4mfxl2&lV{EIoOm16ysN#JbnJ$<>{0e2hn%Q=J-i5NL^aH*Gkq|`!RVDp8 zgAaeQA?H8onfe( z$0s|8X+eD)imQ!*f-oA8(P5+B#Aq^bHd++Mjv1PEdboLf%Bn*EFq#YyClYZYv7kN{ z)PEOv(ch38?B~1AY2aSA}HjHYJ_8A+UcPdwbV4&dh1F6!2W$T z%N_6P48a&`)SLA6`!}y645N#|RzPYXq3QEFqbuZ!E{-j|4nu_o?}{10jV-8;IFT5R zD^?vq9Y7u(7}IHkX!oh0=9n=kwP15@0T-t;2(j$Q*vme*QHxrbraR6hSDqn;SWw@a zc^A}2Xj9!(&ZWJKkMM@Le_vHum;pG5L$0jK8L{JA^TbfYaYfBNJ7&A})|D#z0#Goz zY_N7&l?%cE0IiZ0hzMVPuOD=dh2|i<`Gcpi7PSnRb{RT!J{V3^JYpS)_2JLVaLxu{ z=|Dah-{Fc}n;kczi$SKHo;RTL%DI~Ip6FaI=u>06(k`zDi7x) zl{Tf(&o1XDm-zAX)p*8oB|RZT=6<#5$0D)pQy3k;jAsx+1QTEAII)fIapZG?f8!4c zqshRv>=nbt)8rYDF=WoZzONaad;Wzp%ArQRscuG-0rY$REvw&cIOCP)W0Kc^cYW=& vJ8^U_9GAa=Et`?+)5lIb?X=TQJ7wrEcpJMycX{j^00000NkvXXu0mjfj{nRL literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/layers/81f38d17-202d-41ec-bcc8-c430f6b8b943/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/81f38d17-202d-41ec-bcc8-c430f6b8b943/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 0000000000000000000000000000000000000000..28a7bc4b794ee42a969fc17fba7bdb54de39397f GIT binary patch literal 716 zcmV;-0yF)IP)_2j2FLv07;PbJ^p?v0%x6d)>#$N@qp+0q4zdGWFT2>o--PzHkIK{0^9Gok4iNQOQ`CIFJlh4pkaPyx%Ab$IzhM zVwDWBN`{zR9RTEHF7=z*3O1HA93seh+c(}uI(dcwkV-**IPi*fuoesl334LO^(m(3 z3XoM8{wW*eFGfAr7w0iO7oe;H$%cuD=8qYb?{O$D>)ug$1vUB81*UhOS#Or?`f`N3 zzZFPp4(Osn?v$_J#51z)KT2dZ?f%$*8iA}#?eJ5-{$_M)XS1JLzc=QYHjtaA?c2d{ z@qL<8Nv;+#7W(uWUC)S@2RVs}U8nhDR``u+7;d1GzJ6|A5gN%ExeGr`M))%SBd!<8 z7K`MNylr2V+NC|Yx~PQb=4p#XQhe_Ea>P&VF0%M?f-fyR*B6`B(x!E*jFtAoWW={! y0YK~#zh*UW zW3=1r(mjenDhx`ZHhAIcmB0^ia(-d;@yYoG0zZ`AD#LY~Dl0c^gUvSpI^HIgK$}6X zWJIA4lvlr^1OPB!4B#COE8|R)xoSq6*o($kQ6h-|z|p}SR+J!4vqmCak)b%v)UY;! zNdhemRpl#76nxtNi4~G>3S|oj+ z7Kwyn5Sj^6dBpMAr}Q9QYUAey#n6R z8UShub&kLf=`lbNFW)m*KdzpUxLn-fg%F7Db6YLkVls-5y0_y z%O2r&vMf%{J1$$d1s5G^?csaHgX%jYoX$SH{?`CHAPN9U_%`Wl(^VLk1iDA>5G9Y)C7r48; zsEVOHj15jYwT}u}%&wR^zqzgCcDbCP_>-ygo7+<7<%Oa3aE$eEEQ9L_&Tno_0Ct78 zG~LS?o3#{!Xa!;4982wH7xUFDF>Xs!9H}!`+`=%_Zgv46Q7r}x0l;Jt0RTF!O(K8; zhMo07zBPZaC1~sd@zw9Nu?CzhBJ@rg6i=+ri6OnpRoV>5Zurz`Z5WugG%a-NtT`jx z;6z3c_F+rVr%{CWR}JR`MRF)}P`lZs`DzANr96$2Zb`7B$?UsL1i%a8a>4|x0tS4~ z0pMX-&kPoXeGm~>ALm%ASGkmBA-PJJT>yafaI8UeV5Rg0iLu2>+a?zXPtFtDoPAi< z(L2$3#3f(Y8E1Q!Akqob8T0%scWllW%`FwoD+%?mtfSM~y^J7yd>uPH)>Eb&lGUVmq9b+Yt)4AS6M3S+zFi~w_#rV?g4n*hU>HaNP`#6e zhH`-^rJ$73PT=bR!M~?WXJeogm6)DuJ_BWtTWV zhzLq41YzHMOKfs3l(O@RJ|P@?6<3R|@0ehNnjWVI+e(`gnc}?(hzQqzcL#gN$E)NEd|*hRogBpa$)ZgkqAScR3>=lv0W~IZcOLnk*s&apIfnm`kM|Z~5v( zYfriG^IcuvN}CIDg(d#eCbDG@~PeIQus&|KH87-F#!5+ zSrA~i>+^yX(Y`QNcWiEmE7zYqK)JS^Qs$2CNADAU|M_L+0)S-6^D)k;K~1k?dMjEK zM#X_O4H4mfxl2&lV{EIoOm16ysN#JbnJ$<>{0e2hn%Q=J-i5NL^aH*Gkq|`!RVDp8 zgc~O6o&sj;_WH9)B{PVw=!9cBAwQAL>RqOwdaD0C%Q_Cd`y^bCL0Ik6d z03h%~0Kj5BHP-#=$_*|I04kLF{=a}p73cFJ`r-mchbk&pnIRqK`;VVktf#p(T{$BF z2o5d)EY?%b3uS%DNoG`cSReF~oHs<**z!(?Nd+)zw)D{NG!qVIFvmbtHAEKxgl%RB zpEHmPvK`CJYt{kY7p5xiVGAP~qN@T?6lec(c4a%3Mu(~xCMZC-Xm8LE-PCamj%Cx@ z1OQPianarYNOw=!+1D0kUwl*Ovw6W~_ngeYAM^rs_GPsOH=o|0Ej>OJr_M9R_MI)g zWXSTIVW8L1g9>Lo&tSInazm(3TAF*8JT;Q6&o7iOn)puBF{J0wnO?enus%vTctK(FoL{Ol3{Fkej&#S;Ba zGjqjO!>h|?)g~fJK<=KO&};AVBKC$em|ob>_LXcQD2inQ0RY4I!^P3J^zGG+IuS8+ zHQSiL52=iB*m9V*9&Y~~u;lm=a{QP$leKPH!|2_lYWThbDXNoU0zag?=O^4=U1x%n zm6bCbT<$27Op7DWD>k)LuBeJ)Nr4|y6iXr^8oZ^Czz;J+TbVPeLp)@&j7IJ71W z-Y7T3m0QL0kFMLR>!XiET!`2uK1acSoKBxYl&$p_A1A-+0@MMr00000NkvXXu0mjf DhapKH literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/layers/f122b631-d4bf-4d49-a58b-bc074561f262/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/f122b631-d4bf-4d49-a58b-bc074561f262/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 0000000000000000000000000000000000000000..f1c9feccb0a66b66106f60b24342c3608ba504b6 GIT binary patch literal 973 zcmV;;12X)HP)AaeQA?H8onfe( z$0s|8X+eD)imQ!*f-oA8(P5+B#Aq^bHd++Mjv1PEdboLf%Bn*EFq#YyClYZYv7kN{ z)PEOv(ch38?B~1AY2aSA}HjHYJ_8A+UcPdwbV4&dh1F6!2W$T z%N_6P48a&`)SLA6`!}y645N#|RzPYXq3QEFqbuZ!E{-j|4nu_o?}{10jV-8;IFT5R zD^?vq9Y7u(7}IHkX!oh0=9n=kwP15@0T-t;2(j$Q*vme*QHxrbraR6hSDqn;SWw@a zc^A}2Xj9!(&ZWJKkMM@Le_vHum;pG5L$0jK8L{JA^TbfYaYfBNJ7&A})|D#z0#Goz zY_N7&l?%cE0IiZ0hzMVPuOD=dh2|i<`Gcpi7PSnRb{RT!J{V3^JYpS)_2JLVaLxu{ z=|Dah-{Fc}n;kczi$SKHo;RTL%DI~Ip6FaI=u>06(k`zDi7x) zl{Tf(&o1XDm-zAX)p*8oB|RZT=6<#5$0D)pQy3k;jAsx+1QTEAII)fIapZG?f8!4c zqshRv>=nbt)8rYDF=WoZzONaad;Wzp%ArQRscuG-0rY$REvw&cIOCP)W0Kc^cYW=& vJ8^U_9GAa=Et`?+)5lIb?X=TQJ7wrEcpJMycX{j^00000NkvXXu0mjfj{nRL literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/layers/f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 0000000000000000000000000000000000000000..f1c9feccb0a66b66106f60b24342c3608ba504b6 GIT binary patch literal 973 zcmV;;12X)HP)AaeQA?H8onfe( z$0s|8X+eD)imQ!*f-oA8(P5+B#Aq^bHd++Mjv1PEdboLf%Bn*EFq#YyClYZYv7kN{ z)PEOv(ch38?B~1AY2aSA}HjHYJ_8A+UcPdwbV4&dh1F6!2W$T z%N_6P48a&`)SLA6`!}y645N#|RzPYXq3QEFqbuZ!E{-j|4nu_o?}{10jV-8;IFT5R zD^?vq9Y7u(7}IHkX!oh0=9n=kwP15@0T-t;2(j$Q*vme*QHxrbraR6hSDqn;SWw@a zc^A}2Xj9!(&ZWJKkMM@Le_vHum;pG5L$0jK8L{JA^TbfYaYfBNJ7&A})|D#z0#Goz zY_N7&l?%cE0IiZ0hzMVPuOD=dh2|i<`Gcpi7PSnRb{RT!J{V3^JYpS)_2JLVaLxu{ z=|Dah-{Fc}n;kczi$SKHo;RTL%DI~Ip6FaI=u>06(k`zDi7x) zl{Tf(&o1XDm-zAX)p*8oB|RZT=6<#5$0D)pQy3k;jAsx+1QTEAII)fIapZG?f8!4c zqshRv>=nbt)8rYDF=WoZzONaad;Wzp%ArQRscuG-0rY$REvw&cIOCP)W0Kc^cYW=& vJ8^U_9GAa=Et`?+)5lIb?X=TQJ7wrEcpJMycX{j^00000NkvXXu0mjfj{nRL literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/layers/fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 0000000000000000000000000000000000000000..f1c9feccb0a66b66106f60b24342c3608ba504b6 GIT binary patch literal 973 zcmV;;12X)HP)AaeQA?H8onfe( z$0s|8X+eD)imQ!*f-oA8(P5+B#Aq^bHd++Mjv1PEdboLf%Bn*EFq#YyClYZYv7kN{ z)PEOv(ch38?B~1AY2aSA}HjHYJ_8A+UcPdwbV4&dh1F6!2W$T z%N_6P48a&`)SLA6`!}y645N#|RzPYXq3QEFqbuZ!E{-j|4nu_o?}{10jV-8;IFT5R zD^?vq9Y7u(7}IHkX!oh0=9n=kwP15@0T-t;2(j$Q*vme*QHxrbraR6hSDqn;SWw@a zc^A}2Xj9!(&ZWJKkMM@Le_vHum;pG5L$0jK8L{JA^TbfYaYfBNJ7&A})|D#z0#Goz zY_N7&l?%cE0IiZ0hzMVPuOD=dh2|i<`Gcpi7PSnRb{RT!J{V3^JYpS)_2JLVaLxu{ z=|Dah-{Fc}n;kczi$SKHo;RTL%DI~Ip6FaI=u>06(k`zDi7x) zl{Tf(&o1XDm-zAX)p*8oB|RZT=6<#5$0D)pQy3k;jAsx+1QTEAII)fIapZG?f8!4c zqshRv>=nbt)8rYDF=WoZzONaad;Wzp%ArQRscuG-0rY$REvw&cIOCP)W0Kc^cYW=& vJ8^U_9GAa=Et`?+)5lIb?X=TQJ7wrEcpJMycX{j^00000NkvXXu0mjfj{nRL literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy b/sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy new file mode 100644 index 00000000..48558ea9 --- /dev/null +++ b/sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy @@ -0,0 +1,146 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_noelleb_battleintro", + "bboxMode":0, + "bbox_bottom":52, + "bbox_left":0, + "bbox_right":34, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"81f38d17-202d-41ec-bcc8-c430f6b8b943","name":"81f38d17-202d-41ec-bcc8-c430f6b8b943","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8","name":"e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09905c92-d295-439f-9207-8122dd91a6e1","name":"09905c92-d295-439f-9207-8122dd91a6e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b9023bd-6273-4e8e-98b7-3c1b1a001b31","name":"1b9023bd-6273-4e8e-98b7-3c1b1a001b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae","name":"fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cb6211cc-47b4-400f-962c-f354c0c160f5","name":"cb6211cc-47b4-400f-962c-f354c0c160f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72322e26-681b-4cbb-8852-3fa8227d2224","name":"72322e26-681b-4cbb-8852-3fa8227d2224","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0712194f-08c9-458f-9c95-ce298c243ca6","name":"0712194f-08c9-458f-9c95-ce298c243ca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f122b631-d4bf-4d49-a58b-bc074561f262","name":"f122b631-d4bf-4d49-a58b-bc074561f262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c7a7e27-f41c-4c34-8687-92e63baec044","name":"5c7a7e27-f41c-4c34-8687-92e63baec044","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe","name":"f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9766496b-b20d-4c71-ab2d-b287642ddb30","name":"9766496b-b20d-4c71-ab2d-b287642ddb30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38ff8503-1cd5-4ab7-b07d-f186055f3c25","name":"38ff8503-1cd5-4ab7-b07d-f186055f3c25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1acf3d9b-5ecf-426c-bdc3-1e2aef79d438","name":"1acf3d9b-5ecf-426c-bdc3-1e2aef79d438","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15449b53-5888-41ae-ab0d-33cbb0f9c4bb","name":"15449b53-5888-41ae-ab0d-33cbb0f9c4bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":53, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"d2127cef-4b38-450e-8162-be3eeba20ed3","blendMode":0,"displayName":"default","isLocked":false,"name":"d2127cef-4b38-450e-8162-be3eeba20ed3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_noelleb_battleintro", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"Battle", + "path":"folders/DELTARUNE/Sprites/Characters/Noelle/Battle.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_noelleb_battleintro", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":15.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_noelleb_battleintro", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f38d17-202d-41ec-bcc8-c430f6b8b943","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"43fb421c-8eba-49a0-b42f-e97773bc83e4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f05c3efa-5793-45de-96f4-a641ff7bf794","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09905c92-d295-439f-9207-8122dd91a6e1","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1537eb54-b925-4de0-a7bb-388a0e3353f0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b9023bd-6273-4e8e-98b7-3c1b1a001b31","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"43592c02-aa26-49ef-ac6a-0a4fcd290db5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"aa33f18c-7b65-4fe0-a987-9760b283368f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb6211cc-47b4-400f-962c-f354c0c160f5","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6192a7e3-4902-446c-9ac0-e8a19e44de1c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72322e26-681b-4cbb-8852-3fa8227d2224","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f0b40fc1-bbc8-4d8f-ae77-e7d63768459c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0712194f-08c9-458f-9c95-ce298c243ca6","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6c14403c-a8b1-47db-9e17-6660d3c83d0b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f122b631-d4bf-4d49-a58b-bc074561f262","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"eb59a70b-9749-4592-aaee-1c4d93ddedf8","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c7a7e27-f41c-4c34-8687-92e63baec044","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"392092b3-8ceb-4b2a-a592-34096a636714","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"40bf160c-60ba-4d70-bc63-b94dfeb78f8f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9766496b-b20d-4c71-ab2d-b287642ddb30","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e6ce0f1b-76a6-456c-80c1-074f33f2a782","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38ff8503-1cd5-4ab7-b07d-f186055f3c25","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2fd7fb17-bfe5-425f-8b94-9f78742af49d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1acf3d9b-5ecf-426c-bdc3-1e2aef79d438","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7926204f-6930-4d1b-98c9-ee95b0515e70","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15449b53-5888-41ae-ab0d-33cbb0f9c4bb","path":"sprites/spr_noelleb_battleintro/spr_noelleb_battleintro.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e3b09ecb-fa57-4d09-8d79-2831b5d01b46","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":11, + "yorigin":7, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":35, +} \ No newline at end of file diff --git a/sprites/spr_noelleb_battleintro_l/0e70563e-c2bc-47a3-bbdb-adb36cb93f53.png b/sprites/spr_noelleb_battleintro_l/0e70563e-c2bc-47a3-bbdb-adb36cb93f53.png new file mode 100644 index 0000000000000000000000000000000000000000..3cbe9cc8f736099a98b21803dbdab58149d55c7d GIT binary patch literal 938 zcmV;b16BNqP)o83JO_NZ2~O?*F{PfXGFulET906)Ke0RUWF zgNg#}1x7}sj0%S`3x*>ib#Z-DC|$2gFwpi&27XC9sZwcL(HIreq3L{LWU3UfVk;afL?Kh`BKaZt|nkt9Ynjy8Dp^M4-+tLK&Rw0$IOFC zM&(kjm`(~t0vcm7fl9-;9cwW1y$?u4R~GeA`3>g%K%D^pS8{q07Od? z9cA%uzf%1x6WL|I?>h@h>)ye$ad$=N1Ag+jc$m4>X8$SR4J1g!}2&Oj>6=aYJHv>5LE^jL-HRqcrJ0WApT z*W+{2Nw2y!t*9Qp4~dop*~<8i9=V?BRe_$U9Fh0jb_v0zE&C+XY;I(XHV{WES`u!L z>Zxe4xayRM1WBVLz%JddDyIseo&{Hb_r?lNYDOyr$ zU*f|z1G2#%p6=W&qOfUG8>L)9`!$1BvkhSPh$=ypXqEc&DR`rl|G8*DWkIq!uuR91 zVNK@~>oe`Yn0-dZGPQU}|L@96lQ(kvj7ph~Xb*iHbkIQu9dwYUe`2?@BFld3y)f@szddBFn6MCpWmE%$!On7BF1L zqnN^kNH%)@0HawXEolYgXAMvBe9Fq zZf!y)&Cu5DJNHNeMJRG<5saFVi>_}Xv_zkm1N8g>dj6m^L2EL6VlBeZOV!OaR&FW)vCmTaF_KA6wzEnS#(Fqs zlp+$+hC-g5iy4LXcnb(!xLf8A0VU+`eK*7 zUB`o|<*4c+Q`Ht1r(Kd7F=bpy#9tAvUv9_FPR;>9k*ZS~sy5^RfRHu-fH!RH*ZohO zymcE2Bs!4*6Ro^2g6nvVRP7Xm5b#&qb-w`c-@RAkSrz^3yncga6tE0(^VMYYR;zam^crY&Ma1gI%s6KopsJj;lnZC+D`@!kVM@OHCy#w~4`pe+EFS2z)= z9odQ=0;#e9_Me;AE**!k4Dpn&w~;@dcZ`w51>LAsWI=@XHbP!JF*ae9Jj>ww<5L7} zfvneMy|zFAsHB)B`YOo$uPtx#-rZ@9)?t*Z6O(mGHdU-nHHtE)A=mLRU5w>RL;%2a wF>c%%mC8Xv;9w|a8Er0AeEx_dj`+Xv7mCm|am?TIIsgCw07*qoM6N<$g0X^#HUIzs literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_l/42d1a74a-b9aa-46a6-ba2f-c9db2b517506.png b/sprites/spr_noelleb_battleintro_l/42d1a74a-b9aa-46a6-ba2f-c9db2b517506.png new file mode 100644 index 0000000000000000000000000000000000000000..3cbe9cc8f736099a98b21803dbdab58149d55c7d GIT binary patch literal 938 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_l/c0386448-dfc8-4e28-8865-12b2d62ea14c.png b/sprites/spr_noelleb_battleintro_l/c0386448-dfc8-4e28-8865-12b2d62ea14c.png new file mode 100644 index 0000000000000000000000000000000000000000..8976a86874c3436be422835fceb02ef009c1498e GIT binary patch literal 975 zcmV;=12FuFP)055Ph4t3Zzr-APG_^QYBC$LkeHv=np6m;#NPvzVTBd`FKB)}whaJ) zr8&Ls9svN#c1LSG07Puk#>cRxGf4UXDLx>G=fM-zEbEmf+P%J!({`_qdZj7U(uGRK z*i0qaNnx92lS`RY1myBrhk~_icjWlWjI03($MeysP5}THqapyHRV#6VC@@RceL_bqMZtu2uaC87zs2vnKhHzt%610( z!`|ENOhmK>&x02Ll-ryW;5lhH9vB6WjuFY#og4?zm@!$JEM$~KRD`%nCWN%eNHZ3Q zc8;8s6lagq_;bkT)NnjNz0%}$ZWf=$WJ08(y^x|eGA5(_pDS4v-hRlnLXv#?2 xR<;e58ChEsV`UVR$aff-Dzn69+4~i8;V)!@S2UC@wod>6002ovPDHLkV1lx9!YKd% literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_l/e9c71e60-1779-4505-86ef-a50a7c049954.png b/sprites/spr_noelleb_battleintro_l/e9c71e60-1779-4505-86ef-a50a7c049954.png new file mode 100644 index 0000000000000000000000000000000000000000..116b20317a1ac2dd1f936d2ec37c1073da8d2f3f GIT binary patch literal 740 zcmVc~O6n%qofD~-K63`K-h|-XfCY%5%3at;YT5pHaC7d9XROAAtiMCoAv{d%eVJq9G z$PNA$c*bLUY{q8TD3YJ#W@i5Q`ThT&#|A1?s8FFog$kboOmiKTh%rZ|*X|PlY_=-^ z!0z!00MN3nlMy=0o7`+yf`mj8o9&7#Wt3E{$l{i5;rZ@1Mesw&oQed;A(^Sy?&JCH zHl~hdtWjkstdArSb_yaux`0IsztM{re4qNsH76k>Z%U5qF3X$x0kT zNa+97Od>Tggv2Q^Op39>WD2R00TX+qm3g1~LX|vq9M>0WywQu1)Wy0f@8(kB0*Jaz zBErd)CUmB|P|F_0+m*$++qSIJRzT{3+I6BR0{pE!p~G<0gt# z1>rNmJ{6pRoR;(NO=a-fYbZ^!Y%%k0iUlU$&WBP}XM>coWe{uamThSt6Zp;RYyijg zG3+*TYflFvO}j7Wz_$nGB2}8C?$Oy_3sGxl5Xn+y*llv-6S(O_sbZ{ncPo8HRm3tl zk(*8fmlxLnfZu<9iFrO&6tN?OJdq^QvMo^?06?@~zVrf2Mq@!JRHT&YC4-2Fz!*z@ znh4mh5$A`m(fHB}I8mcV3zDxQ;NMzhp*+uURd$b0@TW8Q)0xSKEk;HKe>%gDzuEIk zFVNlUcrqMWgeIdg?iX_$lPVP%mMq$=mnH{qW!Yy=0mAr=1YC&%@T z6mn*o!kY+}{W**q+2zHxNR25)ln&f$_epkCEat-4WT=Sb75O134Jt)OQiCIJezRSf zGrnHCuWfX^ZjLp)LlA|U1TSLKB(#2s+%M*-iOFbeHXTJ&3KfvmFrJn&e>;oDYU3Y- WcC%+z)PVW`0000pl$0pTMW9-QT0PM-bo;ua2S_zVC_5UH$;QAer~PHSr}zf8`= zI<(XnuCGBvoPdQ`tvhgiZDw8tA?)hx$urec0sw913-iqNHSNi>UMQ&CMapmhtkxaa zrnBp7^qeV(2m!Z12^)&aLCFN(<};?~&%PgYpp?oC?D`s$ldf%+=K5wj@W88e2d{s4 z=$?OpQVK+5J|&cj4{IaF>TzMrQ-+*f6rdFj&P7aLUKs*egtAC5P6u1lhO4!WOpFKs zI6K1pmBQqtYo@b)`677ub(SLH`q~65qX-LHdevq^jNZS8h}h*-a4($dS+*nyq*A2T z<|?bcZ03thYfcASv%0ebMP$h4y;MguM9-PVh-Fn@8z~z~*(B|m$C;a%lO&R~h4V-( z3n`nDH;ghD_i-|uA6XWO1vRDOtQ}1Eu*O)4lp-UEFl>ZeU*p%abmg73!$4snOzxc} z4mzrA<_kmAGF1%`1~0P6Sf5g4zOT1tpjkVRTPnfdrCMb++YGS-Oc5$f;8`1(i9{8? z7xuG2wbVFs|7`P)Twmk;Ao8Dy$fQi>5-Vma4Pk#7iyIa0Y0RF*^|jffIJ;;Mo055Ph4t3Zzr-APG_^QYBC$LkeHv=np6m;#NPvzVTBd`FKB)}whaJ) zr8&Ls9svN#c1LSG07Puk#>cRxGf4UXDLx>G=fM-zEbEmf+P%J!({`_qdZj7U(uGRK z*i0qaNnx92lS`RY1myBrhk~_icjWlWjI03($MeysP5}THqapyHRV#6VC@@RceL_bqMZtu2uaC87zs2vnKhHzt%610( z!`|ENOhmK>&x02Ll-ryW;5lhH9vB6WjuFY#og4?zm@!$JEM$~KRD`%nCWN%eNHZ3Q zc8;8s6lagq_;bkT)NnjNz0%}$ZWf=$WJ08(y^x|eGA5(_pDS4v-hRlnLXv#?2 xR<;e58ChEsV`UVR$aff-Dzn69+4~i8;V)!@S2UC@wod>6002ovPDHLkV1lx9!YKd% literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_l/fee5e780-d105-4173-a878-801064ea22a7.png b/sprites/spr_noelleb_battleintro_l/fee5e780-d105-4173-a878-801064ea22a7.png new file mode 100644 index 0000000000000000000000000000000000000000..a85fb903dc73ceecd06732b6b1c61ae08871be57 GIT binary patch literal 968 zcmV;(12_DMP)pl$0pTMW9-QT0PM-bo;ua2S_zVC_5UH$;QAer~PHSr}zf8`= zI<(XnuCGBvoPdQ`tvhgiZDw8tA?)hx$urec0sw913-iqNHSNi>UMQ&CMapmhtkxaa zrnBp7^qeV(2m!Z12^)&aLCFN(<};?~&%PgYpp?oC?D`s$ldf%+=K5wj@W88e2d{s4 z=$?OpQVK+5J|&cj4{IaF>TzMrQ-+*f6rdFj&P7aLUKs*egtAC5P6u1lhO4!WOpFKs zI6K1pmBQqtYo@b)`677ub(SLH`q~65qX-LHdevq^jNZS8h}h*-a4($dS+*nyq*A2T z<|?bcZ03thYfcASv%0ebMP$h4y;MguM9-PVh-Fn@8z~z~*(B|m$C;a%lO&R~h4V-( z3n`nDH;ghD_i-|uA6XWO1vRDOtQ}1Eu*O)4lp-UEFl>ZeU*p%abmg73!$4snOzxc} z4mzrA<_kmAGF1%`1~0P6Sf5g4zOT1tpjkVRTPnfdrCMb++YGS-Oc5$f;8`1(i9{8? z7xuG2wbVFs|7`P)Twmk;Ao8Dy$fQi>5-Vma4Pk#7iyIa0Y0RF*^|jffIJ;;Moo83JO_NZ2~O?*F{PfXGFulET906)Ke0RUWF zgNg#}1x7}sj0%S`3x*>ib#Z-DC|$2gFwpi&27XC9sZwcL(HIreq3L{LWU3UfVk;afL?Kh`BKaZt|nkt9Ynjy8Dp^M4-+tLK&Rw0$IOFC zM&(kjm`(~t0vcm7fl9-;9cwW1y$?u4R~GeA`3>g%K%D^pS8{q07Od? z9cA%uzf%1x6WL|I?>h@h>)ye$ad$=N1Ag+jc$m4>X8$SR4J1g!}2&Oj>6=aYJHv>5LE^jL-HRqcrJ0WApT z*W+{2Nw2y!t*9Qp4~dop*~<8i9=V?BRe_$U9Fh0jb_v0zE&C+XY;I(XHV{WES`u!L z>Zxe4xayRM1WBVLz%JddDyIseo&{Hb_r?lNYDOyr$ zU*f|z1G2#%p6=W&qOfUG8>L)9`!$1BvkhSPh$=ypXqEc&DR`rl|G8*DWkIq!uuR91 zVNK@~>oe`Yn0-dZGPQU}|L@96lQ(kvj7ph~Xb*iHbkIQu9dwYUe`2?@BFld3y)f@szddBFn6MCpWmE%$!On7BF1L zqnN^kNH%)@0HawXEolYgXAMvBe9Fq zZf!y)&Cu5DJNHNeMJRG<5saFVi>_}Xv_zkm1N8g>dj6m^L2EL6VlBeZOV!OaR&FW)vCmTaF_KA6wzEnS#(Fqs zlp+$+hC-g5iy4LXcnb(!xLf8A0VU+`eK*7 zUB`o|<*4c+Q`Ht1r(Kd7F=bpy#9tAvUv9_FPR;>9k*ZS~sy5^RfRHu-fH!RH*ZohO zymcE2Bs!4*6Ro^2g6nvVRP7Xm5b#&qb-w`c-@RAkSrz^3yncga6tE0(^VMYYR;zam^crY&Ma1gI%s6KopsJj;lnZC+D`@!kVM@OHCy#w~4`pe+EFS2z)= z9odQ=0;#e9_Me;AE**!k4Dpn&w~;@dcZ`w51>LAsWI=@XHbP!JF*ae9Jj>ww<5L7} zfvneMy|zFAsHB)B`YOo$uPtx#-rZ@9)?t*Z6O(mGHdU-nHHtE)A=mLRU5w>RL;%2a wF>c%%mC8Xv;9w|a8Er0AeEx_dj`+Xv7mCm|am?TIIsgCw07*qoM6N<$g0X^#HUIzs literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_l/layers/42d1a74a-b9aa-46a6-ba2f-c9db2b517506/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/42d1a74a-b9aa-46a6-ba2f-c9db2b517506/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 0000000000000000000000000000000000000000..3cbe9cc8f736099a98b21803dbdab58149d55c7d GIT binary patch literal 938 zcmV;b16BNqP)o83JO_NZ2~O?*F{PfXGFulET906)Ke0RUWF zgNg#}1x7}sj0%S`3x*>ib#Z-DC|$2gFwpi&27XC9sZwcL(HIreq3L{LWU3UfVk;afL?Kh`BKaZt|nkt9Ynjy8Dp^M4-+tLK&Rw0$IOFC zM&(kjm`(~t0vcm7fl9-;9cwW1y$?u4R~GeA`3>g%K%D^pS8{q07Od? z9cA%uzf%1x6WL|I?>h@h>)ye$ad$=N1Ag+jc$m4>X8$SR4J1g!}2&Oj>6=aYJHv>5LE^jL-HRqcrJ0WApT z*W+{2Nw2y!t*9Qp4~dop*~<8i9=V?BRe_$U9Fh0jb_v0zE&C+XY;I(XHV{WES`u!L z>Zxe4xayRM1WBVLz%JddDyIseo&{Hb_r?lNYDOyr$ zU*f|z1G2#%p6=W&qOfUG8>L)9`!$1BvkhSPh$=ypXqEc&DR`rl|G8*DWkIq!uuR91 zVNK@~>oe`Yn0-dZGPQU}|L@96lQ(kvj7ph~Xb*iHbkIQu9dwYUe`2o83JO_NZ2~O?*F{PfXGFulET906)Ke0RUWF zgNg#}1x7}sj0%S`3x*>ib#Z-DC|$2gFwpi&27XC9sZwcL(HIreq3L{LWU3UfVk;afL?Kh`BKaZt|nkt9Ynjy8Dp^M4-+tLK&Rw0$IOFC zM&(kjm`(~t0vcm7fl9-;9cwW1y$?u4R~GeA`3>g%K%D^pS8{q07Od? z9cA%uzf%1x6WL|I?>h@h>)ye$ad$=N1Ag+jc$m4>X8$SR4J1g!}2&Oj>6=aYJHv>5LE^jL-HRqcrJ0WApT z*W+{2Nw2y!t*9Qp4~dop*~<8i9=V?BRe_$U9Fh0jb_v0zE&C+XY;I(XHV{WES`u!L z>Zxe4xayRM1WBVLz%JddDyIseo&{Hb_r?lNYDOyr$ zU*f|z1G2#%p6=W&qOfUG8>L)9`!$1BvkhSPh$=ypXqEc&DR`rl|G8*DWkIq!uuR91 zVNK@~>oe`Yn0-dZGPQU}|L@96lQ(kvj7ph~Xb*iHbkIQu9dwYUe`2c#16nzYOfDGaIG`;nzT33b=+d66LiSWf2v zfP?fz9j9yeCbVZG!YAQS-W%<4lyHIs5A1E~piXFNKS)pT=fnGr{k_QuVG-Z8VF)4N zLWTigDj^7Ac>D8LgKUUzTn5$gf1q=zp~uFZnRk;i06qWm-vn?T0XDLL0`BYZPa8zdQ zBuvjFUhV^*PFoT2g>E-dmAFb6h=|bbyvj$dl3(ky$)-w=jU{42Hg>v-YH$03Uzqw4 z?j25sPd+&wK=hfo!+iWBl2KPeRBjzG_ zni|mf%^Ak6T@mqJgx5H0p1HZZv<^Of)%@-2yN|wWFsnjDl&;GH#V>J`XhS3#*=Jtk z+4SY_b3I)*zpYbccsK$8+}>Yp=da4eWYmgC2)xfGjpl$0pTMW9-QT0PM-bo;ua2S_zVC_5UH$;QAer~PHSr}zf8`= zI<(XnuCGBvoPdQ`tvhgiZDw8tA?)hx$urec0sw913-iqNHSNi>UMQ&CMapmhtkxaa zrnBp7^qeV(2m!Z12^)&aLCFN(<};?~&%PgYpp?oC?D`s$ldf%+=K5wj@W88e2d{s4 z=$?OpQVK+5J|&cj4{IaF>TzMrQ-+*f6rdFj&P7aLUKs*egtAC5P6u1lhO4!WOpFKs zI6K1pmBQqtYo@b)`677ub(SLH`q~65qX-LHdevq^jNZS8h}h*-a4($dS+*nyq*A2T z<|?bcZ03thYfcASv%0ebMP$h4y;MguM9-PVh-Fn@8z~z~*(B|m$C;a%lO&R~h4V-( z3n`nDH;ghD_i-|uA6XWO1vRDOtQ}1Eu*O)4lp-UEFl>ZeU*p%abmg73!$4snOzxc} z4mzrA<_kmAGF1%`1~0P6Sf5g4zOT1tpjkVRTPnfdrCMb++YGS-Oc5$f;8`1(i9{8? z7xuG2wbVFs|7`P)Twmk;Ao8Dy$fQi>5-Vma4Pk#7iyIa0Y0RF*^|jffIJ;;Mow}V8M;!83qchUh2S>zS(@wpFD23oXe(V|6*7EYkz<7-nJfyv3k>=pnp zoL=Z`2>>J;(^|Fhtja)eNQFaAv}ts7szhOo^Sk?63!LBGBMM`#mJf8&D!*I^m77wSlG1oDIQ12wHkqKv4~2w{a1+qw45Bc$63Hkjk;o`v_Fj2oEbS^)Sg1t1 zV$3;jvN&Fj-~Z-K5yvq?Kw_tz&|cz;emjoSU9=P3n$m!lr_apigxf zbEZm>=kEu~ST8uma-HJrcwk!FO&QxSG|gp{;AHgZtW3u?sdLK44$*~;WR~kxA;i8v z%x-IS=Y3&pddqc+m){D9A20LkyK8PB=FDo-=izCx&uB6Hy(p zHbiyc*z`3nS-}$i`{{{*||!KWrQTuHL-G_a9d! zGJ^eHWK74-006N?b($- zt`360`+dI>JXFhd%EKgvPYe&ULxX>hD1<~O;#F|0%Nuu;Pc)g8Oe?8TLio7-dLZ_wc2K{0}5z*C>qn x{r_;Tkcq;WS5Oqj;(cSND=SI%055Ph4t3Zzr-APG_^QYBC$LkeHv=np6m;#NPvzVTBd`FKB)}whaJ) zr8&Ls9svN#c1LSG07Puk#>cRxGf4UXDLx>G=fM-zEbEmf+P%J!({`_qdZj7U(uGRK z*i0qaNnx92lS`RY1myBrhk~_icjWlWjI03($MeysP5}THqapyHRV#6VC@@RceL_bqMZtu2uaC87zs2vnKhHzt%610( z!`|ENOhmK>&x02Ll-ryW;5lhH9vB6WjuFY#og4?zm@!$JEM$~KRD`%nCWN%eNHZ3Q zc8;8s6lagq_;bkT)NnjNz0%}$ZWf=$WJ08(y^x|eGA5(_pDS4v-hRlnLXv#?2 xR<;e58ChEsV`UVR$aff-Dzn69+4~i8;V)!@S2UC@wod>6002ovPDHLkV1lx9!YKd% literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_l/layers/c0386448-dfc8-4e28-8865-12b2d62ea14c/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/c0386448-dfc8-4e28-8865-12b2d62ea14c/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 0000000000000000000000000000000000000000..8976a86874c3436be422835fceb02ef009c1498e GIT binary patch literal 975 zcmV;=12FuFP)055Ph4t3Zzr-APG_^QYBC$LkeHv=np6m;#NPvzVTBd`FKB)}whaJ) zr8&Ls9svN#c1LSG07Puk#>cRxGf4UXDLx>G=fM-zEbEmf+P%J!({`_qdZj7U(uGRK z*i0qaNnx92lS`RY1myBrhk~_icjWlWjI03($MeysP5}THqapyHRV#6VC@@RceL_bqMZtu2uaC87zs2vnKhHzt%610( z!`|ENOhmK>&x02Ll-ryW;5lhH9vB6WjuFY#og4?zm@!$JEM$~KRD`%nCWN%eNHZ3Q zc8;8s6lagq_;bkT)NnjNz0%}$ZWf=$WJ08(y^x|eGA5(_pDS4v-hRlnLXv#?2 xR<;e58ChEsV`UVR$aff-Dzn69+4~i8;V)!@S2UC@wod>6002ovPDHLkV1lx9!YKd% literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_l/layers/e9c71e60-1779-4505-86ef-a50a7c049954/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/e9c71e60-1779-4505-86ef-a50a7c049954/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 0000000000000000000000000000000000000000..116b20317a1ac2dd1f936d2ec37c1073da8d2f3f GIT binary patch literal 740 zcmVc~O6n%qofD~-K63`K-h|-XfCY%5%3at;YT5pHaC7d9XROAAtiMCoAv{d%eVJq9G z$PNA$c*bLUY{q8TD3YJ#W@i5Q`ThT&#|A1?s8FFog$kboOmiKTh%rZ|*X|PlY_=-^ z!0z!00MN3nlMy=0o7`+yf`mj8o9&7#Wt3E{$l{i5;rZ@1Mesw&oQed;A(^Sy?&JCH zHl~hdtWjkstdArSb_yaux`0IsztM{re4qNsH76k>Z%U5qF3X$x0kT zNa+97Od>Tggv2Q^Op39>WD2R00TX+qm3g1~LX|vq9M>0WywQu1)Wy0f@8(kB0*Jaz zBErd)CUmB|P|F_0+m*$++qSIJRzT{3+I6BR0{pE!p~G<0gt# z1>rNmJ{6pRoR;(NO=a-fYbZ^!Y%%k0iUlU$&WBP}XM>coWe{uamThSt6Zp;RYyijg zG3+*TYflFvO}j7Wz_$nGB2}8C?$Oy_3sGxl5Xn+y*llv-6S(O_sbZ{ncPo8HRm3tl zk(*8fmlxLnfZu<9iFrO&6tN?OJdq^QvMo^?06?@~zVrf2Mq@!JRHT&YC4-2Fz!*z@ znh4mh5$A`m(fHB}I8mcV3zDxQ;NMzhp*+uURd$b0@TW8Q)0xSKEk;HKe>%gDzuEIk zFVNlUcrqMWgeIdg?iX_$lPVP%mMq$=mnH{qW!Yy=0mAr=1YC&%@T z6mn*o!kY+}{W**q+2zHxNR25)ln&f$_epkCEat-4WT=Sb75O134Jt)OQiCIJezRSf zGrnHCuWfX^ZjLp)LlA|U1TSLKB(#2s+%M*-iOFbeHXTJ&3KfvmFrJn&e>;oDYU3Y- WcC%+z)PVW`0000pl$0pTMW9-QT0PM-bo;ua2S_zVC_5UH$;QAer~PHSr}zf8`= zI<(XnuCGBvoPdQ`tvhgiZDw8tA?)hx$urec0sw913-iqNHSNi>UMQ&CMapmhtkxaa zrnBp7^qeV(2m!Z12^)&aLCFN(<};?~&%PgYpp?oC?D`s$ldf%+=K5wj@W88e2d{s4 z=$?OpQVK+5J|&cj4{IaF>TzMrQ-+*f6rdFj&P7aLUKs*egtAC5P6u1lhO4!WOpFKs zI6K1pmBQqtYo@b)`677ub(SLH`q~65qX-LHdevq^jNZS8h}h*-a4($dS+*nyq*A2T z<|?bcZ03thYfcASv%0ebMP$h4y;MguM9-PVh-Fn@8z~z~*(B|m$C;a%lO&R~h4V-( z3n`nDH;ghD_i-|uA6XWO1vRDOtQ}1Eu*O)4lp-UEFl>ZeU*p%abmg73!$4snOzxc} z4mzrA<_kmAGF1%`1~0P6Sf5g4zOT1tpjkVRTPnfdrCMb++YGS-Oc5$f;8`1(i9{8? z7xuG2wbVFs|7`P)Twmk;Ao8Dy$fQi>5-Vma4Pk#7iyIa0Y0RF*^|jffIJ;;Mo055Ph4t3Zzr-APG_^QYBC$LkeHv=np6m;#NPvzVTBd`FKB)}whaJ) zr8&Ls9svN#c1LSG07Puk#>cRxGf4UXDLx>G=fM-zEbEmf+P%J!({`_qdZj7U(uGRK z*i0qaNnx92lS`RY1myBrhk~_icjWlWjI03($MeysP5}THqapyHRV#6VC@@RceL_bqMZtu2uaC87zs2vnKhHzt%610( z!`|ENOhmK>&x02Ll-ryW;5lhH9vB6WjuFY#og4?zm@!$JEM$~KRD`%nCWN%eNHZ3Q zc8;8s6lagq_;bkT)NnjNz0%}$ZWf=$WJ08(y^x|eGA5(_pDS4v-hRlnLXv#?2 xR<;e58ChEsV`UVR$aff-Dzn69+4~i8;V)!@S2UC@wod>6002ovPDHLkV1lx9!YKd% literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_l/layers/fee5e780-d105-4173-a878-801064ea22a7/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/fee5e780-d105-4173-a878-801064ea22a7/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 0000000000000000000000000000000000000000..a85fb903dc73ceecd06732b6b1c61ae08871be57 GIT binary patch literal 968 zcmV;(12_DMP)pl$0pTMW9-QT0PM-bo;ua2S_zVC_5UH$;QAer~PHSr}zf8`= zI<(XnuCGBvoPdQ`tvhgiZDw8tA?)hx$urec0sw913-iqNHSNi>UMQ&CMapmhtkxaa zrnBp7^qeV(2m!Z12^)&aLCFN(<};?~&%PgYpp?oC?D`s$ldf%+=K5wj@W88e2d{s4 z=$?OpQVK+5J|&cj4{IaF>TzMrQ-+*f6rdFj&P7aLUKs*egtAC5P6u1lhO4!WOpFKs zI6K1pmBQqtYo@b)`677ub(SLH`q~65qX-LHdevq^jNZS8h}h*-a4($dS+*nyq*A2T z<|?bcZ03thYfcASv%0ebMP$h4y;MguM9-PVh-Fn@8z~z~*(B|m$C;a%lO&R~h4V-( z3n`nDH;ghD_i-|uA6XWO1vRDOtQ}1Eu*O)4lp-UEFl>ZeU*p%abmg73!$4snOzxc} z4mzrA<_kmAGF1%`1~0P6Sf5g4zOT1tpjkVRTPnfdrCMb++YGS-Oc5$f;8`1(i9{8? z7xuG2wbVFs|7`P)Twmk;Ao8Dy$fQi>5-Vma4Pk#7iyIa0Y0RF*^|jffIJ;;Mo":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":13.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_noelleb_battleintro_l", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":-1,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe80eb11-7ef9-4faf-8770-6a423a6fecbf","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e2e20b93-4624-48c1-8347-988e4c3cd209","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9c71e60-1779-4505-86ef-a50a7c049954","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d817ccaf-ea8c-4416-9190-c30f4dfde55e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"548d30db-aa73-4744-8cbd-6ff871b5681f","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a5c5bf2-d68e-478d-b37b-d942a42e07dc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49954b19-785a-41cb-a914-4b35364e534d","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f1914378-13ab-43c1-a70c-3f6cb1846b0e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5800514-d536-463d-a7c1-393309b6547c","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6ffca10c-d5e7-4d1d-bdd8-70d05c05a42d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42d1a74a-b9aa-46a6-ba2f-c9db2b517506","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0e83d433-62f4-4bea-9df8-ce157e0919de","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fee5e780-d105-4173-a878-801064ea22a7","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"21653b0f-0f51-49c3-b53b-b25935feee68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e70563e-c2bc-47a3-bbdb-adb36cb93f53","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ebeb9ef2-815c-4830-b508-f082f7838144","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"650026c9-fa6b-41de-a60b-fba3d901b25b","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6b6f0843-c6e5-40fd-954f-d6ab1e6def3f","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38005f93-8b8a-4ebe-8d2e-00d4dc1a951a","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b79ef266-a372-4a8e-8306-9b70f8eaad24","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a94460b6-2373-4c3c-8893-55f8720eab39","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a80472a2-8b56-46a7-9a8c-ad5cacf3a0e3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0386448-dfc8-4e28-8865-12b2d62ea14c","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5492c515-1f0c-4cee-9bc8-48ff2cb2eb3b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb85fb7d-4277-4c3d-859b-e5e03638c634","path":"sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7240f965-c535-4f91-88dc-200575f32d46","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":5, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"ch3_unused", + "path":"texturegroups/ch3_unused", + }, + "type":0, + "VTile":false, + "width":35, +} \ No newline at end of file diff --git a/sprites/spr_noelleb_battleintro_sideb/1f3091de-a351-4965-a54b-f91f337ad48b.png b/sprites/spr_noelleb_battleintro_sideb/1f3091de-a351-4965-a54b-f91f337ad48b.png new file mode 100644 index 0000000000000000000000000000000000000000..e871b650ec5e876fd2d5e1be676167666f2d03dd GIT binary patch literal 810 zcmV+_1J(SAP)RgTS<2!Oq$=4uW$(fdh~jKj)diyd0OlxvfvS=j8Jd<3g|a~e za~SvmRBs3S-1GTtAKW<;kA!T)>w6zR@5j9cIN*Q-4#)+?A0r!PgUGzs2LL!hN3|{i zfMlcedt_4{!6C&C6QVkJWvYtj`nbA(&@#Tde}L!uiCQvD!<2b)MHqB!09X!_NMN6v ztRygyNl>gQObkv~Tg$HvW%$D61f3KK4*p$Cij^&7MI99p8SmbH!gw}P`ZcYl%+r_Q z+n4qnd*o!G6648MP z83LmCEBZ(-xUDKwMtw%L336wu-^4zodH|y^2_r*>pc8abzst6&Tr(+c8cY_rJZq#D zF3XSOn}(=L%D+*V&YMqq&F;%>biD2sZV4t~V%mv&-G%eKDK#@L?Z;`|bO|Fee6UU$ zo=8Zw1vo(mMCBvSJ_)Ssx{uR3&YMrE@8o25f)04n!_uV3PFPzxGH``He|V4YKY#DM z@ZQy=Qs?rl0V2ZdAHOhM)zEtrJ$y)8v`_gf{^UN@;@0=^s2%Y0uh0+XgPi^?oYg;xD6^8u4ph>BxM^c zqod$3dqY8qTb*aRr%|$ov`y651=feF7HVjrmQp|_6)R{xfdPQ>04aGn_;n@9e4Xa^ z4xUFkutFwo@5XqMfm}x1nX4&nAS!1$Tw;j0U8TxgH0w#_sKUkfCyv{dsmB~u@~USr zS3_L93X|cKuqU2l~Ec~T3V6|Kt;<5pj@TQo**p0km4Kw zrPvz`Mf?rppP6ySGrLV*DMez(-{bfD8BYS7b=FyK#2j9W554X)%b+4~5~UmfPofk_ zls>96e79Ny0A7CjAUYXxntuD0AROTgTP$r6d0aFDc*kh+B#4qP zRH>qC@FYqH!C0rs1n%1z5kz)~3OO%I%;LTHJYX4s|HXZKe{GCqJ7;Ps8+{D5C*N$x zxP15C2sJoOCJ+Fa#e4j`yCkQSDYSOxz&BQ3yqGMN?pRIWyeKX2K`$F;tX!!a(Z=-E z+5nD)`*3x1vCsVR3PTE5hAOq%`7;RS;i?pO-X(eN0LNLR>n118(17dGpEvbm@;c@W zMh4ie)>cbBpV21ZfhH0+SDj-tFir$LtwPt4VUO>oTD%rxY#Wd^{Kz4=BSM4GOJ98>fz%r++ zc1??Eh=64XScZ$q(s=&Ry_HI|nd6*uo)@KfpF}Coi<0L>$q#%ZUb>}VFo;S7L@$Ce z!C0s181txClh>_d%Wt2>dwTx$rJ55-lqy}KboEJ*vpMr)+dTm1@fh=1w6vF+5$?!$ zZjx6R>L3~FNr9SyOb$sSz>ho4VARe}0;CG4a*2NJY63awrmjw+4r)hY~oH*)n&a>;SEM=_1-n%qj;?UUHJ$3&JaoHfvUm)0000< KMNUMnLSTXqN>?cW literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/4dfafad1-5571-462d-bc70-42e7cc4fbe4f.png b/sprites/spr_noelleb_battleintro_sideb/4dfafad1-5571-462d-bc70-42e7cc4fbe4f.png new file mode 100644 index 0000000000000000000000000000000000000000..da1e95b9db2ef969695a990a73f6a5eaee7d64f5 GIT binary patch literal 719 zcmV;=0xKpLaa**yHD!RQaSR@?<>koA3S21i0XW3)~=ZxEA$Y_leMGX*ddF0zgq1BMRfQ zDnt9(0s!#*(}!|UC$ZVBMCwSC0RZf03otQP=t72~Fvi<2Ur&B0l<1{O*Oy3FqHq2Hrn)++9iSGJi}EmX(i&F zjEcgwjrFG&nd3aeac+(ut~<7HqRdq=G5+@F^~8D|F&UM>ezs^N1ORt8qgGdWkD1%? z0sChIeYkQ!V?31@SZ{~OY1yg}^0yfqLeNIkG{Ct?!&h70c2_aMG?&T&O>S@nJgwHi?2dz$I zbR=oUmpO{Un36Q3oR*Z+l9Dtl$D0-vD??Pj?u+Y}wc{?8XjCQ&;}fM+m24OFR%ckb z`){9NOQ<)QAKOFaTg7I#sxA9oHqRdp&^n-SDJ(8_qDEODfD*`4!z3a?5O|AS-PU7j zo77R1X;jEr%vi97a>d~+6Wz(J)M-+tE{?cRdLhG$+mJzrz!np-A)~A4O&xXDZA26| z5#a8x*D}R{$Dn>Q9#)>YWB-2m1pu7#&hwsQr&nD4lG| zY1g(bfahorR+;3Z(6tiMNoi?(7BVNKlpfSd;veD5w=9!vk3s+d002ovPDHLkV1i6* BODX^W literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/507c3c4b-7ca2-4044-a213-449aaf00f413.png b/sprites/spr_noelleb_battleintro_sideb/507c3c4b-7ca2-4044-a213-449aaf00f413.png new file mode 100644 index 0000000000000000000000000000000000000000..d9aa4b737036cf18584b74f159e6a5257e6dfb64 GIT binary patch literal 755 zcmV&GXQ|iYz_kRrCnfH93}Yj<7eYR<%v#S+4W0I z_CysbnuEnr(h0^nOeXNYJ;RNN9->4}v!XWe;&=#Po7|62_f~dX*O^+#2H%FtL909j z08B2gYWLgV-a5h*-nTmk_8tS9{5*=X82-Wf&*;VP#USk4b$a>*I?%$C-JDQ^It z)U7uADs2w(;rG%Cq<0w6BUNZ?o2*xum+JyA*X{X3)kI3OLJQ@^Ge^N`>$AU~o6p(` zz!^pa*v#fyAmIOstW)nfb22Wmc{fmjHImtB(Ocyqp4rmq4btG>FQj>B^p5l1WLj%h zdDuu`x-UT0>^sAxS)nv08wOy4;tXAW9qa_8f~vyI8TOLEBG}nzilg9EnQxt8#5cDA zsuT!U?WU_*mvvgyWUovvue4oX=jMvBEz=?|d6iro52@Y6F71YMH4%g?f+7gpmJ{%l zz#m7S_~-L+2*w!q()9MmdY;~@i802#LO`Zp37ugUd0G1_>S2A?2vbilz7@8MAB&@e zwJDAge)R$)USv=w0`3c_<{>g4O&@US^vd>ryI^g`Y|V-p%# z=pkn~kgce^WsqLNq*D;I_fuXsN>f=2AdM~$@OxYjX!;xpM5(=;LI@u7{qkDzjnlLb lspLIO^nw1LV0-Ke0I$}`SuwMC$z=cl002ovPDHLkV1hKBW4-_Y literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/517212a0-14c3-4fd4-8142-c7cf44933975.png b/sprites/spr_noelleb_battleintro_sideb/517212a0-14c3-4fd4-8142-c7cf44933975.png new file mode 100644 index 0000000000000000000000000000000000000000..b53ea782cca3f44935c4a33f768e23fdfb2b93fb GIT binary patch literal 867 zcmV-p1DyPcP)K*`i0J}#rca>OK>+6hR3mp*V?-4h zb)=y5DvZ=IUJ7wn%daTyN|gs7K(2`0;k{1_s@R4MS*DHm-+$zONR-%0m5pEK zWU@*mq2hg!W!hVjQ4Z5O;=5Kx3?eJUjqC?8PL5}y{eYd;9!s^(q(au{8Kp1QA*C%$ zRYU+_K_mD<3{-?pS(ycma*YpHaVfd`unDJa6ppP_fs-%Y2(q8Dc%dRoRmTrkE28T{ zs6(0Bc({rMxx~nY_Sg#?xO0L# zC!V%AV5d1h^>42E9xDee$~bK!oU*E+ttoQOLoA|mpGm=angbGreoG=b%j?r{2<0KoT1a|qSNXEK*~Q=P|harkcrIUaN360 z;B{JE{Q7+-)Pd8bqJpQS3|EH};&^x5Or`nHkLT#Ly0z5N;TZ-1!!W%hFnXVJFTVae ztJk9<$PePejPipx^_%vzE+bTgqV_UET2nh4s!gH$w3D*y7RFd^EyLTPdp%R7&M=&z zY(Kv3iRebkKr%BVztl1E&bPP2aF$bxSLU576L|xESS?iIGd7lok9$dN@WD8t$Q#Jy t_6~WyA}djg%wCT~)?pw2s*rSFiT^rW2%_nv^bP<3002ovPDHLkV1oWKjmrQ4 literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611.png b/sprites/spr_noelleb_battleintro_sideb/541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611.png new file mode 100644 index 0000000000000000000000000000000000000000..d9aa4b737036cf18584b74f159e6a5257e6dfb64 GIT binary patch literal 755 zcmV&GXQ|iYz_kRrCnfH93}Yj<7eYR<%v#S+4W0I z_CysbnuEnr(h0^nOeXNYJ;RNN9->4}v!XWe;&=#Po7|62_f~dX*O^+#2H%FtL909j z08B2gYWLgV-a5h*-nTmk_8tS9{5*=X82-Wf&*;VP#USk4b$a>*I?%$C-JDQ^It z)U7uADs2w(;rG%Cq<0w6BUNZ?o2*xum+JyA*X{X3)kI3OLJQ@^Ge^N`>$AU~o6p(` zz!^pa*v#fyAmIOstW)nfb22Wmc{fmjHImtB(Ocyqp4rmq4btG>FQj>B^p5l1WLj%h zdDuu`x-UT0>^sAxS)nv08wOy4;tXAW9qa_8f~vyI8TOLEBG}nzilg9EnQxt8#5cDA zsuT!U?WU_*mvvgyWUovvue4oX=jMvBEz=?|d6iro52@Y6F71YMH4%g?f+7gpmJ{%l zz#m7S_~-L+2*w!q()9MmdY;~@i802#LO`Zp37ugUd0G1_>S2A?2vbilz7@8MAB&@e zwJDAge)R$)USv=w0`3c_<{>g4O&@US^vd>ryI^g`Y|V-p%# z=pkn~kgce^WsqLNq*D;I_fuXsN>f=2AdM~$@OxYjX!;xpM5(=;LI@u7{qkDzjnlLb lspLIO^nw1LV0-Ke0I$}`SuwMC$z=cl002ovPDHLkV1hKBW4-_Y literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/69551cfc-8a5c-46ea-b634-fb9efd428c1a.png b/sprites/spr_noelleb_battleintro_sideb/69551cfc-8a5c-46ea-b634-fb9efd428c1a.png new file mode 100644 index 0000000000000000000000000000000000000000..5caef37e41f9aad57496833633b33340058d4882 GIT binary patch literal 799 zcmV+)1K|9LP)c#16n$!n&K0y%;Y5LDTUZg$WEcn)#}6$P|<3E)YthXR)2 z&h?N382A}1(iBBWv`BUG0|d!5#sB>N<0on0h$D_Tq7sx}MtvL`M3&DM>m z*Y9r#ys(qm1OOxxdA`p80B^qzlrL1J%bGHWASYi^$JD^2lOCoNP_32?GTJ0`V3H;R zcKKJ-kxH<>s#F;%qgn)6Fx7W%G(?1Ul_pL7nmpH*CP6|a%By~u!JQUn7DnKwVL*2ACU9}z5%nars5p}6D zHgF|N!NlWJJwqGqfm!~4&Q}J*>|vCqE58pSg5x+^t1`e9>+X0Pr&*;s<5NfJ9h=~l zR-QR*A(X1E)@t2$PeD~_5sl0GNENvw^k#T0=TVz!uS#p>)3mlHS$)|F9= dP15H|ya1U1BRGP;E`b05002ovPDHLkV1k_rV-5fS literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/72c13161-4909-4cac-94f9-8b54b06bf9ef.png b/sprites/spr_noelleb_battleintro_sideb/72c13161-4909-4cac-94f9-8b54b06bf9ef.png new file mode 100644 index 0000000000000000000000000000000000000000..f53383e4889e4447a46c39d9840b3d7e6e93b780 GIT binary patch literal 746 zcmV_YR!|^gvKYxEIYR+U z=v-vT4PFQ9$r2?|GDW(JKOjJ$Kje?!dwe8i;H`Np% zk%o%fAkXnT!6=8R3EZ?ZStogiIFW-e#>h>w>wRksV4vJi&kwEoQLQtDkoCR|qz_*X z=K#5{1Jt zn1V3oBe2q`p)(8-(e)oVN(wYzui7`JAj%g$c5617;&FRl z`GN@B_QOCcn7YKRoAP3A>7HecHAbA`CZ~L3(c}A~E66PqCpl4a?ufa<3o7S~){oL+ zA~z|8$rw)JjHufv$y~{+^L|F`JQ8rolmGw#07*qoM6N<$g3n7){r~^~ literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303.png b/sprites/spr_noelleb_battleintro_sideb/7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303.png new file mode 100644 index 0000000000000000000000000000000000000000..32cc2eca01117600395579604749bd4a8bdee254 GIT binary patch literal 728 zcmV;}0w?{6P)3_L93X|cKuqU2l~Ec~T3V6|Kt;<5pj@TQo**p0km4Kw zrPvz`Mf?rppP6ySGrLV*DMez(-{bfD8BYS7b=FyK#2j9W554X)%b+4~5~UmfPofk_ zls>96e79Ny0A7CjAUYXxntuD0AROTgTP$r6d0aFDc*kh+B#4qP zRH>qC@FYqH!C0rs1n%1z5kz)~3OO%I%;LTHJYX4s|HXZKe{GCqJ7;Ps8+{D5C*N$x zxP15C2sJoOCJ+Fa#e4j`yCkQSDYSOxz&BQ3yqGMN?pRIWyeKX2K`$F;tX!!a(Z=-E z+5nD)`*3x1vCsVR3PTE5hAOq%`7;RS;i?pO-X(eN0LNLR>n118(17dGpEvbm@;c@W zMh4ie)>cbBpV21ZfhH0+SDj-tFir$LtwPt4VUO>oTD%rxY#Wd^{Kz4=BSM4GOJ98>fz%r++ zc1??Eh=64XScZ$q(s=&Ry_HI|nd6*uo)@KfpF}Coi<0L>$q#%ZUb>}VFo;S7L@$Ce z!C0s181txClh>_d%Wt2>dwTx$rJ55-lqy}KboEJ*vpMr)+dTm1@fh=1w6vF+5$?!$ zZjx6R>L3~FNr9SyOb$sSz>ho4VARe}0;CG4a*2NJY63awrmjw+4r)hY~oH*)n&a>;SEM=_1-n%qj;?UUHJ$3&JaoHfvUm)0000< KMNUMnLSTXqN>?cW literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/7bad117d-0920-41dc-a93b-a11bbecbfdf9.png b/sprites/spr_noelleb_battleintro_sideb/7bad117d-0920-41dc-a93b-a11bbecbfdf9.png new file mode 100644 index 0000000000000000000000000000000000000000..d82b2c3112f83e5626ab5f4ec013d8d79ed27760 GIT binary patch literal 796 zcmV+%1LOROP)0Uf$Gu(Y|>WFU*j8fc>*=n!P~2NYG-ZgJ5M$Xs;D4=9UPF9tG6$WS0M zoVgw{7XdDVM1~?yv>Q>L`~U(rCHo%V-91tQ4mjX|16~ZOhZDkMFz){d0Pg0O0Dv%= zIb*)^LF8_JDFf;X(0DjeM0SA>G71K%2EP3Ijqz~8UX$pWCaMGA>g-faYU!ZyaME_o zzcN>6r>#VERd&Ifu4LL21AsIy0RV9nAWRnWT5C3Zbd%LF8_L)l--)R+rjG&^GJuN+ z0Bk73csS{;fR#Ef5+*)<_>P;~g%#V2&zM9Wew5B1+}tkMd9OaRE1|lut#ozv87@60 zk+mII{`)ci0avU*jU!g`heg<8=@s=B0!^i9xQF;_FSJ7Ytcz5ro;c&Rdy zkV!@cGma0+m4V8cy^@hD<-n=)=krvOu;O=aZI{_8wSJygqp5~h(-Q!&ECy<{;_C&% zzYqEhyCrm0Mre|=q_|dYGd(XGWgG=K9<9_c35CfFM9tV7A#WRHnwK~pt=NmQki%rg zb(7-Ziwxk{xph<2$!LTG(DQb%ECz_902w`EDw?76T9fcbMjp(U#h_6)vQ{#B#J}Rc z)nj~uHk47Cmoy$uD9uZ%c-VmB>C)>HB@sag(NIJPVRce{PcJ7u096_!2|ak4m$)ug z5JITY<}=<4m{TH-g2rQR81ZMC-j1CTC!>MY&Ker5y^;Bd*G@w62qBTI?HcYynd@TJ zdM!+5ED@hjt()d0rFm(!bh2)=H6`oDoL^;hHR6^6P1fX8#e14$!Aif8xOl()x4qQN z$!K7yB{4s$d}e-R`)zNntvfJBmLuf#2w|F?3i9l_h@+rkiu%^DmnTYY&*D_u3mKCH z0G!`HbLuJHb{KxMKV@V$F}}m9;ggIILa0}7 literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/aa8813e1-3ba3-4df4-bb4a-5286efae8ed4.png b/sprites/spr_noelleb_battleintro_sideb/aa8813e1-3ba3-4df4-bb4a-5286efae8ed4.png new file mode 100644 index 0000000000000000000000000000000000000000..f53383e4889e4447a46c39d9840b3d7e6e93b780 GIT binary patch literal 746 zcmV_YR!|^gvKYxEIYR+U z=v-vT4PFQ9$r2?|GDW(JKOjJ$Kje?!dwe8i;H`Np% zk%o%fAkXnT!6=8R3EZ?ZStogiIFW-e#>h>w>wRksV4vJi&kwEoQLQtDkoCR|qz_*X z=K#5{1Jt zn1V3oBe2q`p)(8-(e)oVN(wYzui7`JAj%g$c5617;&FRl z`GN@B_QOCcn7YKRoAP3A>7HecHAbA`CZ~L3(c}A~E66PqCpl4a?ufa<3o7S~){oL+ zA~z|8$rw)JjHufv$y~{+^L|F`JQ8rolmGw#07*qoM6N<$g3n7){r~^~ literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/b7cbdd79-ba5b-4c3b-90da-bd38594f6b17.png b/sprites/spr_noelleb_battleintro_sideb/b7cbdd79-ba5b-4c3b-90da-bd38594f6b17.png new file mode 100644 index 0000000000000000000000000000000000000000..0d6ed66400fd89da2f09a56292e753e28292a23e GIT binary patch literal 843 zcmV-R1GM~!P)W&}nvKwPfhJDK&G28_M(nVAxF} zfhsQ<31A=OW8G{3=d4UGfa?Ra9c#mDjLX$Iw~SE-o5#P`-dB)UES4` zntc&|{Q8Vev#X3L6J$sxvN;cOU$}p`QMPOEGi4PK5xtXA$C#UBY|ev(Lh`)|&$Z7a zNR)++G6aOnRk4p`BCoHOGO8rV##GOEL(C$i6*EG~5X1EY%qLUW&M@(uuU$WY>#JR- zv+2>AJlxLec-vYe9^}Qz@ArKiw;M|PRh6Nv*#W@esF7^AI1LYgiC8KjD!WNmLssT+ z)c8m0(-`*Srf|$E0UW8ah)Kz=Ivh22TGCp|jE!4-$lKXZ1{y zqC&PagzE>H0bF%8rE(Gz0)VrRAMow&0zi6C5d&W)RXKp!xJcr--N2w#$JyOad|mb8 zc8|7sZZc9+(V9GR{eafwQK#7@hDTfSXiLsAyk;PDF@MZes*^Lx@WG_mAQR$i?&mBi zmx!@~oZVnq7Mvwvd=y@bIf_@6Wm!twM(PHouNpqfeM}OG z3FR$m$#^aaBe|(e6?cs%06^b5$h2!D9h|O!@lmo(j2#Zv>s2jx9AjA<0P;RxgsRSz z-C|<%$&@{3+CFcKPQ}p{-}jO<8}Z{;M*Iu}Qkm#9xW% V>!=cEH}e1h002ovPDHLkV1iFMgY^Ia literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/c8f0bb7f-959a-44ca-9858-a1660d4bcf58.png b/sprites/spr_noelleb_battleintro_sideb/c8f0bb7f-959a-44ca-9858-a1660d4bcf58.png new file mode 100644 index 0000000000000000000000000000000000000000..e9bd2562f0b54f9b1eba924b91b6580f1ec91433 GIT binary patch literal 821 zcmV-51Iqk~P)hNh)Mq1kW* za~SvmRJVhDooD;`1Kx8dj)d%IuHQXA_v1YqIN*Q-4#)(BKP?+!g2-Yp1OT+$o@!nK zfP{_G?~zG)B!?6_jEI)OD_vD=%faQ{eJSJ1yL;G{6RDMiZkSR}t_VXJ8vusGBoo-@ zCL;+9q!JWs@*;z}=$7(pLK&WzT5c~!g2C59Qle-gBkHJ#B=PR;CrlqFO24|*lzRFi zeEahew&he(O#nbiBAZ(u0C0TWRNjykE@R55u(|akVlqPVDRs1)US4>lI%NU3KEgrL{Znmn>C zhZr7h$)hc~%ix@WAjGsLugpu|?u3|(yQCB$NXhOlU&x@MR~1$WLG)h;7Pz9= z1{G|sXf*SqvUQiiQF55RA*aNR?q~WZL9%+Zjnvo$#y3|T)X+gKra+QZsG#u#1^~(e z63NTpaV5%pooDwB&Z9CgLMCkQ+NktZB@1C^uBNnspq!K8l0(FHl`3=IZbX%%3Ky?W zjGL9N#|%}ns%JFwX*BbrbNPszlGfUgXLVC~S&+v?J}V)k!We%609|pE=~wIRKnM{f zY5yetpPbC+?O@Y2Ue)sF(;>qO@kw6AB$C_IN2+{ci@}g=%b~?!NIXW#b;vYB3cvFL z0H%)<*p`Fo*CmMhV5nJ00000NkvXXu0mjfj~RpZ literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/d799e4f2-2a3d-4929-b5ce-d2b80905fb21.png b/sprites/spr_noelleb_battleintro_sideb/d799e4f2-2a3d-4929-b5ce-d2b80905fb21.png new file mode 100644 index 0000000000000000000000000000000000000000..da1e95b9db2ef969695a990a73f6a5eaee7d64f5 GIT binary patch literal 719 zcmV;=0xKpLaa**yHD!RQaSR@?<>koA3S21i0XW3)~=ZxEA$Y_leMGX*ddF0zgq1BMRfQ zDnt9(0s!#*(}!|UC$ZVBMCwSC0RZf03otQP=t72~Fvi<2Ur&B0l<1{O*Oy3FqHq2Hrn)++9iSGJi}EmX(i&F zjEcgwjrFG&nd3aeac+(ut~<7HqRdq=G5+@F^~8D|F&UM>ezs^N1ORt8qgGdWkD1%? z0sChIeYkQ!V?31@SZ{~OY1yg}^0yfqLeNIkG{Ct?!&h70c2_aMG?&T&O>S@nJgwHi?2dz$I zbR=oUmpO{Un36Q3oR*Z+l9Dtl$D0-vD??Pj?u+Y}wc{?8XjCQ&;}fM+m24OFR%ckb z`){9NOQ<)QAKOFaTg7I#sxA9oHqRdp&^n-SDJ(8_qDEODfD*`4!z3a?5O|AS-PU7j zo77R1X;jEr%vi97a>d~+6Wz(J)M-+tE{?cRdLhG$+mJzrz!np-A)~A4O&xXDZA26| z5#a8x*D}R{$Dn>Q9#)>YWB-2m1pu7#&hwsQr&nD4lG| zY1g(bfahorR+;3Z(6tiMNoi?(7BVNKlpfSd;veD5w=9!vk3s+d002ovPDHLkV1i6* BODX^W literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d.png b/sprites/spr_noelleb_battleintro_sideb/e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d.png new file mode 100644 index 0000000000000000000000000000000000000000..b5aa36a658e9c288dc1a8b1f409bcb8fc40debf7 GIT binary patch literal 812 zcmV+{1JnG8P)Nkli1Z0g4R;V!;XPXxX))4BwcVem6magMSy3Vr3gyQAb52jW@49V!D_p?V4s&=IP7u z_4fz3j#o)G0RW|mY;QvVz;UmkydlqB)|63Udm9R3GGg)>b&QLiu6y!`J)1Hz5gnMs zOhRT=UCF7uxv6eMMmENSl@lQ%FvbL-M(;fsV`(A@4n}U0Mh1c9ULN zo?kn79O=LcnYg?g<5>psG~&u!O=<&CI;Y(wyNIu=RGEubU1W~RUA#YW+^kJ4=BSdF zJ)>Djqgg1<RgTS<2!Oq$=4uW$(fdh~jKj)diyd0OlxvfvS=j8Jd<3g|a~e za~SvmRBs3S-1GTtAKW<;kA!T)>w6zR@5j9cIN*Q-4#)+?A0r!PgUGzs2LL!hN3|{i zfMlcedt_4{!6C&C6QVkJWvYtj`nbA(&@#Tde}L!uiCQvD!<2b)MHqB!09X!_NMN6v ztRygyNl>gQObkv~Tg$HvW%$D61f3KK4*p$Cij^&7MI99p8SmbH!gw}P`ZcYl%+r_Q z+n4qnd*o!G6648MP z83LmCEBZ(-xUDKwMtw%L336wu-^4zodH|y^2_r*>pc8abzst6&Tr(+c8cY_rJZq#D zF3XSOn}(=L%D+*V&YMqq&F;%>biD2sZV4t~V%mv&-G%eKDK#@L?Z;`|bO|Fee6UU$ zo=8Zw1vo(mMCBvSJ_)Ssx{uR3&YMrE@8o25f)04n!_uV3PFPzxGH``He|V4YKY#DM z@ZQy=Qs?rl0V2ZdAHOhM)zEtrJ$y)8v`_gf{^UN@;@0=^s2%Y0uh0+XgPi^?oYg;xD6^8u4ph>BxM^c zqod$3dqY8qTb*aRr%|$ov`y651=feF7HVjrmQp|_6)R{xfdPQ>04aGn_;n@9e4Xa^ z4xUFkutFwo@5XqMfm}x1nX4&nAS!1$Tw;j0U8TxgH0w#_sKUkfCyv{dsmB~u@~USr zS3_L93X|cKuqU2l~Ec~T3V6|Kt;<5pj@TQo**p0km4Kw zrPvz`Mf?rppP6ySGrLV*DMez(-{bfD8BYS7b=FyK#2j9W554X)%b+4~5~UmfPofk_ zls>96e79Ny0A7CjAUYXxntuD0AROTgTP$r6d0aFDc*kh+B#4qP zRH>qC@FYqH!C0rs1n%1z5kz)~3OO%I%;LTHJYX4s|HXZKe{GCqJ7;Ps8+{D5C*N$x zxP15C2sJoOCJ+Fa#e4j`yCkQSDYSOxz&BQ3yqGMN?pRIWyeKX2K`$F;tX!!a(Z=-E z+5nD)`*3x1vCsVR3PTE5hAOq%`7;RS;i?pO-X(eN0LNLR>n118(17dGpEvbm@;c@W zMh4ie)>cbBpV21ZfhH0+SDj-tFir$LtwPt4VUO>oTD%rxY#Wd^{Kz4=BSM4GOJ98>fz%r++ zc1??Eh=64XScZ$q(s=&Ry_HI|nd6*uo)@KfpF}Coi<0L>$q#%ZUb>}VFo;S7L@$Ce z!C0s181txClh>_d%Wt2>dwTx$rJ55-lqy}KboEJ*vpMr)+dTm1@fh=1w6vF+5$?!$ zZjx6R>L3~FNr9SyOb$sSz>ho4VARe}0;CG4a*2NJY63awrmjw+4r)hY~oH*)n&a>;SEM=_1-n%qj;?UUHJ$3&JaoHfvUm)0000< KMNUMnLSTXqN>?cW literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/4dfafad1-5571-462d-bc70-42e7cc4fbe4f/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/4dfafad1-5571-462d-bc70-42e7cc4fbe4f/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..da1e95b9db2ef969695a990a73f6a5eaee7d64f5 GIT binary patch literal 719 zcmV;=0xKpLaa**yHD!RQaSR@?<>koA3S21i0XW3)~=ZxEA$Y_leMGX*ddF0zgq1BMRfQ zDnt9(0s!#*(}!|UC$ZVBMCwSC0RZf03otQP=t72~Fvi<2Ur&B0l<1{O*Oy3FqHq2Hrn)++9iSGJi}EmX(i&F zjEcgwjrFG&nd3aeac+(ut~<7HqRdq=G5+@F^~8D|F&UM>ezs^N1ORt8qgGdWkD1%? z0sChIeYkQ!V?31@SZ{~OY1yg}^0yfqLeNIkG{Ct?!&h70c2_aMG?&T&O>S@nJgwHi?2dz$I zbR=oUmpO{Un36Q3oR*Z+l9Dtl$D0-vD??Pj?u+Y}wc{?8XjCQ&;}fM+m24OFR%ckb z`){9NOQ<)QAKOFaTg7I#sxA9oHqRdp&^n-SDJ(8_qDEODfD*`4!z3a?5O|AS-PU7j zo77R1X;jEr%vi97a>d~+6Wz(J)M-+tE{?cRdLhG$+mJzrz!np-A)~A4O&xXDZA26| z5#a8x*D}R{$Dn>Q9#)>YWB-2m1pu7#&hwsQr&nD4lG| zY1g(bfahorR+;3Z(6tiMNoi?(7BVNKlpfSd;veD5w=9!vk3s+d002ovPDHLkV1i6* BODX^W literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/507c3c4b-7ca2-4044-a213-449aaf00f413/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/507c3c4b-7ca2-4044-a213-449aaf00f413/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..d9aa4b737036cf18584b74f159e6a5257e6dfb64 GIT binary patch literal 755 zcmV&GXQ|iYz_kRrCnfH93}Yj<7eYR<%v#S+4W0I z_CysbnuEnr(h0^nOeXNYJ;RNN9->4}v!XWe;&=#Po7|62_f~dX*O^+#2H%FtL909j z08B2gYWLgV-a5h*-nTmk_8tS9{5*=X82-Wf&*;VP#USk4b$a>*I?%$C-JDQ^It z)U7uADs2w(;rG%Cq<0w6BUNZ?o2*xum+JyA*X{X3)kI3OLJQ@^Ge^N`>$AU~o6p(` zz!^pa*v#fyAmIOstW)nfb22Wmc{fmjHImtB(Ocyqp4rmq4btG>FQj>B^p5l1WLj%h zdDuu`x-UT0>^sAxS)nv08wOy4;tXAW9qa_8f~vyI8TOLEBG}nzilg9EnQxt8#5cDA zsuT!U?WU_*mvvgyWUovvue4oX=jMvBEz=?|d6iro52@Y6F71YMH4%g?f+7gpmJ{%l zz#m7S_~-L+2*w!q()9MmdY;~@i802#LO`Zp37ugUd0G1_>S2A?2vbilz7@8MAB&@e zwJDAge)R$)USv=w0`3c_<{>g4O&@US^vd>ryI^g`Y|V-p%# z=pkn~kgce^WsqLNq*D;I_fuXsN>f=2AdM~$@OxYjX!;xpM5(=;LI@u7{qkDzjnlLb lspLIO^nw1LV0-Ke0I$}`SuwMC$z=cl002ovPDHLkV1hKBW4-_Y literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/517212a0-14c3-4fd4-8142-c7cf44933975/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/517212a0-14c3-4fd4-8142-c7cf44933975/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..b53ea782cca3f44935c4a33f768e23fdfb2b93fb GIT binary patch literal 867 zcmV-p1DyPcP)K*`i0J}#rca>OK>+6hR3mp*V?-4h zb)=y5DvZ=IUJ7wn%daTyN|gs7K(2`0;k{1_s@R4MS*DHm-+$zONR-%0m5pEK zWU@*mq2hg!W!hVjQ4Z5O;=5Kx3?eJUjqC?8PL5}y{eYd;9!s^(q(au{8Kp1QA*C%$ zRYU+_K_mD<3{-?pS(ycma*YpHaVfd`unDJa6ppP_fs-%Y2(q8Dc%dRoRmTrkE28T{ zs6(0Bc({rMxx~nY_Sg#?xO0L# zC!V%AV5d1h^>42E9xDee$~bK!oU*E+ttoQOLoA|mpGm=angbGreoG=b%j?r{2<0KoT1a|qSNXEK*~Q=P|harkcrIUaN360 z;B{JE{Q7+-)Pd8bqJpQS3|EH};&^x5Or`nHkLT#Ly0z5N;TZ-1!!W%hFnXVJFTVae ztJk9<$PePejPipx^_%vzE+bTgqV_UET2nh4s!gH$w3D*y7RFd^EyLTPdp%R7&M=&z zY(Kv3iRebkKr%BVztl1E&bPP2aF$bxSLU576L|xESS?iIGd7lok9$dN@WD8t$Q#Jy t_6~WyA}djg%wCT~)?pw2s*rSFiT^rW2%_nv^bP<3002ovPDHLkV1oWKjmrQ4 literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..d9aa4b737036cf18584b74f159e6a5257e6dfb64 GIT binary patch literal 755 zcmV&GXQ|iYz_kRrCnfH93}Yj<7eYR<%v#S+4W0I z_CysbnuEnr(h0^nOeXNYJ;RNN9->4}v!XWe;&=#Po7|62_f~dX*O^+#2H%FtL909j z08B2gYWLgV-a5h*-nTmk_8tS9{5*=X82-Wf&*;VP#USk4b$a>*I?%$C-JDQ^It z)U7uADs2w(;rG%Cq<0w6BUNZ?o2*xum+JyA*X{X3)kI3OLJQ@^Ge^N`>$AU~o6p(` zz!^pa*v#fyAmIOstW)nfb22Wmc{fmjHImtB(Ocyqp4rmq4btG>FQj>B^p5l1WLj%h zdDuu`x-UT0>^sAxS)nv08wOy4;tXAW9qa_8f~vyI8TOLEBG}nzilg9EnQxt8#5cDA zsuT!U?WU_*mvvgyWUovvue4oX=jMvBEz=?|d6iro52@Y6F71YMH4%g?f+7gpmJ{%l zz#m7S_~-L+2*w!q()9MmdY;~@i802#LO`Zp37ugUd0G1_>S2A?2vbilz7@8MAB&@e zwJDAge)R$)USv=w0`3c_<{>g4O&@US^vd>ryI^g`Y|V-p%# z=pkn~kgce^WsqLNq*D;I_fuXsN>f=2AdM~$@OxYjX!;xpM5(=;LI@u7{qkDzjnlLb lspLIO^nw1LV0-Ke0I$}`SuwMC$z=cl002ovPDHLkV1hKBW4-_Y literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/69551cfc-8a5c-46ea-b634-fb9efd428c1a/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/69551cfc-8a5c-46ea-b634-fb9efd428c1a/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..5caef37e41f9aad57496833633b33340058d4882 GIT binary patch literal 799 zcmV+)1K|9LP)c#16n$!n&K0y%;Y5LDTUZg$WEcn)#}6$P|<3E)YthXR)2 z&h?N382A}1(iBBWv`BUG0|d!5#sB>N<0on0h$D_Tq7sx}MtvL`M3&DM>m z*Y9r#ys(qm1OOxxdA`p80B^qzlrL1J%bGHWASYi^$JD^2lOCoNP_32?GTJ0`V3H;R zcKKJ-kxH<>s#F;%qgn)6Fx7W%G(?1Ul_pL7nmpH*CP6|a%By~u!JQUn7DnKwVL*2ACU9}z5%nars5p}6D zHgF|N!NlWJJwqGqfm!~4&Q}J*>|vCqE58pSg5x+^t1`e9>+X0Pr&*;s<5NfJ9h=~l zR-QR*A(X1E)@t2$PeD~_5sl0GNENvw^k#T0=TVz!uS#p>)3mlHS$)|F9= dP15H|ya1U1BRGP;E`b05002ovPDHLkV1k_rV-5fS literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/72c13161-4909-4cac-94f9-8b54b06bf9ef/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/72c13161-4909-4cac-94f9-8b54b06bf9ef/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..f53383e4889e4447a46c39d9840b3d7e6e93b780 GIT binary patch literal 746 zcmV_YR!|^gvKYxEIYR+U z=v-vT4PFQ9$r2?|GDW(JKOjJ$Kje?!dwe8i;H`Np% zk%o%fAkXnT!6=8R3EZ?ZStogiIFW-e#>h>w>wRksV4vJi&kwEoQLQtDkoCR|qz_*X z=K#5{1Jt zn1V3oBe2q`p)(8-(e)oVN(wYzui7`JAj%g$c5617;&FRl z`GN@B_QOCcn7YKRoAP3A>7HecHAbA`CZ~L3(c}A~E66PqCpl4a?ufa<3o7S~){oL+ zA~z|8$rw)JjHufv$y~{+^L|F`JQ8rolmGw#07*qoM6N<$g3n7){r~^~ literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..32cc2eca01117600395579604749bd4a8bdee254 GIT binary patch literal 728 zcmV;}0w?{6P)3_L93X|cKuqU2l~Ec~T3V6|Kt;<5pj@TQo**p0km4Kw zrPvz`Mf?rppP6ySGrLV*DMez(-{bfD8BYS7b=FyK#2j9W554X)%b+4~5~UmfPofk_ zls>96e79Ny0A7CjAUYXxntuD0AROTgTP$r6d0aFDc*kh+B#4qP zRH>qC@FYqH!C0rs1n%1z5kz)~3OO%I%;LTHJYX4s|HXZKe{GCqJ7;Ps8+{D5C*N$x zxP15C2sJoOCJ+Fa#e4j`yCkQSDYSOxz&BQ3yqGMN?pRIWyeKX2K`$F;tX!!a(Z=-E z+5nD)`*3x1vCsVR3PTE5hAOq%`7;RS;i?pO-X(eN0LNLR>n118(17dGpEvbm@;c@W zMh4ie)>cbBpV21ZfhH0+SDj-tFir$LtwPt4VUO>oTD%rxY#Wd^{Kz4=BSM4GOJ98>fz%r++ zc1??Eh=64XScZ$q(s=&Ry_HI|nd6*uo)@KfpF}Coi<0L>$q#%ZUb>}VFo;S7L@$Ce z!C0s181txClh>_d%Wt2>dwTx$rJ55-lqy}KboEJ*vpMr)+dTm1@fh=1w6vF+5$?!$ zZjx6R>L3~FNr9SyOb$sSz>ho4VARe}0;CG4a*2NJY63awrmjw+4r)hY~oH*)n&a>;SEM=_1-n%qj;?UUHJ$3&JaoHfvUm)0000< KMNUMnLSTXqN>?cW literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/7bad117d-0920-41dc-a93b-a11bbecbfdf9/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/7bad117d-0920-41dc-a93b-a11bbecbfdf9/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..d82b2c3112f83e5626ab5f4ec013d8d79ed27760 GIT binary patch literal 796 zcmV+%1LOROP)0Uf$Gu(Y|>WFU*j8fc>*=n!P~2NYG-ZgJ5M$Xs;D4=9UPF9tG6$WS0M zoVgw{7XdDVM1~?yv>Q>L`~U(rCHo%V-91tQ4mjX|16~ZOhZDkMFz){d0Pg0O0Dv%= zIb*)^LF8_JDFf;X(0DjeM0SA>G71K%2EP3Ijqz~8UX$pWCaMGA>g-faYU!ZyaME_o zzcN>6r>#VERd&Ifu4LL21AsIy0RV9nAWRnWT5C3Zbd%LF8_L)l--)R+rjG&^GJuN+ z0Bk73csS{;fR#Ef5+*)<_>P;~g%#V2&zM9Wew5B1+}tkMd9OaRE1|lut#ozv87@60 zk+mII{`)ci0avU*jU!g`heg<8=@s=B0!^i9xQF;_FSJ7Ytcz5ro;c&Rdy zkV!@cGma0+m4V8cy^@hD<-n=)=krvOu;O=aZI{_8wSJygqp5~h(-Q!&ECy<{;_C&% zzYqEhyCrm0Mre|=q_|dYGd(XGWgG=K9<9_c35CfFM9tV7A#WRHnwK~pt=NmQki%rg zb(7-Ziwxk{xph<2$!LTG(DQb%ECz_902w`EDw?76T9fcbMjp(U#h_6)vQ{#B#J}Rc z)nj~uHk47Cmoy$uD9uZ%c-VmB>C)>HB@sag(NIJPVRce{PcJ7u096_!2|ak4m$)ug z5JITY<}=<4m{TH-g2rQR81ZMC-j1CTC!>MY&Ker5y^;Bd*G@w62qBTI?HcYynd@TJ zdM!+5ED@hjt()d0rFm(!bh2)=H6`oDoL^;hHR6^6P1fX8#e14$!Aif8xOl()x4qQN z$!K7yB{4s$d}e-R`)zNntvfJBmLuf#2w|F?3i9l_h@+rkiu%^DmnTYY&*D_u3mKCH z0G!`HbLuJHb{KxMKV@V$F}}m9;ggIILa0}7 literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/aa8813e1-3ba3-4df4-bb4a-5286efae8ed4/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/aa8813e1-3ba3-4df4-bb4a-5286efae8ed4/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..f53383e4889e4447a46c39d9840b3d7e6e93b780 GIT binary patch literal 746 zcmV_YR!|^gvKYxEIYR+U z=v-vT4PFQ9$r2?|GDW(JKOjJ$Kje?!dwe8i;H`Np% zk%o%fAkXnT!6=8R3EZ?ZStogiIFW-e#>h>w>wRksV4vJi&kwEoQLQtDkoCR|qz_*X z=K#5{1Jt zn1V3oBe2q`p)(8-(e)oVN(wYzui7`JAj%g$c5617;&FRl z`GN@B_QOCcn7YKRoAP3A>7HecHAbA`CZ~L3(c}A~E66PqCpl4a?ufa<3o7S~){oL+ zA~z|8$rw)JjHufv$y~{+^L|F`JQ8rolmGw#07*qoM6N<$g3n7){r~^~ literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/b7cbdd79-ba5b-4c3b-90da-bd38594f6b17/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/b7cbdd79-ba5b-4c3b-90da-bd38594f6b17/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..0d6ed66400fd89da2f09a56292e753e28292a23e GIT binary patch literal 843 zcmV-R1GM~!P)W&}nvKwPfhJDK&G28_M(nVAxF} zfhsQ<31A=OW8G{3=d4UGfa?Ra9c#mDjLX$Iw~SE-o5#P`-dB)UES4` zntc&|{Q8Vev#X3L6J$sxvN;cOU$}p`QMPOEGi4PK5xtXA$C#UBY|ev(Lh`)|&$Z7a zNR)++G6aOnRk4p`BCoHOGO8rV##GOEL(C$i6*EG~5X1EY%qLUW&M@(uuU$WY>#JR- zv+2>AJlxLec-vYe9^}Qz@ArKiw;M|PRh6Nv*#W@esF7^AI1LYgiC8KjD!WNmLssT+ z)c8m0(-`*Srf|$E0UW8ah)Kz=Ivh22TGCp|jE!4-$lKXZ1{y zqC&PagzE>H0bF%8rE(Gz0)VrRAMow&0zi6C5d&W)RXKp!xJcr--N2w#$JyOad|mb8 zc8|7sZZc9+(V9GR{eafwQK#7@hDTfSXiLsAyk;PDF@MZes*^Lx@WG_mAQR$i?&mBi zmx!@~oZVnq7Mvwvd=y@bIf_@6Wm!twM(PHouNpqfeM}OG z3FR$m$#^aaBe|(e6?cs%06^b5$h2!D9h|O!@lmo(j2#Zv>s2jx9AjA<0P;RxgsRSz z-C|<%$&@{3+CFcKPQ}p{-}jO<8}Z{;M*Iu}Qkm#9xW% V>!=cEH}e1h002ovPDHLkV1iFMgY^Ia literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/c8f0bb7f-959a-44ca-9858-a1660d4bcf58/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/c8f0bb7f-959a-44ca-9858-a1660d4bcf58/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..e9bd2562f0b54f9b1eba924b91b6580f1ec91433 GIT binary patch literal 821 zcmV-51Iqk~P)hNh)Mq1kW* za~SvmRJVhDooD;`1Kx8dj)d%IuHQXA_v1YqIN*Q-4#)(BKP?+!g2-Yp1OT+$o@!nK zfP{_G?~zG)B!?6_jEI)OD_vD=%faQ{eJSJ1yL;G{6RDMiZkSR}t_VXJ8vusGBoo-@ zCL;+9q!JWs@*;z}=$7(pLK&WzT5c~!g2C59Qle-gBkHJ#B=PR;CrlqFO24|*lzRFi zeEahew&he(O#nbiBAZ(u0C0TWRNjykE@R55u(|akVlqPVDRs1)US4>lI%NU3KEgrL{Znmn>C zhZr7h$)hc~%ix@WAjGsLugpu|?u3|(yQCB$NXhOlU&x@MR~1$WLG)h;7Pz9= z1{G|sXf*SqvUQiiQF55RA*aNR?q~WZL9%+Zjnvo$#y3|T)X+gKra+QZsG#u#1^~(e z63NTpaV5%pooDwB&Z9CgLMCkQ+NktZB@1C^uBNnspq!K8l0(FHl`3=IZbX%%3Ky?W zjGL9N#|%}ns%JFwX*BbrbNPszlGfUgXLVC~S&+v?J}V)k!We%609|pE=~wIRKnM{f zY5yetpPbC+?O@Y2Ue)sF(;>qO@kw6AB$C_IN2+{ci@}g=%b~?!NIXW#b;vYB3cvFL z0H%)<*p`Fo*CmMhV5nJ00000NkvXXu0mjfj~RpZ literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/d799e4f2-2a3d-4929-b5ce-d2b80905fb21/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/d799e4f2-2a3d-4929-b5ce-d2b80905fb21/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..da1e95b9db2ef969695a990a73f6a5eaee7d64f5 GIT binary patch literal 719 zcmV;=0xKpLaa**yHD!RQaSR@?<>koA3S21i0XW3)~=ZxEA$Y_leMGX*ddF0zgq1BMRfQ zDnt9(0s!#*(}!|UC$ZVBMCwSC0RZf03otQP=t72~Fvi<2Ur&B0l<1{O*Oy3FqHq2Hrn)++9iSGJi}EmX(i&F zjEcgwjrFG&nd3aeac+(ut~<7HqRdq=G5+@F^~8D|F&UM>ezs^N1ORt8qgGdWkD1%? z0sChIeYkQ!V?31@SZ{~OY1yg}^0yfqLeNIkG{Ct?!&h70c2_aMG?&T&O>S@nJgwHi?2dz$I zbR=oUmpO{Un36Q3oR*Z+l9Dtl$D0-vD??Pj?u+Y}wc{?8XjCQ&;}fM+m24OFR%ckb z`){9NOQ<)QAKOFaTg7I#sxA9oHqRdp&^n-SDJ(8_qDEODfD*`4!z3a?5O|AS-PU7j zo77R1X;jEr%vi97a>d~+6Wz(J)M-+tE{?cRdLhG$+mJzrz!np-A)~A4O&xXDZA26| z5#a8x*D}R{$Dn>Q9#)>YWB-2m1pu7#&hwsQr&nD4lG| zY1g(bfahorR+;3Z(6tiMNoi?(7BVNKlpfSd;veD5w=9!vk3s+d002ovPDHLkV1i6* BODX^W literal 0 HcmV?d00001 diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 0000000000000000000000000000000000000000..b5aa36a658e9c288dc1a8b1f409bcb8fc40debf7 GIT binary patch literal 812 zcmV+{1JnG8P)Nkli1Z0g4R;V!;XPXxX))4BwcVem6magMSy3Vr3gyQAb52jW@49V!D_p?V4s&=IP7u z_4fz3j#o)G0RW|mY;QvVz;UmkydlqB)|63Udm9R3GGg)>b&QLiu6y!`J)1Hz5gnMs zOhRT=UCF7uxv6eMMmENSl@lQ%FvbL-M(;fsV`(A@4n}U0Mh1c9ULN zo?kn79O=LcnYg?g<5>psG~&u!O=<&CI;Y(wyNIu=RGEubU1W~RUA#YW+^kJ4=BSdF zJ)>Djqgg1<":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":15.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_noelleb_battleintro_sideb", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"517212a0-14c3-4fd4-8142-c7cf44933975","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bcc53dcb-627a-420f-b456-333bf47f85c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72c13161-4909-4cac-94f9-8b54b06bf9ef","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0c231b90-0452-4e14-b987-f106d8a05614","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"08240135-a33e-4b08-a4fa-0c703900ac36","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"507c3c4b-7ca2-4044-a213-449aaf00f413","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"09bf9dbd-b9ae-44fd-a4eb-38a7a67610d9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dfafad1-5571-462d-bc70-42e7cc4fbe4f","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"61fe8816-c11f-4475-a94a-53e0daaee749","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa8813e1-3ba3-4df4-bb4a-5286efae8ed4","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b7d530be-b718-4f82-8e6d-995ebbdcd011","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"486869be-fd45-4fe3-bc52-037519c30ebb","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f19e172a-bb79-4034-a92b-bf097e57213d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a232d6af-85f3-4e38-922b-e1596eb8868f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d799e4f2-2a3d-4929-b5ce-d2b80905fb21","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c86056c1-564d-45b8-96a6-dee89405b460","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bad117d-0920-41dc-a93b-a11bbecbfdf9","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"30a6129b-2a83-42d0-9fc7-0060237ce50c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7cbdd79-ba5b-4c3b-90da-bd38594f6b17","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"65d28c7e-d3d8-4203-8648-679c61160268","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69551cfc-8a5c-46ea-b634-fb9efd428c1a","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4d96499d-472e-4a0f-a156-d2b7e583a0db","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f3091de-a351-4965-a54b-f91f337ad48b","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5cdc29dc-07c0-400e-bf1b-e63f2dd56ceb","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4a23419a-0f4f-4c95-a749-a55d6f557e8b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8f0bb7f-959a-44ca-9858-a1660d4bcf58","path":"sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3016b24b-ee18-48aa-822a-5e1bc8cc6e96","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":11, + "yorigin":7, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":35, +} \ No newline at end of file diff --git a/sprites/spr_npc_originalstarwalker/spr_npc_originalstarwalker.yy b/sprites/spr_npc_originalstarwalker/spr_npc_originalstarwalker.yy index b9cb46bd..6b822456 100644 --- a/sprites/spr_npc_originalstarwalker/spr_npc_originalstarwalker.yy +++ b/sprites/spr_npc_originalstarwalker/spr_npc_originalstarwalker.yy @@ -59,8 +59,8 @@ }, "name":"spr_npc_originalstarwalker", "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, + "playbackSpeed":1.0, + "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", "seqHeight":36.0, From 8690e74afb25d2761e582d5a829bdd95d4f6c774 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 9 Feb 2026 18:39:39 -0800 Subject: [PATCH 52/56] EXTREMELY MINOR Changes (Literally just Replacing Hardcoded Numbers with their relative Macros) --- objects/obj_heroparent/Other_10.gml | 9 +++---- objects/obj_icespell/Draw_0.gml | 4 ++-- objects/obj_spell_mist/Draw_0.gml | 2 +- scripts/scr_enemy_config/scr_enemy_config.gml | 2 ++ scripts/scr_monster/scr_monster.gml | 24 +++++++------------ 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/objects/obj_heroparent/Other_10.gml b/objects/obj_heroparent/Other_10.gml index 0dceea2b..e087df2a 100644 --- a/objects/obj_heroparent/Other_10.gml +++ b/objects/obj_heroparent/Other_10.gml @@ -48,16 +48,13 @@ if (finishattacktimer > 0) if (is_auto_susie == 1 && global.monsterhp[global.chartarget[myself]] <= 0) { with (global.chartarget[myself]) - global.flag[51 + myself] = 5; + global.flag[51 + myself] = MONSTERS_DEFEATTYPES_AutoViolenced; } if (damage > 0) { - if (global.monstertype[0] != 20) - scr_tensionheal(round(points / 10)); - - if (global.monstertype[0] == 20) - scr_tensionheal(round(points / 15)); + if (global.monstertype[0] != 20) scr_tensionheal(round(points / 10)); + if (global.monstertype[0] == 20) scr_tensionheal(round(points / 15)); attack = instance_create(global.monsterx[global.chartarget[myself]] + random(6), global.monstery[global.chartarget[myself]] + random(6), obj_basicattack); diff --git a/objects/obj_icespell/Draw_0.gml b/objects/obj_icespell/Draw_0.gml index 4ef92941..a75fe6ae 100644 --- a/objects/obj_icespell/Draw_0.gml +++ b/objects/obj_icespell/Draw_0.gml @@ -54,8 +54,8 @@ if (timer == 15) { if (i_ex(global.monsterinstance[star])) { - if (global.monsterinstance[star].freezable == 1) - global.flag[51 + star] = 6; + if (global.monsterinstance[star].freezable == true) + global.flag[51 + star] = MONSTERS_DEFEATTYPES_Frozen; } } diff --git a/objects/obj_spell_mist/Draw_0.gml b/objects/obj_spell_mist/Draw_0.gml index b600ca84..05186f42 100644 --- a/objects/obj_spell_mist/Draw_0.gml +++ b/objects/obj_spell_mist/Draw_0.gml @@ -35,7 +35,7 @@ if (initdelay <= 0) { with (target) { - global.flag[51 + myself] = 3; + global.flag[51 + myself] = MONSTERS_DEFEATTYPES_Pacify; event_user(10); scr_monsterdefeat(); } diff --git a/scripts/scr_enemy_config/scr_enemy_config.gml b/scripts/scr_enemy_config/scr_enemy_config.gml index 526513ea..bef57da6 100644 --- a/scripts/scr_enemy_config/scr_enemy_config.gml +++ b/scripts/scr_enemy_config/scr_enemy_config.gml @@ -326,10 +326,12 @@ function scr_getdefeatanimationdataarray() { } function scr_monster_get_defeattypes(mode = "init", monsterslotbattleendflag = global.flag[51 + self.myself]) { + // For more Precise Control go to 'scr_monster->scr_monsterdefeat' and 'scr_turn->scr_defeatrun' #macro MONSTERS_DEFEATTYPES_None 0 #macro MONSTERS_DEFEATTYPES_Violence 1 #macro MONSTERS_DEFEATTYPES_Spare 2 #macro MONSTERS_DEFEATTYPES_Pacify 3 + #macro MONSTERS_DEFEATTYPES_AutoViolenced 5 #macro MONSTERS_DEFEATTYPES_Frozen 6 if mode == "all" || mode == "init" { _amt_add = 0; diff --git a/scripts/scr_monster/scr_monster.gml b/scripts/scr_monster/scr_monster.gml index 1b8c7835..fe5eb6c5 100644 --- a/scripts/scr_monster/scr_monster.gml +++ b/scripts/scr_monster/scr_monster.gml @@ -77,35 +77,29 @@ function scr_monster_makeinstance(monsterid) event_user(15); } -function scr_monsterdefeat() -{ - if (global.monster[myself] == 1) - { +function scr_monsterdefeat() { + if (global.monster[myself] == 1) { global.monstergold[3] += global.monstergold[myself]; global.monsterexp[3] += global.monsterexp[myself]; global.monster[myself] = 0; - if (global.flag[51 + myself] == 0) - { - global.flag[51 + myself] = 2; + if (global.flag[51 + myself] == MONSTERS_DEFEATTYPES_None) { + global.flag[51 + myself] = MONSTERS_DEFEATTYPES_Spare; - if (global.monsterhp[myself] <= 0) - global.flag[51 + myself] = 1; + if (global.monsterhp[myself] <= 0) global.flag[51 + myself] = MONSTERS_DEFEATTYPES_Violence; } - if (global.flag[51 + myself] == 1) + if (global.flag[51 + myself] == MONSTERS_DEFEATTYPES_Violence) { global.flag[40] += 1; - - if (fatal == 1) - global.flag[44]++; + + if (fatal == 1) global.flag[44]++; // Fatal Kills } if (global.flag[51 + myself] == MONSTERS_DEFEATTYPES_Spare) global.flag[41] += 1; if (global.flag[51 + myself] == MONSTERS_DEFEATTYPES_Pacify) global.flag[42] += 1; - if (global.flag[51 + myself] == 5) - global.flag[43] += 1; + if (global.flag[51 + myself] == MONSTERS_DEFEATTYPES_AutoViolenced) global.flag[43] += 1; if (global.flag[51 + myself] == MONSTERS_DEFEATTYPES_Frozen) { From 2f70327eab7c74e6908a2b7db5ed646b49bb3991 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 9 Feb 2026 20:17:39 -0800 Subject: [PATCH 53/56] Minor Fix. --- objects/obj_encounterbasic/Create_0.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_encounterbasic/Create_0.gml b/objects/obj_encounterbasic/Create_0.gml index 64b3a082..a4f4daa2 100644 --- a/objects/obj_encounterbasic/Create_0.gml +++ b/objects/obj_encounterbasic/Create_0.gml @@ -16,7 +16,7 @@ for (var i = 0; i < array_length(global.cinstance) + 1 && i < array_length(globa instance.fun = false _sprite = instance.sprite_index - _imagespeed = 1 + _imagespeed = 0 if variable_instance_exists(instance, "rsprite") _sprite = instance.rsprite scr_character_getbattleintro(global.char[i]) From 544a0e45aa99ce10eab90a00e167a7bd29bb740d Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 9 Feb 2026 22:55:19 -0800 Subject: [PATCH 54/56] Minor Running Fix for Caterpillar --- objects/obj_caterpillarchara/Step_2.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index 41b06c14..f03222a8 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -91,7 +91,7 @@ if (moved == true && follow == true) { slided = true; } - if (abs(remy[target + 1] - remy[target]) > 4) runmove = true; + if (abs(remy[target + 1] - remy[target]) > 4) || (abs(remx[target + 1] - remx[target]) > 4) runmove = true; dir = facing[target]; } From 9a8a992ca7a067e49889f3c3ea0d807795722929 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 9 Feb 2026 23:10:46 -0800 Subject: [PATCH 55/56] Minor Fix via undoing something leftover from Debugging. --- scripts/scr_heroes_config/scr_heroes_config.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index ae0e0d17..a01cc84d 100644 --- a/scripts/scr_heroes_config/scr_heroes_config.gml +++ b/scripts/scr_heroes_config/scr_heroes_config.gml @@ -761,6 +761,6 @@ function scr_character_autotype(charIdx) { function scr_character_getdarkheadsprite(charIdx) { // Format: [{SpriteToCallFrom}, {ImageIndex}] switch charIdx { - default: return [spr_equipchar_ch2, -1]//charIdx] + default: return [spr_equipchar_ch2, charIdx] } } \ No newline at end of file From e398c322bb5fef11baa68e78db5cae315e3acdd0 Mon Sep 17 00:00:00 2001 From: Determined-Memories Date: Mon, 23 Feb 2026 23:26:07 -0800 Subject: [PATCH 56/56] Added scr_hero_rendercharboxicons to HERO CONFIG --- scripts/scr_charbox/scr_charbox.gml | 240 ++++++++---------- .../scr_heroes_config/scr_heroes_config.gml | 33 +++ 2 files changed, 132 insertions(+), 141 deletions(-) diff --git a/scripts/scr_charbox/scr_charbox.gml b/scripts/scr_charbox/scr_charbox.gml index cf6aa93d..7bd986c5 100644 --- a/scripts/scr_charbox/scr_charbox.gml +++ b/scripts/scr_charbox/scr_charbox.gml @@ -1,171 +1,129 @@ function scr_charbox(){ - for (c = 0; c < DRHero.__MAX__; c += 1) - { - if (havechar[c] == 1) - { - charcolor = scr_hero_get_color(c); - - gc = global.charturn; - xchunk = 0; - - if (charpos[c] == 0 && chartotal == 3) - xchunk = 0; - - if (charpos[c] == 1 && chartotal == 3) - xchunk = 213; - - if (charpos[c] == 2 && chartotal == 3) - xchunk = 426; - - if (charpos[c] == 0 && chartotal == 2) - xchunk = 108; - - if (charpos[c] == 1 && chartotal == 2) - xchunk = 322; - - if (charpos[c] == 0 && chartotal == 1) - xchunk = 213; - - if (gc == charpos[c]) - { - if (mmy[c] > -32) - mmy[c] -= 2; - - if (mmy[c] > -24) - mmy[c] -= 4; - - if (mmy[c] > -16) - mmy[c] -= 6; - - if (mmy[c] > -8) - mmy[c] -= 8; - - if (mmy[c] < -32) - mmy[c] = -64; - } + for (curhero = 0; curhero < array_length(global.char); curhero += 1) { + var charicon_width = 213; // A value that seems to be Exactly the correct pos + var charicon_dis = 0; // Not really useful with the normal charboxes since those don't use spacing normally + var changeamt = (charicon_width + charicon_dis) + + xchunk = floor(((camerawidth()/2) + (changeamt * (curhero - (chartotal / 2))))); // 320 is the middle of the screen. + c = global.char[curhero] - 1; + charpos[c] = curhero; + charcolor = scr_hero_get_color(c); + gc = global.charturn; + + if !curhero > array_length(mmy) mmy[curhero] = 0 + + if (gc == charpos[c]) { + if (mmy[curhero] > -32) mmy[curhero] -= 2; + if (mmy[curhero] > -24) mmy[curhero] -= 4; + if (mmy[curhero] > -16) mmy[curhero] -= 6; + if (mmy[curhero] > -8) mmy[curhero] -= 8; + if (mmy[curhero] < -32) mmy[curhero] = -64; + } else { + if (mmy[curhero] < -14) + mmy[curhero] += 15; else - { - if (mmy[c] < -14) - mmy[c] += 15; - else - mmy[c] = 0; - } + mmy[curhero] = 0; + } + var boxcasingy = mmy[curhero] - if (gc == charpos[c] && global.myfight == 0) - scr_selectionmatrix(xx + xchunk, (480 - bp) + yy); + if (gc == charpos[c] && global.myfight == 0) + scr_selectionmatrix(xx + xchunk, (480 - bp) + yy); - btc[0] = 0; - btc[1] = 0; - btc[2] = 0; - btc[3] = 0; - btc[4] = 0; + btc[0] = 0; + btc[1] = 0; + btc[2] = 0; + btc[3] = 0; + btc[4] = 0; - if (gc == charpos[c]) - btc[global.bmenucoord[0][global.charturn]] = 1; + if (gc == charpos[c]) btc[global.bmenucoord[0][global.charturn]] = 1; - if (global.fighting == 1) + if (global.fighting == 1) + { + spare_glow = 0; + + for (sglowi = 0; sglowi < 3; sglowi += 1) { - spare_glow = 0; + if (global.monster[sglowi] == 1 && global.mercymod[sglowi] >= 100) + spare_glow = 1; + } + + pacify_glow = 0; + if (scr_hero_has_pacify(c)) for (sglowi = 0; sglowi < 3; sglowi += 1) - { - if (global.monster[sglowi] == 1 && global.mercymod[sglowi] >= 100) - spare_glow = 1; - } - - pacify_glow = 0; - - if (scr_hero_has_pacify(c)) - for (sglowi = 0; sglowi < 3; sglowi += 1) - if (global.monster[sglowi] == 1 && global.monsterstatus[sglowi] == 1 && global.tension >= scr_hero_get_pacify_spell_cost(c)) - pacify_glow = 1; - - var icon_offset = 5; - { - draw_sprite(spr_btfight, btc[0], xx + xchunk + 15 + icon_offset, (485 - bp) + yy); - - if (scr_hero_uses_acts_instead_of_spells(c)) - draw_sprite(spr_btact, btc[1], xx + xchunk + 50 + icon_offset, (485 - bp) + yy); - else - draw_sprite(spr_bttech, btc[1], xx + xchunk + 50 + icon_offset, (485 - bp) + yy); - - draw_sprite(spr_btitem, btc[2], xx + xchunk + 85 + icon_offset, (485 - bp) + yy); - draw_sprite(spr_btspare, btc[3], xx + xchunk + 120 + icon_offset, (485 - bp) + yy); - draw_sprite(spr_btdefend, btc[4], xx + xchunk + 155 + icon_offset, (485 - bp) + yy); - - if (spare_glow == 1 && gc == charpos[c]) draw_sprite_ext(spr_btspare, 2, xx + xchunk + 120 + icon_offset, (485 - bp) + yy, 1, 1, 0, c_white, 0.4 + (sin(global.time / 6) * 0.4)); - if (pacify_glow == 1 && gc == charpos[c]) draw_sprite_ext(spr_bttech, 2, xx + xchunk + 50 + icon_offset, (485 - bp) + yy, 1, 1, 0, c_white, 0.4 + (sin(global.time / 6) * 0.4)); - } - } + if (global.monster[sglowi] == 1 && global.monsterstatus[sglowi] == 1 && global.tension >= scr_hero_get_pacify_spell_cost(c)) + pacify_glow = 1; + + scr_hero_rendercharboxicons(c) + } - draw_set_color(gc == charpos[c] ? charcolor : bcolor); + draw_set_color(gc == charpos[c] ? charcolor : bcolor); - if (global.charselect == charpos[c] || global.charselect == 3) - draw_set_color(charcolor); + if (global.charselect == charpos[c] || global.charselect == 3) + draw_set_color(charcolor); - if (rouxlsgridenabled == false) + if (rouxlsgridenabled == false) + { + draw_rectangle(xx + xchunk, (480 - bp - 3) + yy + boxcasingy, xx + xchunk + 212, ((480 - bp) + yy) - 2, false); + draw_set_color(c_black); + draw_rectangle(xx + xchunk + 2, (480 - bp - 1) + yy + boxcasingy, xx + xchunk + 210, (480 - bp) + yy + boxcasingy + 33, false); + } + else + { + draw_rectangle(xx + xchunk, (480 - bp - 3) + yy + boxcasingy, xx + xchunk + 212, (480 - bp - 2) + yy + boxcasingy, false); + + if (boxcasingy < -32) { - draw_rectangle(xx + xchunk, (480 - bp - 3) + yy + mmy[c], xx + xchunk + 212, ((480 - bp) + yy) - 2, false); - draw_set_color(c_black); - draw_rectangle(xx + xchunk + 2, (480 - bp - 1) + yy + mmy[c], xx + xchunk + 210, (480 - bp) + yy + mmy[c] + 33, false); + draw_rectangle(xx + xchunk, (480 - bp - 3) + yy + boxcasingy, xx + xchunk + 1, bpoff + b_offset + 39 + boxcasingy, false); + draw_rectangle(xx + xchunk + 211, (480 - bp - 3) + yy + boxcasingy, xx + xchunk + 212, bpoff + b_offset + 39 + boxcasingy, false); } - else - { - draw_rectangle(xx + xchunk, (480 - bp - 3) + yy + mmy[c], xx + xchunk + 212, (480 - bp - 2) + yy + mmy[c], false); - - if (mmy[c] < -32) - { - draw_rectangle(xx + xchunk, (480 - bp - 3) + yy + mmy[c], xx + xchunk + 1, bpoff + b_offset + 39 + mmy[c], false); - draw_rectangle(xx + xchunk + 211, (480 - bp - 3) + yy + mmy[c], xx + xchunk + 212, bpoff + b_offset + 39 + mmy[c], false); - } - draw_set_color(c_black); + draw_set_color(c_black); - if (gc != charpos[c] && mmy[c] != 0) - draw_rectangle(xx + xchunk + 2, (480 - bp - 1) + yy + mmy[c], xx + xchunk + 210, (480 - bp) + yy + 0 + 33, false); - else - draw_rectangle(xx + xchunk + 2, (480 - bp - 1) + yy + mmy[c], xx + xchunk + 210, (480 - bp) + yy + mmy[c] + 33, false); - } + if (gc != charpos[c] && boxcasingy != 0) + draw_rectangle(xx + xchunk + 2, (480 - bp - 1) + yy + boxcasingy, xx + xchunk + 210, (480 - bp) + yy + 0 + 33, false); + else + draw_rectangle(xx + xchunk + 2, (480 - bp - 1) + yy + boxcasingy, xx + xchunk + 210, (480 - bp) + yy + boxcasingy + 33, false); + } - b_offset = 480; + b_offset = 480; - if (global.fighting == 0) - b_offset = 430; + if (global.fighting == 0) + b_offset = 430; - if (global.fighting == 1) - b_offset = 336; + if (global.fighting == 1) + b_offset = 336; - headspr = spr_headkris; - namespr = spr_bnamekris; + headspr = spr_headkris; + namespr = spr_bnamekris; - scr_hero_get_nameplate(c); + scr_hero_get_nameplate(c); - draw_sprite(headspr, global.faceaction[charpos[c]], xx + 13 + xchunk, bpoff + b_offset + mmy[c]); - draw_sprite(namespr, 0, xx + 51 + xchunk, bpoff + b_offset + 3 + mmy[c]); + draw_sprite(headspr, global.faceaction[charpos[c]], xx + 13 + xchunk, bpoff + b_offset + boxcasingy); + draw_sprite(namespr, 0, xx + 51 + xchunk, bpoff + b_offset + 3 + boxcasingy); - draw_sprite(spr_hpname, 0, xx + 109 + xchunk, bpoff + b_offset + 11 + mmy[c]); - draw_set_color(c_white); - draw_set_font(global.hpfont); + draw_sprite(spr_hpname, 0, xx + 109 + xchunk, bpoff + b_offset + 11 + boxcasingy); + draw_set_color(c_white); + draw_set_font(global.hpfont); - if ((global.hp[c + 1] / global.maxhp[c + 1]) <= 0.25) - draw_set_color(c_yellow); + if ((global.hp[c + 1] / global.maxhp[c + 1]) <= 0.25) + draw_set_color(c_yellow); - if (global.hp[c + 1] <= 0) - draw_set_color(c_red); + if (global.hp[c + 1] <= 0) + draw_set_color(c_red); - draw_set_halign(fa_right); - draw_text(xx + 160 + xchunk, ((bpoff + b_offset) - 2) + mmy[c], string_hash_to_newline(global.hp[c + 1])); - draw_sprite(spr_hpslash, 0, xx + 159 + xchunk, ((bpoff + b_offset) - 4) + mmy[c]); - draw_text(xx + 205 + xchunk, ((bpoff + b_offset) - 2) + mmy[c], string_hash_to_newline(global.maxhp[c + 1])); - draw_set_halign(fa_left); - draw_set_color(c_maroon); - draw_rectangle(xx + 128 + xchunk, bpoff + b_offset + 11 + mmy[c], xx + 203 + xchunk, bpoff + b_offset + 19 + mmy[c], false); + draw_set_halign(fa_right); + draw_text(xx + 160 + xchunk, ((bpoff + b_offset) - 2) + boxcasingy, string_hash_to_newline(global.hp[c + 1])); + draw_sprite(spr_hpslash, 0, xx + 159 + xchunk, ((bpoff + b_offset) - 4) + boxcasingy); + draw_text(xx + 205 + xchunk, ((bpoff + b_offset) - 2) + boxcasingy, string_hash_to_newline(global.maxhp[c + 1])); + draw_set_halign(fa_left); + draw_set_color(c_maroon); + draw_rectangle(xx + 128 + xchunk, bpoff + b_offset + 11 + boxcasingy, xx + 203 + xchunk, bpoff + b_offset + 19 + boxcasingy, false); - if (global.hp[c + 1] > 0 && global.maxhp[c + 1] > 0) - { - draw_set_color(charcolor); - draw_rectangle(xx + 128 + xchunk, bpoff + b_offset + 11 + mmy[c], xx + xchunk + 128 + ceil((global.hp[c + 1] / global.maxhp[c + 1]) * 75), bpoff + b_offset + 19 + mmy[c], false); - } + if (global.hp[c + 1] > 0 && global.maxhp[c + 1] > 0) + { + draw_set_color(charcolor); + draw_rectangle(xx + 128 + xchunk, bpoff + b_offset + 11 + boxcasingy, xx + xchunk + 128 + ceil((global.hp[c + 1] / global.maxhp[c + 1]) * 75), bpoff + b_offset + 19 + boxcasingy, false); } } } diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index a01cc84d..7dc19cba 100644 --- a/scripts/scr_heroes_config/scr_heroes_config.gml +++ b/scripts/scr_heroes_config/scr_heroes_config.gml @@ -763,4 +763,37 @@ function scr_character_getdarkheadsprite(charIdx) { switch charIdx { default: return [spr_equipchar_ch2, charIdx] } +} + +function scr_hero_rendercharboxicons(charIdx) { + var icon_offset = 5; + var buttonsize = 35 + var buttoncenterx = 100.50 + + var buttons = [ + spr_btfight, + (scr_hero_uses_acts_instead_of_spells(charIdx) ? spr_btact : spr_bttech), + spr_btitem, + spr_btspare, + spr_btdefend, + ] + + switch charIdx { + default: + for (var i = 0; i < array_length(buttons); ++i) { + if i > (array_length(btc) - 1) btc[i] = 0 + var sprite = buttons[i] + var xmulti = (i - (array_length(buttons) - 1)/2) + var _x = xx + xchunk + round((buttoncenterx - sprite_get_width(sprite)/2) + (buttonsize * xmulti)) + icon_offset + //var _x = xx + xchunk + (15 + (i*buttonsize)) + icon_offset // Uncomment to revert to Normal X Pos Code + var _y = (485 - bp) + yy + draw_sprite(sprite, btc[i], _x, _y); + + //show_debug_message("CHAR: {3}, SPRITE: {0}, CenterX:{1}, CenterY:{2}", sprite_get_name(sprite), (_x - xchunk - xx - icon_offset) + sprite_get_width(sprite)/2, (_y - bp-yy) + sprite_get_height(sprite)/2, global.charname[charIdx + 1]) + } + + if (spare_glow == 1 && gc == charpos[c]) draw_sprite_ext(spr_btspare, 2, xx + xchunk + 120 + icon_offset, (485 - bp) + yy, 1, 1, 0, c_white, 0.4 + (sin(global.time / 6) * 0.4)); + if (pacify_glow == 1 && gc == charpos[c]) draw_sprite_ext(spr_bttech, 2, xx + xchunk + 50 + icon_offset, (485 - bp) + yy, 1, 1, 0, c_white, 0.4 + (sin(global.time / 6) * 0.4)); + break + } } \ No newline at end of file