* Updated Geneticist, Warlock, and Sura job quests to their latest versions.

* Added a clearer example for party_even_share_bonus (tid:58005).
* Standardized job headers.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17010 54d463be-8e91-2dee-dedb-b68131a5f0ec

conf/battle/party.conf

@@ -44,8 +44,9 @@ party_item_share_type: 0
 // A character's idle status is reset upon item use/skill use/attack (auto attack counts too)/movement.
 idle_no_share: no
 
-// Give additional experience bonus per party-member involved on even-share parties?
-// (eg: If set to 10, a even-share party of 5 people will receive +40% exp)
+// Give additional experience bonus per party-member involved on even-share parties (excluding youself)?
+// ex. If set to 10, a even-share party of 5 people will receive +40% exp (4 members * 10% exp):
+//     140% party experience in total, so each member receives 140%/5 = 28% exp (instead of 20%).
 party_even_share_bonus: 0
 
 // Display party name regardless if player is in a guild.

npc/jobs/2-1/assassin.txt

@@ -7,12 +7,12 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job Change quest for Assassin class.
 //===== Additional Comments: ================================= 
-//= v1.0 Used some dialogue from the aegis Assassin script translated By: Pgro Team (OwNaGe)
+//= 1.0 Used some dialogue from the aegis Assassin script translated By: Pgro Team (OwNaGe)
 //= Also converted the booby traps from the aegis script.[kobra_k88]
-//= v1.1 Made adjustments to ontouch npcs to work with the new "ontouch" functionality.
+//= 1.1 Made adjustments to ontouch npcs to work with the new "ontouch" functionality.
 //= Fixed some duplicate npc names.  Added missing waitingroom triggers.
 //= Fixed warp in "TimerSin", was supposed to be an areawarp.
 //= For some reason sometimes the "Nameless One" would have message windows

npc/jobs/2-1/blacksmith.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= Blacksmith Quest
+//= Blacksmith Job Quest
 //===== By: ==================================================
 //= EREMES THE CANIVALIZER(Aegis)
 //= Translated by: yoshiki.
@@ -9,9 +9,9 @@
 //===== Current Version: =====================================
 //= 2.8
 //===== Compatible With: =====================================
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job Change quest for Blacksmith class.
 //===== Additional Comments: =================================
 //= Changed some npc names to the iRO names. Changed some variable

npc/jobs/2-1/hunter.txt

@@ -9,7 +9,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job Change quest for Hunter class.
 //===== Additional Comments: ================================= 
 //= 0.5 Fully working.

npc/jobs/2-1/priest.txt

@@ -9,7 +9,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job Change quest for Priest class.
 //===== Additional Comments: ================================= 
 //= Fully working.  Changed the way Priests enter the test room to help Acos.

npc/jobs/2-1/wizard.txt

@@ -8,7 +8,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job Change quest for Wizard class.
 //===== Additional Comments: ================================= 
 //= 2.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]

npc/jobs/2-1e/StarGladiator.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job Change quest for Star Gladiator class.
 //===== Additional Comments: ================================= 
 //= 1.1 Updated to the Aegis Standards. [Samuray22]

npc/jobs/2-2/alchemist.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Alchemist classes
 //===== Additional Comments: ================================= 
 //= 2.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]

npc/jobs/2-2/bard.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Bard class
 //===== Additional Comments: =================================
 //= 2.1b Updated to the Official One. [Samuray22]

npc/jobs/2-2/crusader.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-//= Crusader Quest
+//= Crusader Job Quest
 //===== By: ================================================== 
 //= Made by: Black Dragon
 //= Converted by: Shin
@@ -8,7 +8,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Crusader classes
 //===== Additional Comments: ================================= 
 //= 2.2 Updated All NPCs to the officials one [Samuray22]

npc/jobs/2-2/dancer.txt

@@ -8,7 +8,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Dancer classes
 //===== Additional Comments: ================================= 
 //= 3.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]

npc/jobs/2-2/monk.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Monk classes
 //===== Additional Comments: ================================= 
 //= 2.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]

npc/jobs/2-2/rogue.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Rogue classes
 //===== Additional Comments: ================================= 
 //= 2.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]

npc/jobs/2-2/sage.txt

@@ -9,7 +9,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Sage classes
 //===== Additional Comments: ================================= 
 //= 2.1 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]

npc/jobs/2-2e/SoulLinker.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Soul Linker class.
 //= [Vars Used]
 //= SOUL_Q = Job Change Phase. (Max 4)

npc/jobs/novice/supernovice.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-//= Super Novice Script
+//= Super Novice Job Quest
 //===== By: ================================================== 
 //= Darkchild
 //===== Current Version: ===================================== 
@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN r15340+
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Super Novice Job Change Npc
 //= Super Novice Cart Rental Npc
 //= Some Other Useless Super Novice Npc

npc/jobs/valkyrie.txt

@@ -9,7 +9,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Quest to become a Tranceded Class. (Advanced/Rebirthed)
 //===== Additional Comments: ================================= 
 //= 1.1 Made all into functions,additional checks,quest skills,now Valhallana can return you back. She also makes reborn process only when you got no Zeny/items (as in kRO) [Lupus]

