diff --git a/Common/Defs/Genes/GeneCategories.xml b/Common/Defs/Genes/GeneCategories.xml
index ab92117..6fe9417 100644
--- a/Common/Defs/Genes/GeneCategories.xml
+++ b/Common/Defs/Genes/GeneCategories.xml
@@ -37,6 +37,12 @@
15
+
+ rjw_genes_fertilin
+
+ 14
+
+
rjw_genes_breeding
@@ -61,4 +67,6 @@
8
+
+
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_LifeForce.xml b/Common/Defs/Genes/GeneDefs_LifeForce.xml
index 69db900..dbaa10b 100644
--- a/Common/Defs/Genes/GeneDefs_LifeForce.xml
+++ b/Common/Defs/Genes/GeneDefs_LifeForce.xml
@@ -2,8 +2,8 @@
rjw_genes_lifeforce
-
- Carriers of this gene have a reserve of biological strength powered by a resource called lifeforce. The resource can be gained and spent in various ways, all of which are unlocked by other genes.\n\nCarriers lose 10 lifeforce per day from biological entropy.
+
+ Carriers of this gene have a reserve of biological strength powered by a resource called fertilin. The resource can be gained and spent in various ways, all of which are unlocked by other genes.\n\nCarriers lose 10 lifeforce per day from biological entropy.RJW_Genes.Gene_LifeForceRJW_Genes.GeneGizmo_ResourceLifeForcelifeforce
@@ -14,13 +14,13 @@
truetrue
- A reserve of biological strength which can be gained and spent in a variety of ways. \n\nLifeforce can be increased by absorbing cum, typically through oral sex or stored cum. \n\nIf lifeforce reaches zero, {PAWN_nameDef} will become very unhappy and may try to obtain some forcefully.
+ A reserve of biological strength which can be gained and spent in a variety of ways. \n\nFertilin can be increased by absorbing cum, typically through oral sex or stored cum. \n\nIf fertilin reaches zero, {PAWN_nameDef} will become very unhappy and may try to obtain some forcefully.UI/Icons/Genes/Gene_Hemogenic0
- Hemogen
+ rjw_genes_fertilin-2
-
Gives lifeforce supply.
+
Gives fertilin supply.
@@ -28,33 +28,60 @@
rjw_genes_lifeforce_randomrape
- 13
+ 180.0211
- rjw_genes_pussyhealer
-
- pussyhealer
- Carriers of this gene are able use vaginal sex to tend to other's wounds.
- Things/Mote/Heart
- Ability
-
-
rjw_genes_pussyheal
-
-
- rjw_genes_pussyheal
-
- 1
- 13
-
-
-
life
-
clotter
-
tender
-
-
-
+ rjw_genes_pussyhealer
+
+ pussyhealer
+ Carriers of this gene are able use vaginal sex to tend to other's wounds.
+ Things/Mote/Heart
+ rjw_genes_lifeforce
+ 10
+ rjw_genes_fertilin
+
+
rjw_genes_pussyheal
+
+
+ rjw_genes_pussyheal
+
+ 1
+ -1
+ 18
+
+
+
life
+
clotter
+
tender
+
+
+
+
+
+ rjw_genes_vaginal_absorber
+
+ Pawns with this gene are able to absorb ferilin through their vagina.
+ Things/Mote/Heart
+ rjw_genes_lifeforce
+ 2
+ rjw_genes_fertilin
+ 1
+ -1
+
+
+
+ rjw_genes_anal_absorber
+
+ Pawns with this gene are able to absorb ferilin through their anus.
+ Things/Mote/Heart
+ rjw_genes_lifeforce
+ 3
+ rjw_genes_fertilin
+ 1
+ -1
+
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_SexSpecial.xml b/Common/Defs/Genes/GeneDefs_SexSpecial.xml
index 3b29889..3761995 100644
--- a/Common/Defs/Genes/GeneDefs_SexSpecial.xml
+++ b/Common/Defs/Genes/GeneDefs_SexSpecial.xml
@@ -15,7 +15,7 @@
rjw_genes_specialRJW_Genes.Gene_Aphrodisiac_Pheromones
- Pheremones of this pawn induce an incressed sexdrive to others nearby.
+ Pheremones of this pawn induce an increased sexdrive to others nearby.UI/Memes/FleshPurity21
diff --git a/Source/GeneDefOf.cs b/Source/GeneDefOf.cs
index 5ac85dd..37446c0 100644
--- a/Source/GeneDefOf.cs
+++ b/Source/GeneDefOf.cs
@@ -75,5 +75,7 @@ namespace RJW_Genes
// LifeForce
public static readonly GeneDef rjw_genes_lifeforce;
public static readonly GeneDef rjw_genes_pussyhealer;
+ public static readonly GeneDef rjw_genes_vaginal_absorber;
+ public static readonly GeneDef rjw_genes_anal_absorber;
}
}
diff --git a/Source/Genes/GeneUtility.cs b/Source/Genes/GeneUtility.cs
index 0a8d571..9ae4711 100644
--- a/Source/Genes/GeneUtility.cs
+++ b/Source/Genes/GeneUtility.cs
@@ -1,10 +1,38 @@
using System;
using Verse;
-
+using RimWorld;
namespace RJW_Genes
{
public class GeneUtility
{
+ //Instead of seperate functions this should be simpeler
+ public static bool HasGeneNullCheck(Pawn pawn, GeneDef genedef)
+ {
+ if (pawn.genes == null)
+ {
+ return false;
+ }
+ return pawn.genes.HasGene(genedef);
+ }
+
+ public static void OffsetLifeForce(Pawn pawn, float offset, bool applyStatFactor = true)
+ {
+ if (!ModsConfig.BiotechActive)
+ {
+ return;
+ }
+ //if (offset > 0f && applyStatFactor)
+ //{
+ // offset *= pawn.GetStatValue(StatDefOf.HemogenGainFactor, true, -1);
+ //}
+ Pawn_GeneTracker genes2 = pawn.genes;
+ Gene_LifeForce gene_LifeFroce = (genes2 != null) ? genes2.GetFirstGeneOfType() : null;
+ if (gene_LifeFroce != null)
+ {
+ gene_LifeFroce.Value += offset;
+ }
+ }
+
public static bool IsMechbreeder(Pawn pawn)
{
if (pawn.genes == null)
diff --git a/Source/Genes/Life_Force/AbilityUtility.cs b/Source/Genes/Life_Force/AbilityUtility.cs
index 896694e..3f18b71 100644
--- a/Source/Genes/Life_Force/AbilityUtility.cs
+++ b/Source/Genes/Life_Force/AbilityUtility.cs
@@ -48,5 +48,24 @@ namespace RJW_Genes
}
return any_wound_tended;
}
+
+ public static float LifeForceCost(Ability ability)
+ {
+ if (ability.comps != null)
+ {
+ using (List.Enumerator enumerator = ability.comps.GetEnumerator())
+ {
+ while (enumerator.MoveNext())
+ {
+ CompAbilityEffect_LifeForceCost compAbilityEffect_HemogenCost;
+ if ((compAbilityEffect_HemogenCost = (enumerator.Current as CompAbilityEffect_LifeForceCost)) != null)
+ {
+ return compAbilityEffect_HemogenCost.Props.fertilinCost;
+ }
+ }
+ }
+ }
+ return 0f;
+ }
}
}
\ No newline at end of file
diff --git a/Source/Genes/Life_Force/CompAbilityEffect_LifeForceCost.cs b/Source/Genes/Life_Force/CompAbilityEffect_LifeForceCost.cs
new file mode 100644
index 0000000..70f9e40
--- /dev/null
+++ b/Source/Genes/Life_Force/CompAbilityEffect_LifeForceCost.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using Verse;
+using Verse.AI;
+using RimWorld;
+namespace RJW_Genes
+{
+ // Token: 0x02000F66 RID: 3942
+ public class CompAbilityEffect_LifeForceCost : CompAbilityEffect
+ {
+ // Token: 0x17000FFB RID: 4091
+ // (get) Token: 0x06005D18 RID: 23832 RVA: 0x001FA767 File Offset: 0x001F8967
+ public new CompProperties_AbilityLifeForceCost Props
+ {
+ get
+ {
+ return (CompProperties_AbilityLifeForceCost)this.props;
+ }
+ }
+
+ // Token: 0x17000FFC RID: 4092
+ // (get) Token: 0x06005D19 RID: 23833 RVA: 0x001FA774 File Offset: 0x001F8974
+ private bool HasEnoughFertilin
+ {
+ get
+ {
+ Pawn_GeneTracker genes = this.parent.pawn.genes;
+ Gene_LifeForce gene_lifeforce = (genes != null) ? genes.GetFirstGeneOfType < Gene_LifeForce>() : null;
+ return gene_lifeforce != null && gene_lifeforce.Value >= this.Props.fertilinCost;
+ }
+ }
+
+ // Token: 0x06005D1A RID: 23834 RVA: 0x001FA7B7 File Offset: 0x001F89B7
+ public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
+ {
+ base.Apply(target, dest);
+ GeneUtility.OffsetLifeForce(this.parent.pawn, -this.Props.fertilinCost, true);
+ }
+
+ // Token: 0x06005D1B RID: 23835 RVA: 0x001FA7E0 File Offset: 0x001F89E0
+ public override bool GizmoDisabled(out string reason)
+ {
+ Pawn_GeneTracker genes = this.parent.pawn.genes;
+ Gene_LifeForce gene_LifeForce = (genes != null) ? genes.GetFirstGeneOfType() : null;
+ if (gene_LifeForce == null)
+ {
+ reason = "AbilityDisabledNoFertilinGene".Translate(this.parent.pawn);
+ return true;
+ }
+ if (gene_LifeForce.Value < this.Props.fertilinCost)
+ {
+ reason = "AbilityDisabledNoFertilin".Translate(this.parent.pawn);
+ return true;
+ }
+ float num = this.TotalLifeForceCostOfQueuedAbilities();
+ float num2 = this.Props.fertilinCost + num;
+ if (this.Props.fertilinCost > 1E-45f && num2 > gene_LifeForce.Value)
+ {
+ reason = "AbilityDisabledNoFertilin".Translate(this.parent.pawn);
+ return true;
+ }
+ reason = null;
+ return false;
+ }
+
+ public override bool AICanTargetNow(LocalTargetInfo target)
+ {
+ return this.HasEnoughFertilin;
+ }
+
+ private float TotalLifeForceCostOfQueuedAbilities()
+ {
+ Pawn_JobTracker jobs = this.parent.pawn.jobs;
+ object obj;
+ if (jobs == null)
+ {
+ obj = null;
+ }
+ else
+ {
+ Job curJob = jobs.curJob;
+ obj = ((curJob != null) ? curJob.verbToUse : null);
+ }
+ Verb_CastAbility verb_CastAbility = obj as Verb_CastAbility;
+ float num;
+ if (verb_CastAbility == null)
+ {
+ num = 0f;
+ }
+ else
+ {
+ Ability ability = verb_CastAbility.ability;
+ num = ((ability != null) ? AbilityUtility.LifeForceCost(ability) : 0f);
+ }
+ float num2 = num;
+ if (this.parent.pawn.jobs != null)
+ {
+ for (int i = 0; i < this.parent.pawn.jobs.jobQueue.Count; i++)
+ {
+ Verb_CastAbility verb_CastAbility2;
+ if ((verb_CastAbility2 = (this.parent.pawn.jobs.jobQueue[i].job.verbToUse as Verb_CastAbility)) != null)
+ {
+ float num3 = num2;
+ Ability ability2 = verb_CastAbility2.ability;
+ num2 = num3 + ((ability2 != null) ? AbilityUtility.LifeForceCost(ability2) : 0f);
+ }
+ }
+ }
+ return num2;
+ }
+
+ //Modified version of HemogenCost in Ability
+
+ }
+}
diff --git a/Source/Genes/Life_Force/CompProperties_AbilityLifeForceCost.cs b/Source/Genes/Life_Force/CompProperties_AbilityLifeForceCost.cs
new file mode 100644
index 0000000..5a05d5f
--- /dev/null
+++ b/Source/Genes/Life_Force/CompProperties_AbilityLifeForceCost.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using Verse;
+using RimWorld;
+
+namespace RJW_Genes
+{
+ // Token: 0x02000F65 RID: 3941
+ public class CompProperties_AbilityLifeForceCost : CompProperties_AbilityEffect
+ {
+ // Token: 0x06005D16 RID: 23830 RVA: 0x001FA73F File Offset: 0x001F893F
+ public CompProperties_AbilityLifeForceCost()
+ {
+ this.compClass = typeof(CompAbilityEffect_LifeForceCost);
+ }
+
+ // Token: 0x06005D17 RID: 23831 RVA: 0x001FA757 File Offset: 0x001F8957
+ public override IEnumerable ExtraStatSummary()
+ {
+ yield return "AbilityFertilinCost" + ": " + Mathf.RoundToInt(this.fertilinCost * 100f);
+ yield break;
+ }
+
+ // Token: 0x040038CD RID: 14541
+ public float fertilinCost;
+ }
+}
diff --git a/Source/Genes/Life_Force/GeneGizmo_ResourceLifeForce.cs b/Source/Genes/Life_Force/GeneGizmo_ResourceLifeForce.cs
index 1dee43d..f2b0055 100644
--- a/Source/Genes/Life_Force/GeneGizmo_ResourceLifeForce.cs
+++ b/Source/Genes/Life_Force/GeneGizmo_ResourceLifeForce.cs
@@ -30,11 +30,11 @@ namespace RJW_Genes
{
if (this.gene.targetValue <= 0f)
{
- text += "NeverConsumeCum";
+ text += "NeverSeekFertilin";
}
else
{
- text = text + ("ConsumeCumBelow" + ": ") + this.gene.PostProcessValue(this.gene.targetValue);
+ text = text + ("SeekFertilinBelow" + ": ") + this.gene.PostProcessValue(this.gene.targetValue);
}
}
if (!this.drainGenes.NullOrEmpty())
diff --git a/Source/Genes/Life_Force/Patch_LifeForce.cs b/Source/Genes/Life_Force/Patch_LifeForce.cs
index 5c73e6d..e7b7811 100644
--- a/Source/Genes/Life_Force/Patch_LifeForce.cs
+++ b/Source/Genes/Life_Force/Patch_LifeForce.cs
@@ -10,7 +10,7 @@ using Verse;
namespace RJW_Genes
{
-
+
[HarmonyPatch(typeof(SexUtility), nameof(SexUtility.SatisfyPersonal))]
public static class Patch_LifeForce
{
@@ -20,16 +20,43 @@ namespace RJW_Genes
if (props.pawn == null || !props.hasPartner())
return;
+ float factor = 1f;
if (GeneUtility.HasLifeForce(props.pawn))
{
if (props.sexType == xxx.rjwSextype.Oral || props.sexType == xxx.rjwSextype.Fellatio || props.sexType == xxx.rjwSextype.Sixtynine)
- {
- Pawn_GeneTracker genes = props.pawn.genes;
- Gene_LifeForce gene = genes.GetFirstGeneOfType();
- gene.Resource.Value += CumUtility.GetTotalFluidAmount(props.partner); //total amount may need to be modified to be balanced or maybe I should just consider one at random
+ {
+ AbsorbFertilin(props, factor);
+ //Currently taking the sum of all penises, maybe I should just consider one at random
}
- }
+ else if (props.sexType == xxx.rjwSextype.Vaginal && GeneUtility.HasGeneNullCheck(props.pawn, GeneDefOf.rjw_genes_vaginal_absorber))
+ {
+ AbsorbFertilin(props, factor);
+ }
+ else if (props.sexType == xxx.rjwSextype.Anal && GeneUtility.HasGeneNullCheck(props.pawn, GeneDefOf.rjw_genes_anal_absorber))
+ {
+ AbsorbFertilin(props, factor);
+ }
+ else if (props.sexType == xxx.rjwSextype.DoublePenetration)
+ {
+ if (GeneUtility.HasGeneNullCheck(props.pawn, GeneDefOf.rjw_genes_vaginal_absorber))
+ {
+ AbsorbFertilin(props, 0.5f);
+ }
+ if (GeneUtility.HasGeneNullCheck(props.pawn, GeneDefOf.rjw_genes_anal_absorber))
+ {
+ AbsorbFertilin(props, 0.5f);
+ }
+ }
+ }
+ }
+ public static void AbsorbFertilin(SexProps props, float factor = 1f)
+ {
+ Pawn_GeneTracker genes = props.pawn.genes;
+ Gene_LifeForce gene = genes.GetFirstGeneOfType();
+ gene.Resource.Value += CumUtility.GetTotalFluidAmount(props.partner) / 100 * factor;
}
}
+
+
}
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index 26c21bf..1b2f469 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -115,8 +115,10 @@
+
+