waster rollback

LoadFolders.xml

@@ -5,7 +5,6 @@
 		<li>Common</li>
 		<!-- Mods -->
 		<li IfModNotActive="asmr.rjw.racesupport">Mods/NotRaceSupport</li>
-		<li IfModActive="vanillaracesexpanded.waster">Mods/VREwaster</li>
 		
 	</v1.5>
 </loadFolders>

Mods/VREwaster/Defs/GeneDefs_SexSpecial.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-        
-    <GeneDef ParentName="VREW_MutationBase">
-        <defName>rjw_genes_mytosis_mutation</defName>
-        <label>Polluted orgasmic Mytosis</label>
-		<!-- <geneClass>RJW_Genes.Gene_Aphrodisiac_Pheromones</geneClass> -->
-        <description>Carriers of this gene grow more unstable with ongoing multiple orgasms in a polluted environnement - climaxing in a process of mytosis. This will result in an (biologically) identical pawn and both twins are set in a regenerative state. Also, the pawn can have multiple orgasms: In a state of higher unstableness, they come quicker.</description>
-        <iconPath>UI/Icons/Genes/Gene_PsychicBonding</iconPath>
-        <displayOrderInCategory>-1</displayOrderInCategory>
-        <biostatCpx>1</biostatCpx>
-        <biostatMet>-1</biostatMet>
-		<modExtensions>
-			<li Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>UI/Icons/Genes/GeneBackground_PollutionMutation</backgroundPathEndogenes>
-			
-			</li>
-		</modExtensions>
-    </GeneDef>    
-</Defs>

Source/GeneDefOf.cs

@@ -114,9 +114,6 @@ namespace RJW_Genes
         public static readonly GeneDef rjw_genes_cockeater;
         public static readonly GeneDef rjw_genes_lifeforce_empath;
 
-        //waster
-        [MayRequire("vanillaracesexpanded.waster")] public static readonly GeneDef rjw_genes_mytosis_mutation;
-
         //Other Defs
         public static readonly XenotypeDef rjw_genes_succubus;
         public static readonly DutyDef rjw_genes_flirt;

Source/Genes/QuirkPatching/QuirkPatcher.cs

@@ -18,8 +18,8 @@ namespace RJW_Genes
             foreach(Gene g in partner.genes.GenesListForReading) {
                 if (partner.genes.HasActiveGene(g.def))
                 {
-                    //g.def?.GetModExtension<QirkExtension>().Satisfiedquirk;
+                    g.def?.GetModExtension<QirkExtension>().Satisfiedquirk;
-                  //  listquirk.Add(g.def?.GetModExtension<QirkExtension>().Satisfiedquirk);
+                    listquirk.Add(g.def?.GetModExtension<QirkExtension>().Satisfiedquirk);
                 }
             }
 

Source/Genes/Special/Patches/Patch_OrgasmMytosis.cs

@@ -10,7 +10,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Verse;
-using VanillaRacesExpandedWaster;
 
 
 namespace RJW_Genes
