From ea61f97a7e23b15706f6c56342c02c76c384981e Mon Sep 17 00:00:00 2001
From: AsmodeusRex <dark.song2667@fastmail.com>
Date: Fri, 4 Nov 2022 11:35:16 -0700
Subject: [PATCH] Tweak formatting

---
 Content/Base/Defs/_Extra_Races.xml | 105 ++++++++++++-----------------
 Content/Base/Patches/KMH_Patch.xml |   1 -
 2 files changed, 43 insertions(+), 63 deletions(-)

diff --git a/Content/Base/Defs/_Extra_Races.xml b/Content/Base/Defs/_Extra_Races.xml
index c9e2327..9400647 100644
--- a/Content/Base/Defs/_Extra_Races.xml
+++ b/Content/Base/Defs/_Extra_Races.xml
@@ -1,24 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
-	<!-- Humanoid -->
 	<rjw.RaceGroupDef>
-		<defName>NoPartsHumanoidRace</defName>
+		<defName>NoPartsGroup</defName>
 		<raceNames>
+			<li>AA_AcanthamoebaGiganteaSmall</li>
+			<li>AA_AcanthamoebaGiganteaLarge</li>
+			<li>AA_AcanthamoebaGiganteaHuge</li>
+			<li>AA_Aerofleet</li>
+			<li>AA_ColossalAerofleet</li>
+			<li>AA_Eyeling</li>
+			<li>AA_FungalHusk</li>
+			<li>AA_GreenGoo</li>
+			<li>AA_InfectedAerofleet</li>
+			<li>AA_MatureFleshbeast</li>
+			<li>AA_MycoidColossus</li>
+			<li>AA_OcularJelly</li>
+			<li>AA_RedGoo</li>
+			<li>AA_RedSpore</li>
+			<li>AA_Slurrypede</li>
+			<li>AA_TeratogenicOriginator</li>
+			<li>AA_TetraSlug</li>
+			<li>AA_WaywardMobileAssembler</li>
+			<li>AA_Wildpawn</li>
+			<li>AA_Wildpod</li>
+			<li>Cults_FormlessSpawnRace</li>
+			<li>GR_AberrantFleshbeast</li>
+			<li>GR_Fleshling</li>
+			<li>GR_FleshMonstrosity</li>
+			<li>GR_FleshGrowth</li>
+			<li>GR_FleshFlies</li>
+			<li>SPBoats_Caravel</li>
+			<li>SPBoats_FishingBoat</li>
+			<li>SPBoats_Galleon</li>
+			<li>SPBoats_PaddleSteamer</li>
+			<li>SPBoats_RowBoat</li>
+			<li>WMH_Bearofleet</li>
+			<li>WMH_Djinn</li>
+			<li>WMH_Hym</li>
+			<li>Yokai_HinoKo</li>
+			<li>Yokai_Hodama</li>
+			<li>Yokai_Nurikabe</li>
+			<li>Yokai_Tukumo</li>
 			<li>Alien_Zoltan</li>
 		</raceNames>
-		<anuses></anuses>
+		<anuses />
 		<femaleBreasts />
 		<femaleGenitals />
 		<maleBreasts />
 		<maleGenitals />
-		<tags>
-			<li>Skin</li>
-		</tags>
+		<tags />
+		<hasSingleGender>true</hasSingleGender>
 		<hasSexNeed>false</hasSexNeed>
 		<hasFertility>false</hasFertility>
 		<hasPregnancy>false</hasPregnancy>
 	</rjw.RaceGroupDef>
 
+	<!-- Humanoid -->
 	<rjw.RaceGroupDef>
 		<defName>DemonRace</defName>
 		<raceNames>
@@ -298,62 +335,6 @@
 	</rjw.RaceGroupDef>
 
 	<!-- Animal -->
-	<rjw.RaceGroupDef>
-		<defName>NoPartsAnimals</defName>
-		<raceNames>
-			<li>AA_AcanthamoebaGiganteaSmall</li>
-			<li>AA_AcanthamoebaGiganteaLarge</li>
-			<li>AA_AcanthamoebaGiganteaHuge</li>
-			<li>AA_Aerofleet</li>
-			<li>AA_ColossalAerofleet</li>
-			<li>AA_Eyeling</li>
-			<li>AA_FungalHusk</li>
-			<li>AA_GreenGoo</li>
-			<li>AA_InfectedAerofleet</li>
-			<li>AA_MatureFleshbeast</li>
-			<li>AA_MycoidColossus</li>
-			<li>AA_OcularJelly</li>
-			<li>AA_RedGoo</li>
-			<li>AA_RedSpore</li>
-			<li>AA_Slurrypede</li>
-			<li>AA_TeratogenicOriginator</li>
-			<li>AA_TetraSlug</li>
-			<li>AA_WaywardMobileAssembler</li>
-			<li>AA_Wildpawn</li>
-			<li>AA_Wildpod</li>
-			<li>Cults_FormlessSpawnRace</li>
-			<li>GR_AberrantFleshbeast</li>
-			<li>GR_Fleshling</li>
-			<li>GR_FleshMonstrosity</li>
-			<li>GR_FleshGrowth</li>
-			<li>GR_FleshFlies</li>
-			<li>SPBoats_Caravel</li>
-			<li>SPBoats_FishingBoat</li>
-			<li>SPBoats_Galleon</li>
-			<li>SPBoats_PaddleSteamer</li>
-			<li>SPBoats_RowBoat</li>
-			<li>WMH_Bearofleet</li>
-			<li>WMH_Djinn</li>
-			<li>WMH_Hym</li>
-			<li>Yokai_HinoKo</li>
-			<li>Yokai_Hodama</li>
-			<li>Yokai_Nurikabe</li>
-			<li>Yokai_Tukumo</li>
-		</raceNames>
-		<anuses />
-		<femaleBreasts />
-		<femaleGenitals />
-		<maleBreasts />
-		<maleGenitals />
-		<tags>
-			<li>Slime</li>
-		</tags>
-		<hasSingleGender>true</hasSingleGender>
-		<hasSexNeed>false</hasSexNeed>
-		<hasFertility>false</hasFertility>
-		<hasPregnancy>false</hasPregnancy>
-	</rjw.RaceGroupDef>
-
 	<rjw.RaceGroupDef>
 		<defName>ArchotechRobotAnimal</defName>
 		<raceNames>
diff --git a/Content/Base/Patches/KMH_Patch.xml b/Content/Base/Patches/KMH_Patch.xml
index b7917f6..77464a8 100644
--- a/Content/Base/Patches/KMH_Patch.xml
+++ b/Content/Base/Patches/KMH_Patch.xml
@@ -10,7 +10,6 @@
 				<li>GenderBalancer</li>
 			</mods>
 			<match Class="PatchOperationSequence">
-				<success>Normal</success>
 				<operations>
 					<li Class="PatchOperationRemove">
 						<xpath>Defs/ThingDef[defName="hana" or defName="kon" or defName="siro" or defName="yuki" or defName="kohime" or defName="kuro" or defName="aome" or defName="akame" or defName="miko"]/race/hasGenders</xpath>