Skip to content

quick dirty fix for 0 armor error logging #4526

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
SaltyKarl wants to merge 4 commits into
base: Development
Choose a base branch
from
Open

quick dirty fix for 0 armor error logging #4526

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62a1321
Update ArmorUtilityCE.cs
SaltyKarl Mar 25, 2026
c6cbc9d
Update ArmorUtilityCE.cs
SaltyKarl Mar 25, 2026
58ec0e4
Update ArmorUtilityCE.cs
SaltyKarl Mar 27, 2026
761b932
Update ArmorUtilityCE.cs
SaltyKarl Mar 27, 2026
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
10 changes: 8 additions & 2 deletions Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using RimWorld;
Expand Down Expand Up @@ -351,7 +351,13 @@ private static bool TryPenetrateArmor(DamageDef def, float armorAmount, ref floa
{
if (penAmount == 0 || armorAmount == 0)
{
if (armor.GetStatValue(StatDefOf.ArmorRating_Sharp) == 0 && armor.GetStatValue(StatDefOf.ArmorRating_Blunt) == 0 && armor.GetStatValue(StatDefOf.ArmorRating_Heat) == 0)
// Skip error logging for utility stuff
var layers = armor.def.apparel?.layers;
bool isUtilityApparel = layers?.Count == 1 &&
(layers[0] == CE_ApparelLayerDefOf.StrappedHead ||
layers[0] == CE_ApparelLayerDefOf.Webbing ||
layers[0] == CE_ApparelLayerDefOf.Backpack);
if (!isUtilityApparel && armor.GetStatValue(StatDefOf.ArmorRating_Sharp) == 0 && armor.GetStatValue(StatDefOf.ArmorRating_Blunt) == 0 && armor.GetStatValue(StatDefOf.ArmorRating_Heat) == 0)
{
Log.ErrorOnce($"penAmount or armorAmount are zero for {def.armorCategory} on {armor}", armor.def.GetHashCode() + 846532021);
}
Expand Down
Loading