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/warps/cities/einbroch.txt | 9 --------- npc/warps/cities/gonryun.txt | 2 -- npc/warps/cities/mid_camp.txt | 1 - npc/warps/cities/prontera.txt | 2 -- npc/warps/dungeons/lhz_dun.txt | 2 +- npc/warps/dungeons/mosk_dun.txt | 7 +++---- npc/warps/pvp.txt | 1 - 7 files changed, 4 insertions(+), 20 deletions(-) (limited to 'npc/warps') diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt index bbb562a95..c05940360 100644 --- a/npc/warps/cities/einbroch.txt +++ b/npc/warps/cities/einbroch.txt @@ -22,7 +22,6 @@ ein_in01,13,213,0 warp ein_fa01a 1,1,einbroch,129,79 ein_in01,81,198,0 warp ein_fa02 1,1,einbroch,179,70 einbroch,179,73,0 warp ein_fa02a 1,1,ein_in01,81,203 - //========================================================================== //Einbroch - Near Train station //========================================================================== @@ -31,14 +30,12 @@ einbroch,233,312,0 warp ein_to01a 1,1,einbroch,214,260 einbroch,250,263,0 warp ein_to02 1,1,einbroch,269,315 einbroch,269,312,0 warp ein_to02a 1,1,einbroch,250,260 - //========================================================================== //Einbroch - Weapon shop //========================================================================== einbroch,216,214,0 warp ein_wp01 1,1,ein_in01,108,17 ein_in01,108,13,0 warp ein_wp01a 1,1,einbroch,216,211 - //========================================================================= //Einbroch - Hotel //========================================================================= @@ -59,7 +56,6 @@ ein_in01,232,176,0 warp ein_h07a 1,1,ein_in01,264,206 ein_in01,284,224,0 warp ein_h08 1,1,ein_in01,177,277 ein_in01,180,277,0 warp ein_h08a 1,1,ein_in01,280,224 - //========================================================================== //Einbroch - Building behind the hotel //========================================================================== @@ -70,20 +66,17 @@ ein_in01,100,142,0 warp ein_ho02a 1,1,ein_in01,123,85 einbroch,290,222,0 warp ein_ho03 1,1,ein_in01,121,80 ein_in01,121,77,0 warp ein_ho03a 1,1,einbroch,290,219 - //========================================================================== //Einbroch - House of Kapetain //========================================================================== einbroch,129,229,0 warp ein_kf01 1,1,ein_in01,14,147 ein_in01,11,147,0 warp ein_kf01a 1,1,einbroch,126,229 - //========================================================================= //Einbroch - Lab //========================================================================= ein_in01,286,25,0 warp ein_lab 1,1,einbroch,54,52 - //========================================================================= //Einbroch - Blacksmith guild //========================================================================= @@ -92,7 +85,6 @@ ein_in01,14,14,0 warp ein_jb01a 1,1,einbroch,255,110 ein_in01,39,36,0 warp ein_jb02 1,1,ein_in01,35,83 ein_in01,39,85,0 warp ein_jb02a 1,1,ein_in01,36,36 - //========================================================================== //Einbroch - Field related //========================================================================== @@ -100,4 +92,3 @@ einbroch,157,331,0 warp ein_fd01 1,1,ein_fild04,184,31 ein_fild04,184,26,0 warp ein_fd01a 1,1,einbroch,157,327 einbroch,150,25,0 warp ein_fd02 1,1,ein_fild08,164,377 ein_fild08,164,380,0 warp ein_fd02a 1,1,einbroch,150,28 - diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt index 1f74e02f5..b4e831dda 100644 --- a/npc/warps/cities/gonryun.txt +++ b/npc/warps/cities/gonryun.txt @@ -29,5 +29,3 @@ gon_in,42,35,0 warp gon_castle2-1 1,1,gon_in,34,97 gon_in,31,97,0 warp gon_castle2-2 1,1,gon_in,39,35 gonryun,161,8,0 warp gon_fild1-1 1,1,gon_fild01,191,261 gon_fild01,192,265,0 warp gon_fild1-2 1,1,gonryun,161,11 - - diff --git a/npc/warps/cities/mid_camp.txt b/npc/warps/cities/mid_camp.txt index b1e26b0ae..b6da7046a 100644 --- a/npc/warps/cities/mid_camp.txt +++ b/npc/warps/cities/mid_camp.txt @@ -42,4 +42,3 @@ mid_camp,266,260,0 warp mid_house1-1 1,1,mid_campin,284,124 mid_campin,282,124,0 warp mid_house1-2 1,1,mid_camp,263,260 mid_camp,163,231,0 warp mid_house2-1 1,1,mid_campin,376,133 mid_campin,376,136,0 warp mid_house2-2 1,1,mid_camp,163,234 - diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt index 7327b2901..2e446ec97 100644 --- a/npc/warps/cities/prontera.txt +++ b/npc/warps/cities/prontera.txt @@ -73,8 +73,6 @@ prt_church,168,19,0 warp prtch01-1 1,2,prt_church,105,81 prt_church,31,19,0 warp prtch02 1,2,prt_church,94,81 prt_church,90,81,0 warp prtch02-1 1,2,prt_church,27,19 - - //= Prontera Castle =========================================== prt_castle,102,129,0 warp prtca01 3,2,prt_castle,102,143 prt_castle,102,140,0 warp prtca01-1 3,2,prt_castle,102,126 diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt index b77b0d2ef..5ed05bd7c 100644 --- a/npc/warps/dungeons/lhz_dun.txt +++ b/npc/warps/dungeons/lhz_dun.txt @@ -201,7 +201,7 @@ lhz_cube,123,26,0 script cubew09-4 WARPNPC,1,1,{ callfunc "randomw"; end; } - + //----- Function for Random Warps ---------------------------- function script randomw { switch(rand(3)) { diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt index 7543b5a9b..b4b83e1bf 100644 --- a/npc/warps/dungeons/mosk_dun.txt +++ b/npc/warps/dungeons/mosk_dun.txt @@ -121,7 +121,7 @@ mosk_dun02,53,215,3 script Soldier1#mos 4_M_RUSKNIGHT,{ mes "We're called out for emergencies,"; mes "don't disturb us anymore."; close; - + OnInit: hideonnpc "Soldier1#mos"; end; @@ -137,7 +137,7 @@ mosk_dun02,50,217,3 script Soldier2#mos 4_M_RUSKNIGHT,{ mes "We're called out for emergencies,"; mes "don't disturb us anymore."; close; - + OnInit: hideonnpc "Soldier2#mos"; end; @@ -147,14 +147,13 @@ OnEnable: end; } - mosk_dun02,56,217,5 script Soldier3#mos 4_M_RUSKNIGHT,{ mes "[Soldier]"; mes "We're the Csar's soldiers."; mes "We're called out for emergencies,"; mes "don't disturb us anymore."; close; - + OnInit: hideonnpc "Soldier3#mos"; end; diff --git a/npc/warps/pvp.txt b/npc/warps/pvp.txt index c8276ce23..61f233910 100644 --- a/npc/warps/pvp.txt +++ b/npc/warps/pvp.txt @@ -171,4 +171,3 @@ pvp_n_8-4,150,71,0 warp Link#pt_link_1-41 1,1,pvp_n_8-4,0,0 pvp_n_8-4,144,166,0 warp Link#pt_link_1-42 1,1,pvp_n_8-4,0,0 // Invalid Warp //pvp_n_8-5,30,30,0 warp a 3,3,pvp_n_8-5,100,100 - -- cgit v1.2.3-70-g09d2