diff --git a/About/About.xml b/About/About.xml index 809d945..de6326a 100644 --- a/About/About.xml +++ b/About/About.xml @@ -41,6 +41,7 @@
  • sarg.alphaanimals
  • Sl4vP0weR.DominantGene
  • +
  • rjw.sexperience.cumgenes
  • \ No newline at end of file diff --git a/About/Manifest.xml b/About/Manifest.xml index b1d6c81..5030d54 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW-Genes - 1.2.0 + 1.2.1
  • RimJobWorld
  • HugsLib
  • @@ -12,6 +12,7 @@
  • RimJobWorld
  • HugsLib
  • +
  • RJWSexperience_CumGenes
  • RJW-LicentiaLabs
  • 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 f7de594..d921f5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,29 +1,44 @@ -# 1.2 +# 1.2.2 -**Since beta-1**: +**Changes:** -- 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) +- 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) **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 twice as fast. +- Addition to InsectIncubator: Now fertilizes eggs once placed inside a host, and breeds out eggs roughly 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. +- 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) **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:** @@ -47,6 +62,7 @@ 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. @@ -61,6 +77,19 @@ 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 0da41c0..a45e15c 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 5c43285..6d0bb5c 100644 --- a/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml +++ b/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml @@ -111,4 +111,20 @@
  • 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 7d8b31b..bca30ab 100644 --- a/Common/Defs/GeneDefs/Xenotype_Hive.xml +++ b/Common/Defs/GeneDefs/Xenotype_Hive.xml @@ -36,7 +36,7 @@
  • AptitudeTerrible_Shooting
  • AptitudeTerrible_Melee
  • AptitudeRemarkable_Social
  • -
  • AptitudeRemarkable_Sex
  • +
  • AptitudeRemarkable_Sex
  • rjw_genes_female_only
  • rjw_genes_ovipositor_genitalia
  • rjw_genes_aphrodisiac_pheromones
  • diff --git a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml index 646d4c8..608a2f4 100644 --- a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml +++ b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml @@ -35,7 +35,10 @@
  • rjw_genes_paralysingkiss
  • rjw_genes_seduce
  • +
  • AptitudeRemarkable_Sex
  • +
  • DominantGene
  • +
  • rjw_genes_elasticity
  • rjw_genes_succubus_wings
  • rjw_genes_succubus_tail
  • rjw_genes_aphrodisiac_pheromones
  • @@ -77,6 +80,10 @@
  • rjw_genes_drainer
  • rjw_genes_demonic_genitalia
  • +
  • AptitudeRemarkable_Sex
  • + + +
  • DominantGene
  • rjw_genes_seduce
  • rjw_genes_succubus_wings
  • rjw_genes_succubus_tail
  • diff --git a/Common/Defs/HediffDefs/Hediffs_Evergrowth.xml b/Common/Defs/HediffDefs/Hediffs_Evergrowth.xml new file mode 100644 index 0000000..c2fc098 --- /dev/null +++ b/Common/Defs/HediffDefs/Hediffs_Evergrowth.xml @@ -0,0 +1,52 @@ + + + + + rjw_genes_evergrowth_sideeffect + HediffWithComps + + science has gone too far - a tool like this needs constant attention. + (1,0,0.5) + 1.0 + +
  • + -0.025 +
  • +
    + +
  • + + + 3 + +
  • +
  • + 0.5 + + + 5 + + +
  • + Consciousness + -0.05 +
  • + + +
  • + 0.9 + + + 7 + + +
  • + Consciousness + -0.1 +
  • + + +
    +
    + +
    \ No newline at end of file diff --git a/Common/Defs/Scenarios/Halamyr_Hive.xml b/Common/Defs/Scenarios/Halamyr_Hive.xml index 0c9387a..1673a15 100644 --- a/Common/Defs/Scenarios/Halamyr_Hive.xml +++ b/Common/Defs/Scenarios/Halamyr_Hive.xml @@ -65,7 +65,7 @@ PlayerStarter 0.5 Malnutrition - 0.2~0.4 + 0.1~0.2
  • SetNeedLevel @@ -73,19 +73,19 @@ PlayerStarter 1.0 Food - 0~0.1 + 0.3~0.8
  • StartingThing_Defined Silver - 400 + 300
  • StartingThing_Defined Pemmican - 250 + 350
  • StartingThing_Defined @@ -132,6 +132,12 @@ Jade 100
  • + +
  • + ScatterThingsNearPlayerStart + Pemmican + 150 +
  • ScatterThingsNearPlayerStart Steel diff --git a/Common/Patches/ThingDefs/RJW_Used_Condoms.xml b/Common/Patches/ThingDefs/RJW_Used_Condoms.xml index d04bcb1..56ae1d2 100644 --- a/Common/Patches/ThingDefs/RJW_Used_Condoms.xml +++ b/Common/Patches/ThingDefs/RJW_Used_Condoms.xml @@ -1,11 +1,19 @@ - - - -
  • RimJobWorld
  • - - + + + + Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers + /Defs/ThingDef[defName="UsedCondom"]/ingestible @@ -14,6 +22,15 @@ + + + Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers + +
  • + 1 +
  • +
    + \ No newline at end of file diff --git a/Common/Patches/ThingDefs/Sexperience_Cum.xml b/Common/Patches/ThingDefs/Sexperience_Cum.xml index b905d4b..5ba06c4 100644 --- a/Common/Patches/ThingDefs/Sexperience_Cum.xml +++ b/Common/Patches/ThingDefs/Sexperience_Cum.xml @@ -1,17 +1,37 @@ - - - -
  • RJW Sexperience
  • -
    + + + + + Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers + + /Defs/ThingDef[defName="GatheredCum"]/ingestible + + +
  • + 1 +
  • +
    +
    +
    - /Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers + Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers
  • - 1 -
  • + 1 +
    +
    \ No newline at end of file diff --git a/Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml b/Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml deleted file mode 100644 index 5c85681..0000000 --- a/Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - -
  • LustLicentia.RJWLabs
  • -
    - - Defs/XenotypeDef[defName="rjw_genes_succubus"]/genes - -
  • rjw_genes_elasticity
  • -
    -
    -
    -
    \ No newline at end of file diff --git a/Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml b/Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml deleted file mode 100644 index 419eeb2..0000000 --- a/Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - -
  • - -
  • RJW Sexperience
  • - - - Defs/XenotypeDef[defName="rjw_genes_succubus"]/genes - -
  • AptitudeRemarkable_Sex
  • -
    -
    - -
  • - -
  • RJW Sexperience
  • - - - Defs/XenotypeDef[defName="rjw_genes_incubus"]/genes - -
  • AptitudeRemarkable_Sex
  • -
    -
    - - -
    -
    -
    \ No newline at end of file diff --git a/Common/Patches/Xenotypes/FromOtherMods/GenitaliaUpdate.xml b/Common/Patches/Xenotypes/GenitaliaUpdate.xml similarity index 100% rename from Common/Patches/Xenotypes/FromOtherMods/GenitaliaUpdate.xml rename to Common/Patches/Xenotypes/GenitaliaUpdate.xml diff --git a/Common/Patches/Xenotypes/PatchAlphaGenes.xml b/Common/Patches/Xenotypes/PatchAlphaGenes.xml new file mode 100644 index 0000000..5550f25 --- /dev/null +++ b/Common/Patches/Xenotypes/PatchAlphaGenes.xml @@ -0,0 +1,86 @@ + + + + +
  • + +
  • Alpha Genes
  • + + + Defs/XenotypeDef[defName="AG_Fleetkind"]/genes + +
  • rjw_genes_slime_genitalia
  • +
  • rjw_genes_elasticity
  • +
    +
    + + +
  • + +
  • Alpha Genes
  • + + + Defs/XenotypeDef[defName="AG_Helixien"]/genes + +
  • rjw_genes_slime_genitalia
  • +
  • rjw_genes_elasticity
  • +
    +
    + + +
  • + +
  • Alpha Genes
  • + + + Defs/XenotypeDef[defName="AG_Taukai"]/genes + +
  • rjw_genes_sexual_mytosis
  • +
    +
    + + +
  • + +
  • Alpha Genes
  • + + + Defs/XenotypeDef[defName="AG_MindDevourer"]/genes + +
  • rjw_genes_demonic_genitalia
  • +
  • rjw_genes_sex_age_drain
  • +
    +
    + + +
  • + +
  • Alpha Genes
  • + + + Defs/XenotypeDef[defName="AG_Lapis"]/genes + +
  • rjw_genes_big_breasts
  • +
  • rjw_genes_no_cum
  • +
  • rjw_genes_big_male_genitalia
  • +
    +
    + + +
  • + +
  • Alpha Genes
  • + + + Defs/XenotypeDef[defName="AG_Efreet"]/genes + +
  • rjw_genes_demonic_genitalia
  • +
  • rjw_genes_small_breasts
  • +
  • rjw_genes_tight_female_genitalia
  • +
  • rjw_genes_tight_anus
  • +
    +
    + +
    +
    +
    diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchBiotechNyaron.xml b/Common/Patches/Xenotypes/PatchBiotechNyaron.xml similarity index 100% rename from Common/Patches/Xenotypes/FromOtherMods/PatchBiotechNyaron.xml rename to Common/Patches/Xenotypes/PatchBiotechNyaron.xml diff --git a/Common/Patches/Xenotypes/PatchErinsAuronya.xml b/Common/Patches/Xenotypes/PatchErinsAuronya.xml new file mode 100644 index 0000000..44e49d9 --- /dev/null +++ b/Common/Patches/Xenotypes/PatchErinsAuronya.xml @@ -0,0 +1,14 @@ + + + + +
  • Erin's Auronya
  • +
    + + Defs/XenotypeDef[defName="ERN_Auronya"]/genes + +
  • rjw_genes_feline_genitalia
  • +
    +
    +
    +
    \ No newline at end of file diff --git a/Common/Patches/Xenotypes/PatchErinsShisune.xml b/Common/Patches/Xenotypes/PatchErinsShisune.xml new file mode 100644 index 0000000..75b41c6 --- /dev/null +++ b/Common/Patches/Xenotypes/PatchErinsShisune.xml @@ -0,0 +1,14 @@ + + + + +
  • Erin's Shisune
  • +
    + + Defs/XenotypeDef[defName="ERN_Shisune"]/genes + +
  • rjw_genes_canine_genitalia
  • +
    +
    +
    +
    \ No newline at end of file diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchKijinRace3.xml b/Common/Patches/Xenotypes/PatchKijinRace3.xml similarity index 100% rename from Common/Patches/Xenotypes/FromOtherMods/PatchKijinRace3.xml rename to Common/Patches/Xenotypes/PatchKijinRace3.xml diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchNarai.xml b/Common/Patches/Xenotypes/PatchNarai.xml similarity index 100% rename from Common/Patches/Xenotypes/FromOtherMods/PatchNarai.xml rename to Common/Patches/Xenotypes/PatchNarai.xml diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchNyaron.xml b/Common/Patches/Xenotypes/PatchNyaron.xml similarity index 100% rename from Common/Patches/Xenotypes/FromOtherMods/PatchNyaron.xml rename to Common/Patches/Xenotypes/PatchNyaron.xml diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchPapou.xml b/Common/Patches/Xenotypes/PatchPapou.xml similarity index 100% rename from Common/Patches/Xenotypes/FromOtherMods/PatchPapou.xml rename to Common/Patches/Xenotypes/PatchPapou.xml diff --git a/Common/Patches/Xenotypes/PatchRoosFaun.xml b/Common/Patches/Xenotypes/PatchRoosFaun.xml new file mode 100644 index 0000000..8f33932 --- /dev/null +++ b/Common/Patches/Xenotypes/PatchRoosFaun.xml @@ -0,0 +1,17 @@ + + + + +
  • Roo's Faun Xenotype
  • +
    + + Defs/XenotypeDef[defName="RBSF_Faun"]/genes + +
  • rjw_genes_tight_female_genitalia
  • +
  • rjw_genes_small_male_genitalia
  • +
  • rjw_genes_small_breasts
  • +
  • rjw_genes_tight_anus
  • +
    +
    +
    +
    diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchRoosMinotaur.xml b/Common/Patches/Xenotypes/PatchRoosMinotaur.xml similarity index 100% rename from Common/Patches/Xenotypes/FromOtherMods/PatchRoosMinotaur.xml rename to Common/Patches/Xenotypes/PatchRoosMinotaur.xml diff --git a/Common/Patches/Xenotypes/PatchRoosSatyr.xml b/Common/Patches/Xenotypes/PatchRoosSatyr.xml new file mode 100644 index 0000000..bfada1f --- /dev/null +++ b/Common/Patches/Xenotypes/PatchRoosSatyr.xml @@ -0,0 +1,15 @@ + + + + +
  • Roo's Satyr Xenotype
  • +
    + + Defs/XenotypeDef[defName="RBSF_Satyr"]/genes + +
  • rjw_genes_aphrodisiac_pheromones
  • +
  • rjw_genes_much_cum
  • +
    +
    +
    +
    diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchSaurid.xml b/Common/Patches/Xenotypes/PatchSaurid.xml similarity index 100% rename from Common/Patches/Xenotypes/FromOtherMods/PatchSaurid.xml rename to Common/Patches/Xenotypes/PatchSaurid.xml diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchVREPhytokin.xml b/Common/Patches/Xenotypes/PatchVREPhytokin.xml similarity index 100% rename from Common/Patches/Xenotypes/FromOtherMods/PatchVREPhytokin.xml rename to Common/Patches/Xenotypes/PatchVREPhytokin.xml diff --git a/Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml b/Common/Patches/Xenotypes/PatchVRESanguophage.xml similarity index 56% rename from Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml rename to Common/Patches/Xenotypes/PatchVRESanguophage.xml index 15b6f3f..03e3ba6 100644 --- a/Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml +++ b/Common/Patches/Xenotypes/PatchVRESanguophage.xml @@ -4,38 +4,38 @@
  • -
  • Dominant Gene
  • +
  • Vanilla Races Expanded - Sanguophage
  • - Defs/XenotypeDef[defName="rjw_genes_succubus"]/genes + Defs/XenotypeDef[defName="VRE_Bruxa"]/genes -
  • DominantGene
  • +
  • rjw_genes_demonic_genitalia
  • -
  • Dominant Gene
  • +
  • Vanilla Races Expanded - Sanguophage
  • - Defs/XenotypeDef[defName="rjw_genes_incubus"]/genes + Defs/XenotypeDef[defName="VRE_Ekkimian"]/genes -
  • DominantGene
  • +
  • rjw_genes_demonic_genitalia
  • -
  • Dominant Gene
  • +
  • Vanilla Races Expanded - Sanguophage
  • - Defs/XenotypeDef[defName="rjw_genes_cumazone"]/genes + Defs/XenotypeDef[defName="VRE_Strigoi"]/genes -
  • DominantGene
  • +
  • rjw_genes_demonic_genitalia
  • - \ No newline at end of file + diff --git a/Common/Patches/Xenotypes/PatchXenotech.xml b/Common/Patches/Xenotypes/PatchXenotech.xml new file mode 100644 index 0000000..8ed3deb --- /dev/null +++ b/Common/Patches/Xenotypes/PatchXenotech.xml @@ -0,0 +1,69 @@ + + + + +
  • + +
  • [LTS]Xenotech
  • + + + Defs/XenotypeDef[defName="LTS_Nyankind"]/genes + +
  • rjw_genes_feline_genitalia
  • +
    +
    + +
  • + +
  • [LTS]Xenotech
  • + + + Defs/XenotypeDef[defName="LTS_Growler"]/genes + +
  • rjw_genes_canine_genitalia
  • +
    +
    + + +
  • + +
  • [LTS]Xenotech
  • + + + Defs/XenotypeDef[defName="LTS_Elfin"]/genes + +
  • rjw_genes_small_male_genitalia
  • +
  • rjw_genes_tight_female_genitalia
  • +
    +
    + + +
  • + +
  • [LTS]Xenotech
  • + + + Defs/XenotypeDef[defName="LTS_Ork"]/genes + +
  • rjw_genes_big_male_genitalia
  • +
  • rjw_genes_loose_female_genitalia
  • +
    +
    + + +
  • + +
  • [LTS]Xenotech
  • + + + Defs/XenotypeDef[defName="LTS_Lilime"]/genes + +
  • rjw_genes_demonic_genitalia
  • +
  • rjw_genes_elasticity
  • +
  • AptitudeRemarkable_Sex
  • +
    +
    + +
    +
    +
    diff --git a/Common/Textures/Genes/Icons/Big_Breasts.png b/Common/Textures/Genes/Icons/Big_Breasts.png index 5061ee5..a9d1786 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 fe6d86e..68396ba 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 9dfbbb6..6097374 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 5e7cbc3..3247920 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 7631681..24283b6 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 d8ace83..e3400e8 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 efb9bab..9577293 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 86036d8..ada02ee 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 69f7d6b..7cfb774 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 5566734..fd17996 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 9104ea6..bad56cf 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 507684a..a15e618 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 9973e24..5d8b0e0 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 f902c39..b3b359e 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 b32f1d3..e2005b7 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 b4d7194..19924d2 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 0e797de..dd57b1d 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 75afdf4..a31c470 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 fa9577b..0b60a46 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 c39e163..743ae44 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 468fc60..d54231c 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 cbffc9d..6c427df 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,16 @@ 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 +- Mech Breeding / Insect Breeding Additions & Orgasmic Mytosis - 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? @@ -40,4 +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. \ 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/GenitaliaSize/Gene_EvergrowingGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_EvergrowingGenitalia.cs new file mode 100644 index 0000000..05a6803 --- /dev/null +++ b/Source/Genes/GenitaliaSize/Gene_EvergrowingGenitalia.cs @@ -0,0 +1,107 @@ +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 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/HediffDefOf.cs b/Source/HediffDefOf.cs index 4e3b052..30e34df 100644 --- a/Source/HediffDefOf.cs +++ b/Source/HediffDefOf.cs @@ -17,6 +17,8 @@ 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 a8bfaa3..c14c538 100644 --- a/Source/Rjw-Genes.csproj +++ b/Source/Rjw-Genes.csproj @@ -44,6 +44,7 @@ + @@ -198,8 +199,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.