summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/airports/izlude.txt3
-rw-r--r--npc/re/cities/jawaii.txt6
-rw-r--r--npc/re/merchants/shops.txt9
-rw-r--r--npc/re/quests/monstertamers.txt15
-rw-r--r--npc/re/quests/quests_13_1.txt17
-rw-r--r--npc/re/quests/quests_lighthalzen.txt9
-rw-r--r--npc/re/scripts_athena.conf4
7 files changed, 51 insertions, 12 deletions
diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt
index 42ec73fe8..bf5cabdf3 100644
--- a/npc/re/airports/izlude.txt
+++ b/npc/re/airports/izlude.txt
@@ -7,6 +7,7 @@
//===== Additional Comments: =================================
//= Official NPCs.
//= Updated to match the new Izlude Map. [Masao]
+//= Updated to Official coordinates
//============================================================
-izlude,204,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90
+izlude,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90
diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt
index f6e6f70ec..a4b584d3a 100644
--- a/npc/re/cities/jawaii.txt
+++ b/npc/re/cities/jawaii.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
//= Jawaii Town Renewal
//===== By: ==================================================
//= Daegaladh, Masao
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules GIT
//===== Description: =========================================
//= Jawaii town NPCs.
//===== Additional Comments: =================================
@@ -13,4 +13,4 @@
//= 1.1 Changed to Official coordinates [Streusel]
//============================================================
-izlude,180,224,6 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71
+izlude,180,224,6 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71 \ No newline at end of file
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 9c0692bdb..77f1f8d68 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -11,6 +11,7 @@
//= 1.1 Added Dicastes merchants. [Joseph]
//= 1.2 Moved more shops to Renewal file. [Euphy]
//= 1.3 Added Malangdo tool dealer. [Euphy]
+//= 1.4 Moved Izlude merchants to Official coordinates [Streusel]
//============================================================
//=======================================================
@@ -33,10 +34,12 @@ dicastes01,207,200,6 shop Points Merchant#dic 66,6360:-1,6361:-1,6362:-1,6363:-1
//=======================================================
// Izlude
//=======================================================
-izlude,97,146,0 shop Butcher#iz 54,517:-1
+izlude,160,186,0 shop Butcher#iz 54,517:-1
izlude,124,165,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1
-izlude,95,145,6 shop Vendor from Milk Ranch#i 90,519:-1
-izlude,174,164,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude,128,158,6 shop Vendor from Milk Ranch#i 90,519:-1
+izlude_in,72,98,3 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,57,109,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_in,72,110,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
//=======================================================
// Juno
diff --git a/npc/re/quests/monstertamers.txt b/npc/re/quests/monstertamers.txt
new file mode 100644
index 000000000..cc95d3749
--- /dev/null
+++ b/npc/re/quests/monstertamers.txt
@@ -0,0 +1,15 @@
+//===== Hercules Script =======================================
+//= Monster Tamers
+//===== By: ==================================================
+//= Streusel
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Hercules
+//===== Description: =========================================
+//= Cute pet quest items
+//===== Additional Comments: =================================
+//= 1.0 Duplicates for Monster Tamer
+//============================================================
+
+izlude_in,55,105,4 duplicate(Monster_Tamer#izu) Monster Tamer#izlude 125 \ No newline at end of file
diff --git a/npc/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt
new file mode 100644
index 000000000..107b7c029
--- /dev/null
+++ b/npc/re/quests/quests_13_1.txt
@@ -0,0 +1,17 @@
+//===== Hercules Script ======================================
+//= Quest NPCs related to Ash-Vacuum
+//===== By: ==================================================
+//= Streusel
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Contains:
+//= Promotional Staff Duplicate for Renewal
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+// Onward to the New World
+//============================================================
+izlude,102,171,6 duplicate(Promotional Staff#iz) Promotional Staff#izlude 100 \ No newline at end of file
diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt
index a68fcb632..3f029f7f4 100644
--- a/npc/re/quests/quests_lighthalzen.txt
+++ b/npc/re/quests/quests_lighthalzen.txt
@@ -1,21 +1,22 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
//= Quest NPCs located in Lighthalzen
//===== By: ==================================================
//= Ziu, Heris (translation)
//===== Current Version: =====================================
-//= 1.1
+//= 1.1a
//===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules GIT
//===== Description: =========================================
//= Quests related to Lighthalzen City.
//===== Additional Comments: =================================
//= 1.0 Updated to match the new Izlude Map. [Masao]
//= 1.1 Added Somatology Laboratory F4 quest. [Euphy]
+//= 1.1a Coordinate update
//============================================================
// Renewal split [Daegaladh]
//============================================================
-izlude,171,73,6 duplicate(Scamp) Scamp#2 853
+izlude,172,73,6 duplicate(Scamp) Scamp#2 853
// Somatology Laboratory F4
//============================================================
diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf
index cc12ddceb..30bf67476 100644
--- a/npc/re/scripts_athena.conf
+++ b/npc/re/scripts_athena.conf
@@ -80,4 +80,6 @@ npc: npc/re/quests/quests_dicastes.txt
npc: npc/re/quests/quests_izlude.txt
npc: npc/re/quests/quests_lighthalzen.txt
npc: npc/re/quests/quests_malangdo.txt
-npc: npc/re/quests/quests_veins.txt \ No newline at end of file
+npc: npc/re/quests/quests_veins.txt
+npc: npc/re/quests/monstertamers.txt
+npc: npc/re/quests/quests_13_1.txt \ No newline at end of file