Merge pull request #2966 from CombatExtended-Continued/5.6-Final-Fixes

5.6 final fixes - Serina's nod.
CombatExtended-Continued · Jan 30, 2024 · d37647f · d37647f
2 parents 0cddcc5 + e69ae5b
commit d37647f
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 32 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -83,6 +83,8 @@
 		<li>Killathon.MechHumanlikes.MechanicalBiomimetics</li>
 		<li>botchjob.divineorder</li>
 		<li>OskarPotocki.VFE.Deserters</li>
+		<li>OskarPotocki.VFE.Tribals</li>
+		<li>Sarg.AlphaMemes</li>
 	</loadAfter>
 
 </ModMetaData>
diff --git a/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml b/Patches/Alpha Memes/StyleCategoryDefs/StyleCategoryDefs.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Alpha Memes</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+			<!-- Remove styles for weapons that no longer exist. -->
+			<li Class="PatchOperationRemove">
+				<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Flamebow"]</xpath>
+			</li>
+
+			<li Class="PatchOperationRemove">
+				<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_EmpLauncher"]</xpath>
+			</li>
+
+			<li Class="PatchOperationRemove">
+				<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_ToxbombLauncher"]</xpath>
+			</li>
+
+			<li Class="PatchOperationRemove">
+				<xpath>Defs/StyleCategoryDef/thingDefStyles/li[thingDef="Gun_SmokeLauncher"]</xpath>
+			</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
diff --git a/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml
@@ -180,21 +180,6 @@
 					<xpath>Defs</xpath>
 					<value>
 
-						<RecipeDef Name="RSExplosive_RecipeBase" Abstract="true">
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<effectWorking>Cook</effectWorking>
-							<soundWorking>Recipe_Smith</soundWorking>
-							<workSkill>Crafting</workSkill>
-							<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-						</RecipeDef>
-
 						<!-- YP BaegYa Microwave Grenades -->
 						<RecipeDef ParentName="RSExplosive_RecipeBase">
 

diff --git a/Patches/Rimsenal Collection/Core/Weapons_Explosives.xml b/Patches/Rimsenal Collection/Core/Weapons_Explosives.xml
@@ -493,21 +493,6 @@
 					<xpath>Defs</xpath>
 					<value>
 
-						<RecipeDef Name="RSExplosive_RecipeBase" Abstract="true">
-							<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-							<effectWorking>Cook</effectWorking>
-							<soundWorking>Recipe_Smith</soundWorking>
-							<workSkill>Crafting</workSkill>
-							<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-							<fixedIngredientFilter>
-								<thingDefs>
-									<li>Plasteel</li>
-									<li>ComponentIndustrial</li>
-									<li>FSX</li>
-								</thingDefs>
-							</fixedIngredientFilter>
-						</RecipeDef>
-
 						<!-- YP BaegYa Microwave Grenades -->
 						<RecipeDef ParentName="RSExplosive_RecipeBase">
 							<defName>Craft_10_BaegYa</defName>

diff --git a/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml b/Patches/Rimsenal Collection/Core/Weapons_ExplosivesRecipeBase.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Rimsenal - Core</li>
+			<li>Rimsenal - Spacer Faction Pack</li>			
+		</mods>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs</xpath>
+			<value>
+
+			<RecipeDef Name="RSExplosive_RecipeBase" Abstract="true">
+				<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+				<effectWorking>Cook</effectWorking>
+				<soundWorking>Recipe_Smith</soundWorking>
+				<workSkill>Crafting</workSkill>
+				<unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+				<fixedIngredientFilter>
+					<thingDefs>
+						<li>Plasteel</li>
+						<li>ComponentIndustrial</li>
+						<li>FSX</li>
+					</thingDefs>
+				</fixedIngredientFilter>
+			</RecipeDef>
+
+			</value>
+
+		</match>
+	</Operation>
+</Patch>
diff --git a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml
@@ -77,8 +77,8 @@
 				</li>
 
 				<!-- == costList == -->
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]</xpath>
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="Turret_GatlingGun"]/costList</xpath>
 					<value>
 						<costList>
 							<Steel>325</Steel>