Remove redundant partial armor display stat

CombatExtended-Continued · Nov 12, 2024 · 0b775ba · 0b775ba
1 parent 85e7359
commit 0b775ba
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 163 deletions.
diff --git a/Defs/Stats/Stats_Pawns_Combat.xml b/Defs/Stats/Stats_Pawns_Combat.xml
@@ -287,12 +287,6 @@
 	</StatDef>
 
 	<!-- Only displays information -->
-	<StatDef ParentName="BodyPartDensity">
-		<defName>PartialArmorBody</defName>
-		<description>Special armor values for certain bodyparts</description>
-		<label>Natural armor</label>
-		<workerClass>CombatExtended.StatWorker_ArmorPartial</workerClass>
-	</StatDef>
 
 	<StatDef ParentName="BodyPartDensity">
 		<defName>BodyPartSharpArmor</defName>

diff --git a/Defs/ThingDefs_Races/Tytan.xml b/Defs/ThingDefs_Races/Tytan.xml
@@ -12,7 +12,6 @@
           <ArmorRating_Heat>1</ArmorRating_Heat>
           <ArmorRating_Electric>0.85</ArmorRating_Electric>
           <PsychicSensitivity>0.75</PsychicSensitivity>
-          <PartialArmorBody>0</PartialArmorBody>
           <CarryWeight>600</CarryWeight>
           <CarryBulk>600</CarryBulk>
           <AimingAccuracy>1.0</AimingAccuracy>

diff --git a/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml b/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml
@@ -42,11 +42,6 @@
   <!-- EN: Base chance to parry a melee attack. When a parry is performed the equipped weapon or shield will take damage instead of the wielder. If the parrying pawn passes a critical chance check they will automatically riposte their attacker.\nThe final chance depends on the opponent's parry skill and equal opponents will always have a 20% chance to parry. The internal formula is:\n\nFinalParryChance = ClampBetweenZeroAndOne(0.2 + DefenderParryChance - AttackerParryChance * (1 + AttackerWeaponMeleeCounterParryBonus)*100%\n\nA pawn that is better skilled in parrying takes less damage from parrying while unarmed and is better at reducing damage taken by their weapon on parry. -->
   <MeleeParryChance.description>挡住近战攻击的几率。当格挡时，装备的武器或盾牌将受到伤害，而不是持用者。如果格挡着成功格挡，他们将自动回击攻击者。\n\n最终的几率取决于对手的招架技能，同等对手将始终有20%的几率格挡。</MeleeParryChance.description>
 
-  <!-- EN: Natural armor -->
-  <PartialArmorBody.label>天然护甲</PartialArmorBody.label>
-  <!-- EN: Special armor values for certain bodyparts -->
-  <PartialArmorBody.description>各种身体部件的特殊护甲值</PartialArmorBody.description>
-
   <!-- EN: reload speed -->
   <ReloadSpeed.label>换弹速度</ReloadSpeed.label>
   <!-- EN: The speed at which firearms are reloaded. -->

diff --git a/...s/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml b/...s/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml
@@ -32,10 +32,4 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="AA_AlphaBaseInsect" or @Name="BaseInsect2"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
 </Patch>
diff --git a/...a Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml b/...a Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml
@@ -50,6 +50,34 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="AA_Slurrypede"]</xpath>
+		<value>
+			<li Class="CombatExtended.PartialArmorExt">
+				<stats>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+						<parts>
+							<li>SightSensor</li>
+							<li>HearingSensor</li>
+							<li>SmellSensor</li>
+						</parts>
+					</li>
+					<li>
+						<useStatic>false</useStatic>
+						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+						<parts>
+							<li>SightSensor</li>
+							<li>HearingSensor</li>
+							<li>SmellSensor</li>
+						</parts>
+					</li>
+				</stats>
+			</li>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationConditional">
 		<xpath>Defs/ThingDef[defName="AA_Slurrypede"]/comps</xpath>
 		<nomatch Class="PatchOperationAdd">

diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml
@@ -59,13 +59,6 @@
 					</value>
 				</li>
 
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[@Name="AG_BaseInsect"]/statBases</xpath>
-					<value>
-						<PartialArmorBody>0</PartialArmorBody>
-					</value>
-				</li>
-
 				<!-- ======= Eye Projectile ======= -->
 
 				<li Class="PatchOperationAdd">

diff --git a/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml b/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<!--Consistency with vanilla mechs-->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases</xpath>

diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<!--Consistency with vanilla mechs-->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases</xpath>

diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<!--Consistency with vanilla mechs-->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases</xpath>

diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<!--Consistency with vanilla mechs-->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases</xpath>

diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<!--Consistency with vanilla mechs-->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases</xpath>

diff --git a/...Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml b/...Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<!--Consistency with vanilla mechs-->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases</xpath>

diff --git a/...World - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml b/...World - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml
@@ -25,13 +25,6 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="WMH_InsectoidMonsterBase"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/ThingDef[defName="WMAux_KikimoreWorker"]</xpath>
 		<value>

diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml
@@ -105,13 +105,6 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="Mutant_Ogron"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Mutant_Ogron"]/tools</xpath>
 		<value>

diff --git a/...ls/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml b/...ls/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml
@@ -25,11 +25,4 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="VAEWaste_BaseInsect"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 </Patch>
diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml
@@ -34,11 +34,4 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="VFEI2_BaseInsect"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 </Patch>
diff --git a/...hanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml b/...hanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml
@@ -49,13 +49,6 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="BaseVFEMachine"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[
 			defName="VFE_Mechanoids_Autocleaner" or

diff --git a/...anoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml b/...anoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml
@@ -51,13 +51,6 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="VFE_Mechanoid"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<!--Consistency with vanilla mechs-->
 
 	<Operation Class="PatchOperationReplace">

diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml
@@ -194,12 +194,6 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="Cow"]/statBases</xpath>
-		<value>
-				Value here does nothing, this whole thing is only used for display of info
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
 	</Operation>-->
 
 	<!-- ========== Alpaca ========== -->

diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml
@@ -36,13 +36,6 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="BaseInsect"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<!-- ========== Megascarab ========== -->
 
 	<Operation Class="PatchOperationReplace">

diff --git a/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml b/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml
@@ -110,13 +110,6 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="BaseMechanoid"]/statBases</xpath>
-		<value>
-			<PartialArmorBody>0</PartialArmorBody>
-		</value>
-	</Operation>
-
 	<!-- ========== Centipede ========== -->
 
 	<Operation Class="PatchOperationAddModExtension">

diff --git a/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_ArmorPartial.cs b/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_ArmorPartial.cs
@@ -227,39 +227,5 @@ public override string GetStatDrawEntryLabel(StatDef stat, float value, ToString
             return base.GetStatDrawEntryLabel(stat, value, numberSense, optionalReq, finalized);
         }
 
-        public override string ValueToString(float val, bool finalized, ToStringNumberSense numberSense = ToStringNumberSense.Absolute)
-        {
-            if (this.stat.defName == "PartialArmorBody")
-            {
-                return "Hover over";
-            }
-            return base.ValueToString(val, finalized, numberSense);
-        }
-
-        public override bool ShouldShowFor(StatRequest req)
-        {
-            if (!(req.Def is ThingDef))
-            {
-                return false;
-            }
-
-            if (((ThingDef)req.Def)?.IsApparel ?? req.Thing?.def?.IsApparel ?? false)
-            {
-                return this.stat.defName != "PartialArmorBody";
-            }
-            else if (req.Thing is Pawn)
-            {
-                if (req.Thing.def.HasModExtension<PartialArmorExt>())
-                {
-                    return true;
-                }
-                else
-                {
-                    return this.stat.defName != "PartialArmorBody";
-                }
-            }
-            return false;
-
-        }
     }
 }