diff --git a/src/main/java/electroblob/wizardry/constants/Constants.java b/src/main/java/electroblob/wizardry/constants/Constants.java index 7f9da548..c6e6e426 100644 --- a/src/main/java/electroblob/wizardry/constants/Constants.java +++ b/src/main/java/electroblob/wizardry/constants/Constants.java @@ -46,7 +46,5 @@ public final class Constants { * won't spawn again if something is already standing in it. */ public static final int DECAY_SPREAD_INTERVAL = 8; - /** The fraction by which potency is increased per level of the empowerment effect. */ - public static final float EMPOWERMENT_POTENCY_PER_LEVEL = 0.25f; } diff --git a/src/main/java/electroblob/wizardry/spell/EmpoweringPresence.java b/src/main/java/electroblob/wizardry/spell/EmpoweringPresence.java index 6ff9b08e..d50e1dbe 100644 --- a/src/main/java/electroblob/wizardry/spell/EmpoweringPresence.java +++ b/src/main/java/electroblob/wizardry/spell/EmpoweringPresence.java @@ -5,6 +5,7 @@ import electroblob.wizardry.constants.Constants; import electroblob.wizardry.entity.living.ISpellCaster; import electroblob.wizardry.event.SpellCastEvent; import electroblob.wizardry.item.SpellActions; +import electroblob.wizardry.registry.Spells; import electroblob.wizardry.registry.WizardryItems; import electroblob.wizardry.registry.WizardryPotions; import electroblob.wizardry.util.ParticleBuilder; @@ -24,11 +25,14 @@ import javax.annotation.Nullable; @Mod.EventBusSubscriber public class EmpoweringPresence extends SpellAreaEffect { + /** The fraction by which potency is increased per level of the empowerment effect. */ + public static final String POTENCY_PER_LEVEL = "potency_per_level"; + public EmpoweringPresence(){ super("empowering_presence", SpellActions.POINT_UP, false); this.alwaysSucceed(true); this.targetAllies(true); - addProperties(EFFECT_DURATION, EFFECT_STRENGTH); + addProperties(EFFECT_DURATION, EFFECT_STRENGTH, POTENCY_PER_LEVEL); } @Override @@ -62,7 +66,7 @@ public class EmpoweringPresence extends SpellAreaEffect { if(event.getCaster() != null && event.getCaster().isPotionActive(WizardryPotions.empowerment) && !(event.getSpell() instanceof EmpoweringPresence)){ // Prevent exponential empowerment stacking! - float potency = 1 + Constants.EMPOWERMENT_POTENCY_PER_LEVEL + float potency = 1 + Spells.empowering_presence.getProperty(POTENCY_PER_LEVEL).floatValue() * (event.getCaster().getActivePotionEffect(WizardryPotions.empowerment).getAmplifier() + 1); event.getModifiers().set(SpellModifiers.POTENCY, diff --git a/src/main/resources/assets/ebwizardry/spells/empowering_presence.json b/src/main/resources/assets/ebwizardry/spells/empowering_presence.json index aac89354..3165ecc7 100644 --- a/src/main/resources/assets/ebwizardry/spells/empowering_presence.json +++ b/src/main/resources/assets/ebwizardry/spells/empowering_presence.json @@ -19,6 +19,7 @@ "base_properties": { "effect_radius": 5, "effect_duration": 900, - "effect_strength": 1 + "effect_strength": 1, + "potency_per_level": 0.15 } } \ No newline at end of file