summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorTaylor Locke <kisuka@kisuka.com>2014-08-06 01:08:47 -0700
committerTaylor Locke <kisuka@kisuka.com>2014-08-06 01:08:47 -0700
commit254f47e4f04141f6ceeb68d0dbbb4a0001d01a24 (patch)
tree27e1185cacfdfa2137bd8eadc06979dafa470c1b /npc
parent33b75b9cd5ef04445a3f6c122d7ae1ea1c618ef8 (diff)
downloadhercules-254f47e4f04141f6ceeb68d0dbbb4a0001d01a24.tar.gz
hercules-254f47e4f04141f6ceeb68d0dbbb4a0001d01a24.tar.bz2
hercules-254f47e4f04141f6ceeb68d0dbbb4a0001d01a24.tar.xz
hercules-254f47e4f04141f6ceeb68d0dbbb4a0001d01a24.zip
Fixed located of Mobile HP Recovery quest. Fixed wrong sprite on Mercenary Merchant NPC in Izlude.
Diffstat (limited to 'npc')
-rw-r--r--npc/pre-re/other/mercenary_rent.txt2
-rw-r--r--npc/quests/skills/swordman_skills.txt5
-rw-r--r--npc/re/other/mercenary_rent.txt10
3 files changed, 9 insertions, 8 deletions
diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt
index 5c382a0e0..13428427e 100644
--- a/npc/pre-re/other/mercenary_rent.txt
+++ b/npc/pre-re/other/mercenary_rent.txt
@@ -12,4 +12,4 @@
//============================================================
izlude,47,139,5 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 4_M_JOB_KNIGHT2
-izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 4_F_HUGRANMA
+izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 4_F_HUWOMAN
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index 4e152c780..8f57af3c4 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.8
+//= 1.8.1
//===== Description: =========================================
//= Quests for skills: Fatal Blow, Mobile HP Recovery,
// Auto-Berserk
@@ -11,9 +11,10 @@
//= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//= 1.7 Updated to latest available official file. [Masao]
//= 1.8 Fixed JobLevel requirements. [Euphy]
+//= 1.8.1 Fixed location of Kight De Thomas. [Kisuka]
//============================================================
-izlude_in,175,130,2 script Knight De Thomas 4W_M_02,4,4,{
+izlude_in,118,175,4 script Knight De Thomas 4W_M_02,{
if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) {
mes "[De Thomas]";
mes "Oh, no! You must have been hurt! Are you ok?";
diff --git a/npc/re/other/mercenary_rent.txt b/npc/re/other/mercenary_rent.txt
index 09c2a24ce..21f54b46f 100644
--- a/npc/re/other/mercenary_rent.txt
+++ b/npc/re/other/mercenary_rent.txt
@@ -18,8 +18,8 @@ izlude_b,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_b 4_M_
izlude_c,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_c 4_M_JOB_KNIGHT2
izlude_d,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_d 4_M_JOB_KNIGHT2
-izlude,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Sword 4_F_HUGRANMA
-izlude_a,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_a 4_F_HUGRANMA
-izlude_b,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_b 4_F_HUGRANMA
-izlude_c,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_c 4_F_HUGRANMA
-izlude_d,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_d 4_F_HUGRANMA
+izlude,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Sword 4_F_HUWOMAN
+izlude_a,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_a 4_F_HUWOMAN
+izlude_b,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_b 4_F_HUWOMAN
+izlude_c,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_c 4_F_HUWOMAN
+izlude_d,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_d 4_F_HUWOMAN