\ No newline at end of file
diff --git a/About/Manifest.xml b/About/Manifest.xml
index 5030d54..b1d6c81 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,7 +1,7 @@
RJW-Genes
- 1.2.1
+ 1.2.0
RimJobWorld
HugsLib
@@ -12,7 +12,6 @@
RimJobWorld
HugsLib
-
RJWSexperience_CumGenes
RJW-LicentiaLabs
diff --git a/About/Preview.png b/About/Preview.png
index fdcd074..315ad3c 100644
Binary files a/About/Preview.png and b/About/Preview.png differ
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d921f5c..f7de594 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,44 +1,29 @@
-# 1.2.2
+# 1.2
-**Changes:**
+**Since beta-1**:
-- New Gene for Evergrowing Cocks. Be careful.
-
-**Fixes:**
-
-- New attempt at fixing condom consumption for Fertilin, adressing #41 & #48 provided by Infi
-- Copy of Infis patch for eating cum from sexperience, #41 and #48
-- Updated some Icons to have better backgrounds (thanks @WasmachenDennSachenSo #53)
-
-# 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)
+- Fix of icon-names (#36)
+- Changes to the scenario (more building items, throne for start). Wealth is now at 12k, which is the same as crashlanded and lost tribe.
+- Added the Orgasmic Mytosis Draft
+- Many touches on the Halamyr Hive Logic and Fertilizitation (#37,#38)
**Changes:**
- Cocoon Weaver Gene
- Spawn Spelopede Gene (Can be changed to spawn megascarabs or other insects via xml)
- Queens & Caste logic (see below)
-- Addition to InsectIncubator: Now fertilizes eggs once placed inside a host, and breeds out eggs roughly twice as fast.
+- Addition to InsectIncubator: Now fertilizes eggs once placed inside a host, and breeds out eggs twice as fast.
- Many new icons
- Custom background icons when Vanilla-Expanded-Framework is loaded
- Sexual Age Drainer & Youth Fountain now change age as configured in XML
- Draft for a Hive-Start Scenario
-- Added Orgasmic Mytosis Gene: On Multiple Orgasms, spawn an identical copy of a pawn. Items and Implants are not copied.
-- Patches for Alpha Genes Xenotypes and LTS Xenotech
-- New Simple Genitalia Patches for other popular Xenotypes (Thanks @Pali42K)
+- Added Orgasmic Mytosis Gene: On Multiple Orgasms, spawn an identical copy of a pawn. Items and Implants are not copied.
**Internal:**
- Renamed abilities to have _ability_ in their name, to not exactly match the gene-defnames.
- Moved Insect-Incubator & Insect-Breeder to hive category and folders (from breeding)
- Some exclusion-tags for Alpha Genes
-- Removed Patches for conditional Genes, and moved them to `mayRequire` in the XenotypeDefs
**Fixes:**
@@ -62,7 +47,6 @@ In general, the logic is the following:
- For workers, every queen can have a set of genes for their workers defined in [a special def](./Common/Defs/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml). These will be added as endogenes, so that pawns can still become xenotypes.
- There is a default gene-set for workers, making dumb, sterile and servile pawns.
- Chances for Offsprings (Drone, Queen, Worker) is defined in an [XML-Def](./Common/Defs/HiveOffspringChanceDef/HiveOffspringChanceDefs.xml). They are set per Queen.
-- Birthlogic should apply for normal pregnancies, and for RJW-Insect Eggs. Other Pregnancies (from mods) are not supported.
I am not sure if I want to have a specific mapping defining that queen can only mate with certain drones, let me know how you feel about it.
*Queens can be male*. I just used the female-term, but implementation is gender-neutral.
@@ -77,19 +61,6 @@ But i don't want to add a bunch of cosmetic genes on top of things.
*And what the fuck is a halamyr?* Well I had to name my little ants somehow. But I didn't want to call them `myr` as I maybe want to make some [TiTs](https://www.fenoxo.com/play-games/) xenotypes separately.
And I am aware that the TiTs-Myr work different than the things I made now.
-
-**Changes Since beta-1**:
-
-- Fix of icon-names (#36)
-- Changes to the scenario (more building items, throne for start). Wealth is now at 12k, which is the same as crashlanded and lost tribe.
-- Added the Orgasmic Mytosis Draft
-- Many touches on the Halamyr Hive Logic and Fertilizitation (#37,#38)
-
-**Changes Since beta-2**:
-
-- Mostly Patches and Changes to the Halamyr Defs
-- Some re-arranging and mayRequires for other mods
-
# 1.1.4
Fixes:
diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll
index a45e15c..0da41c0 100644
Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ
diff --git a/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml b/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
index 6d0bb5c..5c43285 100644
--- a/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
@@ -111,20 +111,4 @@
AnusSize
-
-
-
-
- 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_Genitalia
- RJW_Genes.Gene_EvergrowingGenitalia
- 767
-
-
PenisSize
-
VaginaSize
-
-
-
\ No newline at end of file
diff --git a/Common/Defs/GeneDefs/Xenotype_Hive.xml b/Common/Defs/GeneDefs/Xenotype_Hive.xml
index bca30ab..7d8b31b 100644
--- a/Common/Defs/GeneDefs/Xenotype_Hive.xml
+++ b/Common/Defs/GeneDefs/Xenotype_Hive.xml
@@ -36,7 +36,7 @@
+ 1
+
-
\ No newline at end of file
diff --git a/Common/Patches/Xenotypes/GenitaliaUpdate.xml b/Common/Patches/Xenotypes/FromOtherMods/GenitaliaUpdate.xml
similarity index 100%
rename from Common/Patches/Xenotypes/GenitaliaUpdate.xml
rename to Common/Patches/Xenotypes/FromOtherMods/GenitaliaUpdate.xml
diff --git a/Common/Patches/Xenotypes/PatchBiotechNyaron.xml b/Common/Patches/Xenotypes/FromOtherMods/PatchBiotechNyaron.xml
similarity index 100%
rename from Common/Patches/Xenotypes/PatchBiotechNyaron.xml
rename to Common/Patches/Xenotypes/FromOtherMods/PatchBiotechNyaron.xml
diff --git a/Common/Patches/Xenotypes/PatchKijinRace3.xml b/Common/Patches/Xenotypes/FromOtherMods/PatchKijinRace3.xml
similarity index 100%
rename from Common/Patches/Xenotypes/PatchKijinRace3.xml
rename to Common/Patches/Xenotypes/FromOtherMods/PatchKijinRace3.xml
diff --git a/Common/Patches/Xenotypes/PatchNarai.xml b/Common/Patches/Xenotypes/FromOtherMods/PatchNarai.xml
similarity index 100%
rename from Common/Patches/Xenotypes/PatchNarai.xml
rename to Common/Patches/Xenotypes/FromOtherMods/PatchNarai.xml
diff --git a/Common/Patches/Xenotypes/PatchNyaron.xml b/Common/Patches/Xenotypes/FromOtherMods/PatchNyaron.xml
similarity index 100%
rename from Common/Patches/Xenotypes/PatchNyaron.xml
rename to Common/Patches/Xenotypes/FromOtherMods/PatchNyaron.xml
diff --git a/Common/Patches/Xenotypes/PatchPapou.xml b/Common/Patches/Xenotypes/FromOtherMods/PatchPapou.xml
similarity index 100%
rename from Common/Patches/Xenotypes/PatchPapou.xml
rename to Common/Patches/Xenotypes/FromOtherMods/PatchPapou.xml
diff --git a/Common/Patches/Xenotypes/PatchRoosMinotaur.xml b/Common/Patches/Xenotypes/FromOtherMods/PatchRoosMinotaur.xml
similarity index 100%
rename from Common/Patches/Xenotypes/PatchRoosMinotaur.xml
rename to Common/Patches/Xenotypes/FromOtherMods/PatchRoosMinotaur.xml
diff --git a/Common/Patches/Xenotypes/PatchSaurid.xml b/Common/Patches/Xenotypes/FromOtherMods/PatchSaurid.xml
similarity index 100%
rename from Common/Patches/Xenotypes/PatchSaurid.xml
rename to Common/Patches/Xenotypes/FromOtherMods/PatchSaurid.xml
diff --git a/Common/Patches/Xenotypes/PatchVREPhytokin.xml b/Common/Patches/Xenotypes/FromOtherMods/PatchVREPhytokin.xml
similarity index 100%
rename from Common/Patches/Xenotypes/PatchVREPhytokin.xml
rename to Common/Patches/Xenotypes/FromOtherMods/PatchVREPhytokin.xml
diff --git a/Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml b/Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml
new file mode 100644
index 0000000..5c85681
--- /dev/null
+++ b/Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Patches/Xenotypes/PatchVRESanguophage.xml b/Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml
similarity index 56%
rename from Common/Patches/Xenotypes/PatchVRESanguophage.xml
rename to Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml
index 03e3ba6..15b6f3f 100644
--- a/Common/Patches/Xenotypes/PatchVRESanguophage.xml
+++ b/Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml
@@ -4,38 +4,38 @@
-
-
-
diff --git a/Common/Textures/Genes/Icons/Big_Breasts.png b/Common/Textures/Genes/Icons/Big_Breasts.png
index a9d1786..5061ee5 100644
Binary files a/Common/Textures/Genes/Icons/Big_Breasts.png and b/Common/Textures/Genes/Icons/Big_Breasts.png differ
diff --git a/Common/Textures/Genes/Icons/Big_Male_Genitalia.png b/Common/Textures/Genes/Icons/Big_Male_Genitalia.png
index 68396ba..fe6d86e 100644
Binary files a/Common/Textures/Genes/Icons/Big_Male_Genitalia.png and b/Common/Textures/Genes/Icons/Big_Male_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/Extra_Anus.png b/Common/Textures/Genes/Icons/Extra_Anus.png
index 6097374..9dfbbb6 100644
Binary files a/Common/Textures/Genes/Icons/Extra_Anus.png and b/Common/Textures/Genes/Icons/Extra_Anus.png differ
diff --git a/Common/Textures/Genes/Icons/Extra_Breasts.png b/Common/Textures/Genes/Icons/Extra_Breasts.png
index 3247920..5e7cbc3 100644
Binary files a/Common/Textures/Genes/Icons/Extra_Breasts.png and b/Common/Textures/Genes/Icons/Extra_Breasts.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Canine.png b/Common/Textures/Genes/Icons/Genitalia_Canine.png
index 24283b6..7631681 100644
Binary files a/Common/Textures/Genes/Icons/Genitalia_Canine.png and b/Common/Textures/Genes/Icons/Genitalia_Canine.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Demon.png b/Common/Textures/Genes/Icons/Genitalia_Demon.png
index e3400e8..d8ace83 100644
Binary files a/Common/Textures/Genes/Icons/Genitalia_Demon.png and b/Common/Textures/Genes/Icons/Genitalia_Demon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Equine.png b/Common/Textures/Genes/Icons/Genitalia_Equine.png
index 9577293..efb9bab 100644
Binary files a/Common/Textures/Genes/Icons/Genitalia_Equine.png and b/Common/Textures/Genes/Icons/Genitalia_Equine.png differ
diff --git a/Common/Textures/Genes/Icons/Loose_Anus.png b/Common/Textures/Genes/Icons/Loose_Anus.png
index ada02ee..86036d8 100644
Binary files a/Common/Textures/Genes/Icons/Loose_Anus.png and b/Common/Textures/Genes/Icons/Loose_Anus.png differ
diff --git a/Common/Textures/Genes/Icons/No_Anus.png b/Common/Textures/Genes/Icons/No_Anus.png
index 7cfb774..69f7d6b 100644
Binary files a/Common/Textures/Genes/Icons/No_Anus.png and b/Common/Textures/Genes/Icons/No_Anus.png differ
diff --git a/Common/Textures/Genes/Icons/No_Breasts.png b/Common/Textures/Genes/Icons/No_Breasts.png
index fd17996..5566734 100644
Binary files a/Common/Textures/Genes/Icons/No_Breasts.png and b/Common/Textures/Genes/Icons/No_Breasts.png differ
diff --git a/Common/Textures/Genes/Icons/No_Male_Genitalia.png b/Common/Textures/Genes/Icons/No_Male_Genitalia.png
index bad56cf..9104ea6 100644
Binary files a/Common/Textures/Genes/Icons/No_Male_Genitalia.png and b/Common/Textures/Genes/Icons/No_Male_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/RJW-Genes_Rodent_Genitalia (Not in use now).png b/Common/Textures/Genes/Icons/RJW-Genes_Rodent_Genitalia (Not in use now).png
index a15e618..507684a 100644
Binary files a/Common/Textures/Genes/Icons/RJW-Genes_Rodent_Genitalia (Not in use now).png and b/Common/Textures/Genes/Icons/RJW-Genes_Rodent_Genitalia (Not in use now).png differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Background.png b/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Background.png
index 5d8b0e0..9973e24 100644
Binary files a/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Background.png and b/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Background.png differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_Xenogene_Background.png b/Common/Textures/Genes/Icons/RJW_Genes_Xenogene_Background.png
index b3b359e..f902c39 100644
Binary files a/Common/Textures/Genes/Icons/RJW_Genes_Xenogene_Background.png and b/Common/Textures/Genes/Icons/RJW_Genes_Xenogene_Background.png differ
diff --git a/Common/Textures/Genes/Icons/Small_Breasts.png b/Common/Textures/Genes/Icons/Small_Breasts.png
index e2005b7..b32f1d3 100644
Binary files a/Common/Textures/Genes/Icons/Small_Breasts.png and b/Common/Textures/Genes/Icons/Small_Breasts.png differ
diff --git a/Common/Textures/Genes/Icons/Small_Male_Genitalia.png b/Common/Textures/Genes/Icons/Small_Male_Genitalia.png
index 19924d2..b4d7194 100644
Binary files a/Common/Textures/Genes/Icons/Small_Male_Genitalia.png and b/Common/Textures/Genes/Icons/Small_Male_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/Tight_Anus.png b/Common/Textures/Genes/Icons/Tight_Anus.png
index dd57b1d..0e797de 100644
Binary files a/Common/Textures/Genes/Icons/Tight_Anus.png and b/Common/Textures/Genes/Icons/Tight_Anus.png differ
diff --git a/Common/Textures/Genes/Icons/Zoophile.png b/Common/Textures/Genes/Icons/Zoophile.png
index a31c470..75afdf4 100644
Binary files a/Common/Textures/Genes/Icons/Zoophile.png and b/Common/Textures/Genes/Icons/Zoophile.png differ
diff --git a/Common/Textures/Genes/Icons/cockeater.png b/Common/Textures/Genes/Icons/cockeater.png
index 0b60a46..fa9577b 100644
Binary files a/Common/Textures/Genes/Icons/cockeater.png and b/Common/Textures/Genes/Icons/cockeater.png differ
diff --git a/Common/Textures/Genes/Icons/extra_male.png b/Common/Textures/Genes/Icons/extra_male.png
index 743ae44..c39e163 100644
Binary files a/Common/Textures/Genes/Icons/extra_male.png and b/Common/Textures/Genes/Icons/extra_male.png differ
diff --git a/Common/Textures/Genes/Icons/rjw_naked_prowess.png b/Common/Textures/Genes/Icons/rjw_naked_prowess.png
index d54231c..468fc60 100644
Binary files a/Common/Textures/Genes/Icons/rjw_naked_prowess.png and b/Common/Textures/Genes/Icons/rjw_naked_prowess.png differ
diff --git a/README.md b/README.md
index 6c427df..cbffc9d 100644
--- a/README.md
+++ b/README.md
@@ -9,16 +9,14 @@ This mod adds genes related and based on RJW to Rimworld.
- Extra Genitalia (and a Futa Attempt)
- Most RJW Traits, Cumflation Immunity, Elasticity
- Cum-Amount Changes, Transfer Nutrition Boosts
-- Mech Breeding / Insect Breeding Additions & Orgasmic Mytosis
+- Mech Breeding / Insect Breeding Additions
- Human-Animal Gene Inheritance merged from [Shabakur](https://github.com/Shabakur/RJW_Animal_Gene_Inheritance)
- Succubi, Incubi & Cumazones that utilize Fertilin, similar to Hemogen
- Insect-Caste Mechanics, with Queens, Drones and Workers and a conditional reproduction
-- Patches for some popular / common Xenotypes from other Mods.
See [planned things](TODOS.md) and feel free to contribute.
With the Human-Animal-Gene Inheritance we have a lot of XML that you can contribute!
We have a [template](./Common/Defs/RaceGeneDefs/RaceGeneDefs_template.xml) and you can add animals and/or genes from mods there (Racegroups are base-rjw).
-If you want to make your own Hive-Xenotypes, please see the required XMLs at [Changelog - 1.2](./CHANGELOG.md).
## Bugs?
@@ -42,6 +40,4 @@ 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)
-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
+4. Alpha Genes "Female / Male Only" Genes might overwrite later Genitalia-Changes and should be avoided in combination with RJW-Genes Features.
\ No newline at end of file
diff --git a/Source/Genes/GenitaliaSize/Gene_EvergrowingGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_EvergrowingGenitalia.cs
deleted file mode 100644
index 05a6803..0000000
--- a/Source/Genes/GenitaliaSize/Gene_EvergrowingGenitalia.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using Verse;
-using Verse;
-using RimWorld;
-using rjw;
-using System.Collections.Generic;
-using System;
-
-namespace RJW_Genes
-{
- public class Gene_EvergrowingGenitalia : RJW_Gene
- {
-
- ///
- /// The age (in years) at which the Pawns Genes will take effect, resizing their genitalia.
- ///
- public const int RESIZING_AGE = 20;
-
- //public const int GROWTH_INTERVAL = 1000; // Test value for Quick Trials
- public const int GROWTH_INTERVAL = 60000; // 60k == 1 day
-
- public override void Tick()
- {
- base.Tick();
-
- if (pawn.IsHashIntervalTick(GROWTH_INTERVAL)
- && this.pawn.Map != null
- && pawn.ageTracker.AgeBiologicalYears >= RESIZING_AGE)
- {
- GrowPenisses();
- GrowVaginas();
- }
- }
-
- private void GrowPenisses()
- {
- List AllPenisses = Genital_Helper.get_AllPartsHediffList(pawn).FindAll(x => Genital_Helper.is_penis(x));
- foreach(Hediff penis in AllPenisses)
- {
- CompHediffBodyPart CompHediff = penis.TryGetComp();
- if (penis.Severity < 1.00)
- {
- penis.Severity = Math.Min(1.01f, penis.Severity + 0.05f);
- } else {
- if (CompHediff != null)
- {
- CompHediff.SizeOwner += 0.015f;
- if (CompHediff.SizeOwner > 3.0f)
- {
- // Add Mental Hediff
- HandleGenitaliaSizeThoughts(pawn);
- }
- }
- }
-
- // Increase Fluid
- if (CompHediff != null)
- CompHediff.FluidAmmount *= 1.05f;
- }
- }
-
- private void GrowVaginas()
- {
- List AllVaginas = Genital_Helper.get_AllPartsHediffList(pawn).FindAll(x => Genital_Helper.is_vagina(x));
- foreach (Hediff vagina in AllVaginas)
- {
- CompHediffBodyPart CompHediff = vagina.TryGetComp();
- if (vagina.Severity < 1.00)
- {
- vagina.Severity = Math.Min(1.01f, vagina.Severity + 0.05f);
- }
- else
- {
- if (CompHediff != null)
- {
- CompHediff.SizeOwner += 0.015f;
- if (CompHediff.SizeOwner > 3.0f)
- {
- // Add Mental Hediff
- HandleGenitaliaSizeThoughts(pawn);
- }
- }
- }
-
- // Increase Fluid
- if (CompHediff != null)
- CompHediff.FluidAmmount *= 1.025f;
- }
- }
-
- private void HandleGenitaliaSizeThoughts(Pawn pawn)
- {
- Hediff hybridsThoughts = pawn.health.hediffSet.GetFirstHediffOfDef(HediffDefOf.rjw_genes_evergrowth_sideeffect);
-
- if (hybridsThoughts != null)
- {
- hybridsThoughts.Severity += 0.025f;
- }
- else
- {
- hybridsThoughts = HediffMaker.MakeHediff(HediffDefOf.rjw_genes_evergrowth_sideeffect, pawn);
- hybridsThoughts.Severity = 0.1f;
- pawn.health.AddHediff(hybridsThoughts);
- }
- }
-
- }
-}
\ No newline at end of file
diff --git a/Source/Genes/Special/Patch_OrgasmMytosis.cs b/Source/Genes/Special/Patch_OrgasmMytosis.cs
index 8c5b6e9..af46c64 100644
--- a/Source/Genes/Special/Patch_OrgasmMytosis.cs
+++ b/Source/Genes/Special/Patch_OrgasmMytosis.cs
@@ -12,19 +12,14 @@ 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), "SetupOrgasmTicks")]
+ [HarmonyPatch(typeof(JobDriver_Sex), nameof(JobDriver_Sex.Roll_Orgasm_Duration_Reset))]
public static class Patch_OrgasmMytosis
{
private const float SEVERITY_INCREASE_PER_ORGASM = 0.075f;
- public static void Postfix(JobDriver_Sex __instance)
+ public static void Postfix(JobDriver_Sex __instance, ref int __result)
{
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))
@@ -47,7 +42,7 @@ namespace RJW_Genes
else
{
float orgasm_time_reduction = Math.Max(1.0f - mytosisHediff.Severity, 0.1f);
- __instance.sex_ticks = (int) (__instance.sex_ticks * orgasm_time_reduction);
+ __result = (int)(orgasm_time_reduction * __result);
}
}
diff --git a/Source/HediffDefOf.cs b/Source/HediffDefOf.cs
index 30e34df..4e3b052 100644
--- a/Source/HediffDefOf.cs
+++ b/Source/HediffDefOf.cs
@@ -17,8 +17,6 @@ namespace RJW_Genes
public static readonly HediffDef rjw_genes_orgasm_rush_hediff;
public static readonly HediffDef rjw_genes_fertilin_craving;
- public static readonly HediffDef rjw_genes_evergrowth_sideeffect;
-
public static readonly HediffDef rjw_genes_orgasmic_mytosis_hediff;
public static readonly HediffDef rjw_genes_mytosis_shock_hediff;
}
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index c14c538..a8bfaa3 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -44,7 +44,6 @@
-
@@ -199,7 +198,8 @@
False
- ..\..\RJW-Sexperience-1.1.4.0\1.4\Assemblies\RJWSexperience.dll
+ ..\..\RJW-Sexperience\1.4\Assemblies\RJWSexperience.dll
+ False
diff --git a/TODOS.md b/TODOS.md
index 33ece5e..c28f2ac 100644
--- a/TODOS.md
+++ b/TODOS.md
@@ -34,7 +34,6 @@ 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.