diff options
Diffstat (limited to 'npc/jobs/2-1/wizard.txt')
| -rw-r--r-- | npc/jobs/2-1/wizard.txt | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index 6598a0cc2..b1b4d05ab 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -1,16 +1,14 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Wizard Job Quest -//===== By: ================================================== +//===== By: ================================================== //= (Aegis) Translated by yoshiki, converted by kobra_k88 //= Further bugfixed and tested by Lupus -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 3.3 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job Change quest for Wizard class. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 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] @@ -18,7 +16,7 @@ //= 2.5c Bug fixes. Cleaned up some NPCs slightly. [L0ne_W0lf] //= 2.6 Fixed Water Room not warping on time-up. [L0ne_W0lf] //= 2.7 Now uses enable and disable waitingroomevent. [L0ne_W0lf] -//= Other minor fixes to various NPCs. +//= Other minor fixes to various NPCs. //= 2.7a Added end; :D (bugreport:2038) [Yommy] //= 2.8 Fixed donpcevent to doevent. (bugreport:2311) [SoulBlaker] //= 2.9 Reverted the change of donpcevent to doevent. [L0ne_W0lf] @@ -27,9 +25,9 @@ //= 3.1 Removed the need for use of 'goto.' [L0ne_W0lf] //= 3.2 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info). //= 3.3 Fixed waitingroom bug. [Euphy] -//============================================================ +//============================================================ -gef_tower,111,37,4 script Wizard Guildsman 70,{ +gef_tower,111,37,4 script Wizard Guildsman 1_F_GYPSY,{ if (Upper == 1) { mes "[Catherine]"; mes "? Excuse me, I am wondering if we have met before...?"; @@ -47,7 +45,7 @@ gef_tower,111,37,4 script Wizard Guildsman 70,{ mes "Now, excuse me."; next; mes "[Catherine]"; - if (sex) + if (Sex) mes "Well, If you intended to ask me on a date... I appreciate it...hohoho."; else mes "Well, if you fix me up with a cute guy... I'd appreciate it...hohoho!."; @@ -375,7 +373,7 @@ gef_tower,111,37,4 script Wizard Guildsman 70,{ mes "You...*sigh*...I didn't think you would do such a dishonorable thing."; next; mes "[Catherine]"; - if (sex) { + if (Sex) { mes "Granted you're a mage, but how could a guy be so weak?!"; mes "Well, at least your alive still. Go back and try harder this time. ~tehehehe"; } @@ -448,7 +446,7 @@ gef_tower,111,37,4 script Wizard Guildsman 70,{ } } -gef_tower,102,24,2 script Gloomy Wizard 735,{ +gef_tower,102,24,2 script Gloomy Wizard 4_M_JOB_WIZARD,{ if (BaseJob != Job_Mage) { if (BaseJob == Job_Wizard) { mes "[Raulel]"; @@ -457,7 +455,7 @@ gef_tower,102,24,2 script Gloomy Wizard 735,{ next; mes "[Raulel]"; mes "Don't live dishonestly, or impolitely, or else one day you'll be caught in a spell you can't control, and BOOM, your dead!"; - if (sex == 1) { + if (Sex) { mes "If you don't want that to happen, then learn how to use spells properly!"; next; mes "[Raulel]"; @@ -1055,7 +1053,7 @@ gef_tower,102,24,2 script Gloomy Wizard 735,{ } } -job_wiz,50,165,4 script Arena Assistant 700,{ +job_wiz,50,165,4 script Arena Assistant 8_F_GIRL,{ mes "[Arena Assistant]"; mes "Welcome to the Wizard Job Change Arena."; mes "If you would like to take the final test, then please enter the waiting room."; @@ -1088,7 +1086,7 @@ OnStart: // Water Room (Test 2 part 1) //========================================================== -job_wiz,1,1,1 script Room of Water 66,{ +job_wiz,1,1,1 script Room of Water 1_F_01,{ OnInit: disablenpc "Room of Water"; end; @@ -1182,7 +1180,7 @@ OnTimer186000: end; } -job_wiz,1,2,1 script Room of Water#Door 66,{ +job_wiz,1,2,1 script Room of Water#Door 1_F_01,{ OnInit: disablenpc "Room of Water#Door"; end; @@ -1261,7 +1259,7 @@ OnTouch: // Earth Room (Test 2 part 2) //========================================================== -job_wiz,1,3,1 script Room of Earth 66,{ +job_wiz,1,3,1 script Room of Earth 1_F_01,{ OnInit: disablenpc "Room of Earth"; end; @@ -1356,7 +1354,7 @@ OnTimer186000: end; } -job_wiz,1,4,1 script Room of Earth#Door 66,{ +job_wiz,1,4,1 script Room of Earth#Door 1_F_01,{ OnInit: disablenpc "Room of Earth#Door"; end; @@ -1441,7 +1439,7 @@ OnTouch: // Fire Room (Test 2 part 3) //========================================================== -job_wiz,1,5,1 script Room of Fire 66,{ +job_wiz,1,5,1 script Room of Fire 1_F_01,{ OnInit: disablenpc "Room of Fire"; end; @@ -1534,7 +1532,7 @@ OnTimer186000: end; } -job_wiz,1,6,1 script Room of Fire#Door 66,{ +job_wiz,1,6,1 script Room of Fire#Door 1_F_01,{ OnInit: disablenpc "Room of Fire#Door"; end; @@ -1621,7 +1619,7 @@ OnTouch: end; } -job_wiz,1,7,1 script Test Helper#wiz 66,{ +job_wiz,1,7,1 script Test Helper#wiz 1_F_01,{ end; OnInit: @@ -1659,7 +1657,7 @@ OnTimer9000: end; } -gef_tower,107,36,4 script White Dog#wiz 81,{ +gef_tower,107,36,4 script White Dog#wiz 4_DOG01,{ if (BaseJob != Job_Mage) { if (BaseJob == Job_Wizard) { mes "[Maria]"; @@ -1962,9 +1960,9 @@ gef_tower,107,36,4 script White Dog#wiz 81,{ } } -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.1 Now using the initnpctimer command, donpcevent, //= and new waitingroom event commands. No more addtimer spamming. //= No longer have to talk to the npc to take the test. Just enter the chat room. |