Merge pull request #3551 from CombatExtended-Continued/Housekeeping

Housekeeping
CombatExtended-Continued · Nov 16, 2024 · 547bf00 · 547bf00
2 parents 477abc8 + fe33ea5
commit 547bf00
Show file tree

Hide file tree

Showing 69 changed files with 8 additions and 278 deletions.
diff --git a/LoadFolders.xml b/LoadFolders.xml
@@ -70,6 +70,7 @@
 		<li IfModActive="automatic.autocleaner">ModPatches/Autocleaner</li>
 		<li IfModActive="Heymyteamrules.BeastManTribes">ModPatches/Beast Man Tribes</li>
 		<li IfModActive="Mlem.beeralope">ModPatches/Beeralope Squad</li>
+		<li IfModActive="ElSov.Beliar">ModPatches/Beliar Xenotype</li>
 		<li IfModActive="divineDerivative.AutoWool">ModPatches/Better Wool Production</li>
 		<li IfModActive="RedMattis.Heaven">ModPatches/Big and Small - Heaven and Hell</li>
 		<li IfModActive="RedMattis.BigSmall.MedievalOverhaulFactions">ModPatches/Big and Small - MO</li>
@@ -141,6 +142,7 @@
 		<li IfModActive="Rabbit.Hovercar">ModPatches/Edge of Descension - Hovercraft</li>
 		<li IfModActive="Rabbit.EdgeOfDescension">ModPatches/Edge of Descension - Monoblades</li>
 		<li IfModActive="Rabbit.EoDVanguard">ModPatches/Edge of Descension - Vanguard</li>
+		<li IfModActive="heis.edo.themed.expansion">ModPatches/EdoThemedExpansion</li>
 		<li IfModActive="Nazgul.EisenhansPowerArmor">ModPatches/Eisenhans Power Armor</li>
 		<li IfModActive="Macca.eltexsuit">ModPatches/Eltex Bodysuit</li>
 		<li IfModActive="BlackMarket420.EnchantedSword">ModPatches/Enchanted Sword</li>
@@ -254,6 +256,7 @@
 		<li IfModActive="handandfootwear.kv.rw">ModPatches/KV Hand n Footwear</li>
 		<li IfModActive="ALIEN.KaiserArmory">ModPatches/Kaiser Armory</li>
 		<li IfModActive="psyche.kemomimihouse">ModPatches/Kemomimihouse</li>
+		<li IfModActive="Moo.kemomimihouse.Kz">ModPatches/kemomimihouse Kz</li>
 		<li IfModActive="Kenshi.Armory.Geminingen, biowreck.KenshiArmory">ModPatches/Kenshi Armory</li>
 		<li IfModActive="ssulunge.KijinRace3">ModPatches/Kijin 3.0</li>
 		<li IfModActive="RicoFox233.KLKApparel">ModPatches/Kill la Kill Styles Pack</li>
@@ -380,6 +383,10 @@
 		<li IfModActive="milk.poleepkwaupdate, GHOST.Poleepkwa">ModPatches/Poleepkwa Race</li>
 		<li IfModActive="BotchJob.PossessedWeapons">ModPatches/Possessed Weapons</li>
 		<li IfModActive="JangoDsoul.T45b.PowerArmor">ModPatches/PowerArmour T-45b</li>
+		<li IfModActive="pphhyy.DemigryphsMod">ModPatches/pphhyy Demigryph</li>
+		<li IfModActive="pphhyy.ExpandedMechsScyther">ModPatches/pphhyy Expanded Scythers</li>
+		<li IfModActive="pphhyy.LightlessEmpyrean">ModPatches/pphhyy's Lightless Empyrean</li>
+		<li IfModActive="pphhyy.SanguinaryAnimals">ModPatches/pphhyy Sanguinary Animals</li>
 		<li IfModActive="Pratt.RaW.WWIIWeaponsPackVanilla">ModPatches/Pratt WWII Weapons Pack</li>
 		<li IfModActive="PrestigePhoenix.maltum">ModPatches/Prestige Specialist Armor</li>
 		<li IfModActive="botchjob.profaned">ModPatches/Profaned</li>
@@ -493,7 +500,7 @@
 		<li IfModActive="Rottweiler.SimplyMoreMelee, Mlie.SimplyMoreMelee">ModPatches/Simply More Melee</li>
 		<li IfModActive="PunkyRoo.SlimeRancher">ModPatches/Slime Rancher</li>
 		<li IfModActive="Ayameduki.HARSolark">ModPatches/Solark Race</li>
-    <li IfModActive="det.spacerarsenal">ModPatches/Spacer Arsenal</li>
+		<li IfModActive="det.spacerarsenal">ModPatches/Spacer Arsenal</li>
 		<li IfModActive="notdvd.spacerpack">ModPatches/Spacer Pack</li>
 		<li IfModActive="LTS.PS">ModPatches/Spacer Shields</li>
 		<li IfModActive="Mlie.SpaceWorms">ModPatches/Spaceworm</li>
