Skip to content

Summing of effects that should not reach 100%/1.0 values with diminishing returns formula #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FominArtmind wants to merge 2 commits into
base: releases/EpicLoot/v0.9.37-vapok
Choose a base branch
from
Open

Summing of effects that should not reach 100%/1.0 values with diminishing returns formula #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fd4ffe
- Implemented diminishing returns summing for the effects which value…
Feb 15, 2024
bfd30d2
Fix for AvoidDamageTaken and AvoidDamageTakenLowHealth interaction
Feb 20, 2024
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
59 changes: 53 additions & 6 deletions EpicLoot/MagicItemComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,19 +653,66 @@ public static HashSet<LegendarySetInfo> GetEquippedSets(this Player player)
return sets;
}

public static float GetTotalActiveMagicEffectValue(this Player player, string effectType, float scale = 1.0f, ItemDrop.ItemData ignoreThisItem = null)
public static float GetEffectDiminishingReturnsTotalValue(List<float> effectValues, string effectType = null)
{
var totalValue = scale * (EquipmentEffectCache.Get(player, effectType, () =>
var LIMITED_EFFECTS = new List<string>() {
MagicEffectType.AddPhysicalResistancePercentage,
MagicEffectType.AddBluntResistancePercentage,
MagicEffectType.AddSlashingResistancePercentage,
MagicEffectType.AddPiercingResistancePercentage,
MagicEffectType.AddChoppingResistancePercentage,
MagicEffectType.AddFireResistancePercentage,
MagicEffectType.AddFrostResistancePercentage,
MagicEffectType.AddLightningResistancePercentage,
MagicEffectType.AddPoisonResistancePercentage,
MagicEffectType.AddSpiritResistancePercentage,
MagicEffectType.AddElementalResistancePercentage,
MagicEffectType.AvoidDamageTaken,
MagicEffectType.AvoidDamageTakenLowHealth,
MagicEffectType.ModifyAttackStaminaUse,
MagicEffectType.ModifyBlockStaminaUse,
MagicEffectType.ModifyJumpStaminaUse,
MagicEffectType.ModifySprintStaminaUse,
MagicEffectType.Slow
};

if (effectType == null || LIMITED_EFFECTS.Contains(effectType))
{
var allEffects = player.GetAllActiveMagicEffects(effectType);
return allEffects.Count > 0 ? allEffects.Select(x => x.EffectValue).Sum() : null;
}) ?? 0);
var limitedValues = effectValues.Select(x => Math.Min(x, 90.0f)).ToList();
limitedValues.Sort((float a, float b) => { if (a > b) return -1; return 1; });

var result = limitedValues[0];
for (var i = 1; i < limitedValues.Count; i++)
{
result = result + (100.0f - result) * (limitedValues[i] * 0.01f);
}

return result;
}

return effectValues.Sum();
}

public static float GetTotalActiveMagicEffectValue(this Player player, string effectType, float scale = 1.0f, ItemDrop.ItemData ignoreThisItem = null)
{
var allValues = player.GetAllActiveMagicEffects(effectType).Select(x => x.EffectValue).ToList();

if (ignoreThisItem != null && player.IsItemEquiped(ignoreThisItem) && ignoreThisItem.IsMagic(out var magicItem))
{
totalValue -= magicItem.GetTotalEffectValue(effectType, scale);
var ignoredValue = magicItem.GetEffects(effectType).Sum(x => x.EffectValue);
allValues.Remove(ignoredValue);
}

var totalValue = scale * (EquipmentEffectCache.Get(player, effectType, () =>
{
if (allValues.Count == 0)
{
return null;
}

return GetEffectDiminishingReturnsTotalValue(allValues, effectType);
}) ?? 0);

return totalValue;
}

Expand Down
21 changes: 16 additions & 5 deletions EpicLoot/MagicItemEffects/AvoidDamageTaken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,24 @@ private static bool Prefix(Character __instance, HitData hit)
var attacker = hit.GetAttacker();
if (__instance is Player player && attacker != null && attacker != __instance)
{
var avoidanceChance = 0f;
ModifyWithLowHealth.Apply(player, MagicEffectType.AvoidDamageTaken, effect =>
var avoidancePercent = player.GetTotalActiveMagicEffectValue(MagicEffectType.AvoidDamageTaken, 1.0f);
var avoidancePercentLowHealth = ModifyWithLowHealth.PlayerHasLowHealth(player) ? player.GetTotalActiveMagicEffectValue(MagicEffectType.AvoidDamageTakenLowHealth, 1.0f) : 0.0f;

float min, max;
if(avoidancePercent > avoidancePercentLowHealth)
{
min = avoidancePercentLowHealth;
max = avoidancePercent;
}
else
{
avoidanceChance += player.GetTotalActiveMagicEffectValue(effect, 0.01f);
});
min = avoidancePercent;
max = avoidancePercentLowHealth;
}

float avoidanceChance = (max + (100.0f - max) * min * 0.01f) * 0.01f;

return !(Random.Range(0f, 1f) < avoidanceChance);
return !(Random.Range(0f, 1f) < avoidanceChance);
}

return true;
Expand Down
38 changes: 19 additions & 19 deletions EpicLoot/MagicItemEffects/ModifyResistance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,29 @@ public static void Prefix(Character __instance, HitData hit)
return;
}

