diff options
author | Haru <haru@dotalux.com> | 2015-09-18 13:09:16 +0200 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2015-09-25 12:55:36 +0200 |
commit | 1aea178ef7cdb76eda5600540b5fbd29fd54ff88 (patch) | |
tree | 855d4feafba212d7f36872c1b46814c1f1a85e75 /npc/cities | |
parent | e99bf73af31a8b1f09b9ce033c16832ee5cac51d (diff) | |
download | hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.gz hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.bz2 hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.xz hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.zip |
More aggressive whitespace cleanup. Follow up to 51329e6
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/cities')
-rw-r--r-- | npc/cities/amatsu.txt | 18 | ||||
-rw-r--r-- | npc/cities/ayothaya.txt | 10 | ||||
-rw-r--r-- | npc/cities/einbech.txt | 6 | ||||
-rw-r--r-- | npc/cities/einbroch.txt | 4 | ||||
-rw-r--r-- | npc/cities/geffen.txt | 6 | ||||
-rw-r--r-- | npc/cities/hugel.txt | 2 | ||||
-rw-r--r-- | npc/cities/jawaii.txt | 8 | ||||
-rw-r--r-- | npc/cities/morocc.txt | 1 | ||||
-rw-r--r-- | npc/cities/moscovia.txt | 2 | ||||
-rw-r--r-- | npc/cities/yuno.txt | 4 |
10 files changed, 29 insertions, 32 deletions
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index 54f23c853..3db68617e 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -165,7 +165,7 @@ amatsu,230,160,3 script Well-side Maiden#ama 4_F_JPN2,{ mes "It really gives me the creeps."; close; } - + amatsu,179,107,4 script John#ama 4_M_04,{ mes "[John]"; mes "Yo~"; @@ -222,7 +222,7 @@ amatsu,179,107,4 script John#ama 4_M_04,{ mes "I guess it's over..."; close; } - + amatsu,205,163,3 script Mimi#ama 4_F_JPNCHIBI,{ mes "[Mimi]"; mes "Puhuhu~!"; @@ -240,7 +240,7 @@ amatsu,205,163,3 script Mimi#ama 4_F_JPNCHIBI,{ mes "A lady can always use a little more makeup."; close; } - + amatsu,185,115,3 script Drunken Man#ama 4_M_JPNOJI2,{ mes "[Kosake]"; mes "*Hiccup*...My wife is just like,"; @@ -280,7 +280,7 @@ amatsu,185,115,3 script Drunken Man#ama 4_M_JPNOJI2,{ mes "If you buy me a drink, I will think about it...Hehehe...*Hiccup*.."; close; } - + amatsu,217,179,1 script Grandma#ama 4_F_JPNOBA2,{ mes "[Hatsue]"; mes "I'm worried about my husband."; @@ -292,7 +292,7 @@ amatsu,217,179,1 script Grandma#ama 4_F_JPNOBA2,{ mes "went to the bar and starts drinking again? The man just doesn't have any backbone. *Phew*"; close; } - + amatsu,287,266,3 script Jyaburo#ama 4_M_JPNOJI,{ mes "[Jyaburo]"; mes "This place is special to me."; @@ -372,7 +372,7 @@ amatsu,269,221,1 script Propose Girl#ama 4_F_JPN,{ mes "happy things will happen, if you do."; close; } - + amatsu,243,202,3 script Drama Teacher#ama 4_F_JPNOBA2,{ jap_tree = 2; mes "[Garakame sensei]"; @@ -417,7 +417,7 @@ amatsu,243,202,3 script Drama Teacher#ama 4_F_JPNOBA2,{ mes "someday when you are ready."; close; } - + amatsu,283,203,1 script Bonubonu#ama1 SEE_OTTER,{ end; } @@ -451,7 +451,7 @@ amatsu,283,203,1 script Bonubonu#ama2 HIDDEN_NPC,{ mes "It is really a miraculous and gracious tree..."; close; } - + amatsu,274,178,7 script Veterinarian#ama 4_M_JOB_WIZARD,{ jap_tree = 4; mes "[Sakura Seiichi]"; @@ -504,7 +504,7 @@ amatsu,274,178,7 script Veterinarian#ama 4_M_JOB_WIZARD,{ mes "Finally, I couldn't even hear anything. I can't even recall what he was trying to tell me...^000000"; close; } - + amatsu,262,197,1 script Legendary Tree HIDDEN_NPC,{ if (jap_tree == 1) { mes "^3355FFAs she mentioned, this tree"; diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt index db1a47a31..4eba67b7f 100644 --- a/npc/cities/ayothaya.txt +++ b/npc/cities/ayothaya.txt @@ -120,7 +120,7 @@ ayothaya,189,120,3 script Young Man#Thang 4_M_THAIONGBAK,{ mes "I think."; close; } - + ayothaya,171,152,5 script Girl#Lalitha 4_F_THAIAYO,{ .@sit = rand(1,5); if (.@sit > 0 && .@sit < 3) { @@ -191,7 +191,7 @@ ayothaya,171,152,5 script Girl#Lalitha 4_F_THAIAYO,{ mes "What's up?"; close; } - + ayothaya,143,102,5 script Old Man#ayothaya 4_M_THAIOLD,{ mes "[Villager]"; mes "Ummm."; @@ -236,7 +236,7 @@ ayothaya,143,102,5 script Old Man#ayothaya 4_M_THAIOLD,{ mes "at least once."; close; } - + ayothaya,197,189,5 script Young Man#1ayothaya 4_M_THAIAYO,{ mes "[Kwan]"; mes "Phew, isn't it"; @@ -262,7 +262,7 @@ ayothaya,197,189,5 script Young Man#1ayothaya 4_M_THAIAYO,{ mes "Well, anyway, it's still a really good idea to stay away from that place. I hope you enjoy visiting Ayotaya, and that you keep safe~"; close; } - + ayothaya,214,142,5 script Young Man#5ayothaya 4_M_THAIONGBAK,{ mes "[Detzi]"; mes "In Ayotaya, we have our own traditional martial arts. We, the young men of the village, practice our traditional martial arts in order to become strong."; @@ -271,7 +271,7 @@ ayothaya,214,142,5 script Young Man#5ayothaya 4_M_THAIONGBAK,{ mes "Why don't you learn our martial arts? I guarantee that it will help you greatly in your travels."; close; } - + ayothaya,241,264,5 script Young Man#5ayothaya2 4_M_THAIONGBAK,{ mes "[Eik]"; mes "Hey..."; diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt index d3d853846..428b680e0 100644 --- a/npc/cities/einbech.txt +++ b/npc/cities/einbech.txt @@ -429,7 +429,7 @@ ein_in01,279,92,3 script Tavern Lady#ein 4_M_EINMAN2,{ mes "freshly knit doilies?"; close; } - + ein_in01,277,95,7 script Ryan Danger#air#einbech 4_M_EINMAN,{ mes "[R.D. Kim]"; mes "Oooh..."; @@ -481,7 +481,7 @@ ein_in01,277,95,7 script Ryan Danger#air#einbech 4_M_EINMAN,{ mes "of his freakin' mind!)"; close; } - + ein_in01,281,85,3 script Drunken Man#einbech 4_M_DIEMAN,{ mes "[Drunken Man]"; mes "...^333333*Hiccup*^000000..."; @@ -740,7 +740,7 @@ einbech,46,107,6 script Shena#ein::EinMonsters 4_F_EINOLD,{ close; } } - + einbech,48,107,4 duplicate(EinMonsters) Luda#ein 4_F_EINWOMAN,{ einbech,148,242,5 script Jung#ein 4_M_EINMAN,{ diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt index 714b0bde6..b84a1d897 100644 --- a/npc/cities/einbroch.txt +++ b/npc/cities/einbroch.txt @@ -237,7 +237,7 @@ einbroch,232,272,3 script Train Station Staff#ein1::EinbrochTrain 4_M_EIN_SOLDIE close; } } - + einbroch,252,301,3 duplicate(EinbrochTrain) Train Station Staff#ein2 4_M_EIN_SOLDIER einbroch,259,326,3 script Leslie#ein_1 4_F_EINOLD,{ @@ -285,7 +285,7 @@ einbroch,236,191,3 script Tan#ein 4_M_EINMAN,{ mes "you should carry one with you."; close; } - + einbroch,228,121,5 script Little Toby#ein-1 4_M_EINMAN,{ mes "[Little Toby]"; mes "Excuse me..."; diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index a5d3e8354..58742ae48 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -181,7 +181,7 @@ geffen,111,48,0 script Stacey 4W_F_01,{ close; } } - + geffen_in,34,170,0 script Theodore 1_M_01,{ mes "[Theodore]"; mes "Hello!"; @@ -872,7 +872,7 @@ geffen_in,79,76,2 script Merchant Daven 2_M_PHARMACIST,{ } close; } - + geffen_in,114,73,5 script Hadenheim 4_M_SEAMAN,{ mes "[Hans Hadenheim]"; mes "Man, the Rune-Midgard continent sure is big! How's it going, youngster?"; @@ -1335,7 +1335,7 @@ geffen_in,39,127,2 script Psychic Advisor 4_M_BIBI,{ close; } } - + geffen_in,109,72,2 script Monster Scholar 4_F_01,{ mes "[Estheres]"; mes "Hello, I'm the resident expert of Monsterology here in Geffen. Is there anything in particular that you're curious about?"; diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt index aae031ebd..5d3458799 100644 --- a/npc/cities/hugel.txt +++ b/npc/cities/hugel.txt @@ -55,7 +55,7 @@ hugel,126,151,3 script Emily 4_F_01,{ mes "Don't you think that sounds weird?"; close; } - + hugel,86,165,5 script Kayplas 4_M_HUBOY,{ mes "[Kayplas]"; mes "Ooh, I really want to"; diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 85a993c89..a8cc57ee2 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -624,7 +624,7 @@ jawaii_in,30,96,4 script Employee#jaw6 4_F_07,{ } mes "I hope you will have a good time."; close; - + OnWelcome: emotion e_kis; end; @@ -714,7 +714,7 @@ OnTouch: donpcevent "Employee#jaw1::OnSolo"; end; } - + jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{ if (checkweight(1201,1) == 0) { mes "^3355FF * Wait a minute! *"; @@ -1113,7 +1113,7 @@ S_KillChar: mes "[Bartender]"; return; } - + jawaii_in,43,115,0 script Customer#jaw_1 4W_M_01,{ if (!getpartnerid()) { if (Zeny > 99) { @@ -1388,7 +1388,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{ mes "Is this the third time this week I've gotten plastered? Bachewcca, help me count!"; close; } - + prt_in,170,14,0 script Customer#Bachewcca 4_M_ORIENT02,{ mes "[Bachewcca]"; mes ".............."; diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index e2ca328df..70b652508 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -777,4 +777,3 @@ moc_fild16,200,231,4 duplicate(SinGuard) Assassin Guardian#5 4_M_MOC_SOLDIER moc_fild16,211,231,4 duplicate(SinGuard) Assassin Guardian#6 4_M_MOC_SOLDIER moc_fild16,200,257,4 duplicate(SinGuard) Assassin Guardian#7 4_M_MOC_SOLDIER moc_fild16,211,257,4 duplicate(SinGuard) Assassin Guardian#8 4_M_MOC_SOLDIER - diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt index 74c121836..e6653fef0 100644 --- a/npc/cities/moscovia.txt +++ b/npc/cities/moscovia.txt @@ -46,7 +46,6 @@ mes "I'll help you to have a nice trip"; mes "to Moscovia!"; close; - case 2: mes "[Moscovia P.R. Officer]"; mes "Ok then, let us start now."; @@ -114,7 +113,6 @@ moscovia,166,53,4 script Moscovia P.R. Officer#2 4_F_RUSWOMAN2,{ end; } - // Moscovia Palace :: mos_swan //============================================================ moscovia,253,166,4 script Soldier#mosk1 4_M_RUSKNIGHT,{ diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt index cda19d322..526a91551 100644 --- a/npc/cities/yuno.txt +++ b/npc/cities/yuno.txt @@ -56,7 +56,7 @@ yuno,184,173,4 script Freidrich#juno 4_F_NOVICE,{ close; } } - + yuno,337,227,4 script Juno Granny#juno 8_F_GRANDMOTHER,{ mes "[Granny]"; if (rand(1,50) == 1) { @@ -195,7 +195,7 @@ yuno,165,111,4 script Juno Sage#juno 2_F_MAGICMASTER,,{ close; } } - + yuno,157,205,4 script Juno Artisan#juno 1_M_JOBGUIDER,{ mes "[Artisan]"; mes "*Mumble mumble...*"; |