From 370241177ef9cb94ab77b122c647496623dafc2f Mon Sep 17 00:00:00 2001
From: AsmodeusRex <dark.song2667@fastmail.com>
Date: Mon, 31 Oct 2022 15:46:39 -0700
Subject: [PATCH] Improve patches

---
 .gitlab-ci.yml                                |  4 +-
 .vscode/settings.json                         |  2 +
 ..._Patch.xml => GroupedPawnsLists_Patch.xml} |  0
 Content/Base/Patches/Harpies.xml              |  2 -
 Content/Base/Patches/KMH_Patch.xml            | 35 ---------------
 Content/Base/Patches/Llisceans.xml            | 45 -------------------
 Content/Base/Patches/RoM_Gender.xml           | 15 +++++++
 .../RoM_Vampires_TempPawn_ThinkTree.xml       |  1 -
 8 files changed, 19 insertions(+), 85 deletions(-)
 rename Content/Base/Patches/{RJW/BrothelTab_Patch.xml => GroupedPawnsLists_Patch.xml} (100%)
 delete mode 100644 Content/Base/Patches/Llisceans.xml
 create mode 100644 Content/Base/Patches/RoM_Gender.xml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 395155e..d05b817 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ upload:
     - if: $CI_COMMIT_TAG
   script:
     - |
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build.zip "${PACKAGE_REGISTRY_URL}/"
+      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build.zip "${PACKAGE_REGISTRY_URL}/rjw-race-support.zip"
 
 release:
   stage: release
@@ -37,4 +37,4 @@ release:
   script:
     - |
       release-cli create --name "Release $CI_COMMIT_TAG" --tag-name $CI_COMMIT_TAG \
-        --assets-link "{\"name\":\"${PACKAGE_NAME}\",\"url\":\"${PACKAGE_REGISTRY_URL}/build.zip\"}"
\ No newline at end of file
+        --assets-link "{\"name\":\"Download Build",\"url\":\"${PACKAGE_REGISTRY_URL}/rjw-race-support.zip\"}"
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 61ac9ec..4013e51 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -50,6 +50,7 @@
 		"Gigantea",
 		"Girthy",
 		"Gnollmorph",
+		"hana",
 		"Hediff",
 		"hediffs",
 		"hemi",
@@ -66,6 +67,7 @@
 		"Kikimore",
 		"Kilhn",
 		"Klickmala",
+		"kohime",
 		"Kurin",
 		"kuro",
 		"Lapelli",
diff --git a/Content/Base/Patches/RJW/BrothelTab_Patch.xml b/Content/Base/Patches/GroupedPawnsLists_Patch.xml
similarity index 100%
rename from Content/Base/Patches/RJW/BrothelTab_Patch.xml
rename to Content/Base/Patches/GroupedPawnsLists_Patch.xml
diff --git a/Content/Base/Patches/Harpies.xml b/Content/Base/Patches/Harpies.xml
index 9c14afe..e50baeb 100644
--- a/Content/Base/Patches/Harpies.xml
+++ b/Content/Base/Patches/Harpies.xml
@@ -13,8 +13,6 @@
 						<li>
 							<defName>Rapist</defName>
 							<chance>85</chance>
-							<commonalityMale>0</commonalityMale>
-							<commonalityFemale>100</commonalityFemale>
 						</li>
 					</value>
 				</li>
diff --git a/Content/Base/Patches/KMH_Patch.xml b/Content/Base/Patches/KMH_Patch.xml
index 3d3544e..b7917f6 100644
--- a/Content/Base/Patches/KMH_Patch.xml
+++ b/Content/Base/Patches/KMH_Patch.xml
@@ -30,41 +30,6 @@
 		</match>
 	</Operation>
 
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>kemomimihouse</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<success>Normal</success>
-			<operations>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="hana" or defName="kon" or defName="siro" or defName="miko" or defName="akame" or defName="aome"]/race/lifeStageAges/li[2]/minAge</xpath>
-					<value>
-						<minAge>0.5</minAge>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="hana" or defName="kon" or defName="siro" or defName="miko" or defName="akame" or defName="aome" or defName="yuki" or defName="kohime" or defName="kuro"]/race/lifeStageAges/li[3]/minAge</xpath>
-					<value>
-						<minAge>1.5</minAge>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="hana" or defName="kon" or defName="siro" or defName="miko" or defName="akame" or defName="aome" or defName="yuki" or defName="kohime" or defName="kuro"]/lifeStages/li[1]/bodyGraphicData/drawSize</xpath>
-					<value>
-						<drawSize>0.75</drawSize>
-					</value>
-				</li>
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/PawnKindDef[defName="hana" or defName="kon" or defName="siro" or defName="miko" or defName="akame" or defName="aome" or defName="yuki" or defName="kohime" or defName="kuro"]/lifeStages/li[2]/bodyGraphicData/drawSize</xpath>
-					<value>
-						<drawSize>1.125</drawSize>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-
 	<!-- Gestation -->
 	<Operation Class="PatchOperationFindMod">
 		<mods>
diff --git a/Content/Base/Patches/Llisceans.xml b/Content/Base/Patches/Llisceans.xml
deleted file mode 100644
index 984b6b9..0000000
--- a/Content/Base/Patches/Llisceans.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-	<!-- Lliscean -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Lliscean</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				<!-- Remake this as a LoadFolder Defs  -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs</xpath>
-					<value>
-						<PawnKindDef ParentName="BaseLlisceanPawnKind">
-							<defName>Lliscean_PlayerColonist_Futa</defName>
-							<label>member</label>
-							<defaultFactionType>LlisceanPlayerTribe</defaultFactionType>
-							<apparelTags>
-								<li>Neolithic</li>
-							</apparelTags>
-							<apparelAllowHeadgearChance>0</apparelAllowHeadgearChance>
-							<apparelMoney>200~200</apparelMoney>
-							<techHediffsChance>0.03</techHediffsChance>
-							<techHediffsMoney>50~250</techHediffsMoney>
-							<techHediffsTags>
-								<li>Simple</li>
-							</techHediffsTags>
-							<initialWillRange>0~0</initialWillRange>
-							<initialResistanceRange>10~17</initialResistanceRange>
-						</PawnKindDef>
-					</value>
-				</li>
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Lliscean"]/alienRace/generalSettings/forcedRaceTraitEntries</xpath>
-					<value>
-						<li>
-							<defName>Zoophile</defName>
-							<chance>15</chance>
-						</li>
-					</value>
-				</li>
-			</operations>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Content/Base/Patches/RoM_Gender.xml b/Content/Base/Patches/RoM_Gender.xml
new file mode 100644
index 0000000..0fbde12
--- /dev/null
+++ b/Content/Base/Patches/RoM_Gender.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>H.P. Lovecraft Storyteller - Remastered</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName = "HPLovecraft_MistCreature"]/race/hasGenders</xpath>
+				</li>
+			</operations>
+		</match>
+	</Operation>
+</Patch>
\ No newline at end of file
diff --git a/Content/Base/Patches/RoM_Vampires_TempPawn_ThinkTree.xml b/Content/Base/Patches/RoM_Vampires_TempPawn_ThinkTree.xml
index 2860e79..8d3a1e8 100644
--- a/Content/Base/Patches/RoM_Vampires_TempPawn_ThinkTree.xml
+++ b/Content/Base/Patches/RoM_Vampires_TempPawn_ThinkTree.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!-- hmm -->
 <Patch>
 	<Operation Class="PatchOperationFindMod">
 		<mods>