diff --git a/1.4/Assemblies/RJW_More_Genes.dll b/1.4/Assemblies/RJW_More_Genes.dll
new file mode 100644
index 0000000..aaa2793
Binary files /dev/null and b/1.4/Assemblies/RJW_More_Genes.dll differ
diff --git a/RJW_More_Genes/1.4/Defs/JobDefs/Jobs_Sex.xml b/1.4/Defs/JobDefs/Jobs_Sex.xml
similarity index 100%
rename from RJW_More_Genes/1.4/Defs/JobDefs/Jobs_Sex.xml
rename to 1.4/Defs/JobDefs/Jobs_Sex.xml
diff --git a/RJW_More_Genes/1.4/Defs/ThingDefs_Misc/Apparel_Utility.xml b/1.4/Defs/ThingDefs_Misc/Apparel_Utility.xml
similarity index 100%
rename from RJW_More_Genes/1.4/Defs/ThingDefs_Misc/Apparel_Utility.xml
rename to 1.4/Defs/ThingDefs_Misc/Apparel_Utility.xml
diff --git a/RJW_More_Genes/1.4/Mods/Biotech/Defs/AbilityDefs/Ability_PussyHeal.xml b/1.4/Mods/Biotech/Defs/AbilityDefs/Ability_PussyHeal.xml
similarity index 96%
rename from RJW_More_Genes/1.4/Mods/Biotech/Defs/AbilityDefs/Ability_PussyHeal.xml
rename to 1.4/Mods/Biotech/Defs/AbilityDefs/Ability_PussyHeal.xml
index d48c4c2..5071f93 100644
--- a/RJW_More_Genes/1.4/Mods/Biotech/Defs/AbilityDefs/Ability_PussyHeal.xml
+++ b/1.4/Mods/Biotech/Defs/AbilityDefs/Ability_PussyHeal.xml
@@ -8,7 +8,6 @@
false
true
false
- 60000
Mote_CoagulateStencil
Coagulate
Coagulate_Cast
diff --git a/1.4/Mods/Biotech/Defs/GeneDefs/GeneDefs_AbilityGenes.xml b/1.4/Mods/Biotech/Defs/GeneDefs/GeneDefs_AbilityGenes.xml
new file mode 100644
index 0000000..f87acb9
--- /dev/null
+++ b/1.4/Mods/Biotech/Defs/GeneDefs/GeneDefs_AbilityGenes.xml
@@ -0,0 +1,26 @@
+
+
+
+ rjw_genes_pussyhealer
+
+ pussyhealer
+ Carriers of this gene are able use vaginal sex to tend to other's wounds.
+ Things/Mote/Heart
+ Ability
+
+ PussyHeal
+
+
+ PussyHeal
+
+ -1
+ 13
+
+
+ life
+ clotter
+ tender
+
+
+
+
\ No newline at end of file
diff --git a/RJW_More_Genes/1.4/Mods/Biotech/Defs/JobDefs/Jobs_SexAbility.xml b/1.4/Mods/Biotech/Defs/JobDefs/Jobs_SexAbility.xml
similarity index 100%
rename from RJW_More_Genes/1.4/Mods/Biotech/Defs/JobDefs/Jobs_SexAbility.xml
rename to 1.4/Mods/Biotech/Defs/JobDefs/Jobs_SexAbility.xml
diff --git a/RJW_More_Genes/1.4/Mods/Biotech/Defs/ThoughtDefs/Thoughts_SexAbility.xml b/1.4/Mods/Biotech/Defs/ThoughtDefs/Thoughts_SexAbility.xml
similarity index 100%
rename from RJW_More_Genes/1.4/Mods/Biotech/Defs/ThoughtDefs/Thoughts_SexAbility.xml
rename to 1.4/Mods/Biotech/Defs/ThoughtDefs/Thoughts_SexAbility.xml
diff --git a/1.4/Mods/PsycastExpanded/Assemblies/RJWMoreGenes_VPE.dll b/1.4/Mods/PsycastExpanded/Assemblies/RJWMoreGenes_VPE.dll
new file mode 100644
index 0000000..77e62fb
Binary files /dev/null and b/1.4/Mods/PsycastExpanded/Assemblies/RJWMoreGenes_VPE.dll differ
diff --git a/RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/AbilityDefs/Nymph.xml b/1.4/Mods/PsycastExpanded/Defs/AbilityDefs/Nymph.xml
similarity index 95%
rename from RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/AbilityDefs/Nymph.xml
rename to 1.4/Mods/PsycastExpanded/Defs/AbilityDefs/Nymph.xml
index 7228adb..918d585 100644
--- a/RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/AbilityDefs/Nymph.xml
+++ b/1.4/Mods/PsycastExpanded/Defs/AbilityDefs/Nymph.xml
@@ -72,7 +72,7 @@
RJWMG_Sexfrenzy
- Causes nearby pawns to go into a sex frenzy, trying to rape anyone if they can.
+ Causes victims to go into a sex frenzy, trying to rape anyone if they can.\n\nThis may fail if victims aren't attracted to any valid targets.
Things/Mote/Heart
120
14.9
diff --git a/RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/PsycasterPathDefs/Paths.xml b/1.4/Mods/PsycastExpanded/Defs/PsycasterPathDefs/Paths.xml
similarity index 100%
rename from RJW_More_Genes/1.4/Mods/PsycastExpanded/Defs/PsycasterPathDefs/Paths.xml
rename to 1.4/Mods/PsycastExpanded/Defs/PsycasterPathDefs/Paths.xml
diff --git a/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_Orgasm.xml b/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_Orgasm.xml
similarity index 100%
rename from RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_Orgasm.xml
rename to 1.4/Mods/Royalty/Defs/AbilityDefs/Ability_Orgasm.xml
diff --git a/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_OrgasmCycle.xml b/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_OrgasmCycle.xml
similarity index 100%
rename from RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_OrgasmCycle.xml
rename to 1.4/Mods/Royalty/Defs/AbilityDefs/Ability_OrgasmCycle.xml
diff --git a/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml b/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
similarity index 85%
rename from RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
rename to 1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
index ba318df..a5045ef 100644
--- a/RJW_More_Genes/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
+++ b/1.4/Mods/Royalty/Defs/AbilityDefs/Ability_SexFrenzy.xml
@@ -3,7 +3,7 @@
SexFrenzy
- Causes nearby pawns to go into a sex frenzy, trying to rape anyone if they can.
+ Causes victims to go into a sex frenzy, trying to rape anyone if they can.\n\nThis may fail if victims aren't attracted to any valid targets.
Things/Mote/Heart
false
false
diff --git a/RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_OrgasmCycle.xml b/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_OrgasmCycle.xml
similarity index 100%
rename from RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_OrgasmCycle.xml
rename to 1.4/Mods/Royalty/Defs/HediffDefs/Hediff_OrgasmCycle.xml
diff --git a/RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_SexFrenzy.xml b/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_SexFrenzy.xml
similarity index 100%
rename from RJW_More_Genes/1.4/Mods/Royalty/Defs/HediffDefs/Hediff_SexFrenzy.xml
rename to 1.4/Mods/Royalty/Defs/HediffDefs/Hediff_SexFrenzy.xml
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Orgasm.cs b/1.4/Source/RJWM_VPE/AbilityExtentsion_Orgasm.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Orgasm.cs
rename to 1.4/Source/RJWM_VPE/AbilityExtentsion_Orgasm.cs
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Sexfrenzy.cs b/1.4/Source/RJWM_VPE/AbilityExtentsion_Sexfrenzy.cs
similarity index 94%
rename from RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Sexfrenzy.cs
rename to 1.4/Source/RJWM_VPE/AbilityExtentsion_Sexfrenzy.cs
index 8936a7c..f8ab14c 100644
--- a/RJW_More_Genes/1.4/Source/RJWM_VPE/AbilityExtentsion_Sexfrenzy.cs
+++ b/1.4/Source/RJWM_VPE/AbilityExtentsion_Sexfrenzy.cs
@@ -72,7 +72,7 @@ namespace RJWMoreGenes_VPE
{
foreach (Pawn pawn in map.mapPawns.AllPawns)
{
- if (cell.DistanceTo(pawn.Position) < this.abilityDef.radius)
+ if (cell.DistanceTo(pawn.Position) < this.abilityDef.radius && pawn.RaceProps.Humanlike)
{
yield return pawn;
}
@@ -88,7 +88,7 @@ namespace RJWMoreGenes_VPE
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)
+ IntVec3Utility.DistanceTo(pawn.Position, x.Position) < 15 && pawn.CanReserveAndReach(x, PathEndMode.Touch, Danger.Deadly, 1, 0, null, false) && SexAppraiser.would_fuck(pawn, x, false, true, false) > 0f
select x;
if (source != null)
{
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/Properties/AssemblyInfo.cs b/1.4/Source/RJWM_VPE/Properties/AssemblyInfo.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJWM_VPE/Properties/AssemblyInfo.cs
rename to 1.4/Source/RJWM_VPE/Properties/AssemblyInfo.cs
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/RJWM_VPE.csproj b/1.4/Source/RJWM_VPE/RJWM_VPE.csproj
similarity index 92%
rename from RJW_More_Genes/1.4/Source/RJWM_VPE/RJWM_VPE.csproj
rename to 1.4/Source/RJWM_VPE/RJWM_VPE.csproj
index ef1221b..7493538 100644
--- a/RJW_More_Genes/1.4/Source/RJWM_VPE/RJWM_VPE.csproj
+++ b/1.4/Source/RJWM_VPE/RJWM_VPE.csproj
@@ -44,11 +44,7 @@
False
- ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RJW\1.4\Assemblies\RJW.dll
- False
-
-
- ..\..\Assemblies\RJW_More_Genes.dll
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\rjw-master\1.4\Assemblies\RJW.dll
False
@@ -73,5 +69,12 @@
+
+
+ {3d62bdb2-ed7b-481b-b00b-0b634d99ec8d}
+ RJW_More_Genes
+ 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/1.4/Source/RJWM_VPE/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
rename to 1.4/Source/RJWM_VPE/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/1.4/Source/RJWM_VPE/obj/Debug/DesignTimeResolveAssemblyReferences.cache
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/DesignTimeResolveAssemblyReferences.cache
rename to 1.4/Source/RJWM_VPE/obj/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/1.4/Source/RJWM_VPE/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/1.4/Source/RJWM_VPE/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..de3e4b6
Binary files /dev/null and b/1.4/Source/RJWM_VPE/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.AssemblyReference.cache b/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.AssemblyReference.cache
similarity index 87%
rename from RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.AssemblyReference.cache
rename to 1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.AssemblyReference.cache
index ba5ae81..d9f0e9f 100644
Binary files a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.AssemblyReference.cache and b/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.AssemblyReference.cache differ
diff --git a/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.CoreCompileInputs.cache b/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..c7c9b62
--- /dev/null
+++ b/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+221b66fda805d8513bce6406ce04f5833ddeb68d
diff --git a/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.FileListAbsolute.txt b/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..0223130
--- /dev/null
+++ b/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.FileListAbsolute.txt
@@ -0,0 +1,9 @@
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJWM_VPE\obj\Debug\RJWM_VPE.csproj.AssemblyReference.cache
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJWM_VPE\obj\Debug\RJWM_VPE.csproj.CoreCompileInputs.cache
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Mods\PsycastExpanded\Assemblies\RJWMoreGenes_VPE.dll
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJWM_VPE\obj\Debug\RJWMoreGenes_VPE.dll
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJWM_VPE\obj\Debug\RJWM_VPE.csproj.CopyComplete
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\1.4\Mods\PsycastExpanded\Assemblies\RJWMoreGenes_VPE.dll
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\1.4\Source\RJWM_VPE\obj\Debug\RJWM_VPE.csproj.AssemblyReference.cache
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\1.4\Source\RJWM_VPE\obj\Debug\RJWM_VPE.csproj.CoreCompileInputs.cache
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\1.4\Source\RJWM_VPE\obj\Debug\RJWMoreGenes_VPE.dll
diff --git a/1.4/Source/RJWM_VPE/obj/Debug/RJWMoreGenes_VPE.dll b/1.4/Source/RJWM_VPE/obj/Debug/RJWMoreGenes_VPE.dll
new file mode 100644
index 0000000..77e62fb
Binary files /dev/null and b/1.4/Source/RJWM_VPE/obj/Debug/RJWMoreGenes_VPE.dll differ
diff --git a/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/15ef052f-a9dc-4b67-a3b7-2c892b0e7b5e.vsidx b/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/15ef052f-a9dc-4b67-a3b7-2c892b0e7b5e.vsidx
new file mode 100644
index 0000000..7ffd93e
Binary files /dev/null and b/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/15ef052f-a9dc-4b67-a3b7-2c892b0e7b5e.vsidx differ
diff --git a/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/4f145fcf-4386-4a08-8364-c9c8186bb18a.vsidx b/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/4f145fcf-4386-4a08-8364-c9c8186bb18a.vsidx
new file mode 100644
index 0000000..03143c3
Binary files /dev/null and b/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/4f145fcf-4386-4a08-8364-c9c8186bb18a.vsidx differ
diff --git a/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/6d1fcf05-a934-4f78-8615-7dac3d32ea46.vsidx b/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/6d1fcf05-a934-4f78-8615-7dac3d32ea46.vsidx
new file mode 100644
index 0000000..b68a421
Binary files /dev/null and b/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/6d1fcf05-a934-4f78-8615-7dac3d32ea46.vsidx differ
diff --git a/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/8e9c036b-d7a9-45d6-a1ab-ec43e37790e2.vsidx b/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/8e9c036b-d7a9-45d6-a1ab-ec43e37790e2.vsidx
new file mode 100644
index 0000000..8058742
Binary files /dev/null and b/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/8e9c036b-d7a9-45d6-a1ab-ec43e37790e2.vsidx differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/read.lock b/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/read.lock
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/read.lock
rename to 1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/read.lock
diff --git a/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo b/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo
new file mode 100644
index 0000000..affd29f
Binary files /dev/null and b/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/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx b/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx
rename to 1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx b/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx
rename to 1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx b/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx
rename to 1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx b/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx
rename to 1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/read.lock b/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/read.lock
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/read.lock
rename to 1.4/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/read.lock
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/CompTargetEffect_PsychicMindbreak.cs b/1.4/Source/RJW_More_Genes/CompTargetEffect_PsychicMindbreak.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/CompTargetEffect_PsychicMindbreak.cs
rename to 1.4/Source/RJW_More_Genes/CompTargetEffect_PsychicMindbreak.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/GeneDefOf.cs b/1.4/Source/RJW_More_Genes/GeneDefOf.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/GeneDefOf.cs
rename to 1.4/Source/RJW_More_Genes/GeneDefOf.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/GeneUtility.cs b/1.4/Source/RJW_More_Genes/GeneUtility.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/GeneUtility.cs
rename to 1.4/Source/RJW_More_Genes/GeneUtility.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/HarmonyInit.cs b/1.4/Source/RJW_More_Genes/HarmonyInit.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/HarmonyInit.cs
rename to 1.4/Source/RJW_More_Genes/HarmonyInit.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/HediffDefOf.cs b/1.4/Source/RJW_More_Genes/HediffDefOf.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/HediffDefOf.cs
rename to 1.4/Source/RJW_More_Genes/HediffDefOf.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDefOf.cs b/1.4/Source/RJW_More_Genes/JobDefOf.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDefOf.cs
rename to 1.4/Source/RJW_More_Genes/JobDefOf.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDriver_CastAbilityAfterSex.cs b/1.4/Source/RJW_More_Genes/JobDriver_CastAbilityAfterSex.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDriver_CastAbilityAfterSex.cs
rename to 1.4/Source/RJW_More_Genes/JobDriver_CastAbilityAfterSex.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDriver_Mindbreak.cs b/1.4/Source/RJW_More_Genes/JobDriver_Mindbreak.cs
similarity index 91%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDriver_Mindbreak.cs
rename to 1.4/Source/RJW_More_Genes/JobDriver_Mindbreak.cs
index 226a714..c8de008 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/JobDriver_Mindbreak.cs
+++ b/1.4/Source/RJW_More_Genes/JobDriver_Mindbreak.cs
@@ -7,7 +7,6 @@ using Verse;
using Verse.AI;
using rjw;
using RimWorld;
-using Multiplayer.API;
namespace RJW_More_Genes
{
public class JobDriver_Mindbreak : JobDriver_SexBaseInitiator
@@ -21,11 +20,13 @@ namespace RJW_More_Genes
protected override IEnumerable MakeNewToils()
{
this.setup_ticks();
+ List list = new List();
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 ()
@@ -46,8 +47,9 @@ namespace RJW_More_Genes
else
{
this.ticks_left = this.duration;
- AfterSexUtility.processBrokenPawn(this.pawn);
- AfterSexUtility.processBrokenPawn(this.pawn);
+
+ AfterSexUtility.processBrokenPawn(this.pawn, list);
+ AfterSexUtility.processBrokenPawn(this.pawn, list);
}
}
};
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/MentalStateDefOf.cs b/1.4/Source/RJW_More_Genes/MentalStateDefOf.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/MentalStateDefOf.cs
rename to 1.4/Source/RJW_More_Genes/MentalStateDefOf.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/PatchProcessSex.cs b/1.4/Source/RJW_More_Genes/PatchProcessSex.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/PatchProcessSex.cs
rename to 1.4/Source/RJW_More_Genes/PatchProcessSex.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Properties/AssemblyInfo.cs b/1.4/Source/RJW_More_Genes/Properties/AssemblyInfo.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Properties/AssemblyInfo.cs
rename to 1.4/Source/RJW_More_Genes/Properties/AssemblyInfo.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJWMGSettingController.cs b/1.4/Source/RJW_More_Genes/RJWMGSettingController.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/RJWMGSettingController.cs
rename to 1.4/Source/RJW_More_Genes/RJWMGSettingController.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJWMGSettings.cs b/1.4/Source/RJW_More_Genes/RJWMGSettings.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/RJWMGSettings.cs
rename to 1.4/Source/RJW_More_Genes/RJWMGSettings.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj b/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj
similarity index 93%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj
rename to 1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj
index ba4aaa8..cb4f45e 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj
+++ b/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj
@@ -44,7 +44,7 @@
False
- ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RJW\1.4\Assemblies\RJW.dll
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\rjw-master\1.4\Assemblies\RJW.dll
False
@@ -55,6 +55,10 @@
+
+ ..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.dll
+ False
+
..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll
False
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj.user b/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj.user
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj.user
rename to 1.4/Source/RJW_More_Genes/RJW_More_Genes.csproj.user
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.sln b/1.4/Source/RJW_More_Genes/RJW_More_Genes.sln
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/RJW_More_Genes.sln
rename to 1.4/Source/RJW_More_Genes/RJW_More_Genes.sln
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/AbilityUtility.cs b/1.4/Source/RJW_More_Genes/Royalty/AbilityUtility.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/AbilityUtility.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/AbilityUtility.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_Orgasm.cs b/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_Orgasm.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_Orgasm.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_Orgasm.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_PussyHeal.cs b/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_PussyHeal.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_PussyHeal.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_PussyHeal.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_SexFrenzy.cs b/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_SexFrenzy.cs
similarity index 82%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_SexFrenzy.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_SexFrenzy.cs
index 3279f68..9430f15 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_SexFrenzy.cs
+++ b/1.4/Source/RJW_More_Genes/Royalty/CompAbilityEffect_SexFrenzy.cs
@@ -69,7 +69,7 @@ namespace RJW_More_Genes
{
foreach (Pawn pawn in map.mapPawns.AllPawns)
{
- if (target.Cell.DistanceTo(pawn.Position) < this.Props.radius)
+ if (target.Cell.DistanceTo(pawn.Position) < this.Props.radius && pawn.RaceProps.Humanlike)
{
yield return pawn;
}
@@ -87,9 +87,9 @@ namespace RJW_More_Genes
{
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(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)
+ where x != pawn && xxx.is_not_dying(x) && (xxx.can_get_raped(x) || (xxx.can_be_fucked(x) && x.health.hediffSet.HasHediff(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) && SexAppraiser.would_fuck(pawn, x, false, true, false) > 0f
select x;
if (source != null)
{
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbility_SexInteractionRequirements.cs b/1.4/Source/RJW_More_Genes/Royalty/CompAbility_SexInteractionRequirements.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompAbility_SexInteractionRequirements.cs
rename to 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/1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityOrgasm.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityOrgasm.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityOrgasm.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityPussyHeal.cs b/1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityPussyHeal.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityPussyHeal.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/CompProperties_AbilityPussyHeal.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexFrenzy.cs b/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexFrenzy.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexFrenzy.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexFrenzy.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexInteractionRequirements.cs b/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexInteractionRequirements.cs
similarity index 98%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexInteractionRequirements.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexInteractionRequirements.cs
index b268ec7..46be0aa 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexInteractionRequirements.cs
+++ b/1.4/Source/RJW_More_Genes/Royalty/CompProperties_SexInteractionRequirements.cs
@@ -17,7 +17,7 @@ namespace RJW_More_Genes
{
this.compClass = typeof(CompAbility_SexInteractionRequirements);
}
-
+
public List tags = new List();
public InteractionRequirement dominantRequirement;
public InteractionRequirement submissiveRequirement;
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/HediffCompProperties_OrgasmCycle.cs b/1.4/Source/RJW_More_Genes/Royalty/HediffCompProperties_OrgasmCycle.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/HediffCompProperties_OrgasmCycle.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/HediffCompProperties_OrgasmCycle.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/HediffComp_OrgasmCycle.cs b/1.4/Source/RJW_More_Genes/Royalty/HediffComp_OrgasmCycle.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/HediffComp_OrgasmCycle.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/HediffComp_OrgasmCycle.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/SexInteractionUtility.cs b/1.4/Source/RJW_More_Genes/Royalty/SexInteractionUtility.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/Royalty/SexInteractionUtility.cs
rename to 1.4/Source/RJW_More_Genes/Royalty/SexInteractionUtility.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/ThoughtDefOf.cs b/1.4/Source/RJW_More_Genes/ThoughtDefOf.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/ThoughtDefOf.cs
rename to 1.4/Source/RJW_More_Genes/ThoughtDefOf.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs b/1.4/Source/RJW_More_Genes/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
rename to 1.4/Source/RJW_More_Genes/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferences.cache
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferences.cache
rename to 1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..18b1451
Binary files /dev/null and b/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache b/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..2f77d2f
Binary files /dev/null and b/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache differ
diff --git a/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache b/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..531db74
--- /dev/null
+++ b/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+a5ab93a622659cbd8dd55dafbd7ec218b2635267
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt b/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt
similarity index 78%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt
rename to 1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt
index 6b2bf1d..e2e932a 100644
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt
+++ b/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt
@@ -11,3 +11,7 @@ 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\1.4\Assemblies\RJW_More_Genes.dll
+C:\Users\tyrob\OneDrive\Documenten\GitHub\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\1.4\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.CoreCompileInputs.cache
+C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\1.4\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.dll
diff --git a/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll b/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll
new file mode 100644
index 0000000..aaa2793
Binary files /dev/null and b/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache b/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache
rename to 1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache b/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache
rename to 1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt b/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt
rename to 1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.dll b/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.dll
similarity index 100%
rename from RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.dll
rename to 1.4/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.dll
diff --git a/RJW_More_Genes/About/About.xml b/About/About.xml
similarity index 100%
rename from RJW_More_Genes/About/About.xml
rename to About/About.xml
diff --git a/RJW_More_Genes/1.4/Assemblies/RJW_More_Genes.dll b/RJW_More_Genes/1.4/Assemblies/RJW_More_Genes.dll
deleted file mode 100644
index 6d965f9..0000000
Binary files a/RJW_More_Genes/1.4/Assemblies/RJW_More_Genes.dll and /dev/null differ
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
deleted file mode 100644
index f0e76ca..0000000
--- a/RJW_More_Genes/1.4/Mods/Biotech/Defs/GeneDefs/GeneDefs_AbilityGenes.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- rjw_genes_pussyhealer
-
- pussyhealer
- Carriers of this gene are able use vaginal sex to tend to other's wounds.
- Things/Mote/Heart
- Ability
-
- PussyHeal
-
-
- PussyHeal
-
- -1
- 13
-
-
- life
- clotter
- tender
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index 586f79e..0000000
Binary files a/RJW_More_Genes/1.4/Mods/PsycastExpanded/Assemblies/RJWMoreGenes_VPE.dll and /dev/null differ
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index acd7000..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.CoreCompileInputs.cache b/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 6f678ae..0000000
--- a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-ff6d574fef2eec5cfe1de89cd494c556f1cec83b
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.FileListAbsolute.txt b/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.FileListAbsolute.txt
deleted file mode 100644
index e744a5b..0000000
--- a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWM_VPE.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJWM_VPE\obj\Debug\RJWM_VPE.csproj.AssemblyReference.cache
-C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJWM_VPE\obj\Debug\RJWM_VPE.csproj.CoreCompileInputs.cache
-C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Mods\PsycastExpanded\Assemblies\RJWMoreGenes_VPE.dll
-C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJWM_VPE\obj\Debug\RJWMoreGenes_VPE.dll
diff --git a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWMoreGenes_VPE.dll b/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWMoreGenes_VPE.dll
deleted file mode 100644
index 586f79e..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJWM_VPE/obj/Debug/RJWMoreGenes_VPE.dll and /dev/null differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/1abe075a-5542-4323-8801-cb2111833215.vsidx b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/1abe075a-5542-4323-8801-cb2111833215.vsidx
deleted file mode 100644
index d0ff0ee..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/1abe075a-5542-4323-8801-cb2111833215.vsidx and /dev/null differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/96ff5121-64d9-4655-b3eb-adda6fb02a18.vsidx b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/96ff5121-64d9-4655-b3eb-adda6fb02a18.vsidx
deleted file mode 100644
index def98ba..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/96ff5121-64d9-4655-b3eb-adda6fb02a18.vsidx and /dev/null differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/a9669c92-a115-48f2-ae47-7eadf6248504.vsidx b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/a9669c92-a115-48f2-ae47-7eadf6248504.vsidx
deleted file mode 100644
index 692adf6..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/a9669c92-a115-48f2-ae47-7eadf6248504.vsidx and /dev/null differ
diff --git a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/e3cc8337-1769-4120-8640-528e18ccbd5c.vsidx b/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/e3cc8337-1769-4120-8640-528e18ccbd5c.vsidx
deleted file mode 100644
index f4686ef..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/e3cc8337-1769-4120-8640-528e18ccbd5c.vsidx and /dev/null 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
deleted file mode 100644
index 7da1c8c..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo and /dev/null differ
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
deleted file mode 100644
index 14ac1f8..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null 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
deleted file mode 100644
index 8fc668c..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache and /dev/null differ
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
deleted file mode 100644
index ed729d0..0000000
--- a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-12d5ecf6156bfd9b12520fa2c747ab2b3e89349c
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
deleted file mode 100644
index 6d965f9..0000000
Binary files a/RJW_More_Genes/1.4/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll and /dev/null differ
diff --git a/changelog.md b/changelog.md
index 68b36e5..bb358ac 100644
--- a/changelog.md
+++ b/changelog.md
@@ -17,4 +17,8 @@ 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
+- Made all current psypowers compatible with vanilla psycast expanded
+V1.1.2
+- Pawns affected by sexfrenzy only rape pawns who they are attracted to.
+- Removed healpussy cooldown
+- Fixed Mindbreak Lance
\ No newline at end of file
diff --git a/RJW_More_Genes/loadFolders.xml b/loadFolders.xml
similarity index 100%
rename from RJW_More_Genes/loadFolders.xml
rename to loadFolders.xml