From 9887099d995d6d467f1c07b3ec38993cc3f1f174 Mon Sep 17 00:00:00 2001
From: AsmodeusRex <dark.song2667@fastmail.com>
Date: Sun, 30 Oct 2022 09:37:34 -0700
Subject: [PATCH] Clean up Revia support

---
 .vscode/settings.json                         |  1 +
 ...a_NymphKind_RJW.xml => Revia_PawnKind.xml} | 16 ++++---
 .../Mods/Revia/Revia_PawnKind_Herm_RJW.xml    | 14 -------
 Content/Mods/Revia/Revia_RaceSupport_RJW.xml  | 42 +------------------
 4 files changed, 9 insertions(+), 64 deletions(-)
 rename Content/Mods/Revia/{Revia_NymphKind_RJW.xml => Revia_PawnKind.xml} (61%)
 delete mode 100644 Content/Mods/Revia/Revia_PawnKind_Herm_RJW.xml

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7d913b8..61ac9ec 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -103,6 +103,7 @@
 		"raceparts",
 		"Rakkle",
 		"Ratkin",
+		"Revia",
 		"selffertilized",
 		"Shoggoth",
 		"Shoujo",
diff --git a/Content/Mods/Revia/Revia_NymphKind_RJW.xml b/Content/Mods/Revia/Revia_PawnKind.xml
similarity index 61%
rename from Content/Mods/Revia/Revia_NymphKind_RJW.xml
rename to Content/Mods/Revia/Revia_PawnKind.xml
index 371de42..1b28f10 100644
--- a/Content/Mods/Revia/Revia_NymphKind_RJW.xml
+++ b/Content/Mods/Revia/Revia_PawnKind.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-	<!-- These will be hard  -->
-	<!-- <PawnKindDef ParentName="ReviaRaceMarauder_Standard">
-		<defName>Nymph_ReviaRaceMarauder</defName>
+	<PawnKindDef ParentName="ReviaRaceMarauder_Standard">
+		<defName>ReviaRaceMarauder_Herm</defName>
+		<combatPower>40</combatPower>
 	</PawnKindDef>
 
-	<PawnKindDef ParentName="ReviaRaceMarauder_Standard">
-		<defName>Nymph_ReviaRaceMarauder_Herm</defName>
-	</PawnKindDef> -->
+	<PawnKindDef ParentName="ReviaRaceTemplar_Standard">
+		<defName>ReviaRaceTemplar_Herm</defName>
+		<combatPower>40</combatPower>
+	</PawnKindDef>
 
-	<!-- normal -->
 	<PawnKindDef ParentName="RJW_NymphStandard">
-		<!-- <defName>Nymph_ReviaRace</defName> -->
 		<defName>Nymph_ReviaRaceMarauder</defName>
 		<label>nymph</label>
 		<combatPower>30</combatPower>
@@ -19,7 +18,6 @@
 	</PawnKindDef>
 
 	<PawnKindDef ParentName="RJW_NymphStandard">
-		<!-- <defName>Nymph_ReviaRace_Herm</defName> -->
 		<defName>Nymph_ReviaRaceMarauder_Herm</defName>
 		<label>nymph</label>
 		<combatPower>30</combatPower>
diff --git a/Content/Mods/Revia/Revia_PawnKind_Herm_RJW.xml b/Content/Mods/Revia/Revia_PawnKind_Herm_RJW.xml
deleted file mode 100644
index 3703f67..0000000
--- a/Content/Mods/Revia/Revia_PawnKind_Herm_RJW.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-	<PawnKindDef ParentName="ReviaRaceMarauder_Standard">
-	<!-- <PawnKindDef> -->
-		<defName>ReviaRaceMarauder_Herm</defName>
-		<combatPower>40</combatPower>
-	</PawnKindDef>
-
-	<PawnKindDef ParentName="ReviaRaceTemplar_Standard">
-	<!-- <PawnKindDef> -->
-		<defName>ReviaRaceTemplar_Herm</defName>
-		<combatPower>40</combatPower>
-	</PawnKindDef>
-</Defs>
\ No newline at end of file
diff --git a/Content/Mods/Revia/Revia_RaceSupport_RJW.xml b/Content/Mods/Revia/Revia_RaceSupport_RJW.xml
index dd68618..98b19a4 100644
--- a/Content/Mods/Revia/Revia_RaceSupport_RJW.xml
+++ b/Content/Mods/Revia/Revia_RaceSupport_RJW.xml
@@ -1,78 +1,38 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-	<!-- Revia Race. 2020041005. https://steamcommunity.com/sharedfiles/filedetails/?id=2020041005 -->
-	<!-- Awoo -->
 	<rjw.RaceGroupDef Name="RJW_Revia_Standard">
 		<defName>Revia_Fox_Girl_Race</defName>
 		<raceNames>
 			<li>ReviaRaceAlien</li>
 		</raceNames>
-		
 		<anuses>
 			<li>Petite_FoxGirls_Anus</li>
 		</anuses>
-
 		<femaleBreasts>
 			<li>Petite_FoxGirls_Breasts</li>
 		</femaleBreasts>
-
 		<femaleGenitals>
 			<li>Petite_FoxGirls_Vagina</li>
 		</femaleGenitals>
-
 		<maleBreasts>
 			<li>Breasts</li>
 		</maleBreasts>
-
 		<maleGenitals>
 			<li>DogPenis</li>
 		</maleGenitals>
-		
 		<tags>
 			<li>Fur</li>
 		</tags>
-
-		<hybridRaceParents>
-			<li>ReviaRaceAlien</li>
-			<li>Any</li>
-		</hybridRaceParents>
-		<hybridChildKindDef>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceColonist</li>
-			<li>ReviaRaceMarauder_Herm</li>
-		</hybridChildKindDef>
 	</rjw.RaceGroupDef>
 
 	<rjw.RaceGroupDef ParentName="RJW_Revia_Standard">
 		<defName>Revia_Fox_Girl_Race_Herm</defName>
-		
-		<raceNames Inherit="false">
-		<!-- safety net  -->
-		</raceNames>
-
+		<raceNames Inherit="false" />
 		<pawnKindNames>
 			<li>ReviaRaceMarauder_Herm</li>
 			<li>ReviaRaceTemplar_Herm</li>
 			<li>Nymph_ReviaRaceMarauder_Herm</li>
 		</pawnKindNames>
-
 		<hasSingleGender>true</hasSingleGender>
 	</rjw.RaceGroupDef>