Merge pull request RobertSkalko#2 from SaloEater/allow_spell_to_use_target_stats

Allow spells to use it's target's stats

Author: mahjerion

src/main/java/com/robertx22/mine_and_slash/aoe_data/database/spells/SpellCalcs.java

@@ -37,8 +37,7 @@ public static void init() {
 
     public static ValueCalculation EXPLODE_MINION = ValueCalcBuilder.of("explode_minion")
             .spellScaling(0.25F, 1f)
-            .capScaling(5)
-            .statScaling(Health.getInstance(), 0.1F, 0.3F)
+            .targetStatScaling(Health.getInstance(), 0.1F, 0.3F)
             .build();
 
     public static ValueCalculation CHAOS_TOTEM = ValueCalcBuilder.of("chaos_totem")

src/main/java/com/robertx22/mine_and_slash/database/data/spells/components/actions/DamageAction.java

@@ -39,7 +39,7 @@ public void tryActivate(Collection<LivingEntity> targets, SpellCtx ctx, MapHolde
 
             float dmgEffectiveness = calc.getDamageEffectiveness(ctx.caster, ctx.calculatedSpellData.getSpell());
 
-            int value = calc.getCalculatedValue(ctx.caster, ctx.calculatedSpellData.getSpell());
+            int value = calc.getCalculatedValue(ctx.caster, ctx.target, ctx.calculatedSpellData.getSpell());
 
             if (ctx.calculatedSpellData.chains_did > 0) {
                 float dmgMulti = MathHelper.clamp(1F - (GameBalanceConfig.get().DMG_REDUCT_PER_CHAIN * ctx.calculatedSpellData.chains_did), GameBalanceConfig.get().MIN_CHAIN_DMG, 1F);

src/main/java/com/robertx22/mine_and_slash/database/data/value_calc/ScalingCalc.java

@@ -43,10 +43,14 @@ public int getMultiAsPercent(LivingEntity en, MaxLevelProvider provider) {
         return (int) (multi.getValue(en, provider) * 100);
     }
 
-    public Component GetTooltipString(LivingEntity en, MaxLevelProvider provider) {
+    public Component GetStatTooltipString(LivingEntity en, MaxLevelProvider provider) {
         return Gui.SPELL_DAMAGE_PROPORTION.locName(getMultiAsPercent(en, provider), getStat().getMutableIconNameFormat());
     }
 
+    public Component GetTargetStatTooltipString(LivingEntity en, MaxLevelProvider provider) {
+        return Gui.TARGET_SPELL_DAMAGE_PROPORTION.locName(getMultiAsPercent(en, provider), getStat().getMutableIconNameFormat());
+    }
+
     public List<Component> getTooltipFor(float multi, float value, MutableComponent statname, Elements el) {
         List<Component> list = new ArrayList<>();
         String eleStr = "";

src/main/java/com/robertx22/mine_and_slash/database/data/value_calc/ValueCalcBuilder.java

@@ -55,6 +55,11 @@ public ValueCalcBuilder statScaling(Stat stat, float min, float max) {
         return this;
     }
 
+    public ValueCalcBuilder targetStatScaling(Stat stat, float min, float max) {
+        calc.target_stat_scalings.add(new ScalingCalc(stat, new LeveledValue(min, max)));
+        return this;
+    }
+
     public ValueCalculation build() {
         calc.addToSerializables(MMORPG.SERIAZABLE_REGISTRATION_INFO);
         return calc;

src/main/java/com/robertx22/mine_and_slash/database/data/value_calc/ValueCalculation.java

@@ -33,7 +33,12 @@ public List<ScalingCalc> getAllScalingValues() {
         return new ArrayList<>(stat_scalings);
     }
 
+    public List<ScalingCalc> getAllTargetScalingValues() {
+        return new ArrayList<>(target_stat_scalings);
+    }
+
     public List<ScalingCalc> stat_scalings = new ArrayList<>();
+    public List<ScalingCalc> target_stat_scalings = new ArrayList<>();
 
     public String id = "";
     public StatScaling base_scaling_type = StatScaling.NORMAL;
@@ -68,22 +73,28 @@ public String getLocDmgTooltip() {
         return "[calc:" + id + "]";
     }
 
-    private int getCalculatedScalingValue(LivingEntity en, MaxLevelProvider provider) {
+    private int getCalculatedScalingValue(LivingEntity caster, LivingEntity target, MaxLevelProvider provider) {
 
         var opt = getAllScalingValues().stream().filter(x -> x.getStat() == WeaponDamage.getInstance()).findFirst();
 
         float dmg = 0;
         if (opt.isPresent()) {
-            dmg = opt.get().getCalculatedValue(en, provider);
+            dmg = opt.get().getCalculatedValue(caster, provider);
         }
 
 
         float other = 0;
 
         other += getAllScalingValues().stream().filter(x -> x.getStat() != WeaponDamage.getInstance())
-                .mapToInt(x -> x.getCalculatedValue(en, provider))
+                .mapToInt(x -> x.getCalculatedValue(caster, provider))
                 .sum();
 
+        if (target != null) {
+            other += getAllTargetScalingValues().stream().filter(x -> x.getStat() != WeaponDamage.getInstance())
+                    .mapToInt(x -> x.getCalculatedValue(target, provider))
+                    .sum();
+        }
+
         if (this.capsToWeaponDamage()) {
             float maxotherscaling = dmg * this.cap_to_wep_dmg;
             if (other > maxotherscaling) {
@@ -96,9 +107,13 @@ private int getCalculatedScalingValue(LivingEntity en, MaxLevelProvider provider
         return (int) amount;
     }
 
-    public int getCalculatedValue(LivingEntity en, MaxLevelProvider provider) {
-        int val = getCalculatedScalingValue(en, provider);
-        val += getCalculatedBaseValue(en, provider);
+    public int getCalculatedValue(LivingEntity caster, MaxLevelProvider provider) {
+        return getCalculatedValue(caster, null, provider);
+    }
+
+    public int getCalculatedValue(LivingEntity caster, LivingEntity target, MaxLevelProvider provider) {
+        int val = getCalculatedScalingValue(caster, target, provider);
+        val += getCalculatedBaseValue(caster, provider);
         return val;
 
     }
@@ -116,7 +131,11 @@ public Component getShortTooltip(LivingEntity en, MaxLevelProvider provider) {
         }
 
         stat_scalings.forEach(x -> {
-            text.append(" ").append(x.GetTooltipString(en, provider));
+            text.append(" ").append(x.GetStatTooltipString(en, provider));
+        });
+
+        target_stat_scalings.forEach(x -> {
+            text.append(" ").append(x.GetTargetStatTooltipString(en, provider));
         });
 
         if (capsToWeaponDamage()) {

src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Gui.java

@@ -44,6 +44,7 @@ public enum Gui implements IAutoLocName {
     SALVAGE_TIP_OFF("Auto Salvage for %1$s %2$s: Off"),
     PROF_NAME("%1$s: %2$s"),
     SPELL_DAMAGE_PROPORTION("(%1$s%% of %2$s§7)"),
+    TARGET_SPELL_DAMAGE_PROPORTION("(%1$s%% of %2$s§7 of target)"),
     PROF_LEVEL_AND_EXP("Level: %1$s EXP: %2$s/%3$s"),
     AVAILABLE_SUPPORT_SLOTS("Support Slots: %1$s/5 Available"),
     FAVOR_REGEN_PER_HOUR(ChatFormatting.LIGHT_PURPLE + "Regenerates %1$s " + ChatFormatting.LIGHT_PURPLE + "per Hour"),