From c0ba38cd4b68491e28e467889804ebc09c9c002e Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 2 Apr 2014 11:06:32 -0700 Subject: Clean up main scripts --- world/map/npc/027-2/husband.txt | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'world/map/npc/027-2/husband.txt') diff --git a/world/map/npc/027-2/husband.txt b/world/map/npc/027-2/husband.txt index 4217d9a4..f78cf48a 100644 --- a/world/map/npc/027-2/husband.txt +++ b/world/map/npc/027-2/husband.txt @@ -53,9 +53,11 @@ goto L_Close; next; menu - "I'd like to know why all the people in here are dead.",-, - "Are you feeling well? You look very pale... In fact, deathly pale.",-, + "I'd like to know why all the people in here are dead.",L_Next, + "Are you feeling well? You look very pale... In fact, deathly pale.",L_Next, "Thank you, but I'm fine.", L_Close; + +L_Next: mes "Hamond seems very confused. Then he notices the grey color of his hands and begins to shake his head in panic."; mes "[Hamond]"; mes "\"WHAT IS THIS?\""; @@ -73,7 +75,9 @@ mes "\"But nevertheless, I will continue to run this inn and do my best to make all our patrons happy and satisfied - be they alive or dead.\""; next; menu - "Can I help with that?", -; + "Can I help with that?", L_Continue; + +L_Continue: mes "[Hamond]"; mes "\"Help me? Normally I would never ask you for this, but actually, I do need something to cool the drinks. Maybe you can find something.\""; @@ -130,7 +134,9 @@ L_Check_Ice: mes "\"And I won't let a wannabe mage take her away from me...\""; next; menu - "What do you mean?",-; + "What do you mean?",L_More; + +L_More: mes "[Hamond]"; mes "\"Nevermind, nevermind. I'd like to ask you for another favor, if I might.\""; next; @@ -154,6 +160,7 @@ L_Check_Bones: set @state, 3; callsub S_Update_Mask; + goto L_Brought_Bones; L_Brought_Bones: mes "[Hamond]"; @@ -173,7 +180,10 @@ L_Brought_Bones: if (@woman > 5) menu "Would you tell me about this mage named Savaric?", L_Savaric, - "You're welcome.",-; + "You're welcome.",L_Welcome; + goto L_Welcome; + +L_Welcome: mes "[Hamond]"; mes "\"Please make yourself at home.\""; goto L_Close; @@ -192,6 +202,7 @@ L_Savaric: goto L_Man; mes "\"Well, I have been thinking about you. You seem to be a very helpful and wise person. Even my son told me good things about you, making a long speech about how great you are and your ability to comprehend and deal with delicate matters. I wonder how he reached that conclusion... But anyway, I'll tell you about Savaric.\""; next; + goto L_Jealousy; L_Jealousy: mes "[Hamond]"; @@ -244,7 +255,9 @@ L_News: "I'm enjoying myself.",L_Close; menu "I'm enjoying myself.",L_Close, - "I found out what happened to you and this place.",-; + "I found out what happened to you and this place.",L_FoundOut; + +L_FoundOut: mes "[Hamond]"; mes "\"You did? Amazing! Please tell me.\""; next; @@ -259,9 +272,11 @@ L_News: next; mes "Hamond seems about to break down."; menu - "Maybe it was just fate.",-, - "You got very upset, don't blame yourself",-, - "You're right. You were very violent. How could you do that if you love her?",-; + "Maybe it was just fate.",L_HamondFate, + "You got very upset, don't blame yourself",L_HamondFate, + "You're right. You were very violent. How could you do that if you love her?",L_HamondFate; + +L_HamondFate: mes "[Hamond]"; mes "\"I- I need to apologize.\""; next; -- cgit v1.2.3-60-g2f50