@@ -625,13 +632,6 @@
 		<li IfModActive="Ayameduki.HARXenoorca">ModPatches/Xenoorca Race</li>
 		<li IfModActive="MrKociak.YetAnotherProstheticExpansionModCore">ModPatches/YetAnotherProsthetics - Core</li>
 		<li IfModActive="brrainz.zombieland">ModPatches/Zombieland</li>
-		<li IfModActive="Moo.kemomimihouse.Kz">ModPatches/kemomimihouse Kz</li>
-		<li IfModActive="pphhyy.DemigryphsMod">ModPatches/pphhyy Demigryph</li>
-		<li IfModActive="pphhyy.ExpandedMechsScyther">ModPatches/pphhyy Expanded Scythers</li>
-		<li IfModActive="pphhyy.SanguinaryAnimals">ModPatches/pphhyy Sanguinary Animals</li>
-		<li IfModActive="pphhyy.LightlessEmpyrean">ModPatches/pphhyy's Lightless Empyrean</li>
-		<li IfModActive="heis.edo.themed.expansion">ModPatches/EdoThemedExpansion</li>
-    <li IfModActive="ElSov.Beliar">ModPatches/Beliar Xenotype</li>
 		<!-- Mod Patches (Assemblies) -->
 		<li IfModActive="rwmt.Multiplayer">ModPatches/Multiplayer</li>
 		<li IfModActive="smashphil.neceros.srtsexpanded">ModPatches/SRTS</li>

diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml
@@ -101,7 +101,6 @@
 			def="Foot" or
 			def="Toe"]/groups
 		</xpath>
-
 		<value>
 			<li>CoveredByNaturalArmor</li>
 		</value>

diff --git a/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml b/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml
@@ -37,7 +37,6 @@
 			def="RightDroidFoot"
 			]/groups
 		</xpath>
-
 		<value>
 			<li>CoveredByNaturalArmor</li>
 		</value>

diff --git a/...tches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml b/...tches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml
@@ -73,7 +73,6 @@
 				<canTargetLocations>true</canTargetLocations>
 			</targetParams>
 		</Properties>
-
 		<AmmoUser>
 			<magazineSize>240</magazineSize>
 			<reloadTime>7.8</reloadTime>
@@ -110,7 +109,6 @@
 			<soundCastTail>GunTail_Light</soundCastTail>
 			<muzzleFlashScale>9</muzzleFlashScale>
 		</Properties>
-
 		<AmmoUser>
 			<magazineSize>200</magazineSize>
 			<reloadTime>7.8</reloadTime>

diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml
@@ -185,7 +185,6 @@
 			<soundCastTail>GunTail_Heavy</soundCastTail>
 			<muzzleFlashScale>9</muzzleFlashScale>
 		</Properties>
-
 		<AmmoUser>
 			<magazineSize>18</magazineSize>
 			<reloadTime>4</reloadTime>
@@ -223,7 +222,6 @@
 			<soundCastTail>GunTail_Heavy</soundCastTail>
 			<muzzleFlashScale>9</muzzleFlashScale>
 		</Properties>
-
 		<AmmoUser>
 			<magazineSize>30</magazineSize>
 			<reloadTime>4</reloadTime>
@@ -261,7 +259,6 @@
 			<soundCastTail>GunTail_Heavy</soundCastTail>
 			<muzzleFlashScale>9</muzzleFlashScale>
 		</Properties>
-
 		<AmmoUser>
 			<magazineSize>30</magazineSize>
 			<reloadTime>4</reloadTime>
@@ -307,7 +304,6 @@
 				<canTargetLocations>true</canTargetLocations>
 			</targetParams>
 		</Properties>
-
 		<AmmoUser>
 			<magazineSize>120</magazineSize>
 			<reloadTime>7.8</reloadTime>
@@ -344,7 +340,6 @@
 				<canTargetLocations>true</canTargetLocations>
 			</targetParams>
 		</Properties>
-
 		<AmmoUser>
 			<magazineSize>6</magazineSize>
 			<reloadTime>4</reloadTime>
@@ -384,7 +379,6 @@
 			</targetParams>
 			<recoilPattern>Mounted</recoilPattern>
 		</Properties>
-
 		<AmmoUser>
 			<magazineSize>100</magazineSize>
 			<reloadTime>7.8</reloadTime>

diff --git a/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml
@@ -4,7 +4,6 @@
 	<!-- === Add ammo to scenario === -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ScenarioDef[defName="AstorielScenario"]/scenario/parts</xpath>
-
 		<value>
 			<li Class="ScenPart_StartingThing_Defined">
 				<def>StartingThing_Defined</def>

diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml
@@ -5,7 +5,6 @@
 
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/ThingDef[defName="BMT_DarkAxolotl"]</xpath>
-
 		<value>
 			<li Class="CombatExtended.RacePropertiesExtensionCE">
 				<bodyShape>Quadruped</bodyShape>
@@ -15,7 +14,6 @@
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="BMT_DarkAxolotl"]/statBases</xpath>
-
 		<value>
 			<MeleeDodgeChance>0.12</MeleeDodgeChance>
 			<MeleeCritChance>0.05</MeleeCritChance>
