Merge pull request #4 from DestinyPlayer/indev

Merge of 1.2

1.4/Defs/RecipeDefs/GeneForge_Recipes.xml

@@ -13,6 +13,9 @@
 		<skillRequirements>
 			<Intellectual>6</Intellectual>
 		</skillRequirements>
+		<researchPrerequisites>
+		  <li>GeneForging</li>
+		</researchPrerequisites>
 		<effectWorking>Surgery</effectWorking>
 		<soundWorking>Recipe_Brewing</soundWorking>
 		<ingredients>
@@ -30,18 +33,21 @@
 		</products>
 	</RecipeDef>
 	<RecipeDef MayRequire="wvc.sergkart.races.biotech">
-		<defName>ForgeWYCGenePack</defName>
-		<label>forge WYC genepack</label>
+		<defName>ForgeWVCGenePack</defName>
+		<label>forge wvc genepack</label>
 		<recipeUsers>
             <li>GeneSlurryForge</li>
         </recipeUsers>
-		<description>Forges a WYC gene pack out of naught but Gene Slurry and a random can!</description>
+		<description>Forges a WVC gene pack out of naught but Gene Slurry and a random can!</description>
 		<jobString>Gene forging.</jobString>
 		<workAmount>100</workAmount>
 		<workSkill>Intellectual</workSkill>
 		<skillRequirements>
 			<Intellectual>6</Intellectual>
 		</skillRequirements>
+		<researchPrerequisites>
+		  <li>GeneForging</li>
+		</researchPrerequisites>
 		<effectWorking>Surgery</effectWorking>
 		<soundWorking>Recipe_Brewing</soundWorking>
 		<ingredients>
@@ -72,6 +78,9 @@
 		<skillRequirements>
 			<Intellectual>6</Intellectual>
 		</skillRequirements>
+		<researchPrerequisites>
+		  <li>GeneForging</li>
+		</researchPrerequisites>
 		<effectWorking>Surgery</effectWorking>
 		<soundWorking>Recipe_Brewing</soundWorking>
 		<ingredients>
@@ -103,6 +112,9 @@
 			<Intellectual>6</Intellectual>
 		</skillRequirements>
 		<effectWorking>Surgery</effectWorking>
+		<researchPrerequisites>
+		  <li>PrecisionGeneForging</li>
+		</researchPrerequisites>
 		<soundWorking>Recipe_Brewing</soundWorking>
 		<ingredients>
 			<li>
@@ -141,6 +153,9 @@
 			<Intellectual>6</Intellectual>
 		</skillRequirements>
 		<effectWorking>Surgery</effectWorking>
+		<researchPrerequisites>
+		  <li>PrecisionGeneForging</li>
+		</researchPrerequisites>
 		<soundWorking>Recipe_Brewing</soundWorking>
 		<ingredients>
 			<li>
@@ -171,14 +186,17 @@
 		<recipeUsers>
             <li>GeneSlurryForge</li>
         </recipeUsers>
-		<description>Forges a ability gene pack out of naught but Gene Slurry and a random can!</description>
+		<description>Forges an ability gene pack out of naught but Gene Slurry and a random can!</description>
 		<jobString>Gene forging.</jobString>
 		<workAmount>200</workAmount>
 		<workSkill>Intellectual</workSkill>
 		<skillRequirements>
 			<Intellectual>6</Intellectual>
 		</skillRequirements>
 		<effectWorking>Surgery</effectWorking>
+		<researchPrerequisites>
+		  <li>PrecisionGeneForging</li>
+		</researchPrerequisites>
 		<soundWorking>Recipe_Brewing</soundWorking>
 		<ingredients>
 			<li>
@@ -209,14 +227,17 @@
 		<recipeUsers>
             <li>GeneSlurryForge</li>
         </recipeUsers>
