diff --git a/DELTAModKit.yyp b/DELTAModKit.yyp index fbd5a285..fd47ef7b 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, @@ -69,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",}, @@ -95,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",}, @@ -163,7 +169,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.2.936", + "IDEVersion":"2024.1400.0.911", }, "name":"DELTAModKit", "resources":[ @@ -382,6 +388,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",},}, @@ -391,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",},}, @@ -410,6 +418,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",},}, @@ -453,9 +462,10 @@ {"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",},}, {"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",},}, @@ -464,11 +474,18 @@ {"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",},}, {"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",},}, @@ -884,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",},}, @@ -936,6 +955,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_attackpress/Create_0.gml b/objects/obj_attackpress/Create_0.gml index efefaa95..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; } } } @@ -128,33 +124,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 +151,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; @@ -229,27 +212,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..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,49 +136,41 @@ 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; - 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_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/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_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_battlecontroller/Step_0.gml b/objects/obj_battlecontroller/Step_0.gml index 65afb8ef..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(); @@ -195,30 +195,19 @@ 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; } } - if (button2_p() == 1 && onebuffer < 0 && global.charturn > 0) - { + if (button2_p() && onebuffer < 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 @@ -944,7 +933,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/objects/obj_caterpillarchara/Create_0.gml b/objects/obj_caterpillarchara/Create_0.gml index 3b5c6bc3..9bf22960 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; @@ -19,22 +18,24 @@ 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; 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; 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; @@ -47,8 +48,10 @@ mywidth = sprite_width; myheight = sprite_height; xoffset = 0; yoffset = 0; -init = 0; +init = false; forget = 0; ignoredepth = 0; halign = 6; valign = 16; +facingcodeoverride = -1 + diff --git a/objects/obj_caterpillarchara/Step_2.gml b/objects/obj_caterpillarchara/Step_2.gml index cd2017f8..f03222a8 100644 --- a/objects/obj_caterpillarchara/Step_2.gml +++ b/objects/obj_caterpillarchara/Step_2.gml @@ -1,176 +1,116 @@ -if (!init) -{ - ignoredepth = 0; - init = 1; - - if (name == "susie") - { - if (scr_havechar("no") && global.darkzone == 0) - target = 8; +if !i_ex(parent) exit; + +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 target > maxtarget { + var previousmax = maxtarget + maxtarget = floor(target * 1.5) + 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) -{ +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 (parent.x != remx[0]) || (parent.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 = maxtarget; i > 0; i -= 1) { remx[i] = remx[i - 1]; remy[i] = remy[i - 1]; facing[i] = facing[i - 1]; 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; - y = remy[target] - valign; + x = remx[target] - halign + parent.halign; + y = remy[target] - valign + parent.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) || (abs(remx[target + 1] - remx[target]) > 4) runmove = true; dir = facing[target]; } -if (x != nowx) - walk = 1; +if fun == false { -if (y != nowy) - walk = 1; + var hascustomcode = is_method(facingcodeoverride) -if (walk == 1) - walkbuffer = 6; + scr_overworldcharwalking_shared((hascustomcode || slided) ? -1 : facing[target]) -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) -{ - 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 (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; + if hascustomcode && !slided { + facingcodeoverride() + } } 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_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 87c7e607..b6999571 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; @@ -43,24 +43,10 @@ for (var i = 0; i < 36; i += 1) global.cinstance[0] = 4343434343; global.cinstance[1] = 343434343434; -for (var i = 0; i < 3; i += 1) -{ - global.faceaction[i] = 0; - - if (global.char[i] == DRCharacter.None) continue; - - chartotal++; - havechar[global.char[i] - 1] = 1; - charpos[global.char[i] - 1] = i; - - if (i > 0 )//&& global.char[i] != DRCharacter.Kris) - { - global.cinstance[i - 1] = instance_create(obj_mainchara.x, obj_mainchara.y, obj_caterpillarchara); - global.cinstance[i - 1].target = i * 12; - - with (global.cinstance[i - 1]) - scr_character_set_caterpillar_sprites(global.char[i]); - } +spawnedfollowers = false +if i_ex(obj_mainchara) && variable_instance_exists(obj_mainchara, "dsprite") { + spawnedfollowers = true + scr_overworldcontrollers_spawncharacters(true) } global.charinstance[0] = obj_mainchara; diff --git a/objects/obj_darkcontroller/Draw_0.gml b/objects/obj_darkcontroller/Draw_0.gml index c7234f60..4bb7ad86 100644 --- a/objects/obj_darkcontroller/Draw_0.gml +++ b/objects/obj_darkcontroller/Draw_0.gml @@ -1,10 +1,9 @@ -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; -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"; - - if (global.flag[11] == 1) - runoff = "ON"; - - flashoff = "OFF"; + runoff = global.flag[11] ? "ON" : "OFF"; + flashoff = global.flag[8] ? "ON" : "OFF"; + shakeoff = global.flag[12] ? "ON" : "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) { @@ -305,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 < 3; 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) @@ -408,36 +384,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 == 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 (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 (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])); } } @@ -499,89 +468,53 @@ 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) 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/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/Step_0.gml b/objects/obj_darkcontroller/Step_0.gml index a99d2f9c..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; } @@ -1228,14 +1221,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) @@ -1634,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; } @@ -1661,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/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", 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_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..b654c481 100644 --- a/objects/obj_dw_leave/Step_0.gml +++ b/objects/obj_dw_leave/Step_0.gml @@ -36,23 +36,24 @@ 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") { + 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); } } - }*/ + } 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/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/objects/obj_encounterbasic/Create_0.gml b/objects/obj_encounterbasic/Create_0.gml index df0c9576..a4f4daa2 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 = 0 + 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/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_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_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_initializer2/Create_0.gml b/objects/obj_initializer2/Create_0.gml index 48ccc4b5..25b732d7 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; @@ -80,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); @@ -103,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/objects/obj_initializer2/Step_0.gml b/objects/obj_initializer2/Step_0.gml index 941e3c29..65302319 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/objects/obj_mainchara/Create_0.gml b/objects/obj_mainchara/Create_0.gml index 470a297e..7112fd21 100644 --- a/objects/obj_mainchara/Create_0.gml +++ b/objects/obj_mainchara/Create_0.gml @@ -63,6 +63,10 @@ rsprite = spr_krisr; usprite = spr_krisu; lsprite = spr_krisl; climbsprite = 3707; +timebetweenwalkframes = 10 +halign = 0 +valign = 0 +depthbonus = 0 if darkmode { dsprite = spr_krisd_dark; @@ -75,23 +79,19 @@ 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; 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; @@ -103,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) @@ -254,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; } @@ -301,4 +293,7 @@ nudgex = 0; nudgey = 0; nudgelerp = 0.1; -noclip = false; \ No newline at end of file +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 828d30a9..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 (left_h()) - press_l = 1; + if (run == false) wspeed = bwspeed; + if (climbing == true) wspeed = ceil(wspeed * 0.7); - 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) @@ -276,236 +229,51 @@ 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 - { + } 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; @@ -514,59 +282,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; @@ -574,92 +333,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; @@ -680,78 +411,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 == 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 (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_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/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_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/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_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/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/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..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) { @@ -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++) { 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/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/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; } diff --git a/options/android/icons/hdpi.png b/options/android/icons/hdpi.png new file mode 100644 index 00000000..a4fedad9 Binary files /dev/null and b/options/android/icons/hdpi.png differ diff --git a/options/android/icons/ldpi.png b/options/android/icons/ldpi.png new file mode 100644 index 00000000..8c2c9a70 Binary files /dev/null and b/options/android/icons/ldpi.png differ diff --git a/options/android/icons/mdpi.png b/options/android/icons/mdpi.png new file mode 100644 index 00000000..80c72577 Binary files /dev/null and b/options/android/icons/mdpi.png differ diff --git a/options/android/icons/xhdpi.png b/options/android/icons/xhdpi.png new file mode 100644 index 00000000..3ecd0f9c Binary files /dev/null and b/options/android/icons/xhdpi.png differ diff --git a/options/android/icons/xxhdpi.png b/options/android/icons/xxhdpi.png new file mode 100644 index 00000000..307b5b8c Binary files /dev/null and b/options/android/icons/xxhdpi.png differ diff --git a/options/android/icons/xxxhdpi.png b/options/android/icons/xxxhdpi.png new file mode 100644 index 00000000..97ed553d Binary files /dev/null and b/options/android/icons/xxxhdpi.png differ diff --git a/options/android/options_android.yy b/options/android/options_android.yy index e98feda9..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, @@ -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/fav.ico b/options/html5/fav.ico new file mode 100644 index 00000000..32608b84 Binary files /dev/null and b/options/html5/fav.ico differ diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy index 2bcb9635..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":"", @@ -32,4 +32,4 @@ "option_html5_webgl":2, "resourceType":"GMHtml5Options", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/ios/icons/app/ipad_152.png b/options/ios/icons/app/ipad_152.png new file mode 100644 index 00000000..9dd0a7dc Binary files /dev/null and b/options/ios/icons/app/ipad_152.png differ diff --git a/options/ios/icons/app/ipad_76.png b/options/ios/icons/app/ipad_76.png new file mode 100644 index 00000000..18904d98 Binary files /dev/null and b/options/ios/icons/app/ipad_76.png differ 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 00000000..45102938 Binary files /dev/null and b/options/ios/icons/app/ipad_pro_167.png differ diff --git a/options/ios/icons/app/iphone_120.png b/options/ios/icons/app/iphone_120.png new file mode 100644 index 00000000..ed55e5ce Binary files /dev/null and b/options/ios/icons/app/iphone_120.png differ diff --git a/options/ios/icons/app/iphone_180.png b/options/ios/icons/app/iphone_180.png new file mode 100644 index 00000000..eb48ed51 Binary files /dev/null and b/options/ios/icons/app/iphone_180.png differ diff --git a/options/ios/icons/itunes/itunes_1024.png b/options/ios/icons/itunes/itunes_1024.png new file mode 100644 index 00000000..3183df5c Binary files /dev/null and b/options/ios/icons/itunes/itunes_1024.png differ diff --git a/options/ios/icons/notification/ipad_20.png b/options/ios/icons/notification/ipad_20.png new file mode 100644 index 00000000..c77debab Binary files /dev/null and b/options/ios/icons/notification/ipad_20.png differ diff --git a/options/ios/icons/notification/ipad_40.png b/options/ios/icons/notification/ipad_40.png new file mode 100644 index 00000000..b23fa52b Binary files /dev/null and b/options/ios/icons/notification/ipad_40.png differ diff --git a/options/ios/icons/notification/iphone_40.png b/options/ios/icons/notification/iphone_40.png new file mode 100644 index 00000000..b23fa52b Binary files /dev/null and b/options/ios/icons/notification/iphone_40.png differ diff --git a/options/ios/icons/notification/iphone_60.png b/options/ios/icons/notification/iphone_60.png new file mode 100644 index 00000000..136d32df Binary files /dev/null and b/options/ios/icons/notification/iphone_60.png differ diff --git a/options/ios/icons/settings/ipad_29.png b/options/ios/icons/settings/ipad_29.png new file mode 100644 index 00000000..21266b72 Binary files /dev/null and b/options/ios/icons/settings/ipad_29.png differ diff --git a/options/ios/icons/settings/ipad_58.png b/options/ios/icons/settings/ipad_58.png new file mode 100644 index 00000000..bac755d7 Binary files /dev/null and b/options/ios/icons/settings/ipad_58.png differ diff --git a/options/ios/icons/settings/iphone_58.png b/options/ios/icons/settings/iphone_58.png new file mode 100644 index 00000000..bac755d7 Binary files /dev/null and b/options/ios/icons/settings/iphone_58.png differ diff --git a/options/ios/icons/settings/iphone_87.png b/options/ios/icons/settings/iphone_87.png new file mode 100644 index 00000000..9fb2e367 Binary files /dev/null and b/options/ios/icons/settings/iphone_87.png differ diff --git a/options/ios/icons/spotlight/ipad_40.png b/options/ios/icons/spotlight/ipad_40.png new file mode 100644 index 00000000..b23fa52b Binary files /dev/null and b/options/ios/icons/spotlight/ipad_40.png differ diff --git a/options/ios/icons/spotlight/ipad_80.png b/options/ios/icons/spotlight/ipad_80.png new file mode 100644 index 00000000..7b3b9c95 Binary files /dev/null and b/options/ios/icons/spotlight/ipad_80.png differ diff --git a/options/ios/icons/spotlight/iphone_120.png b/options/ios/icons/spotlight/iphone_120.png new file mode 100644 index 00000000..ed55e5ce Binary files /dev/null and b/options/ios/icons/spotlight/iphone_120.png differ diff --git a/options/ios/icons/spotlight/iphone_80.png b/options/ios/icons/spotlight/iphone_80.png new file mode 100644 index 00000000..7b3b9c95 Binary files /dev/null and b/options/ios/icons/spotlight/iphone_80.png differ diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy index 8fa17d9b..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,10 +40,10 @@ "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", "resourceType":"GMiOSOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/linux/icons/64.png b/options/linux/icons/64.png new file mode 100644 index 00000000..8504ec84 Binary files /dev/null and b/options/linux/icons/64.png differ diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index de5a1b89..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":"", @@ -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/icons/1024.png b/options/mac/icons/1024.png new file mode 100644 index 00000000..3183df5c Binary files /dev/null and b/options/mac/icons/1024.png differ diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index 63739eca..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", @@ -35,4 +35,4 @@ "option_mac_x86_64":true, "resourceType":"GMMacOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/mac/splash/installer_background.png b/options/mac/splash/installer_background.png new file mode 100644 index 00000000..5e8add1c Binary files /dev/null and b/options/mac/splash/installer_background.png differ diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 7d988953..e10bf7fe 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -21,9 +21,9 @@ "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", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/options/main/template_icon.png b/options/main/template_icon.png new file mode 100644 index 00000000..6f12e670 Binary files /dev/null and b/options/main/template_icon.png differ 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/icons/1280.png b/options/tvos/icons/1280.png new file mode 100644 index 00000000..ebb57e65 Binary files /dev/null and b/options/tvos/icons/1280.png differ diff --git a/options/tvos/icons/400.png b/options/tvos/icons/400.png new file mode 100644 index 00000000..fa67f52a Binary files /dev/null and b/options/tvos/icons/400.png differ diff --git a/options/tvos/icons/400_2x.png b/options/tvos/icons/400_2x.png new file mode 100644 index 00000000..178692fb Binary files /dev/null and b/options/tvos/icons/400_2x.png differ diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy index abd6ee8b..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", @@ -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/icons/icon.ico b/options/windows/icons/icon.ico new file mode 100644 index 00000000..32608b84 Binary files /dev/null and b/options/windows/icons/icon.ico differ diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 683960fb..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, @@ -34,4 +34,4 @@ "option_windows_vsync":false, "resourceType":"GMWindowsOptions", "resourceVersion":"2.0", -} +} \ No newline at end of file diff --git a/rooms/room_lw_test/room_lw_test.yy b/rooms/room_lw_test/room_lw_test.yy index 1050aa6e..87620e8b 100644 --- a/rooms/room_lw_test/room_lw_test.yy +++ b/rooms/room_lw_test/room_lw_test.yy @@ -43,7 +43,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,}, 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/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/macros/macros.gml b/scripts/macros/macros.gml new file mode 100644 index 00000000..a6a57219 --- /dev/null +++ b/scripts/macros/macros.gml @@ -0,0 +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/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/ossafe/ossafe.gml b/scripts/ossafe/ossafe.gml index 244df260..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) @@ -390,40 +380,33 @@ 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) + ":"; - 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; } -function scr_chapterswitch(arg0 = 0) -{ +function scr_chapterswitch(chapter = 0) { var parameters = get_chapter_switch_parameters(); - - if (arg0 == 0) - { - switch (os_type) - { + 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: game_change("/../", "-game data.win" + parameters); break; @@ -440,12 +423,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; @@ -493,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_armorinfo/scr_armorinfo.gml b/scripts/scr_armorinfo/scr_armorinfo.gml index d5699d06..9c7f336d 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; @@ -49,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; @@ -122,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) { @@ -131,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]; @@ -148,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_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_script_repeat/scr_script_repeat.yy b/scripts/scr_asset_exists/scr_asset_exists.yy similarity index 77% rename from scripts/scr_script_repeat/scr_script_repeat.yy rename to scripts/scr_asset_exists/scr_asset_exists.yy index 0c742080..7edd6f0a 100644 --- a/scripts/scr_script_repeat/scr_script_repeat.yy +++ b/scripts/scr_asset_exists/scr_asset_exists.yy @@ -1,9 +1,9 @@ { "$GMScript":"v1", - "%Name":"scr_script_repeat", + "%Name":"scr_asset_exists", "isCompatibility":false, "isDnD":false, - "name":"scr_script_repeat", + "name":"scr_asset_exists", "parent":{ "name":"Engine", "path":"folders/DELTARUNE/Scripts/Engine.yy", 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_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_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 bf03cc2f..23812df2 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 (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_chapter_config/scr_chapter_config.gml b/scripts/scr_chapter_config/scr_chapter_config.gml index 15f517f3..a3830ea0 100644 --- a/scripts/scr_chapter_config/scr_chapter_config.gml +++ b/scripts/scr_chapter_config/scr_chapter_config.gml @@ -1,13 +1,12 @@ 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; } 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; diff --git a/scripts/scr_charbox/scr_charbox.gml b/scripts/scr_charbox/scr_charbox.gml index e8eb88f3..7bd986c5 100644 --- a/scripts/scr_charbox/scr_charbox.gml +++ b/scripts/scr_charbox/scr_charbox.gml @@ -1,172 +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; - } +function scr_charbox(){ + 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_charcan/scr_charcan.gml b/scripts/scr_charcan/scr_charcan.gml index b91e52bb..c6962829 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_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_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_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..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) { @@ -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; } @@ -367,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_enemy_config/scr_enemy_config.gml b/scripts/scr_enemy_config/scr_enemy_config.gml index c0c95123..bef57da6 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; @@ -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; @@ -184,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 @@ -296,4 +297,67 @@ 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. + scr_createdefeatanimation(obj_spareanim, function() { return _spared }, 100,function(instance) { _spritetochangeto = sparedsprite }) // 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@@") +} + +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; + _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 9696a3c0..e1dcfd66 100644 --- a/scripts/scr_flag/scr_flag.gml +++ b/scripts/scr_flag/scr_flag.gml @@ -1,11 +1,5 @@ -function global_flagname_init() -{ - global.flagname = []; - - repeat (9999) - { - array_push(global.flagname, undefined) - } +function global_flagname_init() { + global.flagname = array_create(9999, undefined); global.flagname[6] = "disable text skip [Broken]" global.flagname[8] = "Simplify VFX" @@ -52,17 +46,19 @@ 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" 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]" @@ -72,8 +68,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(); diff --git a/scripts/scr_gamestart/scr_gamestart.gml b/scripts/scr_gamestart/scr_gamestart.gml index 55b41b36..9ac4d7e0 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; @@ -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_havechar/scr_havechar.gml b/scripts/scr_havechar/scr_havechar.gml index 0d92519d..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; @@ -98,13 +104,15 @@ function scr_refresh_party() { } } -function scr_makecaterpillar(xx, yy, characterId, idx) -{ - global.cinstance[idx] = instance_create(xx, yy, obj_caterpillarchara); +function scr_makecaterpillar(xx, yy, characterId, idx) { + 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 diff --git a/scripts/scr_heroes_config/scr_heroes_config.gml b/scripts/scr_heroes_config/scr_heroes_config.gml index af940613..7dc19cba 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; @@ -316,6 +349,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"; @@ -325,9 +369,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 +385,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 +397,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 +412,49 @@ 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; + timebetweenwalkframes = 10; + 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 + } + 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; @@ -597,7 +675,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"; @@ -609,11 +687,113 @@ 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"; 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 + } +} + +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] + } +} + +function scr_character_getdarkheadsprite(charIdx) { + // Format: [{SpriteToCallFrom}, {ImageIndex}] + 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 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_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_monster/scr_monster.gml b/scripts/scr_monster/scr_monster.gml index e02b1d46..fe5eb6c5 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) @@ -82,88 +77,42 @@ 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] == 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] == MONSTERS_DEFEATTYPES_AutoViolenced) 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; } - 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_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 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_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/scr_script.yy b/scripts/scr_script/scr_script.yy new file mode 100644 index 00000000..ff4ee3ab --- /dev/null +++ b/scripts/scr_script/scr_script.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_script", + "isCompatibility":false, + "isDnD":false, + "name":"scr_script", + "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_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_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/scr_shared_overworld/scr_shared_overworld.gml b/scripts/scr_shared_overworld/scr_shared_overworld.gml new file mode 100644 index 00000000..8c115396 --- /dev/null +++ b/scripts/scr_shared_overworld/scr_shared_overworld.gml @@ -0,0 +1,207 @@ +// @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) + 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; +} + +// @description Merged for darkcontroller and overworldcontroller +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 = 0; 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 - 1) * 12; + global.cinstance[i - 1].characterslot = char + + with (global.cinstance[i - 1]) { + scr_character_set_caterpillar_sprites(char); + } + } + } +} + +// @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 == false && 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 == false && !place_meeting(x - g, y + py, _solidobjecttype)) { + x -= g; + px = 0; + mvd = true; + break; + } + + if (mvd == false && press_l == false && !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 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 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: { 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_turn/scr_turn.gml b/scripts/scr_turn/scr_turn.gml index 1936a7b3..f44b354f 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] = " "; - - 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; + var character = global.char[i] + + 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; @@ -248,128 +242,75 @@ 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() -{ - 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() -{ - moveswapped = 0; +function scr_nexthero() { + moveswapped = false; 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(); - } - var endturn = false; - if ((global.charturn == 2 && moveswapped == 0) || endturn == true) - scr_endturn(); - - if (moveswapped == 1) - global.bmenuno = 0; + for (var i = global.charturn + 1; i <= array_length(global.charmove) && !moveswapped; ++i) { + moveswapped = true + 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]])) + } + } + + 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]; + for (i = 0; i < 12; i += 1) tempitem[i][global.charturn] = tempitem[i][prevturn]; } + + return endturn } -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; - } - } + moveswapped = false; - 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; - } + if global.charturn > 0 { // No need to run Calculations if we know it'll fail anyways. + for (var i = global.charturn - 1; i >= 0 && !moveswapped; --i) { + if scr_charcan(i) { + global.charturn = i + moveswapped = true + } + } + } - 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; + with (obj_monsterparent) acting[global.char[other.prevturn]] = false; global.actingsingle[global.charturn] = 0; global.actingsimul[global.charturn] = 0; @@ -377,54 +318,34 @@ 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) - { - idefendedthisturn--; - mercytotal -= 40; - } - - 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; - 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]; + if (idefendedthisturn > 0) { + idefendedthisturn--; + mercytotal -= 40; + } + + 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]; } + + return moveswapped } -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,28 +358,26 @@ 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; - 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; @@ -468,8 +387,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) { @@ -481,7 +399,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; @@ -513,8 +431,7 @@ function scr_nextact() } } -function scr_act_simul() -{ +function scr_act_simul(){ show_debug_message("------------ scr_act_simul") __simulcount = 0; @@ -546,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) { @@ -563,56 +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; @@ -620,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); @@ -650,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; @@ -679,86 +576,88 @@ function scr_enemy_hurt() } } -function scr_defeatrun() -{ - var __frozen; - - if (object_is_ancestor(object_index, obj_monsterparent)) - { - __frozen = 0; - - if (global.flag[51 + myself] == 6) - __frozen = 1; - - if (__frozen == 1) - { - _rtext = instance_create(global.monsterx[myself], global.monstery[myself] - 40, obj_recruitanim); - _rtext.image_index = 12; - - if (recruitable == 1) - global.flag[global.monstertype[myself] + 600] = -1; - - global.flag[63] = 1; - } +function scr_defeatrun(){ + 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; + + case MONSTERS_DEFEATTYPES_Pacify: + case MONSTERS_DEFEATTYPES_Spare: _spared = true break; + } + } + + if (object_is_ancestor(object_index, obj_monsterparent)) { - if (recruitable == 1 && global.flag[61] == 0 && __frozen == 0) - { - global.flag[63] = 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; - } + 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 (!__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; + if brokenbond { + global.flag[63] = true; + 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); + _rtext.image_index = messageanimindex; + } } - - defeatanim.sprite_index = sprite_index; - defeatanim.sprite_index = hurtsprite; + 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-- + } + } + } + _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 = _spritetochangeto; defeatanim.image_index = 0; defeatanim.image_xscale = image_xscale; defeatanim.image_yscale = image_yscale; 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 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/scripts/scr_weaponinfo/scr_weaponinfo.gml b/scripts/scr_weaponinfo/scr_weaponinfo.gml index 52c29bdc..4a034007 100644 --- a/scripts/scr_weaponinfo/scr_weaponinfo.gml +++ b/scripts/scr_weaponinfo/scr_weaponinfo.gml @@ -1,8 +1,6 @@ -function scr_weaponinfo_mine() -{ - for (i = 0; i < 6; i += 1) - { - scr_weaponinfo(global.charweapon[i]); +function scr_weaponinfo_mine(){ + for (i = 0; i < DRCharacter.__MAX__; i += 1) { + scr_weaponinfo(global.charweapon[i], i); charweaponname[i] = weaponnametemp; charweapondesc[i] = weapondesctemp; charweaponat[i] = weaponattemp; @@ -24,10 +22,8 @@ function scr_weaponinfo_mine() } } -function scr_weaponinfo_all() -{ - for (i = 0; i < 48; i += 1) - { +function scr_weaponinfo_all(){ + for (i = 0; i < INVENTORYMAX_ARMORANDWEAPONS; i += 1){ scr_weaponinfo(global.weapon[i]); weaponname[i] = weaponnametemp; weapondesc[i] = weapondesctemp; @@ -54,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; @@ -97,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) { @@ -106,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]; @@ -124,7 +120,7 @@ function scr_weaponget(arg0) else if (legacy) { loop = 1; - global.weapon[48] = 999; + global.weapon[INVENTORYMAX_ARMORANDWEAPONS] = 999; while (loop == 1) { @@ -134,7 +130,7 @@ function scr_weaponget(arg0) break; } - if (__i == 48) + if (__i == INVENTORYMAX_ARMORANDWEAPONS) { noroom = 1; break; 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 = " "; 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/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++) { 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") { 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..0c780a20 --- /dev/null +++ b/shaders/shd_hsl/shd_hsl.fsh @@ -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.vsh b/shaders/shd_hsl/shd_hsl.vsh new file mode 100644 index 00000000..3900c20f --- /dev/null +++ b/shaders/shd_hsl/shd_hsl.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_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 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 00000000..d7caf1b2 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/0712194f-08c9-458f-9c95-ce298c243ca6.png differ diff --git a/sprites/spr_noelleb_battleintro/09905c92-d295-439f-9207-8122dd91a6e1.png b/sprites/spr_noelleb_battleintro/09905c92-d295-439f-9207-8122dd91a6e1.png new file mode 100644 index 00000000..69f635c7 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/09905c92-d295-439f-9207-8122dd91a6e1.png differ diff --git a/sprites/spr_noelleb_battleintro/15449b53-5888-41ae-ab0d-33cbb0f9c4bb.png b/sprites/spr_noelleb_battleintro/15449b53-5888-41ae-ab0d-33cbb0f9c4bb.png new file mode 100644 index 00000000..c90644d1 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/15449b53-5888-41ae-ab0d-33cbb0f9c4bb.png differ 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 00000000..606d4f14 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/1acf3d9b-5ecf-426c-bdc3-1e2aef79d438.png differ diff --git a/sprites/spr_noelleb_battleintro/1b9023bd-6273-4e8e-98b7-3c1b1a001b31.png b/sprites/spr_noelleb_battleintro/1b9023bd-6273-4e8e-98b7-3c1b1a001b31.png new file mode 100644 index 00000000..d7caf1b2 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/1b9023bd-6273-4e8e-98b7-3c1b1a001b31.png differ diff --git a/sprites/spr_noelleb_battleintro/38ff8503-1cd5-4ab7-b07d-f186055f3c25.png b/sprites/spr_noelleb_battleintro/38ff8503-1cd5-4ab7-b07d-f186055f3c25.png new file mode 100644 index 00000000..01c06c62 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/38ff8503-1cd5-4ab7-b07d-f186055f3c25.png differ 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 00000000..d7caf1b2 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/5c7a7e27-f41c-4c34-8687-92e63baec044.png differ diff --git a/sprites/spr_noelleb_battleintro/72322e26-681b-4cbb-8852-3fa8227d2224.png b/sprites/spr_noelleb_battleintro/72322e26-681b-4cbb-8852-3fa8227d2224.png new file mode 100644 index 00000000..f1c9fecc Binary files /dev/null and b/sprites/spr_noelleb_battleintro/72322e26-681b-4cbb-8852-3fa8227d2224.png differ 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 00000000..28a7bc4b Binary files /dev/null and b/sprites/spr_noelleb_battleintro/81f38d17-202d-41ec-bcc8-c430f6b8b943.png differ diff --git a/sprites/spr_noelleb_battleintro/9766496b-b20d-4c71-ab2d-b287642ddb30.png b/sprites/spr_noelleb_battleintro/9766496b-b20d-4c71-ab2d-b287642ddb30.png new file mode 100644 index 00000000..65b64260 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/9766496b-b20d-4c71-ab2d-b287642ddb30.png differ diff --git a/sprites/spr_noelleb_battleintro/cb6211cc-47b4-400f-962c-f354c0c160f5.png b/sprites/spr_noelleb_battleintro/cb6211cc-47b4-400f-962c-f354c0c160f5.png new file mode 100644 index 00000000..d7caf1b2 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/cb6211cc-47b4-400f-962c-f354c0c160f5.png differ diff --git a/sprites/spr_noelleb_battleintro/e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8.png b/sprites/spr_noelleb_battleintro/e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8.png new file mode 100644 index 00000000..712c17f0 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8.png differ 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 00000000..f1c9fecc Binary files /dev/null and b/sprites/spr_noelleb_battleintro/f122b631-d4bf-4d49-a58b-bc074561f262.png differ 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 00000000..f1c9fecc Binary files /dev/null and b/sprites/spr_noelleb_battleintro/f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe.png differ 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 00000000..f1c9fecc Binary files /dev/null and b/sprites/spr_noelleb_battleintro/fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae.png differ 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 00000000..d7caf1b2 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/0712194f-08c9-458f-9c95-ce298c243ca6/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ diff --git a/sprites/spr_noelleb_battleintro/layers/09905c92-d295-439f-9207-8122dd91a6e1/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/09905c92-d295-439f-9207-8122dd91a6e1/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 00000000..69f635c7 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/09905c92-d295-439f-9207-8122dd91a6e1/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ diff --git a/sprites/spr_noelleb_battleintro/layers/15449b53-5888-41ae-ab0d-33cbb0f9c4bb/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/15449b53-5888-41ae-ab0d-33cbb0f9c4bb/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 00000000..c90644d1 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/15449b53-5888-41ae-ab0d-33cbb0f9c4bb/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ 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 00000000..606d4f14 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/1acf3d9b-5ecf-426c-bdc3-1e2aef79d438/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ diff --git a/sprites/spr_noelleb_battleintro/layers/1b9023bd-6273-4e8e-98b7-3c1b1a001b31/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/1b9023bd-6273-4e8e-98b7-3c1b1a001b31/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 00000000..d7caf1b2 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/1b9023bd-6273-4e8e-98b7-3c1b1a001b31/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ diff --git a/sprites/spr_noelleb_battleintro/layers/38ff8503-1cd5-4ab7-b07d-f186055f3c25/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/38ff8503-1cd5-4ab7-b07d-f186055f3c25/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 00000000..01c06c62 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/38ff8503-1cd5-4ab7-b07d-f186055f3c25/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ 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 00000000..d7caf1b2 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/5c7a7e27-f41c-4c34-8687-92e63baec044/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ diff --git a/sprites/spr_noelleb_battleintro/layers/72322e26-681b-4cbb-8852-3fa8227d2224/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/72322e26-681b-4cbb-8852-3fa8227d2224/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 00000000..f1c9fecc Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/72322e26-681b-4cbb-8852-3fa8227d2224/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ 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 00000000..28a7bc4b Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/81f38d17-202d-41ec-bcc8-c430f6b8b943/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ diff --git a/sprites/spr_noelleb_battleintro/layers/9766496b-b20d-4c71-ab2d-b287642ddb30/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/9766496b-b20d-4c71-ab2d-b287642ddb30/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 00000000..65b64260 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/9766496b-b20d-4c71-ab2d-b287642ddb30/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ diff --git a/sprites/spr_noelleb_battleintro/layers/cb6211cc-47b4-400f-962c-f354c0c160f5/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/cb6211cc-47b4-400f-962c-f354c0c160f5/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 00000000..d7caf1b2 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/cb6211cc-47b4-400f-962c-f354c0c160f5/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ diff --git a/sprites/spr_noelleb_battleintro/layers/e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8/d2127cef-4b38-450e-8162-be3eeba20ed3.png b/sprites/spr_noelleb_battleintro/layers/e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8/d2127cef-4b38-450e-8162-be3eeba20ed3.png new file mode 100644 index 00000000..712c17f0 Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/e8c5d675-0c0c-4c6e-ac80-63a5f39cd7f8/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ 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 00000000..f1c9fecc Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/f122b631-d4bf-4d49-a58b-bc074561f262/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ 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 00000000..f1c9fecc Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/f9e35c9c-2c1f-4f7f-864c-be02c10ac2fe/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ 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 00000000..f1c9fecc Binary files /dev/null and b/sprites/spr_noelleb_battleintro/layers/fb37dcc5-acac-4dde-b82b-6e7cbd04f7ae/d2127cef-4b38-450e-8162-be3eeba20ed3.png differ 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 00000000..3cbe9cc8 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/0e70563e-c2bc-47a3-bbdb-adb36cb93f53.png differ diff --git a/sprites/spr_noelleb_battleintro_l/38005f93-8b8a-4ebe-8d2e-00d4dc1a951a.png b/sprites/spr_noelleb_battleintro_l/38005f93-8b8a-4ebe-8d2e-00d4dc1a951a.png new file mode 100644 index 00000000..84d08d9b Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/38005f93-8b8a-4ebe-8d2e-00d4dc1a951a.png differ 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 00000000..3cbe9cc8 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/42d1a74a-b9aa-46a6-ba2f-c9db2b517506.png differ diff --git a/sprites/spr_noelleb_battleintro_l/49954b19-785a-41cb-a914-4b35364e534d.png b/sprites/spr_noelleb_battleintro_l/49954b19-785a-41cb-a914-4b35364e534d.png new file mode 100644 index 00000000..3cbe9cc8 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/49954b19-785a-41cb-a914-4b35364e534d.png differ diff --git a/sprites/spr_noelleb_battleintro_l/548d30db-aa73-4744-8cbd-6ff871b5681f.png b/sprites/spr_noelleb_battleintro_l/548d30db-aa73-4744-8cbd-6ff871b5681f.png new file mode 100644 index 00000000..7b396b13 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/548d30db-aa73-4744-8cbd-6ff871b5681f.png differ diff --git a/sprites/spr_noelleb_battleintro_l/650026c9-fa6b-41de-a60b-fba3d901b25b.png b/sprites/spr_noelleb_battleintro_l/650026c9-fa6b-41de-a60b-fba3d901b25b.png new file mode 100644 index 00000000..a85fb903 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/650026c9-fa6b-41de-a60b-fba3d901b25b.png differ diff --git a/sprites/spr_noelleb_battleintro_l/a94460b6-2373-4c3c-8893-55f8720eab39.png b/sprites/spr_noelleb_battleintro_l/a94460b6-2373-4c3c-8893-55f8720eab39.png new file mode 100644 index 00000000..2d7b4f09 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/a94460b6-2373-4c3c-8893-55f8720eab39.png differ diff --git a/sprites/spr_noelleb_battleintro_l/bb85fb7d-4277-4c3d-859b-e5e03638c634.png b/sprites/spr_noelleb_battleintro_l/bb85fb7d-4277-4c3d-859b-e5e03638c634.png new file mode 100644 index 00000000..8976a868 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/bb85fb7d-4277-4c3d-859b-e5e03638c634.png differ 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 00000000..8976a868 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/c0386448-dfc8-4e28-8865-12b2d62ea14c.png differ 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 00000000..116b2031 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/e9c71e60-1779-4505-86ef-a50a7c049954.png differ diff --git a/sprites/spr_noelleb_battleintro_l/f5800514-d536-463d-a7c1-393309b6547c.png b/sprites/spr_noelleb_battleintro_l/f5800514-d536-463d-a7c1-393309b6547c.png new file mode 100644 index 00000000..a85fb903 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/f5800514-d536-463d-a7c1-393309b6547c.png differ diff --git a/sprites/spr_noelleb_battleintro_l/fe80eb11-7ef9-4faf-8770-6a423a6fecbf.png b/sprites/spr_noelleb_battleintro_l/fe80eb11-7ef9-4faf-8770-6a423a6fecbf.png new file mode 100644 index 00000000..8976a868 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/fe80eb11-7ef9-4faf-8770-6a423a6fecbf.png differ 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 00000000..a85fb903 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/fee5e780-d105-4173-a878-801064ea22a7.png differ diff --git a/sprites/spr_noelleb_battleintro_l/layers/0e70563e-c2bc-47a3-bbdb-adb36cb93f53/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/0e70563e-c2bc-47a3-bbdb-adb36cb93f53/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 00000000..3cbe9cc8 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/0e70563e-c2bc-47a3-bbdb-adb36cb93f53/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ diff --git a/sprites/spr_noelleb_battleintro_l/layers/38005f93-8b8a-4ebe-8d2e-00d4dc1a951a/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/38005f93-8b8a-4ebe-8d2e-00d4dc1a951a/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 00000000..84d08d9b Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/38005f93-8b8a-4ebe-8d2e-00d4dc1a951a/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ 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 00000000..3cbe9cc8 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/42d1a74a-b9aa-46a6-ba2f-c9db2b517506/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ diff --git a/sprites/spr_noelleb_battleintro_l/layers/49954b19-785a-41cb-a914-4b35364e534d/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/49954b19-785a-41cb-a914-4b35364e534d/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 00000000..3cbe9cc8 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/49954b19-785a-41cb-a914-4b35364e534d/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ diff --git a/sprites/spr_noelleb_battleintro_l/layers/548d30db-aa73-4744-8cbd-6ff871b5681f/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/548d30db-aa73-4744-8cbd-6ff871b5681f/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 00000000..7b396b13 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/548d30db-aa73-4744-8cbd-6ff871b5681f/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ diff --git a/sprites/spr_noelleb_battleintro_l/layers/650026c9-fa6b-41de-a60b-fba3d901b25b/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/650026c9-fa6b-41de-a60b-fba3d901b25b/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 00000000..a85fb903 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/650026c9-fa6b-41de-a60b-fba3d901b25b/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ diff --git a/sprites/spr_noelleb_battleintro_l/layers/a94460b6-2373-4c3c-8893-55f8720eab39/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/a94460b6-2373-4c3c-8893-55f8720eab39/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 00000000..2d7b4f09 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/a94460b6-2373-4c3c-8893-55f8720eab39/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ diff --git a/sprites/spr_noelleb_battleintro_l/layers/bb85fb7d-4277-4c3d-859b-e5e03638c634/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/bb85fb7d-4277-4c3d-859b-e5e03638c634/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 00000000..8976a868 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/bb85fb7d-4277-4c3d-859b-e5e03638c634/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ 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 00000000..8976a868 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/c0386448-dfc8-4e28-8865-12b2d62ea14c/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ 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 00000000..116b2031 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/e9c71e60-1779-4505-86ef-a50a7c049954/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ diff --git a/sprites/spr_noelleb_battleintro_l/layers/f5800514-d536-463d-a7c1-393309b6547c/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/f5800514-d536-463d-a7c1-393309b6547c/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 00000000..a85fb903 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/f5800514-d536-463d-a7c1-393309b6547c/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ diff --git a/sprites/spr_noelleb_battleintro_l/layers/fe80eb11-7ef9-4faf-8770-6a423a6fecbf/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png b/sprites/spr_noelleb_battleintro_l/layers/fe80eb11-7ef9-4faf-8770-6a423a6fecbf/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png new file mode 100644 index 00000000..8976a868 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/fe80eb11-7ef9-4faf-8770-6a423a6fecbf/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ 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 00000000..a85fb903 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_l/layers/fee5e780-d105-4173-a878-801064ea22a7/e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56.png differ diff --git a/sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy b/sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy new file mode 100644 index 00000000..aeb8bf56 --- /dev/null +++ b/sprites/spr_noelleb_battleintro_l/spr_noelleb_battleintro_l.yy @@ -0,0 +1,138 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_noelleb_battleintro_l", + "bboxMode":2, + "bbox_bottom":53, + "bbox_left":4, + "bbox_right":20, + "bbox_top":43, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fe80eb11-7ef9-4faf-8770-6a423a6fecbf","name":"fe80eb11-7ef9-4faf-8770-6a423a6fecbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9c71e60-1779-4505-86ef-a50a7c049954","name":"e9c71e60-1779-4505-86ef-a50a7c049954","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"548d30db-aa73-4744-8cbd-6ff871b5681f","name":"548d30db-aa73-4744-8cbd-6ff871b5681f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49954b19-785a-41cb-a914-4b35364e534d","name":"49954b19-785a-41cb-a914-4b35364e534d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5800514-d536-463d-a7c1-393309b6547c","name":"f5800514-d536-463d-a7c1-393309b6547c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42d1a74a-b9aa-46a6-ba2f-c9db2b517506","name":"42d1a74a-b9aa-46a6-ba2f-c9db2b517506","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fee5e780-d105-4173-a878-801064ea22a7","name":"fee5e780-d105-4173-a878-801064ea22a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e70563e-c2bc-47a3-bbdb-adb36cb93f53","name":"0e70563e-c2bc-47a3-bbdb-adb36cb93f53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"650026c9-fa6b-41de-a60b-fba3d901b25b","name":"650026c9-fa6b-41de-a60b-fba3d901b25b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38005f93-8b8a-4ebe-8d2e-00d4dc1a951a","name":"38005f93-8b8a-4ebe-8d2e-00d4dc1a951a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a94460b6-2373-4c3c-8893-55f8720eab39","name":"a94460b6-2373-4c3c-8893-55f8720eab39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0386448-dfc8-4e28-8865-12b2d62ea14c","name":"c0386448-dfc8-4e28-8865-12b2d62ea14c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb85fb7d-4277-4c3d-859b-e5e03638c634","name":"bb85fb7d-4277-4c3d-859b-e5e03638c634","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":53, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56","blendMode":0,"displayName":"default","isLocked":false,"name":"e1e510c4-daeb-4b4e-8f9f-1158d1ec7d56","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_noelleb_battleintro_l", + "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_l", + "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":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 00000000..e871b650 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/1f3091de-a351-4965-a54b-f91f337ad48b.png differ diff --git a/sprites/spr_noelleb_battleintro_sideb/486869be-fd45-4fe3-bc52-037519c30ebb.png b/sprites/spr_noelleb_battleintro_sideb/486869be-fd45-4fe3-bc52-037519c30ebb.png new file mode 100644 index 00000000..32cc2eca Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/486869be-fd45-4fe3-bc52-037519c30ebb.png differ 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 00000000..da1e95b9 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/4dfafad1-5571-462d-bc70-42e7cc4fbe4f.png differ 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 00000000..d9aa4b73 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/507c3c4b-7ca2-4044-a213-449aaf00f413.png differ 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 00000000..b53ea782 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/517212a0-14c3-4fd4-8142-c7cf44933975.png differ 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 00000000..d9aa4b73 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611.png differ 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 00000000..5caef37e Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/69551cfc-8a5c-46ea-b634-fb9efd428c1a.png differ 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 00000000..f53383e4 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/72c13161-4909-4cac-94f9-8b54b06bf9ef.png differ 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 00000000..32cc2eca Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303.png differ 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 00000000..d82b2c31 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/7bad117d-0920-41dc-a93b-a11bbecbfdf9.png differ 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 00000000..f53383e4 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/aa8813e1-3ba3-4df4-bb4a-5286efae8ed4.png differ 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 00000000..0d6ed664 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/b7cbdd79-ba5b-4c3b-90da-bd38594f6b17.png differ 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 00000000..e9bd2562 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/c8f0bb7f-959a-44ca-9858-a1660d4bcf58.png differ 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 00000000..da1e95b9 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/d799e4f2-2a3d-4929-b5ce-d2b80905fb21.png differ 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 00000000..b5aa36a6 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d.png differ diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/1f3091de-a351-4965-a54b-f91f337ad48b/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/1f3091de-a351-4965-a54b-f91f337ad48b/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 00000000..e871b650 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/1f3091de-a351-4965-a54b-f91f337ad48b/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ diff --git a/sprites/spr_noelleb_battleintro_sideb/layers/486869be-fd45-4fe3-bc52-037519c30ebb/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png b/sprites/spr_noelleb_battleintro_sideb/layers/486869be-fd45-4fe3-bc52-037519c30ebb/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png new file mode 100644 index 00000000..32cc2eca Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/486869be-fd45-4fe3-bc52-037519c30ebb/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..da1e95b9 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/4dfafad1-5571-462d-bc70-42e7cc4fbe4f/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..d9aa4b73 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/507c3c4b-7ca2-4044-a213-449aaf00f413/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..b53ea782 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/517212a0-14c3-4fd4-8142-c7cf44933975/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..d9aa4b73 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..5caef37e Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/69551cfc-8a5c-46ea-b634-fb9efd428c1a/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..f53383e4 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/72c13161-4909-4cac-94f9-8b54b06bf9ef/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..32cc2eca Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..d82b2c31 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/7bad117d-0920-41dc-a93b-a11bbecbfdf9/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..f53383e4 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/aa8813e1-3ba3-4df4-bb4a-5286efae8ed4/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..0d6ed664 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/b7cbdd79-ba5b-4c3b-90da-bd38594f6b17/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..e9bd2562 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/c8f0bb7f-959a-44ca-9858-a1660d4bcf58/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..da1e95b9 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/d799e4f2-2a3d-4929-b5ce-d2b80905fb21/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ 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 00000000..b5aa36a6 Binary files /dev/null and b/sprites/spr_noelleb_battleintro_sideb/layers/e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d/12633649-e55d-4c4a-92d7-a7e58f3e3e9d.png differ diff --git a/sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy b/sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy new file mode 100644 index 00000000..9431a96f --- /dev/null +++ b/sprites/spr_noelleb_battleintro_sideb/spr_noelleb_battleintro_sideb.yy @@ -0,0 +1,146 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_noelleb_battleintro_sideb", + "bboxMode":0, + "bbox_bottom":52, + "bbox_left":10, + "bbox_right":34, + "bbox_top":6, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"517212a0-14c3-4fd4-8142-c7cf44933975","name":"517212a0-14c3-4fd4-8142-c7cf44933975","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72c13161-4909-4cac-94f9-8b54b06bf9ef","name":"72c13161-4909-4cac-94f9-8b54b06bf9ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303","name":"7b5fe5f2-c5a0-44d6-a7d6-da84ce8ea303","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"507c3c4b-7ca2-4044-a213-449aaf00f413","name":"507c3c4b-7ca2-4044-a213-449aaf00f413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4dfafad1-5571-462d-bc70-42e7cc4fbe4f","name":"4dfafad1-5571-462d-bc70-42e7cc4fbe4f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa8813e1-3ba3-4df4-bb4a-5286efae8ed4","name":"aa8813e1-3ba3-4df4-bb4a-5286efae8ed4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"486869be-fd45-4fe3-bc52-037519c30ebb","name":"486869be-fd45-4fe3-bc52-037519c30ebb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611","name":"541cf0a2-c9e5-45c1-9ecb-c3da2d3fb611","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d799e4f2-2a3d-4929-b5ce-d2b80905fb21","name":"d799e4f2-2a3d-4929-b5ce-d2b80905fb21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7bad117d-0920-41dc-a93b-a11bbecbfdf9","name":"7bad117d-0920-41dc-a93b-a11bbecbfdf9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7cbdd79-ba5b-4c3b-90da-bd38594f6b17","name":"b7cbdd79-ba5b-4c3b-90da-bd38594f6b17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69551cfc-8a5c-46ea-b634-fb9efd428c1a","name":"69551cfc-8a5c-46ea-b634-fb9efd428c1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f3091de-a351-4965-a54b-f91f337ad48b","name":"1f3091de-a351-4965-a54b-f91f337ad48b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d","name":"e5cb2e8d-6aa8-4258-8fb1-6fb8f8a1595d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c8f0bb7f-959a-44ca-9858-a1660d4bcf58","name":"c8f0bb7f-959a-44ca-9858-a1660d4bcf58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":53, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"12633649-e55d-4c4a-92d7-a7e58f3e3e9d","blendMode":0,"displayName":"default","isLocked":false,"name":"12633649-e55d-4c4a-92d7-a7e58f3e3e9d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_noelleb_battleintro_sideb", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"SideB", + "path":"folders/DELTARUNE/Sprites/Characters/Noelle/Battle/SideB.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_noelleb_battleintro_sideb", + "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_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, 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 00000000..8d93c6bf Binary files /dev/null and b/sprites/spr_ralsei_wave_down/4ac93b26-bf21-4f6c-b3f6-0946468dc3a4.png differ 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 00000000..097e2aff Binary files /dev/null and b/sprites/spr_ralsei_wave_down/936aec4d-16d5-44e7-9c5f-0d2a1642e718.png differ diff --git a/sprites/spr_ralsei_wave_down/b659d47b-67b4-4b7d-a253-be06fd87009d.png b/sprites/spr_ralsei_wave_down/b659d47b-67b4-4b7d-a253-be06fd87009d.png new file mode 100644 index 00000000..8d93c6bf Binary files /dev/null and b/sprites/spr_ralsei_wave_down/b659d47b-67b4-4b7d-a253-be06fd87009d.png differ 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 00000000..68345f7a Binary files /dev/null and b/sprites/spr_ralsei_wave_down/f322c253-6c30-42ba-91e9-5aba402f7382.png differ diff --git a/sprites/spr_ralsei_wave_down/layers/4ac93b26-bf21-4f6c-b3f6-0946468dc3a4/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png b/sprites/spr_ralsei_wave_down/layers/4ac93b26-bf21-4f6c-b3f6-0946468dc3a4/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png new file mode 100644 index 00000000..8d93c6bf Binary files /dev/null and b/sprites/spr_ralsei_wave_down/layers/4ac93b26-bf21-4f6c-b3f6-0946468dc3a4/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png differ 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 00000000..097e2aff Binary files /dev/null and b/sprites/spr_ralsei_wave_down/layers/936aec4d-16d5-44e7-9c5f-0d2a1642e718/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png differ diff --git a/sprites/spr_ralsei_wave_down/layers/b659d47b-67b4-4b7d-a253-be06fd87009d/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png b/sprites/spr_ralsei_wave_down/layers/b659d47b-67b4-4b7d-a253-be06fd87009d/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png new file mode 100644 index 00000000..8d93c6bf Binary files /dev/null and b/sprites/spr_ralsei_wave_down/layers/b659d47b-67b4-4b7d-a253-be06fd87009d/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png differ 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 00000000..68345f7a Binary files /dev/null and b/sprites/spr_ralsei_wave_down/layers/f322c253-6c30-42ba-91e9-5aba402f7382/5fd967eb-d70a-4f9d-bca4-1be1c622e095.png differ diff --git a/sprites/spr_ralsei_wave_down/spr_ralsei_wave_down.yy b/sprites/spr_ralsei_wave_down/spr_ralsei_wave_down.yy new file mode 100644 index 00000000..1860ac5e --- /dev/null +++ b/sprites/spr_ralsei_wave_down/spr_ralsei_wave_down.yy @@ -0,0 +1,105 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_ralsei_wave_down", + "bboxMode":0, + "bbox_bottom":38, + "bbox_left":0, + "bbox_right":25, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"936aec4d-16d5-44e7-9c5f-0d2a1642e718","name":"936aec4d-16d5-44e7-9c5f-0d2a1642e718","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b659d47b-67b4-4b7d-a253-be06fd87009d","name":"b659d47b-67b4-4b7d-a253-be06fd87009d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f322c253-6c30-42ba-91e9-5aba402f7382","name":"f322c253-6c30-42ba-91e9-5aba402f7382","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ac93b26-bf21-4f6c-b3f6-0946468dc3a4","name":"4ac93b26-bf21-4f6c-b3f6-0946468dc3a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":39, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5fd967eb-d70a-4f9d-bca4-1be1c622e095","blendMode":0,"displayName":"default","isLocked":false,"name":"5fd967eb-d70a-4f9d-bca4-1be1c622e095","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_ralsei_wave_down", + "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_down", + "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":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 00000000..900bee8d Binary files /dev/null and b/sprites/spr_ralsei_wave_start/8e9a682a-1f42-40ef-a08a-91b5ec7a292c.png differ diff --git a/sprites/spr_ralsei_wave_start/b42acab5-e651-465e-bac5-763cc0db2ff6.png b/sprites/spr_ralsei_wave_start/b42acab5-e651-465e-bac5-763cc0db2ff6.png new file mode 100644 index 00000000..46349187 Binary files /dev/null and b/sprites/spr_ralsei_wave_start/b42acab5-e651-465e-bac5-763cc0db2ff6.png differ 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 00000000..8fea8f8c Binary files /dev/null and b/sprites/spr_ralsei_wave_start/ebbf2240-5728-445e-96aa-6528e7cd6aff.png differ 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 00000000..900bee8d Binary files /dev/null and b/sprites/spr_ralsei_wave_start/layers/8e9a682a-1f42-40ef-a08a-91b5ec7a292c/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png differ diff --git a/sprites/spr_ralsei_wave_start/layers/b42acab5-e651-465e-bac5-763cc0db2ff6/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png b/sprites/spr_ralsei_wave_start/layers/b42acab5-e651-465e-bac5-763cc0db2ff6/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png new file mode 100644 index 00000000..46349187 Binary files /dev/null and b/sprites/spr_ralsei_wave_start/layers/b42acab5-e651-465e-bac5-763cc0db2ff6/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png differ 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 00000000..8fea8f8c Binary files /dev/null and b/sprites/spr_ralsei_wave_start/layers/ebbf2240-5728-445e-96aa-6528e7cd6aff/a0a508d4-7fe0-44b7-8840-e6f0c9ee1088.png differ 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