diff --git a/Compatibility.txt b/Compatibility.txt
index f1f472d..8e401fc 100644
--- a/Compatibility.txt
+++ b/Compatibility.txt
@@ -1,2 +1 @@
-Vanilla Psycast Expanded
-- Disables psycasts
\ No newline at end of file
+I'm currently unaware of any uncompatibilities.
\ No newline at end of file
diff --git a/README.md b/README.md
index f56e219..c09603e 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
# RJW_More_
-Adds some more features related to RJW to the game.
+Adds some more features related to RJW to the game. Mod is WIP, will be adding more features in the future and current features may be changed or removed.
## Current features
-- PussyHeal gene
-- Sexfrenzy Psypower
-- Mindbreak Lance
+- Pussyheal gene
+- Sexfrenzy psypower
+- Orgasm psypower
+- MultiOrgasm psypower
+- Mindbreak lance
Any suggestions and ideas are welcome. See [my current ideas](TODOS.md) for what I have already written down.
diff --git a/RJW_More_Genes/1.4/Assemblies/0MultiplayerAPI.dll b/RJW_More_Genes/1.4/Assemblies/0MultiplayerAPI.dll
deleted file mode 100644
index 38b8a0e..0000000
Binary files a/RJW_More_Genes/1.4/Assemblies/0MultiplayerAPI.dll and /dev/null differ
diff --git a/RJW_More_Genes/1.4/Assemblies/RJW_More_Genes.dll b/RJW_More_Genes/1.4/Assemblies/RJW_More_Genes.dll
index 88f8e42..6d965f9 100644
Binary files a/RJW_More_Genes/1.4/Assemblies/RJW_More_Genes.dll and b/RJW_More_Genes/1.4/Assemblies/RJW_More_Genes.dll differ
diff --git a/RJW_More_Genes/1.4/Mods/PsycastExpanded/Assemblies/RJWMoreGenes_VPE.dll b/RJW_More_Genes/1.4/Mods/PsycastExpanded/Assemblies/RJWMoreGenes_VPE.dll
new file mode 100644
index 0000000..586f79e
Binary files /dev/null and b/RJW_More_Genes/1.4/Mods/PsycastExpanded/Assemblies/RJWMoreGenes_VPE.dll differ
diff --git a/RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/AbilityDefs/Nymph.xml b/RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/AbilityDefs/Nymph.xml
new file mode 100644
index 0000000..7228adb
--- /dev/null
+++ b/RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/AbilityDefs/Nymph.xml
@@ -0,0 +1,103 @@
+
+
+
+
+ RJWMG_Orgasm
+ Orgasm
+ Force the target to have an orgasm, stunning them for a short period.
+ Things/Mote/Heart
+ 60
+ 24.9
+ Heart
+ Pawn
+ VFECore.Abilities.Ability_Blank
+
+ true
+ false
+ false
+ true
+ false
+
+
+
+ RJW_M_Nymph
+ 1
+ 1
+ 0.01
+ 12
+ true
+ true
+
+
+ 3
+
+
+
+
+
+ RJWMG_OrgasmCycle
+ MultiOrgasm
+ Force the target to have multiple orgasms over time, each one stunning them shortly.
+ Things/Mote/Heart
+ 60
+ 24.9
+ 2700
+ Heart
+ Pawn
+ VFECore.Abilities.Ability_Blank
+
+ true
+ false
+ false
+ true
+ false
+
+
+
+ RJW_M_Nymph
+ 2
+ 1
+ 0.01
+ 12
+ true
+ true
+
+
+ OrgasmCycle
+ PsychicSensitivity
+
+
+
+
+
+ RJWMG_Sexfrenzy
+ Sexfrenzy
+ Causes nearby pawns to go into a sex frenzy, trying to rape anyone if they can.
+ Things/Mote/Heart
+ 120
+ 14.9
+ 4.9
+ Heart
+ VFECore.Abilities.Ability_Blank
+
+ true
+ false
+ true
+ true
+ true
+
+
+
+ RJW_M_Nymph
+ 4
+ 1
+ 0.15
+ 30
+ true
+ true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/PsycasterPathDefs/Paths.xml b/RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/PsycasterPathDefs/Paths.xml
new file mode 100644
index 0000000..5493fe9
--- /dev/null
+++ b/RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/PsycasterPathDefs/Paths.xml
@@ -0,0 +1,12 @@
+
+
+
+ RJW_M_Nymph
+ Nymph
+ Nymph psycasts are focused on instigating sex, one way or another.
+ UI/Backgrounds/EmpathPath
+ UI/AlternativeBackgrounds/PathBG_Empath
+ Psycasts
+ Nymps are psycasters known to bring sex to their comminuties. Known to arouse with but a few words, particularly powerful nymps can create great orgies.
+
+
\ No newline at end of file
diff --git a/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_Orgasm.xml b/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_Orgasm.xml
new file mode 100644
index 0000000..80e0c3f
--- /dev/null
+++ b/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_Orgasm.xml
@@ -0,0 +1,37 @@
+
+
+
+ Orgasm
+ Orgasm
+ Force the target to have an orgasm, stunning them for a short period.
+ Things/Mote/Heart
+ false
+ false
+ Coagulate_Cast
+ 403
+
+ 12
+ 0.01
+ 3
+
+
+ Verb_CastAbility
+ 1
+ 24.9
+
+ True
+ false
+ false
+ false
+ false
+
+
+
+
+
+
+ Heart
+
+
+
+
\ No newline at end of file
diff --git a/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_OrgasmCycle.xml b/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_OrgasmCycle.xml
new file mode 100644
index 0000000..cd26626
--- /dev/null
+++ b/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_OrgasmCycle.xml
@@ -0,0 +1,43 @@
+
+
+
+ OrgasmCycle
+ MultiOrgasm
+ Force the target to have multiple orgasms over time, each one stunning them shortly.
+ Things/Mote/Heart
+ false
+ false
+ Coagulate_Cast
+ 404
+
+ 18
+ 0.05
+ 45
+
+
+ Verb_CastAbility
+ 1
+ 24.9
+
+ True
+ false
+ false
+ false
+ false
+
+
+
+
+ CompAbilityEffect_GiveHediff
+ OrgasmCycle
+ PsychicSensitivity
+ True
+ -15
+ False
+
+
+ Heart
+
+
+
+
\ No newline at end of file
diff --git a/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml b/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
index b6b4eb7..ba318df 100644
--- a/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
+++ b/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
@@ -7,13 +7,16 @@
Things/Mote/Heart
false
false
- 180000
+
+ 30
+ 0.15
+
Coagulate_Cast
402
Verb_CastAbility
1
- 7.9
+ 14.9
True
True
diff --git a/RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_OrgasmCycle.xml b/RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_OrgasmCycle.xml
new file mode 100644
index 0000000..249ef89
--- /dev/null
+++ b/RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_OrgasmCycle.xml
@@ -0,0 +1,36 @@
+
+
+
+ OrgasmCycle
+ MultiOrgasm
+ multi-orgasm
+ A pawn under the influence of multiorgasm.
+ HediffWithComps
+ (0.5, 0.5, 0.9)
+ false
+ false
+ false
+ 1.0
+ 1.0
+ 1.0
+ false
+
+
+
+
+ 2000
+
+ 3000
+
+
+
+ 200~1000
+
+
+
+
+ true
+
+
+
+
\ No newline at end of file
diff --git a/RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_SexFrenzy.xml b/RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_SexFrenzy.xml
index 082e565..a99c20a 100644
--- a/RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_SexFrenzy.xml
+++ b/RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_SexFrenzy.xml
@@ -17,16 +17,16 @@
-
+
250
-
+
500
- true
+ false
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Orgasm.cs b/RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Orgasm.cs
new file mode 100644
index 0000000..b485a2a
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Orgasm.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VFECore.Abilities;
+using Verse;
+using RimWorld;
+using RimWorld.Planet;
+//using RJW_More_Genes;
+
+
+namespace RJWMoreGenes_VPE
+{
+ public class AbilityExtentsion_Orgasm : AbilityExtension_AbilityMod
+ {
+ public override void Cast(GlobalTargetInfo[] targets, VFECore.Abilities.Ability ability)
+ {
+ base.Cast(targets, ability);
+ foreach (GlobalTargetInfo globalTargetInfo in targets)
+ {
+ Pawn pawn = globalTargetInfo.Thing as Pawn;
+ if(pawn != null && !pawn.Dead)
+ {
+ float num = stunduration * 60;
+ RJW_More_Genes.AbilityUtility.Orgasm(pawn, (int)num);
+ }
+ }
+ }
+
+ public int stunduration;
+ }
+}
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Sexfrenzy.cs b/RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Sexfrenzy.cs
new file mode 100644
index 0000000..8936a7c
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Sexfrenzy.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VFECore.Abilities;
+using Verse;
+using Verse.AI;
+using RimWorld;
+using RimWorld.Planet;
+using rjw;
+using RJW_More_Genes;
+//using RJW_More_Genes;
+
+
+namespace RJWMoreGenes_VPE
+{
+ public class AbilityExtentsion_Sexfrenzy : AbilityExtension_AbilityMod
+ {
+ public override void Cast(GlobalTargetInfo[] targets, VFECore.Abilities.Ability ability)
+ {
+ Log.Message("trigger");
+ base.Cast(targets, ability);
+ foreach (GlobalTargetInfo globalTargetInfo in targets)
+ {
+ foreach (Pawn pawn in AffectedPawns(globalTargetInfo.Cell, globalTargetInfo.Map))
+ {
+ if (pawn != null)
+ {
+ pawn.health.AddHediff(RJW_More_Genes.HediffDefOf.SexFrenzy);
+ }
+ }
+
+ foreach (Pawn pawn in AffectedPawns(globalTargetInfo.Cell, globalTargetInfo.Map))
+ {
+ if (pawn == null || !xxx.can_rape(pawn, true) || pawn.jobs.curJob.def.defName == "GettinRaped" || pawn.jobs.curJob.def.defName == "RapeRandom")
+ {
+ continue;
+ }
+ Pawn pawn2 = FindVictim(pawn);
+ if (pawn2 == null)
+ {
+ continue;
+ }
+ pawn.pather.StopDead();
+ pawn.jobs.StopAll();
+ //pawn.mindState.mentalStateHandler.TryStartMentalState(MentalStateDefOf.RandomRape, null, true, false, null, false, false, false);
+ Job newJob = JobMaker.MakeJob(xxx.RapeRandom, pawn2);
+ pawn.jobs.StartJob(newJob, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true);
+ }
+ }
+
+ }
+
+ public override bool IsEnabledForPawn(VFECore.Abilities.Ability ability, out string reason)
+ {
+ reason = null;
+ if (!RJWSettings.rape_enabled)
+ {
+ reason = "Rape is disabled";
+ return false;
+ }
+ else if (!RJWMGSettings.sexfrenzy)
+ {
+ reason = "Disabled in modsettings";
+ return false;
+ }
+ return true;
+ }
+
+ private IEnumerable AffectedPawns(IntVec3 cell, Map map)
+ {
+ foreach (Pawn pawn in map.mapPawns.AllPawns)
+ {
+ if (cell.DistanceTo(pawn.Position) < this.abilityDef.radius)
+ {
+ yield return pawn;
+ }
+
+ }
+ //IEnumerator enumerator = null;
+ yield break;
+ }
+
+ public Pawn FindVictim(Pawn pawn)
+ {
+ Map m = pawn.Map;
+ IEnumerable source = from x in m.mapPawns.AllPawnsSpawned
+ where x != pawn && xxx.is_not_dying(x) && (xxx.can_get_raped(x) || (xxx.can_be_fucked(x) && x.health.hediffSet.HasHediff(RJW_More_Genes.HediffDefOf.SexFrenzy))) &&
+ !x.Suspended && !x.IsForbidden(pawn) && x.jobs.curJob.def.defName != "GettinRaped" && x.jobs.curJob.def.defName != "RandomRape" &&
+ IntVec3Utility.DistanceTo(pawn.Position, x.Position) < 15 && pawn.CanReserveAndReach(x, PathEndMode.Touch, Danger.Deadly, 1, 0, null, false)
+ select x;
+ if (source != null)
+ {
+ return source.RandomElement();
+ }
+ else
+ {
+ return null;
+ }
+ }
+ }
+}
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/Properties/AssemblyInfo.cs b/RJW_More_Genes/1.4/Source/RJWM_VPE/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..88ed7bf
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJWM_VPE/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("RJWM_VPE")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HP Inc.")]
+[assembly: AssemblyProduct("RJWM_VPE")]
+[assembly: AssemblyCopyright("Copyright © HP Inc. 2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7b1f5db6-fc35-4f63-bb11-3225a9dd0fe7")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/RJWM_VPE.csproj b/RJW_More_Genes/1.4/Source/RJWM_VPE/RJWM_VPE.csproj
new file mode 100644
index 0000000..ef1221b
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJWM_VPE/RJWM_VPE.csproj
@@ -0,0 +1,77 @@
+
+
+
+ Debug
+ AnyCPU
+ {7B1F5DB6-FC35-4F63-BB11-3225A9DD0FE7}
+ Library
+ Properties
+ RJWMoreGenes_VPE
+ RJWMoreGenes_VPE
+ v4.7.2
+ 512
+ true
+
+
+ false
+ none
+ false
+ ..\..\Mods\PsycastExpanded\Assemblies\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll
+ False
+
+
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RJW\1.4\Assemblies\0MultiplayerAPI.dll
+ False
+
+
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll
+ False
+
+
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RJW\1.4\Assemblies\RJW.dll
+ False
+
+
+ ..\..\Assemblies\RJW_More_Genes.dll
+ False
+
+
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll
+ False
+
+
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\workshop\content\294100\2023507013\1.4\Assemblies\VFECore.dll
+ False
+
+
+
+
+
\ No newline at end of file
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs b/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
new file mode 100644
index 0000000..3871b18
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+// 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 ()
@@ -46,7 +38,7 @@ namespace RJW_More_Genes
SexUtility.reduce_rest(this.pawn, 1f);
if (this.ticks_left <= 0)
{
- Log.Message("cycle " + this.cycle);
+ Log.Message("cycle " + this.cycles);
if ((this.pawn.story.traits.HasTrait(TraitDefOf.Masochist)))
{
base.ReadyForNextToil();
@@ -55,7 +47,8 @@ namespace RJW_More_Genes
{
this.ticks_left = this.duration;
AfterSexUtility.processBrokenPawn(this.pawn);
- }
+ AfterSexUtility.processBrokenPawn(this.pawn);
+ }
}
};
toil2.AddFinishAction(delegate
@@ -75,7 +68,7 @@ namespace RJW_More_Genes
}
public int max_duration = 60000;
- public int cycle = 0;
+ public int cycles = 1;
public int min_cycles = 5;
}
}
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 4aa29a6..ba4aaa8 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
@@ -37,6 +37,7 @@
..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RJW\1.4\Assemblies\0MultiplayerAPI.dll
+ False
..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll
@@ -58,18 +59,26 @@
..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll
False
+
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\workshop\content\294100\2023507013\1.4\Assemblies\VFECore.dll
+ False
+
-
+
+
+ ProjectFiles
+
+
\ No newline at end of file
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.sln b/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.sln
index 2e748f3..09086f8 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.sln
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.2.32519.379
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_More_Genes", "RJW_More_Genes.csproj", "{3D62BDB2-ED7B-481B-B00B-0B634D99EC8D}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJWM_VPE", "..\RJWM_VPE\RJWM_VPE.csproj", "{7B1F5DB6-FC35-4F63-BB11-3225A9DD0FE7}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
{3D62BDB2-ED7B-481B-B00B-0B634D99EC8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D62BDB2-ED7B-481B-B00B-0B634D99EC8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D62BDB2-ED7B-481B-B00B-0B634D99EC8D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7B1F5DB6-FC35-4F63-BB11-3225A9DD0FE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7B1F5DB6-FC35-4F63-BB11-3225A9DD0FE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7B1F5DB6-FC35-4F63-BB11-3225A9DD0FE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7B1F5DB6-FC35-4F63-BB11-3225A9DD0FE7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/AbilityUtility.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/AbilityUtility.cs
similarity index 53%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/AbilityUtility.cs
rename to RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/AbilityUtility.cs
index bbf278e..2ba2349 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/AbilityUtility.cs
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/AbilityUtility.cs
@@ -3,7 +3,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Verse.Sound;
using Verse;
+using RimWorld;
using rjw;
using rjw.Modules.Interactions.Helpers;
using rjw.Modules.Interactions.Enums;
@@ -46,5 +48,48 @@ namespace RJW_More_Genes
}
return any_wound_tended;
}
+
+ //Modified copies of jobdriver_sex functions
+ public static void Orgasm(Pawn pawn, int duration = 180, bool isrape = false)
+ {
+ pawn.stances.stunner.StunFor(duration, pawn, false, false);
+ //pawn.pather.StopDead();
+ PlayCumSound(pawn);
+ FleckMaker.ThrowMetaIcon(pawn.Position, pawn.Map, FleckDefOf.Heart, 0.42f);
+ SexUtility.CumFilthGenerator(pawn);
+ //Add some sex satisfaction?
+ }
+
+ public static void PlayCumSound(Pawn pawn)
+ {
+ if (RJWSettings.sounds_enabled)
+ {
+ SoundInfo info = new TargetInfo(pawn.Position, pawn.Map, false);
+ info.volumeFactor = RJWSettings.sounds_cum_volume;
+ SoundDef.Named("Cum").PlayOneShot(info);
+ ExtraCumSound(pawn, info);
+ }
+ }
+
+ public static void ExtraCumSound(Pawn pawn, SoundInfo info)
+ {
+ if (ModsConfig.IsActive("Tory187.RJWAnimAddons.VoicePatch"))
+ {
+ if (pawn.gender == Gender.Female)
+ {
+ SoundDef.Named("Voiceline_FGrunt").PlayOneShot(info);
+ }
+ if (pawn.gender == Gender.Male)
+ {
+ SoundDef.Named("Voiceline_MGrunt").PlayOneShot(info);
+ }
+
+ }
+ else
+ {
+ SoundDef.Named("Sex").PlayOneShot(info);
+ }
+ }
+
}
}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_Orgasm.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_Orgasm.cs
new file mode 100644
index 0000000..368636c
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_Orgasm.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+using Verse.AI;
+namespace RJW_More_Genes
+{
+ public class CompAbilityEffect_Orgasm : CompAbilityEffect
+ {
+ private new CompProperties_AbilityOrgasm Props
+ {
+ get
+ {
+ return (CompProperties_AbilityOrgasm)this.props;
+ }
+ }
+
+ public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
+ {
+ if (target.HasThing)
+ {
+ base.Apply(target, dest);
+ Pawn pawn = target.Thing as Pawn;
+ if (pawn.Dead)
+ {
+ return;
+ }
+ float num = this.parent.def.GetStatValueAbstract(StatDefOf.Ability_Duration, this.parent.pawn) * 60;
+ Log.Message(num.ToString());
+ AbilityUtility.Orgasm(pawn, (int)num);
+ }
+ }
+ }
+}
+
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/Royalty/CompAbilityEffect_PussyHeal.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs
rename to RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_PussyHeal.cs
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/Royalty/CompAbilityEffect_SexFrenzy.cs
similarity index 90%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_SexFrenzy.cs
rename to RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_SexFrenzy.cs
index d5b37a1..3279f68 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbilityEffect_SexFrenzy.cs
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_SexFrenzy.cs
@@ -4,11 +4,9 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Verse;
-using UnityEngine;
using RimWorld;
using rjw;
using Verse.AI;
-using rjw.Modules.Interactions.Helpers;
namespace RJW_More_Genes
{
@@ -28,15 +26,13 @@ namespace RJW_More_Genes
{
if (pawn != null)
{
- Need_Sex needsex = pawn.needs.TryGetNeed();
- needsex.CurLevel = 0f;
pawn.health.AddHediff(HediffDefOf.SexFrenzy);
}
}
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 == "RapeRandom")
+ if(pawn == null || !xxx.can_rape(pawn, true)|| pawn.jobs.curJob.def.defName == "GettinRaped" || pawn.jobs.curJob.def.defName == "RapeRandom")
{
continue;
}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbility_SexInteractionRequirements.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbility_SexInteractionRequirements.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/CompAbility_SexInteractionRequirements.cs
rename to RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbility_SexInteractionRequirements.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityOrgasm.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityOrgasm.cs
new file mode 100644
index 0000000..9a587d0
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityOrgasm.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RimWorld;
+using Verse;
+
+namespace RJW_More_Genes
+{
+ public class CompProperties_AbilityOrgasm : CompProperties_AbilityEffect
+ {
+ public CompProperties_AbilityOrgasm()
+ {
+ this.compClass = typeof(CompAbilityEffect_Orgasm);
+ }
+ }
+}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompProperties_AbilityPussyHeal.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityPussyHeal.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/CompProperties_AbilityPussyHeal.cs
rename to RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityPussyHeal.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompProperties_SexFrenzy.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexFrenzy.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/CompProperties_SexFrenzy.cs
rename to RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexFrenzy.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompProperties_SexInteractionRequirements.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexInteractionRequirements.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/CompProperties_SexInteractionRequirements.cs
rename to RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexInteractionRequirements.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/HediffCompProperties_OrgasmCycle.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/HediffCompProperties_OrgasmCycle.cs
new file mode 100644
index 0000000..203f7ef
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/HediffCompProperties_OrgasmCycle.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+namespace RJW_More_Genes
+{
+ public class HediffCompProperties_OrgasmCycle : HediffCompProperties
+ {
+ public HediffCompProperties_OrgasmCycle()
+ {
+ this.compClass = typeof(HediffComp_OrgasmCycle);
+ }
+ public FloatRange intervalticks;
+ }
+}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/HediffComp_OrgasmCycle.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/HediffComp_OrgasmCycle.cs
new file mode 100644
index 0000000..4b5fbd1
--- /dev/null
+++ b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/HediffComp_OrgasmCycle.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RimWorld;
+using Verse;
+
+namespace RJW_More_Genes
+{
+ public class HediffComp_OrgasmCycle : HediffComp
+ {
+ public HediffCompProperties_OrgasmCycle Props
+ {
+ get
+ {
+ return (HediffCompProperties_OrgasmCycle)this.props;
+ }
+ }
+
+ public override void CompPostMake()
+ {
+ base.CompPostMake();
+ this.Orgasm();
+ }
+
+ public override void CompPostTick(ref float severityAdjustment)
+ {
+ if (Find.TickManager.TicksGame >= this.tickNext)
+ {
+ this.Orgasm();
+ }
+ base.CompPostTick(ref severityAdjustment);
+ }
+
+ public void Orgasm()
+ {
+ AbilityUtility.Orgasm(this.Pawn);
+ this.tickNext = Find.TickManager.TicksGame + (int)this.Props.intervalticks.RandomInRange;
+ }
+
+
+ public int tickNext;
+ }
+}
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/SexInteractionUtility.cs b/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/SexInteractionUtility.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/SexInteractionUtility.cs
rename to RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/SexInteractionUtility.cs
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 6ae26d4..14ac1f8 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.AssemblyReference.cache b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache
index 5cf8a91..8fc668c 100644
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache and b/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.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
deleted file mode 100644
index e69de29..0000000
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 96e9a0e..ed729d0 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 @@
-a03ce3151cc9c700e1bbeaebf770821465310bea
+12d5ecf6156bfd9b12520fa2c747ab2b3e89349c
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 c242e2d..6b2bf1d 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,4 +11,3 @@ 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 88f8e42..6d965f9 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 906167d..fdaf2ac 100644
--- a/RJW_More_Genes/loadFolders.xml
+++ b/RJW_More_Genes/loadFolders.xml
@@ -4,6 +4,7 @@
1.4
1.4/Mods/Biotech
1.4/Mods/Royalty
+ 1.4/Mods/PsycastExpanded
diff --git a/TODOS.md b/TODOS.md
index 55f3f3e..62596d4 100644
--- a/TODOS.md
+++ b/TODOS.md
@@ -7,9 +7,6 @@ Mindbreak lance (improvements)
## Biotech
-Healpussy (improvements)
-- Mood effect depends on relationship between pawns.
-
Aphrodisiac gene
- Increases sexdrive of pawns around pawn
@@ -19,27 +16,20 @@ Cumabsorber gene
Vigorous gene
- Gain rest after sex
-Succubus like xenotype
-- combination of genes to make succubus like xenotype.
+Sexbot
+- Buildable mechanoids which are great at sex.
## 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?)
+Psypenis psypower
+- Temporary give a pawn a penis (fertile?)
+
+Gangbang psypower
+- Down target and have pawns around them rape them.
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 97093ef..68b36e5 100644
--- a/changelog.md
+++ b/changelog.md
@@ -12,4 +12,9 @@ V1.0.7
- 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
+- Changed sexfrenzy from a gene to a psycast
+V1.1.1
+- Fixed error when sexfrenzy hit an animal
+- Add orgasm psypower
+- Add multiorgasm psypower
+- Made all current psypowers compatible with vanilla psycast expanded
\ No newline at end of file