pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Added rules for managing AA scaling.

Browse Source
This commit is contained in:
Daerath 2018-01-02 17:27:59 -05:00
parent c2b5820153
commit 7d7b9d0238
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/ruletypes.h
View File

@ -156,6 +156,10 @@ RULE_BOOL(Character, UseOldBindWound, false) // Uses the original bind wound beh
RULE_BOOL(Character, GrantHoTTOnCreate, false) // Grant Health of Target's Target leadership AA on character creation
RULE_BOOL(Character, UseOldConSystem, false) // Grant Health of Target's Target leadership AA on character creation
RULE_BOOL(Character, OPClientUpdateVisualDebug, false) // Shows a pulse and forward directional particle each time the client sends its position to server
RULE_BOOL(Character, UseModernAAExperienceScale, false) // Uses the newer approach to AA scaling based on total earned AA
RULE_REAL(Character, ModernAAScalingStartPercent, 1000) // 1000% or 10x AA XP at the start of the scaling range
RULE_INT(Character, ModernAAScalingAAMinimum, 0) // The minimum number of earned AA before AA XP scaling begins.
RULE_INT(Character, ModernAAScalingAALimit, 4000) // The number of earned AA when AA XP scaling ends.
RULE_CATEGORY_END()
RULE_CATEGORY(Mercs)

14
zone/exp.cpp
View File

@ -39,10 +39,9 @@ extern QueryServ* QServ;
static uint32 ScaleAAXPBasedOnCurrentAATotal(int earnedAA, uint32 add_aaxp, float aatotalmod)
{
// TODO: Read from Rules
float baseModifier = 1000;
int aaMinimum = 0;
int aaLimit = 4000;
float baseModifier = RuleR(Character, ModernAAScalingStartPercent);
int aaMinimum = RuleI(Character, ModernAAScalingAAMinimum);
int aaLimit = RuleI(Character, ModernAAScalingAALimit);
// Calculate the current total before checking if we will add additional xp.
uint32 totalWithoutExpMod = (uint32)add_aaxp * aatotalmod;
@ -77,7 +76,10 @@ static uint32 ScaleAAXPBasedOnCurrentAATotal(int earnedAA, uint32 add_aaxp, floa
return totalWithoutExpMod;
}
Log(Logs::Detail, Logs::None, "Total before the modifier %d :: NewTotal %d :: ScaleRange: %d, SpentAA: %d, RemainingAA: %d, normalizedScale: %0.3f", totalWithoutExpMod, totalWithExpMod, scaleRange, earnedAA, remainingAA, normalizedScale);
Log(Logs::Detail,
Logs::None,
"Total before the modifier %d :: NewTotal %d :: ScaleRange: %d, SpentAA: %d, RemainingAA: %d, normalizedScale: %0.3f",
totalWithoutExpMod, totalWithExpMod, scaleRange, earnedAA, remainingAA, normalizedScale);
return totalWithExpMod;
}
@ -404,7 +406,7 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) {
uint32 aaexp = 0;
// if using modernAA and this character has AA XP enabled.
if (true && add_aaxp > 0)
if (RuleB(Character, UseModernAAExperienceScale) && add_aaxp > 0)
{
aaexp = ScaleAAXPBasedOnCurrentAATotal(GetAAPoints(), add_aaxp, aatotalmod);
}