diff options
Diffstat (limited to 'npc/warps')
-rw-r--r-- | npc/warps/cities/aldebaran.txt | 2 | ||||
-rw-r--r-- | npc/warps/cities/amatsu.txt | 9 | ||||
-rw-r--r-- | npc/warps/cities/louyang.txt | 9 | ||||
-rw-r--r-- | npc/warps/cities/payon.txt | 4 | ||||
-rw-r--r-- | npc/warps/cities/yuno.txt | 2 | ||||
-rw-r--r-- | npc/warps/dungeons/ant_hell.txt | 2 | ||||
-rw-r--r-- | npc/warps/einbroch.txt | 111 | ||||
-rw-r--r-- | npc/warps/fields/amatsu_fild.txt | 11 | ||||
-rw-r--r-- | npc/warps/fields/yuno_fild.txt | 48 |
9 files changed, 173 insertions, 25 deletions
diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt index 8523cf5a8..7376c21fa 100644 --- a/npc/warps/cities/aldebaran.txt +++ b/npc/warps/cities/aldebaran.txt @@ -15,7 +15,7 @@ //===== Al De Baran Warps ===================================== aldebaran.gat,118,63,0 warp ald01 1,1,aldeba_in.gat,211,117 -aldebaran.gat,138,34,0 warp ald001 2,2,mjolnir_12.gat,199,375 +aldebaran.gat,139,34,0 warp ald001 3,2,mjolnir_12.gat,199,375 aldebaran.gat,197,70,0 warp ald02 1,1,aldeba_in.gat,94,41 aldebaran.gat,225,54,0 warp ald03 1,1,aldeba_in.gat,149,120 aldebaran.gat,233,105,0 warp ald04 1,1,aldeba_in.gat,157,190 diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt index 29a6c80af..7d19d5f70 100644 --- a/npc/warps/cities/amatsu.txt +++ b/npc/warps/cities/amatsu.txt @@ -18,13 +18,13 @@ ama_in01.gat,157,25,0 warp warp1969 1,1,amatsu.gat,213,116 ama_in01.gat,161,34,0 warp warp1970 1,1,ama_in01.gat,166,77 ama_in01.gat,166,73,0 warp warp1971 1,1,ama_in01.gat,162,32 ama_in01.gat,174,120,0 warp warp2011 1,1,amatsu.gat,217,146 -ama_in01.gat,174,170,0 warp warp2012 1,1,amatsu.gat,52,144 +ama_in01.gat,174,170,0 warp warp2012 1,1,ama_fild01.gat,174,328 ama_in01.gat,31,176,0 warp warp2010 1,1,amatsu.gat,42,110 ama_in01.gat,32,24,0 warp warp1963 1,1,amatsu.gat,98,117 ama_in01.gat,34,97,0 warp warp1965 1,1,amatsu.gat,168,178 ama_in01.gat,77,177,0 warp warp1967 1,1,amatsu.gat,246,160 ama_in01.gat,86,23,0 warp warp2009 1,1,amatsu.gat,130,148 -ama_in01.gat,88,94,0 warp warp2008 1,1,amatsu.gat,99,148 +ama_in01.gat,88,94,0 warp warp2008 1,1,amatsu.gat,52,145 ama_in02.gat,127,163,0 warp warp1980 1,1,ama_in02.gat,220,161 ama_in02.gat,195,44,0 warp warp1973 1,1,ama_in02.gat,65,40 ama_in02.gat,215,150,0 warp warp1978 1,1,ama_in02.gat,59,156 @@ -46,7 +46,8 @@ amatsu.gat,217,149,0 warp warp1987 1,1,ama_in01.gat,174,122 amatsu.gat,247,290,0 warp warp1960 1,1,ama_fild01.gat,73,32 amatsu.gat,249,160,0 warp warp1966 1,1,ama_in01.gat,79,178 amatsu.gat,40,110,0 warp warp1995 1,1,ama_in01.gat,28,176 -amatsu.gat,52,148,0 warp warp1994 1,1,ama_in01.gat,174,172 +amatsu.gat,52,148,0 warp warp1994 1,1,ama_in01.gat,88,97 amatsu.gat,85,235,0 warp warp1972 1,1,ama_in02.gat,224,45 -amatsu.gat,95,148,0 warp warp1990 1,1,ama_in01.gat,88,97 +//removed +//amatsu.gat,95,148,0 warp warp1990 1,1,ama_in01.gat,88,97 amatsu.gat,96,118,0 warp warp1962 1,1,ama_in01.gat,31,23
\ No newline at end of file diff --git a/npc/warps/cities/louyang.txt b/npc/warps/cities/louyang.txt index c39a8dcf0..480d0a316 100644 --- a/npc/warps/cities/louyang.txt +++ b/npc/warps/cities/louyang.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version 6.0+ //===== Description: ========================================= //= Warp Points for Lou Yang //===== Additional Comments: ================================= -//= No comment! +//= 1.1 Added 2 escapes from 2 mountains 018,019 [Lupus] +//= Some players used to stuck there after warps //============================================================ //= Lou Yang Town ============================================ @@ -44,5 +45,5 @@ lou_in02.gat,121,32,0 warp louwarp014a 3,3,louyang.gat,317,173 lou_in02.gat,71,28,0 warp louwarp015a 3,3,louyang.gat,130,57 lou_in02.gat,189,74,0 warp louwarp007a 3,3,louyang.gat,309,76 lou_fild01.gat,232,357,0 warp louwarp001a 3,3,louyang.gat,217,26 - - +louyang.gat,90,253,0 warp louwarp018 3,3,louyang.gat,94,268 +lou_fild01.gat,181,171,0 warp louwarp019 3,3,lou_fild01.gat,194,169 diff --git a/npc/warps/cities/payon.txt b/npc/warps/cities/payon.txt index 0d03800fe..78231e4ef 100644 --- a/npc/warps/cities/payon.txt +++ b/npc/warps/cities/payon.txt @@ -5,7 +5,7 @@ //= Darkchild (1.1) //= Nana (1.3) //===== Current Version: ===================================== -//= 1.3 +//= 1.3.1 //===== Compatible With: ===================================== //= Any eAthena Mod //===== Description: ========================================= @@ -134,4 +134,4 @@ payon_in03.gat,27,172,0 warp payonwarp086 2,2,payon_in03.gat,27,157 payon_in01.gat,86,9,0 warp payonwarp087 2,2,payon.gat,266,152 payon.gat,270,152,0 warp payonwarp088 2,2,payon_in01.gat,90,9 payon_in01.gat,107,71,0 warp payonwarp089 2,2,payon_in01.gat,96,37 -payon_in01.gat,93,37,0 warp payonwarp090 2,2,payon_in01.gat,103,71
\ No newline at end of file +payon_in01.gat,93,37,0 warp payonwarp090 2,2,payon_in01.gat,104,71
\ No newline at end of file diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt index 9232e7f88..402e506f7 100644 --- a/npc/warps/cities/yuno.txt +++ b/npc/warps/cities/yuno.txt @@ -13,7 +13,7 @@ //============================================================ //= Yuno City ================================================ -yuno.gat,158,15,0 warp yun-yunfild 1,1,yuno_fild04.gat,231,209 +yuno.gat,158,15,0 warp yun-yunfild 1,1,yuno_fild04.gat,231,284 yuno.gat,117,135,0 warp yun01 1,1,yuno_in01.gat,116,37 yuno_in01.gat,116,40,0 warp yun02 1,1,yuno.gat,120,138 yuno.gat,48,105,0 warp yun03 1,1,yuno_in01.gat,37,176 diff --git a/npc/warps/dungeons/ant_hell.txt b/npc/warps/dungeons/ant_hell.txt index f32615499..4d4d48bbf 100644 --- a/npc/warps/dungeons/ant_hell.txt +++ b/npc/warps/dungeons/ant_hell.txt @@ -19,7 +19,7 @@ anthell01.gat,35,267,0 script ant001 45,1,1,{ moc15: warp "moc_fild15.gat",251,248; break; } anthell02.gat,171,169,0 script ant001 45,1,2,{ - if(!anthell==0) goto moc15; + if(anthell==0) goto moc15; moc04: warp "moc_fild04.gat",213,327; break; moc15: warp "moc_fild15.gat",251,248; break; } diff --git a/npc/warps/einbroch.txt b/npc/warps/einbroch.txt new file mode 100644 index 000000000..2ffe1b2c9 --- /dev/null +++ b/npc/warps/einbroch.txt @@ -0,0 +1,111 @@ +//Einbroch and Einbech warps by Sara - Semi-final 2 +//Einbroch Field <-> Juno Field +yuno_fild04.gat,251,21,0 warp ein001 1,1,ein_fild06.gat,252,363 +ein_fild06.gat,252,365,0 warp ein001a 1,1,yuno_fild04.gat,251,23 +yuno_fild07.gat,73,219,0 warp ein002 1,1,ein_fild06.gat,338,170 +ein_fild06.gat,340,170,0 warp ein002a 1,1,yuno_fild07.gat,75,219 +yuno_fild07.gat,56,76,0 warp ein003 1,1,ein_fild06.gat,354,94 +ein_fild06.gat,356,94,0 warp ein003a 1,1,yuno_fild07.gat,58,76 +yuno_fild11.gat,28,266,0 warp ein004 1,1,ein_fild07.gat,380,263 +ein_fild07.gat,382,263,0 warp ein004a 1,1,yuno_fild11.gat,30,266 + +//Einbroch Field +ein_fild06.gat,135,35,0 warp ein005 1,1,ein_fild07.gat,147,360 +ein_fild07.gat,145,362,0 warp ein005a 1,1,ein_fild07.gat,135,37 +ein_fild07.gat,191,42,0 warp ein006 1,1,ein_fild10.gat,194,370 +ein_fild10.gat,194,372,0 warp ein006a 1,1,ein_fild07.gat,191,44 +ein_fild10.gat,24,331,0 warp ein007 1,1,ein_fild09.gat,327,346 +ein_fild09.gat,329,346,0 warp ein007a 1,1,ein_fild10.gat,26,331 +ein_fild09.gat,34,132,0 warp ein008 1,1,ein_fild08.gat,361,128 +ein_fild08.gat,363,128,0 warp ein008a 1,1,ein_fild09.gat,36,132 + +//Einbroch Field <-> Einbroch and Einbech +ein_fild08.gat,164,381,0 warp ein009 1,1,einbroch.gat,150,26 +einbroch.gat,150,24,0 warp ein009a 1,1,ein_fild08.gat,164,379 +ein_fild09.gat,70,353,0 warp ein010 1,1,einbech.gat,62,31 +einbech.gat,62,29,0 warp ein010a 1,1,ein_fild09.gat,72,353 + +//Dungeon Warps +einbech.gat,139,253,0 warp ein011 1,1,ein_dun01.gat,22,17 +ein_dun01.gat,22,15,0 warp ein011a 1,1,einbech.gat,139,251 +ein_dun01.gat,262,256,0 warp ein012 1,1,ein_dun02.gat,292,290 +ein_dun02.gat,292,292,0 warp ein012a 1,1,ein_dun01.gat,262,258 + +//Inside Warps +ein_in01.gat,13,213,0 warp ein013 1,1,einbroch.gat,131,80 +einbroch.gat,133,80,0 warp ein013a 1,1,ein_in01.gat,15,213 +ein_in01.gat,110,267,0 warp ein014 1,1,einbroch.gat,204,120 +einbroch.gat,202,120,0 warp ein014a 1,1,ein_in01.gat,108,267 +ein_in01.gat,110,236,0 warp ein015 1,1,einbroch.gat,204,100 +einbroch.gat,202,100,0 warp ein015a 1,1,ein_in01.gat,108,236 +ein_in01.gat,80,199,0 warp ein016 1,1,einbroch.gat,178,71 +einbroch.gat,178,73,0 warp ein016a 1,1,ein_in01.gat,80,201 +ein_in01.gat,195,224,0 warp ein017 1,1,einbroch.gat,255,200 +einbroch.gat,257,200,0 warp ein017a 1,1,ein_in01.gat,197,224 +ein_in01.gat,211,232,0 warp ein018 1,1,ein_in01.gat,273,232 +ein_in01.gat,271,232,0 warp ein018a 1,1,ein_in01.gat,209,232 +ein_in01.gat,211,216,0 warp ein019 1,1,ein_in01.gat,273,218 +ein_in01.gat,271,218,0 warp ein019a 1,1,ein_in01.gat,209,216 +ein_in01.gat,181,277,0 warp ein020 1,1,ein_in01.gat,281,224 +ein_in01.gat,283,224,0 warp ein020a 1,1,ein_in01.gat,179,277 +ein_in01.gat,232,273,0 warp ein021 1,1,ein_in01.gat,274,244 +ein_in01.gat,274,246,0 warp ein021a 1,1,ein_in01.gat,232,275 +ein_in01.gat,273,273,0 warp ein022 1,1,ein_in01.gat,264,244 +ein_in01.gat,264,246,0 warp ein022a 1,1,ein_in01.gat,273,275 +ein_in01.gat,232,176,0 warp ein023 1,1,ein_in01.gat,264,205 +ein_in01.gat,264,203,0 warp ein023a 1,1,ein_in01.gat,232,174 +ein_in01.gat,274,176,0 warp ein024 1,1,ein_in01.gat,274,205 +ein_in01.gat,274,203,0 warp ein024a 1,1,ein_in01.gat,274,174 + +//House with couches +//- Bottom-left doorway +//ein_in01.gat,11,147,0 warp ein025 1,1,mapname.gat,x,y +//mapname.gat,x,y,0 warp ein025a 1,1,ein_in01.gat,13,147 +//- Top-right doorway +//ein_in01.gat,26,131,0 warp ein026 1,1,mapname.gat,x,y +//mapname.gat,x,y,0 warp ein026a 1,1,ein_in01.gat,26,133 + +ein_in01.gat,145,152,0 warp ein027 1,1,einbech.gat,253,110 +einbech.gat,255,110,0 warp ein027a 1,1,ein_in01.gat,147,152 +ein_in01.gat,39,85,0 warp ein028 1,1,ein_in01.gat,37,36 +ein_in01.gat,39,36,0 warp ein028a 1,1,ein_in01.gat,37,85 +ein_in01.gat,14,13,0 warp ein029 1,1,einbroch.gat,255,109 +einbroch.gat,255,107,0 warp ein029a 1,1,ein_in01.gat,14,15 + +//2 floor laboratory-ish house +//- Left Exit +//ein_in01.gat,103,95,0 warp ein030 1,1,mapname.gat,x,y +//mapname.gat,x,y,0 warp ein030a 1,1,ein_in01.gat,105,95 +//- Right Exit +//ein_in01.gat,120,77,0 warp ein031 1,1,mapname.gat,x,y +//mapname.gat,x,y,0 warp ein031a 1,1,ein_in01.gat,120,79 +//- Elevator +ein_in01.gat,126,88,0 warp ein032 1,1,ein_in01.gat,100,140 +ein_in01.gat,100,142,0 warp ein032a 1,1,ein_in01.gat,126,86 + +//House +//- Bottom-left doorway +//ein_in01.gat,187,98,0 warp ein033 1,1,mapname.gat,x,y +//mapname.gat,x,y,0 warp ein033a 1,1,ein_in01.gat,189,98 +//- Top-right doorway +//ein_in01.gat,204,81,0 warp ein034 1,1,mapname.gat,x,y +//mapname.gat,x,y,0 warp ein034a 1,1,ein_in01.gat,204,83 + +ein_in01.gat,265,105,0 warp ein035 1,1,einbech.gat,143,112 +einbech.gat,145,112,0 warp ein035a 1,1,ein_in01.gat,267,105 +ein_in01.gat,288,89,0 warp ein036 1,1,einbech.gat,155,106 +einbech.gat,153,106,0 warp ein036a 1,1,ein_in01.gat,286,89 +ein_in01.gat,108,13,0 warp ein037 1,1,einbroch.gat,217,212 +einbroch.gat,217,214,0 warp ein037a 1,1,ein_in01.gat,108,15 +ein_in01.gat,200,32,0 warp ein038 1,1,einbech.gat,170,144 +einbech.gat,170,146,0 warp ein038a 1,1,ein_in01.gat,200,30 +ein_in01.gat,189,37,0 warp ein039 1,1,einbech.gat,177,136 +einbech.gat,177,138,0 warp ein039a 1,1,ein_in01.gat,189,35 +ein_in01.gat,288,25,0 warp ein040 1,1,einbroch.gat,52,52 +einbroch.gat,50,52,0 warp ein040a 1,1,ein_in01.gat,286,25 +airport.gat,125,14,0 warp ein041 1,1,airport.gat,19,20 +airport.gat,19,18,0 warp ein041a 1,1,airport.gat,123,14 +airport.gat,160,14,0 warp ein042 1,1,airport.gat,48,20 +airport.gat,48,18,0 warp ein042a 1,1,airport.gat,162,14 +einbroch.gat,64,208,0 warp ein043 1,1,airport.gat,143,15 +airport.gat,143,13,0 warp ein043a 1,1,einbroch.gat,64,206
\ No newline at end of file diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt index 56506edc7..19df68ff5 100644 --- a/npc/warps/fields/amatsu_fild.txt +++ b/npc/warps/fields/amatsu_fild.txt @@ -13,9 +13,10 @@ //============================================================ //= Amatsu Fields ============================================ -ama_fild.gat,154,301,0 warp warp1998 1,1,prontera.gat,163,186 -ama_fild.gat,174,132,0 warp warp1996 1,1,prontera.gat,163,186 -ama_fild.gat,193,302,0 warp warp1997 1,1,prontera.gat,163,186 -ama_fild.gat,330,141,0 warp warp1999 1,1,prontera.gat,163,186 -ama_fild01.gat,174,332,0 warp warp8003 1,1,ama_test.gat,50,19 +// removed +//ama_fild.gat,154,301,0 warp warp1998 1,1,prontera.gat,163,186 +//ama_fild.gat,174,132,0 warp warp1996 1,1,prontera.gat,163,186 +//ama_fild.gat,193,302,0 warp warp1997 1,1,prontera.gat,163,186 +//ama_fild.gat,330,141,0 warp warp1999 1,1,prontera.gat,163,186 +ama_fild01.gat,174,332,0 warp warp8003 1,1,ama_in01.gat,175,174 ama_fild01.gat,75,29,0 warp warp1961 1,1,amatsu.gat,247,287
\ No newline at end of file diff --git a/npc/warps/fields/yuno_fild.txt b/npc/warps/fields/yuno_fild.txt index c501c80c5..1948d6d17 100644 --- a/npc/warps/fields/yuno_fild.txt +++ b/npc/warps/fields/yuno_fild.txt @@ -3,29 +3,63 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 5+ //===== Description: ========================================= //= Warp Points for Yuno Field //===== Additional Comments: ================================= -//= No Comment! +//= 1.1 - Updated for the new Yuno Fields //============================================================ //= Yuno Field =============================================== -yuno_fild01.gat,286,368,0 warp yunfild01 1,1,yuno_fild02.gat,294,26 -yuno_fild02.gat,294,24,0 warp yunfild01-1 1,1,yuno_fild01.gat,286,366 -yuno_fild01.gat,70,378,0 warp yunfild02 1,1,yuno_fild02.gat,70,25 -yuno_fild02.gat,70,23,0 warp yunfild02-1 1,1,yuno_fild01.gat,70,376 +//yuno_fild01.gat,286,368,0 warp yunfild01 1,1,yuno_fild02.gat,294,26 +//yuno_fild02.gat,294,24,0 warp yunfild01-1 1,1,yuno_fild01.gat,286,366 +//yuno_fild01.gat,70,378,0 warp yunfild02 1,1,yuno_fild02.gat,70,25 +//yuno_fild02.gat,70,23,0 warp yunfild02-1 1,1,yuno_fild01.gat,70,376 + yuno_fild02.gat,18,337,0 warp yunfild03 1,1,yuno_fild03.gat,381,331 yuno_fild03.gat,383,331,0 warp yunfild03-1 1,1,yuno_fild02.gat,20,337 yuno_fild03.gat,19,79,0 warp yunfild04 1,1,yuno_fild04.gat,373,84 yuno_fild04.gat,375,84,0 warp yunfild04-1 1,1,yuno_fild03.gat,21,79 yuno_fild03.gat,20,155,0 warp yunfild05 1,1,yuno_fild04.gat,373,150 yuno_fild04.gat,375,150,0 warp yunfild05-1 1,1,yuno_fild03.gat,22,155 -yuno_fild04.gat,231,211,0 warp yunfild-yun 1,1,yuno.gat,158,17 +yuno_fild04.gat,231,288,0 warp yunfild-yun 1,1,yuno.gat,158,17 yuno_fild03.gat,32,139,0 warp yunfild-mag01 1,1,mag_dun01.gat,126,68 +//= New Yuno Fields ========================================== +yuno_fild01.gat,26,246,0 warp newjun01 1,1,yuno_fild12.gat,373,239 +yuno_fild12.gat,375,239,0 warp newjun01a 1,1,yuno_fild01.gat,28,246 +yuno_fild12.gat,23,338,0 warp newjun02 1,1,yuno_fild11.gat,366,361 +yuno_fild11.gat,368,361,0 warp newjun02a 1,1,yuno_fild12.gat,25,338 +yuno_fild12.gat,24,225,0 warp newjun03 1,1,yuno_fild11.gat,363,218 +yuno_fild11.gat,365,218,0 warp newjun03a 1,1,yuno_fild12.gat,24,227 +yuno_fild07.gat,92,12,0 warp newjun04 1,1,yuno_fild11.gat,92,369 +yuno_fild11.gat,92,371,0 warp newjun04a 1,1,yuno_fild07.gat,92,14 +yuno_fild12.gat,193,371,0 warp newjun05 1,1,yuno_fild08.gat,143,21 +yuno_fild08.gat,145,21,0 warp newjun05a 1,1,yuno_fild12.gat,195,371 +yuno_fild01.gat,70,378,0 warp newjun06 1,1,yuno_fild09.gat,70,19 +yuno_fild09.gat,70,17,0 warp newjun06a 1,1,yuno_fild01.gat,70,376 +yuno_fild01.gat,286,368,0 warp newjun07 1,1,yuno_fild09.gat,280,30 +yuno_fild09.gat,280,28,0 warp newjun07a 1,1,yuno_fild01.gat,286,366 +yuno_fild09.gat,19,194,0 warp newjun08 1,1,yuno_fild08.gat,374,193 +yuno_fild08.gat,376,193,0 warp newjun08a 1,1,yuno_fild09.gat,21,194 +yuno_fild08.gat,20,278,0 warp newjun09 1,1,yuno_fild07.gat,352,291 +yuno_fild07.gat,354,291,0 warp newjun09a 1,1,yuno_fild08.gat,22,278 +yuno_fild08.gat,31,58,0 warp newjun10 1,1,yuno_fild07.gat,358,72 +yuno_fild07.gat,360,72,0 warp newjun10a 1,1,yuno_fild08.gat,33,58 + +//= (By speculation only) ==================================== +yuno_fild07.gat,179,354,0 warp newjun11 1,1,yuno_fild03.gat,179,17 +yuno_fild03.gat,179,15,0 warp newjun11a 1,1,yuno_fild07.gat,179,352 +yuno_fild08.gat,74,376,0 warp newjun12 1,1,yuno_fild02.gat,70,25 +yuno_fild02.gat,70,23,0 warp newjun12a 1,1,yuno_fild08.gat,74,374 +yuno_fild08.gat,286,386,0 warp newjun13 1,1,yuno_fild02.gat,294,26 +yuno_fild02.gat,294,24,0 warp newjun13a 1,1,yuno_fild08.gat,286,384 +yuno_fild04.gat,42,369,0 warp newjun14 1,1,yuno_fild05.gat,59,30 +yuno_fild05.gat,59,28,0 warp newjun14a 1,1,yuno_fild04.gat,42,367 + + //= Al de Baran <-> Yuno Connection ========================== aldebaran.gat,140,244,0 warp alde-yunfild 1,1,yuno_fild01.gat,208,19 yuno_fild01.gat,208,17,0 warp yunfild-alde 1,1,aldebaran.gat,140,242 |