summaryrefslogtreecommitdiff
path: root/npc/warps/cities
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-11 19:24:13 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-11 19:24:13 +0000
commitfdbec1d35364a6d4fa3ac9d5942e14f5fdf47541 (patch)
tree5a35b6bc4108d8cb23fa75e0e32b97f22eb1ba12 /npc/warps/cities
parent338d99ce33637c33d20ceb636aebe0e25ab91665 (diff)
parent53453425e64412f22734ae9a783c853a3f17027e (diff)
downloadhercules-fdbec1d35364a6d4fa3ac9d5942e14f5fdf47541.tar.gz
hercules-fdbec1d35364a6d4fa3ac9d5942e14f5fdf47541.tar.bz2
hercules-fdbec1d35364a6d4fa3ac9d5942e14f5fdf47541.tar.xz
hercules-fdbec1d35364a6d4fa3ac9d5942e14f5fdf47541.zip
- Merged /branches/renewal/conf (partial)
- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt) - Merged /branches/renewal/npc (full) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15060 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/warps/cities')
-rw-r--r--npc/warps/cities/rachel.txt5
-rw-r--r--npc/warps/cities/yggdrasil.txt8
2 files changed, 9 insertions, 4 deletions
diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index f614f778f..ea2917329 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA & RockmanEXE
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf]
//= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf]
//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf]
+//= 1.5 Renewal warp adjustments.
//============================================================
rachel,150,249,0 warp rachel01 1,1,ra_temple,120,30
@@ -105,7 +106,7 @@ ra_temsky,99,135,0 warp rachel71 1,1,ra_temsky,99,113
ra_temsky,137,139,0 warp rachel72 1,1,ra_temsky,109,143
ra_temsky,62,139,0 warp rachel73 1,1,ra_temsky,91,143
-rachel,25,125,0 warp rachel74 1,1,ra_fild11,353,226
+//rachel,25,125,0 warp rachel74 1,1,ra_fild11,353,226
rachel,275,125,0 warp rachel75 1,1,ra_fild12,40,226
rachel,130,21,0 warp rachel76 1,1,ve_fild02,195,377
diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt
index 84a51400f..a65ad4a12 100644
--- a/npc/warps/cities/yggdrasil.txt
+++ b/npc/warps/cities/yggdrasil.txt
@@ -3,17 +3,21 @@
//===== By: ==================================================
//= PKGINGO (1.0)
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 6+
//===== Description: =========================================
//= Warp Points for Yggdrasil Tree
//===== Additional Comments: =================================
//= Extracted from Vidar -> Athena
+//= 1.1 Renewal warp adjustments.
//============================================================
//Umbala Entrance
-um_dun02,125,163,0 warp nwarp1 1,1,yggdrasil01,40,63
+//um_dun02,125,163,0 warp nwarp1 1,1,yggdrasil01,40,63
+
+// RE Yggdrasil Entrance
+umbala,106,285,1 warp ygGate_yg1 1,1,yggdrasil01,39,63
//Niflheim Exit
yggdrasil01,249,262,0 warp nwarp5 1,1,nif_fild01,315,66