diff --git a/About/Manifest.xml b/About/Manifest.xml index 650339a..5030d54 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW-Genes - 1.2.0 + 1.2.1
  • RimJobWorld
  • HugsLib
  • diff --git a/About/Preview.png b/About/Preview.png index 315ad3c..fdcd074 100644 Binary files a/About/Preview.png and b/About/Preview.png differ diff --git a/CHANGELOG.md b/CHANGELOG.md index a87f6e1..7ce1000 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# 1.2.1 + +**Fixes**: + +- Issue with RJW Changes for Orgasms, #52. Methods were renamed. +- Notes on the Gene Inheritance #51 + # 1.2 (11-06-2023) **Changes:** diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll index 666abb8..a45e15c 100644 Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ diff --git a/README.md b/README.md index 0ddf25a..6c427df 100644 --- a/README.md +++ b/README.md @@ -42,5 +42,6 @@ Please load this after any mod adding genes, and after the used RJW-Mods (Licent 1. Should not be used with the original RJW_Animal_Gene_Inheritance anymore. 2. There was an issue with other "Male-Only / Female-Only" Mods --- for which we provide our own Genes now. 3. CAI5000 will not crash, but will make *Seduce*-Ability fail. I think same goes for Combat Extended. -4. Alpha Genes "Female / Male Only" Genes might overwrite later Genitalia-Changes and should be avoided in combination with RJW-Genes Features. -5. rjw.sexperience.cumgenes removes fertilin-gain from Cum item - I hope I addressed this by adding a load order but keep me posted (Issue #41) \ No newline at end of file +4. Alpha Genes "Female / Male Only" Genes might overwrite later Genitalia-Changes and should be avoided in combination with RJW-Genes features. +5. rjw.sexperience.cumgenes removes fertilin-gain from Cum item - I hope I addressed this by adding a load order but keep me posted (Issue #41) +6. [Consistent Gene Inheritance](https://steamcommunity.com/sharedfiles/filedetails/?id=2881479142&searchtext=Consistent+Gene+Inheritance) alters inheritance - it messes a bit with the Insect-Caste Logic. Your game will not crash, but the insect xenotypes will be a bit messed up. \ No newline at end of file diff --git a/Source/Genes/Special/Patch_OrgasmMytosis.cs b/Source/Genes/Special/Patch_OrgasmMytosis.cs index af46c64..8c5b6e9 100644 --- a/Source/Genes/Special/Patch_OrgasmMytosis.cs +++ b/Source/Genes/Special/Patch_OrgasmMytosis.cs @@ -12,14 +12,19 @@ using Verse; namespace RJW_Genes { + + /// + /// There was a big change with RJW 5.3.6 and I got a new Issue #52 documenting it. + /// Basically, the reroll and orgasm logic was changed. + /// - [HarmonyPatch(typeof(JobDriver_Sex), nameof(JobDriver_Sex.Roll_Orgasm_Duration_Reset))] + [HarmonyPatch(typeof(JobDriver_Sex), "SetupOrgasmTicks")] public static class Patch_OrgasmMytosis { private const float SEVERITY_INCREASE_PER_ORGASM = 0.075f; - public static void Postfix(JobDriver_Sex __instance, ref int __result) + public static void Postfix(JobDriver_Sex __instance) { Pawn orgasmingPawn = __instance.pawn; if (orgasmingPawn != null && GeneUtility.HasGeneNullCheck(orgasmingPawn, GeneDefOf.rjw_genes_sexual_mytosis) && ! orgasmingPawn.health.hediffSet.HasHediff(HediffDefOf.rjw_genes_mytosis_shock_hediff)) @@ -42,7 +47,7 @@ namespace RJW_Genes else { float orgasm_time_reduction = Math.Max(1.0f - mytosisHediff.Severity, 0.1f); - __result = (int)(orgasm_time_reduction * __result); + __instance.sex_ticks = (int) (__instance.sex_ticks * orgasm_time_reduction); } } diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj index a8bfaa3..0ece225 100644 --- a/Source/Rjw-Genes.csproj +++ b/Source/Rjw-Genes.csproj @@ -198,8 +198,7 @@ False - ..\..\RJW-Sexperience\1.4\Assemblies\RJWSexperience.dll - False + ..\..\RJW-Sexperience-1.1.4.0\1.4\Assemblies\RJWSexperience.dll diff --git a/TODOS.md b/TODOS.md index c28f2ac..33ece5e 100644 --- a/TODOS.md +++ b/TODOS.md @@ -34,6 +34,7 @@ Any help is very appreciated, even if it is just pointing me to existing similar - [] Maybe: Boost pregnancy times of Animals - [] Maybe: Make it Animal-Fertilin-Dependend - [] Either: Can only eat meat or cannot eat meat +- [] Gene to prefer hookups of animals that are in a menstrual cycle Can't help but think about Rexxar Porn now I am a bad person.