A few follow-ups.

- Follow-up to pull request rathena#36: some cleanup of the file. - Follow-up to 3f8dd48: updated Pre-Renewal file. Added Rebellion class to custom Job Master script. (credits: Elias) Signed-off-by: Euphy <[email protected]>
vykimo · Jan 12, 2014 · 645e110 · 645e110
1 parent 93c6386
commit 645e110
Show file tree

Hide file tree

Showing 3 changed files with 185 additions and 248 deletions.
diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt
@@ -661,9 +661,9 @@
 2238,0,0,35,0,0,0,99,0,0,none,0,0,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_ELECTRICSHOCKER#Electric Shocker#
 2239,0,0,20,0,0,0,99,0,0,none,0,0,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_CLUSTERBOMB#Cluster Bomb#
 2240,0,0,5,0,0,0,99,0,0,none,0,0,6124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_WUGMASTERY#Warg Mastery#
-2241,0,0,2,0,0,0,99,0,0,ridingwarg,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_WUGRIDER#Warg Rider#
+2241,0,0,2,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_WUGRIDER#Warg Rider#
 2242,0,0,4,0,0,0,99,0,0,move_enable,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_WUGDASH#Warg Dash#
-2243,0,0,20:22:24:26:28,0,0,0,99,0,0,ridingwarg,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_WUGSTRIKE#Warg Strike#
+2243,0,0,20:22:24:26:28,0,0,0,99,0,0,warg,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_WUGSTRIKE#Warg Strike#
 2244,0,0,40:42:44:46:48,0,0,0,99,0,0,warg,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_WUGBITE#Warg Bite#
 
 2246,0,0,12,0,0,0,99,0,0,warg,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RA_SENSITIVEKEEN#Sensitive Keen#

diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= rAthena SVN r16114+
 //===== Description: =========================================
@@ -13,6 +13,7 @@
 //= 1.1 Fixed reset on Baby job change.
 //= 1.2 Added Expanded Super Novice support and initial Kagerou/Oboro support.
 //= 1.3 Kagerou/Oboro added.
+//= 1.4 Rebellion added.
 //============================================================
 
 prontera,153,193,6	script	Job Master	123,{
@@ -60,8 +61,8 @@ function Job_Menu;
 	}
 	set .@j1, roclass(.@eac|EAJL_2_1); set .@j2,roclass(.@eac|EAJL_2_2);
 	if ((.@eac&EAJ_UPPERMASK) == EAJ_SUPER_NOVICE) setarray .@exp[0],roclass(.@eac|EAJL_THIRD),99;
-	if (Class == Job_Ninja) setarray .@exp[0],.@j1,70;
-	if (.@exp[0] && .ThirdClass) {
+	if (Class == Job_Ninja || Class == Job_Gunslinger) setarray .@exp[0],.@j1,70;
+	if (.@exp[0] && .SecondExpanded) {
 		if (BaseLevel < .Rebirth[0] || JobLevel < .@exp[1]) {
 			set .@blvl, .Rebirth[0]-BaseLevel; set .@jlvl, .@exp[1]-JobLevel;
 			mes "You need "+((.@blvl>0)?.@blvl+" more base levels "+((.@jlvl>0)?"/ ":""):"")+((.@jlvl>0)?.@jlvl+" more job levels ":"")+"to continue.";
@@ -175,6 +176,7 @@ OnInit:
 	setarray .Rebirth[0],99,50;	// Minimum base level, job level to rebirth OR change to third class
 	setarray .JobReq[0],10,40;	// Minimum job level to turn into 1st class, 2nd class
 	set .ThirdClass,1;		// Enable third classes? (1: yes / 0: no)
+	set .SecondExpanded,1;		// Enable new expanded second classes: Ex. Super Novice, Kagerou/Oboro, Rebellion? (1: yes / 0: no)
 	set .SNovice,45;		// Minimum base level to turn into Super Novice
 	set .LastJob,1;			// Enforce linear class changes? (1: yes / 0: no)
 	set .SkillPointCheck,1;		// Force player to use up all skill points? (1: yes / 0: no)