-		<description>Forges a mechanitor gene pack out of naught but Gene Slurry and a random can!</description>
+		<description>Forges a mechanitor gene pack out of naught but Gene Slurry and a random can!\n\nSargalicious.</description>
 		<jobString>Gene forging.</jobString>
 		<workAmount>200</workAmount>
 		<workSkill>Intellectual</workSkill>
 		<skillRequirements>
 			<Intellectual>6</Intellectual>
 		</skillRequirements>
 		<effectWorking>Surgery</effectWorking>
+		<researchPrerequisites>
+		  <li>PrecisionGeneForging</li>
+		</researchPrerequisites>
 		<soundWorking>Recipe_Brewing</soundWorking>
 		<ingredients>
 			<li>
@@ -240,4 +261,45 @@
 			<GF_AG_MechanitorGenepack>1</GF_AG_MechanitorGenepack>
 		</products>
 	</RecipeDef>
+
+	<RecipeDef MayRequire="phonicmas.biotechexpansionwarhammer40k">
+		<defName>ForgeWarhammerGenePack</defName>
+		<label>forge gene seed genepack</label>
+		<recipeUsers>
+            <li>GeneSlurryForge</li>
+        </recipeUsers>
+		<description>Forges a gene seed gene pack out of naught but Gene Slurry and a random can!\n\nNot approved by the Adeptus Mechanicus.</description>
+		<jobString>Gene forging.</jobString>
+		<workAmount>200</workAmount>
+		<workSkill>Intellectual</workSkill>
+		<skillRequirements>
+			<Intellectual>6</Intellectual>
+		</skillRequirements>
+		<effectWorking>Surgery</effectWorking>
+		<researchPrerequisites>
+		  <li>PrecisionGeneForging</li>
+		</researchPrerequisites>
+		<soundWorking>Recipe_Brewing</soundWorking>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Gold</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+		</ingredients>
+		<products>
+			<GF_BEWH_WarhammerGenepack>1</GF_BEWH_WarhammerGenepack>
+		</products>
+	</RecipeDef>
 </Defs>

1.4/Defs/ResearchProjectDefs/Research_Projects_Geneforge.xml

@@ -16,4 +16,21 @@
       <li>GeneProcessor</li>
     </prerequisites>
   </ResearchProjectDef>
+
+  <ResearchProjectDef>
+    <defName>PrecisionGeneForging</defName>
+    <label>precision gene forging</label>
+    <description>Forge more specific genepacks based on their category. Also unlocks a bigger tank!</description>
+    <techLevel>Spacer</techLevel>
+    <baseCost>1000</baseCost>
+    <researchViewX>14.00</researchViewX>
+    <researchViewY>5.80</researchViewY>
+    <requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>
+	<requiredResearchFacilities>
+      <li>MultiAnalyzer</li>
+    </requiredResearchFacilities>
+    <prerequisites>
+      <li>GeneProcessor</li>
+    </prerequisites>
+  </ResearchProjectDef>
 </Defs>

1.4/Defs/ThingDefs_Buildings/GeneForge_Buildings_Production.xml

@@ -3,7 +3,7 @@
   <ThingDef ParentName="FurnitureBase">
     <defName>GF_GeneSlurryExtractorCorpse</defName>
     <label>gene slurry extractor</label>
-    <description>This apparatus extracts Genetic Slurry from humanoid corpses and humanoid meat.</description>
+    <description>This apparatus extracts Genetic Slurry from humanoid corpses, genepacks and humanoid meat.</description>
     <thingClass>Building_Storage</thingClass>
     <graphicData>
       <texPath>Things/Building/GeneSlurryExtractor</texPath>
@@ -92,7 +92,7 @@
   <ThingDef ParentName="FurnitureBase">
     <defName>GF_GeneSlurryExtractorMeat</defName>
     <label>gene slurry extractor</label>
