summaryrefslogtreecommitdiff
path: root/npc/re/warps
diff options
context:
space:
mode:
authorj-tkay <joseph.tk.ea@gmail.com>2013-07-04 05:15:48 +0800
committerj-tkay <joseph.tk.ea@gmail.com>2013-07-04 05:15:48 +0800
commit28a9fec0916db3d92629ae6e6cd62b5777b09e73 (patch)
tree4babff20dd0a68025a489f410ebf96b8c1cc09af /npc/re/warps
parent8489dbf3b58d3bff70b27ea42884a14d5229430a (diff)
downloadhercules-28a9fec0916db3d92629ae6e6cd62b5777b09e73.tar.gz
hercules-28a9fec0916db3d92629ae6e6cd62b5777b09e73.tar.bz2
hercules-28a9fec0916db3d92629ae6e6cd62b5777b09e73.tar.xz
hercules-28a9fec0916db3d92629ae6e6cd62b5777b09e73.zip
Merged/Updated/Added scripts from rAthena.
- Fixed Bug #7400 Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
Diffstat (limited to 'npc/re/warps')
-rw-r--r--npc/re/warps/dungeons/moc_pryd.txt16
-rw-r--r--npc/re/warps/fields/bra_fild.txt3
2 files changed, 18 insertions, 1 deletions
diff --git a/npc/re/warps/dungeons/moc_pryd.txt b/npc/re/warps/dungeons/moc_pryd.txt
new file mode 100644
index 000000000..aa2feb937
--- /dev/null
+++ b/npc/re/warps/dungeons/moc_pryd.txt
@@ -0,0 +1,16 @@
+//===== rAthena Script =======================================
+//= Morroc Pyramid Nightmare Warp Script
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for Morroc Pyramid Nightmare Mode
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+moc_prydn1,223,9,0 warp PyramidsN1-2 2,2,moc_prydn2,192,8
+moc_prydn2,195,8,0 warp PyramidsN2-1 2,3,moc_prydn1,220,9
diff --git a/npc/re/warps/fields/bra_fild.txt b/npc/re/warps/fields/bra_fild.txt
index c2078cdd2..85edc6c10 100644
--- a/npc/re/warps/fields/bra_fild.txt
+++ b/npc/re/warps/fields/bra_fild.txt
@@ -5,10 +5,11 @@
//===== Current Version: =====================================
//= 1.0
//===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
//= Warp Points for Brasilis
//===== Additional Comments: =================================
//= 1.0 First version.
//============================================================
+
bra_fild01,72,34,0 warp bra_fild01_brasilis 1,1,brasilis,309,334
brasilis,308,336,0 warp brasilis_bra_fild01 1,1,bra_fild01,74,34