diff --git a/src/dialog/marisa.c b/src/dialog/marisa.c index b6590adc..2a666006 100644 --- a/src/dialog/marisa.c +++ b/src/dialog/marisa.c @@ -24,10 +24,8 @@ DIALOG_TASK(marisa, Stage1PreBoss) { FACE(marisa, puzzled); MSG(marisa, "Aw, snow again? I just put away my winter coat."); - MSG(cirno, "Nice, right?"); EVENT(boss_appears); - WAIT(30); - WAIT_SKIPPABLE(60); + MSG_UNSKIPPABLE(cirno, 180, "Nice, right?"); SHOW(cirno); FACE(cirno, normal); @@ -209,7 +207,7 @@ DIALOG_TASK(marisa, Stage3PostBoss) { MSG(wriggle, "It was in the age of Car—… Carb—… the age of Carbs!"); FACE(marisa, puzzled); - MSG(marisa, "’Glorious insect past’? ’Carbs’?"); + MSG(marisa, "‘Glorious insect past’? ‘Carbs’?"); FACE(marisa, normal); MSG(marisa, "Oh, ya must mean the Carboniferous Period. With the giant bugs and all that."); MSG(marisa, "I remember that doctor in the bamboo forest goin’ off about it once."); @@ -254,6 +252,7 @@ DIALOG_TASK(marisa, Stage4PreBoss) { MSG(kurumi, "But that theme is so overdone…"); FACE(kurumi, normal); MSG(kurumi, "What’s next? A maid?"); + FACE(marisa, normal); MSG(kurumi, "A little girl with almost no dialogue who becomes a fan-favourite anyways?"); MSG(kurumi, "How about one that’ll have her personality massacred by the fans?"); @@ -292,22 +291,24 @@ DIALOG_TASK(marisa, Stage4PreBoss) { FACE(kurumi, tsun_blush); MSG(kurumi, "H-Hmph! I could say the same about you!"); + FACE(kurumi, normal); MSG(kurumi, "Seriously, it’s just a plain generic witch outfit!"); FACE(marisa, normal); MSG(marisa, "My petticoats are legendary, y’know."); FACE(marisa, happy); - MSG(marisa, "Girls across Gensōkyō talk about ’em."); + MSG(marisa, "Girls across Gensōkyō talk about ‘em."); FACE(marisa, normal); - MSG(marisa, "In fact, there’s a few of ’em, uh, deeper inside this mansion."); + MSG(marisa, "In fact, there’s a few of ‘em, uh, deeper inside this mansion."); FACE(marisa, happy); MSG(marisa, "So I’ll be headin’ in, then."); EVENT(music_changes); + FACE(kurumi, tsun); MSG(kurumi, "Oh, I’m not letting you go without a fight!"); + FACE(kurumi, normal); MSG(kurumi, "Let’s see who’s the most fashionable here, witch!"); - DIALOG_END(); } @@ -337,14 +338,16 @@ DIALOG_TASK(marisa, Stage4PostBoss) { FACE(kurumi, normal); MSG(kurumi, "Uh, I kinda doubt that…"); FACE(kurumi, defeated); - MSG(kurumi, "Uuu—… the residents of this Gensōkyō were supposed to be kept ’occupied’!"); + FACE(marisa, normal); + MSG(kurumi, "Uuu—… the residents of this Gensōkyō were supposed to be kept ‘occupied’!"); MSG(kurumi, "I didn’t sign up to get beaten like this!"); MSG(kurumi, "Then gain, I was acting pretty weird, too…"); MSG(kurumi, "Oh no, was it getting to me too?!"); FACE(marisa, puzzled); - MSG(marisa, "’It’? Y’mean the madness everyone’s experiencin’?"); + MSG(marisa, "‘It’? Y’mean the madness everyone’s experiencin’?"); + FACE(kurumi, tsun_blush); MSG(kurumi, "N-Nevermind!"); DIALOG_END(); @@ -361,8 +364,7 @@ DIALOG_TASK(marisa, Stage5PreBoss) { ACTOR_RIGHT(iku); HIDE(iku); - //FACE(marisa, inquisitive); - FACE(marisa, surprised); + FACE(marisa, inquisitive); MSG(marisa, "This place is fascinatin’! Is this space-time magic?"); MSG(marisa, "What kinda energy source would they even use for this?"); MSG(marisa, "I gotta tell Patchy!"); @@ -386,7 +388,7 @@ DIALOG_TASK(marisa, Stage5PreBoss) { MSG(iku, "Would that be your theory about this tower, perhaps?"); MSG(marisa, "It’d make sense though, right?"); - //FACE(marisa, inquisitive); + FACE(marisa, inquisitive); MSG(marisa, "It appeared outta nowhere. If it were real brick, the air displacement alone woulda caused a huge noise…"); MSG(marisa, "And it’d take so much power, too."); FACE(marisa, smug); @@ -394,15 +396,17 @@ DIALOG_TASK(marisa, Stage5PreBoss) { MSG(iku, "I feel as though you are underestimating her."); FACE(iku, eyes_closed); + FACE(marisa, normal); MSG(iku, "This tower is affecting people mentally, after all."); MSG(iku, "The technology on display here is beyond our current comprehension."); FACE(marisa, surprised); - MSG(marisa, "Whoa, so ’yer sayin’ this is REAL brick?!"); + MSG(marisa, "Whoa, so ‘yer sayin’ this is REAL brick?!"); FACE(marisa, normal); MSG(marisa, "*tap tap*"); FACE(marisa, surprised); MSG(marisa, "Dang, it’s so cold it’s almost creepy, like it was suckin’ magic right outta my fingers."); + FACE(marisa, inquisitive); MSG(marisa, "But that means the tower… has corporeal form?!"); MSG(marisa, "Dang! Now I GOTTA meet the owner!"); MSG(marisa, "What grimoires does she got to pull somethin’ like this off?!"); @@ -412,7 +416,6 @@ DIALOG_TASK(marisa, Stage5PreBoss) { FACE(iku, serious); MSG(iku, "She is relying on complex machinery from another world entirely."); - //FACE(marisa, inquisitive); MSG(marisa, "But then, what’s the power source?"); MSG(marisa, "Not even fusion could power somethin’ like this!"); @@ -425,29 +428,32 @@ DIALOG_TASK(marisa, Stage5PreBoss) { FACE(iku, normal); MSG(iku, "You mean… the owner?"); + FACE(marisa, inquisitive); MSG(marisa, "Yeah! Upstairs, right?"); FACE(iku, serious); MSG(iku, "You are clearly affected by these surroundings. I should not divulge any further information."); - FACE(marisa, normal); + FACE(marisa, happy); MSG(marisa, "What’s her name?"); MSG(iku, "Why are you not listening to me? You are clearly not thinking straight!"); - //FACE(marisa, inquisitive); + FACE(marisa, inquisitive); MSG(marisa, "Do ya got any tips on talkin’ to her, maybe make her loosen up a bit?"); FACE(marisa, happy); MSG(marisa, "I don’t wanna blow my chance."); + FACE(iku, smile); MSG(iku, "I am trying to spare your mind, yet all you can do is talk over me. Be more considerate."); MSG(iku, "I had expectations that you would be able to think clearly and resolve this incident, but it seems—"); FACE(marisa, normal); MSG(marisa, "Ah, ah, I see. I’ll have to turn on the ol’ Kirisame charm."); FACE(marisa, smug); + FACE(iku, serious); MSG(marisa, "I get it."); - MSG(marisa, "Haven’t done ’femme fatale’ in a while, but…"); + MSG(marisa, "Haven’t done ‘femme fatale’ in a while, but…"); EVENT(music_changes); @@ -464,7 +470,7 @@ DIALOG_TASK(marisa, Stage5PostMidBoss) { ACTOR_LEFT(marisa); FACE(marisa, surprised); - // should be only one message with a fixed 120-frames timeout + // should be only one message with a fixed 180-frames timeout MSG_UNSKIPPABLE(marisa, 180, "So this place runs on electricity, eh? Hmm…"); DIALOG_END(); @@ -483,20 +489,25 @@ DIALOG_TASK(marisa, Stage5PostBoss) { FACE(marisa, happy); MSG(marisa, "For my big first impression and all."); - MSG(iku, "For the last time, she’ll have nothing to teach you…"); + FACE(iku, eyes_closed); + MSG(iku, "F-For the last time, she’ll have nothing to teach you…"); MSG(iku, "Her powers rely on technology, and the scientific method. Of that much I am sure."); FACE(marisa, unamused); MSG(marisa, "The one time Sanae’s not around to translate all the sciencey stuff, eh?"); + FACE(iku, normal); FACE(marisa, normal); MSG(marisa, "Ah well, I know how to operate one of those Intelligent Phones so I should be fine."); + FACE(marisa, inquisitive); MSG(marisa, "By the way, have ya been hearing that strange voice?"); MSG(iku, "Strange voice?"); FACE(marisa, smug); MSG(marisa, "Yeah, it keeps tellin’ me that I’m not thinkin’ straight or whatever."); + FACE(marisa, happy); MSG(marisa, "But I feel just fine!"); + FACE(marisa, normal); MSG(marisa, "Probably just those weird madness rays tryin’ to get to me."); FACE(iku, eyes_closed); @@ -528,35 +539,37 @@ DIALOG_TASK(marisa, Stage6PreBoss) { FACE(marisa, unamused); MSG(marisa, "Hmm…"); - //FACE(elly, smug); - FACE(elly, angry); - MSG(elly, "Did you really think I wouldn’t notice all the commotion you caused inside the tower?!"); + FACE(elly, smug); + MSG(elly, "Did you really think I wouldn’t notice all the commotion you caused inside the tower?"); MSG(marisa, "Hmmmmmmm…"); + FACE(elly, angry); MSG(elly, "Stop being an insolent brat and speak up!"); + FACE(marisa, unamused); MSG(marisa, "… sigh."); FACE(elly, normal); MSG(elly, "… w-what is it?"); + FACE(marisa, unamused); MSG(marisa, "Y’don’t look like a magician after all."); MSG(marisa, "I’m pretty disappointed."); MSG(marisa, "Honestly, this might be the most disappointing incident yet."); TITLE(elly, "Elly", "The Theoretical Reaper"); MSG(elly, "You’re seeking after… magic?"); - //FACE(elly, smug); - FACE(elly, angry); + FACE(elly, smug); MSG(elly, "Hah! You’ll regret wasting your time on such nonsense when you become truly enlightened."); MSG(elly, "Through this, we will avenge all those who have been forgotten by the—"); MSG(marisa, "Do ya know how boring it is to be a magician in Gensōkyō these days?"); + FACE(elly, eyes_closed); MSG(elly, "I couldn’t possibly care about—"); - MSG(marisa, "Seriously! Recently it’s just been ’God this’ and ’Otherworld that’."); + MSG(marisa, "Seriously! Recently it’s just been ‘God this’ and ‘Otherworld that’."); MSG(marisa, "Reimu’s been pickin’ up some sweet skills, but me? Nothin’!"); MSG(marisa, "Gods use magic too, but they’re like her! They don’t need books!"); MSG(marisa, "But I do! So I end up empty handed, every dang time."); @@ -564,14 +577,18 @@ DIALOG_TASK(marisa, Stage6PreBoss) { FACE(elly, angry); MSG(elly, "I SAID I don’t CARE about your stupid little magi—"); - MSG(marisa, "I saw this place and I was all, ’Whoa! Is this all enchantments and stuff?!’"); + MSG(marisa, "I saw this place and I was all, ‘Whoa! Is this all enchantments and stuff?!’"); + FACE(marisa, inquisitive); MSG(marisa, "I got really excited!"); - MSG(marisa, "’Maybe I could get a new trump-card outta this!’ is what I thought."); - MSG(marisa, "But obviously ’yer a shinigami or somethin’. And I didn’t see a library…"); + MSG(marisa, "‘Maybe I could get a new trump-card outta this!’ is what I thought."); + FACE(marisa, unamused); + MSG(marisa, "But obviously ‘yer a shinigami or somethin’. And I didn’t see a library…"); MSG(marisa, "Master Spark’s good and all, but it’ll only get me so far in life…"); + FACE(elly, eyes_closed); MSG(elly, "…"); MSG(elly, "Are you finally done?"); + FACE(elly, angry); MSG(elly, "Is this some kind of joke?!"); FACE(elly, shouting); MSG(elly, "Are you just trying to mock me like you did the first time we met?!"); @@ -579,12 +596,12 @@ DIALOG_TASK(marisa, Stage6PreBoss) { MSG(marisa, "At least that time y’were guardin’ some powerful magic thingy I coulda used."); MSG(marisa, "I can’t remember, was that time a bust, too?"); FACE(marisa, happy); - MSG(marisa, "At least I met Yūka. Did ya know she ended up givin’ me my trademark spell?"); + MSG(marisa, "At least I met Yūka, right? Did ya know she ended up givin’ me my trademark spell?"); MSG(marisa, "Not right then, and not voluntarily, but—"); FACE(elly, angry); MSG(elly, "Y-you remember that?! But how—?!"); - //FACE(elly, smug); + FACE(elly, smug); MSG(elly, "… nevermind. It’s not as if you could possibly grasp the true power of this place."); MSG(elly, "I can already sense your feeble mind succumbing to its effects!"); @@ -592,33 +609,32 @@ DIALOG_TASK(marisa, Stage6PreBoss) { MSG(marisa, "Eh? I’m not depressed or anythin’. I’m just disappointed."); FACE(elly, shouting); - MSG(elly, "I-It’s not about being ’depressed’! It’s about being overwhelmed with the vast knowledge of the universe!"); + MSG(elly, "I-It’s not about being ‘depressed’! It’s about being overwhelmed with the vast knowledge of the universe!"); MSG(elly, "Once you realize the true potential of reality, you’ll go mad with knowledge!"); MSG(elly, "Don’t you see?! Nothing can stop us now! For we are—!"); - //FACE(marisa, yelling); + FACE(marisa, surprised); MSG(marisa, "But I’m already mad with knowledge! Why do ya think I drink all the time?!"); - MSG(marisa, "My mind’s always racin’ with this ’n that…"); + MSG(marisa, "My mind’s always racin’ with this ‘n that…"); MSG(marisa, "Y’think this is any different than how I usually live?! Get over y’erself!"); - //FACE(marisa, inquistive); - MSG(marisa, "Now, I gotta ask… y’don’t gotta library anywhere?"); + FACE(marisa, inquistive); + MSG(marisa, "Now, I gotta ask… y’don’t got a secret library anywhere?"); MSG(marisa, "A single bookshelf?"); MSG(marisa, "I’ll event take a few loose scribbled notes—"); - //FACE(elly, eyes_closed_yelling); - FACE(elly, shouting); + FACE(elly, eyes_closed); MSG(elly, "Since you’re OBVIOUSLY treating this as a joke, I REFUSE To speak with you any longer!"); FACE(marisa, happy); MSG(marisa, "Oh c’mon, wanna catch up on old times?"); + FACE(marisa, normal); MSG(marisa, "Just turn the madness-whatever off and we’ll go out for sake."); - MSG(elly, "There’s no force in this world that would make me turn back now!"); EVENT(music_changes); - //FACE(elly, smug); - FACE(elly, normal); + FACE(elly, smug); MSG(elly, "Someone as ordinary as you getting in our way is impressive, however, I’ll give you that much."); + FACE(elly, angry); MSG(elly, "But there’s no place for sorcery in our enlightened vision of Gensōkyō!"); FACE(elly, shouting); MSG(elly, "Now, succumb to the madness!"); @@ -636,6 +652,7 @@ DIALOG_TASK(marisa, Stage6PreFinal) { FACE(marisa, unamused); MSG(marisa, "Are y’sure ya don’t got a spellbook laying around?! Nothin’ at all?!"); MSG(elly, "Are you still on about that?! Fine, see what good it does you!"); + FACE(elly, shouting); MSG(elly, "Your pitiful magic amounts to nothing against the true nature of reality!"); DIALOG_END(); diff --git a/src/dialog/reimu.c b/src/dialog/reimu.c index 3ddab766..95deb161 100644 --- a/src/dialog/reimu.c +++ b/src/dialog/reimu.c @@ -37,39 +37,27 @@ DIALOG_TASK(reimu, Stage1PreBoss) { // Hide cirno for now, to be revealed later. HIDE(cirno); - // "normal" is the default face. - // FACE(reimu, normal); - - // FOCUS() to make an actor stand out. - // Focused actors are fully bright and appear in front of the rest. - // Only one actor can be focused at a time. - FOCUS(reimu); - // Let’s wait a bit, then change Reimu’s expression. // All timings are in frames (60 = 1 sec). WAIT_SKIPPABLE(60); - FACE(reimu, unamused); + // "normal" is the default face. + FACE(reimu, normal); // MSG() makes the actor say a line, and then waits an unspecified amount of time (skippable). // The timeout is determined by the dialog_util_estimate_wait_timeout_from_text() function in dialog.c - // MSG() also implies FOCUS() MSG(reimu, "Unseasonable snow? I wonder if it’s that ‘Secret God’ again…"); - MSG(cirno, "‘Secret God’?"); - // EVENT()s are handled by stage code. // You can find the list of events per dialogue in dialog_interface.h // All of them should be signaled eventually. EVENT(boss_appears); + // MSG_UNSKIPPABLE() is like MSG(), but can’t be skipped and takes an explicit timeout. // Wait until the boss slides in. - // WAIT() can not be skipped. - WAIT(30); - WAIT_SKIPPABLE(60); + MSG_UNSKIPPABLE(cirno, 180, "‘Secret God’?"); // Reveal Cirno’s portrait SHOW(cirno); - MSG(cirno, "What, are you *that* impressed by my invincible magic?!"); FACE(reimu, sigh); @@ -89,9 +77,6 @@ DIALOG_TASK(reimu, Stage1PreBoss) { FACE(cirno, angry); MSG(cirno, "No way! Prepare to be chilled to the bone!"); - // MSG_UNSKIPPABLE() is like MSG(), but can’t be skipped and takes an explicit timeout. - //MSG_UNSKIPPABLE(cirno, 300, "You can’t skip this one!"); - // Teardown, must be at the very bottom. DIALOG_END(); } @@ -110,11 +95,8 @@ DIALOG_TASK(reimu, Stage1PostBoss) { // Bosses also have a "defeated" face to go along with the variant, but all the other faces can be used as well. // It’s best to set the face to "defeated" in the beginning of a post-battle dialogue, and change it later if needed. FACE(cirno, defeated); - - SHOW(cirno); - - FACE(reimu, happy); MSG(cirno, "Cool down! I didn’t mean it like that!"); + FACE(reimu, smug); MSG(reimu, "I did say you could just let me through, you know."); MSG(cirno, "I don’t remember that! You broke the rules! I wasn’t ready yet…"); @@ -132,17 +114,12 @@ DIALOG_TASK(reimu, Stage2PreBoss) { ACTOR_RIGHT(hina); HIDE(hina); - - FOCUS(reimu); - WAIT_SKIPPABLE(60); FACE(reimu, unamused); - MSG(reimu, "Hmm… the mountain is unusually quiet today."); MSG(reimu, "With those annoyingly-talkative yōkai gone, it feels practically deserted."); - EVENT(boss_appears); MSG_UNSKIPPABLE(hina, 180, "Ah yes, it’s Ms. Hakurei."); SHOW(hina); @@ -152,8 +129,8 @@ DIALOG_TASK(reimu, Stage2PreBoss) { MSG(hina, "But once again, you’re trying to go places you shouldn’t."); MSG(hina, "What a troubled girl…"); - FACE(reimu, unamused); - MSG(reimu, "So much for ’deserted’…"); + FACE(reimu, sigh); + MSG(reimu, "So much for ‘deserted’…"); FACE(reimu, normal); MSG(reimu, "Do you even know what you’re protecting me from this time?"); @@ -164,8 +141,9 @@ DIALOG_TASK(reimu, Stage2PreBoss) { FACE(hina, concerned); MSG(hina, "You ought to turn back now, my dear."); - FACE(reimu, unamused); + FACE(reimu, sigh); MSG(reimu, "(She… she completely ignored my question.)"); + FACE(reimu, puzzled); MSG(reimu, "Does it matter that the Gods asked me to come this time?"); EVENT(music_changes); @@ -176,7 +154,6 @@ DIALOG_TASK(reimu, Stage2PreBoss) { FACE(reimu, sigh); MSG(reimu, "So annoying…"); - DIALOG_END(); } @@ -187,17 +164,17 @@ DIALOG_TASK(reimu, Stage2PostBoss) { ACTOR_RIGHT(hina); WAIT(30); + VARIANT(hina, defeated); FACE(hina, defeated); FACE(reimu, normal); MSG(hina, "So I lost… you can keep going then, I suppose."); - + FACE(reimu, puzzled); MSG(reimu, "You should know by now that I can handle it. Why are you being so overbearing?"); - MSG(hina, "Just don’t say I didn’t warn you, when you inevitably get mauled by whatever’s out there…"); - FACE(reimu, sigh); + FACE(reimu, unamused); MSG(reimu, "(Ignored again…)"); DIALOG_END(); @@ -218,15 +195,15 @@ DIALOG_TASK(reimu, Stage3PreBoss) { MSG(reimu, "But aside from everyone being whipped up into a frenzy, I can’t see anything abnormal yet."); EVENT(boss_appears); + MSG_UNSKIPPABLE(wriggle, 180, "Well, to your human eyes, insects may seem ‘normal’…"); + SHOW(wriggle); - MSG(wriggle, "Well, to your human eyes, insects may seem ’normal’…"); - WAIT(60); FACE(wriggle, proud); MSG(wriggle, "… but there was a time when we ruled supreme!"); FACE(reimu, puzzled); MSG(reimu, "Eh? You? Aren’t you a bit far from home?"); - MSG(reimu, "Besides, ’ruled supreme’? I’ve never heard of insects ruling over Gensōkyō."); + MSG(reimu, "Besides, ‘ruled supreme’? I’ve never heard of insects ruling over Gensōkyō."); TITLE(wriggle, "Wriggle Nightbug", "Insect Rights Activist"); @@ -234,26 +211,26 @@ DIALOG_TASK(reimu, Stage3PreBoss) { MSG(wriggle, "Home? But you’ve intruded on my secret lair!"); FACE(reimu, sigh); - MSG(reimu, "Again with the ’secret lair’…"); + MSG(reimu, "Again with the ‘secret lair’…"); FACE(wriggle, proud); MSG(wriggle, "Haven’t you heard of the Car—…"); MSG(wriggle, "Carb—…"); + FACE(reimu, puzzled); MSG(wriggle, "That period of history?"); MSG(wriggle, "It was the greatest time, everyone should’ve heard of it!"); - FACE(reimu, normal); MSG(reimu, "Seems pretty far-fetched to me, honestly. But you yōkai are always coming up with the craziest theories…"); FACE(wriggle, outraged); - MSG(wriggle, "Don’t lump giant insects with common yōkai!"); + MSG(wriggle, "Don’t lump us great insects in with common yōkai!"); FACE(wriggle, proud); MSG(wriggle, "I’m going to restore us to our rightful glory of old!"); FACE(reimu, puzzled); MSG(reimu, "Giant insects? But you’re tiny."); FACE(reimu, unamused); - MSG(reimu, "And I still don’t know what you mean by ’glory of old.’"); + MSG(reimu, "And I still don’t know what you mean by ‘glory of old.’"); EVENT(music_changes); @@ -273,7 +250,7 @@ DIALOG_TASK(reimu, Stage3PostBoss) { FACE(reimu, smug); MSG(reimu, "Giant insects roaming Gensōkyō, huh?"); - MSG(reimu, "Sounds like one of Sanae’s ’nuclear’ experiments…"); + MSG(reimu, "Sounds like one of Sanae’s ‘nuclear’ experiments…"); MSG(wriggle, "B-but I saw it clearly… the fate of insectkind…"); @@ -314,14 +291,14 @@ DIALOG_TASK(reimu, Stage4PreBoss) { MSG(kurumi, "Oi, that’s what I should be asking!"); FACE(reimu, puzzled); - MSG(reimu, "…"); - FACE(reimu, normal); + MSG(reimu, "…?"); + FACE(reimu, unamused); MSG(reimu, "And what are you doing, anyways?"); MSG(reimu, "Are you behind all these… strange thoughts everyone’s having?"); FACE(kurumi, normal); TITLE(kurumi, "Kurumi", "High-Society Phlebotomist"); - MSG(kurumi, "I have no idea what you mean by ’strange thoughts,’ but I’ll be honest with you…"); + MSG(kurumi, "I have no idea what you mean by ‘strange thoughts,’ but I’ll be honest with you…"); MSG(kurumi, "Your clothing is giving me some strange thoughts!"); MSG(kurumi, "Where’d you even get it, the trash?!"); @@ -329,6 +306,7 @@ DIALOG_TASK(reimu, Stage4PreBoss) { MSG(reimu, "Ugh, another prissy mansion-dweller."); FACE(reimu, sigh); MSG(reimu, "And to think I thought I remembered you from somewhere. Absolutely not."); + FACE(reimu, assertive); MSG(reimu, "Just… stop whatever it is you’re doing, at once."); FACE(kurumi, dissatisfied); @@ -341,27 +319,30 @@ DIALOG_TASK(reimu, Stage4PreBoss) { FACE(kurumi, normal); MSG(kurumi, "You’re a shrine maiden?"); + FACE(reimu, unamused); MSG(kurumi, "More like… BAD maiden!"); - FACE(reimu, unamused); + FACE(reimu, assertive); MSG(reimu, "T-this is what a shrine maiden wears. It’s a uniform."); MSG(kurumi, "Uniform? Are you kidding me?"); MSG(kurumi, "I’ve seen a real shrine maiden before, and she didn’t look anything like you!"); MSG(kurumi, "What’s with those patterns, anwyays? It’s completely unorthodox!"); + FACE(reimu, irritated); MSG(reimu, "… ARGH!"); - //FACE(reimu, furious); + FACE(reimu, outraged); MSG(reimu, "Listen! It’s HARD to find clothes I can wear every day on the job!"); MSG(reimu, "It has to fit a certain style! And only a few fabrics feel good to wear!"); - FACE(reimu, unamused); MSG(reimu, "I can’t stand scratchy wool or slippery silk!"); MSG(reimu, "Everything else feels terrible again my skin—"); - //FACE(reimu, furious); + FACE(reimu, irritated); MSG(reimu, "… damnit! Now I’m all worked up!"); EVENT(music_changes); + MSG(reimu, "I hate prissy mansion dwellers!"); + FACE(reimu, outraged); MSG(reimu, "Let’s just get this over with!"); DIALOG_END(); @@ -381,13 +362,12 @@ DIALOG_TASK(reimu, Stage4PostBoss) { MSG(kurumi, "Ouch ouch ouch…"); MSG(kurumi, "Wait, what happened?"); - MSG(reimu, "What do you mean ’what happened’?"); + MSG(reimu, "What do you mean ‘what happened’?"); FACE(kurumi, normal); MSG(kurumi, "Wait! Aren’t you that girl from a long while back?"); - FACE(reimu, puzzled); - //FACE(reimu, unsettled); + FACE(reimu, unsettled); MSG(reimu, "I don’t remember you at all? It’s just that unsettling feeling again…"); MSG(reimu, "So familiar…"); FACE(reimu, sigh); @@ -396,6 +376,7 @@ DIALOG_TASK(reimu, Stage4PostBoss) { FACE(kurumi, defeated); MSG(kurumi, "(Ugh, her clothes really do suck though…)"); MSG(kurumi, "I was supposed to keep people out until my friend completed their plan…"); + FACE(reimu, puzzled); MSG(kurumi, "But then I started feeling weird and kept talking like I had no filter?"); MSG(kurumi, "It was kinda liberating but also made me really rude?!"); @@ -417,10 +398,9 @@ DIALOG_TASK(reimu, Stage5PreBoss) { ACTOR_RIGHT(iku); HIDE(iku); - FACE(reimu, puzzled); - //FACE(reimu, unsettled); - + FACE(reimu, unsettled); MSG(reimu, "I’ve got a bad feeling about this…"); + FACE(reimu, puzzled); MSG(reimu, "Or maybe I’m just feeling nauseous with this tower’s constant spinning."); EVENT(boss_appears); @@ -432,6 +412,7 @@ DIALOG_TASK(reimu, Stage5PreBoss) { MSG(reimu, "What did you attack me for earlier?"); TITLE(iku, "Nagae Iku", "Fulminologist of the Heavens"); + FACE(iku, smile); MSG(iku, "Ah, apologies. It must have been friendly fire."); FACE(iku, eyes_closed); MSG(iku, "Things are quite hectic here. I beg your understanding."); @@ -442,15 +423,15 @@ DIALOG_TASK(reimu, Stage5PreBoss) { FACE(iku, serious); MSG(iku, "To get straight to the point, this tower is unlike anything I have seen before."); - MSG(iku, "Since word spread through the clouds, I’ve learned that the culprit is connected to ’parallel universes.’"); + MSG(iku, "Since word spread through the clouds, I’ve learned that the culprit is connected to ‘parallel universes.’"); FACE(reimu, puzzled); MSG(reimu, "You mean like Otherworlds? That’s not too out of the ordinary these days though."); - //FACE(reimu, unsettled); + FACE(reimu, unsettled); MSG(reimu, "This feels different though. It’s like the walls are sucking up faith into a void."); MSG(reimu, "I’m surprised the fairies are surviving at all…"); FACE(reimu, normal); - MSG(reimu, "But what are you doing here? Aren’t you worried about being ’affected’?"); + MSG(reimu, "But what are you doing here? Aren’t you worried about being ‘affected’?"); FACE(iku, eyes_closed); MSG(iku, "It is not just the Netherworld and Gensōkyō being affected."); @@ -462,6 +443,7 @@ DIALOG_TASK(reimu, Stage5PreBoss) { FACE(iku, smile); MSG(iku, "Initially, I had no plans towards interfering. I am not one to take the lead."); + FACE(reimu, normal); FACE(iku, serious); MSG(iku, "However, the tower’s psychological effects began to intensify, and…"); @@ -470,6 +452,7 @@ DIALOG_TASK(reimu, Stage5PreBoss) { FACE(iku, eyes_closed); MSG(iku, "As more minds began to fall prey, I considered a theory…"); + FACE(reimu, normal); MSG(iku, "Is this machine incompatible with the existence of fantasy?"); FACE(iku, normal); MSG(iku, "That may be why you feel a sense of dread about the place."); @@ -481,20 +464,20 @@ DIALOG_TASK(reimu, Stage5PreBoss) { MSG(iku, "To be frank, I am not sure whether you are up to the task."); MSG(iku, "You are still relatively composed, yes, but your mental state seems to be deteriorating."); - FACE(reimu, unamused); + FACE(reimu, irritated); MSG(reimu, "I don’t trust anyone else to get this done!"); EVENT(music_changes); MSG(iku, "You are still so worrisome. You ought to go home before you lose yourself."); - //FACE(reimu, furious); + FACE(reimu, irritated); MSG(reimu, "No!"); FACE(iku, serious); MSG(iku, "I beg your pardon?"); - FACE(reimu, unamused); MSG(reimu, "Don’t keep telling me how little you think of me. I’m sick of it!"); + FACE(reimu, assertive); MSG(reimu, "I’m going to give everyone a reason to have faith in me!"); MSG(iku, "It seems your resolve is unbreakable. Very well, then."); @@ -522,21 +505,22 @@ DIALOG_TASK(reimu, Stage5PostBoss) { ACTOR_RIGHT(iku); VARIANT(iku, defeated); FACE(iku, defeated); - //FACE(reimu, unsettled); - FACE(reimu, sigh); MSG(iku, "Ah…"); MSG(iku, "I was wrong for doubting you."); + FACE(reimu, unamused); MSG(reimu, "Somehow I don’t feel too satisfied by that."); FACE(iku, eyes_closed); MSG(iku, "To be honest with you, I’m glad you arrived after all."); MSG(iku, "I know now that I would not have been able to defeat her."); + FACE(reimu, normal); MSG(iku, "Since you’re still able to think clearly, perhaps Gensōkyō will be saved after all."); + FACE(reimu, sigh); + MSG(reimu, "Finally."); FACE(reimu, normal); - MSG(reimu, "But you’re right. This is bigger than Gensōkyō."); MSG(reimu, "I’ll need to take this seriously."); @@ -560,11 +544,10 @@ DIALOG_TASK(reimu, Stage6PreBoss) { MSG_UNSKIPPABLE(elly, 180, "Well, well, well. It seems a rat snuck into our tower."); SHOW(elly); - //FACE(elly, smug); + FACE(elly, smug); MSG(elly, "How strange. You should’ve lost your mind by now."); - //FACE(reimu, unsettled); - FACE(reimu, unamused); + FACE(reimu, unsettled); MSG(reimu, "I don’t really care why you’re doing this, just turn it off."); TITLE(elly, "Elly", "The Theoretical Reaper"); @@ -579,49 +562,51 @@ DIALOG_TASK(reimu, Stage6PreBoss) { FACE(elly, shouting); MSG(elly, "Is this a joke?! Are you trying to mock me?!"); - //FACE(reimu, outraged); - FACE(reimu, unamused); + FACE(reimu, assertive); MSG(reimu, "I think I would’ve remembered a giant tower that makes people go mad with power!"); MSG(reimu, "The least you can do when accusing someone is to tell them what they’ve supposedly done!"); - //FACE(elly, smug); - FACE(elly, normal); + FACE(elly, smug); MSG(elly, "Ah. I see."); MSG(elly, "Fine. I will."); + FACE(elly, normal); + FACE(reimu, unamused); MSG(elly, "This tower is a recent invention. Its mere existence is revolutionary in several scientific fields."); MSG(elly, "The folks of this Gensōkyō ought to have been thankful for its vast scientific knowledge…"); MSG(elly, "But alas, we had other plans."); FACE(reimu, unamused); MSG(reimu, "Somehow, it feels like more of a punishment."); - MSG(reimu, "Ever heard of ’ignorance is bliss’?"); - MSG(reimu, "There won’t be anyone to rule over, or whatever, if you make them all go off."); + MSG(reimu, "Ever heard of ‘ignorance is bliss’?"); + MSG(reimu, "There won’t be anyone to rule over, or whatever, if you make them all lose it."); - MSG(elly, "The Tower of Babel is capable of ’enlightening’ those fortunate to be around it."); + MSG(elly, "The Tower of Babel is capable of ‘enlightening’ those fortunate to be around it."); + FACE(elly, smug); MSG(elly, "Anyone unable to comprehend its brilliance will be driven to madness."); FACE(elly, shouting); MSG(elly, "But the residents of this Gensōkyō mean less than nothing to us! This is simply retribution!"); - //FACE(reimu, unsettled); - FACE(reimu, normal); - MSG(reimu, "’This’ Gensōkyō…?"); - MSG(reimu, "’Parallel universes,’ is that it? Like what Iku told me…"); + FACE(reimu, unsettled); + MSG(reimu, "‘This’ Gensōkyō…?"); + MSG(reimu, "‘Parallel universes,’ is that it? Like what Iku told me…"); FACE(elly, normal); MSG(elly, "Hmm? Is that what this Gensōkyō is?"); - FACE(reimu, unamused); + FACE(reimu, irritated); MSG(reimu, "You tell me! You’re the megalomaniac!"); - MSG(reimu, "Do you hate me because some other Reimu did something? Is that it?!"); + FACE(reimu, assertive); + MSG(reimu, "Do you hate me because some other Reimu did something? Is that it?"); MSG(reimu, "But then what does that have to do with any of us?!"); + FACE(reimu, irritated); MSG(reimu, "For a scientist, you’re not making a whole lot of sense!"); FACE(elly, angry); MSG(elly, "Perhaps you’ve simply forgotten, like you have of the rest of us!"); + FACE(reimu, unamused); MSG(elly, "Only the privileged, such as Lady Kazami, made it out! The rest of us were lost!"); - //FACE(reimu, unsettled); - FACE(reimu, normal); + FACE(reimu, unsettled); MSG(reimu, "You mean Kazami Yūka? And I suppose… Alice, too?"); MSG(reimu, "I remember when I first met Alice, she made weird comments like you, too."); FACE(reimu, unamused); @@ -634,11 +619,13 @@ DIALOG_TASK(reimu, Stage6PreBoss) { FACE(reimu, sigh); MSG(reimu, "Even in Gensōkyō, you can be forgotten, huh?"); MSG(reimu, "What a miserable thought. No wonder I felt terrible just seeing this place!"); + FACE(reimu, assertive); MSG(reimu, "Turn it off, or being forgotten will be the least of your worries!"); EVENT(music_changes); FACE(elly, shouting); MSG(elly, "It’s too late for that! Soon, all of Gensōkyō will become enlightened!"); + FACE(reimu, unsettled); MSG(elly, "Don’t you understand, pitiful shrine maiden? Science is an unfathomable power, surpassed by nothing!"); MSG(elly, "We will subjugate this world at any cost!"); @@ -652,7 +639,7 @@ DIALOG_TASK(reimu, Stage6PreFinal) { ACTOR_RIGHT(elly); VARIANT(elly, beaten); FACE(elly, shouting); - FACE(reimu, unamused); + FACE(reimu, assertive); MSG(reimu, "Is that it? Are you finally done?!"); MSG(elly, "Y-you think this is over?! The time of reckoning is upon you!"); MSG(elly, "Gaze upon the ultimate truth of the universe, and tremble!"); diff --git a/src/dialog/youmu.c b/src/dialog/youmu.c index 039a62d9..ba357bd2 100644 --- a/src/dialog/youmu.c +++ b/src/dialog/youmu.c @@ -24,28 +24,25 @@ DIALOG_TASK(youmu, Stage1PreBoss) { FACE(youmu, happy); MSG(youmu, "I suppose falling snow can be as pretty as cherry blossoms…"); - MSG(cirno, "I’m cooler than you, so get off my lake!"); - FACE(youmu, normal); EVENT(boss_appears); + MSG_UNSKIPPABLE(cirno, 180, "I’m cooler than you, so get off my lake!"); SHOW(cirno); - WAIT(30); - WAIT_SKIPPABLE(60); FACE(youmu, unamused); MSG(youmu, "I can see you’re quite cold, yes."); + FACE(youmu, smug); MSG(youmu, "I tend to dislike dueling those weaker than myself, so I’d appreciate it if you’d step aside."); TITLE(cirno, "Cirno", "Thermodynamic Ice Fairy"); MSG(cirno, "Hah! Maybe YOU should step aside, then!"); - FACE(youmu, smug); + FACE(youmu, eyes_closed); MSG(youmu, "I suppose it’s as good a time as any to practice my snowflake-destruction technique."); EVENT(music_changes); FACE(cirno, angry); MSG(cirno, "But if I turn you into a snowflake, you’ll have to chop yourself in half!"); - DIALOG_END(); } @@ -89,26 +86,27 @@ DIALOG_TASK(youmu, Stage2PreBoss) { MSG(hina, "And who might you be, dear?"); MSG(youmu, "Konpaku Yōmu. I am on a mission from Lady Yuyuko to investigate the disturbance."); + FACE(youmu, eyes_closed); MSG(youmu, "You needn’t concern yourself. I’ll be passing through now."); TITLE(hina, "Kagiyama Hina", "Gyroscopic Pestilence God"); - MSG(hina, "I’ve never heard of this ’Lady Yuyuko’ you speak of, but I can’t let this slide."); + MSG(hina, "I’ve never heard of this ‘Lady Yuyuko’ you speak of, but I can’t let this slide."); + FACE(youmu, normal); FACE(hina, serious); MSG(hina, "Young girls such as yourself shouldn’t be sent to do such dangerous errands!"); - //FACE(youmu, embarassed); - FACE(youmu, eeeeh); - MSG(youmu, "’Y-Young girl’?! I’ll have you know that I am an expert swordswoman—"); + FACE(youmu, embarrassed); + MSG(youmu, "‘Y-Young girl’?! I’ll have you know that I am an expert swordswoman—"); MSG(youmu, "—having mastered my technique over *decades*—"); MSG(youmu, "—dare I say even the best in Gensōkyō—"); FACE(hina, normal); MSG(hina, "Aww… but you look so cute! No way someone like you could be into that."); - MSG(hina, "Are you sure this ’expert swordswoman’ thing isn’t just some sort of teenage phase?"); + MSG(hina, "Are you sure this ‘expert swordswoman’ thing isn’t just some sort of teenage phase?"); FACE(youmu, unamused); MSG(youmu, "It’s not a PHASE, mo—"); - //FACE(youmu, embarassed); + FACE(youmu, embarrassed); MSG(youmu, "…!!"); EVENT(music_changes); @@ -124,10 +122,9 @@ DIALOG_TASK(youmu, Stage2PostBoss) { VARIANT(hina, defeated); FACE(hina, defeated); - MSG(hina, "Did you just call me ’mom’…?"); + MSG(hina, "Did you just call me ‘mom’…?"); - //FACE(youmu, eyes_closed); - FACE(youmu, sigh); + FACE(youmu, eyes_closed); MSG(youmu, "I did not."); MSG(youmu, "It must be the madness overcoming you."); MSG(youmu, "Yes, indeed."); @@ -161,18 +158,19 @@ DIALOG_TASK(youmu, Stage3PreBoss) { SHOW(wriggle); MSG(wriggle, "Do you mean the comfortable supply of my bretheren?"); - //FACE(youmu, eyes_closed); - FACE(youmu, unamused); + FACE(youmu, eyes_closed); MSG(youmu, "Bugs do not concern me at the moment."); FACE(wriggle, outraged); - MSG(wriggle, "Oh, so all insects are ’bugs’ now, hmm? I see how it is!"); + MSG(wriggle, "Oh, so all insects are ‘bugs’ now, hmm? I see how it is!"); TITLE(wriggle, "Wriggle Nightbug", "Insect Rights Activist"); MSG(wriggle, "Ever heard of beetles? Flies? It’s about respect, you know!"); FACE(youmu, normal); MSG(youmu, "Apologies, I meant no disrespect."); + FACE(youmu, eyes_closed); MSG(youmu, "I am on a mission from Lady Yuyuko to end whatever is causing the disturbance in this area."); + FACE(youmu, normal); MSG(youmu, "Tell me everything you know."); FACE(wriggle, proud); @@ -210,7 +208,7 @@ DIALOG_TASK(youmu, Stage3PostBoss) { VARIANT(wriggle, defeated); FACE(wriggle, defeated); - //FACE(youmu, eyes_closed); + FACE(youmu, eyes_closed); MSG(youmu, "Are you aware of the legend of the Tonbokiri?"); MSG(youmu, "It was said the blade could cut insects in half simply by them landing on it."); FACE(youmu, smug); @@ -219,9 +217,7 @@ DIALOG_TASK(youmu, Stage3PostBoss) { MSG(wriggle, "That’s not the past I saw…"); MSG(youmu, "How unfortunate for you."); - // for "chuuni," I’m basically thinking about how intense Wolf Yōmu looks in WBaWC - // https://i.ytimg.com/vi/aDhavStO540/maxresdefault.jpg - //FACE(youmu, chuuni); + FACE(youmu, chuuni); MSG(youmu, "Fear not. I will end your delusional madness and restore justice and order to the—"); FACE(youmu, eeeeh); MSG(youmu, "… ugh, that’s a little much, even for me."); @@ -246,9 +242,9 @@ DIALOG_TASK(youmu, Stage4PreBoss) { HIDE(kurumi); MSG(youmu, "A-ha, I must be close to the true entrance now."); - //FACE(youmu, eyes_closed); + FACE(youmu, eyes_closed); MSG(youmu, "This tower… I can already feel it…"); - //FACE(youmu, chuuni); + FACE(youmu, chuuni); MSG(youmu, "Yes, this is a challenge worthy of my skills! It’ll take everything I’ve got!"); EVENT(boss_appears); @@ -262,7 +258,7 @@ DIALOG_TASK(youmu, Stage4PreBoss) { MSG(kurumi, "Hmph! I’m Kurumi, a lone black rose drowning in a sea of bad taste!"); MSG(kurumi, "You better remember that!"); - //FACE(youmu, eyes_closed); + FACE(youmu, eyes_closed); MSG(youmu, "Perhaps I will."); FACE(youmu, normal); MSG(youmu, "Are you an associate of this… mansion-tower’s denizens, then?"); @@ -271,10 +267,10 @@ DIALOG_TASK(youmu, Stage4PreBoss) { MSG(kurumi, "No WAY I’d want to associate myself with the folk of this mansion!"); MSG(kurumi, "They dress like they’ve fallen out of a bad 80s anime!"); - //FACE(youmu, eyes_closed); - FACE(youmu, relaxed); + FACE(youmu, eyes_closed); MSG(youmu, "I see. I have no reason to distrust you."); - MSG(youmu, "… what’s an ’80s anime’, though, if I may ask?"); + FACE(youmu, puzzled); + MSG(youmu, "… what’s an ‘80s anime’, though, if I may ask?"); FACE(kurumi, normal); MSG(kurumi, "I don’t know, don’t ask me!"); @@ -285,11 +281,11 @@ DIALOG_TASK(youmu, Stage4PreBoss) { MSG(kurumi, "Yeah, but I was lying to see how gullible you were."); - //FACE(youmu, embarassed); - FACE(youmu, sigh); + FACE(youmu, embarrassed); MSG(youmu, "O-of course. I-I knew that."); - MSG(youmu, "I wanted to see if you’d come clean."); FACE(youmu, normal); + MSG(youmu, "I wanted to see if you’d come clean."); + FACE(youmu, eyes_closed); MSG(youmu, "My true challenge lies beyond you. Step aside."); EVENT(music_changes); @@ -308,12 +304,11 @@ DIALOG_TASK(youmu, Stage4PostBoss) { VARIANT(kurumi, defeated); FACE(kurumi, defeated); - //FACE(youmu, eyes_closed); - FACE(youmu, smug); + FACE(youmu, eyes_closed); MSG(youmu, "Despite your inferior technique, I must thank you."); - MSG(youmu, "’Dancing’ with you has pleasant stepping-stone on the path to completing my mission."); - //FACE(youmu, chuuni); - MSG(youmu, "Tell your ’employer’ that I am coming for them."); + MSG(youmu, "‘Dancing’ with you has pleasant stepping-stone on the path to completing my mission."); + FACE(youmu, chuuni); + MSG(youmu, "Tell your ‘employer’ that I am coming for them."); MSG(kurumi, "(She earnestly talks like a manga anti-hero…)"); FACE(kurumi, normal); @@ -324,11 +319,10 @@ DIALOG_TASK(youmu, Stage4PostBoss) { FACE(youmu, unamused); MSG(youmu, "S-… spooky?"); - //FACE(kurumi, puzzled); - FACE(kurumi, normal); + FACE(kurumi, puzzled); MSG(kurumi, "…?"); FACE(kurumi, normal); - MSG(kurumi, "… yeah! I thought it was gonna be all ’scientific,’ but then they made it haunted, with ghosts and stuff!"); + MSG(kurumi, "… yeah! I thought it was gonna be all ‘scientific,’ but then they made it haunted, with ghosts and stuff!"); FACE(youmu, eeeeh); MSG(youmu, "G-…"); @@ -337,8 +331,7 @@ DIALOG_TASK(youmu, Stage4PostBoss) { MSG(kurumi, "Scary vengeful ghosts! Trying to kill you, even!"); MSG(kurumi, "But surely a strong swordsgirl like yourself could handle it."); - //FACE(youmu, embarassed); - FACE(youmu, normal); + FACE(youmu, embarrassed); MSG(youmu, "B-Bring it on! Nothing will stand in my way!"); MSG(kurumi, "(Teehee, so gullible.)"); @@ -359,9 +352,9 @@ DIALOG_TASK(youmu, Stage5PreBoss) { FACE(youmu, relaxed); MSG(youmu, "Incredible. Truly astounding."); - //FACE(youmu, eyes_closed); + FACE(youmu, eyes_closed); MSG(youmu, "Yes, the final battle is imminent. I can feel it."); - //FACE(youmu, chuuni); + FACE(youmu, chuuni); MSG(youmu, "It will be a legendary duel, one to go down in the history of Gensōkyō!"); EVENT(boss_appears); @@ -388,6 +381,7 @@ DIALOG_TASK(youmu, Stage5PreBoss) { FACE(iku, normal); MSG(iku, "On the contrary, I would say."); TITLE(iku, "Nagae Iku", "Fulminologist of the Heavens"); + FACE(youmu, normal); MSG(iku, "I decided to do some research on my own."); MSG(iku, "This tower is controlled by a machine…"); FACE(iku, serious); @@ -395,32 +389,33 @@ DIALOG_TASK(youmu, Stage5PreBoss) { FACE(youmu, normal); MSG(youmu, "Including the heavens, I presume? I see."); - //FACE(youmu, eyes_closed); + FACE(youmu, eyes_closed); MSG(youmu, "Fear not. Gensōkyō is safe in my hands. I will allow nothing to stand in my way."); - //FACE(youmu, chuuni); + FACE(youmu, chuuni); MSG(youmu, "Konpaku Yōmu, the greatest swordswoman to live and die, will settle this incident once and for all!"); FACE(iku, smile); MSG(iku, "It seems that the machine has also overinflated your ego, Swordswoman of the Hakugyokurō."); MSG(iku, "Would caution not be prudent in this situation?"); - //FACE(youmu, eyes_closed); - FACE(youmu, normal); + FACE(youmu, eyes_closed); MSG(youmu, "Overinflated ego? Nonsense."); MSG(youmu, "During my recent battles, I have achieved a meditative state most blademasters only dream of!"); - //FACE(youmu, chuuni); + FACE(youmu, chuuni); MSG(youmu, "Through that, I have realized the true form of my previously-incomplete yōkai-vanquishing technique!"); - MSG(iku, "Is that so? You believe that this ’technique’ will help you defeat the instigators effortlessly?"); + MSG(iku, "Is that so? You believe that this ‘technique’ will help you defeat the instigators effortlessly?"); FACE(youmu, sigh); MSG(youmu, "More doubt from ignorant skeptics, I see."); - //FACE(youmu, chuuni); + FACE(youmu, chuuni); MSG(youmu, "Shall we duel so that I may demonstrate to your satisfaction?!"); FACE(iku, serious); MSG(iku, "W-wait, that is not what I meant, I simply—"); + EVENT(music_changes); + MSG(iku, "Ah, I haven’t the time for this nonsense!"); MSG(iku, "Insolent humans such as you need rehabilitation! Allow me to administer some onto you!"); @@ -435,7 +430,7 @@ DIALOG_TASK(youmu, Stage5PostMidBoss) { ACTOR_LEFT(youmu); FACE(youmu, smug); - // should be only one message with a fixed 120-frames timeout + // should be only one message with a fixed 180-frames timeout MSG_UNSKIPPABLE(youmu, 180, "Lightning? Hmph. Nothing my swords can’t deflect."); DIALOG_END(); @@ -448,8 +443,8 @@ DIALOG_TASK(youmu, Stage5PostBoss) { ACTOR_RIGHT(iku); VARIANT(iku, defeated); FACE(iku, defeated); - //FACE(youmu, eyes_closed); - FACE(youmu, smug); + + FACE(youmu, eyes_closed); MSG(youmu, "All according to plan."); MSG(iku, "Your logic is so twisted…"); @@ -459,16 +454,16 @@ DIALOG_TASK(youmu, Stage5PostBoss) { MSG(youmu, "And perhaps I truly have gone mad. What of it?"); MSG(youmu, "My mission is crystal clear:"); - //FACE(youmu, chuuni); + FACE(youmu, chuuni); MSG(youmu, "… to carry out Lady Yuyuko’s mission, and to bring peace to Gensōkyō and all connected realms!"); MSG(youmu, "I will not fail!"); MSG(iku, "I-I see."); MSG(iku, "Ascend the staircase. You will find the instigator waiting for you there."); - MSG(iku, "Be prepared. The technology she possesses is from a so-called ’parallel universe’."); + MSG(iku, "Be prepared. The technology she possesses is from a so-called ‘parallel universe’."); MSG(iku, "It is unlike anything any of us have encountered before. Even I am not sure of its specifics."); - //FACE(youmu, eyes_closed); + FACE(youmu, eyes_closed); MSG(youmu, "Fear not, I will slice her infernal machine in half like an invasive weed."); DIALOG_END(); @@ -485,10 +480,12 @@ DIALOG_TASK(youmu, Stage6PreBoss) { ACTOR_RIGHT(elly); HIDE(elly); - //FACE(youmu, eyes_closed); - FACE(youmu, happy); - MSG(youmu, "Ah. Ah-hahaha!"); + FACE(youmu, eyes_closed); + MSG(youmu, "Ah."); + FACE(youmu, chuuni); + MSG(youmu, "Ah-hahaha!"); MSG(youmu, "Yes. Yes! This is it!"); + FACE(youmu, happy); MSG(youmu, "This is obviously the area for the final battle!"); EVENT(boss_appears); @@ -503,60 +500,64 @@ DIALOG_TASK(youmu, Stage6PreBoss) { TITLE(elly, "Elly", "The Theoretical Reaper"); MSG(elly, "Ah, I’m no shinigami, especially not now."); - //FACE(youmu, eyes_closed); - FACE(youmu, normal); + FACE(youmu, eyes_closed); MSG(youmu, "The scythe is a rather particular weapon, you must understand. Forgive me presumptiveness."); MSG(elly, "I see. I used to rely on this scythe as a gatekeeper, in the real Gensōkyō."); FACE(elly, angry); MSG(elly, "Now, it will the sigil of a new era of Gensōkyō!"); FACE(elly, shouting); - MSG(elly, "One that we, the ’forgotten’, will reign over!"); + MSG(elly, "One that we, the ‘forgotten’, will reign over!"); MSG(youmu, "Such an unwieldy weapon… for anyone to choose it willingly…"); MSG(youmu, "Either you’re incredibly skilled, or incredibly foolish."); - //FACE(youmu, chuuni); - FACE(youmu, happy); + FACE(youmu, chuuni); MSG(youmu, "I wish to find that out!"); MSG(youmu, "After our duel, let us meet as colleagues, and discuss our techniques!"); FACE(elly, angry); - MSG(elly, "I’d only call my apprentices ’colleagues’!"); + MSG(elly, "I’d only call my apprentices ‘colleagues’!"); MSG(elly, "Your existence means nothing to us! And I’m sure our existence means nothing to you, either!"); - //FACE(youmu, chuuni); - FACE(youmu, happy); + FACE(youmu, chuuni); MSG(youmu, "On the contrary, scythe-bearer!"); MSG(youmu, "You’ve created an impeccable scene for our final confrontation."); + FACE(youmu, happy); MSG(youmu, "Truly, one of the best. I applaud you!"); + FACE(youmu, eyes_closed); MSG(youmu, "But first, please, tell me: what is your mission? What is it you desire?"); + FACE(youmu, chuuni); MSG(youmu, "For us to share this… intimate moment, I desire to know everything about you."); - //FACE(elly, tsun_blush); - //this face should be similar to Kurumi’s tsun-blush - MSG(elly, "T-To avenge our forgotten friends, we plan on subjugating this world!"); + FACE(elly, blush); + MSG(elly, "T-To avenge our forgotten f-friends—"); + FACE(elly, eyes_closed); + MSG(elly, "…"); + FACE(elly, angry); + MSG(elly, "… we plan on subjugating this world!"); MSG(elly, "We will create a new era of Gensōkyō, where the truly forgotten can live another day!"); MSG(elly, "Soon, the residents of this land will be driven mad beyond comprehension, and be ripe to conquer!"); - - //FACE(youmu, eyes_closed); - MSG(youmu, "So you wish to avenge fallen comrades… how noble…"); + FACE(youmu, eyes_closed); + MSG(youmu, "So you wish to avenge your fallen compatriots… how noble…"); MSG(youmu, "I can feel it move me to tears…"); + FACE(youmu, chuuni); MSG(youmu, "Alas, my mission, given to me by Lady Yuyuko of the Netherworld, directly conflicts with yours!"); - //FACE(youmu, chuuni); MSG(youmu, "I cannot allow you to drive my compatriots mad, or to subjugate my home!"); + FACE(youmu, eyes_closed); MSG(youmu, "Perhaps, in another time and place, we could have been friends!"); FACE(elly, angry); - MSG(elly, "Being friends with you heartless folk would be a sin! I could never!"); + MSG(elly, "B-Being friends with you heartless folk would be a sin! I could never!"); + FACE(youmu, chuuni); MSG(youmu, "What a tragedy!"); - MSG(elly, "You’re aiming to be the big ’hero’ of this Gensōkyō, aren’t you?"); + MSG(elly, "You’re aiming to be the big ‘hero’ of this Gensōkyō, aren’t you?"); - MSG(youmu, "Naturally! No different than how you wish to be the hero of ’your’ Gensōkyō!"); + MSG(youmu, "Naturally! No different than how you wish to be the hero of ‘your’ Gensōkyō!"); MSG(youmu, "We’re not so different, you and I."); - FACE(elly, normal); + FACE(elly, smug); MSG(elly, "Your courage is admirable, I’ll give you that."); FACE(elly, angry); MSG(elly, "But there’s an enormous difference between us, swordswoman."); @@ -564,6 +565,7 @@ DIALOG_TASK(youmu, Stage6PreBoss) { EVENT(music_changes); FACE(elly, shouting); + FACE(youmu, normal); MSG(elly, "For I possess the knowledge of science!"); MSG(elly, "In a magic-filled world like this, science and rationality cut through opponents with unparalleled precision!"); MSG(elly, "Let’s see what good your swords do you when you fall prey to true enlightenment!"); @@ -579,8 +581,7 @@ DIALOG_TASK(youmu, Stage6PreFinal) { VARIANT(elly, beaten); FACE(elly, angry); - //FACE(youmu, chuuni); - FACE(youmu, smug); + FACE(youmu, chuuni); MSG(youmu, "Impressive! You’ve pushed me to 10% of my true power!"); MSG(elly, "Your despicable pride will be your downfall!");