-    <description>This apparatus extracts Genetic Slurry from humanoid corpses and humanoid meat.</description>
+    <description>This apparatus extracts Genetic Slurry from humanoid corpses, genepacks and humanoid meat.</description>
     <thingClass>Building_Storage</thingClass>
     <graphicData>
       <texPath>Things/Building/GeneSlurryExtractor</texPath>
@@ -157,7 +157,7 @@
 	  <li Class="CompProperties_Flickable"/>
 	  <li Class="CompPropertiesSwapBuilding_GF">
 	    <buttonName>Mode: Meat</buttonName>
-		<buttonDescription>The Extractor is currently set to consume humanoid meat. Click to switch to consuming humanoid corpses.</buttonDescription>
+		<buttonDescription>The Extractor is currently set to consume humanoid meat. Click to switch to consuming corpses.</buttonDescription>
 		<buildingSwap>GF_GeneSlurryExtractorCorpse</buildingSwap>
 		<uiIconPath>Things/UI/GeneExtractorMeat</uiIconPath>
 	  </li>

1.4/Defs/ThingDefs_Buildings/GeneForge_Buildings_Storage.xml

@@ -101,7 +101,7 @@
 		<castEdgeShadows>true</castEdgeShadows>
 		<fillPercent>1</fillPercent>
 		<researchPrerequisites>
-		  <li>GeneForging</li>
+		  <li>PrecisionGeneForging</li>
 		</researchPrerequisites>
 		<statBases>
 			<MaxHitPoints>200</MaxHitPoints>

1.4/Defs/ThingDefs_Items/GeneSlurry_Items.xml

@@ -139,4 +139,31 @@
 		  <ThingDef>GeneAssembler</ThingDef>
 		</descriptionHyperlinks>
 	</ThingDef>
+
+	<ThingDef ParentName="GeneSetHolderBase" MayRequire="sarg.alphagenes">
+		<defName>GF_BEWH_WarhammerGenepack</defName>
+		<label>geneforged gene seed genepack</label>
+		<description>A small capsule containing a package of genetic information. To use a genepack, it must be placed in a gene bank near a gene assembler and combined into an implantable xenogerm.\n\nIf not kept in a powered gene bank, this genepack will slowly deteriorate.\n\nThis genepack has been deliberately Geneforged in order to produce a gene seed gene.\n\nNot approved by the Adeptus Mechanicus.</description>
+		<thingClass>CategoricGenepacks.GF_BEWH_WarhammerGenepack</thingClass>
+		<tickerType>Rare</tickerType>
+		<useHitPoints>true</useHitPoints>
+		<canDeteriorateUnspawned>true</canDeteriorateUnspawned>
+		<deteriorateFromEnvironmentalEffects>false</deteriorateFromEnvironmentalEffects>
+		<inspectorTabs>
+		  <li>ITab_Genes</li>
+		</inspectorTabs>
+		<graphicData>
+		  <texPath>Things/Item/Special/Genepack</texPath>
+		  <graphicClass>Graphic_Genepack</graphicClass>
+		  <drawSize>(0.75, 0.75)</drawSize>
+		</graphicData>
+		<statBases>
+		  <MarketValue>100</MarketValue>
+		  <DeteriorationRate>5</DeteriorationRate>
+		</statBases>
+		<descriptionHyperlinks>
+		  <ThingDef>Xenogerm</ThingDef>
+		  <ThingDef>GeneAssembler</ThingDef>
+		</descriptionHyperlinks>
+	</ThingDef>
 </Defs>

1.4/Defs/WorkgiverDefs/Workgiver_geneforge.xml

@@ -70,4 +70,17 @@
 			<li>Manipulation</li>
 		</requiredCapacities>
 	  </WorkGiverDef>
+
+	  <WorkGiverDef MayRequire="phonicmas.biotechexpansionwarhammer40k">
+		<defName>GenepackWarhammerGF_PlaceInGeneBank</defName>
+		<label>bank genepack</label>
+		<giverClass>CategoricGenepacks.GF_BEWH_PutWarhammerInGeneBank</giverClass>
+		<workType>Hauling</workType>
+		<verb>bank</verb>
+		<gerund>banking</gerund>
+		<priorityInType>111</priorityInType>
+		<requiredCapacities>
+			<li>Manipulation</li>
+		</requiredCapacities>
+	  </WorkGiverDef>
 </Defs>

