From 228c74d7fc8f6dd8892de59af87514c40e26e1f9 Mon Sep 17 00:00:00 2001 From: Jennifer Hogueison Date: Thu, 23 Jun 2022 01:47:13 -0700 Subject: [PATCH] cutscene dialogue --- datafiles/cutscene_boss_1.txt | 78 +++++++++++++++++++++++++++++ datafiles/cutscene_boss_2.txt | 12 +++++ datafiles/cutscene_boss_3.txt | 6 +++ datafiles/cutscene_midboss_1.txt | 24 +++++++++ datafiles/cutscene_midboss_2.txt | 24 +++++++++ datafiles/cutscene_midboss_3.txt | 36 +++++++++++++ datafiles/cutscene_opening_2.txt | 6 +++ objects/obj_enemy_parent/Step_0.gml | 6 ++- objects/obj_marisa/Step_0.gml | 64 +++++++++++++---------- rooms/rm_game/rm_game.yy | 2 +- sunflowers-in-the-rain.yyp | 6 +++ 11 files changed, 234 insertions(+), 30 deletions(-) create mode 100644 datafiles/cutscene_boss_1.txt create mode 100644 datafiles/cutscene_boss_2.txt create mode 100644 datafiles/cutscene_boss_3.txt create mode 100644 datafiles/cutscene_midboss_1.txt create mode 100644 datafiles/cutscene_midboss_2.txt create mode 100644 datafiles/cutscene_midboss_3.txt diff --git a/datafiles/cutscene_boss_1.txt b/datafiles/cutscene_boss_1.txt new file mode 100644 index 0000000..f504d2c --- /dev/null +++ b/datafiles/cutscene_boss_1.txt @@ -0,0 +1,78 @@ +1 +0 +noname +1 +Yuuka +At last, my plan has come to fruition! +0 +4 +Marisa +1 +Yuuka +Yuuka! I finally found you! Stop this madness at once! +1 +4 +Marisa +1 +Yuuka +Oh, Marisa, sweet Marisa. You don't know where you #are, do you? +1 +3 +Marisa +0 +Yuuka +I knew you'd come here eventually. I knew you'd follow #me. You witnessed my true power, after all. +0 +3 +Marisa +0 +Yuuka +I don't remember coming here, though. This isn't a #place I've ever been. +1 +3 +Marisa +4 +Yuuka +Correct. You, instead, infiltrated my dreams, #prying my mind for the secrets I hold. +0 +0 +Marisa +4 +Yuuka +I remember being tired after our fight, so I took #a nap. I actually didn't intend to intrude. +1 +0 +Marisa +1 +Yuuka +You're here now. The circumstances are irrelevant #if the result is the same. +0 +4 +Marisa +1 +Yuuka +So you're going to be mad at me no matter what my #intentions are? That's pretty cold of you. +1 +4 +Marisa +1 +Yuuka +I'm not mad at you. I'm actually happy you're here. #I wanted a private chat with you anyway. +1 +0 +Marisa +0 +Yuuka +I had intended to pass my most powerful technique #on to whoever could withstand its a w e s o m e power. +0 +1 +Marisa +0 +Yuuka +I'm listening. +1 +1 +Marisa +1 +Yuuka +Good, because I won't be repeating myself. #It's a date, after all. It'd ruin the flow. diff --git a/datafiles/cutscene_boss_2.txt b/datafiles/cutscene_boss_2.txt new file mode 100644 index 0000000..adb64c5 --- /dev/null +++ b/datafiles/cutscene_boss_2.txt @@ -0,0 +1,12 @@ +1 +0 +noname +0 +Yuuka +*ahem* Let us begin. +1 +0 +noname +0 +Yuuka +Laser... diff --git a/datafiles/cutscene_boss_3.txt b/datafiles/cutscene_boss_3.txt new file mode 100644 index 0000000..8e56a6b --- /dev/null +++ b/datafiles/cutscene_boss_3.txt @@ -0,0 +1,6 @@ +1 +0 +noname +0 +Yuuka +...is not difficult. diff --git a/datafiles/cutscene_midboss_1.txt b/datafiles/cutscene_midboss_1.txt new file mode 100644 index 0000000..6766d6a --- /dev/null +++ b/datafiles/cutscene_midboss_1.txt @@ -0,0 +1,24 @@ +0 +4 +Marisa +0 +noname +Yuuka! I know that's you! Is this another of your tricks? +1 +4 +Marisa +0 +Wriggle +I, uh, am flattered? Lady Yuuka isn't here right now, though. +1 +4 +Marisa +3 +Wriggle +Wait, have I met you before? +0 +3 +Marisa +3 +Wriggle +I, um... don't believe so? I get the feeling it'd be inevitable #at some point, though. diff --git a/datafiles/cutscene_midboss_2.txt b/datafiles/cutscene_midboss_2.txt new file mode 100644 index 0000000..83f6019 --- /dev/null +++ b/datafiles/cutscene_midboss_2.txt @@ -0,0 +1,24 @@ +0 +4 +Marisa +3 +Wriggle +Anyway, don't get me sidetracked! I know I saw her! +1 +4 +Marisa +0 +Wriggle +You mean the shadows? They won't do anything to you, don't #worry. They're just, like, files. +0 +3 +Marisa +0 +Wriggle +Files? You mean, like, philosophically? +1 +3 +Marisa +1 +Wriggle +Perhaps. Or perhaps literally. I've seen the rust they're #etched into, after all. diff --git a/datafiles/cutscene_midboss_3.txt b/datafiles/cutscene_midboss_3.txt new file mode 100644 index 0000000..b42ad54 --- /dev/null +++ b/datafiles/cutscene_midboss_3.txt @@ -0,0 +1,36 @@ +0 +1 +Marisa +1 +Wriggle +I could just ignore you and take that side-path, you know. +1 +1 +Marisa +1 +Wriggle +And miss all this wonderful banter? What a fate, indeed! +1 +1 +Marisa +0 +Wriggle +Road's blocked anyway. No one can pass without me exploding. +0 +1 +Marisa +1 +Wriggle +You seem like you know where she would be anyway. Wanna let #poor ol' me in on the secret? +0 +1 +Marisa +1 +Wriggle +'Cause I'll get it out of you one way or another! +1 +1 +Marisa +1 +Wriggle +It's a date! diff --git a/datafiles/cutscene_opening_2.txt b/datafiles/cutscene_opening_2.txt index 5597cf0..8154b6f 100644 --- a/datafiles/cutscene_opening_2.txt +++ b/datafiles/cutscene_opening_2.txt @@ -16,3 +16,9 @@ Marisa 0 ___ Are you enjoying yourself, my dear? +0 +3 +Marisa +0 +___ +Wait, is that... diff --git a/objects/obj_enemy_parent/Step_0.gml b/objects/obj_enemy_parent/Step_0.gml index f084f0a..d692044 100644 --- a/objects/obj_enemy_parent/Step_0.gml +++ b/objects/obj_enemy_parent/Step_0.gml @@ -1,2 +1,4 @@ -image_index = direction / 45; - +image_index = (direction + 22.5) / 45; +if (direction + 22.5 >= 360 ) { + image_index = 0; +} diff --git a/objects/obj_marisa/Step_0.gml b/objects/obj_marisa/Step_0.gml index 245b36a..0dcd37d 100644 --- a/objects/obj_marisa/Step_0.gml +++ b/objects/obj_marisa/Step_0.gml @@ -14,7 +14,10 @@ if (left && right ) { right = false; } -image_index = direction / 45; +image_index = (direction + 22.5) / 45; +if (direction + 22.5 >= 360 ) { + image_index = 0; +} if (!global.cutscene_mode) { if ( up || down || left || right ) { move = true; @@ -90,6 +93,22 @@ if (!global.cutscene_mode) { } } +if ( !move ) { + target_speed = 0; + if ( dspeed > target_speed ) { + dspeed -= 1; + } else { + dspeed = target_speed; + } +} + +if (!place_meeting( x + lengthdir_x( dspeed, direction ), y, obj_wall ) ) { + x += lengthdir_x( dspeed, direction ); +} +if (!place_meeting( x, y + lengthdir_y( dspeed, direction ), obj_wall ) ) { + y += lengthdir_y( dspeed, direction ); +} + if ( global.cutscene_mode ) { switch (global.cutscene_number) { case CUTSCENE_OPENING: { @@ -116,35 +135,26 @@ if ( global.cutscene_mode ) { } break; } + case CUTSCENE_MIDBOSS: { + if (cutscene_mover) { + move_towards_point( 2272, 928, 2 ); + if (x > 2271 && x < 2273 && y > 927 && y < 929 ) { + cutscene_mover = false; + speed = 0; + direction = 90; + } + } + break; + } + case CUTSCENE_BOSS: { + break; + } + case CUTSCENE_FINAL: { + break; + } default: { break; } } } - - - -if ( !move ) { - target_speed = 0; - if ( dspeed > target_speed ) { - dspeed -= 1; - } else { - dspeed = target_speed; - } -} - -if (!place_meeting( x + lengthdir_x( dspeed, direction ), y, obj_wall ) ) { - x += lengthdir_x( dspeed, direction ); -} -if (!place_meeting( x, y + lengthdir_y( dspeed, direction ), obj_wall ) ) { - y += lengthdir_y( dspeed, direction ); -} - - - - - - - - diff --git a/rooms/rm_game/rm_game.yy b/rooms/rm_game/rm_game.yy index 18ed83b..3ed2761 100644 --- a/rooms/rm_game/rm_game.yy +++ b/rooms/rm_game/rm_game.yy @@ -50,7 +50,7 @@ {"properties":[],"isDnd":false,"objectId":{"name":"obj_spawnzone_E","path":"objects/obj_spawnzone_E/obj_spawnzone_E.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":0.5,"scaleY":11.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":1248.0,"y":1344.0,"resourceVersion":"1.0","name":"inst_33344064","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"obj_camera","path":"objects/obj_camera/obj_camera.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":576.0,"y":2592.0,"resourceVersion":"1.0","name":"inst_5C9EE61E","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"obj_cutscene_camera","path":"objects/obj_cutscene_camera/obj_cutscene_camera.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":1440.0,"y":2464.0,"resourceVersion":"1.0","name":"inst_51F4A4FF","tags":[],"resourceType":"GMRInstance",}, - {"properties":[],"isDnd":false,"objectId":{"name":"obj_cutscene_camera","path":"objects/obj_cutscene_camera/obj_cutscene_camera.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":2368.0,"y":992.0,"resourceVersion":"1.0","name":"inst_79135D0A","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_cutscene_camera","path":"objects/obj_cutscene_camera/obj_cutscene_camera.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":2272.0,"y":832.0,"resourceVersion":"1.0","name":"inst_79135D0A","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"obj_cutscene_camera","path":"objects/obj_cutscene_camera/obj_cutscene_camera.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":736.0,"y":992.0,"resourceVersion":"1.0","name":"inst_575192DA","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"obj_gate","path":"objects/obj_gate/obj_gate.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":2.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":512.0,"y":2624.0,"resourceVersion":"1.0","name":"inst_52AB679A","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"obj_gate","path":"objects/obj_gate/obj_gate.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":3.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":1088.0,"y":2368.0,"resourceVersion":"1.0","name":"inst_338BF964","tags":[],"resourceType":"GMRInstance",}, diff --git a/sunflowers-in-the-rain.yyp b/sunflowers-in-the-rain.yyp index 1dd8fb6..a088e59 100644 --- a/sunflowers-in-the-rain.yyp +++ b/sunflowers-in-the-rain.yyp @@ -144,6 +144,12 @@ "IncludedFiles": [ {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"cutscene_opening_1.txt","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"cutscene_opening_2.txt","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"cutscene_midboss_1.txt","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"cutscene_midboss_2.txt","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"cutscene_midboss_3.txt","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"cutscene_boss_1.txt","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"cutscene_boss_2.txt","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"cutscene_boss_3.txt","resourceType":"GMIncludedFile",}, ], "MetaData": { "IDEVersion": "2022.300.0.499",