diff options
| author | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
| commit | 7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch) | |
| tree | 715f3b80d75cab3a9c2a3abd04ae4461165e8854 /npc/pre-re/jobs/1-1/mage.txt | |
| parent | a2405882a4123d6a11d24e895b40148dc7cb455e (diff) | |
| parent | bd04c6c566902d03d633b4dfee5335361155a79e (diff) | |
| download | hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2 hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/pre-re/jobs/1-1/mage.txt')
| -rw-r--r-- | npc/pre-re/jobs/1-1/mage.txt | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 22aab9052..df53e3440 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,11 +16,12 @@ //= 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,{ if (Upper == 1) { @@ -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~!"; @@ -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!"; @@ -596,6 +595,13 @@ geffen_in,164,112,4 script Mixing Machine 111,{ 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 88,{} +// moc_ruins,91,150,0 script Ponka-Hontas 93,{} + geffen_in,177,112,4 script Bookshelf 111,{ mes "[Guide Book]"; mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care."; |