diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll
index 0f3137f..49d7a8f 100644
Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ
diff --git a/LoadFolders.xml b/LoadFolders.xml
index b53e2d0..8777fdd 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -5,7 +5,6 @@
Common
Mods/NotRaceSupport
- Mods/VREwaster
\ No newline at end of file
diff --git a/Mods/VREwaster/Defs/GeneDefs_SexSpecial.xml b/Mods/VREwaster/Defs/GeneDefs_SexSpecial.xml
deleted file mode 100644
index 1e2b0c5..0000000
--- a/Mods/VREwaster/Defs/GeneDefs_SexSpecial.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- rjw_genes_mytosis_mutation
- Polluted orgasmic Mytosis
-
- 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.
- UI/Icons/Genes/Gene_PsychicBonding
- -1
- 1
- -1
-
-
- UI/Icons/Genes/GeneBackground_PollutionMutation
-
-
-
-
-
\ No newline at end of file
diff --git a/Source/GeneDefOf.cs b/Source/GeneDefOf.cs
index 0f44278..ef269cf 100644
--- a/Source/GeneDefOf.cs
+++ b/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;
diff --git a/Source/Genes/QuirkPatching/QuirkPatcher.cs b/Source/Genes/QuirkPatching/QuirkPatcher.cs
index cfbea04..bb367ed 100644
--- a/Source/Genes/QuirkPatching/QuirkPatcher.cs
+++ b/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().Satisfiedquirk;
- // listquirk.Add(g.def?.GetModExtension().Satisfiedquirk);
+ g.def?.GetModExtension().Satisfiedquirk;
+ listquirk.Add(g.def?.GetModExtension().Satisfiedquirk);
}
}
diff --git a/Source/Genes/Special/Patches/Patch_OrgasmMytosis.cs b/Source/Genes/Special/Patches/Patch_OrgasmMytosis.cs
index eaf45ab..91d7ee4 100644
--- a/Source/Genes/Special/Patches/Patch_OrgasmMytosis.cs
+++ b/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.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);
diff --git a/Source/Genes/Special/Patches/Patch_Waster.cs b/Source/Genes/Special/Patches/Patch_Waster.cs
deleted file mode 100644
index 9c43cbc..0000000
--- a/Source/Genes/Special/Patches/Patch_Waster.cs
+++ /dev/null
@@ -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.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;
- }
- }
-
-
- }
- }
-
-
-
-
- }
-
-}
diff --git a/Source/HarmonyInit.cs b/Source/HarmonyInit.cs
index b693e5d..490b880 100644
--- a/Source/HarmonyInit.cs
+++ b/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)));
- }
+ }*/
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index bf3c29e..0b5a081 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -170,7 +170,6 @@
@@ -229,10 +226,6 @@
..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll
False
-
- ..\..\..\..\..\workshop\content\294100\2983471725\1.5\Assemblies\VanillaRacesExpanded-Waster.dll
- False
-