Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add expanded 4ths to jobmaster #8267

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions npc/custom/jobmaster.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,28 @@ function Job_Options {
Job_Options(.@job_opt,roclass(.@eac|EAJL_THIRD)); // Expanded SN is "third" cls
}
}

// babies don't get to become 4th jobs
if (.FourthExpanded && .@eac == EAJ_REBELLION) {
Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
Job_Options(.@job_opt, roclass(EAJ_NIGHT_WATCH));
}

if (.FourthExpanded && .@eac == EAJ_KAGEROUOBORO) {
Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
Job_Options(.@job_opt, roclass(EAJ_SHINKIRO_SHIRANUI));
}

if (.FourthExpanded && .@eac == EAJ_SUPER_NOVICE_E) {
Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right levels?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The required level (200/70) is correct
https://www.divine-pride.net/tools/skilltree/4307

Job_Options(.@job_opt, roclass(EAJ_HYPER_NOVICE));
}

if (.FourthExpanded && .@eac == EAJ_SUMMONER) {
Require_Level(.Req_SHandler[0], .Req_SHandler[1]);
Job_Options(.@job_opt, roclass(EAJ_SPIRIT_HANDLER));
}

if (.SecondExpanded &&
((.@eac&(~EAJL_BABY)) == EAJ_NINJA || // is (Baby) Ninja
(.@eac&(~EAJL_BABY)) == EAJ_GUNSLINGER)) { // is (Baby) Gunslinger
Expand Down Expand Up @@ -483,6 +504,7 @@ OnInit:

// Settings
.FourthClass = true; // Enable fourth classes?
.FourthExpanded = true; // Enable new expanded fourth classes: Ex. Hyper Novice, Rebellion, Shinkiro/Shiranui?
.ThirdClass = true; // Enable third classes?
.RebirthClass = true; // Enable rebirth classes?
.SecondExpanded = true; // Enable new expanded second classes: Ex. Super Novice, Kagerou/Oboro, Rebellion?
Expand All @@ -504,6 +526,7 @@ OnInit:
setarray .Req_Fourth[0],200,70; // Minimum base level, job level to change to fourth class
setarray .Req_Exp_NJ_GS[0],99,70; // Minimum base level, job level to turn into Expanded Ninja and Gunslinger
setarray .Req_Exp_SNOVI[0],99,99; // Minimum base level, job level to turn into Expanded Super Novice
setarray .Req_SHandler[0],200,60; // Minimum base level, job level to turn into Spirit Handler
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if these are the correct levels

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://www.youtube.com/watch?v=kuCVZv21Amc

The person in this video is level 200/60.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.SNovice = 45; // Minimum base level to turn into Super Novice

// Setting adjustments by PACKETVER
Expand Down