From 1aea178ef7cdb76eda5600540b5fbd29fd54ff88 Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 18 Sep 2015 13:09:16 +0200 Subject: More aggressive whitespace cleanup. Follow up to 51329e6 Signed-off-by: Haru --- npc/events/MemorialDay_2008.txt | 172 +++++++++++++++++----------------------- 1 file changed, 71 insertions(+), 101 deletions(-) (limited to 'npc/events/MemorialDay_2008.txt') diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt index a6c09fe80..c6628ef12 100644 --- a/npc/events/MemorialDay_2008.txt +++ b/npc/events/MemorialDay_2008.txt @@ -65,9 +65,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ mes "Bring me ^FF000030 Fabric and 20 Fluffs^000000."; Memorial08 = 1; close; - } - - else if (Memorial08 == 1) { + } else if (Memorial08 == 1) { if (countitem(1059) < 30 || countitem(914) < 20) { mes "[Mad Sago Lauds]"; mes "What are these? They aren't enough?!"; @@ -94,9 +92,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ Memorial08 = 2; close; } - } - - else if (Memorial08 == 2) { + } else if (Memorial08 == 2) { mes "[Mad Sago Lauds]"; mes "Ah, you have fluffy new towel now I even put your name on it"; next; @@ -116,22 +112,16 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ mes "What a shame! You should go speak to ^FF0000Grast in Prontera^000000."; Memorial08 = 3; close; - } - - else if (Memorial08 == 3) { + } else if (Memorial08 == 3) { mes "[Mad Sago Lauds]"; mes "What are you still doing here?"; mes "I told you to go speak to Grast in Prontera!"; close; - } - - else if (Memorial08 == 4 || Memorial08 == 5 || Memorial08 == 6) { + } else if (Memorial08 == 4 || Memorial08 == 5 || Memorial08 == 6) { mes "[Mad Sago Lauds]"; mes "Go help Grast, and then come back."; close; - } - - else if (Memorial08 == 7) { + } else if (Memorial08 == 7) { mes "[Mad Sago Lauds]"; mes "Oh, you've brought them all."; mes "Hahaha!"; @@ -151,16 +141,12 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ mes "You should be going to the plaque!"; Memorial08 = 8; close; - } - - else if (Memorial08 == 8) { + } else if (Memorial08 == 8) { mes "[Mad Sago Lauds]"; mes "Stop trying to give me your garbage!"; mes "Go to the plaque at 12 o'clock direction in Prontera for your journey!"; close; - } - - else if (Memorial08 >= 9) { + } else if (Memorial08 >= 9) { .@RandomMsg = rand(1,5); if (.@RandomMsg == 1) { mes "[Mad Sago Lauds]"; @@ -191,7 +177,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ } } } - + // Memorial Plaque //============================================================ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{ @@ -199,9 +185,7 @@ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{ mes "[" + strcharinfo(0) + "]"; mes "- It's a dusty old plaque.-"; close; - } - - else if (Memorial08 == 8) { + } else if (Memorial08 == 8) { mes "[" + strcharinfo(0) + "]"; mes "- It's a dusty old plaque.-"; mes "'This must be what Lauds was talking about.'"; @@ -210,43 +194,41 @@ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{ Memorial08 = 9; getexp 93750,43750; goto L_CleanPlaque; - } - - else if (Memorial08 >= 9) { + } else if (Memorial08 >= 9) { goto L_CleanPlaque; } - - L_CleanPlaque: - mes "- You see a message from the cleaned plaque.-"; - next; - mes "-Although no sculptured marble should rise to their memory,-"; - mes "-nor engraved stone bear record of their deeds,-"; - mes "-yet will their remembrance be as lasting as the land they honored.-"; - mes "-Daniel Webster-"; - if (Memorial08 == 9) { - getexp 93750,43750; - } - next; - mes "-There's another message.-"; - next; - mes "-I may not have gone where I intended to go,-"; - mes "-but I think I have ended up where I needed to be.-"; - mes "- Douglas Adams.-"; - if (Memorial08 == 9) { - getexp 93750,43750; - } - next; - mes "-This is the last message.-"; - next; - mes "-True heroism is remarkably sober, very undramatic.-"; - mes "-It is not the urge to surpass all others at whatever cost,-"; - mes "- but the urge to serve others at whatever cost. -"; - mes "- Arthur Ashe -"; - if (Memorial08 == 9) { - getexp 93750,43750; - Memorial08 = 10; - } - close; + +L_CleanPlaque: + mes "- You see a message from the cleaned plaque.-"; + next; + mes "-Although no sculptured marble should rise to their memory,-"; + mes "-nor engraved stone bear record of their deeds,-"; + mes "-yet will their remembrance be as lasting as the land they honored.-"; + mes "-Daniel Webster-"; + if (Memorial08 == 9) { + getexp 93750,43750; + } + next; + mes "-There's another message.-"; + next; + mes "-I may not have gone where I intended to go,-"; + mes "-but I think I have ended up where I needed to be.-"; + mes "- Douglas Adams.-"; + if (Memorial08 == 9) { + getexp 93750,43750; + } + next; + mes "-This is the last message.-"; + next; + mes "-True heroism is remarkably sober, very undramatic.-"; + mes "-It is not the urge to surpass all others at whatever cost,-"; + mes "- but the urge to serve others at whatever cost. -"; + mes "- Arthur Ashe -"; + if (Memorial08 == 9) { + getexp 93750,43750; + Memorial08 = 10; + } + close; } // Grast @@ -257,9 +239,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ mes "Memorial Day is a sad and yet glorious day."; mes "I wonder how many people remember them..."; close; - } - - else if (Memorial08 == 3) { + } else if (Memorial08 == 3) { mes "[Grast]"; mes "Oh, isn't that a Towel of Memory?"; mes "I'm so glad to meet someone who understands the meaning of Memorial Day."; @@ -275,9 +255,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ mes "I'll be waiting for your return."; Memorial08 = 4; close; - } - - else if (Memorial08 == 4) { + } else if (Memorial08 == 4) { if (countitem(501) < 1 || countitem(506) < 1 || countitem(656) < 1 || countitem(602) < 1) { mes "[Grast]"; mes "Oops, you haven't brought all materials."; @@ -306,9 +284,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ Memorial08 = 5; close; } - } - - else if (Memorial08 == 5) { + } else if (Memorial08 == 5) { if (countitem(1065) < 1 || countitem(610) < 1 || countitem(717) < 1 || countitem(747) < 1 || countitem(517) < 1 || countitem(515) < 1) { mes "[Grast]"; mes "Oops, you haven't brought all materials."; @@ -333,9 +309,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ Memorial08 = 6; close; } - } - - else if (Memorial08 == 6) { + } else if (Memorial08 == 6) { if (countitem(643) < 1 || countitem(12018) < 1 || countitem(741) < 1 || countitem(745) < 1) { mes "[Grast]"; mes "Oops, you haven't brought all materials."; @@ -388,42 +362,38 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ getitem 12109,1; close; } - } - - else if (Memorial08 == 7) { + } else if (Memorial08 == 7) { mes "[Grast]"; mes "Have you met Lauds?"; mes "I hope you'll remember your freedom and happiness are built on thousands of lives sacrificed in war."; close; - } - - else if (Memorial08 >= 8) { + } else if (Memorial08 >= 8) { mes "[Grast]"; mes "A towel is about the most massively useful thing an adventurer can have."; close; } - L_GiveUp: - mes "[Grast]"; - mes "Oh, I see. I guess you're quite busy nowadays, huh?"; - mes "No problem; I'll give you all the supplies..."; - next; - mes "[Grast]"; - mes "There you go."; - mes "I crushed all the items together into a more compact form for you."; - mes "You can thank me later for that extra service."; - mes "Please bring them to Lauds."; - Memorial08 = 7; - getitem 7126,1; - next; - mes "[Grast]"; - mes "By the way, he had an unfortunate accident, and has kind of lost his mind."; - mes "Please don't be alarmed even if he starts babbling."; - close; - - L_Continue: - mes "[Grast]"; - mes "That's a good idea."; - mes "Then I'll be waiting for your return."; - close; +L_GiveUp: + mes "[Grast]"; + mes "Oh, I see. I guess you're quite busy nowadays, huh?"; + mes "No problem; I'll give you all the supplies..."; + next; + mes "[Grast]"; + mes "There you go."; + mes "I crushed all the items together into a more compact form for you."; + mes "You can thank me later for that extra service."; + mes "Please bring them to Lauds."; + Memorial08 = 7; + getitem 7126,1; + next; + mes "[Grast]"; + mes "By the way, he had an unfortunate accident, and has kind of lost his mind."; + mes "Please don't be alarmed even if he starts babbling."; + close; + +L_Continue: + mes "[Grast]"; + mes "That's a good idea."; + mes "Then I'll be waiting for your return."; + close; } -- cgit v1.2.3-70-g09d2