@@ -25,7 +23,6 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_DarkAxolotl"]/tools</xpath>
-
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">

diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml
@@ -3,7 +3,6 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/statBases/MoveSpeed</xpath>
-
 		<value>
 			<MoveSpeed>2.0</MoveSpeed>
 			<MeleeDodgeChance>0.04</MeleeDodgeChance>
@@ -14,23 +13,20 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/statBases/ArmorRating_Blunt</xpath>
-
 		<value>
 			<ArmorRating_Blunt>2</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/statBases/ArmorRating_Sharp</xpath>
-
 		<value>
 			<ArmorRating_Sharp>4</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Jellypot"]/tools</xpath>
-
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">

diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml
@@ -3,7 +3,6 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/statBases/MoveSpeed</xpath>
-
 		<value>
 			<MoveSpeed>7.5</MoveSpeed>
 			<MeleeDodgeChance>0.06</MeleeDodgeChance>
@@ -14,23 +13,20 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/statBases/ArmorRating_Blunt</xpath>
-
 		<value>
 			<ArmorRating_Blunt>3</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/statBases/ArmorRating_Sharp</xpath>
-
 		<value>
 			<ArmorRating_Sharp>3</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Megapleura"]/tools</xpath>
-
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">

diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml
@@ -3,7 +3,6 @@
 	<!-- === bodyShape === -->
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/ThingDef[defName="BMT_Mole"]</xpath>
-
 		<value>
 			<li Class="CombatExtended.RacePropertiesExtensionCE">
 				<bodyShape>QuadrupedLow</bodyShape>
@@ -13,7 +12,6 @@
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="BMT_Mole"]/statBases</xpath>
-
 		<value>
 			<MeleeDodgeChance>0.22</MeleeDodgeChance>
 			<MeleeCritChance>0.01</MeleeCritChance>
@@ -30,7 +28,6 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Mole"]/tools</xpath>
-
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">

diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml
@@ -3,7 +3,6 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Pillbug"]/statBases/MoveSpeed</xpath>
-
 		<value>
 			<MoveSpeed>2.3</MoveSpeed>
 			<MeleeDodgeChance>0.11</MeleeDodgeChance>
@@ -14,15 +13,13 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Pillbug"]/race/baseHealthScale</xpath>
-
 		<value>
 			<baseHealthScale>0.3</baseHealthScale>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Pillbug"]/tools</xpath>
-
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">

diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml
@@ -3,7 +3,6 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/statBases/MoveSpeed</xpath>
-
 		<value>
 			<MoveSpeed>2.5</MoveSpeed>
 			<MeleeDodgeChance>0.04</MeleeDodgeChance>
@@ -14,23 +13,20 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/statBases/ArmorRating_Blunt</xpath>
-
 		<value>
 			<ArmorRating_Blunt>4.65</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/statBases/ArmorRating_Sharp</xpath>
-
 		<value>
 			<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_PodWorm"]/tools</xpath>
-
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">

diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml
@@ -3,7 +3,6 @@
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="BMT_Yooka"]/statBases</xpath>
-
 		<value>
 			<MeleeDodgeChance>0.15</MeleeDodgeChance>
 			<MeleeCritChance>0.38</MeleeCritChance>
@@ -13,7 +12,6 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Yooka"]/tools</xpath>
-
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">

diff --git a/...atches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml b/...atches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml
@@ -3,7 +3,6 @@
 	<!-- === Dragon_Leather === -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Dragon_Leather"]/statBases/StuffPower_Armor_Sharp</xpath>
-
 		<value>
 			<StuffPower_Armor_Sharp>0.907</StuffPower_Armor_Sharp>
 		</value>
@@ -48,7 +47,6 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Rare_Dragon_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
-
 		<value>
 			<StuffPower_Armor_Heat>0.2</StuffPower_Armor_Heat>
 		</value>
@@ -79,7 +77,6 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="True_Dragon_Leather"]/statBases/StuffPower_Armor_Heat</xpath>
-
 		<value>
 			<StuffPower_Armor_Heat>0.226</StuffPower_Armor_Heat>
 		</value>

diff --git a/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml b/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml
@@ -134,7 +134,6 @@
 	<!--===== Dusk Saw =====-->
 	<Operation Class="PatchOperationReplace">
 		<xpath>/Defs/ThingDef[defName="DF_Dusk_Saw"]/tools</xpath>
-
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">

diff --git a/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml b/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml
@@ -4,7 +4,6 @@
 	<!-- === bodyShape === -->
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/ThingDef[defName="FoxSquirrel"]</xpath>
-
 		<value>
 			<li Class="CombatExtended.RacePropertiesExtensionCE">
 				<bodyShape>QuadrupedLow</bodyShape>
@@ -14,7 +13,6 @@
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="FoxSquirrel"]/statBases</xpath>
-
 		<value>
 			<MeleeDodgeChance>0.22</MeleeDodgeChance>
 			<MeleeCritChance>0.01</MeleeCritChance>
@@ -31,7 +29,6 @@
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="FoxSquirrel"]/tools</xpath>
-
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">