npc/pre-re/jobs/1-1/acolyte.txt

@@ -7,15 +7,15 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Acolyte classes
 //===== Additional Comments: ================================= 
-//= v1.0 Fully working.
-//= v1.1 Added function calls for Priest Quest.
-//= v1.2 Fixed Marthilda, Yosuke bugs. [Lupus]
-//= v1.2a Added instant job change for High Novice [Lupus]
-//= v1.3 Added Baby Class support [Lupus]
-//= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
+//= 1.0 Fully working.
+//= 1.1 Added function calls for Priest Quest.
+//= 1.2 Fixed Marthilda, Yosuke bugs. [Lupus]
+//= 1.2a Added instant job change for High Novice [Lupus]
+//= 1.3 Added Baby Class support [Lupus]
+//= 1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
 //= 1.5 Now saves/restores all quest skills [Lupus]
 //= 1.6 Merged back JFunc [Lupus]
 //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]

npc/pre-re/jobs/1-1/archer.txt

@@ -7,13 +7,13 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Archer classes
 //===== Additional Comments: ================================= 
-//= Fully working
-//= v1.1 Added instant job change for High Novice [Lupus]
-//= v1.3 Added Baby Class support [Lupus]
-//= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
+//= 1.0 Fully working.
+//= 1.1 Added instant job change for High Novice [Lupus]
+//= 1.3 Added Baby Class support [Lupus]
+//= 1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
 //= 1.5 Now saves/restores all quest skills [Lupus]
 //= 1.6 Merged back JFunc [Lupus]
 //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]

npc/pre-re/jobs/1-1/mage.txt

@@ -7,14 +7,14 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Mage classes
 //===== Additional Comments: ================================= 
-//= Fully working
+//= 1.0 Fully working.
 //= 1.1 Fixed input ingridients bug [Lupus]
-//= v1.2 Added instant job change for High Novice [Lupus]
+//= 1.2 Added instant job change for High Novice [Lupus]
 //= 1.3 Added Baby Class support [Lupus]
-//= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
+//= 1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
 //= 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]

npc/pre-re/jobs/1-1/merchant.txt

@@ -7,13 +7,13 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Merchant classes
 //===== Additional Comments: ================================= 
-//= Fully working
-//= v1.1 Added instant job change for High Novice [Lupus]
-//= v1.3 Added Baby Class support [Lupus]
-//= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
+//= 1.0 Fully working.
+//= 1.1 Added instant job change for High Novice [Lupus]
+//= 1.3 Added Baby Class support [Lupus]
+//= 1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
 //= 1.5 Changed Prontera->Izlude teleport price to 600 [Lupus]
 //= 1.5.1 Removed Duplicates [Silent]
 //= 1.5.2 Now saves/restores all quest skills [Lupus]

npc/pre-re/jobs/1-1/swordman.txt

@@ -7,15 +7,14 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Swordman classes
 //= Uses Job_sword1 as opposed to sword_1-1 -> sword_3-1.
 //= EXPLOITABLE in a sense because while the sword_x-1 maps
 //= are marked as "inside" by the client, job_sword1 is not.
 //= giving players FREE camera rotation while doing the job quest.
 //===== Additional Comments: ================================= 
-//= Fully working.  I have created a custom warp to get into the test room so disable
-//= the one in your warp script or scripts.  It is this warp: "izlude_in",40,170.
+//= 1.0 Fully working.
 //= 1.1 Added instant job change for High Novice [Lupus]
 //= 1.3 Added Baby Class support [Lupus]
 //= 1.4 Changed the timing system to initnpctimer, now you do get warnings about time

npc/pre-re/jobs/1-1/thief.txt

@@ -1,19 +1,19 @@
 //===== rAthena Script =======================================
 //= Thief Job Quest
 //===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.8
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Job quest for Thief classes
 //===== Additional Comments: =================================
-//= Fully working
-//= v1.1 Added instant job change for High Novice [Lupus]
+//= 1.0 Fully working.
+//= 1.1 Added instant job change for High Novice [Lupus]
 //= 1.3 Added Baby Class support [Lupus]
-//= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
+//= 1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
 //= Fixed possible EXP abuse [Lupus]
 //= 1.5 Now saves/restores all quest skills [Lupus]
 //= 1.6 Merged back JFunc [Lupus] 1.6a typos

npc/pre-re/jobs/novice/novice.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Novice Training Grounds
 //===== Additional Comments: ================================= 
 //= 1.7D Added confirm character name thing on receptionist. [Kisuka]

npc/quests/thana_quest.txt

@@ -2054,20 +2054,16 @@ OnInit:
 	end;
 OnEnable:
 	enablenpc "#gateto_thanatos";
-	initnpctimer;
-	end;
 OnOn2:
 	initnpctimer;
 	end;
 OnTouch:
 	set .@touch,1;
 OnTimer6000:
-	set .@boss_tt, $@thana_summon;
-	if ((.@boss_tt == 0) || (.@boss_tt == 6)) {
+	if (($@thana_summon == 0) || ($@thana_summon == 6)) {
 		disablenpc "#gateto_thanatos";
 		stopnpctimer;
-	}
-	else if (.@boss_tt == 5) {
+	} else if ($@thana_summon == 5) {
 		if (.@touch) warp "thana_boss",136,116;
 		else donpcevent "#gateto_thanatos::OnOn2";
 	}

npc/re/jobs/1-1/acolyte.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-//= Renewal Acolyte Job Change
+//= Renewal Acolyte Job Quest
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 

npc/re/jobs/1-1/archer.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-//= Renewal Archer Job Change
+//= Renewal Archer Job Quest
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 

npc/re/jobs/1-1/mage.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-//= Renewal Mage Job Change
+//= Renewal Mage Job Quest
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 

npc/re/jobs/1-1/merchant.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-//= Renewal Merchant Job Change
+//= Renewal Merchant Job Quest
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 

npc/re/jobs/1-1/swordman.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-//= Renewal Swordman Job Change
+//= Renewal Swordman Job Quest
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 

npc/re/jobs/1-1/thief.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-//= Renewal Thief Job Change
+//= Renewal Thief Job Quest
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 

npc/re/jobs/3-1/archbishop.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= Arch Bishop Job change Quest
+//= Arch Bishop Job Quest
 //===== By: ==================================================
 //= L0ne_W0lf
 //= Credits: Gepard

npc/re/jobs/3-1/guillotine_cross.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// Guillotine Cross Job Change Quest
+//= Guillotine Cross Job Quest
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 

npc/re/jobs/3-1/mechanic.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-//= Mechanic Jobchange Quest
+//= Mechanic Job Quest
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 

npc/re/jobs/3-1/ranger.txt

@@ -1,17 +1,16 @@
 //===== rAthena Script ======================================= 
-// Ranger Job change Quest
+//= Ranger Job Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib
+//= Muad_Dib
 //===== Current Version: ===================================== 
 //= 1.4
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
-//= [Translated from the Official]
+//= [Official Conversion]
 //= Job change Quest from Hunter / Sniper -> Ranger.
 //===== Additional Comments: ================================= 
-//= 1.0 First Version.
+//= 1.0 First Version. [Masao]
 //= 1.1 Updated SC_STONE duration from 2 Seconds to 2 Minutes
 //= and fixed Mercenary check.
 //= 1.2 Fixed first Quest so that when a false poring got killed

npc/re/jobs/3-2/minstrel.txt

@@ -1,17 +1,16 @@
 //===== rAthena Script ======================================= 
-// Minstrel Job change Quest
+//= Minstrel Job Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib
+//= Muad_Dib
 //===== Current Version: ===================================== 
 //= 1.2
 //===== Compatible With: ===================================== 
 //= Any rAthena SVN
 //===== Description: ========================================= 
-//= [Translated from the Official]
+//= [Official Conversion]
 //= Job change Quest from Bard / Clown -> Minstrel.
 //===== Additional Comments: ================================= 
-//= 1.0 First Version.
+//= 1.0 First Version. [Masao]
 //= 1.1 Fix the checking of requirements before job change to Minstel [JayPee]
 //= 1.2 Optimized. [Euphy]
 //============================================================

npc/re/jobs/3-2/royal_guard.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// Royal Guard Job change Quest
+//= Royal Guard Job Quest
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 

npc/re/jobs/3-2/shadow_chaser.txt

@@ -1,12 +1,12 @@
 //===== rAthena Script ======================================= 
-// Shadow Chaser Job Change Quest
+//= Shadow Chaser Job Quest
 //===== By: ================================================== 
 //= ultragunner
 //= Credits: Oshinoke
 //===== Current Version: ===================================== 
 //= 1.2
 //===== Compatible With: ===================================== 
-//= rAthena
+//= rAthena SVN
 //===== Description: ========================================= 
 //= Job change Quest from Rogue / Stalker -> Shadow Chaser.
 //= Based on Official pRO server

npc/re/jobs/3-2/sorcerer.txt

@@ -1,11 +1,11 @@
 //===== rAthena Script ======================================= 
-// Sorcerer Job change Quest
+//= Sorcerer Job Quest
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 
 //= 1.2
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= Job change Quest from Sage / Professor -> Sorcerer.
@@ -137,7 +137,7 @@ gef_tower,113,161,5	script	Karacas	754,{
 		mes "You look happy. Have a great journey.";
 		close;
 	}
-	if ((JobLevel < 50) || (SkillPoint != 0) || (BaseLevel < 99)) {
+	if (BaseLevel < 99 || JobLevel < 50 || SkillPoint != 0) {
 		mes "Is there anything I can do for you?";
 		close;
 	}

npc/re/jobs/3-2/wanderer.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// Wanderer Job change Quest
+//= Wanderer Job Quest
 //===== By: ================================================== 
 //= Muad_Dib, Meyraw
 //===== Current Version: =====================================