README.md

@@ -8,6 +8,8 @@ So I made this.
 
 ## CHANGELOG
 
+- Version 1.2: Some research changes, plus compatibility for Warhammer 40k Genes and Psycasts.
+- Version 1.1.2: Fixed the bug where pawns couldn't stuff category Genepacks into Gene Banks.
 - Version 1.1.1: My dumbass screwed up a recipe for Mechanitor genepacks and didn't notice. Fixed.
 - Version 1.1: Added the ability to craft more specific genepacks based on categories.
 - Version 1.0: Made the dang mod!

Source/CategoricGenepacks/CategoricGenepacks.csproj

@@ -49,10 +49,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GF_Categories.cs" />
     <Compile Include="GF_Utility.cs" />
-    <Compile Include="GF_AG_MechanitorGenepack.cs" />
-    <Compile Include="GF_AbilityGenepack.cs" />
-    <Compile Include="GF_HemoGenepack.cs" />
     <Compile Include="GF_ArchiteGenepack.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

Source/CategoricGenepacks/GF_ArchiteGenepack.cs

@@ -18,7 +18,7 @@ public override void PostMake()
             var allGeneDefs = DefDatabase<GeneDef>.AllDefsListForReading;
             foreach (var def in allGeneDefs.InRandomOrder())
             {
-                if (def.biostatArc > 0)
+                if (def.biostatArc > 0 && !def.displayCategory.ToString().ToLower().Contains("BEWH"))
                 {
                     geneSet.AddGene(def);
                     break;

Source/CategoricGenepacks/GF_Categories.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace CategoricGenepacks
+{
+//Ability
+    public class GF_AbilityGenepack : GF_Pack
+    {
+        protected override void SetCategory()
+        {
+            GeneCat = "Ability";
+        }
+    }
+    public class GF_PutAbilityInGeneBank : WorkGiver_PutPackInGenebank
+    {
+        public override ThingRequest PotentialWorkThingRequest => ThingRequest.ForDef(GF_Utility.getGFPack("GF_AbilityGenepack"));
+    }
+//Hemogen
+    public class GF_HemoGenepack : GF_Pack
+    {
+        protected override void SetCategory()
+        {
+            GeneCat = "Hemogen";
+        }
+    }
+    public class GF_PutHemoInGeneBank : WorkGiver_PutPackInGenebank
+    {
+        public override ThingRequest PotentialWorkThingRequest => ThingRequest.ForDef(GF_Utility.getGFPack("GF_HemoGenepack"));
+    }
+//Alpha Genes Mechanitor
+    public class GF_AG_MechanitorGenepack : GF_Pack
+    {
+        protected override void SetCategory()
+        {
+            GeneCat = "AG_Mechanitor";
+        }
+    }
+    public class GF_AG_PutMechanitorInGeneBank : WorkGiver_PutPackInGenebank
+    {
+        public override ThingRequest PotentialWorkThingRequest => ThingRequest.ForDef(GF_Utility.getGFPack("GF_AG_MechanitorGenepack"));
+    }
+//Warhammer 40k Genes and Psycasts
+    public class GF_BEWH_WarhammerGenepack : GF_Pack
+    {
+
+        protected override void SetCategory()
+        {
+            GeneCat = "BEWH";
+            AllowArchite = 100;
+        }
+    }
+    public class GF_BEWH_PutWarhammerInGeneBank : WorkGiver_PutPackInGenebank
+    {
+        public override ThingRequest PotentialWorkThingRequest => ThingRequest.ForDef(GF_Utility.getGFPack("GF_BEWH_WarhammerGenepack"));
+    }
+}