From 1afe3ef44d2e7f40b8cdd7af6d83c4841e4939e2 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Fri, 24 Oct 2008 16:08:46 +0000 Subject: * Bugfixing yay! Just goin' though the tracker. - Fixed variables in a loop in the novice grounds. (bugreport:2374) - Swapped switch for if in Louyang Guard Tower thing. (bugreport:2377) - Swapped mobcount for npc vars in two keil hyre npcs. (bugreport:2380) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13319 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 5 +++++ npc/jobs/novice/novice.txt | 7 ++++--- npc/quests/Kiel_Hyre_Quest.txt | 25 ++++++++++--------------- npc/quests/quests_louyang.txt | 5 +++-- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index a60cb7f25..c5f4bbd4b 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,10 @@ Date Added ====== +2008/10/24 + * Rev. 13319 Bugfixing yay! Just goin' though the tracker. [L0ne_W0lf] + - Fixed variables in a loop in the novice grounds. (bugreport:2374) + - Swapped switch for if in Louyang Guard Tower thing. (bugreport:2377) + - Swapped mobcount for npc vars in two keil hyre npcs. (bugreport:2380) 2008/10/17 * Rev. 13305 Corrected some issues in the Keil Hyre Quest and Mjolnir Seal quest. [L0ne_W0lf] - Corrected Sudri not setting player and NPC hp variables. (bugreport:2355) diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt index d2a682d7b..38ed1a846 100644 --- a/npc/jobs/novice/novice.txt +++ b/npc/jobs/novice/novice.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Dr.Evil & MasterOfMuppets //===== Current Version: ===================================== -//= 2.3a +//= 2.4 //===== Compatible With: ===================================== //= eAthena SVN 3422+(Requires jA Script System) //===== Description: ========================================= @@ -22,6 +22,7 @@ //= 2.2 Corrected Leo's endless dialog. [L0ne_W0lf] //= 2.3 Added fix to Hanson from GM-windsor- and Saithis. [L0ne_W0lf] //= 2.3a Correct a wrong variable name. (bugreport:2293) [Samuray22] +//= 2.4 Corrected an error in Hanson. (bugreport:2374) [L0ne_W0lf] //============================================================ // Bulletin Board @@ -3843,8 +3844,8 @@ S_UserJobchoice: for( set .@i,0; .@i < getarraysize(.@JOBS$); set .@i,.@i+1 ) { - if(.@JOBS$[@i] == getarg(0)) set .@menu$,.@menu$+":"; - else set .@menu$,.@menu$+.@JOBS$[@i]+":"; + if(.@JOBS$[.@i] == getarg(0)) set .@menu$,.@menu$+":"; + else set .@menu$,.@menu$+.@JOBS$[.@i]+":"; } set .@menu, select(.@menu$) -1; if( .@JOBS$[.@menu] == "Swordsman" ) set @menu,1; diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index f53482910..c3c5d1b2c 100644 --- a/npc/quests/Kiel_Hyre_Quest.txt +++ b/npc/quests/Kiel_Hyre_Quest.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf (Script), DZeroX (Timer) //===== Current Version: ===================================== -//= 4.3 +//= 4.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -67,8 +67,8 @@ //= 3.2b Fixed some typos and grammar mistakes. [SinSloth] //= 3.3 Fixed the receiver log out bugs. [L0ne_W0lf] //= 3.4 Fixed bug when u can't get a Yellow Keycard if u got the Blue one at first [Lupus] -//= Note: There are many condition checks that should be omitted in the future fixed item names in item_db.txt / txt resources according the quest -//= for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_- +//= Note: There are many condition checks that should be omitted in the future fixed item names in item_db.txt / txt resources according the quest +//= for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_- //= 3.5 Changed the way the Black Keycard distibuting NPCs work slighty. [L0ne_W0lf] //= 3.6 Keil Hyre removes ALL outstanding quest items when he is talked [L0ne_W0lf] //= to after finishing the quest. @@ -94,6 +94,7 @@ //= 4.2c More various fixes :D [L0ne_W0lf] //= 4.3 Fixed improper condition in the Elly NPC. [L0ne_W0lf] //= Corrected some typos in the dialogs. +//= 4.4 Updated reviecer and robots NPC to use mobcount. (bugreport:2380) [L0ne_W0lf] //============================================================ //============================================================================ @@ -5993,7 +5994,7 @@ yuno_fild09,158,217,0 script Wooden Board#kh 111,{ // Kiehl's Room; Receiver (Gives black keycards upon killing mobs) //---------------------------------------------------------------------------- kh_kiehl01,17,39,0 script Receiver#kh 111,{ - if (.KHKilled < 1) { + if (mobcount("kh_kiehl01","Receiver#kh::OnMyMobDead") < 1) { mes "^333333*BBBZZZ*^000000"; if (KielHyreQuest == 74) { next; @@ -6007,7 +6008,6 @@ kh_kiehl01,17,39,0 script Receiver#kh 111,{ set KielHyreQuest,76; } close2; - set .KHKilled,2; monster "kh_kiehl01",16,32,"Alicel",1739,1,"Receiver#kh::OnMyMobDead"; monster "kh_kiehl01",18,31,"Aliot",1740,1,"Receiver#kh::OnMyMobDead"; end; @@ -6018,10 +6018,8 @@ kh_kiehl01,17,39,0 script Receiver#kh 111,{ } OnMyMobDead: - set .KHKilled,.KHKilled-1; - if (.KHKilled < 1) { - makeitem 7506,1,"this",19,36; - set .KHKilled,0; + if (mobcount("kh_kiehl01","Receiver#kh::OnMyMobDead") <1) { + makeitem 7506,1,"this",19,36; } end; } @@ -6382,13 +6380,12 @@ OnTouch: // Kiehl's Room; Robots //---------------------------------------------------------------------------- kh_kiehl01,15,179,0 script Robots#kh1 111,{ - if (.KHKilled < 1) { + if (mobcount("kh_kiehl01","Robots#kh1::OnMyMobDead") < 1) { mes "^3355FFAs soon as you"; mes "touch the test tube,"; mes "a bunch of robots"; mes "suddenly appeared.^000000."; close2; - set .KHKilled,4; monster "kh_kiehl01",18,181,"Aliot",1740,1,"Robots#kh1::OnMyMobDead"; monster "kh_kiehl01",18,180,"Alicel",1739,1,"Robots#kh1::OnMyMobDead"; monster "kh_kiehl01",18,179,"Aliot",1740,1,"Robots#kh1::OnMyMobDead"; @@ -6400,11 +6397,9 @@ kh_kiehl01,15,179,0 script Robots#kh1 111,{ } OnMyMobDead: - set .KHKilled,.KHKilled-1; - if (.KHKilled < 1) { + if (mobcount("kh_kiehl01","Robots#kh1::OnMyMobDead") < 1) { makeitem 7506,1,"this",18,180; - set .KHKilled,0; - } + } end; } diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index a959c6b6e..cbd99e095 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Evera and The eAthena Dev Team //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -31,6 +31,7 @@ //= 1.8 Bug fixes. (bugreport:1025 bugreport:1062) [L0ne_W0lf] //= 1.9 Bug fixes/Typos. [Paradox924X] //= 2.0 Replaced effect numerics with constants. [L0ne_W0lf] +//= 2.1 Fixed guard tower warper ALWAYS warping. (bugreport:2377) [L0ne_W0lf] //============================================================ // Soup Quest @@ -582,7 +583,7 @@ lou_fild01,195,177,5 script Jiu Lian Bu#1-1 819,{ mes "Hey~"; mes "So how ya been, ya smooth criminal? You wanna visit that place again?"; next; - switch(select("Sure, let's go~:Nah, maybe next time.")) { + if (select("Sure, let's go~:Nah, maybe next time.") == 1) { mes "[Jiu Lian Bu]"; mes "Alright~"; mes "Let's get"; -- cgit v1.2.3-60-g2f50