summaryrefslogtreecommitdiff
path: root/npc/warps/cities
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-05 21:32:34 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-05 21:32:34 +0000
commitaeb00708cbef98f7ae2e6582ce9a7fdd4bdc37a2 (patch)
tree5e77194c0be027c7628fe4f01aca34b880f2541f /npc/warps/cities
parent1e091214a0f55def71889158da474472b4a8e2ea (diff)
downloadhercules-aeb00708cbef98f7ae2e6582ce9a7fdd4bdc37a2.tar.gz
hercules-aeb00708cbef98f7ae2e6582ce9a7fdd4bdc37a2.tar.bz2
hercules-aeb00708cbef98f7ae2e6582ce9a7fdd4bdc37a2.tar.xz
hercules-aeb00708cbef98f7ae2e6582ce9a7fdd4bdc37a2.zip
* Updated Kunlun NPCs and warps.
- Didn't update the Kunlun 'Power' npcs - Updated Lutie and Comodo warps. * Fixed some slight inconsistencies with the some script headers. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12014 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/warps/cities')
-rw-r--r--npc/warps/cities/comodo.txt71
-rw-r--r--npc/warps/cities/gonryun.txt49
-rw-r--r--npc/warps/cities/lutie.txt51
3 files changed, 84 insertions, 87 deletions
diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt
index f63c8ee42..5c7993dae 100644
--- a/npc/warps/cities/comodo.txt
+++ b/npc/warps/cities/comodo.txt
@@ -3,48 +3,43 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
+//= [Aegis Conversion]
//= Warp Points Comodo city
-//= Rogue guild
//===== Additional Comments: =================================
-//= No comment!
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//============================================================
-
-//Comodo City =====================================================
-comodo,115,291,0 warp cmd09 1,1,cmd_in02,67,132
-comodo,126,98,0 warp cmd02 1,1,cmd_in02,144,97
-comodo,130,195,0 warp cmd05 1,1,cmd_in02,143,173
-comodo,140,111,0 warp cmd04 1,1,cmd_in02,178,132
-comodo,140,90,0 warp cmd01 1,1,cmd_in02,74,25
-comodo,145,328,0 warp cmd11 1,1,cmd_in01,120,71
-comodo,153,97,0 warp cmd03 1,1,cmd_in02,212,97
-comodo,176,358,0 warp cmd002 1,1,beach_dun2,154,25
-comodo,192,294,0 warp cmd17 1,1,cmd_in01,177,123
-comodo,236,298,0 warp cmd08 1,1,cmd_in01,179,81
-comodo,25,214,0 warp cmd001 1,1,beach_dun,266,67
-comodo,265,74,0 warp cmd06 1,1,cmd_in01,123,180
-comodo,271,271,0 warp cmd10 1,1,cmd_in01,113,125
-comodo,332,175,0 warp cmd003 1,1,beach_dun3,23,260
-comodo,92,128,0 warp cmd07 1,1,cmd_in01,85,174
-cmd_in01,109,125,0 warp cmd10-1 1,1,comodo,269,273
-cmd_in01,120,67,0 warp cmd11-1 1,1,comodo,145,324
-cmd_in01,123,186,0 warp cmd06-1 1,1,comodo,265,79
-cmd_in01,183,123,0 warp cmd17-1 1,1,comodo,195,294
-cmd_in01,183,81,0 warp cmd08-1 1,1,comodo,239,296
-cmd_in01,90,174,0 warp cmd07-1 1,1,comodo,97,128
-cmd_in02,139,169,0 warp cmd05-1 1,1,comodo,127,191
-cmd_in02,139,97,0 warp cmd02-1 1,1,comodo,122,98
-cmd_in02,168,113,0 warp cmd15-1 1,1,cmd_in02,63,73
-cmd_in02,178,136,0 warp cmd04-1 1,1,comodo,140,115
-cmd_in02,187,78,0 warp cmd14-2 1,1,cmd_in02,84,37
-cmd_in02,208,206,0 warp cmd16 1,1,cmd_in02,97,211
-cmd_in02,216,97,0 warp cmd03-1 1,1,comodo,157,97
-cmd_in02,58,74,0 warp cmd15 1,1,cmd_in02,166,116
-cmd_in02,69,129,0 warp cmd09-1 4,4,comodo,115,288
-cmd_in02,74,21,0 warp cmd01-1 1,1,comodo,140,86
-cmd_in02,90,37,0 warp cmd14 1,1,cmd_in02,191,77
-cmd_in02,98,216,0 warp cmd16-1 1,1,cmd_in02,207,210
+comodo,92,128,0 warp cmd_tools1-1 1,1,cmd_in01,85,174
+cmd_in01,90,174,0 warp cmd_tools1-2 1,1,comodo,97,128
+comodo,265,74,0 warp cmd_weapon1-1 1,1,cmd_in01,123,180
+cmd_in01,123,186,0 warp cmd_weapon1-2 1,1,comodo,265,79
+comodo,271,271,0 warp cmd_house1-1 1,1,cmd_in01,113,125
+cmd_in01,109,125,0 warp cmd_house1-2 1,1,comodo,269,273
+comodo,192,294,0 warp cmd_house2-1 1,1,cmd_in01,177,123
+cmd_in01,183,123,0 warp cmd_house2-2 1,1,comodo,195,294
+comodo,145,328,0 warp cmd_house3-1 1,1,cmd_in01,120,71
+cmd_in01,120,67,0 warp cmd_house3-2 1,1,comodo,145,324
+comodo,236,298,0 warp cmd_house4-1 1,1,cmd_in01,179,81
+cmd_in01,183,81,0 warp cmd_house4-2 1,1,comodo,239,296
+comodo,130,195,0 warp cmd_KAFRA1-1 1,1,cmd_in02,143,173
+cmd_in02,139,169,0 warp cmd_KAFRA1-2 1,1,comodo,127,191
+cmd_in02,208,206,0 warp cmd_KAFRA2-1 1,1,cmd_in02,97,211
+cmd_in02,98,216,0 warp cmd_KAFRA12-2 1,1,cmd_in02,207,210
+comodo,115,291,0 warp cmd_chief1-1 1,1,cmd_in02,67,132
+cmd_in02,69,129,0 warp cmd_chief1-2 1,1,comodo,115,288
+comodo,140,111,0 warp cmd_casino1-1 1,1,cmd_in02,178,132
+cmd_in02,178,136,0 warp cmd_casino1-2 1,1,comodo,140,115
+comodo,153,97,0 warp cmd_casino2-1 1,1,cmd_in02,212,97
+cmd_in02,216,97,0 warp cmd_casino2-2 1,1,comodo,157,97
+comodo,126,98,0 warp cmd_casino3-1 1,1,cmd_in02,144,97
+cmd_in02,139,97,0 warp cmd_casino3-2 1,1,comodo,122,98
+comodo,140,90,0 warp cmd_casino4-1 1,1,cmd_in02,74,25
+cmd_in02,74,21,0 warp cmd_casino4-2 1,1,comodo,140,86
+cmd_in02,168,113,0 warp cmd_casino5-1 1,1,cmd_in02,63,73
+cmd_in02,58,74,0 warp cmd_casino5-2 1,1,cmd_in02,166,116
+cmd_in02,187,78,0 warp cmd_casino6-1 1,1,cmd_in02,84,37
+cmd_in02,90,37,0 warp cmd_casino6-2 1,1,cmd_in02,191,77 \ No newline at end of file
diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt
index afbba5ac9..98e17572a 100644
--- a/npc/warps/cities/gonryun.txt
+++ b/npc/warps/cities/gonryun.txt
@@ -1,34 +1,35 @@
//===== eAthena Script =======================================
-//= Gonryun Town Warp Script
+//= Kunlun Town Warp Script
//===== By: ==================================================
//= Nana (1.0)
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 5+
//===== Description: =========================================
-//= Warp Points for Gonryun
+//= [Aegis Conversion]
+//= Warp Points for Kunlun
//===== Additional Comments: =================================
-//= No comment!
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//============================================================
-//= Gonryun ==================================================
-gonryun,161,8,0 warp gon02 1,1,gon_fild01,191,261
-gonryun,195,93,0 warp gon03 1,1,gon_in,95,23
-gonryun,109,131,0 warp gon15 1,1,gon_in,44,24
-gonryun,215,114,0 warp gon05 1,1,gon_in,152,24
-gonryun,107,184,0 warp gon13 1,1,gon_in,72,70
-gonryun,221,162,0 warp gon11 1,1,gon_in,112,98
-gonryun,159,201,0 warp gon19 1,1,gon_dun01,153,48
-gon_in,95,26,0 warp gon04 1,1,gonryun,195,96
-gon_in,149,24,0 warp gon06 1,1,gonryun,212,114
-gon_in,184,11,0 warp gon07 1,1,gon_in,189,85
-gon_in,186,85,0 warp gon08 1,1,gon_in,181,11
-gon_in,186,107,0 warp gon09 1,1,gon_in,181,36
-gon_in,184,36,0 warp gon10 1,1,gon_in,189,107
-gon_in,109,98,0 warp gon12 1,1,gonryun,218,162
-gon_in,72,67,0 warp gon14 1,1,gonryun,107,181
-gon_in,47,24,0 warp gon16 1,1,gonryun,112,131
-gon_in,42,35,0 warp gon17 1,1,gon_in,34,97
-gon_in,31,97,0 warp gon18 1,1,gon_in,39,35
-gon_fild01,192,266,0 warp gon01 1,1,gonryun,161,11
+gonryun,221,162,0 warp gon_house1-1 1,1,gon_in,112,98
+gon_in,109,98,0 warp gon_house1-2 1,1,gonryun,218,162
+gonryun,195,93,0 warp gon_house2-1 1,1,gon_in,95,23
+gon_in,95,26,0 warp gon_house2=2 1,1,gonryun,195,96
+gonryun,107,184,0 warp gon_tea1-1 1,1,gon_in,72,70
+gon_in,72,67,0 warp gon_tea2-1 1,1,gonryun,107,181
+gonryun,215,114,0 warp gon_tavern1-1 1,1,gon_in,152,24
+gon_in,149,24,0 warp gon_tavern1-2 1,1,gonryun,212,114
+gon_in,184,36,0 warp gon_inn1-1 1,1,gon_in,189,107
+gon_in,186,107,0 warp gon_inn1-2 1,1,gon_in,181,36
+gon_in,184,11,0 warp gon_inn2-1 1,1,gon_in,189,85
+gon_in,186,85,0 warp gon_inn2-2 1,1,gon_in,181,11
+gonryun,109,131,0 warp gon_castle1-1 1,1,gon_in,44,24
+gon_in,47,24,0 warp gon_castle1-2 1,1,gonryun,112,131
+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/lutie.txt b/npc/warps/cities/lutie.txt
index a86a7b111..114439865 100644
--- a/npc/warps/cities/lutie.txt
+++ b/npc/warps/cities/lutie.txt
@@ -3,36 +3,37 @@
//===== By: ==================================================
//= Athena (1.0) Nana (1.1)
//===== Current Version: =====================================
-//= 1.2a
+//= 1.3
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 2+
//===== Description: =========================================
+//= [Aegis Conversion]
//= Warp Points for Lutie
//===== Additional Comments: =================================
//= 1.2a Re-fixed endless warping loop
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//============================================================
-xmas,150,41,0 warp xmas2-1 3,3,xmas_fild01,80,246
-xmas,120,131,0 warp xmas3 3,3,xmas_in,41,33
-xmas_in,46,33,0 warp xmas3-1 3,3,xmas,125,131
-xmas,120,161,0 warp xmas4 3,3,xmas_in,33,91
-xmas_in,38,89,0 warp xmas4-1 3,3,xmas,125,159
-xmas,175,132,0 warp xmas5 3,3,xmas_in,158,31
-xmas_in,153,31,0 warp xmas5-1 3,3,xmas,170,132
-xmas,174,161,0 warp xmas6 3,3,xmas_in,166,98
-xmas_in,163,93,0 warp xmas6-1 3,3,xmas,169,158
-xmas,182,169,0 warp xmas7 3,3,xmas_in,174,108
-xmas_in,179,109,0 warp xmas7-1 3,3,xmas,185,168
-xmas,142,240,0 warp xmas8 3,3,xmas_in,95,87
-xmas_in,95,82,0 warp xmas8-1 3,3,xmas,142,235
-xmas,149,240,0 warp xmas9 3,3,xmas_in,105,87
-xmas_in,105,82,0 warp xmas9-1 3,3,xmas,149,235
-xmas,149,256,0 warp xmas10 3,3,xmas_in,105,112
-xmas_in,105,117,0 warp xmas10-1 2,2,xmas,149,261
-xmas,142,256,0 warp xmas11 3,3,xmas_in,96,114
-xmas_in,95,117,0 warp xmas11-1 2,2,xmas,142,261
-xmas,104,290,0 warp xmas12 3,3,xmas_in,30,166
-xmas_in,30,161,0 warp xmas12-1 3,3,xmas,104,285
-xmas,189,279,0 warp xmas13 3,3,xmas_in,168,166
-xmas_in,168,161,0 warp xmas13-1 3,3,xmas,189,274
-xmas,143,313,0 warp xmas14 3,3,xmas_dun01,205,17
+xmas,149,41,0 warp x_fild_out 8,1,xmas_fild01,80,248
+xmas,120,131,0 warp xmas_tool1-1 1,1,xmas_in,43,33
+xmas_in,46,33,0 warp xmas_tool1-2 1,1,xmas,123,131
+xmas,174,131,0 warp xmas_gift1-1 1,1,xmas_in,155,32
+xmas_in,153,32,0 warp xmas_gift1-2 1,1,xmas,172,131
+xmas,119,162,0 warp xmas_house1-1 1,1,xmas_in,36,91
+xmas_in,38,89,0 warp xmas_house1-2 1,1,xmas,122,159
+xmas,189,278,0 warp xmas_house2-1 1,1,xmas_in,168,164
+xmas_in,168,160,0 warp xmas_house2-2 1,1,xmas,189,275
+xmas,173,160,0 warp xmas_weapon1-1 1,1,xmas_in,165,95
+xmas_in,163,93,0 warp xmas_weapon1-2 1,1,xmas,172,158
+xmas,181,169,0 warp xmas_weapon2-1 1,1,xmas_in,177,107
+xmas_in,179,109,0 warp xmas_weapon2-2 1,1,xmas,184,168
+xmas,142,239,0 warp xmas_santa1-1 1,1,xmas_in,94,85
+xmas_in,94,83,0 warp xmas_santa1-2 1,1,xmas,142,237
+xmas,149,239,0 warp xmas_santa2-1 1,1,xmas_in,104,85
+xmas_in,104,83,0 warp xmas_santa2-2 1,1,xmas,149,237
+xmas,142,258,0 warp xmas_santa3-1 1,1,xmas_in,94,115
+xmas_in,94,117,0 warp xmas_santa3-2 1,1,xmas,142,260
+xmas,149,258,0 warp xmas_santa4-1 1,1,xmas_in,104,115
+xmas_in,104,117,0 warp xmas_santa4-2 1,1,xmas,149,260
+xmas,104,289,0 warp xmas_church1-1 1,1,xmas_in,30,163
+xmas_in,30,161,0 warp xmas_church2-2 1,1,xmas,104,286