@@ -26,18 +25,12 @@ namespace RJW_Genes
 	{
 
 		private const float SEVERITY_INCREASE_PER_ORGASM = 0.075f;
-        public static Def mytosis_mutation = DefDatabase<GeneDef>.GetNamed("rjw_genes_mytosis_mutation",false);
+
         public static void Postfix(JobDriver_Sex __instance)
 		{
 			Pawn orgasmingPawn = __instance.pawn;
             bool hasPollutedMytosis = false;
-            if (mytosis_mutation != null)
+
-            {
-                if (GeneUtility.HasGeneNullCheck(orgasmingPawn, GeneDefOf.rjw_genes_mytosis_mutation))
-                {
-                    hasPollutedMytosis = true;
-                }
-            }
             if (orgasmingPawn != null && (GeneUtility.HasGeneNullCheck(orgasmingPawn, GeneDefOf.rjw_genes_sexual_mytosis) || hasPollutedMytosis) && ! orgasmingPawn.health.hediffSet.HasHediff(HediffDefOf.rjw_genes_mytosis_shock_hediff))
 			{
 				var mytosisHediff = GetOrgasmMytosisHediff(orgasmingPawn);

Source/Genes/Special/Patches/Patch_Waster.cs

@@ -1,62 +0,0 @@
-using HarmonyLib;
-using rjw;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Verse;
-using VanillaRacesExpandedWaster;
-
-namespace RJW_Genes
-{
-
-
-    public static class Patch_Waster
-    {
-        public static void Gene_Randomizer_Prefix(Gene_Randomizer __instance)
-        {
-            if (Patch_OrgasmMytosis.mytosis_mutation != null)
-            {
-                if (!__instance.mutationGenes.Contains(GeneDefOf.rjw_genes_mytosis_mutation))
-                {
-                    __instance.mutationGenes.Add(GeneDefOf.rjw_genes_mytosis_mutation);
-                }
-                if (!__instance.mutationGenes.Contains(GeneDefOf.rjw_genes_Necro_genitalia))
-                {
-                    __instance.mutationGenes.Add(GeneDefOf.rjw_genes_Necro_genitalia);
-                }
-                if (!__instance.mutationGenes.Contains(GeneDefOf.rjw_genes_Tentacle_genitalia))
-                {
-                    __instance.mutationGenes.Add(GeneDefOf.rjw_genes_Tentacle_genitalia);
-                }
-            }
-        }
-        public static GeneDef VRE_GauntBody = DefDatabase<GeneDef>.GetNamed("VRE_GauntBody", false);
-        public static void SatisfiesTeratophile_Postfix(ref bool __result, Pawn partner)
-        {
-            if (!__result)
-            {
-                ModLog.Message("check 1");
-                if (VRE_GauntBody != null)
-                {
-                    ModLog.Message("check 2");
-                    if (partner.genes.HasActiveGene(VRE_GauntBody))
-                    {
-                        ModLog.Message("check 3");
-                        __result = true;
-                        return;
-                    }
-                }
-
-
-            }
-        }
-
-
-
-
-    }
-
-}

Source/HarmonyInit.cs

@@ -11,6 +11,7 @@ namespace RJW_Genes
     [StaticConstructorOnStartup]
     internal static class HarmonyInit
     {
+        public static Type Gene_Randomizer_Instance = null;
         static HarmonyInit()
         {
             Harmony harmony = new Harmony("rjw_genes");
@@ -39,7 +40,7 @@ namespace RJW_Genes
             harmony.Patch(AccessTools.Method(typeof(Quirk), nameof(Quirk.CountSatisfiedQuirks)),
                 postfix: new HarmonyMethod(typeof(QuirkPatcher), nameof(QuirkPatcher.CountSatisfiedPostfix)));
 
-            Type Gene_Randomizer_Instance = null;
+            /*
             try
             {
                 Gene_Randomizer_Instance = (from asm in AppDomain.CurrentDomain.GetAssemblies()
@@ -53,9 +54,7 @@ namespace RJW_Genes
             {
                 harmony.Patch(AccessTools.Method(Gene_Randomizer_Instance, "PostAdd"),
                 prefix: new HarmonyMethod(typeof(Patch_Waster), nameof(Patch_Waster.Gene_Randomizer_Prefix)));
-                harmony.Patch(AccessTools.Method(typeof(Quirk), nameof(Quirk.SatisfiesTeratophile)),
+            }*/
-                postfix: new HarmonyMethod(typeof(Patch_Waster), nameof(Patch_Waster.SatisfiesTeratophile_Postfix)));
-            }
 
 
 

Source/Rjw-Genes.csproj

@@ -170,7 +170,6 @@
     <Compile Include="Genes\Special\Patches\Patch_AgeDrain.cs" />
     <Compile Include="Genes\Special\Patches\Patch_HormonalSaliva.cs" />
     <Compile Include="Genes\Special\Patches\Patch_OrgasmMytosis.cs" />
-    <Compile Include="Genes\Special\Patches\Patch_Waster.cs" />
     <Compile Include="Genes\Special\Thoughts\ThoughtWorker_Aphrodisiac_Pheromones_Social.cs" />
     <Compile Include="LetterDefOf.cs" />
     <Compile Include="Interactions\SuccubusTailjob\CompAbility_SexInteractionRequirements.cs" />
@@ -192,8 +191,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="GeneDefs_GenitaliaTypeEndogenes.xml" />
-    <Content Include="RJW.dll" />
-    <Content Include="RJWSexperience.dll" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="0Harmony, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
@@ -229,10 +226,6 @@
       <HintPath>..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="VanillaRacesExpanded-Waster">
-      <HintPath>..\..\..\..\..\workshop\content\294100\2983471725\1.5\Assemblies\VanillaRacesExpanded-Waster.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Genes\Gender\Patches\" />