+
+
+ 1
+
+
+
+
\ No newline at end of file
diff --git a/RJW_More_Genes/1.4/Mods/Biotech/Defs/GeneDefs/GeneDefs_AbilityGenes.xml b/RJW_More_Genes/1.4/Mods/Biotech/Defs/GeneDefs/GeneDefs_AbilityGenes.xml
index 88ce930..f0e76ca 100644
--- a/RJW_More_Genes/1.4/Mods/Biotech/Defs/GeneDefs/GeneDefs_AbilityGenes.xml
+++ b/RJW_More_Genes/1.4/Mods/Biotech/Defs/GeneDefs/GeneDefs_AbilityGenes.xml
@@ -23,7 +23,7 @@
-
+
\ No newline at end of file
diff --git a/RJW_More_Genes/1.4/Mods/Biotech/Defs/AbilityDefs/Ability_SexFrenzy.xml b/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
similarity index 95%
rename from RJW_More_Genes/1.4/Mods/Biotech/Defs/AbilityDefs/Ability_SexFrenzy.xml
rename to RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
index a61b4a5..b6b4eb7 100644
--- a/RJW_More_Genes/1.4/Mods/Biotech/Defs/AbilityDefs/Ability_SexFrenzy.xml
+++ b/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
@@ -1,6 +1,6 @@
-
+ SexFrenzyCauses nearby pawns to go into a sex frenzy, trying to rape anyone if they can.
diff --git a/RJW_More_Genes/1.4/Mods/Biotech/Defs/HediffDefs/Hediff_SexFrenzy.xml b/RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_SexFrenzy.xml
similarity index 100%
rename from RJW_More_Genes/1.4/Mods/Biotech/Defs/HediffDefs/Hediff_SexFrenzy.xml
rename to RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_SexFrenzy.xml
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/0265eff9-8a1f-4473-9452-ca07749abda9.vsidx b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/0265eff9-8a1f-4473-9452-ca07749abda9.vsidx
deleted file mode 100644
index 7d21044..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/0265eff9-8a1f-4473-9452-ca07749abda9.vsidx and /dev/null differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/2b943581-fc57-41b2-98a7-dd3e54bac373.vsidx b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/2b943581-fc57-41b2-98a7-dd3e54bac373.vsidx
deleted file mode 100644
index 99bdd6b..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/2b943581-fc57-41b2-98a7-dd3e54bac373.vsidx and /dev/null differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/2ff8cfdc-fefb-4674-958d-af2099eb959e.vsidx b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/2ff8cfdc-fefb-4674-958d-af2099eb959e.vsidx
deleted file mode 100644
index eb14913..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/2ff8cfdc-fefb-4674-958d-af2099eb959e.vsidx and /dev/null differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/3343a58d-967d-4f3f-b25c-36a0eaf8353b.vsidx b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/3343a58d-967d-4f3f-b25c-36a0eaf8353b.vsidx
new file mode 100644
index 0000000..bfb35cc
Binary files /dev/null and b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/3343a58d-967d-4f3f-b25c-36a0eaf8353b.vsidx differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/3e31c61b-60ec-4083-a4e1-f629c9b4a048.vsidx b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/3e31c61b-60ec-4083-a4e1-f629c9b4a048.vsidx
new file mode 100644
index 0000000..21ea5ea
Binary files /dev/null and b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/3e31c61b-60ec-4083-a4e1-f629c9b4a048.vsidx differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/448058a6-4c4d-49f8-932e-a1cb87677fee.vsidx b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/448058a6-4c4d-49f8-932e-a1cb87677fee.vsidx
new file mode 100644
index 0000000..24b3f1e
Binary files /dev/null and b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/448058a6-4c4d-49f8-932e-a1cb87677fee.vsidx differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo
index 6586344..e88b473 100644
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo and b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs
index 08d19fe..f36193d 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs
@@ -95,6 +95,11 @@ namespace RJW_More_Genes
reason = "Rape is disabled";
return true;
}
+ else if (!RJWMGSettings.gene_pussyheal)
+ {
+ reason = "Disabled in modsettings";
+ return true;
+ }
return false;
}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_SexFrenzy.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_SexFrenzy.cs
index 13f8ad6..d5b37a1 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_SexFrenzy.cs
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_SexFrenzy.cs
@@ -36,7 +36,7 @@ namespace RJW_More_Genes
foreach (Pawn pawn in AffectedPawns(target,this.parent.pawn.Map))
{
- if(pawn == null || !xxx.can_rape(pawn, false)|| pawn.jobs.curJob.def.defName == "GettinRaped" || pawn.jobs.curJob.def.defName == "SexFrenzy")
+ if(pawn == null || !xxx.can_rape(pawn, false)|| pawn.jobs.curJob.def.defName == "GettinRaped" || pawn.jobs.curJob.def.defName == "RapeRandom")
{
continue;
}
@@ -51,7 +51,6 @@ namespace RJW_More_Genes
Job newJob = JobMaker.MakeJob(xxx.RapeRandom, pawn2);
pawn.jobs.StartJob(newJob, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true);
}
- Log.Message("test");
}
public override bool GizmoDisabled(out string reason)
@@ -62,6 +61,11 @@ namespace RJW_More_Genes
reason = "Rape is disabled";
return true;
}
+ else if (!RJWMGSettings.sexfrenzy)
+ {
+ reason = "Disabled in modsettings";
+ return true;
+ }
return false;
}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompTargetEffect_PsychicMindbreak.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompTargetEffect_PsychicMindbreak.cs
new file mode 100644
index 0000000..e656dcd
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompTargetEffect_PsychicMindbreak.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+using rjw;
+using Verse.AI;
+namespace RJW_More_Genes
+{
+ public class CompTargetEffect_PsychicMindbreak : CompTargetEffect
+ {
+ public override void DoEffectOn(Pawn user, Thing target)
+ {
+ Pawn pawn = (Pawn)target;
+ if (pawn.Dead)
+ {
+ return;
+ }
+ pawn.pather.StopDead();
+ pawn.jobs.StopAll();
+ //pawn.mindState.mentalStateHandler.TryStartMentalState(MentalStateDefOf.RandomRape, null, true, false, null, false, false, false);
+ Job newJob = JobMaker.MakeJob(JobDefOf.Mindbreak, pawn, null, pawn.Position);
+ pawn.jobs.StartJob(newJob, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true);
+
+ }
+ }
+}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/HediffDefOf.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/HediffDefOf.cs
index b46cd64..941bbf6 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/HediffDefOf.cs
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/HediffDefOf.cs
@@ -11,7 +11,7 @@ namespace RJW_More_Genes
[DefOf]
public static class HediffDefOf
{
- [MayRequireBiotech]
+ [MayRequireRoyalty]
public static readonly HediffDef SexFrenzy;
}
}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDefOf.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDefOf.cs
new file mode 100644
index 0000000..4e69d4d
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDefOf.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+
+namespace RJW_More_Genes
+{
+ [DefOf]
+ public static class JobDefOf
+ {
+ public static readonly JobDef Mindbreak;
+ }
+}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDriver_Mindbreak.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDriver_Mindbreak.cs
new file mode 100644
index 0000000..143d6b3
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDriver_Mindbreak.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+using rjw;
+using RimWorld;
+using Multiplayer.API;
+namespace RJW_More_Genes
+{
+ public class JobDriver_Mindbreak : JobDriver_SexBaseInitiator
+ {
+ //Slightly modifiied version of JobDriver_Masturbate from rjw
+ public override bool TryMakePreToilReservations(bool errorOnFailed)
+ {
+ return true;
+ }
+
+ [SyncMethod(SyncContext.None)]
+ public void rapid_orgasms()
+ {
+ this.ticks_left = this.duration;
+ this.cycle++;
+ }
+ protected override IEnumerable MakeNewToils()
+ {
+ this.setup_ticks();
+ //this.duration = (int)(100 * Rand.Range(1.5f, 2.5f));
+ //this.rapid_orgasms();
+ Toil toil2 = Toils_General.Wait(this.max_duration, TargetIndex.None);
+ toil2.handlingFacing = true;
+ toil2.initAction = delegate ()
+ {
+ base.Start();
+ //this.Sexprops.isRape = true;
+ };
+ toil2.tickAction = delegate ()
+ {
+ if (this.pawn.IsHashIntervalTick(this.ticks_between_hearts))
+ {
+ base.ThrowMetaIconF(this.pawn.Position, this.pawn.Map, FleckDefOf.Heart);
+ }
+ base.SexTick(this.pawn, null, true, true);
+ SexUtility.reduce_rest(this.pawn, 1f);
+ if (this.ticks_left <= 0)
+ {
+ Log.Message("cycle " + this.cycle);
+ if ((this.pawn.story.traits.HasTrait(TraitDefOf.Masochist)))
+ {
+ base.ReadyForNextToil();
+ }
+ else
+ {
+ this.ticks_left = this.duration;
+ AfterSexUtility.processBrokenPawn(this.pawn);
+ }
+ }
+ };
+ toil2.AddFinishAction(delegate
+ {
+ base.End();
+ });
+ yield return toil2;
+ yield return new Toil
+ {
+ initAction = delegate ()
+ {
+ SexUtility.Aftersex(this.Sexprops);
+ },
+ defaultCompleteMode = ToilCompleteMode.Instant
+ };
+ yield break;
+ }
+
+ public int max_duration = 60000;
+ public int cycle = 0;
+ public int min_cycles = 5;
+ }
+}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/PatchProcessSex.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/PatchProcessSex.cs
index 14a9d57..aefaa80 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/PatchProcessSex.cs
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/PatchProcessSex.cs
@@ -5,7 +5,6 @@ using System.Text;
using System.Threading.Tasks;
using HarmonyLib;
using rjw;
-using RimWorld;
using Verse;
namespace RJW_More_Genes
{
@@ -16,8 +15,11 @@ namespace RJW_More_Genes
//[HarmonyPostfix]
public static void Postfix(SexProps props)
{
- Log.Message("triggered");
- AbilityUtility.PussyHeal(props);
+ if(RJWMGSettings.gene_pussyheal)
+ {
+ AbilityUtility.PussyHeal(props);
+ Log.Message("triggered");
+ }
}
}
}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJWMGSettingController.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJWMGSettingController.cs
new file mode 100644
index 0000000..d1edf95
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJWMGSettingController.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using UnityEngine;
+namespace RJW_More_Genes
+{
+ public class RJWMGSettingController : Mod
+ {
+ public RJWMGSettingController(ModContentPack content) : base(content)
+ {
+ base.GetSettings();
+ }
+
+ public override string SettingsCategory()
+ {
+ return "RJW More Genes";
+ }
+
+ public override void DoSettingsWindowContents(Rect inRect)
+ {
+ RJWMGSettings.DoWindowContents(inRect);
+ }
+ }
+}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJWMGSettings.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJWMGSettings.cs
new file mode 100644
index 0000000..ac0bb2c
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJWMGSettings.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using UnityEngine;
+namespace RJW_More_Genes
+{
+ public class RJWMGSettings : ModSettings
+ {
+ public static void DoWindowContents(Rect inRect)
+ {
+ //Copied from RJW settings mostly
+ Rect outRect = new Rect(0f, 30f, inRect.width, inRect.height - 30f);
+ Rect rect = new Rect(0f, 0f, inRect.width - 16f, inRect.height + 300f);
+ //Widgets.BeginScrollView(outRect, ref RJWSettings.scrollPosition, rect, true);
+ Listing_Standard listing_Standard = new Listing_Standard();
+ listing_Standard.maxOneColumn = true;
+ listing_Standard.ColumnWidth = rect.width / 2.05f;
+ listing_Standard.Begin(rect);
+ listing_Standard.Gap(24f);
+ listing_Standard.CheckboxLabeled("gene pussyheal", ref gene_pussyheal, "disable the effects of the gene", 0f, 1f);
+ listing_Standard.CheckboxLabeled("sexfrenzy", ref sexfrenzy, "disable the effects", 0f, 1f);
+ listing_Standard.End();
+ }
+
+ public override void ExposeData()
+ {
+ base.ExposeData();
+ Scribe_Values.Look(ref RJWMGSettings.gene_pussyheal, "gene_pussyheal", RJWMGSettings.gene_pussyheal, true);
+ Scribe_Values.Look(ref RJWMGSettings.sexfrenzy, "sexfrenzy", RJWMGSettings.sexfrenzy, true);
+ }
+ public static bool gene_pussyheal = true;
+ public static bool sexfrenzy = true;
+ }
+}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj b/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj
index a7534f0..4aa29a6 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj
@@ -35,6 +35,9 @@
..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\Shaba_Addons\Assemblies\0Harmony.dllFalse
+
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RJW\1.4\Assemblies\0MultiplayerAPI.dll
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dllFalse
@@ -64,14 +67,19 @@
+
+
+
+
+
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d806c6e..6ae26d4 100644
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CopyComplete b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache
index 0bc5bff..96e9a0e 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f59e2df566da23df4599eff4fecc10000904942f
+a03ce3151cc9c700e1bbeaebf770821465310bea
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt
index 6b2bf1d..c242e2d 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt
@@ -11,3 +11,4 @@ C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\1.4\
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.AssemblyReference.cache
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.CoreCompileInputs.cache
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.dll
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.CopyComplete
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll
index f426558..88f8e42 100644
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll and b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll differ
diff --git a/RJW_More_Genes/loadFolders.xml b/RJW_More_Genes/loadFolders.xml
index f201600..906167d 100644
--- a/RJW_More_Genes/loadFolders.xml
+++ b/RJW_More_Genes/loadFolders.xml
@@ -3,6 +3,7 @@
/
1.4
1.4/Mods/Biotech
+
1.4/Mods/Royalty
diff --git a/TODOS.txt b/TODOS.txt
index a3497ed..6cf451b 100644
--- a/TODOS.txt
+++ b/TODOS.txt
@@ -1,18 +1,46 @@
-Healpussy
+Points with (improvements) behind them are things already implemented, but things where I want to add improvements.
+
+Vanilla
+Mindbreak lance (improvements)
+- Allow pawn to be moved while mindbreaking
+- Dont let combat interrupt mindbreak
+
+
+Biotech
+Healpussy (improvements)
- Mood effect depends on relationship between pawns.
- Add sex interaction to have a female, female animal vaginal interaction, animal scissoring?
--
-
-Sex frenzy gene
-- Add Special Mind break, Run around colony and cause other pawns to go into random rape.
Aphrodisiac gene
- Increases sexdrive of pawns around pawn
Cumabsorber gene
-- Gain benefits after cum enters any orfice, rest? combat?
+- Gain benefits after cum enters any orfice, rest? combat? work?
Vigorous gene
- Gain rest after sex
-
\ No newline at end of file
+Succubus like xenotype
+- combination of genes to make succubus like xenotype.
+
+Royalty
+Add compatibility with vanilla expanded psypowers
+
+Sex frenzy psycast (improvements)
+- Add Special Mind break, Run around colony and cause other pawns to go into random rape.
+- Allow it to effect drafted pawns and allow drafted pawns to be raped.
+
+Orgasm psypower
+- Force a pawn to orgasm, count as a short stun
+
+Orgasm Cycle psypower
+- Force a pawn to several orgasm over x time, each orgasm works as a short stun
+
+Fertility psypower
+- Increase a pawns fertility for some time
+
+Sexdrive psypower
+- Increase the sexdrive of a pawn for some time.
+
+ Psypenis psypower
+ - Temporary give a pawn a penis (fertile?)
\ No newline at end of file
diff --git a/changelog b/changelog.md
similarity index 87%
rename from changelog
rename to changelog.md
index 9f60c20..97093ef 100644
--- a/changelog
+++ b/changelog.md
@@ -9,4 +9,7 @@ V1.0.6
- Allowed Healpussy to work passively
- Added checks for RJWsettings and if the pawn has a vagina.
V1.0.7
-- Removed Dependency on biotech, Mod will "function" without biotech enabled, but has no non-biotech required content currently.
\ No newline at end of file
+- Removed Dependency on biotech, Mod will "function" without biotech enabled, but has no non-biotech required content currently.
+V1.1.0
+- Added mindbreak lance
+- Changed sexfrenzy from a gene to a psycast
\ No newline at end of file