From b9b88449ed5160c1b0065d451dc71698c38c939c Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sat, 22 Feb 2025 15:37:38 -0500 Subject: [PATCH] Variable rename --- src/engine/powers/poweractions/CharmPowerAction.java | 2 +- src/engine/powers/poweractions/FearPowerAction.java | 2 +- src/engine/wpak/PowerActionParser.java | 2 +- src/engine/wpak/data/PowerAction.java | 2 +- src/engine/wpakpowers/Behaviours.java | 6 +++--- src/engine/wpakpowers/WpakPowerManager.java | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/engine/powers/poweractions/CharmPowerAction.java b/src/engine/powers/poweractions/CharmPowerAction.java index ebb0496c..be6bb400 100644 --- a/src/engine/powers/poweractions/CharmPowerAction.java +++ b/src/engine/powers/poweractions/CharmPowerAction.java @@ -29,7 +29,7 @@ public class CharmPowerAction extends AbstractPowerAction { public CharmPowerAction(PowerAction powerAction) { super(powerAction); this.levelCap = powerAction.levelCap; - this.levelCapRamp = powerAction.compoundCurveType.ordinal(); + this.levelCapRamp = powerAction.levelCapCurve.ordinal(); } @Override diff --git a/src/engine/powers/poweractions/FearPowerAction.java b/src/engine/powers/poweractions/FearPowerAction.java index 6f4e4eda..6dd5e5ea 100644 --- a/src/engine/powers/poweractions/FearPowerAction.java +++ b/src/engine/powers/poweractions/FearPowerAction.java @@ -30,7 +30,7 @@ public class FearPowerAction extends AbstractPowerAction { public FearPowerAction(PowerAction powerAction) { super(powerAction); this.levelCap = powerAction.levelCap; - this.levelCapRamp = powerAction.compoundCurveType.ordinal(); + this.levelCapRamp = powerAction.levelCapCurve.ordinal(); } @Override diff --git a/src/engine/wpak/PowerActionParser.java b/src/engine/wpak/PowerActionParser.java index b9c21d58..d2017efb 100644 --- a/src/engine/wpak/PowerActionParser.java +++ b/src/engine/wpak/PowerActionParser.java @@ -274,7 +274,7 @@ public class PowerActionParser { powerAction.levelCap = Integer.parseInt(arguments.get(0)); if (arguments.size() > 1) // Not all level caps have a curve - powerAction.compoundCurveType = mbEnums.CompoundCurveType.valueOf(arguments.get(1)); + powerAction.levelCapCurve = mbEnums.CompoundCurveType.valueOf(arguments.get(1)); break; case "CLEARAGGRO": powerAction.clearAggro = Boolean.parseBoolean(lineValues.get(1).trim()); diff --git a/src/engine/wpak/data/PowerAction.java b/src/engine/wpak/data/PowerAction.java index 98d0d587..17faf0df 100644 --- a/src/engine/wpak/data/PowerAction.java +++ b/src/engine/wpak/data/PowerAction.java @@ -24,7 +24,7 @@ public class PowerAction { public int petRace; public StatTransfer statTransfer; public int levelCap; - public mbEnums.CompoundCurveType compoundCurveType; + public mbEnums.CompoundCurveType levelCapCurve; public TrackEntry trackEntry; // Additional variables after header go here. diff --git a/src/engine/wpakpowers/Behaviours.java b/src/engine/wpakpowers/Behaviours.java index a5c98fcb..91467664 100644 --- a/src/engine/wpakpowers/Behaviours.java +++ b/src/engine/wpakpowers/Behaviours.java @@ -31,12 +31,12 @@ public class Behaviours { public static Object Standard(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target, PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) { - return WpakPowerManager.applyCurveToValue(powerAction.compoundCurveType, modifierEntry.compoundCurveType.getValue(), rank); + return WpakPowerManager.applyCurveToValue(powerAction.levelCapCurve, modifierEntry.compoundCurveType.getValue(), rank); } public static Object FPSubTypeAttr(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target, PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) { - return WpakPowerManager.applyCurveToValue(powerAction.compoundCurveType, modifierEntry.compoundCurveType.getValue(), rank); + return WpakPowerManager.applyCurveToValue(powerAction.levelCapCurve, modifierEntry.compoundCurveType.getValue(), rank); } public static Object SubTypeSourceType(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target, @@ -58,7 +58,7 @@ public class Behaviours { public static Object FPSubTypeDmg(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target, PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) { String key = modifierEntry.arg1; - float value = WpakPowerManager.applyCurveToValue(powerAction.compoundCurveType, modifierEntry.compoundCurveType.getValue(), rank); + float value = WpakPowerManager.applyCurveToValue(powerAction.levelCapCurve, modifierEntry.compoundCurveType.getValue(), rank); return new Pair<>(key,value); } diff --git a/src/engine/wpakpowers/WpakPowerManager.java b/src/engine/wpakpowers/WpakPowerManager.java index e300a844..29d7a7cd 100644 --- a/src/engine/wpakpowers/WpakPowerManager.java +++ b/src/engine/wpakpowers/WpakPowerManager.java @@ -443,10 +443,10 @@ public class WpakPowerManager { // Method scales by either integer or float values driven by the curve type if (EnumSet.of(mbEnums.CompoundCurveType.DefaultFlat, mbEnums.CompoundCurveType.DefaultSlope, - mbEnums.CompoundCurveType.DefaultSlopeDown).contains(powerAction.compoundCurveType)) - scaledValue = powerAction.compoundCurveType.getValue() + (modifierEntry.compoundCurveType.getValue() * rank); + mbEnums.CompoundCurveType.DefaultSlopeDown).contains(powerAction.levelCapCurve)) + scaledValue = powerAction.levelCapCurve.getValue() + (modifierEntry.compoundCurveType.getValue() * rank); else - scaledValue = powerAction.compoundCurveType.getValue() * (1 + (modifierEntry.compoundCurveType.getValue() * rank)); + scaledValue = powerAction.levelCapCurve.getValue() * (1 + (modifierEntry.compoundCurveType.getValue() * rank)); scaledValue = scaledValue * 0.01f;