Skip to content

Fix job levels being reset when adding new jobs via >addjob #357

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.

Sign up for GitHub

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

Open
kenedos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix job levels being reset when adding new jobs via >addjob #357

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/ZoneServer/Commands/ChatCommands.Handlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,9 +1498,28 @@ private CommandResult HandleAddJob(Character sender, Character target, string me

if (job == null)
{
// Store current levels of all existing jobs before adding the new one,
// because adding a job changes the rank which affects how TotalExp
// translates to Level (Level is calculated from TotalExp + rank)
var existingJobLevels = new Dictionary<JobId, int>();
foreach (var existingJob in target.Jobs.GetList())
existingJobLevels[existingJob.Id] = existingJob.Level;

Send.ZC_PC(target, PcUpdateType.Job, (int)jobId, (int)circle);
target.JobId = jobId;
target.Jobs.Add(new Job(target, jobId, circle));

// After adding the job, the rank has increased. Recalculate TotalExp
// for all existing jobs to maintain their levels at the new rank.
var newRank = target.Jobs.GetCurrentRank();
foreach (var existingJob in target.Jobs.GetList())
{
if (existingJob.Id == jobId)
continue; // Skip the newly added job

var targetLevel = existingJobLevels[existingJob.Id];
existingJob.TotalExp = ZoneServer.Instance.Data.ExpDb.GetNextTotalJobExp(newRank, targetLevel);
}
}
else
target.Jobs.ChangeCircle(jobId, circle);
Expand Down