From bc65860d166f644ca3796467713c2792d0f60889 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Thu, 28 Feb 2008 20:04:16 +0000 Subject: * Changed how waiting rooms work in the job quests. - Implemented a checkweight in the alchemist job quest. - Various other small updates to the 2-1 and 2-2 quests. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12262 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/2-2/alchemist.txt | 38 ++++++++++++++++++-------------------- npc/jobs/2-2/crusader.txt | 14 +++++++++----- npc/jobs/2-2/dancer.txt | 16 ++++++++++------ npc/jobs/2-2/sage.txt | 18 ++++++++++-------- 4 files changed, 47 insertions(+), 39 deletions(-) (limited to 'npc/jobs/2-2') diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index 6e1902a09..b2c21d337 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= nestor_zulueta (Fusion), converted by Darkchild //===== Current Version: ===================================== -//= 2.5 +//= 2.7 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 2.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" //= 2.6 Corrected a bug in advanced class checking. [L0ne_W0lf] +//= 2.7 Added missing checkweights. [L0ne_W0lf] //============================================================ alde_alche,27,185,5 script Alchemist Guildsman#am 744,{ @@ -764,16 +765,14 @@ L_AskQuestions: } alde_alche,13,15,7 script Studying Man#am 750,{ - //set max_max_c,1201; - //if (max_max_c == 1) { - // mes "- Wait a minute! -"; - // mes "- Currently you are carrying -"; - // mes "- too many items with you. -"; - // mes "- Please come back again -"; - // mes "- after you store some items into kafra storage. -"; - // close; - // return - //} + if (checkweight(1201,1) == 0) { + mes "- Wait a minute! -"; + mes "- Currently you are carrying -"; + mes "- too many items with you. -"; + mes "- Please come back again -"; + mes "- after you store some items into kafra storage. -"; + close; + } mes "[Darwin]"; if (BaseJob != Job_Merchant) { if (BaseJob == Job_Alchemist) { @@ -1736,15 +1735,14 @@ alde_alche,101,184,4 script Master Alchemist#am 122,{ } alde_alche,145,19,1 script Chief Researcher#am 57,{ - //set max_max_c,1201; - //if (max_max_c == 1) { - // mes "- Wait a minute! -"; - // mes "- Currently you are carrying -"; - // mes "- too many items with you. -"; - // mes "- Please come back again -"; - // mes "- after you store some items into kafra storage. -"; - // close; - //} + if (checkweight(1201,1) == 0) { + mes "- Wait a minute! -"; + mes "- Currently you are carrying -"; + mes "- too many items with you. -"; + mes "- Please come back again -"; + mes "- after you store some items into kafra storage. -"; + close; + } if (ALCH_Q > 19 && ALCH_Q < 22) { if (ALCH_Q == 20) { mes "[Nicholas Flamel]"; diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index d3c17ec83..4124f0738 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -4,7 +4,7 @@ //= Made by: Black Dragon //= Converted by: Shin //===== Current Version: ===================================== -//= 2.9a +//= 3.0 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -28,6 +28,7 @@ //= 2.8 Fixed a little minor bug. [Samuray22] //= 2.9 Minor fixes, typos, an incorrect answer. Thanks to yyCC. [L0ne_W0lf] //= 2.9a Deleted unused variables. [Samuray22] +//= 3.0 Updated waiting room. (Removes global var) [L0ne_W0lf] //============================================================ @@ -1199,16 +1200,19 @@ job_cru,24,187,2 script Waiting Room#cr1 700,{ OnInit: disablenpc "Waiting Room#cr1"; - waitingroom "Waiting Room",20,"Waiting Room#cr1::OnStart",1; + waitingroom "Waiting Room",20,"Waiting Room#cr1::OnStartArena",1; + enablewaitingroomevent; end; -OnStart: - if (getareausers("job_cru", 160, 16, 190, 190)) end; - if (!getwaitingroomstate(33)) end; +OnStartArena: warpwaitingpc "job_cru",168,21; donpcevent "Monster Summon#cr0::OnStart"; + disablewaitingroomevent; end; +OnStart: + enablewaitingroomevent; + end; } job_cru,168,17,0 script Zombie Guide -1,2,2,{ diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index d568f5f39..6d7b768f6 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -4,7 +4,7 @@ //= Kalen - Original jAthena //= Fredzilla - Converted, Lupus //===== Current Version: ===================================== -//= 3.2a +//= 3.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 3.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" //= 3.2a Deleted unused variables. [Samuray22] +//= 3.3 Updated waiting room. (Removes global var) [L0ne_W0lf] //============================================================ comodo,180,153,4 script Sonotora#1 90,{ @@ -871,10 +872,10 @@ job_duncer,95,93,4 script Bijou#da 101,{ job_duncer,32,154,1 script Waiting Room#dance 66,{ OnInit: waitingroom "Waiting Room",20,"Waiting Room#dance::OnStartArena",1; + enablewaitingroomevent; end; OnStartArena: - disablewaitingroomevent; disablenpc "dance#up"; disablenpc "dance#down"; disablenpc "dance#left"; @@ -883,10 +884,7 @@ OnStartArena: donpcevent "dance#return::OnDisable"; warpwaitingpc "job_duncer",69,110,1; donpcevent "Bijou#dance_timer::OnEnable"; - set .Dance_PID,$@warpwaitingpc[0]; - if (attachrid(.Dance_PID) == 0) { - enablewaitingroomevent; - } + disablewaitingroomevent; end; OnEnable: @@ -1207,6 +1205,7 @@ OnTimer89000: donpcevent "dance#return::OnEnable"; donpcevent "dance#poring::OnDisable"; stopnpctimer; + end; } job_duncer,69,110,0 script dance#return -1,1,4,{ @@ -1225,6 +1224,7 @@ OnDisable: OnEnable: enablenpc "dance#return"; donpcevent "dance#return#2::OnEnable"; + end; } job_duncer,66,110,0 script dance#return#2 -1,1,1,{ @@ -1240,6 +1240,7 @@ OnDisable: OnEnable: enablenpc "dance#return#2"; donpcevent "dance#return#3::OnEnable"; + end; } job_duncer,72,110,0 script dance#return#3 -1,1,1,{ @@ -1255,6 +1256,7 @@ OnDisable: OnEnable: enablenpc "dance#return#3"; donpcevent "Waiting Room#dance::OnEnable"; + end; } // Dance Move Triggers @@ -1285,6 +1287,8 @@ OnMyMobDead: OnDisable: killmonsterall "job_duncer"; + end; + } // Backup Dancers diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index ccf7bf69a..f702be59c 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -5,7 +5,7 @@ //= Unknown Translator (1.0) //= Darkchild (1.2) //===== Current Version: ===================================== -//= 2.4a +//= 2.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -19,6 +19,7 @@ //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 2.4 Fixes bug with first room monsters not being reset. [L0ne_W0lf] //= 2.4a Deleted unused variables. [Samuray22] +//= 2.5 Updated waiting room. (Removes global var) [L0ne_W0lf] //============================================================ yuno_in02,38,61,5 script Dean of the Academy#sa 743,{ @@ -2469,23 +2470,18 @@ job_sage,50,165,4 script Waiting Room#sg 700,{ OnInit: disablenpc "Waiting Room#sg"; waitingroom "Waiting Room",20,"Waiting Room#sg::OnStartArena",1; + enablewaitingroomevent; end; OnStartArena: - disablewaitingroomevent; warpwaitingpc "job_sage",116,97; - set .Sage_pid,$@warpwaitingpc[0]; - if (attachrid(.Sage_pid) == 0) { - enablewaitingroomevent; - end; - } donpcevent "Arena#1::OnEnable"; + disablewaitingroomevent; end; OnEnable: enablewaitingroomevent; end; - } - script Arena#1 66,{ @@ -2580,6 +2576,8 @@ OnTimer185000: OnTimer186000: disablenpc "Arena#1"; donpcevent "Waiting Room#sg::OnEnable"; + stopnpctimer; + end; } - script Arena#2 -1,{ @@ -2680,6 +2678,8 @@ OnTimer185000: OnTimer186000: disablenpc "Arena#2"; donpcevent "Waiting Room#sg::OnEnable"; + stopnpctimer; + end; } - script Arena#Doorkeeper -1,{ @@ -2745,6 +2745,8 @@ OnTimer62000: OnTimer63000: disablenpc "Arena#Doorkeeper"; donpcevent "Waiting Room#sg::OnEnable"; + stopnpctimer; + end; } - script Arena#3 -1,{ -- cgit v1.2.3-60-g2f50