From a00579f57be4f02cd2a60ecd9468277ba6631e78 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 2 Apr 2014 22:33:31 -0700 Subject: Fix style (split for more readable diff) --- world/map/npc/009-2/airlia.txt | 8 ++++---- world/map/npc/009-2/alan.txt | 33 ++++++++++++++------------------- world/map/npc/009-2/doctor.txt | 7 +++---- world/map/npc/009-2/nicholas.txt | 1 - world/map/npc/009-2/nurse.txt | 9 ++++----- world/map/npc/009-2/wyara.txt | 11 +++++------ 6 files changed, 30 insertions(+), 39 deletions(-) (limited to 'world/map/npc/009-2') diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt index 7c29ef75..0071c7e7 100644 --- a/world/map/npc/009-2/airlia.txt +++ b/world/map/npc/009-2/airlia.txt @@ -54,10 +54,10 @@ L_Caretaker: "Sorry, no.", L_Next, "My what?", L_Caretaker_mount; //else == - menu - "Sorry, no.", L_Next, - "I have a letter from your father.", L_Caretaker_first_reward, - "My what?", L_Caretaker_mount; + menu + "Sorry, no.", L_Next, + "I have a letter from your father.", L_Caretaker_first_reward, + "My what?", L_Caretaker_mount; goto L_Next; L_Next: diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt index ba9e1f30..6d39e3e2 100644 --- a/world/map/npc/009-2/alan.txt +++ b/world/map/npc/009-2/alan.txt @@ -35,10 +35,9 @@ "OK, thanks.", L_Close, "Can you make me a really good bow?", L_State_0_1, "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer; - //else - menu - "OK, thanks.", L_Close, - "Can you make me a really good bow?", L_State_0_1; + menu + "OK, thanks.", L_Close, + "Can you make me a really good bow?", L_State_0_1; L_State_0_1: mes "[Alan]"; @@ -84,10 +83,9 @@ L_State_1: "No, I haven't had the time yet.", L_Close, "No, I didn't find him yet.", L_State_1_1, "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer; - //else - menu - "No, I haven't had the time yet.", L_Close, - "No, I didn't find him yet.", L_State_1_1; + menu + "No, I haven't had the time yet.", L_Close, + "No, I didn't find him yet.", L_State_1_1; L_State_1_1: mes "[Alan]"; @@ -102,9 +100,8 @@ L_State_2: menu "Yes, I did. He said that the trees turned into dangerous monsters.", L_Foo, "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer; - //else - menu - "Yes, I did. He said that the trees turned into dangerous monsters.", L_Foo; + menu + "Yes, I did. He said that the trees turned into dangerous monsters.", L_Foo; L_Foo: mes "[Alan]"; mes "\"Oh, that's really bad news. Maybe you can do his job?"; @@ -125,10 +122,9 @@ L_State_3: "Here, take a look!", L_State_3_try, "Yes, but I need it for something else.", L_Close, "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer; - //else - menu - "Here, take a look!", L_State_3_try, - "Yes, but I need it for something else.", L_Close; + menu + "Here, take a look!", L_State_3_try, + "Yes, but I need it for something else.", L_Close; L_State_3_try: if (countitem("RawLog") < 1) @@ -171,10 +167,9 @@ L_State_4: "10,000??? What a ripoff!", L_Close, "Sure, here you go!", L_State_4_pay, "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer; - //else - menu - "10,000??? What a ripoff!", L_Close, - "Sure, here you go!", L_State_4_pay; + menu + "10,000??? What a ripoff!", L_Close, + "Sure, here you go!", L_State_4_pay; L_State_4_pay: if (Zeny < 10000) diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt index e9905c77..d3f5a1c5 100644 --- a/world/map/npc/009-2/doctor.txt +++ b/world/map/npc/009-2/doctor.txt @@ -18,10 +18,9 @@ "I think I am sick!", L_Cure, "No, I feel fine.", L_Next, "Have you seen anything strange in town? Anything that might have to do with the robberies?", L_NohMask; - //else - menu - "I think I am sick!", L_Cure, - "No, I feel fine.", L_Next; + menu + "I think I am sick!", L_Cure, + "No, I feel fine.", L_Next; L_Next: mes "[Doctor]"; diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt index 8c105b02..edcb2321 100644 --- a/world/map/npc/009-2/nicholas.txt +++ b/world/map/npc/009-2/nicholas.txt @@ -324,7 +324,6 @@ L_WhereLeather: mes "\"Hmm. You should look for someone who can work with some kind of leather. Rumor has it that there is someone in the eastern desert who can, but I haven't been there.\""; close; - L_SetzerQuest: mes "[Nicholas]"; if (@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER) diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt index 3fbbc536..2320297e 100644 --- a/world/map/npc/009-2/nurse.txt +++ b/world/map/npc/009-2/nurse.txt @@ -66,11 +66,10 @@ L_Usual: "I don't feel so well, I might be sick.", L_Doctor, "Have you seen anything out of the ordinary?", L_NohMask, "No, I'm fine.", L_Next; - //else - menu - "Oooh, these wounds! They hurt so much!", L_Heal, - "I don't feel so well, I might be sick.", L_Doctor, - "No, I'm fine.", L_Next; + menu + "Oooh, these wounds! They hurt so much!", L_Heal, + "I don't feel so well, I might be sick.", L_Doctor, + "No, I'm fine.", L_Next; L_Next: mes "[Nurse]"; diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt index adcc7f6e..da2b8dc5 100644 --- a/world/map/npc/009-2/wyara.txt +++ b/world/map/npc/009-2/wyara.txt @@ -47,12 +47,11 @@ L_Main: "Can you help me learn magic?", L_Magic, "I would like to buy potions.", L_Shop, "Bye!", L_Close; - //else - menu - "What do you know about...", L_Question, - "Can you help me learn magic?", L_Magic, - "I would like to buy potions.", L_Shop, - "Bye!", L_Close; + menu + "What do you know about...", L_Question, + "Can you help me learn magic?", L_Magic, + "I would like to buy potions.", L_Shop, + "Bye!", L_Close; L_Shop: mes "[Wyara the Witch]"; -- cgit v1.2.3-60-g2f50