diff --git a/datafiles/thpj5_c3.txt b/datafiles/thpj5_c3.txt index 41b1988..f09e368 100644 --- a/datafiles/thpj5_c3.txt +++ b/datafiles/thpj5_c3.txt @@ -45,18 +45,6 @@ Kanoko Yasaka 7 0.5 -She looked around. It appeared to be an office,#with furniture hastily gathered.#Beside her, Suwako was in a similar bind,#seemingly frozen in place. -3 -0 -0 -2 -6 --0.5 -0 -0 -7 -0.5 - She looked around. It appeared to be an office,#with furniture hastily gathered.#Beside her, Suwako was in a similar bind,#seemingly frozen in place. 3 0 @@ -501,16 +489,4 @@ Sanae Kochiya 0 1 -Moriya's gods left the office, leaving Koishi#and her plans behind for the trip back home. -0 -0 -0 -2 -0 --1 -0 -0 -0 -1 - -(to be continued...) +Moriya's gods left the office, leaving Koishi#and her plans behind for the trip back home. \ No newline at end of file diff --git a/datafiles/thpj5_c4.txt b/datafiles/thpj5_c4.txt new file mode 100644 index 0000000..59fb71c --- /dev/null +++ b/datafiles/thpj5_c4.txt @@ -0,0 +1,816 @@ +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Sanae Kochiya +"Are we there yet?" +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Kanoko Yasaka +"No." +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Sanae Kochiya +"Are we there yet?" +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Kanoko Yasaka +"No." +4 +0 +0 +2 +3 +-1 +6 +-0.5 +7 +1 + +This had been going for the last 2 hours. +4 +0 +0 +2 +3 +-1 +6 +-0.5 +7 +1 + +Suwako groaned. +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Suwako Moriya +"Whose idea was it to walk anyway?!#We *are* able to fly, you know." +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Kanoko Yasaka +"Sanae's still tied up." +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Suwako Moriya +"Then untie her." +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Sanae Kochiya +"Actually this is kinda comfortable at this point." +4 +0 +0 +2 +3 +-1 +6 +-0.5 +7 +1 + +Kanoko shrugged, hefting the weight of Sanae in her chair. +4 +0 +0 +2 +3 +-1 +6 +-0.5 +7 +1 + +They all knew that they could just fly away. #They all knew that there was nothing stopping them. +4 +0 +0 +2 +3 +-1 +6 +-0.5 +7 +1 + +They didn't, though.#Even Suwako wasn't taking the initative to actually#lift off. They all just continued their leisurely pace#around the Misty Lake +4 +0 +0 +2 +3 +-1 +6 +-0.5 +7 +1 + +Kanoko sighed. +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Kanoko Yasaka +"It's a nice day out, but it feels... I don't know... heavy." +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Suwako Moriya +"The unthinking satori's magic is manipulation of#the subconscious, and I suspect we're being affected" +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Suwako Moriya +"I know she isn't doing this consciously. She#doesn't -- can't have -- intent beyond need or desire." +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Kanoko Yasaka +"Nothing beyond what her own subconscious gleaned.#Which says much more about us than about her." +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Suwako Moriya +"We cooperate without having to question each other.#We understand and work towards the same goals." +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Suwako Moriya +"We act out against each other to maintain a status quo.#We argue and fight despite our shared interests." +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Kanoko Yasaka +"And in the mean time, we ignore our priestess, who#gave up the world outside just to be around us." +4 +0 +0 +1 +3 +-1 +6 +-0.5 +7 +1 +Kanoko Yasaka +"We watch as she hurts herself just trying to keep up." +4 +0 +0 +2 +6 +-1 +0 +-0.5 +7 +1 + +They stopped in their tracks.#After a long silence, Suwako laughed. +4 +0 +0 +1 +6 +-1 +0 +-0.5 +7 +1 +Kanoko Yasaka +"What's so funny?" +4 +0 +0 +1 +6 +-1 +0 +-0.5 +7 +1 +Suwako Moriya +"Maybe we really *do* need therapy." +0 +0 +0 +0 +0 +-1 +0 +-0.5 +0 +1 + + +4 +0 +0 +2 +0 +-1 +1 +0 +0 +1 + +Koishi had been slowly floating across the lake#to find the geyser that led back to former Hell. +4 +0 +0 +2 +0 +-1 +1 +0 +0 +1 + +She felt aimless. Rather than find a blessing for Satori,#she managed to insult some of the most powerful#beings in Gensokyo with a plan that made#her look like a complete fool. +4 +0 +0 +2 +0 +-1 +1 +0 +0 +1 + +She looked up. In the distance, she saw raptors' wings. #The wings started increasing in size, #slowly at first, then much, much faster. +4 +0 +0 +1 +0 +-1 +0 +0 +0 +1 +? ? ? +"LOOK OUT BELOW!!!!!" +4 +0 +0 +2 +0 +-1 +0 +0 +0 +1 + +A large object shot into the water in front of Koishi,#causing a massive splash and a jet of steam from#the lake. In the distance, some fairies were#thrown ashore by the resulting waves. +4 +0 +0 +2 +0 +-1 +5 +0 +0 +1 + +Utsuho Reiuji spread her wings, splashing Koishi#with droplets of what water didn't instantly vaporize#from the radiating energy she possessed.#Koishi recognized her sister's pet bird instantly. +4 +0 +0 +2 +0 +-1 +4 +0 +0 +1 + +Her partner-in-crime, a cat named Rin Kaenbyou,#floated gently down to meet Koishi. She was carrying#caway some corpses that had recently passed. +4 +0 +0 +1 +1 +-1 +4 +0.5 +5 +1 +Utsuho Reiuji +"Hiiii~ We're just dropping by" +4 +0 +0 +1 +1 +-1 +5 +1 +4 +0.5 +Rin Kaenbyou +"In multiple ways." +4 +0 +0 +1 +1 +-1 +5 +1 +4 +0.5 +Koishi Komeiji +"Thanks for checking on me... I suppose Satori wants#me to get home soon so she could say 'told you so'." +4 +0 +0 +1 +1 +-1 +5 +1 +4 +0.5 +Rin Kaenbyou +"Actually... that's what we came here to talk about.#She actually wants to apologize to you." +4 +0 +0 +1 +1 +-1 +4 +0.5 +5 +1 +Utsuho Reiuji +"She's not feeling well so she couldn't come in person.#But she wants you to come back." +4 +0 +0 +1 +1 +-1 +5 +1 +4 +0.5 +Rin Kaenbyou +"She was mostly scuffed about you not remembering stuff well,#but she knows you can't control it." +4 +0 +0 +1 +1 +-1 +4 +0.5 +5 +1 +Koishi Komeiji +"I'm thankful, really. But I can't come back yet." +4 +0 +0 +1 +1 +-1 +5 +1 +4 +0.5 +Rin Kaenbyou +"You were headed that direction mya~" +4 +0 +0 +1 +1 +-1 +4 +0.5 +5 +1 +Koishi Komeiji +"Even if I do go home, I still can't remember things#on-demand. It just isn't possible even if she wishes it." +4 +0 +0 +1 +1 +-1 +4 +0.5 +5 +1 +Koishi Komeiji +"I can't let this happen again. I don't want to give her#the same reason to hate me in the future." +4 +0 +0 +1 +1 +-1 +4 +0.5 +5 +1 +Koishi Komeiji +"I need to find the gods of the mountain again and#apologize for my own trespasses into their lives." +4 +0 +0 +1 +1 +-1 +4 +0.5 +5 +1 +Koishi Komeiji +"I know I'm not trained to help them.#I just wanted to do something that would." +4 +0 +0 +1 +1 +-1 +4 +0.5 +5 +1 +Koishi Komeiji +"but talking to them made realize just how little I#actually can help..." +4 +0 +0 +2 +1 +-1 +5 +-0.25 +4 +1 + +Utsuho placed a hand on Koishi's shoulder. +4 +0 +0 +1 +1 +-1 +5 +-0.25 +4 +1 +Utusho Reiuji +"I'm not sure what's going on, but take us with you.#Be empowered by our presences." +4 +0 +0 +1 +1 +-1 +5 +-0.25 +4 +1 +Rin Kaenbyou +"We've got your back. Unless you die, then, y'know,#I'll just be giving you a ride." +4 +0 +0 +2 +1 +-1 +5 +-0.25 +4 +1 + +Koishi smiled, tears coming to her eyes. +4 +0 +0 +1 +1 +-1 +5 +-0.25 +4 +1 +Koishi Komeiji +"Thank you all. I'm sorry for all this trouble." +4 +0 +0 +2 +1 +-1 +5 +-0.25 +4 +1 + +The three sped across the lake.#Utsuho's crow eyes surveyed the landscape.#Hunting the snake that granted her power. +0 +0 +0 +0 +0 +-1 +0 +-0.5 +0 +1 + + +4 +0 +0 +2 +3 +-1 +7 +0.25 +0 +0 + +Sanae was slumbering in her chair.#Suwako was pacing back and forth, #digging a path in the grass#beside the Misty Lake's shore +4 +0 +0 +1 +3 +-1 +7 +0.75 +0 +0 +Suwako Moriya +"The proper thing to do would probably be to go back.#It'd be weird apologizing to our kidnapper though." +4 +0 +0 +2 +6 +-1 +7 +0.25 +0 +0 + +Kanoko was laying in the grass, basking in the sun. +4 +0 +0 +1 +6 +-1 +7 +0.75 +0 +0 +Kanoko Yasaka +"Would she even still be there? If she's headed home,#she'd be heading towards Youkai Mountain like us." +4 +0 +0 +1 +6 +-1 +7 +0.25 +0 +0 +Kanoko Yasaka +"Besides, you had mentioned the effects of her#personal magic. It'd be strong enough that she's close" +4 +0 +0 +0 +6 +-1 +7 +-0.5 +5 +-1.5 + + +4 +0 +0 +0 +6 +-1 +7 +-0.5 +5 +-0.5 + + +4 +0 +0 +0 +6 +-1 +7 +-0.5 +5 +0.5 + + +4 +0 +0 +0 +6 +-1 +7 +-0.5 +5 +1.5 + + +4 +0 +0 +2 +3 +-1 +0 +0 +4 +1 + +As if on queue, Utsuho dived in at full speed,#a blazing meteor dragging Rin and Koishi in tow.#The two landed and did a pose they had clearly practiced. +4 +0 +0 +2 +3 +-1 +5 +0 +4 +1 + +Utsuho swept upward, narrowly missing the forest, #and landed between Koishi and Rin, matching their#choreography with a powerful stance, #wings spread, arms folded,#and a bright, beaming smile on her face. +4 +0 +0 +1 +3 +-1 +5 +0 +4 +1 +Suwako Moriya +"Oh for the love of --" +4 +0 +0 +2 +0 +-1 +0 +0 +0 +1 + +A streak across the tops of the trees had ignited.#Suwako quickly extinguished it with#a splash of water from the lake. +4 +0 +0 +2 +0 +-1 +1 +0 +0 +1 + +Koishi stepped forward to meet the trio again,#the evaporating mist and the glow of Utsuho's#control rod creating a bright rainbow aura around her. +4 +0 +0 +1 +0 +-1 +1 +0 +0 +1 +Koishi Komeiji +"Everyone, I'm sorry. Thank you for waiting for me." \ No newline at end of file diff --git a/datafiles/thpj5_c5.txt b/datafiles/thpj5_c5.txt new file mode 100644 index 0000000..120bfca --- /dev/null +++ b/datafiles/thpj5_c5.txt @@ -0,0 +1,432 @@ +4 +0 +0 +2 +0 +-1 +3 +0 +0 +1 + +Sanae had just woken up from the noise#to the harsh scent of burned pine#and Koishi waving her arms,#in front of the powerful pets of Satori. +4 +0 +0 +1 +1 +-1 +0 +0 +3 +1 +Koishi Komeiji +"I know this experience has been a lot for all of us.#It wasn't a well thought out plan, I guess that's on me." +4 +0 +0 +1 +1 +-1 +0 +0 +3 +1 +Koishi Komeiji +"I'm sorry about kidnapping all of you. I'm sorry for subjecting#you to weird situations to get you to talk to each other." +4 +0 +0 +1 +1 +-1 +0 +0 +3 +1 +Koishi Komeiji +"I'm sorry for tying you all up like that" +4 +0 +0 +2 +1 +-1 +0 +0 +3 +1 + +Sanae struggled to move her arms,#tightly bound against the steel chair. +4 +0 +0 +1 +1 +-1 +0 +0 +3 +1 +Koishi Komeiji +"Which I should probably address." +4 +0 +0 +2 +1 +0 +0 +0 +3 +0.5 + +Koishi ran up to Sanae and untied her swiftly. #Sanae rubbed her arms where the ropes had chaffed her skin.#She then threw a punch at Koishi's arm, leaving a stinging welt. +4 +0 +0 +1 +1 +-0.5 +0 +0 +3 +0.5 +Sanae Kochiya +"That's for earlier. Please don't do that again." +4 +0 +0 +1 +1 +-0.5 +0 +0 +3 +0.5 +Koishi Komeiji +"I guess I kinda deserved that..." +4 +0 +0 +2 +1 +-0.5 +0 +0 +3 +0.5 + +Sanae smiled and gripped Koishi's hand in her own.#She stared directly into Koishi's eyes. +4 +0 +0 +1 +1 +-0.5 +0 +0 +3 +0.5 +Sanae Kochiya +"A bit of stimulus to train your subconscious." +4 +0 +0 +1 +1 +-0.5 +0 +0 +3 +0.5 +Sanae Kochiya +"You're not entirely to blame for this whole mess either.#You just go with what your emotions tell you." +4 +0 +0 +1 +1 +-0.5 +0 +0 +3 +0.5 +Sanae Kochiya +"If anything, I'm the one who wrote up the plan.#At least the broad strokes." +4 +0 +0 +1 +1 +-0.5 +0 +0 +3 +0.5 +Sanae Kochiya +"If there wasn't anything wrong, you wouldn't have#shown interest due to your nature." +4 +0 +0 +1 +1 +-0.5 +0 +0 +3 +0.5 +Sanae Kochiya +"I'm not sure what to do about the whole situation, though..." +4 +0 +0 +2 +6 +-0.75 +0 +0 +7 +0.75 + +Kanoko gave Suwako a knowing glance.#The two of them stepped up to the girls together. +4 +0 +0 +1 +6 +-0.75 +0 +0 +7 +0.75 +Kanoko Yasaka +"We're sorry too. We've been complete assholes lately." +4 +0 +0 +1 +6 +-0.75 +0 +0 +7 +0.75 +Suwako Moriya +"We've been posturing to maintain a story of ancient history,#when what we should have done is celebrated the present." +4 +0 +0 +1 +6 +-0.75 +0 +0 +7 +0.75 +Suwako Moriya +"What we have now is the ability to collaborate.#We should be working together to build our future." +4 +0 +0 +1 +6 +-0.75 +3 +0 +7 +0.75 +Kanoko Yasaka +"Sanae, we're truly sorry. We know this has all been#really hard on you. It isn't fair to you to keep you up like this." +4 +0 +0 +2 +6 +-0.25 +1 +0 +7 +0.25 + +Suwako and Kanoko hugged Koishi tightly. +4 +0 +0 +1 +6 +-0.75 +1 +0 +7 +0.75 +Suwako Moriya +"Koishi, thank you. You really did help us,#even if you don't really know how." +4 +0 +0 +2 +6 +-0.25 +1 +0 +7 +0.25 + +Koishi accepted the hug gratefully.#She then explained the situation about her sister.#She asked the gods what they could do.#They shook their heads when they realized#even they could not read her mind. +4 +0 +0 +2 +1 +-0.5 +0 +0 +3 +0.5 + +Sanae pulled a pocket camera out and took a picture,#She gave it to Koishi and showed her#a memory forever sealed in a plastic case. +4 +0 +0 +2 +1 +-0.5 +0 +0 +3 +0.5 + +Koishi took the object and let it infuse her with desire.#She let her consciousness into an electrical one.#She could use this device to access#that which no one could before +4 +0 +0 +2 +1 +-0.75 +2 +0 +3 +1 + +Satori floated down behind the group.#Koishi turned, noticing her presence. +4 +0 +0 +2 +1 +0.25 +2 +-0.25 +0 +0 + +The sisters hugged, crying and smiling.#Koishi lifted the camera and it took a photo#as bidden by her desire to capture the moment#she apologized to her sister. +4 +0 +0 +2 +1 +0.25 +2 +-0.25 +0 +0 + +The sisters hugged, crying and smiling.#Koishi lifted the camera and it took a photo#as bidden by her desire to capture the moment#she apologized to her sister. +2 +0 +0 +2 +0 +0 +0 +0 +0 +0 + +The pets, gods, and satori floated home#Outside of the Moriya shrine,#the gods had a party to celebrate#their renewed relationship iwth each other. +2 +0 +0 +2 +0 +0 +0 +0 +0 +0 + +Kanoko and Suwako danced in the moonlight#scheming with a knowing look in each other's eyes#as Sanae and the sisters partied the night away. +2 +0 +0 +2 +4 +-0.75 +0 +0 +5 +0.75 + +Rin and Utsuho sat on a bench next to each other,#snacking on the delicious foods the gods had made. +2 +0 +0 +1 +4 +-0.75 +0 +0 +5 +0.75 +Rin Kaenbyou +"I guess we really brought everything together mya~" +2 +0 +0 +1 +4 +-0.75 +0 +0 +5 +0.75 +Utsuho Reiuji +"I don't really know what happened, but I guess so" +2 +0 +0 +1 +4 +-0.75 +0 +0 +5 +0.75 +Utsuho Reiuji +"Everything turned out fine in the end,#and our mistresses are safe and happy." +2 +0 +0 +1 +4 +-0.75 +0 +0 +5 +0.75 +Rin Kaenbyou +"Yeah..." +2 +0 +0 +2 +4 +-0.5 +0 +0 +5 +0.5 + +The satori sisters' pets gently kissed in the moonlight. \ No newline at end of file diff --git a/fonts/fn_dialogue_names/fn_dialogue_names.yy b/fonts/fn_dialogue_names/fn_dialogue_names.yy index fe3dc90..7d07315 100644 --- a/fonts/fn_dialogue_names/fn_dialogue_names.yy +++ b/fonts/fn_dialogue_names/fn_dialogue_names.yy @@ -212,7 +212,7 @@ {"amount":-1,"first":121,"second":46,}, ], "last": 0, - "lineHeight": 21, + "lineHeight": 0, "maintainGms1Font": false, "parent": { "name": "fonts", diff --git a/fonts/fn_dialogue_text/fn_dialogue_text.yy b/fonts/fn_dialogue_text/fn_dialogue_text.yy index bb69b62..38e2d77 100644 --- a/fonts/fn_dialogue_text/fn_dialogue_text.yy +++ b/fonts/fn_dialogue_text/fn_dialogue_text.yy @@ -165,7 +165,7 @@ {"amount":-1,"first":121,"second":46,}, ], "last": 0, - "lineHeight": 18, + "lineHeight": 0, "maintainGms1Font": false, "parent": { "name": "fonts", diff --git a/objects/obj_dialogue/Step_0.gml b/objects/obj_dialogue/Step_0.gml index 8b5c1af..4ee8a89 100644 --- a/objects/obj_dialogue/Step_0.gml +++ b/objects/obj_dialogue/Step_0.gml @@ -51,10 +51,10 @@ if (global.dialogue_mode) { bg_sprite = spr_bg_therapy; break; } - case BG_TEST: { - bg_sprite = spr_bg_mistylake; - break; - } + case BG_MISTY_LAKE: { + bg_sprite = spr_bg_mistylake; + break; + } default: { bg_sprite = -1; diff --git a/objects/obj_ending/Draw_0.gml b/objects/obj_ending/Draw_0.gml index c03d8ed..7bbca42 100644 --- a/objects/obj_ending/Draw_0.gml +++ b/objects/obj_ending/Draw_0.gml @@ -3,7 +3,7 @@ draw_sprite_ext( spr_logo, 0, 320, 180, 4, 4, 0, c_white, min(0.1 * alpha_cycle, draw_set_halign( fa_center ); draw_set_font( fn_logo_large ); draw_text_color( 320, 30, "thank you for playing\n" - + "this is unfinished sorry i ran out of time\n" + + "sorry it took so long but we're finally here\n" , c_lime, c_green, c_lime, c_green, alpha_cycle); diff --git a/objects/obj_logo/Draw_0.gml b/objects/obj_logo/Draw_0.gml index bd2df4a..a8a9348 100644 --- a/objects/obj_logo/Draw_0.gml +++ b/objects/obj_logo/Draw_0.gml @@ -9,8 +9,8 @@ draw_text_color( 320, 30, "The following is a Touhou Project fan-game\n" draw_set_font( fn_logo_small ); draw_set_halign( fa_center ); -draw_text_color( 320, 230, "JAM RELEASE BUILD\n" - + "Touhou Pride Jam 5\n" +draw_text_color( 320, 230, "POST-JAM BUILD\n" + + "Originally created for Touhou Pride Jam 5\n" + "1 June 2023 ~ 14 June 2023", c_lime, c_green, c_lime, c_green, alpha_cycle); draw_set_halign( fa_right ); diff --git a/objects/obj_scene/Create_0.gml b/objects/obj_scene/Create_0.gml new file mode 100644 index 0000000..687663a --- /dev/null +++ b/objects/obj_scene/Create_0.gml @@ -0,0 +1 @@ +fade_in = 50; \ No newline at end of file diff --git a/objects/obj_scene/Other_4.gml b/objects/obj_scene/Other_4.gml index 701ed6a..ad819ad 100644 --- a/objects/obj_scene/Other_4.gml +++ b/objects/obj_scene/Other_4.gml @@ -39,16 +39,16 @@ if (!global.scene_mode && global.loaded_file[? SAVE_CHNUM] == SCENE_C3_THERAPY1) timeline_index = tml_scene_c3; timeline_running = true; } -if (!global.scene_mode && global.loaded_file[? SAVE_CHNUM] == SCENE_C4_RINPARK) { +if (!global.scene_mode && global.loaded_file[? SAVE_CHNUM] == SCENE_C4_LAKE) { global.scene_mode = true; - global.scene_number = SCENE_C4_RINPARK; + global.scene_number = SCENE_C4_LAKE; timeline_position = 0; timeline_index = tml_scene_c4; timeline_running = true; } -if (!global.scene_mode && global.loaded_file[? SAVE_CHNUM] == SCENE_C5_THERAPY2) { +if (!global.scene_mode && global.loaded_file[? SAVE_CHNUM] == SCENE_C5_SORRY) { global.scene_mode = true; - global.scene_number = SCENE_C5_THERAPY2; + global.scene_number = SCENE_C5_SORRY; timeline_position = 0; timeline_index = tml_scene_c5; timeline_running = true; diff --git a/objects/obj_scene/obj_scene.yy b/objects/obj_scene/obj_scene.yy index cc895a8..f27ed3d 100644 --- a/objects/obj_scene/obj_scene.yy +++ b/objects/obj_scene/obj_scene.yy @@ -7,6 +7,7 @@ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":5,"eventType":7,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, ], "managed": true, "overriddenProperties": [], diff --git a/objects/obj_title/Step_0.gml b/objects/obj_title/Step_0.gml index a308e11..1dab6a9 100644 --- a/objects/obj_title/Step_0.gml +++ b/objects/obj_title/Step_0.gml @@ -61,7 +61,7 @@ if (title_mode == TITLE_MODE_MENU_READY ) { scr_files_load_preview(); break; } - case TITLE_MENU_CHOICE_CG: { +/* case TITLE_MENU_CHOICE_CG: { title_switch_timer = MENU_TRANSITION; title_mode = TITLE_MODE_CG_FADEIN; break; @@ -72,6 +72,7 @@ if (title_mode == TITLE_MODE_MENU_READY ) { menu_wait = MENU_DELAY; break; } +*/ case TITLE_MENU_CHOICE_OPTIONS: { title_switch_timer = MENU_TRANSITION; title_mode = TITLE_MODE_OPTIONS_FADEIN; @@ -156,6 +157,7 @@ if ( title_mode == TITLE_MODE_FILES_READY ) { title_switch_timer = MENU_TRANSITION; title_mode = TITLE_MODE_FILES_FADEOUT; menu_wait = MENU_DELAY; + menu_position = 1; break; } default: { diff --git a/scripts/scr_initialize/scr_initialize.gml b/scripts/scr_initialize/scr_initialize.gml index 2bce3bc..f66f735 100644 --- a/scripts/scr_initialize/scr_initialize.gml +++ b/scripts/scr_initialize/scr_initialize.gml @@ -65,17 +65,17 @@ #macro MENU_OPTIONS 7 #macro MENU_EXIT 8 - #macro TITLE_MENU_CHOICES 5 + #macro TITLE_MENU_CHOICES 3 #macro TITLE_MENU_TEXT_FILES "Start Game" - #macro TITLE_MENU_TEXT_CG "Gallery" - #macro TITLE_MENU_TEXT_MUSIC "Music Room" +// #macro TITLE_MENU_TEXT_CG "Gallery" +// #macro TITLE_MENU_TEXT_MUSIC "Music Room" #macro TITLE_MENU_TEXT_OPTIONS "Options" #macro TITLE_MENU_TEXT_EXIT_GAME "Exit" #macro TITLE_MENU_CHOICE_FILES 1 - #macro TITLE_MENU_CHOICE_CG 2 - #macro TITLE_MENU_CHOICE_MUSIC 3 - #macro TITLE_MENU_CHOICE_OPTIONS 4 - #macro TITLE_MENU_CHOICE_EXIT_GAME 5 +// #macro TITLE_MENU_CHOICE_CG 2 +// #macro TITLE_MENU_CHOICE_MUSIC 3 + #macro TITLE_MENU_CHOICE_OPTIONS 2 + #macro TITLE_MENU_CHOICE_EXIT_GAME 3 #macro LOAD_MENU_CHOICES 5 #macro LOAD_CHOICE_FILE_A 1 @@ -160,6 +160,7 @@ #macro OPTIONS_MENU_CHOICES 4 #macro OPTIONS_MENU_CHOICE_FULLSCREEN 1 +// #macro OPTIONS_MENU_CHOICE_TYPEWRITER 2 #macro OPTIONS_MENU_CHOICE_DEFAULTS 2 #macro OPTIONS_MENU_CHOICE_SAVE 3 #macro OPTIONS_MENU_CHOICE_DISCARD 4 @@ -227,14 +228,14 @@ #macro TALK_SUWAKO 7 //scene - #macro SCENE_TOTAL 3 + #macro SCENE_TOTAL 5 #macro SCENE_TEST -1 #macro SCENE_NOSCENE 0 #macro SCENE_C1_SISMAD 1 #macro SCENE_C2_SHRINEMAD 2 #macro SCENE_C3_THERAPY1 3 - #macro SCENE_C4_RINPARK 4 - #macro SCENE_C5_THERAPY2 5 + #macro SCENE_C4_LAKE 4 + #macro SCENE_C5_SORRY 5 #macro SCENE_C6_SISSORRY 6 diff --git a/scripts/scr_menu_draw/scr_menu_draw.gml b/scripts/scr_menu_draw/scr_menu_draw.gml index 38f78a7..08a54cb 100644 --- a/scripts/scr_menu_draw/scr_menu_draw.gml +++ b/scripts/scr_menu_draw/scr_menu_draw.gml @@ -34,12 +34,14 @@ function scr_menu_draw( _menu, _t, _pos) { //implemented menu functions: draw_text_ext_transformed_color_border( 580 + (3 * TITLE_MENU_CHOICE_FILES ), 90 + (30 * TITLE_MENU_CHOICE_FILES ), TITLE_MENU_TEXT_FILES ,15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_dkgray); //1 // draw_text_ext_transformed_color_border( 580 + (3 * TITLE_MENU_CHOICE_CG ), 90 + (30 * TITLE_MENU_CHOICE_CG ), TITLE_MENU_TEXT_CG ,15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_dkgray); //2 - draw_text_ext_transformed_color_border( 580 + (3 * TITLE_MENU_CHOICE_MUSIC ), 90 + (30 * TITLE_MENU_CHOICE_MUSIC ), TITLE_MENU_TEXT_MUSIC ,15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_dkgray); //3 +// draw_text_ext_transformed_color_border( 580 + (3 * TITLE_MENU_CHOICE_MUSIC ), 90 + (30 * TITLE_MENU_CHOICE_MUSIC ), TITLE_MENU_TEXT_MUSIC ,15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_dkgray); //3 draw_text_ext_transformed_color_border( 580 + (3 * TITLE_MENU_CHOICE_OPTIONS ), 90 + (30 * TITLE_MENU_CHOICE_OPTIONS ), TITLE_MENU_TEXT_OPTIONS ,15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_dkgray); //4 draw_text_ext_transformed_color_border( 580 + (3 * TITLE_MENU_CHOICE_EXIT_GAME ), 90 + (30 * TITLE_MENU_CHOICE_EXIT_GAME ), TITLE_MENU_TEXT_EXIT_GAME ,15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_dkgray); //5 //unimplemented menu functions: - draw_text_ext_transformed_color_border( 580 + (3 * TITLE_MENU_CHOICE_CG ), 90 + (30 * TITLE_MENU_CHOICE_CG ), TITLE_MENU_TEXT_CG ,15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_gray); //2 - +// draw_text_ext_transformed_color_border( 580 + (3 * TITLE_MENU_CHOICE_CG ), 90 + (30 * TITLE_MENU_CHOICE_CG ), TITLE_MENU_TEXT_CG ,15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_gray); //2 +// draw_text_ext_transformed_color_border( 580 + (3 * TITLE_MENU_CHOICE_MUSIC ), 90 + (30 * TITLE_MENU_CHOICE_MUSIC ), TITLE_MENU_TEXT_MUSIC ,15, 1000, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_dkgray); //3 + + draw_set_font(fn_menu_help); draw_set_halign(fa_left); draw_text_ext_transformed_color_border( 5, 345, "up/down: choose, Z: select", 9, 620, 1, 1, 0, c_silver, c_silver, c_white, c_white, 1, 1, c_dkgray); diff --git a/sprites/spr_title/52ec7187-33fc-4396-a2f4-68f921271ef2.png b/sprites/spr_title/52ec7187-33fc-4396-a2f4-68f921271ef2.png index 36780af..babdfac 100644 Binary files a/sprites/spr_title/52ec7187-33fc-4396-a2f4-68f921271ef2.png and b/sprites/spr_title/52ec7187-33fc-4396-a2f4-68f921271ef2.png differ diff --git a/sprites/spr_title/layers/52ec7187-33fc-4396-a2f4-68f921271ef2/1da2cfb1-5a48-49a4-8beb-deaa39a84cbd.png b/sprites/spr_title/layers/52ec7187-33fc-4396-a2f4-68f921271ef2/1da2cfb1-5a48-49a4-8beb-deaa39a84cbd.png index 36780af..babdfac 100644 Binary files a/sprites/spr_title/layers/52ec7187-33fc-4396-a2f4-68f921271ef2/1da2cfb1-5a48-49a4-8beb-deaa39a84cbd.png and b/sprites/spr_title/layers/52ec7187-33fc-4396-a2f4-68f921271ef2/1da2cfb1-5a48-49a4-8beb-deaa39a84cbd.png differ diff --git a/thpj5.yyp b/thpj5.yyp index 48de321..878ba74 100644 --- a/thpj5.yyp +++ b/thpj5.yyp @@ -22,12 +22,14 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"thpj5_c1.txt","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"thpj5_c2.txt","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"thpj5_c3.txt","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"thpj5_c4.txt","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"thpj5_c5.txt","CopyToMask":-1,"filePath":"datafiles",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"thpj5_test.txt","CopyToMask":-1,"filePath":"datafiles",}, ], "isEcma": false, "LibraryEmitters": [], "MetaData": { - "IDEVersion": "2023.600.0.351", + "IDEVersion": "2023.600.0.368", }, "resources": [ {"id":{"name":"tml_scene_test","path":"timelines/tml_scene_test/tml_scene_test.yy",},}, diff --git a/timelines/tml_scene_c4/moment_2.gml b/timelines/tml_scene_c4/moment_2.gml index a46c03c..96df8ec 100644 --- a/timelines/tml_scene_c4/moment_2.gml +++ b/timelines/tml_scene_c4/moment_2.gml @@ -1 +1 @@ -scr_dialogue_start("thpj5_test.txt"); \ No newline at end of file +scr_dialogue_start("thpj5_c4.txt"); \ No newline at end of file diff --git a/timelines/tml_scene_c5/moment_2.gml b/timelines/tml_scene_c5/moment_2.gml index a46c03c..f84f5de 100644 --- a/timelines/tml_scene_c5/moment_2.gml +++ b/timelines/tml_scene_c5/moment_2.gml @@ -1 +1 @@ -scr_dialogue_start("thpj5_test.txt"); \ No newline at end of file +scr_dialogue_start("thpj5_c5.txt"); \ No newline at end of file