float sum(params string[] effects)
{
float value = 1;
foreach (var effect in effects)
{
value -= player.GetTotalActiveMagicEffectValue(effect, 0.01f);
}
float resultingDamageCoeff(string eff1, string eff2)
{
float totalSum = PlayerExtensions.GetEffectDiminishingReturnsTotalValue(new List<float>()
{
player.GetTotalActiveMagicEffectValue(eff1, 0.01f),
player.GetTotalActiveMagicEffectValue(eff2, 0.01f)
});

return Math.Max(value, 0);
}
return 1.0f - totalSum;
}

// elemental resistances
hit.m_damage.m_fire *= sum(MagicEffectType.AddFireResistancePercentage, MagicEffectType.AddElementalResistancePercentage);
hit.m_damage.m_frost *= sum(MagicEffectType.AddFrostResistancePercentage, MagicEffectType.AddElementalResistancePercentage);
hit.m_damage.m_lightning *= sum(MagicEffectType.AddLightningResistancePercentage, MagicEffectType.AddElementalResistancePercentage);
hit.m_damage.m_poison *= sum(MagicEffectType.AddPoisonResistancePercentage, MagicEffectType.AddElementalResistancePercentage);
hit.m_damage.m_spirit *= sum(MagicEffectType.AddSpiritResistancePercentage, MagicEffectType.AddElementalResistancePercentage);
// elemental resistances
hit.m_damage.m_fire *= resultingDamageCoeff(MagicEffectType.AddFireResistancePercentage, MagicEffectType.AddElementalResistancePercentage);
hit.m_damage.m_frost *= resultingDamageCoeff(MagicEffectType.AddFrostResistancePercentage, MagicEffectType.AddElementalResistancePercentage);
hit.m_damage.m_lightning *= resultingDamageCoeff(MagicEffectType.AddLightningResistancePercentage, MagicEffectType.AddElementalResistancePercentage);
hit.m_damage.m_poison *= resultingDamageCoeff(MagicEffectType.AddPoisonResistancePercentage, MagicEffectType.AddElementalResistancePercentage);
hit.m_damage.m_spirit *= resultingDamageCoeff(MagicEffectType.AddSpiritResistancePercentage, MagicEffectType.AddElementalResistancePercentage);

// physical resistances
hit.m_damage.m_blunt *= sum(MagicEffectType.AddBluntResistancePercentage, MagicEffectType.AddPhysicalResistancePercentage);
hit.m_damage.m_slash *= sum(MagicEffectType.AddSlashingResistancePercentage, MagicEffectType.AddPhysicalResistancePercentage);
hit.m_damage.m_pierce *= sum(MagicEffectType.AddPiercingResistancePercentage, MagicEffectType.AddPhysicalResistancePercentage);
hit.m_damage.m_chop *= sum(MagicEffectType.AddChoppingResistancePercentage, MagicEffectType.AddPhysicalResistancePercentage);
hit.m_damage.m_blunt *= resultingDamageCoeff(MagicEffectType.AddBluntResistancePercentage, MagicEffectType.AddPhysicalResistancePercentage);
hit.m_damage.m_slash *= resultingDamageCoeff(MagicEffectType.AddSlashingResistancePercentage, MagicEffectType.AddPhysicalResistancePercentage);
hit.m_damage.m_pierce *= resultingDamageCoeff(MagicEffectType.AddPiercingResistancePercentage, MagicEffectType.AddPhysicalResistancePercentage);
hit.m_damage.m_chop *= resultingDamageCoeff(MagicEffectType.AddChoppingResistancePercentage, MagicEffectType.AddPhysicalResistancePercentage);
}
}
}
3 changes: 2 additions & 1 deletion EpicLoot/MagicItemEffects/ReduceWeight.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using HarmonyLib;
using System;

namespace EpicLoot.MagicItemEffects
{
Expand All @@ -14,7 +15,7 @@ public static void Postfix(ItemDrop.ItemData __instance, ref float __result)
}
else if (__instance.HasMagicEffect(MagicEffectType.ReduceWeight))
{
var totalWeightReduction = __instance.GetMagicItem().GetTotalEffectValue(MagicEffectType.ReduceWeight, 0.01f);
var totalWeightReduction = Math.Min(__instance.GetMagicItem().GetTotalEffectValue(MagicEffectType.ReduceWeight, 0.01f), 1.0f);
__result *= 1.0f - totalWeightReduction;
}
}
Expand Down
5 changes: 3 additions & 2 deletions EpicLoot/TextsDialog_Patch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using EpicLoot.Adventure;
Expand Down Expand Up @@ -55,7 +56,7 @@ public static void AddMagicEffectsPage(TextsDialog textsDialog, Player player)
{
var effectType = entry.Key;
var effectDef = MagicItemEffectDefinitions.Get(effectType);
var sum = entry.Value.Sum(x => x.Key.EffectValue);
float sum = (float)Math.Round(PlayerExtensions.GetEffectDiminishingReturnsTotalValue(entry.Value.Select(x => x.Key.EffectValue).ToList(), effectType));
var totalEffectText = MagicItem.GetEffectText(effectDef, sum);
var highestRarity = (ItemRarity) entry.Value.Max(x => (int) x.Value.GetRarity());

Expand Down