From 0f6c399c236ac332eb6a44ebc1b0ea77ec75d878 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Mon, 21 Jun 2010 15:25:44 +0000 Subject: * Removed usage of the 'goto' command from job quests. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14351 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/2-1/wizard.txt | 127 ++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 63 deletions(-) (limited to 'npc/jobs/2-1/wizard.txt') diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index 090108084..a573ef930 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: ===================================== -//= 3.0 +//= 3.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -24,6 +24,7 @@ //= 2.9 Reverted the change of donpcevent to doevent. [L0ne_W0lf] //= Was probably cuased by a warp BEFORE a percentheal //= 3.0 Added Quest Log commands. [Kisuka] +//= 3.1 Removed the need for use of 'goto.' [L0ne_W0lf] //============================================================ gef_tower,111,37,4 script Wizard Guildsman 70,{ @@ -513,45 +514,73 @@ gef_tower,102,24,2 script Gloomy Wizard 735,{ mes "*Cough* *cough* Let's see how well you live as a Wizard. ~Hahahahhaha"; close; } - else if (WIZ_Q == 3) { - mes "[Raulel]"; - mes "*Cough* *cough*...You must've passed the first test."; - mes "Ok, I'm the Wizard in charge of your testing from now on. My name is 'Raulel Asparagus'."; - next; - mes "[Raulel]"; - mes "*sneeze* It's not too late yet, wouldn't you rather just go back to town and enjoy the peaceful life?"; - next; - mes "[Raulel]"; - mes "Hahahaha~ You don't know how dangerous it is...to deal with Greater Magic."; - next; - if (select("I want to live as a normal Mage.:I would like to continue with the tests.") == 1) { + else if ((WIZ_Q == 3) || (WIZ_Q == 4)) { + if (WIZ_Q == 3) { mes "[Raulel]"; - mes "Hahaha~ *sneeze* Good choice...*cough* *cough*~"; - mes "Best not to even dream about life as a Wizard. Graa...Greaa...*sneeze* Greater Magic wasn't meant for humans to use!"; + mes "*Cough* *cough*...You must've passed the first test."; + mes "Ok, I'm the Wizard in charge of your testing from now on. My name is 'Raulel Asparagus'."; next; mes "[Raulel]"; - mes "Leave the top of this tower quietly and don't ever look back."; - mes "Just live peacefully with the powers that you have right now."; - close; + mes "*sneeze* It's not too late yet, wouldn't you rather just go back to town and enjoy the peaceful life?"; + next; + mes "[Raulel]"; + mes "Hahahaha~ You don't know how dangerous it is...to deal with Greater Magic."; + next; + if (select("I want to live as a normal Mage.:I would like to continue with the tests.") == 1) { + mes "[Raulel]"; + mes "Hahaha~ *sneeze* Good choice...*cough* *cough*~"; + mes "Best not to even dream about life as a Wizard. Graa...Greaa...*sneeze* Greater Magic wasn't meant for humans to use!"; + next; + mes "[Raulel]"; + mes "Leave the top of this tower quietly and don't ever look back."; + mes "Just live peacefully with the powers that you have right now."; + close; + } + mes "[Raulel]"; + mes "*sneeze* Hahahaha~ Now there's a foolish one here!"; + mes "Well then, let's see how good you are. *cough* I want to see this with my own two eyes!"; + next; + mes "[Raulel]"; + mes "*sneeze* Then let's begin the test!"; + mes "If you don't answer them all correctly, you fail. Hahahahahahahahaha~"; + next; + mes "[Raulel]"; + mes "I'll give you 10 questions so give me the right answers."; + mes "If you get something wrong, I won't tell you what it is!"; + if(checkquest(9016) == -1) { + changequest 9015,9016; + } + next; + mes "[Raulel]"; + mes "*Cough* *cough* Then here go the questions!"; } - mes "[Raulel]"; - mes "*sneeze* Hahahaha~ Now there's a foolish one here!"; - mes "Well then, let's see how good you are. *cough* I want to see this with my own two eyes!"; - next; - mes "[Raulel]"; - mes "*sneeze* Then let's begin the test!"; - mes "If you don't answer them all correctly, you fail. Hahahahahahahahaha~"; - next; - mes "[Raulel]"; - mes "I'll give you 10 questions so give me the right answers."; - mes "If you get something wrong, I won't tell you what it is!"; - if(checkquest(9016) == -1) { - changequest 9015,9016; + else if (WIZ_Q == 4) { + mes "[Raulel]"; + mes "Hahahaha~ Are you that desperate? *sneeze* What a pain in the arse..."; + next; + mes "[Raulel]"; + mes "Since you don't want to settle for a stable and peaceful life, I'll give you another chance..."; + next; + mes "[Raulel]"; + mes "If you miss one single question, then just give up. You wouldn't have any talent in being a Wizard! ~Hahahahaha"; + next; + if (select("Because of you, I want to live as a normal Mage now.:I would like to continue with the tests.") == 1) { + mes "[Raulel]"; + mes "Hahahaha~ Surprising, comming from you, that's a very wise choice...*cough* *cough*"; + mes "If i were you, i would never, ever dream of becoming a Wizard again. Gre...Greaa...*sneeze* Greater Magic wasn't meant for humans to use."; + next; + mes "[Raulel]"; + mes "Just leave the top of this tower quietly and never look back."; + mes "Live peacefully with the powers that you have right now."; + close; + } + mes "[Raulel]"; + mes "Hahahahahahaha~ Now there's a foolish one right here!"; + mes "Well then, let's see just how good you can be! *sneeze* I want to see this with my own two eyes."; + next; + mes "[Raulel]"; + mes "Then let's begin the test!"; } - next; - mes "[Raulel]"; - mes "*Cough* *cough* Then here go the questions!"; -L_AskQuestions: next; switch(rand(1,3)) { case 1: @@ -792,34 +821,6 @@ L_AskQuestions: close; } } - else if (WIZ_Q == 4) { - mes "[Raulel]"; - mes "Hahahaha~ Are you that desperate? *sneeze* What a pain in the arse..."; - next; - mes "[Raulel]"; - mes "Since you don't want to settle for a stable and peaceful life, I'll give you another chance..."; - next; - mes "[Raulel]"; - mes "If you miss one single question, then just give up. You wouldn't have any talent in being a Wizard! ~Hahahahaha"; - next; - if (select("Because of you, I want to live as a normal Mage now.:I would like to continue with the tests.") == 1) { - mes "[Raulel]"; - mes "Hahahaha~ Surprising, comming from you, that's a very wise choice...*cough* *cough*"; - mes "If i were you, i would never, ever dream of becoming a Wizard again. Gre...Greaa...*sneeze* Greater Magic wasn't meant for humans to use."; - next; - mes "[Raulel]"; - mes "Just leave the top of this tower quietly and never look back."; - mes "Live peacefully with the powers that you have right now."; - close; - } - mes "[Raulel]"; - mes "Hahahahahahaha~ Now there's a foolish one right here!"; - mes "Well then, let's see just how good you can be! *sneeze* I want to see this with my own two eyes."; - next; - mes "[Raulel]"; - mes "Then let's begin the test!"; - goto L_AskQuestions; - } else if (WIZ_Q == 5) { mes "[Raulel]"; mes "Ok, hope you got plenty of rest. Hahahahahah~"; -- cgit v1.2.3-70-g09d2