From 700e4388dbea30f4119404b3eb1ac9be372d1adf Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Tue, 18 Aug 2009 22:33:33 +0000 Subject: * Changed attribute_recover to no, being hit by the same element should not recover HP. * Added monster_noteleport to Okolnir quest maps. Will fix the tarot card issue. - Fixed Brynhild dialog in the Asprika quests. (bugreport:3085) - Removed "Disabled" tag from Volcano base quest. (bugreport:3342) - Attempted to fix the sign quest dancing portion. (bugreport:3382) - Fixed Guardian in schg_cas03 using invalid coords. (bugreport:3462) - Fixed Turbo Track records using wrong variable type. (bugreport:3484) - Fixed the checkweights in the Crow of Fate quest. (bugreport:3500) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14013 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 10 +++++++++- npc/guild2/schg_cas03.txt | 5 +++-- npc/other/turbotrack/Expert_16.txt | 13 +++++++------ npc/other/turbotrack/Expert_4.txt | 13 +++++++------ npc/other/turbotrack/Expert_8.txt | 13 +++++++------ npc/other/turbotrack/Normal_16.txt | 13 +++++++------ npc/other/turbotrack/Normal_4.txt | 13 +++++++------ npc/other/turbotrack/Normal_8.txt | 13 +++++++------ npc/quests/The_Sign_Quest.txt | 7 ++++--- npc/quests/okolnir/godse_aru01.txt | 5 +++-- npc/quests/okolnir/godse_aru02.txt | 5 +++-- npc/quests/okolnir/godse_aru03.txt | 5 +++-- npc/quests/okolnir/godse_aru04.txt | 5 +++-- npc/quests/okolnir/godse_aru05.txt | 3 ++- npc/quests/quests_morocc.txt | 9 +++++---- npc/quests/quests_veins.txt | 2 +- 16 files changed, 78 insertions(+), 56 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 234be2863..b4418dd86 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,14 @@ Date Added ====== -2009/09/11 +2009/08/18 + * Rev. 14013 Bug fixes mostly. [L0ne_W0lf] + - Fixed Brynhild dialog in the Asprika quests. (bugreport:3085) + - Removed "Disabled" tag from Volcano base quest. (bugreport:3342) + - Attempted to fix the sign quest dancing portion. (bugreport:3382) + - Fixed Guardian in schg_cas03 using invalid coords. (bugreport:3462) + - Fixed Turbo Track records using wrong variable type. (bugreport:3484) + - Fixed the checkweights in the Crow of Fate quest. (bugreport:3500) +2009/08/11 * Rev. 14001 More episode 12.1 updates, mainly to morroc quests. [L0ne_W0lf] - Updated Satan Morroc to allow people who have finished it to return to the previous map. - Added quest log commands for Resurrection of Satan Morocc. diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt index d67e25cae..59b09c8b5 100644 --- a/npc/guild2/schg_cas03.txt +++ b/npc/guild2/schg_cas03.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 2.2 +//= 2.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -28,6 +28,7 @@ //= 2.1 Applied updated eco/def systems. [L0ne_W0lf] //= 2.2 Fixed eco/def not actually incrementing. [L0ne_W0lf] //= Can no longer gain eco/def higher than 100. +//= 2.3 Fixed invalid corridinates when spawning a guardian. [L0ne_W0lf] //============================================================ schg_cas03,1,1,0 script Manager#sch03_02 111,{ @@ -488,7 +489,7 @@ OnGuardianDied: set .MyMobCount,.MyMobCount-1; if (.MyMobCount < 2) { set .MyMobCount,.MyMobCount+1; - guardian "schg_cas03",120,37,"Guardian",1899,"#sch03_gard01::OnGuardianDied"; //10; + guardian "schg_cas03",273,309,"Guardian",1899,"#sch03_gard01::OnGuardianDied"; //10; } end; diff --git a/npc/other/turbotrack/Expert_16.txt b/npc/other/turbotrack/Expert_16.txt index 5627295a5..cd758bb3a 100644 --- a/npc/other/turbotrack/Expert_16.txt +++ b/npc/other/turbotrack/Expert_16.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.0 First version. [L0ne_W0lf] //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Fixed a little mistake [akrus] +//= 1.3 Corrected issue with top record setting. [L0ne_W0lf] //============================================================ turbo_room,124,135,3 script Expert mode - 16 person 124,{ @@ -958,7 +959,7 @@ turbo_e_16,384,167,1 script Winner Helper#TBT_e_16 47,{ next; if (tt_rank > $ttranks[1]) { setarray $ttranks[0],$ttranks[0],tt_rank,$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4]; - setarray $ttnames[9],strcharinfo(0); + setarray $ttnames$[9],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You are ranked as"; @@ -982,7 +983,7 @@ turbo_e_16,384,167,1 script Winner Helper#TBT_e_16 47,{ } else if (tt_rank > $ttranks[2]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],tt_rank,$ttranks[3],$ttranks[4],$ttranks[5]; - setarray $ttnames[10],strcharinfo(0); + setarray $ttnames$[10],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Second"; @@ -1006,7 +1007,7 @@ turbo_e_16,384,167,1 script Winner Helper#TBT_e_16 47,{ } else if (tt_rank > $ttranks[3]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],tt_rank,$ttranks[4],$ttranks[5]; - setarray $ttnames[11],strcharinfo(0); + setarray $ttnames$[11],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Third"; @@ -1030,7 +1031,7 @@ turbo_e_16,384,167,1 script Winner Helper#TBT_e_16 47,{ } else if (tt_rank > $ttranks[4]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],tt_rank,$ttranks[5]; - setarray $ttnames[12],strcharinfo(0); + setarray $ttnames$[12],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fourth"; @@ -1054,7 +1055,7 @@ turbo_e_16,384,167,1 script Winner Helper#TBT_e_16 47,{ } else if (tt_rank > $ttranks[5]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4],tt_rank; - setarray $ttnames[13],strcharinfo(0); + setarray $ttnames$[13],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fifth"; diff --git a/npc/other/turbotrack/Expert_4.txt b/npc/other/turbotrack/Expert_4.txt index d1d3f75c2..a58220d82 100644 --- a/npc/other/turbotrack/Expert_4.txt +++ b/npc/other/turbotrack/Expert_4.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.0 First version. [L0ne_W0lf] //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Fixed a little mistake [akrus] +//= 1.3 Corrected issue with top record setting. [L0ne_W0lf] //============================================================ turbo_room,110,135,3 script Expert mode - 4 person 124,{ @@ -853,7 +854,7 @@ turbo_e_4,384,167,1 script Winner Helper#TBT_e_4 47,{ next; if (tt_rank > $ttranks[1]) { setarray $ttranks[0],$ttranks[0],tt_rank,$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4]; - setarray $ttnames[9],strcharinfo(0); + setarray $ttnames$[9],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You are ranked as"; @@ -877,7 +878,7 @@ turbo_e_4,384,167,1 script Winner Helper#TBT_e_4 47,{ } else if (tt_rank > $ttranks[2]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],tt_rank,$ttranks[3],$ttranks[4],$ttranks[5]; - setarray $ttnames[10],strcharinfo(0); + setarray $ttnames$[10],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Second"; @@ -901,7 +902,7 @@ turbo_e_4,384,167,1 script Winner Helper#TBT_e_4 47,{ } else if (tt_rank > $ttranks[3]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],tt_rank,$ttranks[4],$ttranks[5]; - setarray $ttnames[11],strcharinfo(0); + setarray $ttnames$[11],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Third"; @@ -925,7 +926,7 @@ turbo_e_4,384,167,1 script Winner Helper#TBT_e_4 47,{ } else if (tt_rank > $ttranks[4]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],tt_rank,$ttranks[5]; - setarray $ttnames[12],strcharinfo(0); + setarray $ttnames$[12],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fourth"; @@ -949,7 +950,7 @@ turbo_e_4,384,167,1 script Winner Helper#TBT_e_4 47,{ } else if (tt_rank > $ttranks[5]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4],tt_rank; - setarray $ttnames[13],strcharinfo(0); + setarray $ttnames$[13],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fifth"; diff --git a/npc/other/turbotrack/Expert_8.txt b/npc/other/turbotrack/Expert_8.txt index 74d59112f..f7fea20d8 100644 --- a/npc/other/turbotrack/Expert_8.txt +++ b/npc/other/turbotrack/Expert_8.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.0 First version. [L0ne_W0lf] //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Fixed a little mistake [akrus] +//= 1.3 Corrected issue with top record setting. [L0ne_W0lf] //============================================================ turbo_room,117,135,3 script Expert mode - 8 person 124,{ @@ -880,7 +881,7 @@ turbo_e_8,384,167,1 script Winner Helper#TBT_e_8 47,{ next; if (tt_rank > $ttranks[1]) { setarray $ttranks[0],$ttranks[0],tt_rank,$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4]; - setarray $ttnames[9],strcharinfo(0); + setarray $ttnames$[9],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You are ranked as"; @@ -904,7 +905,7 @@ turbo_e_8,384,167,1 script Winner Helper#TBT_e_8 47,{ } else if (tt_rank > $ttranks[2]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],tt_rank,$ttranks[3],$ttranks[4],$ttranks[5]; - setarray $ttnames[10],strcharinfo(0); + setarray $ttnames$[10],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Second"; @@ -928,7 +929,7 @@ turbo_e_8,384,167,1 script Winner Helper#TBT_e_8 47,{ } else if (tt_rank > $ttranks[3]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],tt_rank,$ttranks[4],$ttranks[5]; - setarray $ttnames[11],strcharinfo(0); + setarray $ttnames$[11],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Third"; @@ -952,7 +953,7 @@ turbo_e_8,384,167,1 script Winner Helper#TBT_e_8 47,{ } else if (tt_rank > $ttranks[4]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],tt_rank,$ttranks[5]; - setarray $ttnames[12],strcharinfo(0); + setarray $ttnames$[12],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fourth"; @@ -976,7 +977,7 @@ turbo_e_8,384,167,1 script Winner Helper#TBT_e_8 47,{ } else if (tt_rank > $ttranks[5]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4],tt_rank; - setarray $ttnames[13],strcharinfo(0); + setarray $ttnames$[13],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fifth"; diff --git a/npc/other/turbotrack/Normal_16.txt b/npc/other/turbotrack/Normal_16.txt index 42c0f2565..d321e8c1f 100644 --- a/npc/other/turbotrack/Normal_16.txt +++ b/npc/other/turbotrack/Normal_16.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.3 Fixed a little mistake [akrus] +//= 1.4 Corrected issue with top record setting. [L0ne_W0lf] //============================================================ turbo_room,91,135,3 script Normal mode - 16 person 124,{ @@ -959,7 +960,7 @@ turbo_n_16,384,167,1 script Winner Helper#TBT_n_16 47,{ next; if (tt_rank > $ttranks[1]) { setarray $ttranks[0],$ttranks[0],tt_rank,$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4]; - setarray $ttnames[9],strcharinfo(0); + setarray $ttnames$[9],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You are ranked as"; @@ -983,7 +984,7 @@ turbo_n_16,384,167,1 script Winner Helper#TBT_n_16 47,{ } else if (tt_rank > $ttranks[2]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],tt_rank,$ttranks[3],$ttranks[4],$ttranks[5]; - setarray $ttnames[10],strcharinfo(0); + setarray $ttnames$[10],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Second"; @@ -1007,7 +1008,7 @@ turbo_n_16,384,167,1 script Winner Helper#TBT_n_16 47,{ } else if (tt_rank > $ttranks[3]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],tt_rank,$ttranks[4],$ttranks[5]; - setarray $ttnames[11],strcharinfo(0); + setarray $ttnames$[11],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Third"; @@ -1031,7 +1032,7 @@ turbo_n_16,384,167,1 script Winner Helper#TBT_n_16 47,{ } else if (tt_rank > $ttranks[4]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],tt_rank,$ttranks[5]; - setarray $ttnames[12],strcharinfo(0); + setarray $ttnames$[12],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fourth"; @@ -1055,7 +1056,7 @@ turbo_n_16,384,167,1 script Winner Helper#TBT_n_16 47,{ } else if (tt_rank > $ttranks[5]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4],tt_rank; - setarray $ttnames[13],strcharinfo(0); + setarray $ttnames$[13],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fifth"; diff --git a/npc/other/turbotrack/Normal_4.txt b/npc/other/turbotrack/Normal_4.txt index 0c730a3f3..3cee6ff5f 100644 --- a/npc/other/turbotrack/Normal_4.txt +++ b/npc/other/turbotrack/Normal_4.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.3 Fixed a little mistake [akrus] +//= 1.4 Corrected issue with top record setting. [L0ne_W0lf] //============================================================ turbo_room,77,135,3 script Normal mode - 4 person 124,{ @@ -853,7 +854,7 @@ turbo_n_4,384,167,1 script Winner Helper#TBT_n_4 47,{ next; if (tt_rank > $ttranks[1]) { setarray $ttranks[0],$ttranks[0],tt_rank,$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4]; - setarray $ttnames[9],strcharinfo(0); + setarray $ttnames$[9],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You are ranked as"; @@ -877,7 +878,7 @@ turbo_n_4,384,167,1 script Winner Helper#TBT_n_4 47,{ } else if (tt_rank > $ttranks[2]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],tt_rank,$ttranks[3],$ttranks[4],$ttranks[5]; - setarray $ttnames[10],strcharinfo(0); + setarray $ttnames$[10],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Second"; @@ -901,7 +902,7 @@ turbo_n_4,384,167,1 script Winner Helper#TBT_n_4 47,{ } else if (tt_rank > $ttranks[3]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],tt_rank,$ttranks[4],$ttranks[5]; - setarray $ttnames[11],strcharinfo(0); + setarray $ttnames$[11],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Third"; @@ -925,7 +926,7 @@ turbo_n_4,384,167,1 script Winner Helper#TBT_n_4 47,{ } else if (tt_rank > $ttranks[4]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],tt_rank,$ttranks[5]; - setarray $ttnames[12],strcharinfo(0); + setarray $ttnames$[12],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fourth"; @@ -949,7 +950,7 @@ turbo_n_4,384,167,1 script Winner Helper#TBT_n_4 47,{ } else if (tt_rank > $ttranks[5]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4],tt_rank; - setarray $ttnames[13],strcharinfo(0); + setarray $ttnames$[13],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fifth"; diff --git a/npc/other/turbotrack/Normal_8.txt b/npc/other/turbotrack/Normal_8.txt index 2d6354c3c..0decd29f1 100644 --- a/npc/other/turbotrack/Normal_8.txt +++ b/npc/other/turbotrack/Normal_8.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.3 Fixed a little mistake [akrus] +//= 1.4 Corrected issue with top record setting. [L0ne_W0lf] //============================================================ turbo_room,84,135,3 script Normal mode - 8 person 124,{ @@ -880,7 +881,7 @@ turbo_n_8,384,167,1 script Winner Helper#TBT_n_8 47,{ next; if (tt_rank > $ttranks[1]) { setarray $ttranks[0],$ttranks[0],tt_rank,$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4]; - setarray $ttnames[9],strcharinfo(0); + setarray $ttnames$[9],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You are ranked as"; @@ -904,7 +905,7 @@ turbo_n_8,384,167,1 script Winner Helper#TBT_n_8 47,{ } else if (tt_rank > $ttranks[2]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],tt_rank,$ttranks[3],$ttranks[4],$ttranks[5]; - setarray $ttnames[10],strcharinfo(0); + setarray $ttnames$[10],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Second"; @@ -928,7 +929,7 @@ turbo_n_8,384,167,1 script Winner Helper#TBT_n_8 47,{ } else if (tt_rank > $ttranks[3]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],tt_rank,$ttranks[4],$ttranks[5]; - setarray $ttnames[11],strcharinfo(0); + setarray $ttnames$[11],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Third"; @@ -952,7 +953,7 @@ turbo_n_8,384,167,1 script Winner Helper#TBT_n_8 47,{ } else if (tt_rank > $ttranks[4]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],tt_rank,$ttranks[5]; - setarray $ttnames[12],strcharinfo(0); + setarray $ttnames$[12],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fourth"; @@ -976,7 +977,7 @@ turbo_n_8,384,167,1 script Winner Helper#TBT_n_8 47,{ } else if (tt_rank > $ttranks[5]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4],tt_rank; - setarray $ttnames[13],strcharinfo(0); + setarray $ttnames$[13],strcharinfo(0); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fifth"; diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt index 4c9bb54c7..c7b42c089 100644 --- a/npc/quests/The_Sign_Quest.txt +++ b/npc/quests/The_Sign_Quest.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs) //===== Current Version: ===================================== -//= 3.1 +//= 3.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -17,6 +17,8 @@ //= version, variables will attmept to be translated to the //= new version, however it is untested. //= 3.1 Corrected time check for Sir Jore. [L0ne_W0lf] +//= 3.2 Removed mapannounce used while debugging. [L0ne_W0lf] +//= Moved the disablewaitingroomevent in dancing portion. //============================================================ //============================================================ @@ -5219,11 +5221,11 @@ OnInit: end; OnStartArena: - disablewaitingroomevent; donpcevent "s_dance_timer::Onbutton_off"; donpcevent "Examiner#sd::OnDisable"; warpwaitingpc "cmd_in01",16,15,1; donpcevent "s_dance_timer::OnEnable"; + disablewaitingroomevent; end; Onreset: @@ -5731,7 +5733,6 @@ OnTouch: Onup: set .s_check,.s_check + 1; -mapannounce "cmd_in01", "check: "+.s_check,bc_map,"0x00FF00"; end; OnDisable: diff --git a/npc/quests/okolnir/godse_aru01.txt b/npc/quests/okolnir/godse_aru01.txt index f5617f6c3..2f30bdf7b 100644 --- a/npc/quests/okolnir/godse_aru01.txt +++ b/npc/quests/okolnir/godse_aru01.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.2a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -21,6 +21,7 @@ //= Fixed message on the portal when the okolnir section is full. //= Corrected non-angry Piamette not disabling. //= Removed extra dialog that was used in the Brynhild quest. +//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf] //============================================================ arug_cas01,161,371,3 script Guide#gq_aru01 899,{ @@ -274,7 +275,7 @@ que_qaru01,345,82,3 script Wish Maiden#gq_aru01 403,{ next; mes "[Wish Maiden]"; mes "Remember..."; - mes "You need to collect many Valhalla flowers."; + mes "You need to collect many soft feathers."; mes "I hope that your dreams come true."; next; mes "[Wish Maiden]"; diff --git a/npc/quests/okolnir/godse_aru02.txt b/npc/quests/okolnir/godse_aru02.txt index 7ae66cc87..bc006f47c 100644 --- a/npc/quests/okolnir/godse_aru02.txt +++ b/npc/quests/okolnir/godse_aru02.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.2a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -21,6 +21,7 @@ //= Fixed message on the portal when the okolnir section is full. //= Corrected non-angry Piamette not disabling. //= Removed extra dialog that was used in the Brynhild quest. +//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf] //============================================================ arug_cas02,349,347,3 script Guide#gq_aru02 899,{ @@ -274,7 +275,7 @@ que_qaru02,345,82,3 script Wish Maiden#gq_aru02 403,{ next; mes "[Wish Maiden]"; mes "Remember..."; - mes "You need to collect many Valhalla flowers."; + mes "You need to collect many soft feathers."; mes "I hope that your dreams come true."; next; mes "[Wish Maiden]"; diff --git a/npc/quests/okolnir/godse_aru03.txt b/npc/quests/okolnir/godse_aru03.txt index ceea46902..c53637c02 100644 --- a/npc/quests/okolnir/godse_aru03.txt +++ b/npc/quests/okolnir/godse_aru03.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.2a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -21,6 +21,7 @@ //= Fixed message on the portal when the okolnir section is full. //= Corrected non-angry Piamette not disabling. //= Removed extra dialog that was used in the Brynhild quest. +//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf] //============================================================ arug_cas03,324,161,3 script Guide#gq_aru03 899,{ @@ -274,7 +275,7 @@ que_qaru03,345,82,3 script Wish Maiden#gq_aru03 403,{ next; mes "[Wish Maiden]"; mes "Remember..."; - mes "You need to collect many Valhalla flowers."; + mes "You need to collect many soft feathers."; mes "I hope that your dreams come true."; next; mes "[Wish Maiden]"; diff --git a/npc/quests/okolnir/godse_aru04.txt b/npc/quests/okolnir/godse_aru04.txt index 425137bfc..983115ad5 100644 --- a/npc/quests/okolnir/godse_aru04.txt +++ b/npc/quests/okolnir/godse_aru04.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.2a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -21,6 +21,7 @@ //= Fixed message on the portal when the okolnir section is full. //= Corrected non-angry Piamette not disabling. //= Removed extra dialog that was used in the Brynhild quest. +//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf] //============================================================ arug_cas04,324,161,3 script Guide#gq_aru04 899,{ @@ -274,7 +275,7 @@ que_qaru04,345,82,3 script Wish Maiden#gq_aru04 403,{ next; mes "[Wish Maiden]"; mes "Remember..."; - mes "You need to collect many Valhalla flowers."; + mes "You need to collect many soft feathers."; mes "I hope that your dreams come true."; next; mes "[Wish Maiden]"; diff --git a/npc/quests/okolnir/godse_aru05.txt b/npc/quests/okolnir/godse_aru05.txt index 116ba7015..37ca9536b 100644 --- a/npc/quests/okolnir/godse_aru05.txt +++ b/npc/quests/okolnir/godse_aru05.txt @@ -21,6 +21,7 @@ //= Fixed message on the portal when the okolnir section is full. //= Corrected non-angry Piamette not disabling. //= Removed extra dialog that was used in the Brynhild quest. +//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf] //============================================================ arug_cas05,324,161,3 script Guide#gq_aru05 899,{ @@ -274,7 +275,7 @@ que_qaru05,345,82,3 script Wish Maiden#gq_aru05 403,{ next; mes "[Wish Maiden]"; mes "Remember..."; - mes "You need to collect many Valhalla flowers."; + mes "You need to collect many soft feathers."; mes "I hope that your dreams come true."; next; mes "[Wish Maiden]"; diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index b0d4808ad..4970a52b6 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 2.6 +//= 2.7 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -39,6 +39,7 @@ //= Added the two remaining episode 12.1 quests. //= Updated Satan Morroc Quest to allow peopel who have //= finished it to return to the previous map. +//= 2.7 Corrected weight checks, they only check for inventory slots. [L0ne_W0lf] //============================================================ // Stop Post Quest @@ -2017,7 +2018,7 @@ OnTimer5415000: // ============================================================ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{ if (BaseLevel > 59) { - if ((wt_inven == 2) || (wt_inven == 3)) { + if (checkweight(703,3) == 0) { mes "- You have too many items in your inventory to proceed with this quest. -"; close; } @@ -3030,7 +3031,7 @@ yuno_in04,117,102,3 script Old News Scrapbook 844,{ } yuno_in04,169,123,3 script Suspicious Man#oliver_h 407,{ - if ((wt_inven == 2) || (wt_inven == 3)) { + if (checkweight(617,3) == 0) { mes "- You have too many items in your inventory to proceed with this quest. -"; close; } @@ -3243,7 +3244,7 @@ yuno_in04,169,123,3 script Suspicious Man#oliver_h 407,{ } yuno_in04,167,120,3 script Worn-out Book#garas 111,{ - if ((wt_inven == 2) || (wt_inven == 3)) { + if (checkweight(617,3) == 0) { mes "- You have too many items in your inventory to proceed with this quest. -"; close; } diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index 55f83f21d..4dbfac3e5 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -21,7 +21,7 @@ //= - Help a boy save his little sister. //= - Dialog partially obtained from iRO. //= - Variable in use: rachel_camel (max 25) -//= Thor Volcano Base Quest (Disabled): +//= Thor Volcano Base Quest: //= - Missing addition to High Priest Zhed to start quest. //= - Infiltrate Thor Volcano Base. What is Arunafeltz up to? //= - Variable in use: rachel_camel (max 27) -- cgit v1.2.3-60-g2f50