summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-01 22:45:51 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-01 22:45:51 +0000
commit779e8c6fb93bbff8fba7d5ef287eb92590d115dd (patch)
treea0d42fc5d7c0bab47527e50d3a54d7139921bb56 /npc/cities
parentacee0f80c837286e302b82d9b29a05b4f3a6e404 (diff)
downloadhercules-779e8c6fb93bbff8fba7d5ef287eb92590d115dd.tar.gz
hercules-779e8c6fb93bbff8fba7d5ef287eb92590d115dd.tar.bz2
hercules-779e8c6fb93bbff8fba7d5ef287eb92590d115dd.tar.xz
hercules-779e8c6fb93bbff8fba7d5ef287eb92590d115dd.zip
* Updated Arch Bishop, Guillotine Cross, Mechanic, and Royal Guard job quests to their latest versions.
* Fixed Izlude RE warps (bugreport:6884, bugreport:6285). * Fixed experience reward in Cursed Spirit quest (bugreport:6288). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16990 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/alberta.txt8
-rw-r--r--npc/cities/jawaii.txt8
2 files changed, 12 insertions, 4 deletions
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index e47b86e9e..27d60a48a 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= DZeroX
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= rAthena 1.0
//===== Description: =========================================
@@ -16,6 +16,7 @@
//= 1.3 Removed npc "Tourist#al" as it's a quest NPC. [L0ne_W0lf]
//= 1.4 Removed "Fastidious Old Man" duplicate. [L0ne_W0lf]
//= 1.5 Updated to match AEGIS script. [Kisuka]
+//= 1.6 Added Izlude RE coordinates. [Euphy]
//============================================================
alberta,97,51,0 script Fabian 84,{
@@ -216,7 +217,10 @@ alberta,189,151,5 script Fisk 100,{
close;
}
set Zeny,Zeny - 500;
- warp "izlude",176,182;
+ if(checkre(0))
+ warp "izlude",195,212;
+ else
+ warp "izlude",176,182;
end;
case 3:
mes "[Fisk]";
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 2d18d6298..dd7ebb28a 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -5,7 +5,7 @@
//= DNett123 (1.1 - 1.5)
//= L0ne_w0lf
//===== Current Version: =====================================
-//= 3.6
+//= 3.7
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -35,6 +35,7 @@
//= 3.4 Added missing checkweights. [L0ne_W0lf]
//= 3.5 Replaced effect numerics with constants. [L0ne_W0lf]
//= 3.6 Fixed bartender so he no longer hangs. [L0ne_W0lf]
+//= 3.7 Added Izlude RE coordinates. [Euphy]
//============================================================
// Jawaii
@@ -58,7 +59,10 @@ jawaii,239,112,7 script Mariner#toizu 100,{
mes "guide you to";
mes "Izlude.";
close2;
- warp "izlude",176,182;
+ if(checkre(0))
+ warp "izlude",195,212;
+ else
+ warp "izlude",176,182;
end;
}
mes "[Mariner]";