diff options
Diffstat (limited to 'npc/pre-re/jobs/1-1/mage.txt')
| -rw-r--r-- | npc/pre-re/jobs/1-1/mage.txt | 78 |
1 files changed, 21 insertions, 57 deletions
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 5652260f2..2e03ce410 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -1,15 +1,13 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Mage Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== -//= 1.9 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Current Version: ===================================== +//= 2.0 +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Mage classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Fixed input ingridients bug [Lupus] //= 1.2 Added instant job change for High Novice [Lupus] @@ -18,13 +16,14 @@ //= 1.5 Now saves/restores all quest skills [Lupus] //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus] //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= No longer uses function "F_ToHigh" +//= No longer uses function "F_ToHigh" //= 1.7a Fixed a "If" in the quest. (bugreport:489) [Samuray22] //= 1.8 Added Quest Log commands. [L0ne_W0lf] //= 1.9 Fixed an issue with completequest by adding checkquest. [Kisuka] -//============================================================ +//= 2.0 Moved "Dollshoi" and "Ponka-Hontas" NPCs. [Euphy] +//============================================================ -geffen_in,164,124,4 script Mage Guildsman 123,{ +geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ if (Upper == 1) { if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) { if (Class == Job_Novice_High) { @@ -86,7 +85,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ } if (job_magician_q == 0) { mes "Wanna be a Mage, eh...?"; - if (sex) + if (Sex) mes "Hey, look at you! You're kinda cute~! Not my type though..."; else { mes "Oooh, you're such a hot babe~!"; @@ -208,7 +207,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ next; callfunc "Job_Change",Job_Mage; callfunc "F_ClearJobVar"; - set Zeny,Zeny+50; + Zeny += 50; if(checkquest(1005) != -1) { completequest 1005; } @@ -231,7 +230,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ case 2: mes "[Mage Guildsman]"; mes "Wanna be a Mage, eh?"; - if (sex) + if (Sex) mes "For a cutie like you, I'd be happy to explain the requirements!"; else mes "I'd be happy to explain the requirements for a pretty girl like you!"; @@ -286,7 +285,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ } } -geffen_in,164,112,4 script Mixing Machine 111,{ +geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "[Mixing Machine]"; mes "This machine is the property of the Geffen Mage Guild and is used only for mixing solutions for magic purposes."; next; @@ -596,49 +595,14 @@ geffen_in,164,112,4 script Mixing Machine 111,{ close; } -pay_arche,122,100,0 script Dollshoi 88,{ - mes "[Mage Guildsman]"; - mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube."; - next; - if (select("Alright, Deal.:Nah, forget it.") == 1) { - mes "[Mage Guildsman]"; - if (Zeny < 50) { - mes "Hey! You don't have enough money to cover my 50 Zeny charge."; - close; - } - if (countitem(1092) == 0) { - mes "You can't carry solutions without a bottle! Bring me an Empty Test Tube."; - close; - } - delitem 1092,1; //Empty_Cylinder - set zeny,zeny-50; - getitem 1089,1; //Payon_Potion - } - close; -} - -moc_ruins,91,150,0 script Ponka-Hontas 93,{ - mes "[Mage Guildsman]"; - mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Testtube."; - next; - if (select("Alright, Deal.:Nah, forget it.") == 1) { - mes "[Mage Guildsman]"; - if (zeny < 50) { - mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee."; - close; - } - if (countitem(1092) == 0) { - mes "You can't carry liquids without using a bottle. Bring an Empty Test Tube the next time you see me."; - close; - } - delitem 1092,1; //Empty_Cylinder - set zeny,zeny-50; - getitem 1088,1; //Morocc_Potion - } - close; -} +// The Morroc Solution and Payon Solution traders +// are also used in the Sage skill quests, and have +// been moved to npc/quests/mage_solution.txt. +// +// pay_arche,122,100,0 script Dollshoi 4_M_ORIENT01,{} +// moc_ruins,91,150,0 script Ponka-Hontas 4_F_04,{} -geffen_in,177,112,4 script Bookshelf 111,{ +geffen_in,177,112,4 script Bookshelf HIDDEN_NPC,{ mes "[Guide Book]"; mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care."; next; |