From b96c98c51940db6199fe08a2539e1a1fd7129cef Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Fri, 24 Aug 2007 22:28:36 +0000 Subject: * Changed the Keil Hyre Black Keycard distributing NPCs slightly. Changes to the Keil Hyre quest were mirrored on Stable as well. * Bug fixes to the Wizard and Knight job quests. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11076 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 +++ npc/jobs/2-1/knight.txt | 7 ++++--- npc/jobs/2-1/wizard.txt | 15 ++++++++------- npc/quests/Kiel_Hyre_Quest.txt | 36 +++++++++--------------------------- 4 files changed, 24 insertions(+), 37 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index b793a0a24..835f09b65 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,8 @@ Date Added ====== +2007/08/24 + * Rev. 11076 Changed the Keil Hyre Black Keycard distributing NPCs slightly. [L0ne_W0lf] + * Bug fixes to the Wizard and Knight job quests. 2007/08/22 * Updated Cursed Abbey spawns [Playtester] 2007/08/19 diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index 9b051fdfa..c7d2e4e76 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -5,7 +5,7 @@ //= Converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.3 +//= 2.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -28,6 +28,7 @@ //= 2.1 Merged JFunc [Lupus] //= 2.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 2.3 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf] +//= 2.4 Minor fixes to timer#knt. [L0ne_W0lf] //============================================================ prt_in,88,101,4 script Chivalry Captain#knt 56,{ @@ -2068,8 +2069,8 @@ OnTimer300500: end; OnTimer301500: - donpcevent "Timer#knt::OnEnable"; stopnpctimer; + donpcevent "Timer#knt::OnEnable"; end; OnInit: @@ -2096,7 +2097,7 @@ OnEnable: end; OnDisable: - killmonsterall "job_knt"; + killmonsterall "job_knt","Timer#knt::OnMyMobDead"; disablenpc "Timer#knt"; disablenpc "Warp#knt"; end; diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index 91cd0db8f..e18c685d4 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -4,7 +4,7 @@ //= (Aegis) Translated by yoshiki, converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.5a +//= 2.5b //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -30,6 +30,7 @@ //= 2.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 2.5 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf] //= 2.5a More bugfixes care of Barron-Monster. [L0ne_W0lf] +//= 2.5b Fixed tests calling on a non-existant label in "Room of x#Failed" npcs. [L0ne_W0lf] //============================================================ gef_tower,111,37,4 script Wizard Guildsman 70,{ @@ -1164,7 +1165,7 @@ OnTimer185000: end; OnTimer186000: - donpcevent "Room of Water#Failed::OnDisable"; + disablenpc "Room of Water#Failed"; donpcevent "Room of Water::OnDisable"; donpcevent "Waiting Room#wiz::OnEnable"; } @@ -1229,7 +1230,7 @@ OnTimer62000: end; OnTimer63000: - donpcevent "Room of Water#Failed::OnDisable"; + disablenpc "Room of Water#Failed"; donpcevent "Room of Water#Door::OnDisable"; donpcevent "Waiting Room#wiz::OnEnable"; } @@ -1336,7 +1337,7 @@ OnTimer185000: end; OnTimer186000: - donpcevent "Room of Earth#Failed::OnDisable"; + disablenpc "Room of Earth#Failed"; donpcevent "Room of Earth::OnDisable"; donpcevent "Waiting Room#wiz::OnEnable"; } @@ -1404,7 +1405,7 @@ OnTimer62000: end; OnTimer63000: - donpcevent "Room of Earth#Failed::OnDisable"; + disablenpc "Room of Earth#Failed"; donpcevent "Room of Earth#Door::OnDisable"; donpcevent "Waiting Room#wiz::OnEnable"; } @@ -1512,7 +1513,7 @@ OnTimer185000: end; OnTimer186000: - donpcevent "Room of Fire#Failed::OnDisable"; + disablenpc "Room of Fire#Failed"; donpcevent "Room of Fire::OnDisable"; donpcevent "Waiting Room#wiz::OnEnable"; } @@ -1583,7 +1584,7 @@ OnTimer122000: end; OnTimer123000: - donpcevent "Room of Fire#Failed::OnDisable"; + disablenpc "Room of Fire#Failed"; donpcevent "Room of Fire#Door::OnDisable"; donpcevent "Waiting Room#wiz::OnEnable"; } diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index da57b5785..a16030575 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: ===================================== -//= 3.4 +//= 3.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -69,6 +69,7 @@ //= 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 ^_- +//= 3.5 Changed the way the Black Keycard distibuting NPCs work slighty. [L0ne_W0lf] //============================================================ //============================================================================ // Kiel Hyre Quest/Robotic Lab Dungeon @@ -6384,7 +6385,7 @@ kh_kiehl01,17,39,0 script Receiver 111,{ set KielHyreQuest,76; } close2; - set .KHKilled,.KHKilled+1; + set .KHKilled,2; monster "kh_kiehl01",16,32,"Alicel",1739,1,"Receiver::OnMyMobDead"; monster "kh_kiehl01",18,31,"Aliot",1740,1,"Receiver::OnMyMobDead"; end; @@ -6395,8 +6396,8 @@ kh_kiehl01,17,39,0 script Receiver 111,{ } OnMyMobDead: - set .KHKilled,.KHKilled+1; - if (.KHKilled == 3) { + set .KHKilled,.KHKilled-1; + if (.KHKilled < 1) { makeitem 7506,1,"this",19,36; set .KHKilled,0; } @@ -6760,7 +6761,7 @@ kh_kiehl01,15,179,0 script Robots#kh1 111,{ mes "a bunch of robots"; mes "suddenly appeared.^000000."; close2; - set .KHKilled,.KHKilled+1; + 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"; @@ -6773,8 +6774,8 @@ kh_kiehl01,15,179,0 script Robots#kh1 111,{ } OnMyMobDead: - set .KHKilled,.KHKilled+1; - if (.KHKilled == 4) { + set .KHKilled,.KHKilled-1; + if (.KHKilled < 1) { makeitem 7506,1,"this",18,180; set .KHKilled,0; } @@ -6808,26 +6809,7 @@ kh_kiehl01,166,187,0 script Big Door#BigDoorKHQ5 111,{ mes "you can hear the door"; mes "hinges slightly squeak.^000000"; next; - - switch(select("Push Door","Kick Door","Shake Door","Pull Door","Lift Door")) { - - case 1: - break; - - case 2: - break; - - case 3: - break; - - case 4: - break; - - case 5: - break; - - } - + select("Push Door","Kick Door","Shake Door","Pull Door","Lift Door"); mes "^3355FFA group of monsters"; mes "suddenly appeared as"; mes "soon as you applied"; -- cgit v1.2.3-60-g2f50