Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions src/main/java/net/tfminecraft/magic/gear/GearCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -21,26 +21,26 @@ 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<Integer, ModifierTriple> ALIGNMENT = new LinkedHashMap<>();
private static final Map<Integer, ModifierSet> ALIGNMENT = new LinkedHashMap<>();

private GearCache() {}

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() {
Expand Down
52 changes: 42 additions & 10 deletions src/main/java/net/tfminecraft/magic/gui/ModifierLore.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

import net.tfminecraft.magic.GuiCache;
import net.tfminecraft.magic.model.ElementDef;
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.session.ResonanceSession;
import net.tfminecraft.magic.util.GuiText;
Expand All @@ -25,6 +27,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() {}

Expand All @@ -35,7 +39,7 @@ public static List<String> 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));
Expand All @@ -47,7 +51,7 @@ public static List<String> 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));
}
Expand Down Expand Up @@ -101,7 +105,7 @@ private static List<String> balanceLines(
String noneTemplate,
String peakTemplate,
double peak,
ModifierTriple atPeak) {
ModifierSet atPeak) {
List<String> lines = new ArrayList<>();
if (onThisSide) {
lines.add(GuiText.format(withValue(yourTemplate, amount)));
Expand All @@ -126,7 +130,7 @@ private static List<String> 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(
Expand All @@ -143,11 +147,39 @@ 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 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(" ");
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));
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
}
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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -33,6 +35,7 @@ public final class SpellModifierApplyService {
private static final Map<UUID, AppliedState> applied = new ConcurrentHashMap<>();
private static final Map<String, SkillHandler<?>> handlers = new ConcurrentHashMap<>();
private static final Set<String> unknownWarned = ConcurrentHashMap.newKeySet();
private static final Set<String> BASE_PARAMETERS = Set.of("mana", "cooldown", "stamina", "timer");
private static boolean missingLogged;

private SpellModifierApplyService() {}
Expand Down Expand Up @@ -124,14 +127,16 @@ private static void sync(Player player, ResonanceSession session, boolean forceA
unregisterStored(player, data);
List<SkillModifier> 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));
Expand All @@ -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);
}
Expand Down Expand Up @@ -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<String> declared = handler.getParameters();
return declared != null && declared.contains(parameter);
}

private static SkillModifier register(
MMOPlayerData data,
String skillId,
Expand Down Expand Up @@ -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
Expand All @@ -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;
}
}
}
7 changes: 5 additions & 2 deletions src/main/java/net/tfminecraft/magic/loader/ConfigLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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");
}
Expand Down
Loading