* 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://svn.code.sf.net/p/rathena/svn/trunk@14676 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2011-01-16 14:05:21 +00:00
parent 178cc183ab
commit 9799eb3699
4 changed files with 12 additions and 5 deletions

View File

@ -1,5 +1,10 @@
Date Added 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 2010/12/03
* Rev. 14555 Updated instances with more proper English, care of Resplendent. [L0ne_W0lf] * Rev. 14555 Updated instances with more proper English, care of Resplendent. [L0ne_W0lf]
2010/12/02 2010/12/02

View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= eAthena Dev Team //= eAthena Dev Team
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.1 //= 1.2
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena 1.0 //= eAthena 1.0
//===== Description: ========================================= //===== Description: =========================================
@ -11,6 +11,7 @@
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 ???? //= 1.0 ????
//= 1.1 Optimized Book of Devil quest. used bit-wise var. [Lupus] //= 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; close;
} }
nif_fild01,213,268,5 script Little Boy 797,{ nif_fild01,213,268,5 script Little Boy#02 797,{
if(MISC_QUEST & 256){ if(MISC_QUEST & 256){
L_DONE: L_DONE:
set @niflheimlost,2; set @niflheimlost,2;

View File

@ -10,7 +10,7 @@
// revised By Warlock // // revised By Warlock //
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////
//===== Version ============================================== //===== Version ==============================================
//= 1.4 //= 1.5
//===== Compatible With ====================================== //===== Compatible With ======================================
//= eAthena 1.0 //= eAthena 1.0
//===== Description ========================================== //===== Description ==========================================
@ -22,6 +22,7 @@
//= 1.2 some bugfixes, typos [Lupus] //= 1.2 some bugfixes, typos [Lupus]
//= 1.3 Removed Duplicates [Silent] //= 1.3 Removed Duplicates [Silent]
//= 1.4 Further removed duplicates. [L0ne_W0lf] //= 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/////// ///////Job list 7///////
//7-1 goes to 8-1 using callfunc; //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 && countitem(531) > 4) goto N_QuestComp;
if (seven_qset == 1) goto N_QuestStart; if (seven_qset == 1) goto N_QuestStart;
if (eight_qset == 1) goto N_QuestStart2; if (eight_qset == 1) goto N_QuestStart2;

View File

@ -86,7 +86,7 @@
//npc: npc/custom/Lance/FR_HallOfFame.c //npc: npc/custom/Lance/FR_HallOfFame.c
//npc: npc/custom/Lance/FR_WeatherController.c //npc: npc/custom/Lance/FR_WeatherController.c
//npc: npc/custom/Lance/FR_MailSystem.c //npc: npc/custom/Lance/FR_MailSystem.c
//npc: npc/sample/npc_dynamic_shop.txt //npc: doc/sample/npc_dynamic_shop.txt
// -------------------------------------------------------------- // --------------------------------------------------------------
// -------------------------------------------------------------- // --------------------------------------------------------------