summaryrefslogtreecommitdiff
path: root/npc/warps
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-04-09 09:09:35 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-04-09 09:09:35 +0000
commit1260d294ed795011b5b73284e308a6a01d9eef9e (patch)
tree6663a0ae44f8ac7d830598311411843401f129a1 /npc/warps
parent28532995686a5315ddf0ad6557ae00cb2fe76206 (diff)
downloadhercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.gz
hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.bz2
hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.xz
hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.zip
* Merged changes from trunk [14742:14782/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/warps')
-rw-r--r--npc/warps/dungeons/anthell.txt12
-rw-r--r--npc/warps/other/sign.txt3
2 files changed, 14 insertions, 1 deletions
diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt
index dc542628e..4ac200321 100644
--- a/npc/warps/dungeons/anthell.txt
+++ b/npc/warps/dungeons/anthell.txt
@@ -13,9 +13,21 @@
//= 1.4 Removed Duplicates [Silent]
//= 1.5 Updated warps for episode 12.1 [L0ne_W0lf]
//= 1.6 Renewal warp adjustments.
+//= 1.6 Fixed coordinates for pre-2010/06/09 maps (bugreport:3589)
+//= Moved entrance to cmd_fild08 to match mapcache [Gepard]
//============================================================
//= Ant Hell =================================================
+
+/* Pre 2010-06-09adata_x1.gpf version
+ * Requires modified mapcache and client-side maps
+ */
+//moc_fild20,156,143,0 warp moc_ant1-1 1,1,anthell01,35,263
+//anthell01,35,267,0 warp moc_ant1-2 1,1,moc_fild20,161,144
+//moc_fild20,337,315,0 warp moc_ant2-1 1,1,anthell02,168,170
+//anthell02,171,170,0 warp moc_ant2-2 1,1,moc_fild20,333,315
+
+/* 2010-06-09 version */
cmd_fild08,335,355,0 warp moc_ant1-1 3,4,anthell01,35,262
anthell01,35,267,0 warp moc_ant1-2 1,1,cmd_fild08,330,355
cmd_fild08,348,82,0 warp moc_ant2-1 3,3,anthell02,168,170
diff --git a/npc/warps/other/sign.txt b/npc/warps/other/sign.txt
index 95236735c..566dbebd0 100644
--- a/npc/warps/other/sign.txt
+++ b/npc/warps/other/sign.txt
@@ -13,6 +13,7 @@
//= 1.1 A few more warps. [MasterOfMuppets]
//= 1.2 Completed the warps [MasterOfMuppets]
//= 1.3 Added Renewal Changes. [Kisuka]
+//= 1.3 Correct AEGIS Warps. [Kisuka]
//============================================================
cmd_in01,17,34,0 warp sign01 1,1,comodo,187,164
@@ -35,4 +36,4 @@ que_sign01,113,132,0 warp sign07 1,1,nif_in,117,173
que_sign01,45,15,0 warp sign08 1,1,niflheim,146,245
-que_sign02,22,313,0 warp sign09 1,1,niflheim,30,156 \ No newline at end of file
+que_sign02,22,313,0 warp sign09 1,1,niflheim,30,156