From 52acd397945829e2f260e4db50e16f6e1d7813c2 Mon Sep 17 00:00:00 2001
From: Zeracronius <zeracronius@outlook.dk>
Date: Thu, 28 Mar 2024 11:37:39 +0100
Subject: [PATCH] Fixed VEF integration

---
 1.5/Defs/Pawnmorpher_Research.xml          | 30 --------------
 1.5/Mods/VEF/Defs/Pipenetwork_Research.xml | 48 ++++++++++++++++++++++
 LoadFolders.xml                            |  2 +-
 3 files changed, 49 insertions(+), 31 deletions(-)
 create mode 100644 1.5/Mods/VEF/Defs/Pipenetwork_Research.xml

diff --git a/1.5/Defs/Pawnmorpher_Research.xml b/1.5/Defs/Pawnmorpher_Research.xml
index 173625693..65b03fdd9 100644
--- a/1.5/Defs/Pawnmorpher_Research.xml
+++ b/1.5/Defs/Pawnmorpher_Research.xml
@@ -107,18 +107,6 @@
 
 	<!--=== Column 4 ===-->
 
-	<ResearchProjectDef ParentName="PMSpaceResearch">
-		<defName>PM_MutagenStorage</defName>
-		<label>Mutagen Storage</label>
-		<description>Develop methods of large scale mutagenic slurry production, storage and transfer</description>
-		<baseCost>500</baseCost>
-		<researchViewX>3.00</researchViewX>
-		<researchViewY>0.00</researchViewY>
-		<prerequisites>
-			<li>MutagenExtraction</li>
-		</prerequisites>
-	</ResearchProjectDef>
-
 	<ResearchProjectDef>
 		<defName>AdvancedExtraction</defName>
 		<label>Advanced synthesis</label>
@@ -181,24 +169,6 @@
 
 	<!--=== Column 5 ===-->
 
-	<ResearchProjectDef>
-		<defName>MutagenCentrifuging</defName>
-		<label>Mutagen centrifuging</label>
-		<description>Develop plans to construct a centrifuge to refine slurry and chaobulbs back to mutanite by a process involving the straining of mechanites through morphsilk. This process will not be efficient and will use quite a bit of power, but if mutanite is otherwise unobtainable...this is one way to get it. It will also be possible to forgo safety protocols to speed up the process, though this may have unintended effects on anyone nearby.</description>
-		<baseCost>3000</baseCost>
-		<techLevel>Spacer</techLevel>
-		<tab>Pawnmorpher</tab>
-		<researchViewX>4.00</researchViewX>
-		<researchViewY>0.00</researchViewY>
-		<requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>
-		<prerequisites>
-			<li>PM_MutagenStorage</li>
-		</prerequisites>
-		<requiredResearchFacilities>
-			<li>MultiAnalyzer</li>
-		</requiredResearchFacilities>
-	</ResearchProjectDef>
-
 	<ResearchProjectDef>
 		<defName>MutagenChambers</defName>
 		<label>Chambers</label>
diff --git a/1.5/Mods/VEF/Defs/Pipenetwork_Research.xml b/1.5/Mods/VEF/Defs/Pipenetwork_Research.xml
new file mode 100644
index 000000000..f9d1c0b06
--- /dev/null
+++ b/1.5/Mods/VEF/Defs/Pipenetwork_Research.xml
@@ -0,0 +1,48 @@
+<Defs>
+	<ResearchProjectDef Name="PMResearch" Abstract="True">
+		<tab>Pawnmorpher</tab>
+		<techLevel>Industrial</techLevel>
+		<baseCost>500</baseCost>
+	</ResearchProjectDef>
+
+
+	<ResearchProjectDef Name="PMSpaceResearch" ParentName="PMResearch" Abstract="True">
+		<techLevel>Spacer</techLevel>
+		<baseCost>1000</baseCost>
+		<requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>
+	</ResearchProjectDef>
+
+	<!--=== Column 4 ===-->
+
+	<ResearchProjectDef ParentName="PMSpaceResearch">
+		<defName>PM_MutagenStorage</defName>
+		<label>Mutagen Storage</label>
+		<description>Develop methods of large scale mutagenic slurry production, storage and transfer</description>
+		<baseCost>500</baseCost>
+		<researchViewX>3.00</researchViewX>
+		<researchViewY>0.00</researchViewY>
+		<prerequisites>
+			<li>MutagenExtraction</li>
+		</prerequisites>
+	</ResearchProjectDef>
+
+	<!--=== Column 5 ===-->
+
+	<ResearchProjectDef>
+		<defName>MutagenCentrifuging</defName>
+		<label>Mutagen centrifuging</label>
+		<description>Develop plans to construct a centrifuge to refine slurry and chaobulbs back to mutanite by a process involving the straining of mechanites through morphsilk. This process will not be efficient and will use quite a bit of power, but if mutanite is otherwise unobtainable...this is one way to get it. It will also be possible to forgo safety protocols to speed up the process, though this may have unintended effects on anyone nearby.</description>
+		<baseCost>3000</baseCost>
+		<techLevel>Spacer</techLevel>
+		<tab>Pawnmorpher</tab>
+		<researchViewX>4.00</researchViewX>
+		<researchViewY>0.00</researchViewY>
+		<requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>
+		<prerequisites>
+			<li>PM_MutagenStorage</li>
+		</prerequisites>
+		<requiredResearchFacilities>
+			<li>MultiAnalyzer</li>
+		</requiredResearchFacilities>
+	</ResearchProjectDef>
+</Defs>
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 2d3abe986..939b054a7 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -50,6 +50,6 @@
 		<li>1.5</li>
 		<li IfModActive="Ludeon.RimWorld.Ideology">1.5/Mods/Ideology</li>
 		<li IfModActive="Ludeon.RimWorld.Royalty">1.5/Mods/Royalty</li>
-		<li IfModActive="OskarPotocki.VanillaFactionsExpanded.Core">1.4/Mods/VEF</li>
+		<li IfModActive="OskarPotocki.VanillaFactionsExpanded.Core">1.5/Mods/VEF</li>
 	</v1.5>
 </loadFolders>
\ No newline at end of file