diff --git a/Defs/Stats/Stats_Pawns_Combat.xml b/Defs/Stats/Stats_Pawns_Combat.xml index 1acf76ecaa..a553b08739 100644 --- a/Defs/Stats/Stats_Pawns_Combat.xml +++ b/Defs/Stats/Stats_Pawns_Combat.xml @@ -287,12 +287,6 @@ - - PartialArmorBody - Special armor values for certain bodyparts - - CombatExtended.StatWorker_ArmorPartial - BodyPartSharpArmor diff --git a/Defs/ThingDefs_Races/Tytan.xml b/Defs/ThingDefs_Races/Tytan.xml index a768e17cac..a0ef647af8 100644 --- a/Defs/ThingDefs_Races/Tytan.xml +++ b/Defs/ThingDefs_Races/Tytan.xml @@ -12,7 +12,6 @@ 1 0.85 0.75 - 0 600 600 1.0 diff --git a/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml b/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml index d23e895670..ccffb28208 100644 --- a/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml +++ b/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml @@ -42,11 +42,6 @@ 挡住近战攻击的几率。当格挡时，装备的武器或盾牌将受到伤害，而不是持用者。如果格挡着成功格挡，他们将自动回击攻击者。\n\n最终的几率取决于对手的招架技能，同等对手将始终有20%的几率格挡。 - - 天然护甲 - - 各种身体部件的特殊护甲值 - 换弹速度 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml index d7c9873b61..a2688ce731 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml @@ -32,10 +32,4 @@ - - Defs/ThingDef[@Name="AA_AlphaBaseInsect" or @Name="BaseInsect2"]/statBases - - 0 - - \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml index 49b6b779d3..525fe1a8ec 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml @@ -50,6 +50,34 @@ + + Defs/ThingDef[defName="AA_Slurrypede"] + +
  • + +
  • + false + 0.25 + +
  • SightSensor
    • +
  • HearingSensor
    • +
  • SmellSensor
    • + + +
  • + false + 0.25 + +
  • SightSensor
    • +
  • HearingSensor
    • +
  • SmellSensor
    • + + + + +     +     + Defs/ThingDef[defName="AA_Slurrypede"]/comps 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 index 8064d195cd..a2ba9b5d40 100644 --- 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 @@ -
  • - Defs/ThingDef[@Name="AG_BaseInsect"]/statBases - - 0 - -
    • -
  • diff --git a/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml b/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml index 4ce7fbadc9..fc1c567390 100644 --- 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 @@ - - Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases - - 0 - - - Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases 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 index a2cf2e400f..03b2276723 100644 --- 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 @@ - - Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases - - 0 - - - Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases 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 index a3bbf7d5ab..11e1844934 100644 --- 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 @@ - - Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases - - 0 - - - Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases 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 index 13cdea17dd..46978291da 100644 --- 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 @@ - - Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases - - 0 - - - Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases 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 index 7c288948fd..ed1c717d2f 100644 --- 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 @@ - - Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases - - 0 - - - Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases diff --git a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml index 8ab91f96e4..ac5a1021cd 100644 --- a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml @@ -1,13 +1,6 @@ - - Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases - - 0 - - - Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml index 0f1b8a0a48..1b3ccf9d5c 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml @@ -25,13 +25,6 @@ - - Defs/ThingDef[@Name="WMH_InsectoidMonsterBase"]/statBases - - 0 - - - Defs/ThingDef[defName="WMAux_KikimoreWorker"] 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 index 19e055a76a..903e69ba4e 100644 --- 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 @@ - - Defs/ThingDef[defName="Mutant_Ogron"]/statBases - - 0 - - - Defs/ThingDef[defName="Mutant_Ogron"]/tools diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml index aa2383d794..40925244c0 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml @@ -25,11 +25,4 @@ - - Defs/ThingDef[@Name="VAEWaste_BaseInsect"]/statBases - - 0 - - - \ No newline at end of file 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 index ab10999032..45e0aee5d6 100644 --- 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 @@ - - Defs/ThingDef[@Name="VFEI2_BaseInsect"]/statBases - - 0 - - - \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml index ca8fbee2de..413285422d 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml @@ -49,13 +49,6 @@ - - Defs/ThingDef[@Name="BaseVFEMachine"]/statBases - - 0 - - - Defs/ThingDef[ defName="VFE_Mechanoids_Autocleaner" or diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml index 1d1b009e14..24e3edf391 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml @@ -51,13 +51,6 @@ - - Defs/ThingDef[@Name="VFE_Mechanoid"]/statBases - - 0 - - - diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml index ae7b978c2c..6b6298294f 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml @@ -194,12 +194,6 @@ - - Defs/ThingDef[defName="Cow"]/statBases - - Value here does nothing, this whole thing is only used for display of info - 0 - --> diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml index 8df09ef55a..c4968665f9 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml @@ -36,13 +36,6 @@ - - Defs/ThingDef[@Name="BaseInsect"]/statBases - - 0 - - - diff --git a/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml b/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml index c748dfb5d8..f49e1d431e 100644 --- a/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml +++ b/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml @@ -110,13 +110,6 @@ - - Defs/ThingDef[@Name="BaseMechanoid"]/statBases - - 0 - - - diff --git a/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_ArmorPartial.cs b/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_ArmorPartial.cs index 29caf43b07..675ad4b4f5 100644 --- 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()) - { - return true; - } - else - { - return this.stat.defName != "PartialArmorBody"; - } - } - return false; - - } } }