Skip to content

Fixed issue with damage reduction imporoperly displaying in the Mechbay #218

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

Merged
CptMoore merged 4 commits into from
Aug 5, 2024
Merged

Fixed issue with damage reduction imporoperly displaying in the Mechbay #218

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e5f8c7
Updated tooltips to correctly display durability
Vek17 Aug 4, 2024
f15148b
Update source/Features/OverrideStatTooltips/Stats/DurabilityStat.cs
Vek17 Aug 4, 2024
ecb9a56
Update source/Features/OverrideStatTooltips/Stats/DurabilityStat.cs
Vek17 Aug 4, 2024
bcb5f16
Updated formatting
Vek17 Aug 5, 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
9 changes: 4 additions & 5 deletions source/Features/OverrideStatTooltips/Stats/DurabilityStat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using BattleTech;
using BattleTech;
using Localize;
using MechEngineer.Features.ArmorStructureChanges;
using MechEngineer.Features.OverrideStatTooltips.Helper;
Expand All @@ -13,13 +13,12 @@ public void SetupTooltip(StatTooltipData tooltipData, MechDef mechDef)
{
var value = mechDef.MechDefAssignedArmor;
value *= ArmorMultiplier(mechDef);
value *= DamageReductionMultiplierAll(mechDef);
tooltipData.dataList.Add("<u>" + Strings.T("Armor") + "</u>", $"{value}");
}

{
var value = DamageReductionMultiplierAll(mechDef);
tooltipData.dataList.Add("<u>" + Strings.T("Damage Reduction") + "</u>", Strings.T("{0} %", value));
var reduction = 1 - DamageReductionMultiplierAll(mechDef);
tooltipData.dataList.Add("<u>" + Strings.T("Damage Reduction") + "</u>", Strings.T("{0:P0}", reduction));
/*
<float>("DamageReductionMultiplierAll", 1f);
<float>("DamageReductionMultiplierMelee", 1f);
Expand Down Expand Up @@ -69,7 +68,7 @@ public float BarValue(MechDef mechDef)
{
var armor = mechDef.MechDefAssignedArmor;
armor *= ArmorMultiplier(mechDef);
armor *= DamageReductionMultiplierAll(mechDef);
armor /= DamageReductionMultiplierAll(mechDef);

var stats = UnityGameInstance.BattleTechGame.MechStatisticsConstants;
return MechStatUtils.NormalizeToFraction(armor, 0, stats.MaxArmorFactor);
Expand Down