Skip to content

Commit

Permalink
Merge pull request #3546 from CombatExtended-Continued/PartialArmorCl…
Browse files Browse the repository at this point in the history 
…eanup

Clean up useStatic tags on Partial Armor
  • Loading branch information
@N7Huntsman
N7Huntsman authored Nov 12, 2024
2 parents 621f7f5 + e0ba026 commit 313abf0
Show file tree
Hide file tree
Showing 18 changed files with 2 additions and 46 deletions.
2 changes: 0 additions & 2 deletions ...Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,13 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
<parts>
<li>AA_LeftPincer</li>
<li>AA_RightPincer</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
<parts>
<li>AA_LeftPincer</li>
Expand Down
2 changes: 0 additions & 2 deletions ...s/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>InsectLeg</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>InsectLeg</li>
Expand Down
4 changes: 0 additions & 4 deletions ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>InsectLeg</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>InsectLeg</li>
Expand All @@ -39,15 +37,13 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
<parts>
<li>AG_LeftPincer</li>
<li>AG_RightPincer</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
<parts>
<li>AG_LeftPincer</li>
Expand Down
7 changes: 0 additions & 7 deletions ...Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,18 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>SightSensor</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>SightSensor</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
<parts>
<li>MGR_SyntheticalLeg</li>
Expand All @@ -127,28 +124,24 @@
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
<parts>
<li>MechanicalFoot</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
<parts>
<li>MechanicalFoot</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
<parts>
<li>PowerClaw</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
<parts>
<li>PowerClaw</li>
Expand Down
2 changes: 0 additions & 2 deletions ...World - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>InsectLeg</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>InsectLeg</li>
Expand Down
2 changes: 0 additions & 2 deletions ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>Eye</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>Eye</li>
Expand Down
2 changes: 0 additions & 2 deletions ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,13 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>Leg</li>
<li>Paw</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>Leg</li>
Expand Down
2 changes: 0 additions & 2 deletions ...ls/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>InsectLeg</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>InsectLeg</li>
Expand Down
2 changes: 0 additions & 2 deletions ...hes/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,13 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
<parts>
<li>VAEWaste_LeftPincer</li>
<li>VAEWaste_RightPincer</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
<parts>
<li>VAEWaste_LeftPincer</li>
Expand Down
2 changes: 0 additions & 2 deletions ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
<parts>
<li>Leg</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
<parts>
<li>Leg</li>
Expand Down
2 changes: 0 additions & 2 deletions ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>InsectLeg</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>InsectLeg</li>
Expand Down
2 changes: 0 additions & 2 deletions ...hanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>SightSensor</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>SightSensor</li>
Expand Down
2 changes: 0 additions & 2 deletions ...anoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>SightSensor</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>SightSensor</li>
Expand Down
6 changes: 0 additions & 6 deletions ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,42 +267,36 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>SightSensor</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>SightSensor</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
<parts>
<li>MechanicalHead</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
<parts>
<li>MechanicalHead</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.625</ArmorRating_Sharp>
<parts>
<li>MechanicalLeg</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.625</ArmorRating_Blunt>
<parts>
<li>MechanicalLeg</li>
Expand Down
3 changes: 2 additions & 1 deletion Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@
<stats>
<li>
<useStatic>true</useStatic>
When useStatic is true, this becomes the value used and it is NOT influenced by durability, health and similar
When useStatic is 'true', this becomes the value used and it is NOT influenced by durability, health and similar,
The default value is 'false'.
<ArmorRating_Sharp>4</ArmorRating_Sharp>
<parts>
<li>Neck</li>
Expand Down
2 changes: 0 additions & 2 deletions Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>InsectLeg</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>InsectLeg</li>
Expand Down
2 changes: 0 additions & 2 deletions Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,12 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
<parts>
<li>Leg</li>
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.5</ArmorRating_Blunt>
<parts>
<li>Leg</li>
Expand Down
2 changes: 0 additions & 2 deletions Patches/Core/ThingDefs_Races/Races_Mechanoid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
<li Class="CombatExtended.PartialArmorExt">
<stats>
<li>
<useStatic>false</useStatic>
<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
<parts>
<li>SightSensor</li>
Expand All @@ -101,7 +100,6 @@
</parts>
</li>
<li>
<useStatic>false</useStatic>
<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
<parts>
<li>SightSensor</li>
Expand Down

0 comments on commit 313abf0

Please sign in to comment.