From 77b2e08c561adeb87c447241bd8e19b91157dc8e Mon Sep 17 00:00:00 2001 From: XxFran10xX <318299142+XxFran10xX@users.noreply.github.com> Date: Tue, 17 Nov 2026 18:48:31 +0100 Subject: [PATCH 1/2] Let resonance and equilibrium scale heals, shields and burns Resonance, Tranquility/Surge and weapon alignment only reached a rune's mana, cooldown and damage parameters, so Cerrith heals and every shield never got stronger, and Scalding Wave / Fire Breath burns (burnt_damage) missed the damage bonus. - ModifierTriple becomes ModifierSet with two more stats: support (heal and shield power) and duration. A curve point without support copies its damage, so live configs scale heals and shields like damage with no edit; duration is 0 unless set. - New config.yml modifier_parameters maps each stat to MythicLib skill parameters: damage [damage, burnt_damage], support [heal, shield_power], duration [] (off). A stat left out keeps its default. - Modifiers other than mana/cooldown only register on skills that declare the parameter. - /resonance rows show "Damage & Healing" while the two match, separate columns when they differ, and Duration only when set. Co-Authored-By: Claude Opus 5.5 --- .../net/tfminecraft/magic/gear/GearCache.java | 14 +- .../tfminecraft/magic/gui/ModifierLore.java | 35 +++-- .../SpellModifierApplyService.java | 74 ++++++---- .../magic/loader/ConfigLoader.java | 7 +- .../magic/modifier/KeyframeCurve.java | 48 +++--- .../magic/modifier/ModifierParameters.java | 73 ++++++++++ .../magic/modifier/ModifierSet.java | 133 +++++++++++++++++ .../magic/modifier/ModifierStat.java | 18 +++ .../magic/modifier/ModifierTriple.java | 92 ------------ .../magic/modifier/SpellModifiers.java | 30 ++-- src/main/resources/config.yml | 13 ++ src/main/resources/elements/elements.yml | 3 + src/main/resources/gui.yml | 2 + .../magic/CurveEdgeCoverageTest.java | 16 +- .../net/tfminecraft/magic/DomainTest.java | 47 +++++- .../tfminecraft/magic/GearDefinitionTest.java | 12 +- .../magic/ResonanceGuiCoverageTest.java | 66 ++++++--- .../tfminecraft/magic/SpellDomainTest.java | 4 +- .../magic/SpellModifierCoverageTest.java | 137 ++++++++++++++++-- 19 files changed, 592 insertions(+), 232 deletions(-) create mode 100644 src/main/java/net/tfminecraft/magic/modifier/ModifierParameters.java create mode 100644 src/main/java/net/tfminecraft/magic/modifier/ModifierSet.java create mode 100644 src/main/java/net/tfminecraft/magic/modifier/ModifierStat.java delete mode 100644 src/main/java/net/tfminecraft/magic/modifier/ModifierTriple.java diff --git a/src/main/java/net/tfminecraft/magic/gear/GearCache.java b/src/main/java/net/tfminecraft/magic/gear/GearCache.java index 2bc1ca9..e7b78cf 100644 --- a/src/main/java/net/tfminecraft/magic/gear/GearCache.java +++ b/src/main/java/net/tfminecraft/magic/gear/GearCache.java @@ -3,7 +3,7 @@ import java.util.LinkedHashMap; import java.util.Map; -import net.tfminecraft.magic.modifier.ModifierTriple; +import net.tfminecraft.magic.modifier.ModifierSet; public final class GearCache { @@ -21,7 +21,7 @@ public final class GearCache { public static boolean socketRarityPrefix = false; /** Weapon tier band in the spell's element -> bonus. Never a penalty. */ - private static final Map ALIGNMENT = new LinkedHashMap<>(); + private static final Map ALIGNMENT = new LinkedHashMap<>(); private GearCache() {} @@ -29,18 +29,18 @@ public static void clearAlignment() { ALIGNMENT.clear(); } - public static void putAlignment(int band, ModifierTriple triple) { + public static void putAlignment(int band, ModifierSet triple) { if (band > 0 && triple != null) { ALIGNMENT.put(band, triple); } } - public static ModifierTriple alignment(int band) { + public static ModifierSet alignment(int band) { if (!alignmentEnabled || band <= 0) { - return ModifierTriple.ZERO; + return ModifierSet.ZERO; } - ModifierTriple triple = ALIGNMENT.get(band); - return triple == null ? ModifierTriple.ZERO : triple; + ModifierSet triple = ALIGNMENT.get(band); + return triple == null ? ModifierSet.ZERO : triple; } public static int alignmentBands() { diff --git a/src/main/java/net/tfminecraft/magic/gui/ModifierLore.java b/src/main/java/net/tfminecraft/magic/gui/ModifierLore.java index cf36b2d..38a8474 100644 --- a/src/main/java/net/tfminecraft/magic/gui/ModifierLore.java +++ b/src/main/java/net/tfminecraft/magic/gui/ModifierLore.java @@ -7,7 +7,7 @@ import net.tfminecraft.magic.GuiCache; import net.tfminecraft.magic.model.ElementDef; -import net.tfminecraft.magic.modifier.ModifierTriple; +import net.tfminecraft.magic.modifier.ModifierSet; import net.tfminecraft.magic.modifier.SpellModifiers; import net.tfminecraft.magic.session.ResonanceSession; import net.tfminecraft.magic.util.GuiText; @@ -25,6 +25,8 @@ public final class ModifierLore { private static final String MANA_FALLBACK = "#5b9bd4"; private static final String DAMAGE_FALLBACK = "#c45c4a"; private static final String COOLDOWN_FALLBACK = "#7dba6e"; + private static final String SUPPORT_FALLBACK = "#e0c45c"; + private static final String DURATION_FALLBACK = "#b48ad6"; private ModifierLore() {} @@ -35,7 +37,7 @@ public static List linesForElement(ElementDef element, ResonanceSession } double resonance = session != null ? session.getResonance(element.getId()) : 0.0; double equilibrium = equilibrium(session); - ModifierTriple fromResonance = SpellModifiers.resonance(element.getId(), resonance); + ModifierSet fromResonance = SpellModifiers.resonance(element.getId(), resonance); lines.add(GuiText.format(GuiCache.modifierNow.replace("{school}", MagicText.elementName(element)))); lines.add(row("", now(element, session, weapon))); lines.add(GuiText.format(GuiCache.modifierMadeOf)); @@ -47,7 +49,7 @@ public static List linesForElement(ElementDef element, ResonanceSession withValue(GuiCache.modifierSourceCorruption, Math.abs(equilibrium)), SpellModifiers.drift(equilibrium))); } - ModifierTriple fromWeapon = SpellModifiers.alignment(weapon, element.getId()); + ModifierSet fromWeapon = SpellModifiers.alignment(weapon, element.getId()); if (!fromWeapon.isZero()) { lines.add(row(GuiCache.modifierSourceWeapon, fromWeapon)); } @@ -101,7 +103,7 @@ private static List balanceLines( String noneTemplate, String peakTemplate, double peak, - ModifierTriple atPeak) { + ModifierSet atPeak) { List lines = new ArrayList<>(); if (onThisSide) { lines.add(GuiText.format(withValue(yourTemplate, amount))); @@ -126,7 +128,7 @@ private static List balanceLines( * The modifiers a cast of this school gets right now, combined in the same order * as SpellModifierApplyService: resonance x balance, then the held weapon's alignment. */ - static ModifierTriple now(ElementDef element, ResonanceSession session, ItemStack weapon) { + static ModifierSet now(ElementDef element, ResonanceSession session, ItemStack weapon) { double resonance = session != null ? session.getResonance(element.getId()) : 0.0; return SpellModifiers.combine( SpellModifiers.combine( @@ -143,11 +145,24 @@ private static String withValue(String template, double value) { return template.replace("{value}", MagicNumbers.format(value)); } - private static String row(String prefix, ModifierTriple triple) { - return GuiText.format(" " + prefix - + stat("stat_mana", MANA_FALLBACK, "Mana", triple.mana(), false) + " " - + stat("stat_cooldown", COOLDOWN_FALLBACK, "Cooldown", triple.cooldown(), false) + " " - + stat("stat_damage", DAMAGE_FALLBACK, "Damage", triple.damage(), true)); + /** + * One line. Damage and healing share a column while they match (the default, since + * support follows damage); duration only shows when something sets it. + */ + private static String row(String prefix, ModifierSet modifiers) { + StringBuilder line = new StringBuilder(" ").append(prefix) + .append(stat("stat_mana", MANA_FALLBACK, "Mana", modifiers.mana(), false)).append(" ") + .append(stat("stat_cooldown", COOLDOWN_FALLBACK, "Cooldown", modifiers.cooldown(), false)).append(" "); + if (Double.compare(modifiers.damage(), modifiers.support()) == 0) { + line.append(stat("stat_damage", DAMAGE_FALLBACK, "Damage & Healing", modifiers.damage(), true)); + } else { + line.append(stat("stat_damage", DAMAGE_FALLBACK, "Damage", modifiers.damage(), true)).append(" ") + .append(stat("stat_support", SUPPORT_FALLBACK, "Healing", modifiers.support(), true)); + } + if (Math.abs(modifiers.duration()) >= 0.0000001) { + line.append(" ").append(stat("stat_duration", DURATION_FALLBACK, "Duration", modifiers.duration(), true)); + } + return GuiText.format(line.toString()); } private static String stat( diff --git a/src/main/java/net/tfminecraft/magic/integration/SpellModifierApplyService.java b/src/main/java/net/tfminecraft/magic/integration/SpellModifierApplyService.java index 08b46b8..cb66e59 100644 --- a/src/main/java/net/tfminecraft/magic/integration/SpellModifierApplyService.java +++ b/src/main/java/net/tfminecraft/magic/integration/SpellModifierApplyService.java @@ -23,7 +23,9 @@ import net.tfminecraft.magic.gear.GearCache; import net.tfminecraft.magic.gear.GearHand; import net.tfminecraft.magic.gear.WeaponRequirement; -import net.tfminecraft.magic.modifier.ModifierTriple; +import net.tfminecraft.magic.modifier.ModifierParameters; +import net.tfminecraft.magic.modifier.ModifierSet; +import net.tfminecraft.magic.modifier.ModifierStat; import net.tfminecraft.magic.modifier.SpellModifiers; import net.tfminecraft.magic.registry.SkillElementRegistry; import net.tfminecraft.magic.session.ResonanceSession; @@ -33,6 +35,7 @@ public final class SpellModifierApplyService { private static final Map applied = new ConcurrentHashMap<>(); private static final Map> handlers = new ConcurrentHashMap<>(); private static final Set unknownWarned = ConcurrentHashMap.newKeySet(); + private static final Set BASE_PARAMETERS = Set.of("mana", "cooldown", "stamina", "timer"); private static boolean missingLogged; private SpellModifierApplyService() {} @@ -124,14 +127,16 @@ private static void sync(Player player, ResonanceSession session, boolean forceA unregisterStored(player, data); List next = new ArrayList<>(); for (SkillPlan plan : desired.skills) { - if (plan.mana != 0.0) { - next.add(register(data, plan.skillId, "mana", plan.handler, plan.mana)); - } - if (plan.cooldown != 0.0) { - next.add(register(data, plan.skillId, "cooldown", plan.handler, plan.cooldown)); - } - if (plan.damage != 0.0) { - next.add(register(data, plan.skillId, "damage", plan.handler, plan.damage)); + for (ModifierStat stat : ModifierStat.values()) { + double value = plan.modifiers.get(stat); + if (value == 0.0) { + continue; + } + for (String parameter : ModifierParameters.of(stat)) { + if (hasParameter(plan.handler, parameter)) { + next.add(register(data, plan.skillId, parameter, plan.handler, value)); + } + } } } applied.put(player.getUniqueId(), new AppliedState(session.modifierRevision(), desired, next)); @@ -151,12 +156,12 @@ private static DesiredSnapshot plan(Player player, ResonanceSession session) { continue; } String elementId = binding.getValue(); - ModifierTriple triple = SpellModifiers.combine( + ModifierSet modifiers = SpellModifiers.combine( SpellModifiers.combine( SpellModifiers.resonance(elementId, session.getResonance(elementId)), SpellModifiers.drift(equilibrium)), SpellModifiers.alignment(requirement, elementId)); - skills.add(new SkillPlan(skillId, handler, triple.mana(), triple.cooldown(), triple.damage())); + skills.add(new SkillPlan(skillId, handler, modifiers)); } return new DesiredSnapshot(alignmentBands, skills); } @@ -191,6 +196,19 @@ private static SkillHandler handlerFor(String skillId) { return resolved; } + /** + * MythicLib gives every skill mana and cooldown (and stamina and timer) without + * listing them; other parameters only exist when the skill declares them, so a heal + * modifier is never left on a damage spell. + */ + public static boolean hasParameter(SkillHandler handler, String parameter) { + if (BASE_PARAMETERS.contains(parameter)) { + return true; + } + Set declared = handler.getParameters(); + return declared != null && declared.contains(parameter); + } + private static SkillModifier register( MMOPlayerData data, String skillId, @@ -276,21 +294,12 @@ public int hashCode() { private static final class SkillPlan { private final String skillId; private final SkillHandler handler; - private final double mana; - private final double cooldown; - private final double damage; + private final ModifierSet modifiers; - private SkillPlan( - String skillId, - SkillHandler handler, - double mana, - double cooldown, - double damage) { + private SkillPlan(String skillId, SkillHandler handler, ModifierSet modifiers) { this.skillId = skillId; this.handler = handler; - this.mana = mana; - this.cooldown = cooldown; - this.damage = damage; + this.modifiers = modifiers; } @Override @@ -301,15 +310,24 @@ public boolean equals(Object obj) { if (!(obj instanceof SkillPlan other)) { return false; } - return Objects.equals(skillId, other.skillId) - && Double.compare(mana, other.mana) == 0 - && Double.compare(cooldown, other.cooldown) == 0 - && Double.compare(damage, other.damage) == 0; + if (!Objects.equals(skillId, other.skillId)) { + return false; + } + for (ModifierStat stat : ModifierStat.values()) { + if (Double.compare(modifiers.get(stat), other.modifiers.get(stat)) != 0) { + return false; + } + } + return true; } @Override public int hashCode() { - return Objects.hash(skillId, mana, cooldown, damage); + int hash = Objects.hashCode(skillId); + for (ModifierStat stat : ModifierStat.values()) { + hash = 31 * hash + Double.hashCode(modifiers.get(stat)); + } + return hash; } } } diff --git a/src/main/java/net/tfminecraft/magic/loader/ConfigLoader.java b/src/main/java/net/tfminecraft/magic/loader/ConfigLoader.java index c88ec74..0148124 100644 --- a/src/main/java/net/tfminecraft/magic/loader/ConfigLoader.java +++ b/src/main/java/net/tfminecraft/magic/loader/ConfigLoader.java @@ -20,7 +20,8 @@ import net.tfminecraft.magic.meditation.MeditationCache; import net.tfminecraft.magic.modifier.DriftCache; import net.tfminecraft.magic.modifier.KeyframeCurve; -import net.tfminecraft.magic.modifier.ModifierTriple; +import net.tfminecraft.magic.modifier.ModifierParameters; +import net.tfminecraft.magic.modifier.ModifierSet; public final class ConfigLoader implements LoaderInterface { @@ -76,6 +77,8 @@ public boolean loadSafe(File configFile) { "default_corruption_tranquility", Cache.defaultEquilibrium); } + ModifierParameters.load(config.getConfigurationSection("modifier_parameters"), Magic.plugin.getLogger()); + long intervalTicks = config.getLong("tick.interval_ticks", Cache.tickIntervalTicks); Cache.tickIntervalTicks = intervalTicks > 0 ? intervalTicks : Cache.tickIntervalTicks; double secondsPerHour = config.getDouble("tick.seconds_per_hour", Cache.secondsPerHour); @@ -205,7 +208,7 @@ private static void loadAlignment(ConfigurationSection section) { } try { net.tfminecraft.magic.gear.GearCache.putAlignment( - Integer.parseInt(key.trim()), ModifierTriple.from(row)); + Integer.parseInt(key.trim()), ModifierSet.from(row)); } catch (NumberFormatException ex) { Magic.plugin.getLogger().warning("[Magic] gear.alignment band '" + key + "' is not a number"); } diff --git a/src/main/java/net/tfminecraft/magic/modifier/KeyframeCurve.java b/src/main/java/net/tfminecraft/magic/modifier/KeyframeCurve.java index 504658e..27d7dae 100644 --- a/src/main/java/net/tfminecraft/magic/modifier/KeyframeCurve.java +++ b/src/main/java/net/tfminecraft/magic/modifier/KeyframeCurve.java @@ -8,24 +8,24 @@ public final class KeyframeCurve { - private final NavigableMap keys; + private final NavigableMap keys; - public KeyframeCurve(NavigableMap keys) { + public KeyframeCurve(NavigableMap keys) { this.keys = new TreeMap<>(); if (keys != null) { - for (Map.Entry entry : keys.entrySet()) { + for (Map.Entry entry : keys.entrySet()) { if (Double.isFinite(entry.getKey())) { this.keys.put(entry.getKey(), entry.getValue()); } } } if (this.keys.isEmpty()) { - this.keys.put(0.0, ModifierTriple.ZERO); + this.keys.put(0.0, ModifierSet.ZERO); } } public static KeyframeCurve fromSection(ConfigurationSection section) { - TreeMap map = new TreeMap<>(); + TreeMap map = new TreeMap<>(); if (section == null) { return empty(); } @@ -43,7 +43,7 @@ public static KeyframeCurve fromSection(ConfigurationSection section) { if (point == null) { continue; } - map.put(at, ModifierTriple.from(point)); + map.put(at, ModifierSet.from(point)); } if (map.isEmpty()) { return empty(); @@ -52,45 +52,45 @@ public static KeyframeCurve fromSection(ConfigurationSection section) { } public static KeyframeCurve empty() { - TreeMap map = new TreeMap<>(); - map.put(0.0, ModifierTriple.ZERO); + TreeMap map = new TreeMap<>(); + map.put(0.0, ModifierSet.ZERO); return new KeyframeCurve(map); } public static KeyframeCurve defaultResonance() { - TreeMap map = new TreeMap<>(); - map.put(0.0, new ModifierTriple(0.20, -0.20, 0.20)); - map.put(100.0, new ModifierTriple(-0.20, 0.20, -0.20)); + TreeMap map = new TreeMap<>(); + map.put(0.0, new ModifierSet(0.20, -0.20, 0.20)); + map.put(100.0, new ModifierSet(-0.20, 0.20, -0.20)); return new KeyframeCurve(map); } public static KeyframeCurve defaultSurge() { - TreeMap map = new TreeMap<>(); - map.put(0.0, ModifierTriple.ZERO); - map.put(15.0, new ModifierTriple(-0.05, 0.10, -0.10)); - map.put(60.0, new ModifierTriple(-0.10, 0.15, -0.15)); - map.put(100.0, new ModifierTriple(-0.05, 0.10, -0.10)); + TreeMap map = new TreeMap<>(); + map.put(0.0, ModifierSet.ZERO); + map.put(15.0, new ModifierSet(-0.05, 0.10, -0.10)); + map.put(60.0, new ModifierSet(-0.10, 0.15, -0.15)); + map.put(100.0, new ModifierSet(-0.05, 0.10, -0.10)); return new KeyframeCurve(map); } public static KeyframeCurve defaultTranquility() { - TreeMap map = new TreeMap<>(); - map.put(0.0, ModifierTriple.ZERO); - map.put(100.0, new ModifierTriple(-0.20, 0.25, -0.05)); + TreeMap map = new TreeMap<>(); + map.put(0.0, ModifierSet.ZERO); + map.put(100.0, new ModifierSet(-0.20, 0.25, -0.05)); return new KeyframeCurve(map); } - public ModifierTriple sample(double amount) { - Map.Entry first = keys.firstEntry(); - Map.Entry last = keys.lastEntry(); + public ModifierSet sample(double amount) { + Map.Entry first = keys.firstEntry(); + Map.Entry last = keys.lastEntry(); if (Double.isNaN(amount) || amount <= first.getKey()) { return first.getValue(); } if (amount >= last.getKey()) { return last.getValue(); } - Map.Entry floor = keys.floorEntry(amount); - Map.Entry ceil = keys.ceilingEntry(amount); + Map.Entry floor = keys.floorEntry(amount); + Map.Entry ceil = keys.ceilingEntry(amount); if (ceil.getKey().equals(floor.getKey())) { return floor.getValue(); } diff --git a/src/main/java/net/tfminecraft/magic/modifier/ModifierParameters.java b/src/main/java/net/tfminecraft/magic/modifier/ModifierParameters.java new file mode 100644 index 0000000..f24bbbe --- /dev/null +++ b/src/main/java/net/tfminecraft/magic/modifier/ModifierParameters.java @@ -0,0 +1,73 @@ +package net.tfminecraft.magic.modifier; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.logging.Logger; + +import org.bukkit.configuration.ConfigurationSection; + +/** + * Which MythicLib skill parameters each modifier stat reaches ({@code modifier_parameters} + * in config.yml). A stat missing from the config keeps its default list; an empty list + * turns the stat off. A parameter belongs to one stat only: a later claim is dropped. + */ +public final class ModifierParameters { + + private static final Map> DEFAULTS = defaults(); + private static Map> current = DEFAULTS; + + private ModifierParameters() {} + + public static List of(ModifierStat stat) { + return current.get(stat); + } + + public static void reset() { + current = DEFAULTS; + } + + public static void load(ConfigurationSection section, Logger logger) { + if (section == null) { + reset(); + return; + } + Map> loaded = new EnumMap<>(ModifierStat.class); + Set claimed = new HashSet<>(); + for (ModifierStat stat : ModifierStat.values()) { + List raw = section.isSet(stat.key()) ? section.getStringList(stat.key()) : DEFAULTS.get(stat); + List parameters = new ArrayList<>(); + for (String entry : raw) { + if (entry.isBlank()) { + continue; + } + String parameter = entry.trim().toLowerCase(Locale.ROOT); + if (!claimed.add(parameter)) { + if (logger != null) { + logger.warning("[Magic] modifier_parameters: '" + parameter + "' is already under another stat;" + + " ignored under " + stat.key()); + } + continue; + } + parameters.add(parameter); + } + loaded.put(stat, Collections.unmodifiableList(parameters)); + } + current = Collections.unmodifiableMap(loaded); + } + + private static Map> defaults() { + Map> map = new EnumMap<>(ModifierStat.class); + map.put(ModifierStat.MANA, List.of("mana")); + map.put(ModifierStat.COOLDOWN, List.of("cooldown")); + map.put(ModifierStat.DAMAGE, List.of("damage", "burnt_damage")); + map.put(ModifierStat.SUPPORT, List.of("heal", "shield_power")); + map.put(ModifierStat.DURATION, List.of()); + return Collections.unmodifiableMap(map); + } +} diff --git a/src/main/java/net/tfminecraft/magic/modifier/ModifierSet.java b/src/main/java/net/tfminecraft/magic/modifier/ModifierSet.java new file mode 100644 index 0000000..60f79d9 --- /dev/null +++ b/src/main/java/net/tfminecraft/magic/modifier/ModifierSet.java @@ -0,0 +1,133 @@ +package net.tfminecraft.magic.modifier; + +import org.bukkit.configuration.ConfigurationSection; + +/** + * Decimal spell modifiers: 0.25 is +25%. Negative cooldown is a shorter cooldown. + * + *

Support is heal and shield power. A curve point that does not set it follows its + * damage, so healers and shielders scale exactly like damage dealers unless a config + * says otherwise. Duration is off (0) unless a curve point sets it. Which skill + * parameters each stat reaches is {@link ModifierParameters}. + */ +public final class ModifierSet { + + public static final ModifierSet ZERO = new ModifierSet(0.0, 0.0, 0.0, 0.0, 0.0); + + public static final double MANA_DAMAGE_CLAMP = 0.9; + public static final double COOLDOWN_MIN = -0.5; + + private final double mana; + private final double damage; + private final double cooldown; + private final double support; + private final double duration; + + /** Support follows damage; duration is 0. */ + public ModifierSet(double mana, double damage, double cooldown) { + this(mana, damage, cooldown, damage, 0.0); + } + + public ModifierSet(double mana, double damage, double cooldown, double support, double duration) { + this.mana = mana; + this.damage = damage; + this.cooldown = cooldown; + this.support = support; + this.duration = duration; + } + + public static ModifierSet from(ConfigurationSection section) { + if (section == null) { + return ZERO; + } + double damage = section.getDouble("damage", 0.0); + return new ModifierSet( + section.getDouble("mana", 0.0), + damage, + section.getDouble("cooldown", 0.0), + section.isSet("support") ? section.getDouble("support", damage) : damage, + section.getDouble("duration", 0.0)); + } + + public double mana() { + return mana; + } + + public double damage() { + return damage; + } + + public double cooldown() { + return cooldown; + } + + public double support() { + return support; + } + + public double duration() { + return duration; + } + + public double get(ModifierStat stat) { + return switch (stat) { + case MANA -> mana; + case COOLDOWN -> cooldown; + case DAMAGE -> damage; + case SUPPORT -> support; + case DURATION -> duration; + }; + } + + public ModifierSet lerp(ModifierSet other, double t) { + if (other == null || t <= 0.0) { + return this; + } + if (t >= 1.0) { + return other; + } + return new ModifierSet( + mana + (other.mana - mana) * t, + damage + (other.damage - damage) * t, + cooldown + (other.cooldown - cooldown) * t, + support + (other.support - support) * t, + duration + (other.duration - duration) * t); + } + + public ModifierSet combine(ModifierSet other) { + if (other == null) { + return clamp(this); + } + return clamp(new ModifierSet( + multiplicative(mana, other.mana), + multiplicative(damage, other.damage), + multiplicative(cooldown, other.cooldown), + multiplicative(support, other.support), + multiplicative(duration, other.duration))); + } + + public boolean isZero() { + return mana == 0.0 && damage == 0.0 && cooldown == 0.0 && support == 0.0 && duration == 0.0; + } + + public ModifierSet clamp() { + return clamp(this); + } + + private static double multiplicative(double a, double b) { + return (1.0 + a) * (1.0 + b) - 1.0; + } + + private static ModifierSet clamp(ModifierSet v) { + return new ModifierSet( + clampSigned(v.mana, MANA_DAMAGE_CLAMP), + clampSigned(v.damage, MANA_DAMAGE_CLAMP), + Math.max(COOLDOWN_MIN, v.cooldown), + clampSigned(v.support, MANA_DAMAGE_CLAMP), + clampSigned(v.duration, MANA_DAMAGE_CLAMP)); + } + + private static double clampSigned(double value, double absMax) { + return Math.max(-absMax, Math.min(absMax, value)); + } +} diff --git a/src/main/java/net/tfminecraft/magic/modifier/ModifierStat.java b/src/main/java/net/tfminecraft/magic/modifier/ModifierStat.java new file mode 100644 index 0000000..d84d15c --- /dev/null +++ b/src/main/java/net/tfminecraft/magic/modifier/ModifierStat.java @@ -0,0 +1,18 @@ +package net.tfminecraft.magic.modifier; + +import java.util.Locale; + +/** The spell stats resonance, balance and weapon alignment can change. */ +public enum ModifierStat { + MANA, + COOLDOWN, + DAMAGE, + /** Heal and shield power. */ + SUPPORT, + DURATION; + + /** The config key: {@code mana}, {@code cooldown}, {@code damage}, {@code support}, {@code duration}. */ + public String key() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/net/tfminecraft/magic/modifier/ModifierTriple.java b/src/main/java/net/tfminecraft/magic/modifier/ModifierTriple.java deleted file mode 100644 index 4108677..0000000 --- a/src/main/java/net/tfminecraft/magic/modifier/ModifierTriple.java +++ /dev/null @@ -1,92 +0,0 @@ -package net.tfminecraft.magic.modifier; - -import org.bukkit.configuration.ConfigurationSection; - -/** - * Decimal modifiers. Negative cooldown is a shorter cooldown. - */ -public final class ModifierTriple { - - public static final ModifierTriple ZERO = new ModifierTriple(0.0, 0.0, 0.0); - - public static final double MANA_DAMAGE_CLAMP = 0.9; - public static final double COOLDOWN_MIN = -0.5; - - private final double mana; - private final double damage; - private final double cooldown; - - public ModifierTriple(double mana, double damage, double cooldown) { - this.mana = mana; - this.damage = damage; - this.cooldown = cooldown; - } - - public static ModifierTriple from(ConfigurationSection section) { - if (section == null) { - return ZERO; - } - return new ModifierTriple( - section.getDouble("mana", 0.0), - section.getDouble("damage", 0.0), - section.getDouble("cooldown", 0.0)); - } - - public double mana() { - return mana; - } - - public double damage() { - return damage; - } - - public double cooldown() { - return cooldown; - } - - public ModifierTriple lerp(ModifierTriple other, double t) { - if (other == null || t <= 0.0) { - return this; - } - if (t >= 1.0) { - return other; - } - return new ModifierTriple( - mana + (other.mana - mana) * t, - damage + (other.damage - damage) * t, - cooldown + (other.cooldown - cooldown) * t); - } - - public ModifierTriple combine(ModifierTriple other) { - if (other == null) { - return clamp(this); - } - return clamp(new ModifierTriple( - multiplicative(mana, other.mana), - multiplicative(damage, other.damage), - multiplicative(cooldown, other.cooldown))); - } - - public boolean isZero() { - return mana == 0.0 && damage == 0.0 && cooldown == 0.0; - } - - public ModifierTriple clamp() { - return clamp(this); - } - - private static double multiplicative(double a, double b) { - return (1.0 + a) * (1.0 + b) - 1.0; - } - - private static ModifierTriple clamp(ModifierTriple v) { - return new ModifierTriple( - clampSigned(v.mana, MANA_DAMAGE_CLAMP), - clampSigned(v.damage, MANA_DAMAGE_CLAMP), - Math.max(COOLDOWN_MIN, v.cooldown)); - } - - private static double clampSigned(double value, double absMax) { - return Math.max(-absMax, Math.min(absMax, value)); - } -} diff --git a/src/main/java/net/tfminecraft/magic/modifier/SpellModifiers.java b/src/main/java/net/tfminecraft/magic/modifier/SpellModifiers.java index 2ac885a..692efa2 100644 --- a/src/main/java/net/tfminecraft/magic/modifier/SpellModifiers.java +++ b/src/main/java/net/tfminecraft/magic/modifier/SpellModifiers.java @@ -14,22 +14,22 @@ public final class SpellModifiers { private SpellModifiers() {} - public static ModifierTriple resonance(String elementId, double amount) { + public static ModifierSet resonance(String elementId, double amount) { ElementDef element = resolve(elementId); if (element == null) { - return ModifierTriple.ZERO; + return ModifierSet.ZERO; } return element.getResonanceCurve().sample(amount); } - public static ModifierTriple drift(double equilibrium) { + public static ModifierSet drift(double equilibrium) { if (equilibrium < 0.0) { return DriftCache.surge.sample(Math.abs(equilibrium)); } if (equilibrium > 0.0) { return DriftCache.tranquility.sample(equilibrium); } - return ModifierTriple.ZERO; + return ModifierSet.ZERO; } /** @@ -38,46 +38,46 @@ public static ModifierTriple drift(double equilibrium) { * contributes nothing rather than a penalty, because a weapon that cannot carry the * element refuses the cast outright. */ - public static ModifierTriple alignment(ItemStack weapon, String elementId) { + public static ModifierSet alignment(ItemStack weapon, String elementId) { if (weapon == null) { - return ModifierTriple.ZERO; + return ModifierSet.ZERO; } return alignment(WeaponRequirement.fromItem(weapon), elementId); } - public static ModifierTriple alignment(WeaponRequirement requirement, String elementId) { + public static ModifierSet alignment(WeaponRequirement requirement, String elementId) { if (requirement == null || !GearCache.alignmentEnabled || resolve(elementId) == null) { - return ModifierTriple.ZERO; + return ModifierSet.ZERO; } double fill = requirement.aura().getFill(elementId); if (fill <= 0) { - return ModifierTriple.ZERO; + return ModifierSet.ZERO; } return GearCache.alignment(TierBands.bandOf(elementId, fill)); } - public static ModifierTriple combine(ModifierTriple a, ModifierTriple b) { + public static ModifierSet combine(ModifierSet a, ModifierSet b) { if (a == null) { - a = ModifierTriple.ZERO; + a = ModifierSet.ZERO; } if (b == null) { - b = ModifierTriple.ZERO; + b = ModifierSet.ZERO; } return a.combine(b); } /** Batch 2 lore: resonance curve at 100. */ - public static ModifierTriple resonanceAt100(String elementId) { + public static ModifierSet resonanceAt100(String elementId) { return resonance(elementId, 100.0); } /** Batch 2 lore: surge curve at 60. */ - public static ModifierTriple surgeAt60() { + public static ModifierSet surgeAt60() { return DriftCache.surge.sample(60.0); } /** Batch 2 lore: tranquility curve at 100. */ - public static ModifierTriple tranquilityAt100() { + public static ModifierSet tranquilityAt100() { return DriftCache.tranquility.sample(100.0); } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 7a9251c..d404994 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -28,6 +28,19 @@ equilibrium: 0: { mana: 0, damage: 0, cooldown: 0 } 100: { mana: -0.20, damage: 0.25, cooldown: -0.05 } +# Which skill parameters each spell modifier reaches (resonance in elements.yml, the +# surge/tranquility curves above, gear.alignment below). Every curve point takes +# mana, damage, cooldown and optionally support and duration. Support is heal and +# shield power: a point without it copies its damage. Duration is 0 unless set. +# A stat left out here keeps the list shown; [] turns it off. Parameters a skill does +# not declare are skipped. +modifier_parameters: + mana: [mana] + cooldown: [cooldown] + damage: [damage, burnt_damage] + support: [heal, shield_power] + duration: [] + # School rune MMOItems type ids (item-types.yml) that /magic rune keybind can rebind. runes: types: diff --git a/src/main/resources/elements/elements.yml b/src/main/resources/elements/elements.yml index 63a8f81..ff119e7 100644 --- a/src/main/resources/elements/elements.yml +++ b/src/main/resources/elements/elements.yml @@ -3,6 +3,9 @@ # Row 3 (third from bottom): Cerrith, Seithr, Oseni, Mitlan # Row 4 (second from bottom): Shadowmancy, Necromancy, Bloodmagic # Special schools (rows 2 and 4) stay hidden until the player holds magic.. +# Resonance points take mana, damage and cooldown, plus optional support (heal and +# shield power; copies damage when left out) and duration. See modifier_parameters +# in config.yml. cerrith: name: "Cerrith" diff --git a/src/main/resources/gui.yml b/src/main/resources/gui.yml index 317d192..21b061e 100644 --- a/src/main/resources/gui.yml +++ b/src/main/resources/gui.yml @@ -47,6 +47,8 @@ colors: stat_mana: "#5b9bd4" stat_damage: "#c45c4a" stat_cooldown: "#7dba6e" + stat_support: "#e0c45c" + stat_duration: "#b48ad6" resonance: bar_segments: 20 diff --git a/src/test/java/net/tfminecraft/magic/CurveEdgeCoverageTest.java b/src/test/java/net/tfminecraft/magic/CurveEdgeCoverageTest.java index 6f30bc8..5021b3f 100644 --- a/src/test/java/net/tfminecraft/magic/CurveEdgeCoverageTest.java +++ b/src/test/java/net/tfminecraft/magic/CurveEdgeCoverageTest.java @@ -17,14 +17,14 @@ void malformedNonFiniteKeyframesCannotPoisonInterpolation() { cfg.set(" .damage", .8); assertEquals(1, KeyframeCurve.fromSection(cfg).size()); assertEquals(0, KeyframeCurve.fromSection(cfg).sample(25).damage()); - var keys = new TreeMap(); - keys.put(0., ModifierTriple.ZERO); - keys.put(Double.NaN, new ModifierTriple(0, .5, 0)); - keys.put(Double.POSITIVE_INFINITY, new ModifierTriple(0, .7, 0)); + var keys = new TreeMap(); + keys.put(0., ModifierSet.ZERO); + keys.put(Double.NaN, new ModifierSet(0, .5, 0)); + keys.put(Double.POSITIVE_INFINITY, new ModifierSet(0, .7, 0)); assertEquals(1, new KeyframeCurve(keys).size()); assertEquals(0, new KeyframeCurve(keys).sample(25).damage()); assertEquals( - 1, new KeyframeCurve(new TreeMap<>(Map.of(Double.NaN, ModifierTriple.ZERO))).size()); + 1, new KeyframeCurve(new TreeMap<>(Map.of(Double.NaN, ModifierSet.ZERO))).size()); } @Test @@ -34,11 +34,11 @@ void exactInteriorKeysAndNanAmountsResolveToStableValues() { new TreeMap<>( Map.of( 0., - ModifierTriple.ZERO, + ModifierSet.ZERO, 10., - new ModifierTriple(0, .2, 0), + new ModifierSet(0, .2, 0), 20., - new ModifierTriple(0, .4, 0)))); + new ModifierSet(0, .4, 0)))); assertEquals(.2, curve.sample(10).damage()); assertEquals(.1, curve.sample(5).damage(), 1e-12); assertEquals(0, curve.sample(Double.NaN).damage()); diff --git a/src/test/java/net/tfminecraft/magic/DomainTest.java b/src/test/java/net/tfminecraft/magic/DomainTest.java index 23527d3..db02907 100644 --- a/src/test/java/net/tfminecraft/magic/DomainTest.java +++ b/src/test/java/net/tfminecraft/magic/DomainTest.java @@ -104,8 +104,8 @@ void sitYieldCopiesInputsAndTracksIndividualArtifactExhaustion() { @Test void modifiersInterpolateMultiplyAndClamp() { - var a = new ModifierTriple(.2, -.2, .3); - var b = new ModifierTriple(.4, .2, -.1); + var a = new ModifierSet(.2, -.2, .3); + var b = new ModifierSet(.4, .2, -.1); assertSame(a, a.lerp(null, .5)); assertSame(a, a.lerp(b, 0)); assertSame(b, a.lerp(b, 1)); @@ -115,19 +115,50 @@ void modifiersInterpolateMultiplyAndClamp() { assertEquals(.68, a.combine(b).mana(), 1e-10); assertEquals(-.04, a.combine(b).damage(), 1e-10); assertEquals(.17, a.combine(b).cooldown(), 1e-10); - var clamped = new ModifierTriple(4, -4, -4).clamp(); + var clamped = new ModifierSet(4, -4, -4).clamp(); assertEquals(.9, clamped.mana()); assertEquals(-.9, clamped.damage()); assertEquals(-.5, clamped.cooldown()); assertEquals(.2, a.combine(null).mana()); - assertTrue(ModifierTriple.ZERO.isZero()); + assertTrue(ModifierSet.ZERO.isZero()); assertFalse(a.isZero()); - assertFalse(new ModifierTriple(0, 1, 0).isZero()); - assertFalse(new ModifierTriple(0, 0, 1).isZero()); - assertSame(ModifierTriple.ZERO, ModifierTriple.from(null)); + assertFalse(new ModifierSet(0, 1, 0).isZero()); + assertFalse(new ModifierSet(0, 0, 0, 1, 0).isZero()); + assertFalse(new ModifierSet(0, 0, 0, 0, 1).isZero()); + assertFalse(new ModifierSet(0, 0, 1).isZero()); + assertFalse(new ModifierSet(1, 0, 0).isZero()); + // Support follows damage unless set; duration is off unless set. + var support = new ModifierSet(.1, .2, .3, .4, .5); + assertEquals(-.2, a.support(), 1e-10); + assertEquals(0, a.duration(), 1e-10); + assertEquals(.1, support.get(ModifierStat.MANA), 1e-10); + assertEquals(.2, support.get(ModifierStat.DAMAGE), 1e-10); + assertEquals(.3, support.get(ModifierStat.COOLDOWN), 1e-10); + assertEquals(.4, support.get(ModifierStat.SUPPORT), 1e-10); + assertEquals(.5, support.get(ModifierStat.DURATION), 1e-10); + assertEquals("support", ModifierStat.SUPPORT.key()); + var mid = support.lerp(ModifierSet.ZERO, .5); + assertEquals(.2, mid.support(), 1e-10); + assertEquals(.25, mid.duration(), 1e-10); + var both = support.combine(support); + assertEquals(.9, both.support(), 1e-10); + assertEquals(.9, both.duration(), 1e-10); + var low = new ModifierSet(0, 0, 0, -4, -4).clamp(); + assertEquals(-.9, low.support()); + assertEquals(-.9, low.duration()); + var yaml = new org.bukkit.configuration.file.YamlConfiguration(); + yaml.set("damage", .25); + assertEquals(.25, ModifierSet.from(yaml).support(), 1e-10); + assertEquals(0, ModifierSet.from(yaml).duration(), 1e-10); + yaml.set("support", 0.0); + yaml.set("duration", .1); + assertEquals(0, ModifierSet.from(yaml).support(), 1e-10); + assertEquals(.1, ModifierSet.from(yaml).duration(), 1e-10); + assertFalse(new ModifierSet(0, 0, 1).isZero()); + assertSame(ModifierSet.ZERO, ModifierSet.from(null)); var config = new YamlConfiguration(); config.set("mana", .5); - assertEquals(.5, ModifierTriple.from(config).mana()); + assertEquals(.5, ModifierSet.from(config).mana()); } @Test diff --git a/src/test/java/net/tfminecraft/magic/GearDefinitionTest.java b/src/test/java/net/tfminecraft/magic/GearDefinitionTest.java index eff0599..45486cc 100644 --- a/src/test/java/net/tfminecraft/magic/GearDefinitionTest.java +++ b/src/test/java/net/tfminecraft/magic/GearDefinitionTest.java @@ -4,7 +4,7 @@ import java.util.*; import net.tfminecraft.magic.gear.*; -import net.tfminecraft.magic.modifier.ModifierTriple; +import net.tfminecraft.magic.modifier.ModifierSet; import org.bukkit.Material; import org.junit.jupiter.api.*; @@ -233,17 +233,17 @@ void gearTypesAndAlignmentAreExplicitlyBounded() { assertEquals(Material.STICK, GearType.STAFF.getIcon()); assertEquals("Staff", GearType.STAFF.getDisplayName()); GearCache.clearAlignment(); - GearCache.putAlignment(0, ModifierTriple.ZERO); + GearCache.putAlignment(0, ModifierSet.ZERO); GearCache.putAlignment(1, null); assertEquals(0, GearCache.alignmentBands()); - var triple = new ModifierTriple(.1, .2, .3); + var triple = new ModifierSet(.1, .2, .3); GearCache.putAlignment(2, triple); assertEquals(1, GearCache.alignmentBands()); GearCache.alignmentEnabled = false; - assertSame(ModifierTriple.ZERO, GearCache.alignment(2)); + assertSame(ModifierSet.ZERO, GearCache.alignment(2)); GearCache.alignmentEnabled = true; - assertSame(ModifierTriple.ZERO, GearCache.alignment(0)); - assertSame(ModifierTriple.ZERO, GearCache.alignment(1)); + assertSame(ModifierSet.ZERO, GearCache.alignment(0)); + assertSame(ModifierSet.ZERO, GearCache.alignment(1)); assertSame(triple, GearCache.alignment(2)); var type = new PartTypeDef(" head ", 4); assertEquals("head", type.getId()); diff --git a/src/test/java/net/tfminecraft/magic/ResonanceGuiCoverageTest.java b/src/test/java/net/tfminecraft/magic/ResonanceGuiCoverageTest.java index 267e243..02fda00 100644 --- a/src/test/java/net/tfminecraft/magic/ResonanceGuiCoverageTest.java +++ b/src/test/java/net/tfminecraft/magic/ResonanceGuiCoverageTest.java @@ -261,31 +261,31 @@ void schoolLoreNamesItsPartsAndKeepsThePeakResonanceOnly() { assertEquals( List.of( "Your Seithr spells now:", - " Mana -29.65% Cooldown -17.22% Damage +38.36%", + " Mana -29.65% Cooldown -17.22% Damage & Healing +38.36%", "Made of:", - " Resonance 98.61: Mana -19.44% Cooldown -14.51% Damage +19.44%", - " Tranquility 63.35: Mana -12.67% Cooldown -3.17% Damage +15.84%", + " Resonance 98.61: Mana -19.44% Cooldown -14.51% Damage & Healing +19.44%", + " Tranquility 63.35: Mana -12.67% Cooldown -3.17% Damage & Healing +15.84%", "At 100 Resonance:", - " Mana -20% Cooldown -15% Damage +20%"), + " Mana -20% Cooldown -15% Damage & Healing +20%"), plain(ModifierLore.linesForElement(seithr, session, null))); session.setResonance("seithr", 3.2); session.setEquilibrium(-27.8); var corrupted = plain(ModifierLore.linesForElement(seithr, session, null)); - assertEquals(" Mana +11.1% Cooldown +5.3% Damage -9.44%", corrupted.get(1)); - assertEquals(" Corruption 27.8: Mana -6.42% Cooldown -11.42% Damage +11.42%", corrupted.get(4)); + assertEquals(" Mana +11.1% Cooldown +5.3% Damage & Healing -9.44%", corrupted.get(1)); + assertEquals(" Corruption 27.8: Mana -6.42% Cooldown -11.42% Damage & Healing +11.42%", corrupted.get(4)); session.setResonance("seithr", 50); session.setEquilibrium(0); assertEquals( List.of( "Your Seithr spells now:", - " Mana 0% Cooldown +2.5% Damage 0%", + " Mana 0% Cooldown +2.5% Damage & Healing 0%", "Made of:", - " Resonance 50: Mana 0% Cooldown +2.5% Damage 0%", + " Resonance 50: Mana 0% Cooldown +2.5% Damage & Healing 0%", "At 100 Resonance:", - " Mana -20% Cooldown -15% Damage +20%"), + " Mana -20% Cooldown -15% Damage & Healing +20%"), plain(ModifierLore.linesForElement(seithr, session, null))); assertEquals( - " Mana +20% Cooldown +20% Damage -20%", + " Mana +20% Cooldown +20% Damage & Healing -20%", plain(ModifierLore.linesForElement(seithr, null, null)).get(1)); } @@ -306,11 +306,37 @@ void schoolNowLineIsWhatACastGets() throws Exception { + invoke(ModifierLore.class, "formatPercent", new Class[] {double.class}, cast.mana()) + " Cooldown " + invoke(ModifierLore.class, "formatPercent", new Class[] {double.class}, cast.cooldown()) - + " Damage " + + " Damage & Healing " + invoke(ModifierLore.class, "formatPercent", new Class[] {double.class}, cast.damage()), shown); } + @Test + void healingGetsItsOwnColumnWhenItDiffersFromDamageAndDurationShowsWhenSet() { + var yaml = new YamlConfiguration(); + yaml.set("name", "Cerrith"); + yaml.set("resonance.0.mana", 0.0); + yaml.set("resonance.0.damage", -0.20); + yaml.set("resonance.0.cooldown", 0.0); + yaml.set("resonance.0.support", 0.0); + yaml.set("resonance.100.mana", -0.20); + yaml.set("resonance.100.damage", 0.0); + yaml.set("resonance.100.cooldown", -0.15); + yaml.set("resonance.100.support", 0.10); + yaml.set("resonance.100.duration", 0.05); + var cerrith = new ElementDef("cerrith", yaml); + ElementRegistry.register(cerrith); + var session = new ResonanceSession(); + session.setResonance("cerrith", 100); + assertEquals( + " Mana -20% Cooldown -15% Damage 0% Healing +10% Duration +5%", + plain(ModifierLore.linesForElement(cerrith, session, null)).get(1)); + session.setResonance("cerrith", 0); + assertEquals( + " Mana 0% Cooldown 0% Damage -20% Healing 0%", + plain(ModifierLore.linesForElement(cerrith, session, null)).get(1)); + } + @Test void anAlignedWeaponJoinsTheNowRowsAndGetsItsOwnSource() throws Exception { var seithr = seithr(); @@ -321,7 +347,7 @@ void anAlignedWeaponJoinsTheNowRowsAndGetsItsOwnSource() throws Exception { try (var modifiers = mockStatic(SpellModifiers.class, CALLS_REAL_METHODS)) { modifiers .when(() -> SpellModifiers.alignment(weapon, "seithr")) - .thenReturn(new ModifierTriple(0.0, 0.05, -0.04)); + .thenReturn(new ModifierSet(0.0, 0.05, -0.04)); var cast = SpellModifiers.combine( SpellModifiers.combine( @@ -332,11 +358,11 @@ void anAlignedWeaponJoinsTheNowRowsAndGetsItsOwnSource() throws Exception { + invoke(ModifierLore.class, "formatPercent", new Class[] {double.class}, cast.mana()) + " Cooldown " + invoke(ModifierLore.class, "formatPercent", new Class[] {double.class}, cast.cooldown()) - + " Damage " + + " Damage & Healing " + invoke(ModifierLore.class, "formatPercent", new Class[] {double.class}, cast.damage()); var school = plain(ModifierLore.linesForElement(seithr, session, weapon)); assertEquals(expected, school.get(1)); - assertEquals(" Weapon: Mana 0% Cooldown -4% Damage +5%", school.get(5)); + assertEquals(" Weapon: Mana 0% Cooldown -4% Damage & Healing +5%", school.get(5)); assertEquals("At 100 Resonance:", school.get(6)); var flow = plain(ModifierLore.linesForFlow(session, List.of(seithr), weapon)); assertEquals(" Seithr:" + expected, flow.get(5)); @@ -354,11 +380,11 @@ void balanceLoreShowsYourAmountThePeakAndEachSchoolOnlyOnYourSide() { assertEquals( List.of( "Your Tranquility 63.35:", - " Mana -12.67% Cooldown -3.17% Damage +15.84%", + " Mana -12.67% Cooldown -3.17% Damage & Healing +15.84%", "At 100 Tranquility:", - " Mana -20% Cooldown -5% Damage +25%", + " Mana -20% Cooldown -5% Damage & Healing +25%", "Your spells now, with each school's Resonance:", - " Seithr: Mana -29.65% Cooldown -17.22% Damage +38.36%"), + " Seithr: Mana -29.65% Cooldown -17.22% Damage & Healing +38.36%"), flow.subList(0, 6)); assertEquals(7, flow.size()); assertTrue(flow.get(6).startsWith(" fire: ")); @@ -366,14 +392,14 @@ void balanceLoreShowsYourAmountThePeakAndEachSchoolOnlyOnYourSide() { List.of( "You have no Corruption.", "At 60 Corruption:", - " Mana -10% Cooldown -15% Damage +15%"), + " Mana -10% Cooldown -15% Damage & Healing +15%"), plain(ModifierLore.linesForSurge(session, List.of(seithr), null))); session.setResonance("seithr", 3.2); session.setEquilibrium(-27.8); var surge = plain(ModifierLore.linesForSurge(session, List.of(seithr), null)); assertEquals("Your Corruption 27.8:", surge.get(0)); - assertEquals(" Mana -6.42% Cooldown -11.42% Damage +11.42%", surge.get(1)); - assertEquals(" Seithr: Mana +11.1% Cooldown +5.3% Damage -9.44%", surge.get(5)); + assertEquals(" Mana -6.42% Cooldown -11.42% Damage & Healing +11.42%", surge.get(1)); + assertEquals(" Seithr: Mana +11.1% Cooldown +5.3% Damage & Healing -9.44%", surge.get(5)); assertEquals("You have no Tranquility.", plain(ModifierLore.linesForFlow(session, List.of(seithr), null)).get(0)); assertEquals(4, ModifierLore.linesForSurge(session, List.of(), null).size()); assertEquals(4, ModifierLore.linesForSurge(session, null, null).size()); diff --git a/src/test/java/net/tfminecraft/magic/SpellDomainTest.java b/src/test/java/net/tfminecraft/magic/SpellDomainTest.java index 9eed842..85f4c86 100644 --- a/src/test/java/net/tfminecraft/magic/SpellDomainTest.java +++ b/src/test/java/net/tfminecraft/magic/SpellDomainTest.java @@ -208,7 +208,7 @@ void spellModifiersCombineElementCurvesDriftAndAlignment() { assertEquals(.15, SpellModifiers.drift(-60).damage()); assertEquals(.25, SpellModifiers.drift(100).damage()); assertTrue(SpellModifiers.combine(null, null).isZero()); - assertEquals(.1, SpellModifiers.combine(new ModifierTriple(0, .1, 0), null).damage(), 1e-10); + assertEquals(.1, SpellModifiers.combine(new ModifierSet(0, .1, 0), null).damage(), 1e-10); assertTrue(SpellModifiers.alignment((ItemStack) null, "fire").isZero()); assertTrue(SpellModifiers.alignment((WeaponRequirement) null, "fire").isZero()); var req = WeaponRequirement.fromItem(new ItemStack(Material.STICK)); @@ -216,7 +216,7 @@ void spellModifiersCombineElementCurvesDriftAndAlignment() { assertTrue(SpellModifiers.alignment(req, "fire").isZero()); req.mergeAmounts(Map.of("fire", 20.)); TierBands.register(null, 1, 1); - var triple = new ModifierTriple(0, .2, 0); + var triple = new ModifierSet(0, .2, 0); GearCache.putAlignment(1, triple); assertSame(triple, SpellModifiers.alignment(req, "fire")); GearCache.alignmentEnabled = false; diff --git a/src/test/java/net/tfminecraft/magic/SpellModifierCoverageTest.java b/src/test/java/net/tfminecraft/magic/SpellModifierCoverageTest.java index bcda2ac..b18fb3c 100644 --- a/src/test/java/net/tfminecraft/magic/SpellModifierCoverageTest.java +++ b/src/test/java/net/tfminecraft/magic/SpellModifierCoverageTest.java @@ -52,6 +52,7 @@ void setup() throws Exception { @AfterEach void cleanup() { + ModifierParameters.reset(); SpellModifierApplyService.clearAll(); Magic.plugin = null; SkillElementRegistry.clear(); @@ -107,6 +108,7 @@ void unchangedSnapshotReusesModifiersChangedValuesAndReloadReplaceThem() { var data = mock(MMOPlayerData.class); when(data.isOnline()).thenReturn(true); var handler = mock(SkillHandler.class); + when(handler.getParameters()).thenReturn(Set.of("damage")); var observed = new ArrayList>(); try (var b = mockStatic(Bukkit.class, CALLS_REAL_METHODS); var players = mockStatic(MMOPlayerData.class); @@ -121,10 +123,10 @@ void unchangedSnapshotReusesModifiersChangedValuesAndReloadReplaceThem() { SkillElementRegistry.register("fireball", "fire"); ids.when(() -> SkillIdResolver.handlerForBinding("fireball")).thenReturn(handler); mods.when(() -> SpellModifiers.resonance(eq("fire"), anyDouble())) - .thenReturn(new ModifierTriple(.1, .2, -.1)); - mods.when(() -> SpellModifiers.drift(anyDouble())).thenReturn(ModifierTriple.ZERO); + .thenReturn(new ModifierSet(.1, .2, -.1)); + mods.when(() -> SpellModifiers.drift(anyDouble())).thenReturn(ModifierSet.ZERO); mods.when(() -> SpellModifiers.alignment(any(WeaponRequirement.class), eq("fire"))) - .thenReturn(ModifierTriple.ZERO); + .thenReturn(ModifierSet.ZERO); SpellModifierApplyService.sync(p, session); assertEquals(3, made.constructed().size()); assertEquals("magic-mana-fireball", observed.getFirst().get(0)); @@ -140,7 +142,7 @@ void unchangedSnapshotReusesModifiersChangedValuesAndReloadReplaceThem() { assertEquals(6, made.constructed().size()); for (var modifier : made.constructed().subList(0, 3)) verify(modifier).unregister(data); mods.when(() -> SpellModifiers.resonance(eq("fire"), anyDouble())) - .thenReturn(ModifierTriple.ZERO); + .thenReturn(ModifierSet.ZERO); SpellModifierApplyService.sync(p, live); assertEquals(6, made.constructed().size()); for (var modifier : made.constructed().subList(3, 6)) verify(modifier).unregister(data); @@ -224,17 +226,19 @@ void cachedValueObjectsCompareEveryModifierAndHaveStableHashCodes() throws Excep var ctor = planClass.getDeclaredConstructors()[0]; ctor.setAccessible(true); var handler = mock(SkillHandler.class); - Object base = ctor.newInstance("skill", handler, .1, .2, .3); - Object same = ctor.newInstance("skill", handler, .1, .2, .3); + Object base = ctor.newInstance("skill", handler, new ModifierSet(.1, .2, .3, .4, .5)); + Object same = ctor.newInstance("skill", handler, new ModifierSet(.1, .2, .3, .4, .5)); assertEquals(base, base); assertNotEquals(base, null); assertNotEquals(base, "other"); assertEquals(base, same); assertEquals(base.hashCode(), same.hashCode()); - assertNotEquals(base, ctor.newInstance("other", handler, .1, .2, .3)); - assertNotEquals(base, ctor.newInstance("skill", handler, .2, .2, .3)); - assertNotEquals(base, ctor.newInstance("skill", handler, .1, .3, .3)); - assertNotEquals(base, ctor.newInstance("skill", handler, .1, .2, .4)); + assertNotEquals(base, ctor.newInstance("other", handler, new ModifierSet(.1, .2, .3, .4, .5))); + assertNotEquals(base, ctor.newInstance("skill", handler, new ModifierSet(.2, .2, .3, .4, .5))); + assertNotEquals(base, ctor.newInstance("skill", handler, new ModifierSet(.1, .3, .3, .4, .5))); + assertNotEquals(base, ctor.newInstance("skill", handler, new ModifierSet(.1, .2, .4, .4, .5))); + assertNotEquals(base, ctor.newInstance("skill", handler, new ModifierSet(.1, .2, .3, .5, .5))); + assertNotEquals(base, ctor.newInstance("skill", handler, new ModifierSet(.1, .2, .3, .4, .6))); var snapshot = Class.forName("net.tfminecraft.magic.integration.SpellModifierApplyService$DesiredSnapshot") .getDeclaredConstructors()[0]; @@ -249,4 +253,117 @@ void cachedValueObjectsCompareEveryModifierAndHaveStableHashCodes() throws Excep assertNotEquals(first, snapshot.newInstance(new TreeMap<>(Map.of("fire", 1)), List.of(base))); assertNotEquals(first, snapshot.newInstance(new TreeMap<>(), List.of())); } + + @Test + void healShieldAndBurnFollowTheirStatsOnlyOnSkillsThatDeclareThem() { + var p = server.addPlayer(); + var session = new ResonanceSession(); + var data = mock(MMOPlayerData.class); + when(data.isOnline()).thenReturn(true); + var orb = mock(SkillHandler.class); + when(orb.getParameters()).thenReturn(Set.of("heal")); + var glyph = mock(SkillHandler.class); + when(glyph.getParameters()).thenReturn(Set.of("duration", "shield_power", "shield_duration")); + var breath = mock(SkillHandler.class); + when(breath.getParameters()).thenReturn(Set.of("burnt_damage", "burnt_duration")); + var observed = new ArrayList>(); + try (var b = mockStatic(Bukkit.class, CALLS_REAL_METHODS); + var players = mockStatic(MMOPlayerData.class); + var ids = mockStatic(SkillIdResolver.class); + var hands = mockStatic(GearHand.class); + var mods = mockStatic(SpellModifiers.class, CALLS_REAL_METHODS); + var made = mockConstruction(SkillModifier.class, (m, c) -> observed.add(c.arguments()))) { + var pm = mock(PluginManager.class); + when(pm.isPluginEnabled(anyString())).thenReturn(true); + b.when(Bukkit::getPluginManager).thenReturn(pm); + players.when(() -> MMOPlayerData.getOrNull(p)).thenReturn(data); + SkillElementRegistry.register("healing_orb", "cerrith"); + SkillElementRegistry.register("cerrith_glyph", "cerrith"); + SkillElementRegistry.register("fire_breath", "oseni"); + ids.when(() -> SkillIdResolver.handlerForBinding("healing_orb")).thenReturn(orb); + ids.when(() -> SkillIdResolver.handlerForBinding("cerrith_glyph")).thenReturn(glyph); + ids.when(() -> SkillIdResolver.handlerForBinding("fire_breath")).thenReturn(breath); + // Full tranquility: damage and support +25%, nothing from resonance. + mods.when(() -> SpellModifiers.resonance(anyString(), anyDouble())).thenReturn(ModifierSet.ZERO); + mods.when(() -> SpellModifiers.drift(anyDouble())) + .thenReturn(new ModifierSet(0, .25, 0, .25, .25)); + mods.when(() -> SpellModifiers.alignment(any(WeaponRequirement.class), anyString())) + .thenReturn(ModifierSet.ZERO); + SpellModifierApplyService.sync(p, session); + var keys = observed.stream().map(a -> (String) a.get(0)).sorted().toList(); + assertEquals( + List.of( + "magic-burnt_damage-fire_breath", + "magic-heal-healing_orb", + "magic-shield_power-cerrith_glyph"), + keys); + for (var args : observed) { + assertEquals(25., (Double) args.get(3), 1e-8); + assertEquals(args.get(0).toString().split("-")[1], args.get(1)); + } + + // Turning duration on reaches durations the skill declares; turning support off drops heals. + var config = new org.bukkit.configuration.file.YamlConfiguration(); + config.set("modifier_parameters.duration", List.of("duration", "burnt_duration")); + config.set("modifier_parameters.support", List.of()); + ModifierParameters.load(config.getConfigurationSection("modifier_parameters"), null); + observed.clear(); + SpellModifierApplyService.syncOnline(sessionsFor(p, session)); + keys = observed.stream().map(a -> (String) a.get(0)).sorted().toList(); + assertEquals( + List.of( + "magic-burnt_damage-fire_breath", + "magic-burnt_duration-fire_breath", + "magic-duration-cerrith_glyph"), + keys); + } + } + + @Test + void parameterMapKeepsDefaultsForMissingStatsAndGivesEachParameterOneStat() { + ModifierParameters.load(null, null); + assertEquals(List.of("damage", "burnt_damage"), ModifierParameters.of(ModifierStat.DAMAGE)); + assertEquals(List.of("heal", "shield_power"), ModifierParameters.of(ModifierStat.SUPPORT)); + assertEquals(List.of(), ModifierParameters.of(ModifierStat.DURATION)); + assertEquals(List.of("mana"), ModifierParameters.of(ModifierStat.MANA)); + var logger = mock(java.util.logging.Logger.class); + var config = new org.bukkit.configuration.file.YamlConfiguration(); + config.set("p.damage", List.of(" Damage ", "", "heal")); + config.set("p.support", List.of("heal", "shield_power")); + ModifierParameters.load(config.getConfigurationSection("p"), logger); + assertEquals(List.of("damage", "heal"), ModifierParameters.of(ModifierStat.DAMAGE)); + assertEquals(List.of("shield_power"), ModifierParameters.of(ModifierStat.SUPPORT)); + assertEquals(List.of("cooldown"), ModifierParameters.of(ModifierStat.COOLDOWN)); + verify(logger).warning(contains("'heal'")); + config.set("p.support", List.of("shield_power", "shield_power")); + ModifierParameters.load(config.getConfigurationSection("p"), null); + assertEquals(List.of("shield_power"), ModifierParameters.of(ModifierStat.SUPPORT)); + ModifierParameters.reset(); + assertEquals(List.of("heal", "shield_power"), ModifierParameters.of(ModifierStat.SUPPORT)); + } + + @Test + void baseParametersNeedNoDeclarationAndOthersDo() { + var handler = mock(SkillHandler.class); + when(handler.getParameters()).thenReturn(null); + assertTrue(SpellModifierApplyService.hasParameter(handler, "mana")); + assertTrue(SpellModifierApplyService.hasParameter(handler, "cooldown")); + assertFalse(SpellModifierApplyService.hasParameter(handler, "heal")); + when(handler.getParameters()).thenReturn(Set.of("heal")); + assertTrue(SpellModifierApplyService.hasParameter(handler, "heal")); + assertFalse(SpellModifierApplyService.hasParameter(handler, "damage")); + } + + @SuppressWarnings("unchecked") + private static ResonanceSessionManager sessionsFor(Player p, ResonanceSession session) { + var sessions = mock(ResonanceSessionManager.class); + doAnswer( + a -> { + ((BiConsumer) a.getArgument(0)).accept(p, session); + return null; + }) + .when(sessions) + .forEachOnlineSession(any()); + return sessions; + } } From c2c1776f6c834333521b491aa52f09891d6463d7 Mon Sep 17 00:00:00 2001 From: XxFran10xX <318299142+XxFran10xX@users.noreply.github.com> Date: Tue, 17 Nov 2026 18:59:07 +0100 Subject: [PATCH 2/2] Accept a single name in modifier_parameters; tooltip shows only applied stats A scalar like 'support: heal' used to read as an empty list and silently turn the stat off. The /resonance rows now zero a stat that modifier_parameters points at nothing, so they match what casts get. Co-Authored-By: Claude Opus 5.5 --- .../tfminecraft/magic/gui/ModifierLore.java | 19 +++++++++++++- .../magic/modifier/ModifierParameters.java | 13 +++++++++- .../magic/ResonanceGuiCoverageTest.java | 26 ++++++++++++++++++- .../magic/SpellModifierCoverageTest.java | 4 +++ 4 files changed, 59 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/tfminecraft/magic/gui/ModifierLore.java b/src/main/java/net/tfminecraft/magic/gui/ModifierLore.java index 38a8474..a1b393a 100644 --- a/src/main/java/net/tfminecraft/magic/gui/ModifierLore.java +++ b/src/main/java/net/tfminecraft/magic/gui/ModifierLore.java @@ -7,7 +7,9 @@ import net.tfminecraft.magic.GuiCache; import net.tfminecraft.magic.model.ElementDef; +import net.tfminecraft.magic.modifier.ModifierParameters; import net.tfminecraft.magic.modifier.ModifierSet; +import net.tfminecraft.magic.modifier.ModifierStat; import net.tfminecraft.magic.modifier.SpellModifiers; import net.tfminecraft.magic.session.ResonanceSession; import net.tfminecraft.magic.util.GuiText; @@ -149,7 +151,8 @@ private static String withValue(String template, double value) { * One line. Damage and healing share a column while they match (the default, since * support follows damage); duration only shows when something sets it. */ - private static String row(String prefix, ModifierSet modifiers) { + private static String row(String prefix, ModifierSet raw) { + ModifierSet modifiers = applied(raw); StringBuilder line = new StringBuilder(" ").append(prefix) .append(stat("stat_mana", MANA_FALLBACK, "Mana", modifiers.mana(), false)).append(" ") .append(stat("stat_cooldown", COOLDOWN_FALLBACK, "Cooldown", modifiers.cooldown(), false)).append(" "); @@ -165,6 +168,20 @@ private static String row(String prefix, ModifierSet modifiers) { return GuiText.format(line.toString()); } + /** Zeroes any stat that modifier_parameters points at no skill parameter, so rows show what casts get. */ + static ModifierSet applied(ModifierSet modifiers) { + return new ModifierSet( + live(ModifierStat.MANA, modifiers), + live(ModifierStat.DAMAGE, modifiers), + live(ModifierStat.COOLDOWN, modifiers), + live(ModifierStat.SUPPORT, modifiers), + live(ModifierStat.DURATION, modifiers)); + } + + private static double live(ModifierStat stat, ModifierSet modifiers) { + return ModifierParameters.of(stat).isEmpty() ? 0.0 : modifiers.get(stat); + } + private static String stat( String colorKey, String fallbackHex, String label, double decimal, boolean higherIsBetter) { String labelHex = GuiCache.color(colorKey, fallbackHex); diff --git a/src/main/java/net/tfminecraft/magic/modifier/ModifierParameters.java b/src/main/java/net/tfminecraft/magic/modifier/ModifierParameters.java index f24bbbe..7044c53 100644 --- a/src/main/java/net/tfminecraft/magic/modifier/ModifierParameters.java +++ b/src/main/java/net/tfminecraft/magic/modifier/ModifierParameters.java @@ -40,7 +40,7 @@ public static void load(ConfigurationSection section, Logger logger) { Map> loaded = new EnumMap<>(ModifierStat.class); Set claimed = new HashSet<>(); for (ModifierStat stat : ModifierStat.values()) { - List raw = section.isSet(stat.key()) ? section.getStringList(stat.key()) : DEFAULTS.get(stat); + List raw = raw(section, stat); List parameters = new ArrayList<>(); for (String entry : raw) { if (entry.isBlank()) { @@ -61,6 +61,17 @@ public static void load(ConfigurationSection section, Logger logger) { current = Collections.unmodifiableMap(loaded); } + /** A list as written; a single name ({@code support: heal}) counts as a one-entry list. */ + private static List raw(ConfigurationSection section, ModifierStat stat) { + if (!section.isSet(stat.key())) { + return DEFAULTS.get(stat); + } + if (section.isList(stat.key())) { + return section.getStringList(stat.key()); + } + return List.of(section.getString(stat.key(), "")); + } + private static Map> defaults() { Map> map = new EnumMap<>(ModifierStat.class); map.put(ModifierStat.MANA, List.of("mana")); diff --git a/src/test/java/net/tfminecraft/magic/ResonanceGuiCoverageTest.java b/src/test/java/net/tfminecraft/magic/ResonanceGuiCoverageTest.java index 02fda00..9e72ecf 100644 --- a/src/test/java/net/tfminecraft/magic/ResonanceGuiCoverageTest.java +++ b/src/test/java/net/tfminecraft/magic/ResonanceGuiCoverageTest.java @@ -328,13 +328,37 @@ void healingGetsItsOwnColumnWhenItDiffersFromDamageAndDurationShowsWhenSet() { ElementRegistry.register(cerrith); var session = new ResonanceSession(); session.setResonance("cerrith", 100); + // Duration reaches no parameter by default, so it is not shown. assertEquals( - " Mana -20% Cooldown -15% Damage 0% Healing +10% Duration +5%", + " Mana -20% Cooldown -15% Damage 0% Healing +10%", plain(ModifierLore.linesForElement(cerrith, session, null)).get(1)); session.setResonance("cerrith", 0); assertEquals( " Mana 0% Cooldown 0% Damage -20% Healing 0%", plain(ModifierLore.linesForElement(cerrith, session, null)).get(1)); + // A stat modifier_parameters turns off shows 0, the same as a cast gets. + var config = new YamlConfiguration(); + config.set("p.support", List.of()); + config.set("p.duration", List.of()); + try { + ModifierParameters.load(config.getConfigurationSection("p"), null); + session.setResonance("cerrith", 50); + assertEquals( + " Mana -10% Cooldown -7.5% Damage -10% Healing 0%", + plain(ModifierLore.linesForElement(cerrith, session, null)).get(1)); + session.setResonance("cerrith", 100); + config.set("p.duration", List.of("duration")); + config.set("p.mana", List.of()); + config.set("p.cooldown", List.of()); + config.set("p.damage", List.of()); + config.set("p.support", List.of("heal")); + ModifierParameters.load(config.getConfigurationSection("p"), null); + assertEquals( + " Mana 0% Cooldown 0% Damage 0% Healing +10% Duration +5%", + plain(ModifierLore.linesForElement(cerrith, session, null)).get(1)); + } finally { + ModifierParameters.reset(); + } } @Test diff --git a/src/test/java/net/tfminecraft/magic/SpellModifierCoverageTest.java b/src/test/java/net/tfminecraft/magic/SpellModifierCoverageTest.java index b18fb3c..aebad22 100644 --- a/src/test/java/net/tfminecraft/magic/SpellModifierCoverageTest.java +++ b/src/test/java/net/tfminecraft/magic/SpellModifierCoverageTest.java @@ -335,6 +335,10 @@ void parameterMapKeepsDefaultsForMissingStatsAndGivesEachParameterOneStat() { assertEquals(List.of("shield_power"), ModifierParameters.of(ModifierStat.SUPPORT)); assertEquals(List.of("cooldown"), ModifierParameters.of(ModifierStat.COOLDOWN)); verify(logger).warning(contains("'heal'")); + config.set("p.damage", List.of("damage")); + config.set("p.support", "Heal"); + ModifierParameters.load(config.getConfigurationSection("p"), null); + assertEquals(List.of("heal"), ModifierParameters.of(ModifierStat.SUPPORT)); config.set("p.support", List.of("shield_power", "shield_power")); ModifierParameters.load(config.getConfigurationSection("p"), null); assertEquals(List.of("shield_power"), ModifierParameters.of(ModifierStat.SUPPORT));