From 6dd8e27e0e0214eb6d1e4f250ba5f66ed0740ae2 Mon Sep 17 00:00:00 2001
From: a flock of birds <97801845+flock-of-birds@users.noreply.github.com>
Date: Sun, 31 Mar 2024 12:54:55 +0100
Subject: [PATCH 01/62] Added support for Big and Small Slimes
---
Common/Patches/Xenotypes/PatchBSSlimes.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 Common/Patches/Xenotypes/PatchBSSlimes.xml
diff --git a/Common/Patches/Xenotypes/PatchBSSlimes.xml b/Common/Patches/Xenotypes/PatchBSSlimes.xml
new file mode 100644
index 0000000..11b20c8
--- /dev/null
+++ b/Common/Patches/Xenotypes/PatchBSSlimes.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
Big and Small - Slimes
+
+
+ Defs/XenotypeDef[defName="BS_GreenSlime"
+ or defName="BS_PinkSlime"
+ or defName="BS_FrostSlime"
+ or defName="BS_LavaSlime"
+ or defName="BS_EmperorSlime"
+ or defName="BS_ElixirSlime"
+ or defName="BS_BananaSplitSlime"
+ or defName="BS_ToxicSludge"
+ ]/genes
+
+
rjw_genes_slime_genitalia
+
+
+
+
\ No newline at end of file
From c3773bb7bae71b1175ef7822817dae01378b4740 Mon Sep 17 00:00:00 2001
From: a flock of birds <97801845+flock-of-birds@users.noreply.github.com>
Date: Sun, 31 Mar 2024 13:19:37 +0100
Subject: [PATCH 02/62] Added support for Big and Small Yokai
---
Common/Patches/Xenotypes/PatchBSYokai.xml | 42 +++++++++++++++++++++++
1 file changed, 42 insertions(+)
create mode 100644 Common/Patches/Xenotypes/PatchBSYokai.xml
diff --git a/Common/Patches/Xenotypes/PatchBSYokai.xml b/Common/Patches/Xenotypes/PatchBSYokai.xml
new file mode 100644
index 0000000..43648ec
--- /dev/null
+++ b/Common/Patches/Xenotypes/PatchBSYokai.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+ Being Bred is not an easy business.\nThis might lead to a broken pawn, torn genitalia and hybrid-pregnancies.\nMaybe this is what you want.\nThe pawn will `submit` and e.g. Insects might cocoon him.\n\nAre you sure to proceed?
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
index 6d16ee6..ab270b5 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
@@ -77,4 +77,21 @@
-1
+
+
+ rjw_genes_mating_call
+
+ This gene allows to call nearby animals and invite them for mating.
+ Genes/Icons/Cocoon
+ 65
+
+
rjw_genes_ability_mating_call
+
+
+ rjw_genes_ability_mating_call
+
+ 2
+ -1
+
+
\ No newline at end of file
diff --git a/Source/Genes/Breeding/Abilities/CompAbilityEffect_MatingCall.cs b/Source/Genes/Breeding/Abilities/CompAbilityEffect_MatingCall.cs
new file mode 100644
index 0000000..9117629
--- /dev/null
+++ b/Source/Genes/Breeding/Abilities/CompAbilityEffect_MatingCall.cs
@@ -0,0 +1,64 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse.Sound;
+using Verse;
+using RimWorld.Planet;
+using rjw;
+using HarmonyLib;
+using Verse.AI;
+
+namespace RJW_Genes
+{
+ public class CompAbilityEffect_MatingCall : CompAbilityEffect
+ {
+
+ bool fired = false;
+ private new CompProperties_AbilityMatingCall Props
+ {
+ get
+ {
+ return (CompProperties_AbilityMatingCall)this.props;
+ }
+ }
+
+ public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
+ {
+ base.Apply(target, dest);
+ DoAnimalBreedingPulse();
+ }
+
+ private void DoAnimalBreedingPulse()
+ {
+ if (fired) { return; }
+
+ IEnumerable animals = this.parent.pawn.Map.mapPawns.AllPawnsSpawned.Where((Func)(p => p.IsNonMutantAnimal && p.Position.InHorDistOf(this.parent.pawn.Position, Props.calldistance)));
+ int breeder_counter = 0;
+
+ foreach (Pawn animal in animals)
+ {
+ if (animal.MentalState != null && (animal.MentalState.def == MentalStateDefOf.Manhunter || animal.MentalState.def == MentalStateDefOf.ManhunterPermanent))
+ {
+ Log.Warning("Found an angry Animal to Fuck");
+ animal?.MentalState?.RecoverFromState();
+ }
+
+ if(xxx.is_healthy_enough(animal))
+ {
+ // Stopping all Jobs in this way is a bit heavy - but as it's only about Animals this should be fine.
+ animal.jobs.CaptureAndClearJobQueue();
+ animal.jobs.StopAll();
+ Job job = JobMaker.MakeJob(xxx.animalBreed, this.parent.pawn);
+ animal.jobs.TryTakeOrderedJob(job);
+ breeder_counter++;
+ }
+ }
+ ModLog.Message($"{breeder_counter} of {animals.Count()} Animals in range are trying to breed {this.parent.pawn}");
+ fired = true;
+ }
+
+ }
+}
diff --git a/Source/Genes/Breeding/Abilities/CompProperties_AbilityMatingCall.cs b/Source/Genes/Breeding/Abilities/CompProperties_AbilityMatingCall.cs
new file mode 100644
index 0000000..e30485c
--- /dev/null
+++ b/Source/Genes/Breeding/Abilities/CompProperties_AbilityMatingCall.cs
@@ -0,0 +1,20 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RJW_Genes
+{
+ public class CompProperties_AbilityMatingCall : CompProperties_AbilityEffect
+ {
+
+ public int calldistance;
+
+ public CompProperties_AbilityMatingCall()
+ {
+ this.compClass = typeof(CompAbilityEffect_MatingCall);
+ }
+ }
+}
diff --git a/Source/Genes/Breeding/Gene_FerventOvipositor.cs b/Source/Genes/Breeding/Genes/Gene_FerventOvipositor.cs
similarity index 100%
rename from Source/Genes/Breeding/Gene_FerventOvipositor.cs
rename to Source/Genes/Breeding/Genes/Gene_FerventOvipositor.cs
diff --git a/Source/Genes/Breeding/Gene_InsectIncubator.cs b/Source/Genes/Breeding/Genes/Gene_InsectIncubator.cs
similarity index 100%
rename from Source/Genes/Breeding/Gene_InsectIncubator.cs
rename to Source/Genes/Breeding/Genes/Gene_InsectIncubator.cs
diff --git a/Source/Genes/Breeding/Gene_MechBreeder.cs b/Source/Genes/Breeding/Genes/Gene_MechBreeder.cs
similarity index 100%
rename from Source/Genes/Breeding/Gene_MechBreeder.cs
rename to Source/Genes/Breeding/Genes/Gene_MechBreeder.cs
diff --git a/Source/Genes/Breeding/PatchMechBirth.cs b/Source/Genes/Breeding/Patches/PatchMechBirth.cs
similarity index 100%
rename from Source/Genes/Breeding/PatchMechBirth.cs
rename to Source/Genes/Breeding/Patches/PatchMechBirth.cs
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index 757086f..4459155 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -64,8 +64,10 @@
-
-
+
+
+
+
@@ -76,8 +78,8 @@
-
-
+
+
From 5fe252bd67cb33d11b8640190199b26c225aa9ee Mon Sep 17 00:00:00 2001
From: Vegapnk
Date: Fri, 31 May 2024 17:28:11 +0200
Subject: [PATCH 04/62] Added a Gene to tame and train animals with Sex
---
Common/Defs/GeneDefs/GeneDefs_Breeding.xml | 2 +-
Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml | 11 ++++
Source/GeneDefOf.cs | 9 ++-
.../Special/Patches/Patch_SexualTamer.cs | 55 +++++++++++++++++++
Source/Rjw-Genes.csproj | 1 +
5 files changed, 76 insertions(+), 2 deletions(-)
create mode 100644 Source/Genes/Special/Patches/Patch_SexualTamer.cs
diff --git a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
index ab270b5..fa940bc 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
@@ -82,7 +82,7 @@
rjw_genes_mating_callThis gene allows to call nearby animals and invite them for mating.
- Genes/Icons/Cocoon
+ UI/Abilities/AnimalBerserkPulse65
rjw_genes_ability_mating_call
diff --git a/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml b/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml
index 6cd34be..ae30268 100644
--- a/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml
@@ -126,4 +126,15 @@
-1
+
+ rjw_genes_sex_tamer
+
+ sextamer
+ Bestiality has a chance to tame animals or advance their training.
+ UI/Abilities/AnimalBerserkPulse
+ 14
+ 2
+ -1
+
+
\ No newline at end of file
diff --git a/Source/GeneDefOf.cs b/Source/GeneDefOf.cs
index ef269cf..6049b8b 100644
--- a/Source/GeneDefOf.cs
+++ b/Source/GeneDefOf.cs
@@ -69,7 +69,12 @@ namespace RJW_Genes
public static readonly GeneDef rjw_genes_mechbreeder;
public static readonly GeneDef rjw_genes_zoophile;
public static readonly GeneDef rjw_genes_fertile_anus;
- // Cum
+ public static readonly GeneDef rjw_genes_mating_call;
+ public static readonly GeneDef rjw_genes_fervent_ovipositor;
+ public static readonly GeneDef rjw_genes_insectbreeder;
+ public static readonly GeneDef rjw_genes_insectincubator;
+
+ // Cum
public static readonly GeneDef rjw_genes_no_cum;
public static readonly GeneDef rjw_genes_much_cum;
public static readonly GeneDef rjw_genes_very_much_cum;
@@ -97,6 +102,8 @@ namespace RJW_Genes
public static readonly GeneDef rjw_genes_aphrodisiac_pheromones;
public static readonly GeneDef rjw_genes_sexual_mytosis;
public static readonly GeneDef rjw_genes_hormonal_saliva;
+ public static readonly GeneDef rjw_genes_cocoonweaver;
+ public static readonly GeneDef rjw_genes_sex_tamer;
// Cosmetic
public static readonly GeneDef rjw_genes_succubus_tail;
diff --git a/Source/Genes/Special/Patches/Patch_SexualTamer.cs b/Source/Genes/Special/Patches/Patch_SexualTamer.cs
new file mode 100644
index 0000000..6e8588a
--- /dev/null
+++ b/Source/Genes/Special/Patches/Patch_SexualTamer.cs
@@ -0,0 +1,55 @@
+using HarmonyLib;
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using static RJWSexperience.RsDefOf;
+
+namespace RJW_Genes
+{
+
+ [HarmonyPatch(typeof(SexUtility), nameof(SexUtility.SatisfyPersonal))]
+ public static class Patch_SexualTamer
+ {
+
+ public static void Postfix(SexProps props)
+ {
+ // ShortCuts: Exit Early if Pawn or Partner are null (can happen with Masturbation or other nieche-cases)
+ if (props == null || props.pawn == null || !props.hasPartner())
+ return;
+
+ // Exit for non Animals or Animal on Animal
+ if (!(props.pawn.IsAnimal() || props.partner.IsAnimal() ) )
+ return;
+
+ Pawn animal = props.pawn.IsAnimal() ? props.pawn : props.partner;
+ Pawn human = props.pawn.IsAnimal() ? props.partner : props.pawn;
+
+ if (human.genes.HasActiveGene(GeneDefOf.rjw_genes_sex_tamer))
+ {
+ // Case 1: Wild Animal - Try to Tame
+ if (animal.AnimalOrWildMan() && animal.Faction == null)
+ {
+ if(RJW_Genes_Settings.rjw_genes_detailed_debug)
+ ModLog.Message($"{human} is a sextamer with bestiality on wild animal {animal} - trying to recruit");
+ human.interactions.TryInteractWith(animal, InteractionDefOf.TameAttempt);
+ }
+ // Case 2: Colony Animal - Try to Train
+ else if (animal.Faction == human.Faction && animal.training != null)
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ ModLog.Message($"{human} is a sextamer with bestiality on colony animal {animal} - trying to train");
+ var trainable = animal.training.NextTrainableToTrain();
+ animal.training.Train(trainable, human);
+ }
+ }
+ }
+
+ }
+
+
+}
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index 4459155..254f196 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -170,6 +170,7 @@
+
From 48e06ff97f608378741c5f82faaaad91abe885b2 Mon Sep 17 00:00:00 2001
From: Vegapnk
Date: Fri, 31 May 2024 17:42:33 +0200
Subject: [PATCH 05/62] Another important null check for Sextamer
---
Source/Genes/Special/Patches/Patch_SexualTamer.cs | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Source/Genes/Special/Patches/Patch_SexualTamer.cs b/Source/Genes/Special/Patches/Patch_SexualTamer.cs
index 6e8588a..15215af 100644
--- a/Source/Genes/Special/Patches/Patch_SexualTamer.cs
+++ b/Source/Genes/Special/Patches/Patch_SexualTamer.cs
@@ -19,16 +19,18 @@ namespace RJW_Genes
public static void Postfix(SexProps props)
{
// ShortCuts: Exit Early if Pawn or Partner are null (can happen with Masturbation or other nieche-cases)
- if (props == null || props.pawn == null || !props.hasPartner())
+ if (props == null || props.pawn == null || !props.hasPartner() || props.partner == null)
return;
-
// Exit for non Animals or Animal on Animal
if (!(props.pawn.IsAnimal() || props.partner.IsAnimal() ) )
return;
-
Pawn animal = props.pawn.IsAnimal() ? props.pawn : props.partner;
Pawn human = props.pawn.IsAnimal() ? props.partner : props.pawn;
+ // Another Short Sanity Check
+ if (animal == null || human == null ) return;
+ if (human.genes == null) return;
+
if (human.genes.HasActiveGene(GeneDefOf.rjw_genes_sex_tamer))
{
// Case 1: Wild Animal - Try to Tame
@@ -39,7 +41,7 @@ namespace RJW_Genes
human.interactions.TryInteractWith(animal, InteractionDefOf.TameAttempt);
}
// Case 2: Colony Animal - Try to Train
- else if (animal.Faction == human.Faction && animal.training != null)
+ else if (human.Faction != null && animal.Faction == human.Faction && animal.training != null)
{
if (RJW_Genes_Settings.rjw_genes_detailed_debug)
ModLog.Message($"{human} is a sextamer with bestiality on colony animal {animal} - trying to train");
From 707ca7cfa6aaa146a4cb933d523942d4a3756301 Mon Sep 17 00:00:00 2001
From: a flock of birds <97801845+flock-of-birds@users.noreply.github.com>
Date: Sun, 31 Mar 2024 13:50:51 +0100
Subject: [PATCH 06/62] Snake-people patches and yokai/slime touchups
---
Common/Patches/Xenotypes/PatchBSSlimes.xml | 39 ++++++++++++++--------
Common/Patches/Xenotypes/PatchBSSneks.xml | 33 ++++++++++++++++++
Common/Patches/Xenotypes/PatchBSYokai.xml | 7 +++-
3 files changed, 65 insertions(+), 14 deletions(-)
create mode 100644 Common/Patches/Xenotypes/PatchBSSneks.xml
diff --git a/Common/Patches/Xenotypes/PatchBSSlimes.xml b/Common/Patches/Xenotypes/PatchBSSlimes.xml
index 11b20c8..fea02c8 100644
--- a/Common/Patches/Xenotypes/PatchBSSlimes.xml
+++ b/Common/Patches/Xenotypes/PatchBSSlimes.xml
@@ -4,19 +4,32 @@
Big and Small - Slimes
-
- Defs/XenotypeDef[defName="BS_GreenSlime"
- or defName="BS_PinkSlime"
- or defName="BS_FrostSlime"
- or defName="BS_LavaSlime"
- or defName="BS_EmperorSlime"
- or defName="BS_ElixirSlime"
- or defName="BS_BananaSplitSlime"
- or defName="BS_ToxicSludge"
- ]/genes
-
-
rjw_genes_slime_genitalia
-
+
+
+
+ Defs/XenotypeDef[defName="BS_GreenSlime"
+ or defName="BS_PinkSlime"
+ or defName="BS_FrostSlime"
+ or defName="BS_LavaSlime"
+ or defName="BS_EmperorSlime"
+ or defName="BS_ElixirSlime"
+ or defName="BS_ToxicSludge"
+ or defName="BS_BananaSplitSlime"
+ ]/genes
+
+
+ Defs/XenotypeDef[defName="BS_Jotun"
+ or defName="BS_FrostJotun"
+ or defName="BS_FireJotun"
+ or defName="BS_Surtr"
+ or defName="BS_Ymir"
+ or defName="BS_Half_Jotun"
+ ]/genes
+
+
+
+
+
+
\ No newline at end of file
From a68c263aa1d3123d4d0f57eb5bdb7ccd1fb54445 Mon Sep 17 00:00:00 2001
From: Vegapnk
Date: Sat, 1 Jun 2024 10:12:00 +0200
Subject: [PATCH 11/62] Added PheromoneSpit Gene
---
.../AbilityDefs/Ability_PheromoneSpit.xml | 29 ++++++++
Common/Defs/GeneDefs/GeneDefs_Breeding.xml | 17 +++++
.../Abilities/CompAbilityEffect_MatingCall.cs | 34 +--------
.../CompAbilityEffect_PheromoneSpit.cs | 31 ++++++++
.../CompProperties_AbilityPheromoneSpit.cs | 18 +++++
Source/Genes/Breeding/AnimalBreedingHelper.cs | 70 +++++++++++++++++++
Source/Rjw-Genes.csproj | 3 +
7 files changed, 171 insertions(+), 31 deletions(-)
create mode 100644 Common/Defs/AbilityDefs/Ability_PheromoneSpit.xml
create mode 100644 Source/Genes/Breeding/Abilities/CompAbilityEffect_PheromoneSpit.cs
create mode 100644 Source/Genes/Breeding/Abilities/CompProperties_AbilityPheromoneSpit.cs
create mode 100644 Source/Genes/Breeding/AnimalBreedingHelper.cs
diff --git a/Common/Defs/AbilityDefs/Ability_PheromoneSpit.xml b/Common/Defs/AbilityDefs/Ability_PheromoneSpit.xml
new file mode 100644
index 0000000..584e0a8
--- /dev/null
+++ b/Common/Defs/AbilityDefs/Ability_PheromoneSpit.xml
@@ -0,0 +1,29 @@
+
+
+
+ rjw_genes_ability_pheromone_spit
+
+ Spit a condensed ball of animal pheromones to mark a target. Nearby Animals will try to breed the target. This means all animals - hostile, friendly and wild.
+ UI/Abilities/PiercingSpine
+ 3000
+ 201
+ true
+
+ Verb_CastAbility
+ 11
+ 1.2
+ PiercingSpine_Launch
+
+ True
+ False
+ False
+ False
+
+
+
+
+ 25
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
index fa940bc..7eb6bb6 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
@@ -94,4 +94,21 @@
-1
+
+
+ rjw_genes_pheromone_spit
+
+ This gene allows to mark targets for breeding, enticing nearby animals for a ride.
+ UI/Abilities/AnimalBerserkPulse
+ 66
+
+
rjw_genes_ability_pheromone_spit
+
+
+ rjw_genes_ability_pheromone_spit
+
+ 2
+ -1
+
+
\ No newline at end of file
diff --git a/Source/Genes/Breeding/Abilities/CompAbilityEffect_MatingCall.cs b/Source/Genes/Breeding/Abilities/CompAbilityEffect_MatingCall.cs
index 9117629..e50291b 100644
--- a/Source/Genes/Breeding/Abilities/CompAbilityEffect_MatingCall.cs
+++ b/Source/Genes/Breeding/Abilities/CompAbilityEffect_MatingCall.cs
@@ -28,37 +28,9 @@ namespace RJW_Genes
public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
{
base.Apply(target, dest);
- DoAnimalBreedingPulse();
+ ModLog.Message($"{this.parent.pawn} is casting MatingCall");
+ AnimalBreedingHelper.DoAnimalBreedingPulse(this.parent.pawn, Props.calldistance);
}
-
- private void DoAnimalBreedingPulse()
- {
- if (fired) { return; }
-
- IEnumerable animals = this.parent.pawn.Map.mapPawns.AllPawnsSpawned.Where((Func)(p => p.IsNonMutantAnimal && p.Position.InHorDistOf(this.parent.pawn.Position, Props.calldistance)));
- int breeder_counter = 0;
-
- foreach (Pawn animal in animals)
- {
- if (animal.MentalState != null && (animal.MentalState.def == MentalStateDefOf.Manhunter || animal.MentalState.def == MentalStateDefOf.ManhunterPermanent))
- {
- Log.Warning("Found an angry Animal to Fuck");
- animal?.MentalState?.RecoverFromState();
- }
-
- if(xxx.is_healthy_enough(animal))
- {
- // Stopping all Jobs in this way is a bit heavy - but as it's only about Animals this should be fine.
- animal.jobs.CaptureAndClearJobQueue();
- animal.jobs.StopAll();
- Job job = JobMaker.MakeJob(xxx.animalBreed, this.parent.pawn);
- animal.jobs.TryTakeOrderedJob(job);
- breeder_counter++;
- }
- }
- ModLog.Message($"{breeder_counter} of {animals.Count()} Animals in range are trying to breed {this.parent.pawn}");
- fired = true;
- }
-
+
}
}
diff --git a/Source/Genes/Breeding/Abilities/CompAbilityEffect_PheromoneSpit.cs b/Source/Genes/Breeding/Abilities/CompAbilityEffect_PheromoneSpit.cs
new file mode 100644
index 0000000..5064003
--- /dev/null
+++ b/Source/Genes/Breeding/Abilities/CompAbilityEffect_PheromoneSpit.cs
@@ -0,0 +1,31 @@
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+
+namespace RJW_Genes
+{
+ public class CompAbilityEffect_PheromoneSpit : CompAbilityEffect
+ {
+ bool fired = false;
+ private new CompProperties_AbilityPheromoneSpit Props
+ {
+ get
+ {
+ return (CompProperties_AbilityPheromoneSpit)this.props;
+ }
+ }
+
+ public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
+ {
+ base.Apply(target, dest);
+ AnimalBreedingHelper.DoAnimalBreedingPulse(target.Pawn, Props.calldistance);
+ }
+
+ }
+}
diff --git a/Source/Genes/Breeding/Abilities/CompProperties_AbilityPheromoneSpit.cs b/Source/Genes/Breeding/Abilities/CompProperties_AbilityPheromoneSpit.cs
new file mode 100644
index 0000000..381843f
--- /dev/null
+++ b/Source/Genes/Breeding/Abilities/CompProperties_AbilityPheromoneSpit.cs
@@ -0,0 +1,18 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RJW_Genes {
+ public class CompProperties_AbilityPheromoneSpit : CompProperties_AbilityEffect
+ {
+ public int calldistance;
+
+ public CompProperties_AbilityPheromoneSpit()
+ {
+ this.compClass = typeof(CompAbilityEffect_PheromoneSpit);
+ }
+ }
+}
diff --git a/Source/Genes/Breeding/AnimalBreedingHelper.cs b/Source/Genes/Breeding/AnimalBreedingHelper.cs
new file mode 100644
index 0000000..f2386e9
--- /dev/null
+++ b/Source/Genes/Breeding/AnimalBreedingHelper.cs
@@ -0,0 +1,70 @@
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse.AI;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class AnimalBreedingHelper
+ {
+
+ ///
+ /// Finds animals in a distance around a pawn, and schedules a breeding job.
+ /// This is done regardless of the animals genitalia at the moment.
+ /// This function has no checks if the Pawn is hostile, downed, etc., such checks must be done upstream!
+ ///
+ /// The pawn that will be target of breeding animals
+ /// The range around the pawn for which animals will be triggered.
+ public static void DoAnimalBreedingPulse(Pawn toBeBred, int pulse_distance, bool ends_manhunter = true)
+ {
+ IEnumerable animals = GetAnimalsInRange(toBeBred.Map, toBeBred.Position, pulse_distance);
+ int breeder_counter = 0;
+
+ foreach (Pawn animal in animals)
+ {
+ if (ends_manhunter)
+ EndManHunter(animal);
+ ForceBreedingJob(toBeBred, animal);
+ breeder_counter++;
+ }
+ ModLog.Message($"{breeder_counter} of {animals.Count()} Animals in range are trying to breed {toBeBred}");
+ }
+
+ private static IEnumerable GetAnimalsInRange(Map map, IntVec3 position, int distance)
+ {
+ IEnumerable animals =
+ map.mapPawns
+ .AllPawnsSpawned
+ .Where((Func)(p =>
+ p.IsNonMutantAnimal
+ && p.Position.InHorDistOf(position, distance)
+ && xxx.is_healthy_enough(p))
+ );
+
+ return animals;
+ }
+
+ private static void ForceBreedingJob(Pawn toBeBred, Pawn animal)
+ {
+ // Stopping all Jobs in this way is a bit heavy - but as it's only about Animals this should be fine.
+ animal.jobs.CaptureAndClearJobQueue();
+ animal.jobs.StopAll();
+ Job job = JobMaker.MakeJob(xxx.animalBreed, toBeBred);
+ animal.jobs.TryTakeOrderedJob(job);
+ }
+
+ private static void EndManHunter(Pawn animal)
+ {
+ if (animal.MentalState != null && (animal.MentalState.def == MentalStateDefOf.Manhunter || animal.MentalState.def == MentalStateDefOf.ManhunterPermanent))
+ {
+ animal?.MentalState?.RecoverFromState();
+ }
+
+ }
+ }
+}
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index 254f196..8fe1556 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -65,7 +65,10 @@
+
+
+
From d83c2354b9753ef8f10f8e19ae7f3def3ec96ff9 Mon Sep 17 00:00:00 2001
From: a flock of birds <97801845+flock-of-birds@users.noreply.github.com>
Date: Sat, 1 Jun 2024 11:06:43 +0100
Subject: [PATCH 12/62] Added patches for Big and Small - Vampires and Undead
---
Common/Patches/Xenotypes/PatchBSShared.xml | 53 +++++++++++++++++++
Common/Patches/Xenotypes/PatchBSUndead.xml | 60 ++++++++++++++++++++++
2 files changed, 113 insertions(+)
create mode 100644 Common/Patches/Xenotypes/PatchBSShared.xml
create mode 100644 Common/Patches/Xenotypes/PatchBSUndead.xml
diff --git a/Common/Patches/Xenotypes/PatchBSShared.xml b/Common/Patches/Xenotypes/PatchBSShared.xml
new file mode 100644
index 0000000..1759c8b
--- /dev/null
+++ b/Common/Patches/Xenotypes/PatchBSShared.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+ Defs/XenotypeDef[defName="VU_Nosferatu" or defName="VU_Dracul_Feral"]/genes
+
+
rjw_genes_demonic_genitalia
+
rjw_genes_no_sex_need
+
+
+
+ Defs/XenotypeDef[defName="VU_Dracul_Spawn"
+ or defName="VU_Dracul"
+ or defName="VU_Dracul_Mature"
+ or defName="VU_Dracul_Progenitor"
+ ]/genes
+
+
+
+
+
+
\ No newline at end of file
From c0e63b1a40901ec46c87339128794fc140e9c285 Mon Sep 17 00:00:00 2001
From: a flock of birds <97801845+flock-of-birds@users.noreply.github.com>
Date: Sat, 1 Jun 2024 12:44:53 +0100
Subject: [PATCH 14/62] Fixed label capitalisation
---
Common/Defs/AbilityDefs/Ability_CockEater.xml | 2 +-
.../Defs/AbilityDefs/Ability_CocoonWeaver.xml | 2 +-
Common/Defs/AbilityDefs/Ability_PussyHeal.xml | 2 +-
Common/Defs/AbilityDefs/Ability_Seduce.xml | 6 +++---
Common/Defs/GeneDefs/GeneCategories.xml | 18 +++++++++---------
Common/Defs/GeneDefs/GeneDefs_Breeding.xml | 12 ++++++------
Common/Defs/GeneDefs/GeneDefs_Cum.xml | 12 ++++++------
Common/Defs/GeneDefs/GeneDefs_Damage.xml | 4 ++--
.../Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml | 2 +-
.../Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml | 18 +++++++++---------
Common/Defs/GeneDefs/GeneDefs_LifeForce.xml | 8 ++++----
Common/Defs/GeneDefs/GeneDefs_Reproduction.xml | 14 +++++++-------
Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml | 14 +++++++-------
.../Defs/GeneDefs/GeneDefs_SpecifiedGender.xml | 6 +++---
Common/Defs/GeneDefs/Xenotype_Lifeforce.xml | 4 ++--
Common/Defs/HediffDefs/Hediffs_OrgasmRush.xml | 3 +--
Common/Defs/JobDefs/Jobs_LifeForce.xml | 8 ++++----
Common/Defs/JobDefs/Jobs_SexOnSpot.xml | 2 +-
.../Defs/PawnKindDefs/PawnKind_LifeForce.xml | 2 +-
Common/Defs/ThoughtDefs/Thoughts_Special.xml | 2 +-
Common/Patches/Xenotypes/PatchBSHeavHell.xml | 2 ++
21 files changed, 72 insertions(+), 71 deletions(-)
diff --git a/Common/Defs/AbilityDefs/Ability_CockEater.xml b/Common/Defs/AbilityDefs/Ability_CockEater.xml
index 4a8f2e3..f5cc8ad 100644
--- a/Common/Defs/AbilityDefs/Ability_CockEater.xml
+++ b/Common/Defs/AbilityDefs/Ability_CockEater.xml
@@ -2,7 +2,7 @@
rjw_genes_ability_cockeater
-
+
Eat the cock of another pawn, restoring fertilin based on the size of the cock.Genes/Icons/cockeatertrue
diff --git a/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml b/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
index 2a1577a..434df04 100644
--- a/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
+++ b/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
@@ -2,7 +2,7 @@
rjw_genes_ability_cocoonweaver
-
+
Weaves the victim into a (self-sustaining) cocoon. The victim cannot move, but can be bred.Genes/Icons/Cocoontrue
diff --git a/Common/Defs/AbilityDefs/Ability_PussyHeal.xml b/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
index c31cb75..e9fb85b 100644
--- a/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
+++ b/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
@@ -2,7 +2,7 @@
rjw_genes_ability_pussyheal
-
+
Rape another pawn, so you can heal them with your vagina's special healing power.Things/Mote/Heartfalse
diff --git a/Common/Defs/AbilityDefs/Ability_Seduce.xml b/Common/Defs/AbilityDefs/Ability_Seduce.xml
index 620be2b..60d5d10 100644
--- a/Common/Defs/AbilityDefs/Ability_Seduce.xml
+++ b/Common/Defs/AbilityDefs/Ability_Seduce.xml
@@ -9,13 +9,13 @@
truetruefalse
-
+ 10Mote_CoagulateStencilCoagulateCoagulate_Cast
-
+ Verb_CastAbility101
@@ -35,7 +35,7 @@
Heart
-
+
0.20
diff --git a/Common/Defs/GeneDefs/GeneCategories.xml b/Common/Defs/GeneDefs/GeneCategories.xml
index ecce35f..e506741 100644
--- a/Common/Defs/GeneDefs/GeneCategories.xml
+++ b/Common/Defs/GeneDefs/GeneCategories.xml
@@ -15,55 +15,55 @@
rjw_genes_gender
-
+
21rjw_genes_genitalia_type
-
+
19rjw_genes_genitalia_extras
-
+
17rjw_genes_genitalia_size
-
+
15rjw_genes_fertilin
-
+
14rjw_genes_breeding
-
+
13rjw_genes_cum
-
+
12rjw_genes_damage
-
+
11rjw_genes_special
-
+
8
diff --git a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
index 6d16ee6..c54ece4 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
@@ -16,7 +16,7 @@
rjw_genes_mechbreeder
-
+
Pawns with this gene are able to birth mechanoids unharmed.World/WorldObjects/Expanding/Mechanoids51
@@ -26,7 +26,7 @@
rjw_genes_zoophile
-
+
Xenotypes with this Gene are Zoophile.Genes/Icons/Zoophile54
@@ -39,7 +39,7 @@
rjw_genes_fertile_anus
-
+
Xenotypes with this gene have a functional uterus connected to the anal cavity even for malesGenes/Icons/Fertile_anus54
@@ -47,7 +47,7 @@
rjw_genes_insectincubator
-
+
RJW_Genes.Gene_InsectIncubatorPawns with this gene fertilize insect eggs that are placed inside them.Genes/Icons/Egg
@@ -58,7 +58,7 @@
rjw_genes_insectbreeder
-
+
Pawns with this gene are able to fertilize eggs with any fertile penis.Genes/Icons/Insect_Breeder53
@@ -68,7 +68,7 @@
rjw_genes_fervent_ovipositor
-
+
RJW_Genes.Gene_FerventOvipositorPawns that have a female (egg producing) ovipositor produce eggs at drastically increased speed.Genes/Icons/Fervent_Ovipositor
diff --git a/Common/Defs/GeneDefs/GeneDefs_Cum.xml b/Common/Defs/GeneDefs/GeneDefs_Cum.xml
index c031645..a3f9208 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Cum.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Cum.xml
@@ -17,7 +17,7 @@
rjw_genes_no_cum
-
+
Males of these species have no fluid.Genes/Icons/No_CumRJW_Genes.Gene_NoCum
@@ -28,7 +28,7 @@
rjw_genes_much_cum
-
+
Males of this species produce a lot of fluid.Genes/Icons/Much_CumRJW_Genes.Gene_MuchCum
@@ -39,7 +39,7 @@
rjw_genes_very_much_cum
-
+
Males of this species produce a whole lot of fluid. They are like fountains basically.Genes/Icons/Very_Much_CumRJW_Genes.Gene_VeryMuchCum
@@ -50,7 +50,7 @@
rjw_genes_likes_cumflation
-
+
rjw_genes_cumThis Xenotype loves being cumflated.Genes/Icons/Cumflation
@@ -74,7 +74,7 @@
rjw_genes_cumflation_immunity
-
+
rjw_genes_cumThis Xenotype cannot get cumflated.Genes/Icons/Cumflation_Immunity
@@ -94,7 +94,7 @@
rjw_genes_generous_donor
-
+
rjw_genes_cumWhen this Xenotype transfers nutrition via cumshot, the giver will not get hungry. (Licentia Configuration for Transfer Nutrition must be enabled).Genes/Icons/Generous_Donor
diff --git a/Common/Defs/GeneDefs/GeneDefs_Damage.xml b/Common/Defs/GeneDefs/GeneDefs_Damage.xml
index 97aba0e..0e3f586 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Damage.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Damage.xml
@@ -3,7 +3,7 @@
rjw_genes_elasticity
-
+
rjw_genes_damageThis Xenotype cannot get stretched by huge penetrators.Genes/Icons/Elasticity
@@ -22,7 +22,7 @@
rjw_genes_unbreakable
-
+
rjw_genes_damageThis Gene makes the Carrier unable to get mood or social penalties from being raped and they cannot be broken for a long period of time.UI/Icons/Rituals/TrialDefend
diff --git a/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml b/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
index c9d3c17..eaf8728 100644
--- a/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
@@ -138,7 +138,7 @@
rjw_genes_featureless_chest
-
+
Carriers of this gene do not have breasts or nipples.Genes/Icons/No_BreastsRJW_Genes.Gene_FeaturelessChest
diff --git a/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml b/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
index 492aedc..4c93001 100644
--- a/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
@@ -15,7 +15,7 @@
rjw_genes_big_male_genitalia
-
+
Penises of this Xenotype are bigger.(Resizing takes place at 20th Birthday)Genes/Icons/Big_Male_GenitaliaRJW_Genes.Gene_BigMaleGenitalia
@@ -27,7 +27,7 @@
rjw_genes_small_male_genitalia
-
+
Penises of this Xenotype are smaller. (Resizing takes place at 20th Birthday)Genes/Icons/Small_Male_GenitaliaRJW_Genes.Gene_SmallMaleGenitalia
@@ -40,7 +40,7 @@
rjw_genes_loose_female_genitalia
-
+
Vaginas of this Xenotype are quite spacy. (Resizing takes place at 20th Birthday)Genes/Icons/Loose_VaginaRJW_Genes.Gene_LooseFemaleGenitalia
@@ -52,7 +52,7 @@
rjw_genes_tight_female_genitalia
-
+
Vaginas of this Xenotype are pretty tight.(Resizing takes place at 20th Birthday)Genes/Icons/Tight_VaginaRJW_Genes.Gene_TightFemaleGenitalia
@@ -65,7 +65,7 @@
rjw_genes_big_breasts
-
+
Females of this Xenotype have big honkers.(Resizing takes place at 20th Birthday)Genes/Icons/Big_BreastsRJW_Genes.Gene_BigBreasts
@@ -77,7 +77,7 @@
rjw_genes_small_breasts
-
+
Females of this Xenotype have smaller breasts.(Resizing takes place at 20th Birthday)Genes/Icons/Small_BreastsRJW_Genes.Gene_SmallBreasts
@@ -90,7 +90,7 @@
rjw_genes_loose_anus
-
+
The Anus of this Xenotype is roomy.(Resizing takes place at 20th Birthday)Genes/Icons/Loose_AnusRJW_Genes.Gene_LooseAnus
@@ -102,7 +102,7 @@
rjw_genes_tight_anus
-
+
The anus of this Xenotype is small.(Resizing takes place at 20th Birthday)Genes/Icons/Tight_AnusRJW_Genes.Gene_TightAnus
@@ -116,7 +116,7 @@
rjw_genes_evergrowth
-
+
One of the most regretted gene-modifications in the Glitterworlds: The (primary) genitalia will continue growing forever. This affects size and fluid output. Excessive growth can also effect mental stability! (Resizing takes place at 20th Birthday)Genes/Icons/Big_Male_GenitaliaRJW_Genes.Gene_EvergrowingGenitalia
diff --git a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
index 8c793e2..12a58a0 100644
--- a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
@@ -62,7 +62,7 @@
rjw_genes_pussyhealing
-
+
pussyhealerCarriers of this gene are able use vaginal sex to tend to other's wounds.Genes/Icons/Healpussy
@@ -87,7 +87,7 @@
rjw_genes_cockeater
-
+
cockeaterCarriers of this gene are able eat cocks to restore their fertilin supply. Cocks are consumed during that process.Genes/Icons/cockeater
@@ -178,7 +178,7 @@
rjw_genes_cum_eater
-
+
Carriers of this gene are able to absorb fertilin through eating cum. This includes oral sex, eating cum for food or sucking out cumflated pawns. Genes/Icons/cumeaterrjw_genes_lifeforce
@@ -188,7 +188,7 @@
rjw_genes_fertilin_absorber
-
+
Carriers of this gene are able to absorb the fertilin inside sperm through their vagina and anus.Genes/Icons/Vaginal_cum_absorptionrjw_genes_lifeforce
diff --git a/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml b/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml
index 3dbc43e..4e5160a 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml
@@ -3,7 +3,7 @@
rjw_genes_hypersexual
-
+
ReproductionXenotypes with this Gene are Hypersexual (Nymphs).Genes/Icons/Hypersexual
@@ -25,7 +25,7 @@
rjw_genes_rapist
-
+
ReproductionXenotypes with this Gene are Rapists.Genes/Icons/Rape
@@ -49,7 +49,7 @@
Carriers of this gene grow more unstable with ongoing multiple orgasms - climaxing in a process of mytosis. This will result in an (biologically) identical pawn and both twins are set in a regenerative state. Also, the pawn can have multiple orgasms: In a state of higher unstableness, they come quicker.UI/Icons/Genes/Gene_PsychicBonding
@@ -91,7 +91,7 @@
rjw_genes_hormonal_saliva
-
+
The saliva of this xenotype stimulates growth in penises. Regular contact will lead to noticable growth.2-1
@@ -111,7 +111,7 @@
rjw_genes_cocoonweaver
-
+
cocoonerCarriers of this gene can produce a cocoon to prepare helpless (or willing) victims for breeding.Genes/Icons/Cocoon
diff --git a/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml b/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml
index d7541e7..e8e7ed3 100644
--- a/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml
@@ -2,7 +2,7 @@
rjw_genes_female_only
-
+
rjw_genes_genderThis Xenotype only has females.0
@@ -26,7 +26,7 @@
rjw_genes_male_onlyrjw_genes_gender
-
+
This Xenotype only has males.0Genes/Icons/Male_Only
@@ -50,7 +50,7 @@
rjw_genes_gender_fluidrjw_genes_gender
-
+
Everyday carriers of this gene might change their biological sex.0Genes/Icons/Futa
diff --git a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
index 608a2f4..9c96211 100644
--- a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
+++ b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
@@ -3,7 +3,7 @@
rjw_genes_succubus
-
+
Succubi are strongly enhanced xenohumans. These overnaturally beautiful creatures strive parasitically on the Fertilin found in semen.Succubi are beautiful and extremely hungry Xenohumans. They strive on having sex and extracting their victims life-force through this. Genes/Icons/Xenotypes/Xenotype-Succubus
@@ -53,7 +53,7 @@
rjw_genes_incubus
-
+
Incubi are strongly enhanced xenohumans. These overnaturally beautiful creatures strive parasitically on the Fertilin found in semen.Incubi are beautiful and extremely hungry Xenohumans. They strive on having sex and extracting their victims life-force through this. Genes/Icons/Xenotypes/Xenotype-Incubus
diff --git a/Common/Defs/HediffDefs/Hediffs_OrgasmRush.xml b/Common/Defs/HediffDefs/Hediffs_OrgasmRush.xml
index f68663f..255b3e9 100644
--- a/Common/Defs/HediffDefs/Hediffs_OrgasmRush.xml
+++ b/Common/Defs/HediffDefs/Hediffs_OrgasmRush.xml
@@ -4,7 +4,7 @@
rjw_genes_orgasm_rush_hediffHediffWithComps
-
+
Xenotypes with this Gene are pushed beyond normal limits when they have an orgasm.(240,200,110)false
@@ -75,4 +75,3 @@
-
diff --git a/Common/Defs/JobDefs/Jobs_LifeForce.xml b/Common/Defs/JobDefs/Jobs_LifeForce.xml
index 13dd1e3..c05bf61 100644
--- a/Common/Defs/JobDefs/Jobs_LifeForce.xml
+++ b/Common/Defs/JobDefs/Jobs_LifeForce.xml
@@ -4,21 +4,21 @@
rjw_genes_lifeforce_randomraperjw.JobDriver_RandomRape
- Raping
+ rapingfalserjw_genes_lifeforce_healpussyRJW_Genes.JobDriver_CastAbilityAfterSex
- Tending someones wounds with sex.
+ tending wounds with sex.falserjw_genes_lifeforce_seducedRJW_Genes.JobDriver_Seduced
- Seduced.
+ seduced.falsefalse
@@ -26,7 +26,7 @@
rjw_genes_flirtRJW_Genes.JobDriver_Flirt
- Seduced.
+ seduced.false
\ No newline at end of file
diff --git a/Common/Defs/JobDefs/Jobs_SexOnSpot.xml b/Common/Defs/JobDefs/Jobs_SexOnSpot.xml
index e904f3e..842f676 100644
--- a/Common/Defs/JobDefs/Jobs_SexOnSpot.xml
+++ b/Common/Defs/JobDefs/Jobs_SexOnSpot.xml
@@ -4,7 +4,7 @@
sex_on_spotRJW_Genes.JobDriver_SexOnSpot
- Making love on the spot.
+ making love on the spot.false
diff --git a/Common/Defs/PawnKindDefs/PawnKind_LifeForce.xml b/Common/Defs/PawnKindDefs/PawnKind_LifeForce.xml
index 9d48cdc..ed6001a 100644
--- a/Common/Defs/PawnKindDefs/PawnKind_LifeForce.xml
+++ b/Common/Defs/PawnKindDefs/PawnKind_LifeForce.xml
@@ -45,7 +45,7 @@
rjw_genes_incubus
-
+
50Human
diff --git a/Common/Defs/ThoughtDefs/Thoughts_Special.xml b/Common/Defs/ThoughtDefs/Thoughts_Special.xml
index b669317..5620ca9 100644
--- a/Common/Defs/ThoughtDefs/Thoughts_Special.xml
+++ b/Common/Defs/ThoughtDefs/Thoughts_Special.xml
@@ -8,7 +8,7 @@
RJW_Genes.ThoughtWorker_Aphrodisiac_Pheromones_Social
-
+
{0} has a special vibe, we should hang out more often.+3
+
+
+
+
\ No newline at end of file
From ea6c0387829a5df77aa4ad67dfc5bd4b053322d8 Mon Sep 17 00:00:00 2001
From: Ohreallyow <01maparker@gmail.com>
Date: Sun, 2 Jun 2024 16:33:59 -0700
Subject: [PATCH 18/62] Small update for a few Xeno genitalia that were left
out.
---
Common/Patches/Xenotypes/PatchMammalia.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Common/Patches/Xenotypes/PatchMammalia.xml b/Common/Patches/Xenotypes/PatchMammalia.xml
index d441b87..409bdb5 100644
--- a/Common/Patches/Xenotypes/PatchMammalia.xml
+++ b/Common/Patches/Xenotypes/PatchMammalia.xml
@@ -67,6 +67,7 @@