From 5744d5df0f52464acb7144bc46a1c913ec2b3441 Mon Sep 17 00:00:00 2001
From: Vegapnk
Date: Fri, 11 Oct 2024 16:39:06 +0200
Subject: [PATCH 04/60] Made littered Births translatable #178
---
1.5/Languages/English/Keyed/Letters.xml | 8 ++++++++
1.5/Source/Genes/Patches/PatchLitteredBirth.cs | 6 ++----
CHANGELOG.md | 10 ++++++++++
3 files changed, 20 insertions(+), 4 deletions(-)
create mode 100644 1.5/Languages/English/Keyed/Letters.xml
diff --git a/1.5/Languages/English/Keyed/Letters.xml b/1.5/Languages/English/Keyed/Letters.xml
new file mode 100644
index 0000000..4436829
--- /dev/null
+++ b/1.5/Languages/English/Keyed/Letters.xml
@@ -0,0 +1,8 @@
+
+
+ Twins!
+ is still in labor and is having twins! Be sure to gather your doctor and additional friends and family to ensure the other baby is also born healthy!
+
+ Another baby!
+ is still in labor and is having twins! Be sure to gather your doctor and additional friends and family to ensure the other baby is also born healthy!
+
diff --git a/1.5/Source/Genes/Patches/PatchLitteredBirth.cs b/1.5/Source/Genes/Patches/PatchLitteredBirth.cs
index 0499b33..90c4f12 100644
--- a/1.5/Source/Genes/Patches/PatchLitteredBirth.cs
+++ b/1.5/Source/Genes/Patches/PatchLitteredBirth.cs
@@ -139,14 +139,12 @@ namespace RJW_Genes
{
ModLog.Message("Pawn " + __instance.pawn.NameShortColored + " (" + __instance.pawn.ThingID + ") is having random twins");
}
- Find.LetterStack.ReceiveLetter("Twins!", __instance.pawn.NameShortColored + " is still in labor and is having twins!\n\n" +
- "Be sure to gather your doctor and additional friends and family to ensure the other baby is also born healthy!",
+ Find.LetterStack.ReceiveLetter("rjw_genes_twin_letter".Translate(), __instance.pawn.NameShortColored + " " + "rjw_genes_twin_letter_content".Translate(),
LetterDefOf.AnotherBaby, __instance.pawn);
return;
}
- Find.LetterStack.ReceiveLetter("Another baby!", __instance.pawn.NameShortColored + " is still in labor and is having another baby!\n\n" +
- "Be sure to gather your doctor and additional friends and family to ensure the next baby is also born healthy!",
+ Find.LetterStack.ReceiveLetter("rjw_genes_another_baby_letter".Translate(), __instance.pawn.NameShortColored + " " + "rjw_genes_another_baby_letter_content".Translate(),
LetterDefOf.AnotherBaby, __instance.pawn);
}
}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9b9a6b..cf68b2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 2.3.3
+
+**Changes**:
+
+- Made Littered Birth Letters Translatable (#178)
+
+**Fixes**:
+
+- Fixed two patches using the outdated LitteredBirth DefNames (#181)
+
# 2.3.2 (19-09-2024)
**Changes**:
From 6135cfe449d2544c7297c48ede39df4b4fad0537 Mon Sep 17 00:00:00 2001
From: Vegapnk
Date: Tue, 15 Oct 2024 14:46:53 +0200
Subject: [PATCH 05/60] Got Likes Cumflation working again for Cumpilation
---
1.5/Defs/GeneDefs/GeneDefs_Fluids.xml | 19 +++
.../Defs/GeneDefs/Cumpilation_Genes.xml | 49 ++++++
.../HediffDefs/Cumflation_Counter_Hediffs.xml | 77 ++++++++++
.../HediffDefs/Stuffing_Counter_Hediffs.xml | 145 ++++++++++++++++++
.../Defs/GeneDefs/LicentiaLabs_GeneDefs.xml | 18 ---
1.5/Source/DefOfs/GeneDefOf.cs | 6 +-
1.5/Source/DefOfs/HediffDefOf.cs | 4 -
...iffCompProperties_MatchSeverityOfHediff.cs | 17 ++
.../HediffComp_MatchSeverityOfHediff.cs | 26 ++++
.../Fluid/Patches/Patch_CumflationImmunity.cs | 38 -----
.../Patch_Cumpilation_BlockCumflation.cs | 18 +++
.../Patch_Cumpilation_BlockStuffing.cs | 18 +++
.../Patches/Patch_Cumpilation_Inflatable.cs | 97 ++++++++++++
.../Fluid/Patches/Patch_LikesCumflation.cs | 79 ----------
1.5/Source/Genes/GeneUtility.cs | 1 -
1.5/Source/HarmonyInit.cs | 35 ++++-
1.5/Source/Rjw-Genes.csproj | 10 +-
About/Manifest.xml | 2 +-
CHANGELOG.md | 6 +-
19 files changed, 511 insertions(+), 154 deletions(-)
create mode 100644 1.5/Mods/Cumpilation/Defs/GeneDefs/Cumpilation_Genes.xml
create mode 100644 1.5/Mods/Cumpilation/Defs/HediffDefs/Cumflation_Counter_Hediffs.xml
create mode 100644 1.5/Mods/Cumpilation/Defs/HediffDefs/Stuffing_Counter_Hediffs.xml
create mode 100644 1.5/Source/Genes/Fluid/HediffComps/HediffCompProperties_MatchSeverityOfHediff.cs
create mode 100644 1.5/Source/Genes/Fluid/HediffComps/HediffComp_MatchSeverityOfHediff.cs
delete mode 100644 1.5/Source/Genes/Fluid/Patches/Patch_CumflationImmunity.cs
create mode 100644 1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_BlockCumflation.cs
create mode 100644 1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_BlockStuffing.cs
create mode 100644 1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_Inflatable.cs
delete mode 100644 1.5/Source/Genes/Fluid/Patches/Patch_LikesCumflation.cs
diff --git a/1.5/Defs/GeneDefs/GeneDefs_Fluids.xml b/1.5/Defs/GeneDefs/GeneDefs_Fluids.xml
index 6b861d5..2fed4c2 100644
--- a/1.5/Defs/GeneDefs/GeneDefs_Fluids.xml
+++ b/1.5/Defs/GeneDefs/GeneDefs_Fluids.xml
@@ -119,4 +119,23 @@
+
+
+ rjw_genes_generous_donor
+
+ rjw_genes_fluids
+ When this Xenotype transfers fluids during sex, the giver will not get hungry.
+ Genes/Icons/Generous_Donor
+ 538
+
+ 2
+ -1
+
+
+
+
+
\ No newline at end of file
diff --git a/1.5/Mods/Cumpilation/Defs/GeneDefs/Cumpilation_Genes.xml b/1.5/Mods/Cumpilation/Defs/GeneDefs/Cumpilation_Genes.xml
new file mode 100644
index 0000000..1f84a66
--- /dev/null
+++ b/1.5/Mods/Cumpilation/Defs/GeneDefs/Cumpilation_Genes.xml
@@ -0,0 +1,49 @@
+
+
+
+
+ rjw_genes_inflatable
+
+ rjw_genes_fluids
+ This Xenotype loves being stuffed with fluids and does not suffer physical impediments from being inflated.
+ Genes/Icons/Cumflation
+ 536
+ -1
+ 2
+
+
+
+
+
+
\ No newline at end of file
diff --git a/1.5/Mods/LicentiaLabs/Defs/GeneDefs/LicentiaLabs_GeneDefs.xml b/1.5/Mods/LicentiaLabs/Defs/GeneDefs/LicentiaLabs_GeneDefs.xml
index e8f6089..769b602 100644
--- a/1.5/Mods/LicentiaLabs/Defs/GeneDefs/LicentiaLabs_GeneDefs.xml
+++ b/1.5/Mods/LicentiaLabs/Defs/GeneDefs/LicentiaLabs_GeneDefs.xml
@@ -65,22 +65,4 @@
-
- rjw_genes_generous_donor
-
- rjw_genes_fluids
- When this Xenotype transfers nutrition via cumshot, the giver will not get hungry. (Licentia Configuration for Transfer Nutrition must be enabled).
- Genes/Icons/Generous_Donor
- 538
-
- 2
- -1
-
-
-
-
-
\ No newline at end of file
diff --git a/1.5/Source/DefOfs/GeneDefOf.cs b/1.5/Source/DefOfs/GeneDefOf.cs
index b828b64..dd50de9 100644
--- a/1.5/Source/DefOfs/GeneDefOf.cs
+++ b/1.5/Source/DefOfs/GeneDefOf.cs
@@ -73,9 +73,9 @@ namespace RJW_Genes
public static readonly GeneDef rjw_genes_no_fluid;
public static readonly GeneDef rjw_genes_much_fluid;
public static readonly GeneDef rjw_genes_very_much_fluid;
- [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_likes_cumflation;
- [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_cumflation_immunity;
- [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_generous_donor;
+ [MayRequire("vegapnk.cumpilation")] public static readonly GeneDef rjw_genes_un_inflatable;
+ [MayRequire("vegapnk.cumpilation")] public static readonly GeneDef rjw_genes_inflatable;
+ public static readonly GeneDef rjw_genes_generous_donor;
[MayRequire("rjw.sexperience")] public static readonly GeneDef rjw_genes_living_cumbucket;
diff --git a/1.5/Source/DefOfs/HediffDefOf.cs b/1.5/Source/DefOfs/HediffDefOf.cs
index b7c33fb..9eee352 100644
--- a/1.5/Source/DefOfs/HediffDefOf.cs
+++ b/1.5/Source/DefOfs/HediffDefOf.cs
@@ -27,10 +27,6 @@ namespace RJW_Genes
public static readonly HediffDef rjw_genes_disease_carrier_storage;
- // Note: Counter does meant it counters it, not it's counting
- [MayRequire("LustLicentia.RJWLabs")] public static readonly HediffDef rjw_genes_cumstuffed_counter;
- [MayRequire("LustLicentia.RJWLabs")] public static readonly HediffDef rjw_genes_cumflation_counter;
-
public static readonly HediffDef OvaryAgitator;
public static readonly HediffDef Bioscaffold;
diff --git a/1.5/Source/Genes/Fluid/HediffComps/HediffCompProperties_MatchSeverityOfHediff.cs b/1.5/Source/Genes/Fluid/HediffComps/HediffCompProperties_MatchSeverityOfHediff.cs
new file mode 100644
index 0000000..ed1c9f3
--- /dev/null
+++ b/1.5/Source/Genes/Fluid/HediffComps/HediffCompProperties_MatchSeverityOfHediff.cs
@@ -0,0 +1,17 @@
+using Cumpilation.Oscillation;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class HediffCompProperties_MatchSeverityOfHediff : HediffCompProperties
+ {
+ public HediffDef hediffToMatch;
+
+ public HediffCompProperties_MatchSeverityOfHediff() => this.compClass = typeof(HediffComp_MatchSeverityOfHediff);
+ }
+}
diff --git a/1.5/Source/Genes/Fluid/HediffComps/HediffComp_MatchSeverityOfHediff.cs b/1.5/Source/Genes/Fluid/HediffComps/HediffComp_MatchSeverityOfHediff.cs
new file mode 100644
index 0000000..b1c110c
--- /dev/null
+++ b/1.5/Source/Genes/Fluid/HediffComps/HediffComp_MatchSeverityOfHediff.cs
@@ -0,0 +1,26 @@
+using Verse;
+
+namespace RJW_Genes
+{
+ public class HediffComp_MatchSeverityOfHediff : HediffComp
+ {
+ public new HediffCompProperties_MatchSeverityOfHediff Props => (HediffCompProperties_MatchSeverityOfHediff)this.props;
+
+ public override void CompPostTick(ref float severityAdjustment)
+ {
+ base.CompPostTick(ref severityAdjustment);
+
+ bool hasMatchingHediff = parent.pawn.health.hediffSet.HasHediff(Props.hediffToMatch);
+
+ if (!hasMatchingHediff) {
+ parent.Severity = 0.0f;
+ }
+ else
+ {
+ Hediff match = parent.pawn.health.hediffSet.GetFirstHediffOfDef(Props.hediffToMatch);
+ if (match == null) parent.Severity = 0.0f;
+ parent.Severity = match.Severity;
+ }
+ }
+ }
+}
diff --git a/1.5/Source/Genes/Fluid/Patches/Patch_CumflationImmunity.cs b/1.5/Source/Genes/Fluid/Patches/Patch_CumflationImmunity.cs
deleted file mode 100644
index 49f8e73..0000000
--- a/1.5/Source/Genes/Fluid/Patches/Patch_CumflationImmunity.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HarmonyLib;
-using rjw;
-using RimWorld;
-using Verse;
-
-namespace RJW_Genes
-{
- ///
- /// Changes LicentiaLabs (if Present) to not cumflate pawns that are cumflation immune.
- /// This code is exercised / loaded in the HarmonyInit.
- /// Patched File: https://gitgud.io/John-the-Anabaptist/licentia-labs/-/blob/master/Source/LicentiaLabs/LicentiaLabs/Cumflation.cs
- ///
- ///
- class Patch_CumflationImmunity
- {
- // This patch does not need the normal Harmony Targetting,
- // as it needs to be added only on demand (See HarmonyInit.cs)
- public static bool Prefix(SexProps props)
- {
- // Harmony Logic skips the original Method after Prefix when "false" is returned
- // See https://harmony.pardeike.net/articles/execution.html
-
- // We skip the whole Cumflation Logic when the Partner is Cumflation Immune
- if (props != null && props.partner != null && GeneUtility.IsCumflationImmune(props.partner))
- {
- return false;
- }
- return true;
- }
- }
-}
\ No newline at end of file
diff --git a/1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_BlockCumflation.cs b/1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_BlockCumflation.cs
new file mode 100644
index 0000000..322e706
--- /dev/null
+++ b/1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_BlockCumflation.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class Patch_Cumpilation_BlockCumflation
+ {
+ public static void PostFix(Pawn pawn,ref bool __result) {
+ if (pawn != null && pawn.genes != null && pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_un_inflatable))
+ __result = false;
+ }
+
+ }
+}
diff --git a/1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_BlockStuffing.cs b/1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_BlockStuffing.cs
new file mode 100644
index 0000000..58110ee
--- /dev/null
+++ b/1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_BlockStuffing.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class Patch_Cumpilation_BlockStuffing
+ {
+ public static void PostFix(Pawn pawn,ref bool __result) {
+ if (pawn != null && pawn.genes != null && pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_un_inflatable))
+ __result = false;
+ }
+
+ }
+}
diff --git a/1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_Inflatable.cs b/1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_Inflatable.cs
new file mode 100644
index 0000000..24d813b
--- /dev/null
+++ b/1.5/Source/Genes/Fluid/Patches/Patch_Cumpilation_Inflatable.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using HarmonyLib;
+using rjw;
+using RimWorld;
+using Verse;
+
+namespace RJW_Genes
+{
+ ///
+ /// Changes LicentiaLabs (if Present) to add a cumflation-counter hediff, when the pawn is cumflated.
+ /// The counter hediff takes away the negative stats of the original hediff.
+ /// This code is exercised / loaded in the HarmonyInit.
+ /// Patched File: https://gitgud.io/John-the-Anabaptist/licentia-labs/-/blob/master/Source/LicentiaLabs/LicentiaLabs/Cumflation.cs
+ ///
+ ///
+ class Patch_Cumpilation_Inflatable
+ {
+ // This patch does not need the normal Harmony Targetting,
+ // as it needs to be added only on demand (See HarmonyInit.cs)
+ public static void PostFix(SexProps props)
+ {
+
+ if (props == null || props.pawn == null || props.partner == null) return;
+
+
+ if (props.pawn.genes != null && props.pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_inflatable) )
+ {
+ AddOrIncreaseCumflationCounterHediffs(props.pawn);
+ }
+
+ if (props.partner.genes != null && props.partner.genes.HasActiveGene(GeneDefOf.rjw_genes_inflatable))
+ {
+ AddOrIncreaseCumflationCounterHediffs(props.partner);
+ }
+ }
+
+ public static void AddOrIncreaseCumflationCounterHediffs(Pawn inflated)
+ {
+
+ List<(Hediff,HediffDef)> expectedCounterHediffs = inflated.health.hediffSet.hediffs
+ .Where(hediff => FindMatchingCounterHediff(hediff.def) != null)
+ .Select(hediff => (hediff,FindMatchingCounterHediff(hediff.def)))
+ .ToList();
+
+ ModLog.Debug($"Adding or Increasing {expectedCounterHediffs.Count()} expected CounterHediffs for Pawn {inflated}");
+
+ foreach ((Hediff,HediffDef) matchedHediffs in expectedCounterHediffs) {
+ if (inflated.health.hediffSet.HasHediff(matchedHediffs.Item2)) {
+ Hediff counter = inflated.health.GetOrAddHediff(matchedHediffs.Item2);
+ counter.Severity = matchedHediffs.Item1.Severity;
+ } else
+ {
+ Hediff counter = HediffMaker.MakeHediff(matchedHediffs.Item2, inflated, matchedHediffs.Item1.Part);
+ counter.Severity = matchedHediffs.Item1.Severity;
+ inflated.health.AddHediff(counter);
+ }
+ }
+ }
+
+ public static HediffDef FindMatchingCounterHediff(HediffDef hediffDef)
+ {
+ if (hediffDef == null) return null;
+
+ var result = DefDatabase.AllDefsListForReading
+ .Where(def => {
+ if (def.comps == null || def.comps.Count == 0) return false;
+ var Matcher = def.comps.FirstOrFallback(comp => comp is HediffCompProperties_MatchSeverityOfHediff,null);
+ if (Matcher == null) return false;
+ HediffCompProperties_MatchSeverityOfHediff MatcherCasted = (HediffCompProperties_MatchSeverityOfHediff)Matcher;
+ return MatcherCasted.hediffToMatch == hediffDef;
+ })
+ .FirstOrFallback(null);
+ if (result != null) ModLog.Debug($"Found CounterHediff {result} as counter for {hediffDef}");
+
+ return result;
+ }
+
+ public static Hediff CreateOrGetCumflationCounterHediff(Pawn inflated, HediffDef counterCumflationDef, BodyPartRecord bodyPartRecord)
+ {
+ Hediff cumflationHediff = inflated.health.hediffSet.GetFirstHediffOfDef(counterCumflationDef);
+ if (cumflationHediff == null)
+ {
+ cumflationHediff = HediffMaker.MakeHediff(counterCumflationDef, inflated, bodyPartRecord);
+ cumflationHediff.Severity = 0;
+ inflated.health.AddHediff(cumflationHediff, bodyPartRecord);
+ }
+ return cumflationHediff;
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/1.5/Source/Genes/Fluid/Patches/Patch_LikesCumflation.cs b/1.5/Source/Genes/Fluid/Patches/Patch_LikesCumflation.cs
deleted file mode 100644
index 4e9a957..0000000
--- a/1.5/Source/Genes/Fluid/Patches/Patch_LikesCumflation.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HarmonyLib;
-using rjw;
-using RimWorld;
-using Verse;
-
-namespace RJW_Genes
-{
- ///
- /// Changes LicentiaLabs (if Present) to add a cumflation-counter hediff, when the pawn is cumflated.
- /// The counter hediff takes away the negative stats of the original hediff.
- /// This code is exercised / loaded in the HarmonyInit.
- /// Patched File: https://gitgud.io/John-the-Anabaptist/licentia-labs/-/blob/master/Source/LicentiaLabs/LicentiaLabs/Cumflation.cs
- ///
- ///
- class Patch_LikesCumflation
- {
- // This patch does not need the normal Harmony Targetting,
- // as it needs to be added only on demand (See HarmonyInit.cs)
- public static void PostFix(SexProps props)
- {
-
- if (props == null || props.pawn == null || props.partner == null) return;
-
- // Minor Hardening to help with #105
- if (!ModsConfig.IsActive("LustLicentia.RJWLabs")) return;
-
- if (props.pawn.genes != null && props.pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_likes_cumflation) )
- {
- AddOrIncreaseCumflationCounterHediff(props.pawn);
- }
-
- if (props.partner.genes != null && props.partner.genes.HasActiveGene(GeneDefOf.rjw_genes_likes_cumflation))
- {
- AddOrIncreaseCumflationCounterHediff(props.partner);
- }
- }
-
- public static void AddOrIncreaseCumflationCounterHediff(Pawn inflated)
- {
- Hediff cumstuffed_hediff = inflated.health.hediffSet.GetFirstHediffOfDef(LicentiaLabs.Licentia.HediffDefs.Cumstuffed);
- //Hediff cumstuffed_hediff = LicentiaLabs.CumflationHelper.GetCumflationHediff(inflated, LicentiaLabs.Licentia.HediffDefs.Cumstuffed, "stomach");
- if (cumstuffed_hediff != null && cumstuffed_hediff.Severity >= 0.01) {
- ModLog.Debug($"{inflated} got cumstuffed and gets the counter-part");
- var bodyPartRecord = inflated.RaceProps.body.AllParts.Find(bpr => bpr.def.defName.Contains("stomach") || bpr.def.defName.Contains("stomach".ToLower()));
- var counter_hediff = CreateOrGetCumflationCounterHediff(inflated, HediffDefOf.rjw_genes_cumstuffed_counter, bodyPartRecord);
- counter_hediff.Severity = cumstuffed_hediff.Severity;
- }
-
- Hediff cumflation_hediff = inflated.health.hediffSet.GetFirstHediffOfDef(LicentiaLabs.Licentia.HediffDefs.Cumflation);
- if (cumflation_hediff != null && cumflation_hediff.Severity >= 0.01)
- {
- ModLog.Debug($"{inflated} got cumflated and gets the counter-part");
- var bodyPartRecord = Genital_Helper.get_genitalsBPR(inflated);
- var counter_hediff = CreateOrGetCumflationCounterHediff(inflated, HediffDefOf.rjw_genes_cumflation_counter, bodyPartRecord);
- counter_hediff.Severity = cumflation_hediff.Severity;
- }
- }
-
- public static Hediff CreateOrGetCumflationCounterHediff(Pawn inflated, HediffDef counterCumflationDef, BodyPartRecord bodyPartRecord)
- {
- Hediff cumflationHediff = inflated.health.hediffSet.GetFirstHediffOfDef(counterCumflationDef);
- if (cumflationHediff == null)
- {
- cumflationHediff = HediffMaker.MakeHediff(counterCumflationDef, inflated, bodyPartRecord);
- cumflationHediff.Severity = 0;
- inflated.health.AddHediff(cumflationHediff, bodyPartRecord);
- }
- return cumflationHediff;
-
- }
- }
-}
\ No newline at end of file
diff --git a/1.5/Source/Genes/GeneUtility.cs b/1.5/Source/Genes/GeneUtility.cs
index fad55e7..30c1128 100644
--- a/1.5/Source/Genes/GeneUtility.cs
+++ b/1.5/Source/Genes/GeneUtility.cs
@@ -116,7 +116,6 @@ namespace RJW_Genes
public static bool IsYouthFountain(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_youth_fountain); }
public static bool IsAgeDrainer(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_sex_age_drain); }
public static bool IsElastic(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_elasticity); }
- public static bool IsCumflationImmune(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_cumflation_immunity); }
public static bool IsGenerousDonor(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_generous_donor); }
public static bool IsPussyHealer(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_pussyhealing); }
public static bool IsUnbreakable(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_unbreakable); }
diff --git a/1.5/Source/HarmonyInit.cs b/1.5/Source/HarmonyInit.cs
index e6c1688..173c443 100644
--- a/1.5/Source/HarmonyInit.cs
+++ b/1.5/Source/HarmonyInit.cs
@@ -5,6 +5,7 @@ using rjw;
using RJWLoveFeeding;
using RimWorld;
using System.Linq;
+using LicentiaLabs;
namespace RJW_Genes
{
@@ -56,17 +57,14 @@ namespace RJW_Genes
if (ModsConfig.IsActive("LustLicentia.RJWLabs"))
{
// Gene: Cumflation Immunity [Prefix Patch]
- harmony.Patch(AccessTools.Method(typeof(LicentiaLabs.CumflationHelper), nameof(LicentiaLabs.CumflationHelper.Cumflation)),
- prefix: new HarmonyMethod(typeof(Patch_CumflationImmunity), nameof(Patch_CumflationImmunity.Prefix)));
+ //harmony.Patch(AccessTools.Method(typeof(LicentiaLabs.CumflationHelper), nameof(LicentiaLabs.CumflationHelper.Cumflation)),
+ // prefix: new HarmonyMethod(typeof(Patch_CumflationImmunity), nameof(Patch_CumflationImmunity.Prefix)));
// Gene: Generous Donor [Postfix Patch]
- harmony.Patch(AccessTools.Method(typeof(LicentiaLabs.CumflationHelper), nameof(LicentiaLabs.CumflationHelper.TransferNutrition)),
- postfix: new HarmonyMethod(typeof(Patch_TransferNutrition), nameof(Patch_TransferNutrition.Postfix)));
+ //harmony.Patch(AccessTools.Method(typeof(LicentiaLabs.CumflationHelper), nameof(LicentiaLabs.CumflationHelper.TransferNutrition)),
+ // postfix: new HarmonyMethod(typeof(Patch_TransferNutrition), nameof(Patch_TransferNutrition.Postfix)));
// Gene: CumEater [Postfix Patch] -- This is not exactly licentia, but the Generous-Donor Gene is only active with Licentia
harmony.Patch(AccessTools.Method(typeof(rjw.JobDriver_Sex), nameof(rjw.JobDriver_Sex.ChangePsyfocus)),
postfix: new HarmonyMethod(typeof(Patch_SexTicks_ChangePsyfocus), nameof(Patch_SexTicks_ChangePsyfocus.Postfix)));
- // Gene: Likes Cumflation [Postfix Patch]
- harmony.Patch(AccessTools.Method(typeof(LicentiaLabs.CumflationHelper), nameof(LicentiaLabs.CumflationHelper.Cumflation)),
- postfix: new HarmonyMethod(typeof(Patch_LikesCumflation), nameof(Patch_LikesCumflation.PostFix)));
}
}))();
}
@@ -75,6 +73,29 @@ namespace RJW_Genes
// To be expected for people without Licentia Labs
}
+ // Patch Cumpilation, if Cumpilation exists
+ try
+ {
+ ((Action)(() =>
+ {
+ if (ModsConfig.IsActive("vegapnk.cumpilation"))
+ {
+ // Gene: Inflatable [Postfix Patch]
+ harmony.Patch(AccessTools.Method(typeof(SexUtility), nameof(SexUtility.TransferFluids)),
+ postfix: new HarmonyMethod(typeof(Patch_Cumpilation_Inflatable), nameof(Patch_Cumpilation_Inflatable.PostFix)));
+ // Gene: Inflation-Resistance [Postfix Patch]
+ harmony.Patch(AccessTools.Method(typeof(Cumpilation.Cumflation.CumflationUtility), nameof(Cumpilation.Cumflation.CumflationUtility.CanBeCumflated)),
+ postfix: new HarmonyMethod(typeof(Patch_Cumpilation_BlockCumflation), nameof(Patch_Cumpilation_BlockCumflation.PostFix)));
+ // Gene: Inflation-Resistance [Postfix Patch]
+ harmony.Patch(AccessTools.Method(typeof(Cumpilation.Cumflation.StuffingUtility), nameof(Cumpilation.Cumflation.StuffingUtility.CanBeStuffed)),
+ postfix: new HarmonyMethod(typeof(Patch_Cumpilation_BlockStuffing), nameof(Patch_Cumpilation_BlockStuffing.PostFix)));
+ }
+ }))();
+ }
+ catch (TypeLoadException ex)
+ {
+ // To be expected for people without Licentia Labs
+ }
}
}
}
\ No newline at end of file
diff --git a/1.5/Source/Rjw-Genes.csproj b/1.5/Source/Rjw-Genes.csproj
index 8b58b65..eab0b87 100644
--- a/1.5/Source/Rjw-Genes.csproj
+++ b/1.5/Source/Rjw-Genes.csproj
@@ -72,10 +72,14 @@
+
+
-
+
+
+
@@ -107,7 +111,6 @@
-
@@ -229,6 +232,9 @@
..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dllFalse
+
+ ..\..\..\Cumpilation\1.5\Assemblies\Cumpilation.dll
+ ..\..\..\licentia-labs-master\Assemblies\LicentiaLabs.dllFalse
diff --git a/About/Manifest.xml b/About/Manifest.xml
index 9a4d9b3..07aa781 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,7 +1,7 @@
RJW-Genes
- 2.3.3
+ 2.4.0
RimJobWorld
HugsLib
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf68b2f..959fd39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
-# 2.3.3
+# 2.4.0
+
**Changes**:
- Made Littered Birth Letters Translatable (#178)
+- Likes Cumflation now works for all Cumflations and Stuffings from [Cumpilation](https://github.com/vegapnk/Cumpilation). It only removes the "physical" parts of the debuffs (pain, moving), but not e.g. food need reduction. It is now called `rjw_genes_inflatable`.
+- Likes Cumflation might not work for Licentia anymore. Maybe it does, tried my best.
+- Blocked Cumflation moved from Licentia Labs to Cumflation Hediffs. It's now called Un-Inflatable (`rjw_genes_un_inflatable`).
**Fixes**:
From c7d1a9c7340dce71e0eee199adfa9dd43fb9bf63 Mon Sep 17 00:00:00 2001
From: Vegapnk
Date: Tue, 15 Oct 2024 15:41:45 +0200
Subject: [PATCH 06/60] Migrated Living Cumbucket to Cumpilation, currently no
tuning for item amount #185
---
.../Defs/GeneDefs/Cumpilation_Genes.xml | 19 +++++
.../HediffDefs/Living_Cumbucket_Hediff.xml} | 1 +
.../Defs/JobDefs/Job_ProcessCumbucket.xml} | 2 +-
.../Defs/GeneDefs/Sexperience_GeneDefs.xml | 21 ------
.../Patch_Sexperience_Cum_Ingestion.xml | 71 -------------------
.../HediffComp_MatchSeverityOfHediff.cs | 2 +-
.../HediffComp_ProcessCumbucket.cs | 2 +-
...diffsCompProperties_ProcessCumbucketMTB.cs | 0
.../Fluid/JobDriver_ProcessingCumbucket.cs | 19 +++--
.../Patch_LivingCumbucket_StackHediff.cs | 30 ++++++--
1.5/Source/HarmonyInit.cs | 4 ++
1.5/Source/Rjw-Genes.csproj | 5 +-
LoadFolders.xml | 1 -
13 files changed, 64 insertions(+), 113 deletions(-)
rename 1.5/Mods/{Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml => Cumpilation/Defs/HediffDefs/Living_Cumbucket_Hediff.xml} (97%)
rename 1.5/Mods/{Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml => Cumpilation/Defs/JobDefs/Job_ProcessCumbucket.xml} (88%)
delete mode 100644 1.5/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml
delete mode 100644 1.5/Mods/Sexperience/Patches/Patch_Sexperience_Cum_Ingestion.xml
rename 1.5/Source/Genes/Fluid/{ => HediffComps}/HediffComp_ProcessCumbucket.cs (85%)
rename 1.5/Source/Genes/Fluid/{ => HediffComps}/HediffsCompProperties_ProcessCumbucketMTB.cs (100%)
diff --git a/1.5/Mods/Cumpilation/Defs/GeneDefs/Cumpilation_Genes.xml b/1.5/Mods/Cumpilation/Defs/GeneDefs/Cumpilation_Genes.xml
index 1f84a66..cace367 100644
--- a/1.5/Mods/Cumpilation/Defs/GeneDefs/Cumpilation_Genes.xml
+++ b/1.5/Mods/Cumpilation/Defs/GeneDefs/Cumpilation_Genes.xml
@@ -46,4 +46,23 @@
+
+
+ rjw_genes_living_cumbucket
+
+ rjw_genes_fluids
+ When this Xenotype partakes in sexual activity, they store cum and produce it as an item.
+ Genes/Icons/living_cumbucket
+ 559
+ 3
+ -2
+
+
+
+
+
+
\ No newline at end of file
diff --git a/1.5/Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml b/1.5/Mods/Cumpilation/Defs/HediffDefs/Living_Cumbucket_Hediff.xml
similarity index 97%
rename from 1.5/Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml
rename to 1.5/Mods/Cumpilation/Defs/HediffDefs/Living_Cumbucket_Hediff.xml
index a0abeef..6a72301 100644
--- a/1.5/Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml
+++ b/1.5/Mods/Cumpilation/Defs/HediffDefs/Living_Cumbucket_Hediff.xml
@@ -15,6 +15,7 @@
-0.5
+
0
diff --git a/1.5/Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml b/1.5/Mods/Cumpilation/Defs/JobDefs/Job_ProcessCumbucket.xml
similarity index 88%
rename from 1.5/Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml
rename to 1.5/Mods/Cumpilation/Defs/JobDefs/Job_ProcessCumbucket.xml
index 6cbb372..1bc0be5 100644
--- a/1.5/Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml
+++ b/1.5/Mods/Cumpilation/Defs/JobDefs/Job_ProcessCumbucket.xml
@@ -4,7 +4,7 @@
- ProcessCumbucket
+ RJW_Genes_ProcessCumbucketRJW_Genes.JobDriver_ProcessingCumbucketfalsefalse
diff --git a/1.5/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml b/1.5/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml
deleted file mode 100644
index cb9e0af..0000000
--- a/1.5/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- rjw_genes_living_cumbucket
-
- rjw_genes_fluids
- When this Xenotype partakes in sexual activity, they store cum and produce it as an item.
- Genes/Icons/living_cumbucket
- 559
- 3
- -2
-
-