summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-01-16 14:05:21 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-01-16 14:05:21 +0000
commit55b1b926c34a7d1691f233070bfc5fe032d11fb3 (patch)
tree9ae8f19bd8bd6340f083900315482cfb92b80ff4 /npc
parent941cb34b52c879ffeb2ec3959bef17b147268285 (diff)
downloadhercules-55b1b926c34a7d1691f233070bfc5fe032d11fb3.tar.gz
hercules-55b1b926c34a7d1691f233070bfc5fe032d11fb3.tar.bz2
hercules-55b1b926c34a7d1691f233070bfc5fe032d11fb3.tar.xz
hercules-55b1b926c34a7d1691f233070bfc5fe032d11fb3.zip
* Various fixes for scripts that are disabled by default.
- Fixed name collision in Baphomet Jr. taming item quest (custom) with 'Little Boy' in cities/lutie.txt - Fixed name collision in THQS_Quests (custom) with 'Little Girl' in cities/lutie.txt - Fixed outdated reference to npc_dynamic_shop sample (follow up to r14277). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14676 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt5
-rw-r--r--npc/custom/quests/bookofthedevil.txt5
-rw-r--r--npc/custom/quests/thq/THQS_Quests.txt5
-rw-r--r--npc/scripts_custom.conf2
4 files changed, 12 insertions, 5 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 57fae7cf2..458bbc4f5 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,10 @@
Date Added
======
+2011/01/16
+ * Rev. 14676 Various fixes for scripts that are disabled by default. [Ai4rei]
+ - Fixed name collision in Baphomet Jr. taming item quest (custom) with 'Little Boy' in cities/lutie.txt
+ - Fixed name collision in THQS_Quests (custom) with 'Little Girl' in cities/lutie.txt
+ - Fixed outdated reference to npc_dynamic_shop sample (follow up to r14277).
2010/12/03
* Rev. 14555 Updated instances with more proper English, care of Resplendent. [L0ne_W0lf]
2010/12/02
diff --git a/npc/custom/quests/bookofthedevil.txt b/npc/custom/quests/bookofthedevil.txt
index 0c601dfd2..4eaeb3925 100644
--- a/npc/custom/quests/bookofthedevil.txt
+++ b/npc/custom/quests/bookofthedevil.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= 1.0 ????
//= 1.1 Optimized Book of Devil quest. used bit-wise var. [Lupus]
+//= 1.2 Fixed name collision with 'Little Boy' in cities/lutie.txt [Ai4rei]
//============================================================
//=============================================================
@@ -62,7 +63,7 @@ M_NO:
close;
}
-nif_fild01,213,268,5 script Little Boy 797,{
+nif_fild01,213,268,5 script Little Boy#02 797,{
if(MISC_QUEST & 256){
L_DONE:
set @niflheimlost,2;
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index b50082943..8e6a79b70 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -10,7 +10,7 @@
// revised By Warlock //
//////////////////////////////////////////////////////////////
//===== Version ==============================================
-//= 1.4
+//= 1.5
//===== Compatible With ======================================
//= eAthena 1.0
//===== Description ==========================================
@@ -22,6 +22,7 @@
//= 1.2 some bugfixes, typos [Lupus]
//= 1.3 Removed Duplicates [Silent]
//= 1.4 Further removed duplicates. [L0ne_W0lf]
+//= 1.5 Fixed name collision with 'Little Girl' in cities/lutie.txt [Ai4rei]
//============================================================
@@ -671,7 +672,7 @@ N_QuestStart:
}
///////Job list 7///////
//7-1 goes to 8-1 using callfunc;
-prontera,123,208,6 script Little Girl 717,{
+prontera,123,208,6 script Little Girl#thq 717,{
if (seven_qset == 1 && countitem(531) > 4) goto N_QuestComp;
if (seven_qset == 1) goto N_QuestStart;
if (eight_qset == 1) goto N_QuestStart2;
diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf
index c714e42bc..89aff0823 100644
--- a/npc/scripts_custom.conf
+++ b/npc/scripts_custom.conf
@@ -86,7 +86,7 @@
//npc: npc/custom/Lance/FR_HallOfFame.c
//npc: npc/custom/Lance/FR_WeatherController.c
//npc: npc/custom/Lance/FR_MailSystem.c
-//npc: npc/sample/npc_dynamic_shop.txt
+//npc: doc/sample/npc_dynamic_shop.txt
// --------------------------------------------------------------
// --------------------------------------------------------------