diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll index 352f035..e5045f9 100644 Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ diff --git a/Common/Defs/Genes/GeneDefs_Cum.xml b/Common/Defs/Genes/GeneDefs_Cum.xml index 114ef91..89334fe 100644 --- a/Common/Defs/Genes/GeneDefs_Cum.xml +++ b/Common/Defs/Genes/GeneDefs_Cum.xml @@ -65,13 +65,19 @@ This Xenotype cannot get cumflated. Genes/Icons/Placeholder 537 -
  • NotCumflatable
    •  + + rjw_genes_generous_donor + + rjw_genes_cum + When this Xenotype transfers nutrition via cumshot, the giver will not get hungry. (Licentia Configuration for Transfer Nutrition must be enabled). + Genes/Icons/Placeholder + 538 + + \ No newline at end of file diff --git a/README.md b/README.md index cc00f1b..c5dc677 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ This is my first Mod I started from scratch so any feedback is very welcome. - Different Genitalia Types - Genitalia Size Scaling - Extra Genitalia (and a Futa Attempt) -- Some Traits -- Cum-Amount Changes +- Some Traits, Cumflation Immunity, Elasticity +- Cum-Amount Changes, Transfer Nutrition - Mech Breeding / Insect Breeding Support See [planned things](TODOS.md) and feel free to contribute. @@ -23,5 +23,5 @@ Please consider looking at [the known bugs](./KNOWN_BUGS.md) ## Genes vs. Races -I currently don't use Genes after Biotech was introduced. +I currently don't use Races after Biotech was introduced. One of the main motivations was to have genes being added to the xenotypes that other mods and the base game add, e.g. adding demonic penis for impids. \ No newline at end of file diff --git a/Source/GeneDefOf.cs b/Source/GeneDefOf.cs index 959ff01..88cf099 100644 --- a/Source/GeneDefOf.cs +++ b/Source/GeneDefOf.cs @@ -60,8 +60,9 @@ namespace RJW_Genes public static readonly GeneDef rjw_genes_much_cum; public static readonly GeneDef rjw_genes_very_much_cum; [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_likes_cumflation; - [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_cumflation_immunity; //Does currently not work like this - + [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_cumflation_immunity; + [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_generous_donor; + // Reproduction public static readonly GeneDef rjw_genes_hypersexual; public static readonly GeneDef rjw_genes_rapist; diff --git a/Source/Genes/Cum/Patch_Cumflation.cs b/Source/Genes/Cum/Patch_Cumflation.cs index e8c3496..9e26a26 100644 --- a/Source/Genes/Cum/Patch_Cumflation.cs +++ b/Source/Genes/Cum/Patch_Cumflation.cs @@ -16,6 +16,7 @@ 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_Cumflation diff --git a/Source/Genes/Cum/Patch_TransferNutrition.cs b/Source/Genes/Cum/Patch_TransferNutrition.cs new file mode 100644 index 0000000..cf8d92d --- /dev/null +++ b/Source/Genes/Cum/Patch_TransferNutrition.cs @@ -0,0 +1,41 @@ +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; +using LicentiaLabs; + +namespace RJW_Genes +{ + /// + /// Changes LicentiaLabs (if Present) to alter the TransferNutrition for rjw_genes_generous_donor. + /// 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_TransferNutrition + { + // 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(Pawn giver, Pawn receiver, float cumAmount) + { + // Design decision: + // I could have done some transpiler stuff, but that is scary and might need to be adjusted quite a lot + // Hence, I simply re-book the nutrition back to the giver in the Postfix. That should be robust and easy. + + if (GeneUtility.IsGenerousDonor(giver)) { + float donatedNutrition = CumflationHelper.CalculateNutritionAmount(giver, cumAmount); + // TODO: In theory, there could be something weird happening if the donor has food less than X and the "IgnoreThermodynamics" is set on. + // Then it can happen that the donor ends up with more food than he had before cumshot, but I think that is somewhat funny given that you have ignore Thermodynamics on. + Need_Food inflatorFood = giver.needs.TryGetNeed(); + inflatorFood.CurLevel += donatedNutrition; + } + } + } +} \ No newline at end of file diff --git a/Source/Genes/GeneUtility.cs b/Source/Genes/GeneUtility.cs index 44b6e64..ce022ba 100644 --- a/Source/Genes/GeneUtility.cs +++ b/Source/Genes/GeneUtility.cs @@ -59,5 +59,13 @@ namespace RJW_Genes } return pawn.genes.HasGene(GeneDefOf.rjw_genes_cumflation_immunity); } + public static bool IsGenerousDonor(Pawn pawn) + { + if (pawn.genes == null) + { + return false; + } + return pawn.genes.HasGene(GeneDefOf.rjw_genes_generous_donor); + } } } \ No newline at end of file diff --git a/Source/HarmonyInit.cs b/Source/HarmonyInit.cs index 1d44812..35ffb2e 100644 --- a/Source/HarmonyInit.cs +++ b/Source/HarmonyInit.cs @@ -21,9 +21,12 @@ namespace RJW_Genes { if (ModsConfig.IsActive("LustLicentia.RJWLabs")) { - // Gene: Cumflation Immunity + // Gene: Cumflation Immunity [Prefix Patch] harmony.Patch(AccessTools.Method(typeof(LicentiaLabs.CumflationHelper), nameof(LicentiaLabs.CumflationHelper.Cumflation)), prefix: new HarmonyMethod(typeof(Patch_Cumflation), nameof(Patch_Cumflation.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))); } }))(); } diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj index 0582a73..67da2c6 100644 --- a/Source/Rjw-Genes.csproj +++ b/Source/Rjw-Genes.csproj @@ -64,6 +64,7 @@ + diff --git a/TODOS.md b/TODOS.md index 5cd5bed..5bf70df 100644 --- a/TODOS.md +++ b/TODOS.md @@ -8,10 +8,6 @@ So any help is very appreciated, even if it is just pointing me to existing simi **Sanguophage like Cumwhores** adding Hemogen and refilling it by getting semen. Showstopper here is the amount of code required, and that I need to understand a bit better of harmony to run the AfterSexUtility and modulate SexChances. -**Immunity to Soreness / Ignoring Cumflation Mali** - -**LicentiaLabs TransferNutrition _Generous Donor_** pawns that get head do not loose nutrition or only part of what they fire. - **Adjustable Cock-Size** like e.g. artificial genitalia have ## Animal Gene Inheritance