From feafd43fdfc6099dbdd974f0f46689b21a063e46 Mon Sep 17 00:00:00 2001 From: Daerath Date: Wed, 3 Jan 2018 06:19:48 -0500 Subject: [PATCH] * Renamed rule to enable modern AA scaling to be consistent with the other related rules. --- common/ruletypes.h | 2 +- zone/exp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/ruletypes.h b/common/ruletypes.h index 03624622e..06cefa84f 100644 --- a/common/ruletypes.h +++ b/common/ruletypes.h @@ -156,7 +156,7 @@ 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_BOOL(Character, ModernAAScalingEnabled, 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. diff --git a/zone/exp.cpp b/zone/exp.cpp index 70d261ff7..4e43d6c1d 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -406,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 (RuleB(Character, UseModernAAExperienceScale) && add_aaxp > 0) + if (RuleB(Character, ModernAAScalingEnabled) && add_aaxp > 0) { aaexp = ScaleAAXPBasedOnCurrentAATotal(GetAAPoints(), add_aaxp, aatotalmod); }