diff --git a/.gitignore b/.gitignore
index bd55167..971fc41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
+*.user
+
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
-
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
@@ -253,4 +254,4 @@ paket-files/
# Python Tools for Visual Studio (PTVS)
__pycache__/
-*.pyc
\ No newline at end of file
+*.pyc
diff --git a/About/About.xml b/About/About.xml
index 5d46796..f1f2296 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -1,13 +1,30 @@
RJW GenesVegapnk
- Vegapnk.rjw.genes
+ Vegapnk.rjw.genes
-
1.4
+
1.5
- Adds Genes for RJW Content
- https://steamcommunity.com/id/Vegapnk/myworkshopfiles/?appid=294100
+
+Adds Genes for RJW Content.
+Adds:
+- Genes for Genitalia Types and Sizes
+- Fertilin, a resource similiar to Hemogen, and accompanying sex-vampires
+- Mechanics for Breeding and being Breed by Animals and Insects
+- Inherit genes from bestiality or produce VGE-Hybrids
+- Male / Female Only, MPreg, Genderfluid Pawns
+- Orgasmic Mytosis, Orgasmic Supercharging, Age-Transfer on Sex, Pheromones
+- Cum-Amount changes, Cumflation Immunity
+- Horny Pheromones, Animal Mating Call
+- Patches for some popular Xenotypes from the Workshop
+- Sexual Taming of Animals
+
+ https://github.com/vegapnk/RJW-Genes
+
\ No newline at end of file
diff --git a/About/Manifest.xml b/About/Manifest.xml
new file mode 100644
index 0000000..2589c5d
--- /dev/null
+++ b/About/Manifest.xml
@@ -0,0 +1,22 @@
+
+
+ RJW-Genes
+ 2.0.0
+
+
RimJobWorld
+
HugsLib
+
+
+
Male- and Female- Only Genes
+
+
+
RimJobWorld
+
HugsLib
+
RJWSexperience_CumGenes
+
+
+
RJW-LicentiaLabs
+
+ https://github.com/vegapnk/RJW-Genes/tree/main/About/Manifest.xml
+ https://github.com/vegapnk/RJW-Genes
+
diff --git a/About/Preview.png b/About/Preview.png
index 315ad3c..f1b61c0 100644
Binary files a/About/Preview.png and b/About/Preview.png differ
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fce2807..c6b9f65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,547 @@
+# 2.2.0 (23-07-2024)
+
+## Explanations
+
+**Genetic Diseases**:
+
+This update introduces genetic diseases that are shared on sex.
+Infection is handled when sex finishes, so a coitus-interruptus will not result in infections.
+
+Infections can be
+
+- Turned off entirely
+- Spread only on penetrative sex
+- Chances are adjustable per XML per Gene
+
+By turning their spread off, you effectively have a set of normal negative genes.
+Dead pawns can spread diseases, but cannot receive them. For all you necros out there.
+
+*Why???*
+
+Most of the genes so far were positive or neutral,
+so I got some fair requests to introduce negative genes to keep xenotypes balanced.
+I know that this is some overlap with the STD mod, but well ... you are free to turn things off?
+
+In theory, you can specify and gene of any kind to be spreadable by sex, not only ones written by this mod.
+
+**Genetic Infectors**:
+
+These Genes can apply a genetic disease, but are not genetic diseases themselves.
+A single infector gene can have multiple resulting diseases, see this extension example:
+
+```xml
+
+ 0.05
+
+
rjw_genes_size_blinded
+
rjw_genes_infectious_bisexuality
+
+
+```
+
+The infection-chance is applied per gene - for the example above there would be a 5% chance to apply `size_blinded` and 5% chance to apply `infectious_bisexuality`.
+Multiple infections can happen on a single sex.
+The `infectionGenes` can be any gene, this is not limited to genetic diseases (e.g. ugly or something).
+
+*Infectors* are always applied even if the genetic disease spread is turned off.
+The created genetic diseases will follow the logic outlined above.
+
+**Disease Immunity**:
+
+Pawns can be immune to genetic diseases.
+
+This is either done with a specialised gene (`rjw_genes_genetic_disease_immunity`)
+or by genes giving specific immunities.
+
+Any gene can give immunity against any genetic disease using an extension:
+
+```xml
+
+
+
rjw_genes_size_blinded
+
+
+```
+
+These extensions can be slapped on any gene,
+but they are meant mostly to have infectors immune against their own diseases.
+
+**Twinkification / Feminization**:
+
+Both approaches follow the same general logic.
+
+- Pawn `A` has Twinkifier Gene and fucks Pawn `B`
+- `B` receives a `twinkification progress` hediff with some effects
+- Upon having ANY sex, `B` can gain genes from a relevant genepool.
+- Genes can be minor or major, depending on the progress of twinkification.
+
+Pawn `B` might be immune against twinkifier as normal immunity logic against diseases.
+But once the hediff is there, the twinkification can happen unless you wait for it to cool down.
+Gene additions are subject to an application chance (25% for minor, 10% for major)
+and might try to add a gene that already exists - then nothing happens.
+
+*Twink Genepool*:
+- (Minor) Body_Thin
+- (Minor) Homosexual
+- (Minor) Beard_NoBeardOnly
+- (Minor) Small male genitalia
+- (Major) Minor Vulnerability
+- (Major) Infectious Homosexuality
+- (Major) Delicate
+- (Major) Beauty Pretty
+- (Major) Fertile Anus
+
+*Feminization Genepool*:
+- (Minor) Long Hair
+- (Minor) No-Beard
+- (Minor) Small Male Genitals
+- (Minor) No Cum
+- (Minor) Big Breasts (will only show later)
+- (Major) Female Only
+- (Major) No Penis
+- (Major) Minor Vulnerability
+
+You can configure all genes, as well as their application chance, in the Genes` XML.
+
+*Why are these changes Genetic?*
+Because this is the genes mod, and I find things here quite robust.
+
+## Changelog
+
+**Additions:**
+
+- Gene: Genetic Disease Immunity. cannot get infected by any genetic diseases, and won't be affected by some other genes (see relevant genes)
+- Disease Gene: Vulnerability. Pawn is likelier to be raped
+- Disease Gene: Infectious Hypersexuality
+- Disease Gene: Infectious Homosexuality & Bisexuality
+- Disease Gene: Infectious lower fertility
+- Disease Gene: Infectious higher sex need
+- Disease Gene: Fluctual Sexual Need. (Configurable) Chance to reset sex-need to near-zero and gain a bit of rest-need.
+- Disease Gene: Size Blinded. Pawns have a higher chance for hooking up with pawns with a big cock, lower chance for small cocks.
+- Infector Gene: Genetic Stretcher. Pawns can infect other pawns with *Size Blinded*
+- Gene: Hardwired Progenity. Pawns with this get a malus on having no-children, and bonus on having a lot.
+- Gene: Sexual Genetic Swap. Pawns have a chance to switch a random gene with their sexpartner.
+- (Archite) Gene: Sexual Genetic Thief. Pawns have a chance to steal a gene from their sexpartner. Genetic Disease Immunity shields against this.
+- Gene: Sperm Displacement. Pawns might overwrite an existing pregnancy, becoming the new father. The pregnancy will stay in its gestation progress.
+- Gene: Twinkification. Pawns turn their (male) sexual partners into breedable twinks.
+- Gene: Feminization. Pawns turn their (male) sexual partners into women.
+- Gene: Blocked Masturbation. Pawns cannot masturbate.
+- {Sexperience} Gene: Living Cumbucket. Pawns with this Gene get "filled" upon sex, and slowly disperse usable gathered cum.
+- Disease Gene: Infectious Blocked Masturbation
+- Gene: Rut. Pawns have a chance to go into heat and need more sex for a day. (Default: 5% chance per day, to go 1 day in heat).
+- Disease Gene: Infectious Rut.
+- Pawns will have negative thoughts about pawns with more genetic diseases than themselves.
+- Faction Penalties for spreading diseases, stealing genes and aging pawns with age transfer
+- Patch for [Imphilee Xeno](https://steamcommunity.com/sharedfiles/filedetails/?id=2990674516) by @Bunuffin
+
+**Changes**::
+
+- Cum-Amount-Changing genes now are XML Adjustable and share a single `.cs`-class
+- Incubi are now Bisexual too, as they should be.
+
+**Fixes:**
+
+- Fixed an Issue where pawns would always get the Pheromone social boost, unless they had the pheromone (#113)
+- Fixed two hidden dependencies on Ideology and Royalty (#115)
+- Fixed some more hidden dependencies on Ideology Icons (#118)
+- Fixed a hidden dependency on Licentialabs (#119)
+
+**Internal:**
+
+- GenderFluid-Gene now uses a generalized `TickBasedChanceExtension` over its unique special `GenderFluidExtension`
+- Introduced a `ModLog.Debug` Function that checks for the settings before printing - trying to spread it over the whole project.
+- Removed TODO File. I have enough to do.
+
+**Notes:**
+
+*One Time Error Load*
+
+The changes to the cum-gene will give a 1-time warning on loading the save. The warning looks like this:
+```
+Could not find class RJW_Genes.Gene_MuchCum while resolving node li. Trying to use Verse.Gene instead. Full node:
rjw_genes_much_cumThing_Human697null82
+UnityEngine.StackTraceUtility:ExtractStackTrace ()
+Verse.Log:Error (string)
+...
+```
+
+This is not dangerous.
+
+*Blocked Masturbation*
+
+Might not be fully working - for testing, I run things in DevMode, and I can just order people to masturbate.
+Please playtest this a bit for me, as I want to make it work nicely.
+
+*Supporting*
+
+You can now support me with [buying me a coffee](https://buymeacoffee.com/vegapnk).
+The mod will remain free, open source and I will not hide or lock any features.
+Its just meant if you want to drop me a tip.
+
+**Since Beta-1** (11-07-2024)
+
+- Made the Feminizer and Twinkifier configurable with XML.
+- Typos in the Hediff Defs, tweaking of some values.
+- Living Cum-Bucket & Rut Genes
+- Great icons by @Alpenglow
+
+**Since Beta-2** (17-07-2024)
+
+- Changed behaviour of living cumbucket. Now, once "really full" the output happens more rarely but is much more at once.
+- More Icons by @Alpenglow <3 this time attributed correct.
+- Adjusted some of the metabolic values - likes cumflation, generous donor and living cumbucket have small costs.
+
+# 2.1.0 (27-06-2024)
+
+**Additions**:
+
+- New Ability Gene *Mating-Call*: Get bred by all nearby animals.
+- New Ability Gene *Pheromone Spit*: Mark a target to be bred by nearby animals
+- New Passive Gene *Sexual Tamer*: Chance to tame or train animals on bestiality.
+- Human + Animal Pregnancy can (if enabled in settings) produce Vanilla Expanded Genetics Hybrids. Thanks to @Jaaldabaoth (#88)
+- Xenogenes for "Big and Small" Xenotypes thanks to @Flock-of-birds (#83)
+- Xenogenes for "Biotech Expansion Mammalia" and "Biotech Expansion - Mythic" thanks to @Ohreallyow (#86)
+- Xenogenes update for (many?) "Vanilla Races Expanded (VRE)" Mods - Thanks to @Jaaldabaoth (#84 / #88 )
+- Genes can now fulfill RJW Quirks, configurable in XML. Thanks to @Jaaldabaoth (#84 / #88)
+- "Genes" to support VRE Androids having Mechanical Genitalia. Thanks to @Jaaldabaoth (#88)
+- "Curiosity Genes" alongside other Curiosities from VRE. Thanks to @Jaaldabaoth (#88)
+- Support for many VE-Genetics Animals into the Animal-Framework. Thanks to @Jaaldabaoth (#88)
+- "Likes Cumflation"-Gene now also makes pawns immune against the effects of cumflations. They are still cumflated.
+- Gasmasks make immune against Aphrodisiac Pheromones (#108)
+
+**Fixes**:
+
+- Licentia Genes are back in and should work again. I used the [updated for by Jaaldabaoth](https://gitgud.io/Jaaldabaoth/licentia-labs) for my testing.
+- Lower-casing most labels to fit rimworld standards, thanks to @Flock-of-birds (#83)
+- X-Gender-Only Genes leave / re-add artificial genitalia. Thanks to @Jaaldabaoth (#84 / #88)
+- Issues with Elasticity References (#87)
+- Null Pointer for LoveFeeding when finding Mechs. Thanks to @Jaaldabaoth (Fixes #90)
+- Changes to the Implants introduced in 2.0.0 - they imposed a hidden dependency on Royalty (Fixes #89)
+- Issues when generating relations (#98, fixed in #106 thanks @Jaaldabaoth)
+- Hardening of Licentia Dependencies (#105)
+- Littered Birth and Chest-Burst Pregnancy are now mutually exclusive (#96)
+- Youth Fountain cannot youth on masturbation anymore (#99)
+- Documented the HasActiveGene Error Message (#104)
+- Pawns with "rjw_genes_no_sexneed" wont go raping (or atleast way less, #100)
+- Extra Nullcheck for Genes in Orgasmic Mytosis (#95)
+- Orgasmic Mytosis Pawns *should* inherit the Xenotypename and favorite colour now
+- Babies should not have "SexChangeThoughts" anymore when they had a (fe)male-only gene (#103)
+
+**Changes**:
+
+- Minified some Race-Patches, thanks to @Flock-of-birds (#83)
+- XML-Genitalia-Genes can now also provide Breasts. Thanks to @Jaaldabaoth (#84 / #88)
+- Many patches and files went into a `Mods`Folder and use an `LoadFolders.xml`. Thanks to @Jaaldabaoth (#84 / #88)
+- Translate-Keys for Settings
+- Translate-Key for Animal Hybrid Race-Names
+- "Tick-Speed" for Evergrowth moved from Mod-Settings to XML
+- Some new Icons thanks to Kira-Bad-Artist
+- Some new Icons thanks to Archer
+
+# 2.0.0 (30-05-2024)
+
+**Summary**:
+
+- 1.5 Support
+- Femboys, MPReg
+- Couple Implants around Fertility / Sex / Pregnancy
+- Hive Removal (to be reintroduced somewhere else)
+- Licentia Genes became placeholders, no functions until Licentia is on 1.5
+
+**Additions**:
+
+- initial Rimworld 1.5 thanks to @jaaldabaoth
+- Fertile Anus Gene, thanks to @jaaldabaoth
+- Femboy Genes, for male pawns with Vaginas @jaaldabaoth
+- Udder Gene @jaaldabaoth , Fixes #57
+- Some other Genitalia Sets (Crocodilian, Racoon, ...) thanks to @jaaldabaoth, Closes #57
+- LitteredBirthsGene thanks to @jaaldabaoth
+- OvaryAgitator that allows for a cyclic fertility. Thanks @jaaldabaoth. See [its description](./Common/Defs/ThingDefs/OvaryAgitator.xml)
+- LimbicStimulator / Scrambler thanks to @jaaldabaoth. See [Scrambler Description](Common/Defs/ThingDefs/Scrambler.xml) and [Limbic Stimulator](./Common/Defs/ThingDefs/LimbicStimulator.xml)
+- Bioscaffold that allows for faster pregnancies. thanks to @jaaldabaoth. See [its description](./Common/Defs/ThingDefs/Bioscaffold.xml)
+- Multi-Pregnancy Gene thanks to @jaaldabaoth
+- Many genes have settings configurable in their xml - tick speeds and distances.
+
+**Changes**:
+
+- Modularised many "change gentialia sets"-genes into a XML configurations. Thanks to @flock-of-birds
+- **Removed** Hive Logic for now! This might break some of your save-games.
+- Highmates "Initiate Loving" uses Succubus "Seduce" ability, thanks to @jaaldabaoth
+- Slider for Evergrowth Tick-Speed, thanks to @jaaldabaoth
+- Resizing Age for resizing Genes can be set in Settings @jaaldabaoth
+- **Licentia related genes are only placeholders**, as Licentia is not 1.5 yet
+- InsectIncubator only does self-fertilization now, but does not increase storage capacities for eggs anymore
+- Some Genes (GenitaliaTypes, Cum, some others) cannot be in quest-rewards anymore. Special, Size, Breeding and Lifeforce genes still can be quest rewards.
+
+**Fixes:**
+
+- Small changes to drawing Succubus Wings
+- Minor Format changes to lots of XML files
+- Pawns with ONLY an Archotech penis will not give Fertilin, and will not receive debuffs (Fixes #71)
+
+**Hidden Changes:**
+
+- Patches for "Same Mother" / "Same Father" to account for Male-Pregs. This should only extend behaviour but be warned a bit.
+- Patches to RJW-Pregnancy Helper to account for Male Pregs.
+- Some replacements from `hasGene` to `hasActiveGene`
+
+# 1.3.3 (02-11-2023)
+
+**Fixes:**
+
+- Added another check to the AG Malachai Xenotype (Fixes #68)
+- Fixed the `GatheredCum`Fertilin Ingestion Patch throwing an Error for people without Sexperience (Fixes #69 (nice))
+
+# 1.3.2 (24-10-2023)
+
+**Fixes:**
+
+- Removed patch for Malachai, needs a different patching operator but I don't want to have broken fixes for now (Tracked in a new Issue)
+
+# 1.3.1 (22-10-2023)
+
+**Changes**
+
+- Added patches for Alpha-Genes Animusen, Drakonori and Malachai (Closes #65, thanks @Stars22223)
+- Little Social Boost for Pawns affected by pheromones (Closes #50)
+
+**Fixes:**
+
+- XML Missmatch for Succubus Letter (Fixed in #64, thanks @mwcrow)
+- Made constructor for Empathetic Lifeforce explicitly `public` to not hang up in character creation (Fixes #66)
+
+# 1.3.0 (19-09-2023)
+
+**Changes:**
+
+- New Gene for Evergrowing Cocks. Be careful.
+- New Gene for Genderfluid Pawns - daily chance to change sex. Futas just change "display" and keep genitalia, other pawns switch genitalia. XML configurable times & chances.
+- New Drawings for the Succubi Wings & Tail, thanks to @Monti (donated via Discord)
+- Simple Gene that removes Sex need (called asexual, `rjw_genes_no_sex_need`)
+- New Gene that grows Penisses on Oral sex. Configurable in XML.
+- New Gene Lifeforce Empath: Gain Lifeforce for sexually satisfied pawns, loose for frustrated pawns.
+- More genes are configurable with XML, e.g. tick speed, distances or multipliers. I am getting the hang of it.
+- Halfed Succubus Fertilin-Need, increased cost of abilities.
+- Translation Keys for some letters
+
+**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)
+- Custom Queen- and Drone-Xenotypes should work now.
+- Some more checks if Queen is on Map or not (fixing #60)
+
+*Notes*:
+The pawns that are gender fluid can get pregnant.
+However, with RJW 5.3.7 these pregnancies disappear.
+This is a change needed upstream, but I will have a look.
+
+# 1.2.1 (18-06-2023)
+
+**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 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.
+- 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:**
+
+- Cockeater Ability has now Icon of Cockeater Gene
+- Cockeater now leaves a bite wound!
+- Pythokin-Patch checks for Licentialabs (#30)
+- Removed Sex-Change thoughts for pawns born or spawned with a gender-altering gene (Issue #32, PR #33 by @callavico)
+- More consistent behavior for genitalia resizing over multiple game-starts (Issue #34)
+
+**Queen & Caste Logic**
+
+There are 3 genes revolting around a new, hopefully flexible insect-caste system. Queens, Drones and Workers. These reproduce either through normal sex, or can utilize the insect birth once [this PR](https://gitgud.io/Ed86/rjw/-/merge_requests/266) has been merged in.
+Update: It has been merged into [RJW 5.3.5](https://gitgud.io/Ed86/rjw/-/tags/5.3.5), make sure you update!
+
+In general, the logic is the following:
+
+- A queen can have sex with anyone. If the partner was a drone, there is chance for the baby to become a queen, drone or worker.
+- If the partner of the queen was not a drone, the baby will be a worker.
+- If the drone didn't mate with a queen but someone else, normal inheritance happens
+- The assignment is done by xenotypes for queen and drones. The baby will get all xenogenes of their parents chosen xenotypes.
+- 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.
+
+**On Alpha Genes**
+
+Alpha genes might have colliding features, but I need some reports to find out about it.
+I disabled the specific gender and the oviparious reproduction (when you have rjw-ovipos).
+I recommend using alpha genes for the Hive-Playthroughs, as otherwise the Halamyr look a bit ... boring?
+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 (06-04-2023)
+
+**Fixes:**
+
+- Youth Fountain and Age Drainer **really** "stop" at 18 (#26, #28) and never age pawns
+- Drastically reduced vomiting time due to an missunderstanding (#29). `0.4` instead of `0.01`
+
+Sometimes life is like that, and you have to fix the fixes.
+It was never really broken, life is just very long.
+
+# 1.1.3 (28-03-2023)
+
+**Changes:**
+
+- Youth Fountain and Age Drainer "stop" at 18 (#26)
+- Youth Fountain and Age Drainer activate only for pawns at 18 (#26)
+- Drained Pawns vomit less (from mtb 0.05 to 0.01)(#29)
+
+**Fixes:**
+
+- InsectBreeder would mess with normal Pawn-Animal pregancy for egg laying animals (#23)
+
+# 1.1.2 (19-03-2023)
+
+**Changes:**
+
+- Added more cool images from WasMachenDennSachen (#22)
+
+**Fixes:**
+
+- Aphrodisiac Pheromones checks for children and other conditions (#25)
+
+# 1.1.1 (10-03-2023)
+
+**Changes:**
+
+- Drastically increased mood-penalty for Fertilin-Loss (if the pawn is still too happy, there will never be a breakdown for missing fertilin)
+- No-Breast Genes add Nipples
+- Featureless Chest Gene (No Nipples at all, adds the RJW Featureless Chest as requested per some Kobold fetishists)
+
+**Fixes:**
+
+- Small and Big Male Genitalia had images wrong way round
+- Fertilin should activate at a MinAge of 18
+
+**Important**: The Fertilin Changes could throw errors! I tested a bit, but not a lot.
+So please reach out if you get something and I will try to fix it ASAP.
+
+# 1.1.0 (2023-03-04)
+
+1.1.0-beta-1 was released on 05.02.2023.
+
+Changes since beta: Typos, Icons & Merge of Anal & Vaginal Absorber.
+
+## Features:
+
+- Succubus, other Fertilin Xenotypes (see below)
+- Orgasm Rush got a Hediff
+- Unbreakable Gene
+- Age-Transfer and Youth-Fountain per Sex Gene
+- Bisexual and Homosexual Genes with Placeholder Icon
+- Balancing some Genes by changing metabolism and complexity
+- Pheromone Gene (#13, Shabakur)
+- RJW Race-Support Compatibility (#12,#13, Shabakur)
+- Animal Gene Inheritance Gene-Chance Multiplier per Setting (#13, Shabakur)
+- Lots of Debug-Only Logging for Animal Gene Inheritance
+- Patches for some popular Xenotype Mods (Nyaron, Kijin3, Roos Minotaurs, VRE Phytokin)
+- Generous Donor Cheatmode
+- Mod-Settings
+
+## Fertilin:
+
+Big news ! We got a system similar to hemogen running, labelled *Fertilin*.
+
+Pawns gain Fertilin through various sources, and can spend them on various abilities and loose it over time.
+
+Fertilin-Sources:
+
+- Vaginal & Anal Absorption (Through sex in respective types)
+- Cum-Eater (through oral sex, eating cum from Sexperience, or cunnilinguing (?) cumflated pawns)
+- Sex Drain, after Sex apply a debuff to the fucked pawn
+- Cock-Eater, bite off the wiener of downed enemies, own colonists, animals, slaves, not sure about visitors but let me know what you think.
+
+Animals give less Fertilin as a source, configurable in the Mod Settings.
+The Vaginal, Anal and CumEater interactions *empty* the pawns balls and the pawn needs to *recharge*. Gain and recharge are based on cum-production.
+The drainer is a flag - undrained pawns can be drained, drained pawns will not get any debuff and will not give any fertilin.
+
+Fertilin-Abilities:
+
+- Heal Pussy; Rape someone to tend their wounds.
+- Seduce; Target Pawn needs to follow the caster, engaging in sex on collision.
+- Paralysing Kiss; Stun someone in meele range.
+- Naked Prowess; When the pawn is naked, get a 3h buff on meele stats and armor.
+
+Other than that, the Xenotypes tend to have other buffs from base-game to make up for their insatiable hunger.
+
+Xenotypes:
+
+**Succubi** absorb Fertilin through sex and can use it for paralyzing kiss and seduce.
+
+**Incubi** are their male parallels, but gaining fertilin through draining.
+
+**Cumazones** are female only martial fighters, that can only gain fertilin through biting cocks. Be sure to have enough supply before you hire one of these bad bitches.
+
+Incubi and Succubi can spawn in a special event at night when pawns have low sex need. Cumazones can just appear randomly.
+
+**_On Inheritance:_**
+
+We realized that it's not nice if the Succubi Babies do not have all Succubi Genes, and have Fertilin with no use for it or look like wookies instead. Hence, we changed the Fertilin Xenotypes to be Xenogenes (non-inheritable) *BUT* we recommend using the [dominant-gene](https://steamcommunity.com/sharedfiles/filedetails/?id=2884110898) mod.
+If the dominant-gene mod is loaded, our xenotypes will spawn with it, making Succubus Babies Succubi.
+In case you do not want that behaviour, look for the Patch `Patch_Dominant_Gene.xml` and delete it.
+
+**_On Making your own Succubi_:**
+
+Currently Succubi and Incubi only spawn through a special event determined by their xenotype def name. So if you make your own, they will not spawn with this event. Make sure that you have a way to get your custom xenotypes appear. You might want to "just alter" the xenotype xml provided by us, then they will spawn with the event.
+
+## Fixes:
+
+- Issue with Breast-Size (#8) fixed by lowercasing breast-match (Shabakur)
+- Error on Game Load when Licentia Genes are tried to be added to Xenotypes for players without Licentia (#5,#17)
+- Futa Gene only triggers if Pawn is not a futa already (#2)
+- Genitalia Resizing triggers on 20th Birthday (#11)
+- RJW-Gene-Inheritance Settings now do things (#13, Shabakur)
+- Check for Animals in Orgasm Rush, no Orgasm Rush for and from Animals (#15)
+- Using Character Editor, it can happen that the Genes fired twice. I hoped to harden this issue by checking better (#19)
+
# 1.0.1 (2022-12-20)
- Fix issue with Orgasm Rush throwing an Error on Animal Orgasm (Thanks Shabakur)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0e2154e..d905c20 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,6 +16,9 @@ But please consider also the following:
## Contributors
- Shabalox (MechBreeding, InsectBreeding, Animal Gene Inheritance)
+- WasMachenDennSachen (Various Icons)
+- Jaaldabaoth (1.5 Migration, MPreg, Femboys)
+- Flock-of-Birds (Cosmetic Genitalia per XML)
## Other Credits
@@ -23,4 +26,10 @@ But please consider also the following:
- Many of the Icons I made (e.g. Genitalia Types) include things from [OpenMoji](https://openmoji.org/) which is awesome
- Placeholder, Rapist, Necrophile come from [RJW-Sexperience Ideology](https://gitgud.io/amevarashi/rjw-sexperience-ideology/)
-- Hypersexual & Zoophile comes from [RJW](https://gitgud.io/Ed86/rjw)
\ No newline at end of file
+- Hypersexual & Zoophile comes from [RJW](https://gitgud.io/Ed86/rjw)
+- Cockeater & Naked Prowess come from *WasMachenDennSachen* but I copied it from Discord Chat.
+- Fertilin, Fertilin Drain, Healpussy, Succubus Wing & Tail come from Shabakur
+- Littered Birth, Many of the Penis Types are from Jaaldabaoth
+- Feline Genitalia, Animal Mating Call and Udder are from Kira-Bad-Artist
+- Sexual Tamer, Pheromone Spit and Mating call are from Archer
+- The Preview was started with [Yodayo](https://yodayo.com/)
\ No newline at end of file
diff --git a/Common/Assemblies/0Harmony.dll b/Common/Assemblies/0Harmony.dll
deleted file mode 100644
index 86fc5eb..0000000
Binary files a/Common/Assemblies/0Harmony.dll and /dev/null differ
diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll
index 9eef3ca..bb1f065 100644
Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ
diff --git a/Common/Defs/AbilityDefs/Ability_CockEater.xml b/Common/Defs/AbilityDefs/Ability_CockEater.xml
new file mode 100644
index 0000000..f5cc8ad
--- /dev/null
+++ b/Common/Defs/AbilityDefs/Ability_CockEater.xml
@@ -0,0 +1,33 @@
+
+
+
+ rjw_genes_ability_cockeater
+
+ Eat the cock of another pawn, restoring fertilin based on the size of the cock.
+ Genes/Icons/cockeater
+ true
+ true
+ false
+ Mote_CoagulateStencil
+ Coagulate
+ Coagulate_Cast
+ CastAbilityOnThingMelee
+ 402
+
+ Verb_CastAbilityTouch
+ false
+ -1
+ 10
+
+ true
+ false
+ false
+ false
+ true
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml b/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
new file mode 100644
index 0000000..434df04
--- /dev/null
+++ b/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
@@ -0,0 +1,34 @@
+
+
+
+ rjw_genes_ability_cocoonweaver
+
+ Weaves the victim into a (self-sustaining) cocoon. The victim cannot move, but can be bred.
+ Genes/Icons/Cocoon
+ true
+ true
+ false
+ Mote_CocoonStencil
+ CocoonWeave
+ CastAbilityOnThingMelee
+ 404
+
+ 30000
+
+ Verb_CastAbilityTouch
+ false
+ -1
+ 15
+
+ true
+ false
+ false
+ false
+ true
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/AbilityDefs/Ability_Flight.xml b/Common/Defs/AbilityDefs/Ability_Flight.xml
new file mode 100644
index 0000000..d643940
--- /dev/null
+++ b/Common/Defs/AbilityDefs/Ability_Flight.xml
@@ -0,0 +1,28 @@
+
+
+
+ rjw_genes_ability_flight
+
+ Fly to a short location using your wings.
+ Genes/Icons/Succubus_Wings
+ 1250
+ false
+
+ Verb_CastAbilityJump
+
+ false
+ false
+ 0.5
+ 19.9
+ true
+ Longjump_Jump
+ Longjump_Land
+
+ true
+ false
+ false
+
+
+ CastJump
+
+
\ No newline at end of file
diff --git a/Common/Defs/AbilityDefs/Ability_MatingCall.xml b/Common/Defs/AbilityDefs/Ability_MatingCall.xml
new file mode 100644
index 0000000..383895f
--- /dev/null
+++ b/Common/Defs/AbilityDefs/Ability_MatingCall.xml
@@ -0,0 +1,50 @@
+
+
+
+
+ rjw_genes_ability_mating_call
+
+ Calls nearby animals to breed me.
+ Genes/Icons/Mating_Call_2
+
+ true
+ false
+
+ false
+
+ 50
+ 0
+
+
+ 410
+
+ 30000
+
+ 5
+ Verb_CastAbility
+
+ False
+ False
+ True
+ True
+
+
+
+
+
+
+ Being Bred is not an easy business.\nThis might lead to a broken pawn, torn genitalia and hybrid-pregnancies.\nMaybe this is what you want.\nThe pawn will `submit` and e.g. Insects might cocoon him.\n\nAre you sure to proceed?
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/AbilityDefs/Ability_NakedProwess.xml b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
new file mode 100644
index 0000000..292af25
--- /dev/null
+++ b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
@@ -0,0 +1,47 @@
+
+
+
+ rjw_genes_ability_naked_prowess
+
+ Enhance the strength and resilience of your naked body with fertilin.
+ Genes/Icons/rjw_naked_prowess
+ Things/Mote/Heart
+ CastAbilityOnThing
+ False
+ False
+ True
+
+ 126
+ 0
+
+
+ Verb_CastAbility
+ 2
+ 0
+ False
+ False
+
+ true
+ false
+ false
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+ rjw_genes_mechbreeder
+
+ Pawns with this gene are able to birth mechanoids unharmed.
+ World/WorldObjects/Expanding/Mechanoids
+ 51
+ 1
+ -1
+
+
+
+ rjw_genes_zoophile
+
+ Xenotypes with this Gene are Zoophile.
+ Genes/Icons/Zoophile
+ 54
+
+
+ Zoophile
+
+
+
+
+
+ rjw_genes_fertile_anus
+
+ Xenotypes with this gene have a functional uterus if they do not possess one by
+ means of their vagina.
+ For males, it is connected to the anal cavity and leads to a normal pregnancy.
+ Genes/Icons/Fertile_anus
+ 54
+
+
+
+ rjw_genes_insectincubator
+
+ RJW_Genes.Gene_InsectIncubator
+ Pawns with this gene fertilize insect eggs that are placed inside them.
+ Genes/Icons/Egg
+ 52
+ 1
+ -1
+
+
+
+ rjw_genes_insectbreeder
+
+ Pawns with this gene are able to fertilize eggs with any fertile penis.
+ Genes/Icons/Insect_Breeder
+ 53
+ 1
+ -1
+
+
+
+ rjw_genes_fervent_ovipositor
+
+ RJW_Genes.Gene_FerventOvipositor
+ Pawns that have a female (egg producing) ovipositor produce eggs at drastically
+ increased speed.
+ Genes/Icons/Fervent_Ovipositor
+ 55
+ 1
+ -1
+
+
+
+ rjw_genes_mating_call
+
+ This gene allows to call nearby animals and invite them for mating.
+ Genes/Icons/RJW_Genes_Mating_Call
+ 65
+
+
rjw_genes_ability_mating_call
+
+
+ rjw_genes_ability_mating_call
+
+ 2
+ -1
+
+
+
+ rjw_genes_pheromone_spit
+
+ This gene allows to mark targets for breeding, enticing nearby animals for a ride.
+ Genes/Icons/RJW_Genes_PheromoneSpit
+ 66
+
+
rjw_genes_ability_pheromone_spit
+
+
+ rjw_genes_ability_pheromone_spit
+
+ 2
+ -1
+
+
+
+ rjw_genes_hardwired_progenity
+
+ Carriers of this gene need to procreate. They suffer negative effects if they are
+ childless, and have increased capabilities if they reach a high amount of offsprings.
+ Genes/Icons/hardwired_progenity
+ 70
+
+
+
+
+ -0.1
+ 1.2
+ 1.2
+ +0.15
+ -0.1
+
+
+
+
+ 0.05
+ 0.1
+ 0.1
+ 0.4
+
+
+
+
+ 0.15
+ 0.25
+ -0.25
+
+
+
+
+ 1
+ 0
+
+
+
+ rjw_genes_basic_rut
+
+ Carriers of this gene can enter a state of heat, resulting in drastically higher
+ sexual activity.
+ Genes/Icons/rut
+ 1
+ 1
+ 11
+ RJW_Genes.Gene_Rut
+
+
+
+ 60000
+ 0.05
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml b/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
new file mode 100644
index 0000000..f578e99
--- /dev/null
+++ b/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
@@ -0,0 +1,117 @@
+
+
+
+ Miscellaneous
+ true
+
+
+
+
+
+
+ rjw_genes_succubus_tail
+
+ Carriers of this gene grow a slender tail ending with a heart that can act as a
+ dexterous fifth limb.
+ Genes/Icons/Succubus_Tail
+ (1, 0, 0)
+ 1000
+
+
+
+
+
+
+
+ rjw_genes_no_cum
+
+ Males of these species have no fluid.
+ Genes/Icons/No_Cum
+ RJW_Genes.Gene_ChangeCumAmount
+ 533
+ 0
+ 1
+
+
+ 0.0
+
+
+
+
+
+ rjw_genes_much_cum
+
+ Males of this species produce a lot of fluid.
+ Genes/Icons/Much_Cum
+ RJW_Genes.Gene_ChangeCumAmount
+ 534
+ 1
+ 0
+
+
+ 3.0
+
+
+
+
+
+ rjw_genes_very_much_cum
+
+ Males of this species produce a whole lot of fluid. They are like fountains
+ basically.
+ Genes/Icons/Very_Much_Cum
+ RJW_Genes.Gene_ChangeCumAmount
+ 535
+ 1
+ -1
+
+
+ 15.0
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/GeneDefs/GeneDefs_Damage.xml b/Common/Defs/GeneDefs/GeneDefs_Damage.xml
new file mode 100644
index 0000000..2e7f941
--- /dev/null
+++ b/Common/Defs/GeneDefs/GeneDefs_Damage.xml
@@ -0,0 +1,29 @@
+
+
+
+
+ rjw_genes_unbreakable
+
+ rjw_genes_damage
+ This Gene makes the Carrier unable to get mood or social penalties from being raped
+ and they cannot be broken for a long period of time.
+ Genes/Icons/TrialDefend
+ 2
+ -1
+ 1
+
+ RJW_Genes.Gene_Unbreakable
+
+
+
+
+
+
+ rjw_genes_diseases
+ rjw_genes_genetic_disease_immunity
+ 1
+ 0.95
+
+ This gene makes the pawn immune against genetic STDs and some other genes that
+ imply negative side-effects.
+ 1
+ -1
+ Genes/Icons/disease_immunity
+
+
+
+
+
+
+
+ rjw_genes_minor_vulnerability
+
+ This gene makes the pawn a bit more vulnerable, and a slightly more attractive
+ target for rape.
+ 1
+ 1
+ 0.85
+ Genes/Icons/minor_vulnerability
+ 5
+
+
+ 0.15
+
+
+
+
RJW_Genes_Vulnerability
+
+
+
+
+ 0.05
+
+
+
+
+
+ rjw_genes_major_vulnerability
+
+ This gene makes the pawn more vulnerable, and a more attractive target for
+ rape.
+ 2
+ 1
+ Genes/Icons/major_vulnerability
+ 6
+
+
+
RJW_Genes_Vulnerability
+
+
+
+ 0.3
+
+
+
+
+ 0.03
+
+
+
+
+
+
+ rjw_genes_infectious_blocked_masturbation
+
+ Carriers of this gene are unable to masturbate - they need a partner or
+ equipment.
+ Genes/Icons/blocked_masturbation
+ 55
+ 1
+ 2
+
+
+
+
+
+
+ rjw_genes_infectious_increased_sex_need
+
+ Carriers of this genetic disease need more sex.
+ 0
+ 1
+ 0.9
+ UI/Icons/ColonistBar/Idle
+ 5
+
+
+ 0.15
+
+
+
+
+ 0.08
+
+
+
+
+
+ rjw_genes_infectious_major_increased_sex_need
+
+ Carriers of this genetic disease need a lot more sex.
+ 1
+ 2
+ 0.85
+ UI/Icons/ColonistBar/Idle
+ 5
+
+
+ 1.0
+
+
+
+
+ 0.03
+
+
+
+
+
+ rjw_genes_infectious_hypersexuality
+
+ This gene makes the pawn hypersexual, and has a chance to spread on
+ intercourse.
+ Genes/Icons/Hypersexual
+ 2
+ 2
+ 7
+
+
rjw_genes_hypersexuality_trait_giver
+
+
+
+
+ Nymphomaniac
+
+
+
+
+
+ 0.05
+
+
+
+
+
+ rjw_genes_infectious_bisexuality
+
+ This gene makes the pawn bisexual, and has a chance to spread on intercourse.
+ Genes/Icons/bisexuality
+ 1
+ 0
+ 8
+
+
+
rjw_genes_bisexuality_trait_giver
+
rjw_genes_sexual_orientation
+
+
+
+
+ Bisexual
+
+
+
+
+
+ 0.1
+
+
+
+
+
+ rjw_genes_infectious_homosexuality
+
+ This gene makes the pawn homosexual, and has a chance to spread on intercourse.
+ Genes/Icons/homosexuality
+ 1
+ 0
+ 9
+
+
+
rjw_genes_homosexuality_trait_giver
+
rjw_genes_sexual_orientation
+
+
+
+
+ Gay
+
+
+
+
+
+ 0.1
+
+
+
+
+
+ rjw_genes_fluctual_sexual_needs
+
+ Carriers of this genetic disease have a chance to suddenly require sex, gaining
+ a bit of energy to find quick relief.
+ UI/Icons/ColonistBar/Idle
+ 1
+ 2
+ 11
+ RJW_Genes.Gene_FluctualSexualNeed
+
+
+ 0.1
+
+
+
+ 30000
+ 0.15
+
+
+
+
+
+
+ rjw_genes_size_blinded
+
+ This genetic disease makes the carrier dramatically more drawn to pawns with
+ huge cocks.
+ Genes/Icons/size_blinded
+ 1
+ 1
+ 11
+
+
+ 0.1
+
+
+
+
+
+ rjw_genes_stretcher
+
+ Pawns with this gene have a chance to alter the genes of their sexual partners
+ to prefer large cocks.
+ Genes/Icons/stretcher
+ 1
+ 0
+ 12
+
+
+
+
rjw_genes_size_blinded
+
+
+
+ 0.05
+
+
rjw_genes_size_blinded
+
+
+
+
+
+
+
+ rjw_genes_infectious_rut
+
+ Carriers of this gene can enter a state of heat, resulting in drastically
+ higher
+ sexual activity.
+ Genes/Icons/rut
+ 1
+ 2
+ 11
+ RJW_Genes.Gene_Rut
+
+
+
+ 60000
+ 0.05
+
+
+ 0.1
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_ExtraGenitalia.xml b/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
similarity index 51%
rename from Common/Defs/Genes/GeneDefs_ExtraGenitalia.xml
rename to Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
index c2acd4c..2a82c73 100644
--- a/Common/Defs/Genes/GeneDefs_ExtraGenitalia.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
@@ -1,13 +1,22 @@
-
+
-
- rjw_genes_genitalia_extras
-
+
+ false
+
+
+
+ rjw_genes_extra_penis
+ rjw_genes_genitalia_extras
+
Males of this species grow an additional penis .Genes/Icons/extra_maleRJW_Genes.Gene_ExtraPenis
@@ -20,6 +29,7 @@
rjw_genes_no_penis
+ rjw_genes_genitalia_extrasMales of this do not have a penis.Genes/Icons/No_Male_GenitaliaRJW_Genes.Gene_NoPenis
@@ -33,8 +43,9 @@
rjw_genes_extra_vagina
+ rjw_genes_genitalia_extrasFemales of this species grow an additional vagina .
- Genes/Icons/extra_female
+ Genes/Icons/Extra_VaginaRJW_Genes.Gene_ExtraVagina703
@@ -45,8 +56,9 @@
rjw_genes_no_vagina
+ rjw_genes_genitalia_extrasFemales of this do not have a vagina.
- Genes/Icons/No_Female_Genitalia
+ Genes/Icons/No_VaginaRJW_Genes.Gene_NoVagina704
@@ -58,6 +70,7 @@
rjw_genes_extra_breasts
+ rjw_genes_genitalia_extrasFemales of this species grow an additional pair of breasts .Genes/Icons/Extra_BreastsRJW_Genes.Gene_ExtraBreasts
@@ -70,7 +83,8 @@
rjw_genes_no_breasts
- Females of this do not have a pair of breasts.
+ rjw_genes_genitalia_extras
+ Females of this do not have a pair of breasts, but only nipples.Genes/Icons/No_BreastsRJW_Genes.Gene_NoBreasts706
@@ -82,6 +96,7 @@
rjw_genes_extra_anus
+ rjw_genes_genitalia_extrasThis specias has an extra anus.Genes/Icons/Extra_AnusRJW_Genes.Gene_ExtraAnus
@@ -94,6 +109,7 @@
rjw_genes_no_anus
+ rjw_genes_genitalia_extrasThis specias has no anus.Genes/Icons/No_AnusRJW_Genes.Gene_NoAnus
@@ -103,17 +119,59 @@
-
- rjw_genes_futa
-
- Males of this xenotype grow additional female genitalia, Females grow additional male genitalia.
- Genes/Icons/Futa
- RJW_Genes.Gene_Futa
- 709
-
-
+
+
+
+
+ rjw_genes_femboy
+
+ rjw_genes_gender
+ Males with this gene are considered female despite having a penis
+ Genes/Icons/Futa
+ RJW_Genes.Gene_Femboy
+ 709
+
+
PenisAmount
+
VaginaAmount
+
+
+
+
+ rjw_genes_featureless_chest
+ rjw_genes_genitalia_extras
+
+ Carriers of this gene do not have breasts or nipples.
+ Genes/Icons/No_Breasts
+ RJW_Genes.Gene_FeaturelessChest
+ 710
+
+
BreastAmount
+
+
+
+
+ rjw_genes_udder
+
+ rjw_genes_genitalia_extras
+ Carriers of this gene have udders and breasts.
+ Genes/Icons/RJW_Genes_Udder
+ RJW_Genes.Gene_UdderBreasts
+ 711
+
+
BreastAmount
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml b/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
similarity index 53%
rename from Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml
rename to Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
index 89bc7f9..4c93001 100644
--- a/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
@@ -2,15 +2,22 @@
rjw_genes_genitalia_size
-
+
+
+
+
+ rjw_genes_big_male_genitalia
-
- Penises of this Xenotype are bigger.
- Genes/Icons/Small_Male_Genitalia
+
+ Penises of this Xenotype are bigger.(Resizing takes place at 20th Birthday)
+ Genes/Icons/Big_Male_GenitaliaRJW_Genes.Gene_BigMaleGenitalia751
@@ -20,9 +27,9 @@
rjw_genes_small_male_genitalia
-
- Penises of this Xenotype are smaller.
- Genes/Icons/Big_Male_Genitalia
+
+ Penises of this Xenotype are smaller. (Resizing takes place at 20th Birthday)
+ Genes/Icons/Small_Male_GenitaliaRJW_Genes.Gene_SmallMaleGenitalia753
@@ -33,9 +40,9 @@
rjw_genes_loose_female_genitalia
-
- Vaginas of this Xenotype are quite spacy.
- Genes/Icons/Loose_Female_Genitalia
+
+ Vaginas of this Xenotype are quite spacy. (Resizing takes place at 20th Birthday)
+ Genes/Icons/Loose_VaginaRJW_Genes.Gene_LooseFemaleGenitalia754
@@ -45,9 +52,9 @@
rjw_genes_tight_female_genitalia
-
- Vaginas of this Xenotype are pretty tight.
- Genes/Icons/Tight_Female_Genitalia
+
+ Vaginas of this Xenotype are pretty tight.(Resizing takes place at 20th Birthday)
+ Genes/Icons/Tight_VaginaRJW_Genes.Gene_TightFemaleGenitalia756
@@ -58,8 +65,8 @@
rjw_genes_big_breasts
-
- Females of this Xenotype have big honkers.
+
+ Females of this Xenotype have big honkers.(Resizing takes place at 20th Birthday)Genes/Icons/Big_BreastsRJW_Genes.Gene_BigBreasts757
@@ -70,8 +77,8 @@
rjw_genes_small_breasts
-
- Females of this Xenotype have smaller breasts.
+
+ Females of this Xenotype have smaller breasts.(Resizing takes place at 20th Birthday)Genes/Icons/Small_BreastsRJW_Genes.Gene_SmallBreasts759
@@ -83,8 +90,8 @@
rjw_genes_loose_anus
-
- The Anus of this Xenotype is roomy.
+
+ The Anus of this Xenotype is roomy.(Resizing takes place at 20th Birthday)Genes/Icons/Loose_AnusRJW_Genes.Gene_LooseAnus760
@@ -95,8 +102,8 @@
rjw_genes_tight_anus
-
- The anus of this Xenotype is small.
+
+ The anus of this Xenotype is small.(Resizing takes place at 20th Birthday)Genes/Icons/Tight_AnusRJW_Genes.Gene_TightAnus762
@@ -104,4 +111,26 @@
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
+
+
+
+
+ 60000
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml b/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
new file mode 100644
index 0000000..757ee1e
--- /dev/null
+++ b/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
@@ -0,0 +1,340 @@
+
+
+
+
+ rjw_genes_genitalia_type
+ RJW_Genes.Gene_GenitaliaType
+
+
+
+
+
+
+ rjw_genes_lifeforce
+
+ Carriers of this gene have a reserve of biological strength powered by a
+ resource called fertilin. The resource can be gained and spent in various ways, some of
+ which are unlocked by other genes.\n\nCarriers lose 5 fertilin per day from biological
+ entropy. \n\nGene is inactive until carrier is able to have sex.
+ RJW_Genes.Gene_LifeForce
+ RJW_Genes.GeneGizmo_ResourceLifeForce
+ fertilin
+
+
0.25
+
0.5
+
0.75
+
+ true
+ true
+ A reserve of biological strength which can be gained and spent in a
+ variety of ways. \n\nFertilin can be increased by absorbing cum, typically through oral
+ sex or stored cum. \n\nIf fertilin reaches zero, {PAWN_nameDef} will become very unhappy
+ and may try to obtain some forcefully.
+ Genes/Icons/FertilinAlt
+ 0
+ -2
+ 18
+
+
Gives fertilin supply.
+
+
+
+
+ fert
+
+
+
+ 0.025
+ 1
+ 1
+
+
+
+ rjw_genes_lifeforce_drain
+
+ draining
+ Carriers lose an additional 7.5 fertilin per day from biological entropy.
+ fertilin
+ RJW_Genes.Gene_LifeForceDrain
+ Genes/Icons/FertilinDrainAlt
+ rjw_genes_lifeforce
+ 0.075
+ 18
+ -1
+ 1
+ 6
+
+
+
+ rjw_genes_pussyhealing
+
+ pussyhealer
+ Carriers of this gene are able use vaginal sex to tend to other's wounds.
+ Genes/Icons/Healpussy
+ rjw_genes_lifeforce
+ 9
+
+
+
+
+
+
+
+ rjw_genes_cockeater
+
+ cockeater
+ Carriers of this gene are able eat cocks to restore their fertilin supply.
+ Cocks are consumed during that process.
+ Genes/Icons/cockeater
+ rjw_genes_lifeforce
+ 11
+
+
+
+
+
+
+
+ rjw_genes_paralysingkiss
+
+ paralysing kiss
+ Carriers of this gene are able to briefly stun an enemy with a kiss.
+ Genes/Icons/Paralysing_Kiss
+ rjw_genes_lifeforce
+ 12
+
+
+
+
+
+
+
+ rjw_genes_seduce
+
+ seduction
+ Carriers of this gene are able to seduce a pawn into having sex with them.
+ Genes/Icons/seduce
+ rjw_genes_lifeforce
+ 13
+
+
rjw_genes_ability_seduce
+
+
+ rjw_genes_ability_seduce
+
+ 1
+ -1
+
+
+
+
+ stun
+
+
+ kiss
+
+
+
+
+
+
+ rjw_genes_naked_prowess
+
+ Carriers of this gene are able to temporarily increase their strength and
+ resilience, while they are naked.
+ Genes/Icons/rjw_naked_prowess
+ rjw_genes_lifeforce
+ 14
+
+
rjw_genes_ability_naked_prowess
+
+
+ rjw_genes_ability_naked_prowess
+
+ 1
+ -1
+
+
+
+ rjw_genes_cum_eater
+
+ Carriers of this gene are able to absorb fertilin through eating cum. This
+ includes oral sex, eating cum for food or sucking out cumflated pawns.
+ Genes/Icons/cumeater
+ rjw_genes_lifeforce
+ 1
+ 1
+
+
+
+ rjw_genes_fertilin_absorber
+
+ Carriers of this gene are able to absorb the fertilin inside sperm through
+ their vagina and anus.
+ Genes/Icons/Vaginal_cum_absorption
+ rjw_genes_lifeforce
+ 2
+ 1
+
+
+
+ rjw_genes_lifeforce_empath
+
+ RJW_Genes.Gene_LifeForce_Empath
+ Carriers of this gene generate lifeforce if nearby pawns are sexually
+ satisfied. Be careful: Sexually frustrated pawns will make your empath loose lifeforce!
+ Genes/Icons/Hypersexual
+ rjw_genes_lifeforce
+ 3
+ 3
+ -2
+
+
+
+ 0.02
+ 0.01
+ -0.01
+
+
+
+ 2500
+
+
+
+ 25
+
+
+
+
+
+ rjw_genes_drainer
+
+ Carriers of this gene are able to absorb a great amount of fertilin by draining
+ the vitality of the partner. This is done passively through having sex with a
+ non-drained pawn that does not have this gene.
+ Genes/Icons/Vitality_Drainer
+ rjw_genes_lifeforce
+ 4
+ 1
+ -1
+
+
\ No newline at end of file
diff --git a/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml b/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml
new file mode 100644
index 0000000..a01e245
--- /dev/null
+++ b/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml
@@ -0,0 +1,226 @@
+
+
+
+
+ rjw_genes_hypersexual
+
+ Reproduction
+ Xenotypes with this Gene are Hypersexual (Nymphs).
+ Genes/Icons/Hypersexual
+ 1
+
+
+
+
+
+
+ LitteredBirths
+
+ Reproduction
+ Female carriers of this gene birth litters instead of just one baby, with a
+ chance of having two to four babies per pregnancy.
+ Genes/Icons/Gene_LitteredBirths
+ 110
+ 1.10
+ -2
+ 1
+
+
+ ImpregnationFetishQuirk
+
+
+
+
rjw_genes_littered_birth_vs_chestburst
+
+
+
+
+ rjw_genes_pregnancy_overwrite
+
+ Reproduction
+ Carriers of this gene can 'overwrite' an existing pregnancy, keeping the
+ progress but effectively replacing the father.
+ Genes/Icons/pregnancy_overwrite
+ 120
+
+ 4
+ -2
+
+
+
+
+
+
+
+ rjw_genes_blocked_masturbation
+
+ Reproduction
+ Carriers of this gene are unable to masturbate - they need a partner or equipment.
+ Genes/Icons/blocked_masturbation
+ 60
+ 0
+ 1
+
+
+
+
+
+
+ rjw_genes_orgasm_rush
+
+ On orgasm, carriers of this gene get a boost in activity. (rest-need is
+ partially filled)
+ 1
+ -2
+ Genes/Icons/FleshPurity
+ 1
+
+
+
+ rjw_genes_youth_fountain
+
+ Having sex with a carrier of this gene makes the partner slightly younger.
+ (Partner stays adult)
+ 2
+ -2
+ Genes/Icons/FireLeaves
+ 2
+
+
+
+ 60000
+ 18
+
+
+
+
+
+ rjw_genes_sex_age_drain
+
+ Having sex transfers some of the partners life-time to themselves. (Pawn stays
+ adult)
+ 2
+ -1
+ UI/Icons/ColonistBar/Idle
+ 3
+
+
+
+ 120000
+ 18
+
+
+
+
+
+ rjw_genes_aphrodisiac_pheromones
+
+ RJW_Genes.Gene_Aphrodisiac_Pheromones
+ Pheremones of this pawn induce an incressed sexdrive to others nearby.
+ Genes/Icons/Pheromones
+ 4
+ 1
+ 1
+
+
+
+ 1250
+
+
+
+ 25
+
+
+
+
+
+ rjw_genes_sexual_mytosis
+
+
+ Carriers have malfunctioning regenerative archites that grow more unstable with
+ ongoing multiple orgasms - climaxing in a process of mytosis. This will result in an
+ (biologically) identical pawn and both twins are set in a regenerative state. Also, the
+ pawn can have multiple orgasms: In a state of higher unstableness, they come quicker.
+ UI/Icons/Genes/Gene_PsychicBonding
+ 5
+ 5
+ -5
+ 1
+
+
+
+ rjw_genes_hormonal_saliva
+
+ The saliva of this xenotype stimulates growth in penises. Regular contact will
+ lead to noticable growth.
+ 2
+ -1
+ Genes/Icons/Big_Male_Genitalia
+ 6
+
+
+
+ 0.02
+ 2.5
+
+ 1.05
+
+
+
+
+
+ rjw_genes_cocoonweaver
+
+ cocooner
+ Carriers of this gene can produce a cocoon to prepare helpless (or willing)
+ victims for breeding.
+ Genes/Icons/Cocoon
+ 11
+
+
+
+
+
+
+ rjw_genes_sex_tamer
+
+ sextamer
+ Bestiality has a chance to tame animals or advance their training.
+ Genes/Icons/RJW_Genes_SexualTamer
+ 14
+ 2
+ -1
+
+
+
+ rjw_genes_sexual_genetic_swap
+
+ Carriers with this gene may switch a gene with their sex-partner. Switched Genes are always endogenes.
+ Genes/Icons/sexual_genetic_swap
+ 20
+ 3
+ 0
+
+
+ 0.1
+
+
+
+
+
+ rjw_genes_sexual_genetic_thief
+
+ Carriers with this gene may steal a gene from their sex-partner. Stolen genes are always xenogenes.
+ Genes/Icons/sexual_genetic_thief
+ 21
+ 5
+ -2
+ 1
+
+
+ 0.2
+
+
+
+
+
+ rjw_genes_feminizer
+
+ Carriers with this gene slowly turn male sexual partners into females.
+ Genes/Icons/feminizer
+ 31
+ 4
+ -1
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
new file mode 100644
index 0000000..f28f160
--- /dev/null
+++ b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
@@ -0,0 +1,148 @@
+
+
+
+
+ rjw_genes_succubus
+
+ Succubi are strongly enhanced xenohumans. These overnaturally beautiful creatures
+ strive parasitically on the Fertilin found in semen.
+ Succubi are beautiful and extremely hungry Xenohumans. They strive on having
+ sex and extracting their victims life-force through this.
+ Genes/Icons/Xenotypes/Xenotype-Succubus
+ PawnBecameSanguophage
+ 0.5
+ 0.1~140
+ 1
+ -1000
+ 0.005
+ false
+
+ 0.02
+ 0.02
+ 0.02
+ 0.02
+ 0.02
+ 0.02
+
+
+
rjw_genes_bisexual
+
rjw_genes_hypersexual
+
rjw_genes_female_only
+
rjw_genes_lifeforce
+
rjw_genes_lifeforce_drain
+
rjw_genes_demonic_genitalia
+
rjw_genes_cum_eater
+
rjw_genes_fertilin_absorber
+
rjw_genes_paralysingkiss
+
rjw_genes_seduce
+
AptitudeRemarkable_Sex
+
DominantGene
+
rjw_genes_elasticity
+
rjw_genes_succubus_wings
+
rjw_genes_succubus_tail
+
rjw_genes_aphrodisiac_pheromones
+
Beauty_Pretty
+
MoveSpeed_Quick
+
AptitudeStrong_Social
+
Ears_Pointed
+
Headbone_MiniHorns
+
Skin_Purple
+
+
+
+
+ rjw_genes_incubus
+
+ Incubi are strongly enhanced xenohumans. These overnaturally beautiful creatures
+ strive parasitically on the Fertilin found in semen.
+ Incubi are beautiful and extremely hungry Xenohumans. They strive on having
+ sex and extracting their victims life-force through this.
+ Genes/Icons/Xenotypes/Xenotype-Incubus
+ PawnBecameSanguophage
+ 0.5
+ 0.1~140
+ 1
+ -1000
+ 0.005
+ false
+
+ 0.02
+ 0.02
+ 0.02
+ 0.02
+ 0.02
+ 0.02
+
+
+
rjw_genes_hypersexual
+
rjw_genes_bisexual
+
rjw_genes_male_only
+
rjw_genes_lifeforce
+
rjw_genes_lifeforce_drain
+
rjw_genes_drainer
+
rjw_genes_demonic_genitalia
+
AptitudeRemarkable_Sex
+
DominantGene
+
rjw_genes_seduce
+
rjw_genes_succubus_wings
+
rjw_genes_succubus_tail
+
rjw_genes_aphrodisiac_pheromones
+
Beauty_Pretty
+
MoveSpeed_Quick
+
Robust
+
UVSensitivity_Intense
+
AptitudeStrong_Intellectual
+
Ears_Pointed
+
Headbone_CenterHorn
+
Skin_InkBlack
+
+
+
+
+ rjw_genes_cumazone
+
+ Cumazone are a female only xenotype that excel at meele combat. Originally created
+ as bodyguards for glitterworld amazon communities, they spred to other systems by mere
+ strength and providing for some fetishes. They can use Fertilin to enhance their skin to
+ overpower any combatant in meele. Their only source for Fertilin is biting of male genitalia -
+ so be sure to have a steady supply of victim males or prepare to raid unsuspecting men of the
+ rim.
+ Female only, strong meele fighters, that use Fertilin from bitten-off cocks
+ for powerful buffs.
+ Genes/Icons/Xenotypes/Xenotype-Cumazon
+ 0.5
+ 0.1~140
+ 2.5
+ -1000
+ 0.01
+ false
+
+
WoundHealing_Fast
+
NakedSpeed
+
Aggression_Aggressive
+
MeleeDamage_Strong
+
KillThirst
+
Robust
+
Pain_Reduced
+
Beauty_Ugly
+
Hair_BaldOnly
+
Hair_ShortOnly
+
Brow_Heavy
+
Body_Hulk
+
AptitudeStrong_Shooting
+
AptitudeRemarkable_Melee
+
AptitudePoor_Crafting
+
AptitudePoor_Artistic
+
Unstoppable
+
rjw_genes_rapist
+
rjw_genes_female_only
+
rjw_genes_lifeforce
+
rjw_genes_lifeforce_drain
+
rjw_genes_pussyhealing
+
rjw_genes_cockeater
+
rjw_genes_naked_prowess
+
rjw_genes_orgasm_rush
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_Breeding.xml b/Common/Defs/Genes/GeneDefs_Breeding.xml
deleted file mode 100644
index fa65c52..0000000
--- a/Common/Defs/Genes/GeneDefs_Breeding.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
- rjw_genes_mechbreeder
-
- Pawns with this gene are able to birth mechanoids unharmed.
- World/WorldObjects/Expanding/Mechanoids
- 51
- rjw_genes_breeding
-
-
-
- rjw_genes_insectincubator
-
- Pawns with this gene are able to hold more insect eggs.
- Genes/Icons/More_Egg_Space
- 52
- rjw_genes_breeding
-
-
-
- rjw_genes_insectbreeder
-
- Pawns with this gene are able to fertilize eggs with any fertile penis.
- World/WorldObjects/Expanding/Insects
- 53
- rjw_genes_breeding
-
-
-
- rjw_genes_zoophile
-
- rjw_genes_breeding
- Xenotypes with this Gene are Zoophile.
- Genes/Icons/Zoophile_2
- 54
-
-
- Zoophile
-
-
-
-
-
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_Cum.xml b/Common/Defs/Genes/GeneDefs_Cum.xml
deleted file mode 100644
index d410319..0000000
--- a/Common/Defs/Genes/GeneDefs_Cum.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
- rjw_genes_cum
-
-
CumAmount
-
-
-
-
-
- rjw_genes_no_cum
-
- Males of these species have no fluid.
- Genes/Icons/No_Cum
- RJW_Genes.Gene_NoCum
- 533
- 0
- 1
-
-
-
- rjw_genes_much_cum
-
- Males of this species produce a lot of fluid.
- Genes/Icons/Bonus_Cum
- RJW_Genes.Gene_MuchCum
- 534
- 1
- -1
-
-
-
- rjw_genes_very_much_cum
-
- Males of this species produce a whole lot of fluid. They are like fountains basically.
- Genes/Icons/Much_Bonus_Cum
- RJW_Genes.Gene_VeryMuchCum
- 535
- 1
- -2
-
-
-
- rjw_genes_likes_cumflation
-
- rjw_genes_cum
- This Xenotype loves being cumflated.
- Genes/Icons/Cumflation
- 536
-
-
-
-
-
-
-
- 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/Generous_Donor
- 538
-
-
-
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_Damage.xml b/Common/Defs/Genes/GeneDefs_Damage.xml
deleted file mode 100644
index b3c21ef..0000000
--- a/Common/Defs/Genes/GeneDefs_Damage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- rjw_genes_elasticity
-
- rjw_genes_damage
- This Xenotype cannot get stretched by huge penetrators.
- Genes/Icons/Elasticity
- RJW_Genes.Gene_Elasticity
- 1
-
-
-
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_GenitaliaTypes.xml b/Common/Defs/Genes/GeneDefs_GenitaliaTypes.xml
deleted file mode 100644
index f7ab982..0000000
--- a/Common/Defs/Genes/GeneDefs_GenitaliaTypes.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
- rjw_genes_genitalia_type
-
-
GenitalType
-
- 0
-
-
-
- rjw_genes_equine_genitalia
-
- Carriers of this gene develop equine genitalia.
- Genes/Icons/Genitalia_Equine
- RJW_Genes.Gene_EquineGenitalia
- 802
-
-
-
- rjw_genes_canine_genitalia
-
- Carriers of this gene develop canine genitalia.
- Genes/Icons/Genitalia_Canine_2
- RJW_Genes.Gene_CanineGenitalia
- 803
-
-
-
- rjw_genes_feline_genitalia
-
- Carriers of this gene develop feline genitalia.
- Genes/Icons/Genitalia_Feline
- RJW_Genes.Gene_FelineGenitalia
- 804
-
-
-
- rjw_genes_demonic_genitalia
-
- Carriers of this gene have demonic genitalia.
- Genes/Icons/Genitalia_Demon
- RJW_Genes.Gene_DemonicGenitalia
- 805
-
-
-
- rjw_genes_dragon_genitalia
-
- Carriers of this gene develop dragon genitalia.
- Genes/Icons/Genitalia_Draconic
- RJW_Genes.Gene_DragonGenitalia
- 806
-
-
-
- rjw_genes_slime_genitalia
-
- Carriers of this gene have slime genitalia.
- Genes/Icons/Genitalia_Slime
- RJW_Genes.Gene_SlimeGenitalia
- 807
-
-
-
- rjw_genes_ovipositor_genitalia
-
- Carriers of this gene have ovipositors similar to insects.
- Genes/Icons/Genitalia_Insect
- RJW_Genes.Gene_OvipositorGenitalia
- 808
-
-
-
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_Reproduction.xml b/Common/Defs/Genes/GeneDefs_Reproduction.xml
deleted file mode 100644
index ef348fd..0000000
--- a/Common/Defs/Genes/GeneDefs_Reproduction.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- rjw_genes_hypersexual
-
- Reproduction
- Xenotypes with this Gene are Hypersexual (Nymphs).
- Genes/Icons/Hypersexual
- 1
-
-
- Nymphomaniac
-
-
-
-
-
- rjw_genes_rapist
-
- Reproduction
- Xenotypes with this Gene are Rapists.
- Genes/Icons/Rape
- 2
-
-
- Rapist
-
-
-
-
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_SexSpecial.xml b/Common/Defs/Genes/GeneDefs_SexSpecial.xml
deleted file mode 100644
index 51d4269..0000000
--- a/Common/Defs/Genes/GeneDefs_SexSpecial.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- rjw_genes_orgasm_rush
-
- rjw_genes_special
- On Orgasm, carriers of this gene get a boost in activity. (rest-need is partially filled)
- 1
- UI/Memes/FleshPurity
- 1
-
-
-
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_SpecifiedGender.xml b/Common/Defs/Genes/GeneDefs_SpecifiedGender.xml
deleted file mode 100644
index e168411..0000000
--- a/Common/Defs/Genes/GeneDefs_SpecifiedGender.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- rjw_genes_female_only
-
- rjw_genes_gender
- This Xenotype only has females.
- 0
- Genes/Icons/Female_Only
- RJW_Genes.Gene_FemaleOnly
- 1
-
-
-
- rjw_genes_male_only
- rjw_genes_gender
-
- This Xenotype only has males.
- 0
- Genes/Icons/Male_Only
- RJW_Genes.Gene_MaleOnly
- 2
-
-
-
\ No newline at end of file
diff --git a/Common/Defs/HediffDefs/Bioscaffold.xml b/Common/Defs/HediffDefs/Bioscaffold.xml
new file mode 100644
index 0000000..c6bed88
--- /dev/null
+++ b/Common/Defs/HediffDefs/Bioscaffold.xml
@@ -0,0 +1,71 @@
+
+
+
+
+ Bioscaffold
+ HediffWithComps
+
+ This woman has an bioscaffold mesh within her womb, providing an enriching environment for an unborn baby to grow more quickly.
+
+ Bioscaffold
+
+ 0.001
+ false
+
+
+
+
+ Bioscaffold
+
+ A single-use nanite-constructed lattice of organic mesh material meant to be installed inside a woman's womb prior to pregnancy. It provides an enriching environment for an unborn baby to grow more quickly.
+
+ InstallBioscaffold
+
+ Spacer
+ Rare
+ true
+ 25
+ false
+
+ 30
+ 350
+ 0.15
+ 1.3
+ 6
+ 800
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/HediffDefs/Hediffs_Aphrodisiac.xml b/Common/Defs/HediffDefs/Hediffs_Aphrodisiac.xml
new file mode 100644
index 0000000..3d1048c
--- /dev/null
+++ b/Common/Defs/HediffDefs/Hediffs_Aphrodisiac.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+ rjw_genes_aphrodisiac_pheromone
+ HediffWithComps
+
+ sex drive increasing due to smelling aphrodisiac pheromones.
+ (1,0,0.5)
+ 1.0
+
+
+ -4.0
+
+
+
+
+
+
+ 1.25
+
+
+
+ 0.35
+
+
+
+ 1.8
+
+
+
+ 0.9
+
+
+
+ 2.5
+
+
+
+
+
+
\ No newline at end of file
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/HediffDefs/Hediffs_Fertilin.xml b/Common/Defs/HediffDefs/Hediffs_Fertilin.xml
new file mode 100644
index 0000000..5b56717
--- /dev/null
+++ b/Common/Defs/HediffDefs/Hediffs_Fertilin.xml
@@ -0,0 +1,168 @@
+
+
+
+
+ rjw_genes_fertilin_lost
+ Hediff_HemogenCraving
+
+ Percentage of fertilin lost.
+ (1,1,1)
+ 1
+
+
+ -0.5
+
+
+
+
+ true
+
+
+
+
+
+ rjw_genes_succubus_drained
+ HediffWithComps
+
+ The vitality of this pawn has been drained. Cannot be drained again until fully
+ recovered.
+ (1,0,0.5)
+ 1.0
+ 1.0
+
+
+ -0.25
+
+
+
+
+
+
+
+ Consciousness
+ -0.1
+
+
+ 0.1
+
+ -0.1
+
+
+
+ 0.5
+
+
+
+ Consciousness
+ -0.2
+
+
+ 0.05
+ 0.20
+
+ -0.1
+
+
+
+ 0.8
+
+
+
+ Consciousness
+ -0.3
+
+
+
+ -0.2
+
+ 0.4
+ 0.1
+ 0.35
+
+
+
+
+
+ rjw_genes_fertilin_craving
+
+ Hediff_HemogenCraving
+ weakened due to running out of fertilin.
+ (1,0,0.5)
+ 1.0
+ 0.01
+
+
+
+ 0.05
+
+
+ Consciousness
+ 0.9
+
+
+
+
+
+ 0.35
+ 0.1
+
+
+ Consciousness
+ 0.8
+
+
+
+
+
+ 0.7
+ 0.15
+
+
+ Consciousness
+ 0.5
+
+
+
+
+
+
+ 0.05
+ -0.1
+
+
+
+
+
+ rjw_genes_naked_prowess
+ (0.52, 1, 0.95)
+
+ Driven by fertilin, this person has greatly increased strength and resilience.
+ HediffWithComps
+
+
+
+
+ 0.5
+ 0.5
+ 0.5
+
+
+ 0.5
+ 1.5
+
+
+
+
+
+ True
+ 5000
+
+
+
+
+ false
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/HediffDefs/Hediffs_InfectiveGenderChanges.xml b/Common/Defs/HediffDefs/Hediffs_InfectiveGenderChanges.xml
new file mode 100644
index 0000000..45537fd
--- /dev/null
+++ b/Common/Defs/HediffDefs/Hediffs_InfectiveGenderChanges.xml
@@ -0,0 +1,147 @@
+
+
+
+
+ rjw_genes_feminization_progress
+ HediffWithComps
+
+ Something is changing this pawn - there is a chance to develop female features
+ upon sex.
+ false
+ 1.0
+ false
+ false
+
+
+ -0.01
+
+
+
+
+
+
+ false
+
+
+
+
+ 0.6
+ true
+
+
+ Consciousness
+ -0.5
+
+
+
+ 0.25
+
+
+
+
+
+ 0.8
+
+
+ Consciousness
+ -0.05
+
+
+ true
+
+ 0.5
+ 0.25
+
+
+
+
+
+ 0.9
+
+
+ Consciousness
+ -0.1
+
+
+ true
+
+ 1.0
+ 0.5
+
+
+
+
+
+
+
+ rjw_genes_twinkification_progress
+ HediffWithComps
+
+ Something is changing this pawn - there is a chance to turn into a cute,
+ breedable twink upon sex.
+ false
+ 1.0
+ false
+ false
+
+
+ -0.01
+
+
+
+
+
+
+ false
+
+
+
+
+ 0.6
+ true
+
+
+ Consciousness
+ -0.05
+
+
+
+ 0.25
+
+
+
+
+
+ 0.8
+
+
+ Consciousness
+ -0.05
+
+
+ true
+
+ 0.5
+ 0.25
+
+
+
+
+
+ 0.9
+
+
+ Consciousness
+ -0.1
+
+
+ true
+
+ 1.5
+ 0.5
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/HediffDefs/Hediffs_OrgasmRush.xml b/Common/Defs/HediffDefs/Hediffs_OrgasmRush.xml
new file mode 100644
index 0000000..255b3e9
--- /dev/null
+++ b/Common/Defs/HediffDefs/Hediffs_OrgasmRush.xml
@@ -0,0 +1,77 @@
+
+
+
+
+ rjw_genes_orgasm_rush_hediff
+ HediffWithComps
+
+ Xenotypes with this Gene are pushed beyond normal limits when they have an orgasm.
+ (240,200,110)
+ false
+ 1.0
+ false
+ false
+
+
+ -0.75
+
+
+
+
+
+
+ 4
+ 4
+
+
+
+ Consciousness
+ 0.05
+
+
+
+
+
+ 0.4
+
+ 8
+ 8
+
+
+
+ Moving
+ 0.08
+
+
+ Consciousness
+ 0.08
+
+
+
+
+
+ 0.7
+
+ 10
+ 10
+
+
+
+ Moving
+ 0.1
+
+
+ Consciousness
+ 0.1
+
+
+ BloodPumping
+ 0.1
+
+
+
+
+
+
+
+
diff --git a/Common/Defs/HediffDefs/Hediffs_OrgasmicMytosis.xml b/Common/Defs/HediffDefs/Hediffs_OrgasmicMytosis.xml
new file mode 100644
index 0000000..f26d1a9
--- /dev/null
+++ b/Common/Defs/HediffDefs/Hediffs_OrgasmicMytosis.xml
@@ -0,0 +1,136 @@
+
+
+
+
+ rjw_genes_orgasmic_mytosis_hediff
+ HediffWithComps
+
+ Xenotypes with this Gene grow more unstable on orgasm - upon reaching critical level they will initate a process of mytosis.
+ (240,200,110)
+ false
+ 1.0
+ false
+ false
+
+
+ -0.9
+
+
+
+
+
+
+
+ Moving
+ 0.05
+
+
+ Consciousness
+ 0.08
+
+
+
+
+
+ 0.4
+
+
+ Moving
+ 0.15
+
+
+ Consciousness
+ 0.15
+
+
+
+
+
+ 0.7
+
+
+ Moving
+ -0.1
+
+
+ Consciousness
+ -0.1
+
+
+ BloodPumping
+ +0.2
+
+
+
+
+
+
+ 0.9
+
+
+ Moving
+ -0.25
+
+
+ Consciousness
+ -0.25
+
+
+ BloodPumping
+ +0.5
+
+
+
+
+
+
+
+ rjw_genes_mytosis_shock_hediff
+ HediffWithComps
+
+ Recently underwent (successful) mytosis. As this is a taxing process, some time for regeneration is required. While regenerating, no new mytosis can be started.
+ (240,200,110)
+ false
+ 1.0
+ true
+ false
+
+
+ -0.20
+
+
+
+
+
+
+
+ Moving
+ -0.25
+
+
+ Consciousness
+ -0.25
+
+
+
+
+
+ 0.6
+
+
+ Moving
+ -0.50
+
+
+ Consciousness
+ -0.7
+
+
+
+
+
+
+
+
+
+
diff --git a/Common/Defs/HediffDefs/Hediffs_Rut.xml b/Common/Defs/HediffDefs/Hediffs_Rut.xml
new file mode 100644
index 0000000..6c6ac10
--- /dev/null
+++ b/Common/Defs/HediffDefs/Hediffs_Rut.xml
@@ -0,0 +1,51 @@
+
+
+
+ rjw_genes_genetic_rut
+ HediffWithComps
+
+ Based on genetics, this pawn is in heat.
+ (240,200,110)
+ false
+ 1.0
+ false
+ false
+
+
+ -1.00
+
+
+
+
+
+
+ 0.50
+
+
+
+ BloodPumping
+ 0.1
+
+
+
+
+
+ 0.4
+
+ 2.00
+
+
+
+ Moving
+ 0.1
+
+
+ BloodPumping
+ 0.15
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/HediffDefs/LimbicStimulator.xml b/Common/Defs/HediffDefs/LimbicStimulator.xml
new file mode 100644
index 0000000..8a7f8a6
--- /dev/null
+++ b/Common/Defs/HediffDefs/LimbicStimulator.xml
@@ -0,0 +1,38 @@
+
+
+
+ LimbicStimulator
+ HediffWithComps
+
+ limbic stimulator
+ An installed limbic stimulator.
+
+ (1.0, 0.6, 0.7)
+
+
+ 0
+
+ -1.0
+ 6.0
+
+
+
+
+
+
+ LimbicStimulator
+
+ A perpetual slow-release chemical stimulation implant that is embedded deep within the reward center of the brain, greatly increasing the need for lovin'. The need is said to become so strong that it can drive people to force themselves onto others, even if they wouldn't otherwise. Post-lovin' clarity will leave the implanted in a state of bliss, but they may also feel a sense of regret if they steal lovin' if they normally wouldn't - at least until they become used to doing it.
+
+ InstallLimbicStimulator
+
+
+ 30
+ 4
+ 1
+
+
+ FertilityProcedures
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/HediffDefs/OvaryAgitator.xml b/Common/Defs/HediffDefs/OvaryAgitator.xml
new file mode 100644
index 0000000..45d69c9
--- /dev/null
+++ b/Common/Defs/HediffDefs/OvaryAgitator.xml
@@ -0,0 +1,136 @@
+
+
+
+
+ OvaryAgitator
+
+ An installed ovary agitator.
+
+ OvaryAgitator
+
+ HediffWithComps
+ 0.0001
+
+
+
+
+ RJW_Fertility
+ 0.50
+
+
+
+
+ 0.1
+
+
+ RJW_Fertility
+ 0.22
+
+
+
+
+ 0.2
+
+
+ RJW_Fertility
+ 0
+
+
+
+
+ 0.3
+
+
+ RJW_Fertility
+ -0.17
+
+
+
+
+ 0.4
+
+
+ RJW_Fertility
+ -0.32
+
+
+
+
+ 0.5
+
+
+ RJW_Fertility
+ -0.48
+
+
+
+
+ 0.6
+
+
+ RJW_Fertility
+ -0.54
+
+
+
+
+ 0.7
+
+
+ RJW_Fertility
+ -0.63
+
+
+
+
+ 0.8
+
+
+ RJW_Fertility
+ -0.69
+
+
+
+
+ 0.9
+
+
+ RJW_Fertility
+ -0.75
+
+
+
+
+ 1
+
+
+ RJW_Fertility
+ -100
+
+
+
+
+
+
+ 0.0045
+
+
+
+
+
+ OvaryAgitator
+
+ A crude slaver implant used to increase the number of eggs released during ovulation, increasing the likelihood of having multiple children per pregnancy. Their use is largely limited to rimworlds lacking in cloning infrastructure as most civilized and unified worlds have outlawed them.\n\nWhile it provides an initial boost in fertility, the implant will slowly deplete the victims's ovaries over several years until they're infertile. Allies of implanted victims will be angered.
+
+ InstallOvaryAgitator
+
+
+ 10
+ 1
+ 6
+
+
+ FertilityProcedures
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/HediffDefs/Scrambler.xml b/Common/Defs/HediffDefs/Scrambler.xml
new file mode 100644
index 0000000..4ab6071
--- /dev/null
+++ b/Common/Defs/HediffDefs/Scrambler.xml
@@ -0,0 +1,49 @@
+
+
+
+ Scrambler
+
+ scrambler
+ An installed scrambler.
+
+ Scrambler
+
+ (0.9, 0.5, 1.0)
+
+
+ 0
+
+ 0.40
+ 3.0
+
+
+
+ Consciousness
+ 0.6
+
+
+ Talking
+ 0.2
+
+
+
+
+
+
+
+ Scrambler
+
+ A slaver implant, similar to the mindscrew, that can inject disorienting mind imagery directly into the visual cortex of the brain through a complex network of nanoelectrodes. Victims of scrambler implantation tend to socially withdraw to minimize additional stimulation. As a consequence of their confusion, they also become physically meek, making them easy to impose upon. Allies of implanted victims will be angered.
+
+
+ 50
+
+
+ 8
+ 1
+
+
+ FertilityProcedures
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/HistoryEventDefs/DiseaseHistoryEventDefs.xml b/Common/Defs/HistoryEventDefs/DiseaseHistoryEventDefs.xml
new file mode 100644
index 0000000..488fa5f
--- /dev/null
+++ b/Common/Defs/HistoryEventDefs/DiseaseHistoryEventDefs.xml
@@ -0,0 +1,18 @@
+
+
+
+ rjw_genes_GoodwillChangedReason_StoleGene
+
+
+
+
+ rjw_genes_GoodwillChangedReason_infected_with_disease
+
+
+
+
+ rjw_genes_GoodwillChangedReason_spread_genetic_disease
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/HistoryEventDefs/SpecialHistoryEventDefs.xml b/Common/Defs/HistoryEventDefs/SpecialHistoryEventDefs.xml
new file mode 100644
index 0000000..ded422c
--- /dev/null
+++ b/Common/Defs/HistoryEventDefs/SpecialHistoryEventDefs.xml
@@ -0,0 +1,18 @@
+
+
+
+ rjw_genes_GoodwillChangedReason_aged_pawn_with_sex_gene
+
+
+
+
+ rjw_genes_GoodwillChangedReason_youthed_pawn_with_sex_gene
+
+
+
+
+ rjw_genes_GoodwillChangedReason_OverwritePregnancy
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/IncidentsDefs/Incidents_LifeForce.xml b/Common/Defs/IncidentsDefs/Incidents_LifeForce.xml
new file mode 100644
index 0000000..297aca5
--- /dev/null
+++ b/Common/Defs/IncidentsDefs/Incidents_LifeForce.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ SuccubusDreamVisit
+
+ Misc
+
+
Map_PlayerHome
+
+ RJW_Genes.IncidentWorker_SuccubusDreamVisit
+ 1.0
+ 10
+ false
+
+
\ No newline at end of file
diff --git a/Common/Defs/InteractionDef/Interactions_Flirt.xml b/Common/Defs/InteractionDef/Interactions_Flirt.xml
new file mode 100644
index 0000000..27c5408
--- /dev/null
+++ b/Common/Defs/InteractionDef/Interactions_Flirt.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+ rjw_genes_flirt
+
+ Things/Mote/SpeechSymbols/Chitchat
+
+
+
r_logentry->[INITIATOR_nameDef] and [RECIPIENT_nameDef] [talkedabout] [TalkTopicLight].
+
r_logentry->[INITIATOR_nameDef] [talkedabout] [TalkTopicLight] with [RECIPIENT_nameDef].
+
r_logentry(p=0.8)->[INITIATOR_nameDef] [commentedabout] [TalkTopicLight] to [RECIPIENT_nameDef].
Furskin
diff --git a/Common/Defs/RaceGeneDefs/RaceGeneDefs_template.xml b/Common/Defs/RaceGeneDefs/RaceGeneDefs_template.xml
index 20be765..b092257 100644
--- a/Common/Defs/RaceGeneDefs/RaceGeneDefs_template.xml
+++ b/Common/Defs/RaceGeneDefs/RaceGeneDefs_template.xml
@@ -1,12 +1,17 @@
-
-
+this is to disable the xml, remove it for your own xml -->
-
+
+
+this is to disable the xml, remove it for your own xml -->
\ No newline at end of file
diff --git a/Common/Defs/RecipeDefs/Bioscaffold.xml b/Common/Defs/RecipeDefs/Bioscaffold.xml
new file mode 100644
index 0000000..624f0cb
--- /dev/null
+++ b/Common/Defs/RecipeDefs/Bioscaffold.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ InstallBioscaffold
+
+ Install a bioscaffold.
+
+ Bioscaffold
+ Bioscaffold
+
+ Installing bioscaffold.
+
+
+
+
+
Bioscaffold
+
+
+ 1
+
+
+
+
+
Bioscaffold
+
+
+
+
Torso
+
+ Bioscaffold
+
+
\ No newline at end of file
diff --git a/Common/Defs/RecipeDefs/LimbicStimulator.xml b/Common/Defs/RecipeDefs/LimbicStimulator.xml
new file mode 100644
index 0000000..b824041
--- /dev/null
+++ b/Common/Defs/RecipeDefs/LimbicStimulator.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ InstallLimbicStimulator
+
+ Install a limbic stimulator.
+
+ LimbicStimulator
+ LimbicStimulator
+
+ Installing limbic stimulator.
+
+
+
+
+
LimbicStimulator
+
+
+ 1
+
+
+
+
+
LimbicStimulator
+
+
+
+
Brain
+
+ LimbicStimulator
+
+
\ No newline at end of file
diff --git a/Common/Defs/RecipeDefs/OvaryAgitator.xml b/Common/Defs/RecipeDefs/OvaryAgitator.xml
new file mode 100644
index 0000000..2d2523f
--- /dev/null
+++ b/Common/Defs/RecipeDefs/OvaryAgitator.xml
@@ -0,0 +1,35 @@
+
+
+
+
+ InstallOvaryAgitator
+
+ Install an ovary agitator.
+
+ OvaryAgitator
+ OvaryAgitator
+
+ Recipe_InstallImplant
+ Installing ovary agitator.
+ true
+
+
+
+
+
OvaryAgitator
+
+
+ 1
+
+
+
+
+
OvaryAgitator
+
+
+
+
Torso
+
+ OvaryAgitator
+
+
\ No newline at end of file
diff --git a/Common/Defs/RecipeDefs/Scrambler.xml b/Common/Defs/RecipeDefs/Scrambler.xml
new file mode 100644
index 0000000..5479d91
--- /dev/null
+++ b/Common/Defs/RecipeDefs/Scrambler.xml
@@ -0,0 +1,35 @@
+
+
+
+
+ InstallScrambler
+
+ Install a scrambler.
+
+ Scrambler
+ Scrambler
+
+ Recipe_InstallImplant
+ Installing scrambler.
+ true
+
+
+
+
+
Scrambler
+
+
+ 1
+
+
+
+
+
Scrambler
+
+
+
+
Brain
+
+ Scrambler
+
+
\ No newline at end of file
diff --git a/Common/Defs/RulePackDefs/Sex/RulePacks_SuccubTail.xml b/Common/Defs/RulePackDefs/Sex/RulePacks_SuccubTail.xml
new file mode 100644
index 0000000..21e75a1
--- /dev/null
+++ b/Common/Defs/RulePackDefs/Sex/RulePacks_SuccubTail.xml
@@ -0,0 +1,77 @@
+
+
+
+
+ DomSuccubusTail_Tailjob_RP
+
+
+
sent-> [INITIATOR_nameDef] gave [RECIPIENT_nameDef] a tailjob.
+
+
+
+
+
+ DomSuccubusTail_Vaginal_RP
+
+
+
sent-> [INITIATOR_nameDef] [INITIATOR_possessive] tail was vaginally inserted into [RECIPIENT_nameDef].
+
+
+
+
+
+ DomSuccubusTail_Anal_RP
+
+
+
sent-> [INITIATOR_nameDef] [INITIATOR_possessive] tail was anally inserted into [RECIPIENT_nameDef].
+
+
+
+
+
+
+ DomSuccubusTail_Envelop_RP
+
+
+
sent-> [RECIPIENT_nameDef] dick was enveloped by [INITIATOR_nameDef] [INITIATOR_possessive] tail.
+
+
+
+
+
+ SubSuccubusTail_Tailjob_RP
+
+
+
sent-> [RECIPIENT_nameDef] gave [INITIATOR_nameDef] a tailjob.
+
+
+
+
+
+ SubSuccubusTail_Vaginal_RP
+
+
+
sent-> [RECIPIENT_nameDef] [RECIPIENT_possessive] tail was vaginally inserted into [INITIATOR_nameDef].
+
+
+
+
+
+ SubSuccubusTail_Anal_RP
+
+
+
sent-> [RECIPIENT_nameDef] [RECIPIENT_possessive] tail was anally inserted into [INITIATOR_nameDef].
+
+
+
+
+
+
+ SubSuccubusTail_Envelop_RP
+
+
+
sent-> [INITIATOR_nameDef] dick was enveloped by [RECIPIENT_nameDef] [RECIPIENT_possessive] tail.
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/ThinkTreeDefs/ThinkTrees_LifeForce.xml b/Common/Defs/ThinkTreeDefs/ThinkTrees_LifeForce.xml
new file mode 100644
index 0000000..574fe0f
--- /dev/null
+++ b/Common/Defs/ThinkTreeDefs/ThinkTrees_LifeForce.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+ SuccubusGetLifeForce
+ Humanlike_PostMain
+ 14
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/ThoughtDefs/Thoughts_Disease.xml b/Common/Defs/ThoughtDefs/Thoughts_Disease.xml
new file mode 100644
index 0000000..8997a52
--- /dev/null
+++ b/Common/Defs/ThoughtDefs/Thoughts_Disease.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+ rjw_genes_appealing_cock
+ Thought_SituationalSocial
+ RJW_Genes.ThoughtWorker_SizeBlinded_Social
+ true
+
+
+
+
+ I don't remember how or why, but I violated someone. It felt good in the moment, but it felt so wrong afterward. My cravings from my implant are just too strong!
+ -5
+
+
+
+
\ No newline at end of file
diff --git a/Common/Defs/ThoughtDefs/Thoughts_Special.xml b/Common/Defs/ThoughtDefs/Thoughts_Special.xml
new file mode 100644
index 0000000..5620ca9
--- /dev/null
+++ b/Common/Defs/ThoughtDefs/Thoughts_Special.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ rjw_genes_pheromone_carrier_nearby
+ Thought_SituationalSocial
+ RJW_Genes.ThoughtWorker_Aphrodisiac_Pheromones_Social
+
+
+
+ {0} has a special vibe, we should hang out more often.
+ +3
+
Succubi and Incubi can spawn at a rare event when a horny pawn is sleeping alone in the night.
+
+
Cumazones need to regularly bite of cocks. This hunger can be stilled by animals - but they will need much more this way!
+
+
Succubi drain Fertilin through sex. The drained pawn will give less Fertilin in consequent acts until they are recovered.
+
+
Incubi 'tap' pawns they have sex with to gain fertilin. Incubi cannot gain further Fertilin this way until the pawn is fully recovered.
+
+
The Xenotypes added by RJW_Genes require a lot of human resources - have yourself a big colony or lots of prisoners before you keep their company!
+
+
Succubi receive their fertilin from cum. Make sure to have enough juice around to keep them happy.
+
+
The gene 'cumeater' allows you to drain cumflation by cunnilingus. ... Cool, huh?
+
+
Some animals carry rare genes - you can try to breed them and create your own super-hybrids! (No warranty provided for cat girls or genetic waste)
+
+
The Settings for Animal-Gene Inheritance are distributed between RJW-Pregnancy-Settings and their own Mod-Options.
+
+
Children born by pawns with the `Fertile Anus` gene might be bullied at school, but they can still live a fulfilling and happy life.
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Languages/English/Keyed/Bestiality.xml b/Common/Languages/English/Keyed/Bestiality.xml
new file mode 100644
index 0000000..e6edf59
--- /dev/null
+++ b/Common/Languages/English/Keyed/Bestiality.xml
@@ -0,0 +1,4 @@
+
+
+ animal-hybrid
+
diff --git a/Common/Languages/English/Keyed/Lifeforce.xml b/Common/Languages/English/Keyed/Lifeforce.xml
new file mode 100644
index 0000000..16ce67a
--- /dev/null
+++ b/Common/Languages/English/Keyed/Lifeforce.xml
@@ -0,0 +1,20 @@
+
+
+
+ Pawn doesn't have required fertilin gene.
+ Not enough fertilin to cast.
+ This happened because of low fertilin.
+
+ Low fertilin
+ A colonist has low fertilin. At this point they are becoming desperate enough to consider rape and bestiality to obtain fertilin (if they didn't already). At zero fertilin they will lose all sense and start raping randomly
+
+
+
+ {0} has fed enough on your colonists and will now leave.
+
+ Dirty dreams
+ The dirty dreams of your colonists have attracted succubi.\n\nThey will hang around for a couple of days trying to seduce your colonists. They may decide to join your colony, if they are impressed by your colonists's sexual prowess.
+
+ Guest Joins
+ {0} enjoys it here and has decided to stay.
+
diff --git a/Common/Languages/English/Keyed/Mod_Settings.xml b/Common/Languages/English/Keyed/Mod_Settings.xml
new file mode 100644
index 0000000..cf320c9
--- /dev/null
+++ b/Common/Languages/English/Keyed/Mod_Settings.xml
@@ -0,0 +1,40 @@
+
+
+ Genitalia resizing age:
+ years
+ At this age (in biological years) any resizing gene will be applied. This is done to prevent changes and issues related to genitalia changing in the pawns growth, but also for 'ethics'.
+
+ Fertilin-Gain from Animals:
+ % of fertilin gained (compared to human-baseline).
+
+ Sexdemon Visits
+ If enabled, incubi and succubi can spawn in through an event.
+ Size matters
+ Incubi and succubi will consider size/tightness of partners genital for deciding if they want to join
+ Sexdemon groups
+ Multiple sexdemons can spawn during a event
+ Succubi
+ Allow Succubi to spawn through this event
+ Incubi
+ Allow Incubi to spawn through this event
+
+ Regret Stealing Love
+ If off, pawns will not get bad thoughts for seduction.
+
+ Animal-Mating GenitalCheck
+ If on, only animals that 'can rape' will be engaging in bestiality after being hit by a animal mating pulse. This usually means that only male animals will start breeding.
+
+ Genetic STDS
+ Genetic STD Spread
+ If checked, certain Genes will spread on sex.
+ Genetic STDs as Endogenes
+ If checked, genetic diseases will be added as Endogenes. Otherwise they are added as Xenogenes.
+ Genetic STDs on penetrative-sex only
+ If checked, genetic STDs are only spread on penetrative sex. Otherwise, any sextype is considered for spread.
+
+ generous-donor cheatmode
+ When enabled, pawns with the 'generous donor' are not drained and not fertilin exhausted. Hence they can fuel succubi and incubi non-stop. This makes them drastically easier to keep, and you should not do it.
+
+ detailed-debug
+ Adds detailed information to the log about interactions and genes.
+
diff --git a/Common/Languages/English/Keyed/Mod_Settings_AnimalGeneInheritance.xml b/Common/Languages/English/Keyed/Mod_Settings_AnimalGeneInheritance.xml
new file mode 100644
index 0000000..bb7012d
--- /dev/null
+++ b/Common/Languages/English/Keyed/Mod_Settings_AnimalGeneInheritance.xml
@@ -0,0 +1,18 @@
+
+
+
+ enabled
+ If toggled, Animal Pregnancies will try inherit genes.
+
+
+
+
+ genes as xenogenes
+ If toggled on, animal genes will be added as xenogenes.
+
+ enable VE genetics hybridation
+ If enabled and if you have VE genetics it will enable the hybridation system.
+
+
+
+
diff --git a/Common/Languages/English/Keyed/StatsReports.xml b/Common/Languages/English/Keyed/StatsReports.xml
new file mode 100644
index 0000000..715bccb
--- /dev/null
+++ b/Common/Languages/English/Keyed/StatsReports.xml
@@ -0,0 +1,8 @@
+
+
+
+ Pawn doesn't have any children.
+ Pawn has a decent amount of children.
+ Pawn has a lot of children.
+
+
diff --git a/Common/Patches/Genes/Patch_Highmates.xml b/Common/Patches/Genes/Patch_Highmates.xml
new file mode 100644
index 0000000..47cd747
--- /dev/null
+++ b/Common/Patches/Genes/Patch_Highmates.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ Defs/XenotypeDef[defName="BS_Jotun"
+ or defName="BS_FrostJotun"
+ or defName="BS_FireJotun"
+ or defName="BS_Surtr"
+ or defName="BS_Ymir"
+ or defName="BS_Half_Jotun"
+ ]/genes
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Patches/Xenotypes/PatchBSSlimes.xml b/Common/Patches/Xenotypes/PatchBSSlimes.xml
new file mode 100644
index 0000000..fea02c8
--- /dev/null
+++ b/Common/Patches/Xenotypes/PatchBSSlimes.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
Big and Small - Slimes
+
+
+
+
+ Defs/XenotypeDef[defName="BS_GreenSlime"
+ or defName="BS_PinkSlime"
+ or defName="BS_FrostSlime"
+ or defName="BS_LavaSlime"
+ or defName="BS_EmperorSlime"
+ or defName="BS_ElixirSlime"
+ or defName="BS_ToxicSludge"
+ or defName="BS_BananaSplitSlime"
+ ]/genes
+
+
+ Defs/XenotypeDef[defName="VU_Nosferatu" or defName="VU_Dracul_Feral"]/genes
+
+
rjw_genes_demonic_genitalia
+
rjw_genes_no_sex_need
+
+
+
+ Defs/XenotypeDef[defName="VU_Dracul_Spawn"
+ or defName="VU_Dracul"
+ or defName="VU_Dracul_Mature"
+ or defName="VU_Dracul_Progenitor"
+ ]/genes
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Textures/Genes/Icons/Animal_Mating_Call.png b/Common/Textures/Genes/Icons/Animal_Mating_Call.png
new file mode 100644
index 0000000..c8ff964
Binary files /dev/null and b/Common/Textures/Genes/Icons/Animal_Mating_Call.png differ
diff --git a/Common/Textures/Genes/Icons/Big_Breasts.dds b/Common/Textures/Genes/Icons/Big_Breasts.dds
new file mode 100644
index 0000000..8f1c0f1
Binary files /dev/null and b/Common/Textures/Genes/Icons/Big_Breasts.dds differ
diff --git a/Common/Textures/Genes/Icons/Big_Breasts.png b/Common/Textures/Genes/Icons/Big_Breasts.png
index 904613e..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.dds b/Common/Textures/Genes/Icons/Big_Male_Genitalia.dds
new file mode 100644
index 0000000..30b1cbc
Binary files /dev/null and b/Common/Textures/Genes/Icons/Big_Male_Genitalia.dds differ
diff --git a/Common/Textures/Genes/Icons/Big_Male_Genitalia.png b/Common/Textures/Genes/Icons/Big_Male_Genitalia.png
index ed4810d..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/Bonus_Cum.png b/Common/Textures/Genes/Icons/Bonus_Cum.png
deleted file mode 100644
index e6c51a4..0000000
Binary files a/Common/Textures/Genes/Icons/Bonus_Cum.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Cocoon.dds b/Common/Textures/Genes/Icons/Cocoon.dds
new file mode 100644
index 0000000..23d11dc
Binary files /dev/null and b/Common/Textures/Genes/Icons/Cocoon.dds differ
diff --git a/Common/Textures/Genes/Icons/Cocoon.png b/Common/Textures/Genes/Icons/Cocoon.png
new file mode 100644
index 0000000..4e62420
Binary files /dev/null and b/Common/Textures/Genes/Icons/Cocoon.png differ
diff --git a/Common/Textures/Genes/Icons/Cum-Base.dds b/Common/Textures/Genes/Icons/Cum-Base.dds
new file mode 100644
index 0000000..bf47dab
Binary files /dev/null and b/Common/Textures/Genes/Icons/Cum-Base.dds differ
diff --git a/Common/Textures/Genes/Icons/Cum-Base.png b/Common/Textures/Genes/Icons/Cum-Base.png
new file mode 100644
index 0000000..05ec22a
Binary files /dev/null and b/Common/Textures/Genes/Icons/Cum-Base.png differ
diff --git a/Common/Textures/Genes/Icons/Cumflation.dds b/Common/Textures/Genes/Icons/Cumflation.dds
new file mode 100644
index 0000000..01c2ff3
Binary files /dev/null and b/Common/Textures/Genes/Icons/Cumflation.dds differ
diff --git a/Common/Textures/Genes/Icons/Cumflation_Immunity.dds b/Common/Textures/Genes/Icons/Cumflation_Immunity.dds
new file mode 100644
index 0000000..c587855
Binary files /dev/null and b/Common/Textures/Genes/Icons/Cumflation_Immunity.dds differ
diff --git a/Common/Textures/Genes/Icons/Cumflation_Immunity.png b/Common/Textures/Genes/Icons/Cumflation_Immunity.png
index 643e0bf..40b40ad 100644
Binary files a/Common/Textures/Genes/Icons/Cumflation_Immunity.png and b/Common/Textures/Genes/Icons/Cumflation_Immunity.png differ
diff --git a/Common/Textures/Genes/Icons/Drone.dds b/Common/Textures/Genes/Icons/Drone.dds
new file mode 100644
index 0000000..ee130a6
Binary files /dev/null and b/Common/Textures/Genes/Icons/Drone.dds differ
diff --git a/Common/Textures/Genes/Icons/Drone.png b/Common/Textures/Genes/Icons/Drone.png
new file mode 100644
index 0000000..a631565
Binary files /dev/null and b/Common/Textures/Genes/Icons/Drone.png differ
diff --git a/Common/Textures/Genes/Icons/Egg.dds b/Common/Textures/Genes/Icons/Egg.dds
new file mode 100644
index 0000000..0b2b723
Binary files /dev/null and b/Common/Textures/Genes/Icons/Egg.dds differ
diff --git a/Common/Textures/Genes/Icons/Egg.png b/Common/Textures/Genes/Icons/Egg.png
new file mode 100644
index 0000000..81b16bd
Binary files /dev/null and b/Common/Textures/Genes/Icons/Egg.png differ
diff --git a/Common/Textures/Genes/Icons/Elasticity.dds b/Common/Textures/Genes/Icons/Elasticity.dds
new file mode 100644
index 0000000..e0f35a1
Binary files /dev/null and b/Common/Textures/Genes/Icons/Elasticity.dds differ
diff --git a/Common/Textures/Genes/Icons/Empty.dds b/Common/Textures/Genes/Icons/Empty.dds
new file mode 100644
index 0000000..7f12134
Binary files /dev/null and b/Common/Textures/Genes/Icons/Empty.dds differ
diff --git a/Common/Textures/Genes/Icons/Extra_Anus.dds b/Common/Textures/Genes/Icons/Extra_Anus.dds
new file mode 100644
index 0000000..c5cb1ac
Binary files /dev/null and b/Common/Textures/Genes/Icons/Extra_Anus.dds differ
diff --git a/Common/Textures/Genes/Icons/Extra_Anus.png b/Common/Textures/Genes/Icons/Extra_Anus.png
index 1075bbd..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.dds b/Common/Textures/Genes/Icons/Extra_Breasts.dds
new file mode 100644
index 0000000..dc51d0f
Binary files /dev/null and b/Common/Textures/Genes/Icons/Extra_Breasts.dds differ
diff --git a/Common/Textures/Genes/Icons/Extra_Breasts.png b/Common/Textures/Genes/Icons/Extra_Breasts.png
index f2c470e..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/Extra_Vagina.dds b/Common/Textures/Genes/Icons/Extra_Vagina.dds
new file mode 100644
index 0000000..846c8f5
Binary files /dev/null and b/Common/Textures/Genes/Icons/Extra_Vagina.dds differ
diff --git a/Common/Textures/Genes/Icons/Extra_Vagina.png b/Common/Textures/Genes/Icons/Extra_Vagina.png
new file mode 100644
index 0000000..12bb91a
Binary files /dev/null and b/Common/Textures/Genes/Icons/Extra_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Female_Only.dds b/Common/Textures/Genes/Icons/Female_Only.dds
new file mode 100644
index 0000000..c1d1fd1
Binary files /dev/null and b/Common/Textures/Genes/Icons/Female_Only.dds differ
diff --git a/Common/Textures/Genes/Icons/female_only.png b/Common/Textures/Genes/Icons/Female_Only.png
similarity index 100%
rename from Common/Textures/Genes/Icons/female_only.png
rename to Common/Textures/Genes/Icons/Female_Only.png
diff --git a/Common/Textures/Genes/Icons/Fertile_anus.dds b/Common/Textures/Genes/Icons/Fertile_anus.dds
new file mode 100644
index 0000000..bd3dccc
Binary files /dev/null and b/Common/Textures/Genes/Icons/Fertile_anus.dds differ
diff --git a/Common/Textures/Genes/Icons/Fertile_anus.png b/Common/Textures/Genes/Icons/Fertile_anus.png
new file mode 100644
index 0000000..6a62da8
Binary files /dev/null and b/Common/Textures/Genes/Icons/Fertile_anus.png differ
diff --git a/Common/Textures/Genes/Icons/FertilinAlt.dds b/Common/Textures/Genes/Icons/FertilinAlt.dds
new file mode 100644
index 0000000..acb64e0
Binary files /dev/null and b/Common/Textures/Genes/Icons/FertilinAlt.dds differ
diff --git a/Common/Textures/Genes/Icons/FertilinAlt.png b/Common/Textures/Genes/Icons/FertilinAlt.png
new file mode 100644
index 0000000..f89bc2d
Binary files /dev/null and b/Common/Textures/Genes/Icons/FertilinAlt.png differ
diff --git a/Common/Textures/Genes/Icons/FertilinDrainAlt.dds b/Common/Textures/Genes/Icons/FertilinDrainAlt.dds
new file mode 100644
index 0000000..b078bb5
Binary files /dev/null and b/Common/Textures/Genes/Icons/FertilinDrainAlt.dds differ
diff --git a/Common/Textures/Genes/Icons/FertilinDrainAlt.png b/Common/Textures/Genes/Icons/FertilinDrainAlt.png
new file mode 100644
index 0000000..adb198b
Binary files /dev/null and b/Common/Textures/Genes/Icons/FertilinDrainAlt.png differ
diff --git a/Common/Textures/Genes/Icons/Fervent_Ovipositor.dds b/Common/Textures/Genes/Icons/Fervent_Ovipositor.dds
new file mode 100644
index 0000000..784801e
Binary files /dev/null and b/Common/Textures/Genes/Icons/Fervent_Ovipositor.dds differ
diff --git a/Common/Textures/Genes/Icons/Fervent_Ovipositor.png b/Common/Textures/Genes/Icons/Fervent_Ovipositor.png
new file mode 100644
index 0000000..b9cc33e
Binary files /dev/null and b/Common/Textures/Genes/Icons/Fervent_Ovipositor.png differ
diff --git a/Common/Textures/Genes/Icons/FireLeaves.png b/Common/Textures/Genes/Icons/FireLeaves.png
new file mode 100644
index 0000000..4f1b247
Binary files /dev/null and b/Common/Textures/Genes/Icons/FireLeaves.png differ
diff --git a/Common/Textures/Genes/Icons/FleshPurity.png b/Common/Textures/Genes/Icons/FleshPurity.png
new file mode 100644
index 0000000..0843812
Binary files /dev/null and b/Common/Textures/Genes/Icons/FleshPurity.png differ
diff --git a/Common/Textures/Genes/Icons/Futa.dds b/Common/Textures/Genes/Icons/Futa.dds
new file mode 100644
index 0000000..dfd7fcb
Binary files /dev/null and b/Common/Textures/Genes/Icons/Futa.dds differ
diff --git a/Common/Textures/Genes/Icons/Gene_LitteredBirths.dds b/Common/Textures/Genes/Icons/Gene_LitteredBirths.dds
new file mode 100644
index 0000000..ebf7069
Binary files /dev/null and b/Common/Textures/Genes/Icons/Gene_LitteredBirths.dds differ
diff --git a/Common/Textures/Genes/Icons/Gene_LitteredBirths.png b/Common/Textures/Genes/Icons/Gene_LitteredBirths.png
new file mode 100644
index 0000000..5b5a09e
Binary files /dev/null and b/Common/Textures/Genes/Icons/Gene_LitteredBirths.png differ
diff --git a/Common/Textures/Genes/Icons/Generous_Donor.dds b/Common/Textures/Genes/Icons/Generous_Donor.dds
new file mode 100644
index 0000000..b6a8cde
Binary files /dev/null and b/Common/Textures/Genes/Icons/Generous_Donor.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Canine.dds b/Common/Textures/Genes/Icons/Genitalia_Canine.dds
new file mode 100644
index 0000000..deef5dd
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_Canine.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Canine.png b/Common/Textures/Genes/Icons/Genitalia_Canine.png
index 84df9d2..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_Canine_2.png b/Common/Textures/Genes/Icons/Genitalia_Canine_2.png
deleted file mode 100644
index a9d6c1d..0000000
Binary files a/Common/Textures/Genes/Icons/Genitalia_Canine_2.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Demon.dds b/Common/Textures/Genes/Icons/Genitalia_Demon.dds
new file mode 100644
index 0000000..1745c32
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_Demon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Demon.png b/Common/Textures/Genes/Icons/Genitalia_Demon.png
index 7831b4d..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_Draconic.dds b/Common/Textures/Genes/Icons/Genitalia_Draconic.dds
new file mode 100644
index 0000000..abefb5e
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_Draconic.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Draconic.png b/Common/Textures/Genes/Icons/Genitalia_Draconic.png
index cb763d6..7717d23 100644
Binary files a/Common/Textures/Genes/Icons/Genitalia_Draconic.png and b/Common/Textures/Genes/Icons/Genitalia_Draconic.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Equine.dds b/Common/Textures/Genes/Icons/Genitalia_Equine.dds
new file mode 100644
index 0000000..a41f863
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_Equine.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Equine.png b/Common/Textures/Genes/Icons/Genitalia_Equine.png
index 51c7c1c..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/Genitalia_Feline.dds b/Common/Textures/Genes/Icons/Genitalia_Feline.dds
new file mode 100644
index 0000000..b2bf6e8
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_Feline.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Feline.png b/Common/Textures/Genes/Icons/Genitalia_Feline.png
index c03cc27..8f5b4d7 100644
Binary files a/Common/Textures/Genes/Icons/Genitalia_Feline.png and b/Common/Textures/Genes/Icons/Genitalia_Feline.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Insect.png b/Common/Textures/Genes/Icons/Genitalia_Insect.png
deleted file mode 100644
index e71cabe..0000000
Binary files a/Common/Textures/Genes/Icons/Genitalia_Insect.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Slime.png b/Common/Textures/Genes/Icons/Genitalia_Slime.png
deleted file mode 100644
index ee7ae69..0000000
Binary files a/Common/Textures/Genes/Icons/Genitalia_Slime.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_alien_icon.dds b/Common/Textures/Genes/Icons/Genitalia_alien_icon.dds
new file mode 100644
index 0000000..c04c5a0
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_alien_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_alien_icon.png b/Common/Textures/Genes/Icons/Genitalia_alien_icon.png
new file mode 100644
index 0000000..633ed83
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_alien_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_croc_icon.dds b/Common/Textures/Genes/Icons/Genitalia_croc_icon.dds
new file mode 100644
index 0000000..feb17c9
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_croc_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_croc_icon.png b/Common/Textures/Genes/Icons/Genitalia_croc_icon.png
new file mode 100644
index 0000000..569c1e7
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_croc_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_ghost_icon.dds b/Common/Textures/Genes/Icons/Genitalia_ghost_icon.dds
new file mode 100644
index 0000000..2f95e85
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_ghost_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_ghost_icon.png b/Common/Textures/Genes/Icons/Genitalia_ghost_icon.png
new file mode 100644
index 0000000..7c7ca9d
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_ghost_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_hemi_icon.dds b/Common/Textures/Genes/Icons/Genitalia_hemi_icon.dds
new file mode 100644
index 0000000..3ac1a44
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_hemi_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_hemi_icon.png b/Common/Textures/Genes/Icons/Genitalia_hemi_icon.png
new file mode 100644
index 0000000..e59cfec
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_hemi_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_human.dds b/Common/Textures/Genes/Icons/Genitalia_human.dds
new file mode 100644
index 0000000..f0a502c
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_human.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_human.png b/Common/Textures/Genes/Icons/Genitalia_human.png
new file mode 100644
index 0000000..c16c4ea
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_human.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_marine_icon.dds b/Common/Textures/Genes/Icons/Genitalia_marine_icon.dds
new file mode 100644
index 0000000..a0ecbba
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_marine_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_marine_icon.png b/Common/Textures/Genes/Icons/Genitalia_marine_icon.png
new file mode 100644
index 0000000..28dc8a3
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_marine_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_necro_icon.dds b/Common/Textures/Genes/Icons/Genitalia_necro_icon.dds
new file mode 100644
index 0000000..f9709d8
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_necro_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_necro_icon.png b/Common/Textures/Genes/Icons/Genitalia_necro_icon.png
new file mode 100644
index 0000000..378d181
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_necro_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_orc_icon.dds b/Common/Textures/Genes/Icons/Genitalia_orc_icon.dds
new file mode 100644
index 0000000..4c6f3ab
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_orc_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_orc_icon.png b/Common/Textures/Genes/Icons/Genitalia_orc_icon.png
new file mode 100644
index 0000000..c615f70
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_orc_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_racoon_icon.dds b/Common/Textures/Genes/Icons/Genitalia_racoon_icon.dds
new file mode 100644
index 0000000..2ea8f28
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_racoon_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_racoon_icon.png b/Common/Textures/Genes/Icons/Genitalia_racoon_icon.png
new file mode 100644
index 0000000..13c0a5a
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_racoon_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_screw_icon.dds b/Common/Textures/Genes/Icons/Genitalia_screw_icon.dds
new file mode 100644
index 0000000..d9c0e92
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_screw_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_screw_icon.png b/Common/Textures/Genes/Icons/Genitalia_screw_icon.png
new file mode 100644
index 0000000..c50c114
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_screw_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_tentacle_icon.dds b/Common/Textures/Genes/Icons/Genitalia_tentacle_icon.dds
new file mode 100644
index 0000000..1840c61
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_tentacle_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_tentacle_icon.png b/Common/Textures/Genes/Icons/Genitalia_tentacle_icon.png
new file mode 100644
index 0000000..41e8331
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_tentacle_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_thin_icon.dds b/Common/Textures/Genes/Icons/Genitalia_thin_icon.dds
new file mode 100644
index 0000000..a45f899
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_thin_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_thin_icon.png b/Common/Textures/Genes/Icons/Genitalia_thin_icon.png
new file mode 100644
index 0000000..2517a47
Binary files /dev/null and b/Common/Textures/Genes/Icons/Genitalia_thin_icon.png differ
diff --git a/Common/Textures/Genes/Icons/Healpussy.dds b/Common/Textures/Genes/Icons/Healpussy.dds
new file mode 100644
index 0000000..aa1ec00
Binary files /dev/null and b/Common/Textures/Genes/Icons/Healpussy.dds differ
diff --git a/Common/Textures/Genes/Icons/Healpussy.png b/Common/Textures/Genes/Icons/Healpussy.png
new file mode 100644
index 0000000..46a11a3
Binary files /dev/null and b/Common/Textures/Genes/Icons/Healpussy.png differ
diff --git a/Common/Textures/Genes/Icons/Hypersexual.dds b/Common/Textures/Genes/Icons/Hypersexual.dds
new file mode 100644
index 0000000..b36397a
Binary files /dev/null and b/Common/Textures/Genes/Icons/Hypersexual.dds differ
diff --git a/Common/Textures/Genes/Icons/Insect_Breeder.dds b/Common/Textures/Genes/Icons/Insect_Breeder.dds
new file mode 100644
index 0000000..85c94eb
Binary files /dev/null and b/Common/Textures/Genes/Icons/Insect_Breeder.dds differ
diff --git a/Common/Textures/Genes/Icons/Insect_Breeder.png b/Common/Textures/Genes/Icons/Insect_Breeder.png
new file mode 100644
index 0000000..5315179
Binary files /dev/null and b/Common/Textures/Genes/Icons/Insect_Breeder.png differ
diff --git a/Common/Textures/Genes/Icons/Loose_Anus.dds b/Common/Textures/Genes/Icons/Loose_Anus.dds
new file mode 100644
index 0000000..d078f04
Binary files /dev/null and b/Common/Textures/Genes/Icons/Loose_Anus.dds differ
diff --git a/Common/Textures/Genes/Icons/Loose_Anus.png b/Common/Textures/Genes/Icons/Loose_Anus.png
index c96dec3..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/Loose_Female_Genitalia.png b/Common/Textures/Genes/Icons/Loose_Female_Genitalia.png
deleted file mode 100644
index 63b6a9c..0000000
Binary files a/Common/Textures/Genes/Icons/Loose_Female_Genitalia.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Loose_Vagina.dds b/Common/Textures/Genes/Icons/Loose_Vagina.dds
new file mode 100644
index 0000000..714af26
Binary files /dev/null and b/Common/Textures/Genes/Icons/Loose_Vagina.dds differ
diff --git a/Common/Textures/Genes/Icons/Loose_Vagina.png b/Common/Textures/Genes/Icons/Loose_Vagina.png
new file mode 100644
index 0000000..57a4706
Binary files /dev/null and b/Common/Textures/Genes/Icons/Loose_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Loyalty.dds b/Common/Textures/Genes/Icons/Loyalty.dds
new file mode 100644
index 0000000..1ef4268
Binary files /dev/null and b/Common/Textures/Genes/Icons/Loyalty.dds differ
diff --git a/Common/Textures/Genes/Icons/Loyalty.png b/Common/Textures/Genes/Icons/Loyalty.png
new file mode 100644
index 0000000..8ac3c4c
Binary files /dev/null and b/Common/Textures/Genes/Icons/Loyalty.png differ
diff --git a/Common/Textures/Genes/Icons/Male_Only.dds b/Common/Textures/Genes/Icons/Male_Only.dds
new file mode 100644
index 0000000..8387f22
Binary files /dev/null and b/Common/Textures/Genes/Icons/Male_Only.dds differ
diff --git a/Common/Textures/Genes/Icons/male_only.png b/Common/Textures/Genes/Icons/Male_Only.png
similarity index 100%
rename from Common/Textures/Genes/Icons/male_only.png
rename to Common/Textures/Genes/Icons/Male_Only.png
diff --git a/Common/Textures/Genes/Icons/Mating_Call_2.png b/Common/Textures/Genes/Icons/Mating_Call_2.png
new file mode 100644
index 0000000..275e6dc
Binary files /dev/null and b/Common/Textures/Genes/Icons/Mating_Call_2.png differ
diff --git a/Common/Textures/Genes/Icons/More_Egg_Space.png b/Common/Textures/Genes/Icons/More_Egg_Space.png
deleted file mode 100644
index 35fbcb3..0000000
Binary files a/Common/Textures/Genes/Icons/More_Egg_Space.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Much_Bonus_Cum.png b/Common/Textures/Genes/Icons/Much_Bonus_Cum.png
deleted file mode 100644
index d512725..0000000
Binary files a/Common/Textures/Genes/Icons/Much_Bonus_Cum.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Much_Cum.dds b/Common/Textures/Genes/Icons/Much_Cum.dds
new file mode 100644
index 0000000..c7974f4
Binary files /dev/null and b/Common/Textures/Genes/Icons/Much_Cum.dds differ
diff --git a/Common/Textures/Genes/Icons/Much_Cum.png b/Common/Textures/Genes/Icons/Much_Cum.png
new file mode 100644
index 0000000..21a9a17
Binary files /dev/null and b/Common/Textures/Genes/Icons/Much_Cum.png differ
diff --git a/Common/Textures/Genes/Icons/Necrophile.dds b/Common/Textures/Genes/Icons/Necrophile.dds
new file mode 100644
index 0000000..0239a1e
Binary files /dev/null and b/Common/Textures/Genes/Icons/Necrophile.dds differ
diff --git a/Common/Textures/Genes/Icons/No_Anus.dds b/Common/Textures/Genes/Icons/No_Anus.dds
new file mode 100644
index 0000000..c829f90
Binary files /dev/null and b/Common/Textures/Genes/Icons/No_Anus.dds differ
diff --git a/Common/Textures/Genes/Icons/No_Anus.png b/Common/Textures/Genes/Icons/No_Anus.png
index f5a9a03..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.dds b/Common/Textures/Genes/Icons/No_Breasts.dds
new file mode 100644
index 0000000..c4b6ad7
Binary files /dev/null and b/Common/Textures/Genes/Icons/No_Breasts.dds differ
diff --git a/Common/Textures/Genes/Icons/No_Breasts.png b/Common/Textures/Genes/Icons/No_Breasts.png
index 28729b8..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_Cum.dds b/Common/Textures/Genes/Icons/No_Cum.dds
new file mode 100644
index 0000000..f21f6bb
Binary files /dev/null and b/Common/Textures/Genes/Icons/No_Cum.dds differ
diff --git a/Common/Textures/Genes/Icons/No_Cum.png b/Common/Textures/Genes/Icons/No_Cum.png
index 2084b5e..a7964f0 100644
Binary files a/Common/Textures/Genes/Icons/No_Cum.png and b/Common/Textures/Genes/Icons/No_Cum.png differ
diff --git a/Common/Textures/Genes/Icons/No_Female_Genitalia.png b/Common/Textures/Genes/Icons/No_Female_Genitalia.png
deleted file mode 100644
index 9405ce7..0000000
Binary files a/Common/Textures/Genes/Icons/No_Female_Genitalia.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/No_Male_Genitalia.dds b/Common/Textures/Genes/Icons/No_Male_Genitalia.dds
new file mode 100644
index 0000000..8beee67
Binary files /dev/null and b/Common/Textures/Genes/Icons/No_Male_Genitalia.dds differ
diff --git a/Common/Textures/Genes/Icons/No_Male_Genitalia.png b/Common/Textures/Genes/Icons/No_Male_Genitalia.png
index ce1fa4e..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/No_Vagina.dds b/Common/Textures/Genes/Icons/No_Vagina.dds
new file mode 100644
index 0000000..4ff0383
Binary files /dev/null and b/Common/Textures/Genes/Icons/No_Vagina.dds differ
diff --git a/Common/Textures/Genes/Icons/No_Vagina.png b/Common/Textures/Genes/Icons/No_Vagina.png
new file mode 100644
index 0000000..a4f47ee
Binary files /dev/null and b/Common/Textures/Genes/Icons/No_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Ovipositor_Genitalia.dds b/Common/Textures/Genes/Icons/Ovipositor_Genitalia.dds
new file mode 100644
index 0000000..7e3a1af
Binary files /dev/null and b/Common/Textures/Genes/Icons/Ovipositor_Genitalia.dds differ
diff --git a/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png b/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png
new file mode 100644
index 0000000..97421e1
Binary files /dev/null and b/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/Paralysing_Kiss.dds b/Common/Textures/Genes/Icons/Paralysing_Kiss.dds
new file mode 100644
index 0000000..7ec2664
Binary files /dev/null and b/Common/Textures/Genes/Icons/Paralysing_Kiss.dds differ
diff --git a/Common/Textures/Genes/Icons/Paralysing_Kiss.png b/Common/Textures/Genes/Icons/Paralysing_Kiss.png
new file mode 100644
index 0000000..20c4fd5
Binary files /dev/null and b/Common/Textures/Genes/Icons/Paralysing_Kiss.png differ
diff --git a/Common/Textures/Genes/Icons/Pheromone.dds b/Common/Textures/Genes/Icons/Pheromone.dds
new file mode 100644
index 0000000..06738ed
Binary files /dev/null and b/Common/Textures/Genes/Icons/Pheromone.dds differ
diff --git a/Common/Textures/Genes/Icons/Pheromone.png b/Common/Textures/Genes/Icons/Pheromone.png
new file mode 100644
index 0000000..342f695
Binary files /dev/null and b/Common/Textures/Genes/Icons/Pheromone.png differ
diff --git a/Common/Textures/Genes/Icons/Pheromone_Spit.png b/Common/Textures/Genes/Icons/Pheromone_Spit.png
new file mode 100644
index 0000000..743d0a3
Binary files /dev/null and b/Common/Textures/Genes/Icons/Pheromone_Spit.png differ
diff --git a/Common/Textures/Genes/Icons/Pheromones.dds b/Common/Textures/Genes/Icons/Pheromones.dds
new file mode 100644
index 0000000..a2f0394
Binary files /dev/null and b/Common/Textures/Genes/Icons/Pheromones.dds differ
diff --git a/Common/Textures/Genes/Icons/Pheromones.png b/Common/Textures/Genes/Icons/Pheromones.png
new file mode 100644
index 0000000..88a6c53
Binary files /dev/null and b/Common/Textures/Genes/Icons/Pheromones.png differ
diff --git a/Common/Textures/Genes/Icons/Placeholder.dds b/Common/Textures/Genes/Icons/Placeholder.dds
new file mode 100644
index 0000000..ce2c267
Binary files /dev/null and b/Common/Textures/Genes/Icons/Placeholder.dds differ
diff --git a/Common/Textures/Genes/Icons/Queen.dds b/Common/Textures/Genes/Icons/Queen.dds
new file mode 100644
index 0000000..ee24210
Binary files /dev/null and b/Common/Textures/Genes/Icons/Queen.dds differ
diff --git a/Common/Textures/Genes/Icons/Queen.png b/Common/Textures/Genes/Icons/Queen.png
new file mode 100644
index 0000000..b087f03
Binary files /dev/null and b/Common/Textures/Genes/Icons/Queen.png differ
diff --git a/Common/Textures/Genes/Icons/RJW-Genes_Rodent_Genitalia (Not in use now).dds b/Common/Textures/Genes/Icons/RJW-Genes_Rodent_Genitalia (Not in use now).dds
new file mode 100644
index 0000000..d554df2
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW-Genes_Rodent_Genitalia (Not in use now).dds 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
new file mode 100644
index 0000000..a15e618
Binary files /dev/null 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.dds b/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Background.dds
new file mode 100644
index 0000000..833af52
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Background.dds differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Background.png b/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Background.png
new file mode 100644
index 0000000..5d8b0e0
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Background.png differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Disease_Background.png b/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Disease_Background.png
new file mode 100644
index 0000000..c614dc9
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW_Genes_Endogene_Disease_Background.png differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_Feline_Genitalia.png b/Common/Textures/Genes/Icons/RJW_Genes_Feline_Genitalia.png
new file mode 100644
index 0000000..7b0dc9f
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW_Genes_Feline_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_Mating_Call.png b/Common/Textures/Genes/Icons/RJW_Genes_Mating_Call.png
new file mode 100644
index 0000000..1079d89
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW_Genes_Mating_Call.png differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_PheromoneSpit.png b/Common/Textures/Genes/Icons/RJW_Genes_PheromoneSpit.png
new file mode 100644
index 0000000..fc8f699
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW_Genes_PheromoneSpit.png differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_SexualTamer.png b/Common/Textures/Genes/Icons/RJW_Genes_SexualTamer.png
new file mode 100644
index 0000000..6a848c6
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW_Genes_SexualTamer.png differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_Udder.png b/Common/Textures/Genes/Icons/RJW_Genes_Udder.png
new file mode 100644
index 0000000..9a641e1
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW_Genes_Udder.png differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_Xenogene_Background.dds b/Common/Textures/Genes/Icons/RJW_Genes_Xenogene_Background.dds
new file mode 100644
index 0000000..091b63a
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW_Genes_Xenogene_Background.dds differ
diff --git a/Common/Textures/Genes/Icons/RJW_Genes_Xenogene_Background.png b/Common/Textures/Genes/Icons/RJW_Genes_Xenogene_Background.png
new file mode 100644
index 0000000..b3b359e
Binary files /dev/null and b/Common/Textures/Genes/Icons/RJW_Genes_Xenogene_Background.png differ
diff --git a/Common/Textures/Genes/Icons/Rape.dds b/Common/Textures/Genes/Icons/Rape.dds
new file mode 100644
index 0000000..fca75d7
Binary files /dev/null and b/Common/Textures/Genes/Icons/Rape.dds differ
diff --git a/Common/Textures/Genes/Icons/RoundC.png b/Common/Textures/Genes/Icons/RoundC.png
new file mode 100644
index 0000000..e2288f5
Binary files /dev/null and b/Common/Textures/Genes/Icons/RoundC.png differ
diff --git a/Common/Textures/Genes/Icons/Samples/AnimalMatingcall.psd b/Common/Textures/Genes/Icons/Samples/AnimalMatingcall.psd
new file mode 100644
index 0000000..16c084b
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/AnimalMatingcall.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/Cumflation_Immunity.psd b/Common/Textures/Genes/Icons/Samples/Cumflation_Immunity.psd
new file mode 100644
index 0000000..06e07e4
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Cumflation_Immunity.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/Gene_Fertile.png b/Common/Textures/Genes/Icons/Samples/Gene_Fertile.png
new file mode 100644
index 0000000..46abbae
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Gene_Fertile.png differ
diff --git a/Common/Textures/Genes/Icons/Samples/Gene_Inbred.png b/Common/Textures/Genes/Icons/Samples/Gene_Inbred.png
new file mode 100644
index 0000000..3d8d705
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Gene_Inbred.png differ
diff --git a/Common/Textures/Genes/Icons/Samples/Gene_MaxTemperatureLargeIncrease.png b/Common/Textures/Genes/Icons/Samples/Gene_MaxTemperatureLargeIncrease.png
new file mode 100644
index 0000000..b07b305
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Gene_MaxTemperatureLargeIncrease.png differ
diff --git a/Common/Textures/Genes/Icons/Samples/Gene_MaxTemperatureSmallIncrease копия.png b/Common/Textures/Genes/Icons/Samples/Gene_MaxTemperatureSmallIncrease копия.png
new file mode 100644
index 0000000..25ad570
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Gene_MaxTemperatureSmallIncrease копия.png differ
diff --git a/Common/Textures/Genes/Icons/Samples/Gene_PsychicBonding.png b/Common/Textures/Genes/Icons/Samples/Gene_PsychicBonding.png
new file mode 100644
index 0000000..a558928
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Gene_PsychicBonding.png differ
diff --git a/Common/Textures/Genes/Icons/Samples/Gene_PsychicallyDeaf.png b/Common/Textures/Genes/Icons/Samples/Gene_PsychicallyDeaf.png
new file mode 100644
index 0000000..9a9eb8c
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Gene_PsychicallyDeaf.png differ
diff --git a/Common/Textures/Genes/Icons/Samples/Gene_TotalHealing.png b/Common/Textures/Genes/Icons/Samples/Gene_TotalHealing.png
new file mode 100644
index 0000000..dda02fd
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Gene_TotalHealing.png differ
diff --git a/Common/Textures/Genes/Icons/Samples/Gene_TotalHealing.psd b/Common/Textures/Genes/Icons/Samples/Gene_TotalHealing.psd
new file mode 100644
index 0000000..35dadab
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Gene_TotalHealing.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/Pheromone_Spit.psd b/Common/Textures/Genes/Icons/Samples/Pheromone_Spit.psd
new file mode 100644
index 0000000..c977538
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Pheromone_Spit.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/RJW_Genes_MatingCall.psd b/Common/Textures/Genes/Icons/Samples/RJW_Genes_MatingCall.psd
new file mode 100644
index 0000000..0ac04b9
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/RJW_Genes_MatingCall.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/Sexual_Tamer.psd b/Common/Textures/Genes/Icons/Samples/Sexual_Tamer.psd
new file mode 100644
index 0000000..e85ca52
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Sexual_Tamer.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/Skill_Pheromone_Spit.psd b/Common/Textures/Genes/Icons/Samples/Skill_Pheromone_Spit.psd
new file mode 100644
index 0000000..72e02a0
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Skill_Pheromone_Spit.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/Time.png b/Common/Textures/Genes/Icons/Samples/Time.png
new file mode 100644
index 0000000..84cc532
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Time.png differ
diff --git a/Common/Textures/Genes/Icons/Samples/blocked_masturbation.psd b/Common/Textures/Genes/Icons/Samples/blocked_masturbation.psd
new file mode 100644
index 0000000..79ca75b
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/blocked_masturbation.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/disease_immunity.psd b/Common/Textures/Genes/Icons/Samples/disease_immunity.psd
new file mode 100644
index 0000000..f6a0ac3
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/disease_immunity.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/feminizer&twinkifier.psd b/Common/Textures/Genes/Icons/Samples/feminizer&twinkifier.psd
new file mode 100644
index 0000000..cfda363
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/feminizer&twinkifier.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/hardwired_progenity.psd b/Common/Textures/Genes/Icons/Samples/hardwired_progenity.psd
new file mode 100644
index 0000000..25721ce
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/hardwired_progenity.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/la-copa-menstrual-04.png b/Common/Textures/Genes/Icons/Samples/la-copa-menstrual-04.png
new file mode 100644
index 0000000..fdb0ccd
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/la-copa-menstrual-04.png differ
diff --git a/Common/Textures/Genes/Icons/Samples/living_cumbucket.psd b/Common/Textures/Genes/Icons/Samples/living_cumbucket.psd
new file mode 100644
index 0000000..85796b3
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/living_cumbucket.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/low_fertility.psd b/Common/Textures/Genes/Icons/Samples/low_fertility.psd
new file mode 100644
index 0000000..5f6af24
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/low_fertility.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/pregnancy_overwrite.psd b/Common/Textures/Genes/Icons/Samples/pregnancy_overwrite.psd
new file mode 100644
index 0000000..eaf1210
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/pregnancy_overwrite.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/rut.psd b/Common/Textures/Genes/Icons/Samples/rut.psd
new file mode 100644
index 0000000..b15bcc6
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/rut.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/sexual_genetic_swap.psd b/Common/Textures/Genes/Icons/Samples/sexual_genetic_swap.psd
new file mode 100644
index 0000000..354b409
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/sexual_genetic_swap.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/sexual_genetic_thief.psd b/Common/Textures/Genes/Icons/Samples/sexual_genetic_thief.psd
new file mode 100644
index 0000000..a2b92b2
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/sexual_genetic_thief.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/size_blinded&stretcher.psd b/Common/Textures/Genes/Icons/Samples/size_blinded&stretcher.psd
new file mode 100644
index 0000000..41faa92
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/size_blinded&stretcher.psd differ
diff --git a/Common/Textures/Genes/Icons/Samples/vulnerability.psd b/Common/Textures/Genes/Icons/Samples/vulnerability.psd
new file mode 100644
index 0000000..5fdc6aa
Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/vulnerability.psd differ
diff --git a/Common/Textures/Genes/Icons/Sexual_Tamer.png b/Common/Textures/Genes/Icons/Sexual_Tamer.png
new file mode 100644
index 0000000..ce35369
Binary files /dev/null and b/Common/Textures/Genes/Icons/Sexual_Tamer.png differ
diff --git a/Common/Textures/Genes/Icons/Slime_Genitalia.dds b/Common/Textures/Genes/Icons/Slime_Genitalia.dds
new file mode 100644
index 0000000..e473210
Binary files /dev/null and b/Common/Textures/Genes/Icons/Slime_Genitalia.dds differ
diff --git a/Common/Textures/Genes/Icons/Slime_Genitalia.png b/Common/Textures/Genes/Icons/Slime_Genitalia.png
new file mode 100644
index 0000000..91e6cd0
Binary files /dev/null and b/Common/Textures/Genes/Icons/Slime_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/Small_Breasts.dds b/Common/Textures/Genes/Icons/Small_Breasts.dds
new file mode 100644
index 0000000..fdbf4ed
Binary files /dev/null and b/Common/Textures/Genes/Icons/Small_Breasts.dds differ
diff --git a/Common/Textures/Genes/Icons/Small_Breasts.png b/Common/Textures/Genes/Icons/Small_Breasts.png
index bfae844..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.dds b/Common/Textures/Genes/Icons/Small_Male_Genitalia.dds
new file mode 100644
index 0000000..a9f85fe
Binary files /dev/null and b/Common/Textures/Genes/Icons/Small_Male_Genitalia.dds differ
diff --git a/Common/Textures/Genes/Icons/Small_Male_Genitalia.png b/Common/Textures/Genes/Icons/Small_Male_Genitalia.png
index 58aa367..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/Spelopede_Dispenser.dds b/Common/Textures/Genes/Icons/Spelopede_Dispenser.dds
new file mode 100644
index 0000000..68d12db
Binary files /dev/null and b/Common/Textures/Genes/Icons/Spelopede_Dispenser.dds differ
diff --git a/Common/Textures/Genes/Icons/Spelopede_Dispenser.png b/Common/Textures/Genes/Icons/Spelopede_Dispenser.png
new file mode 100644
index 0000000..4308892
Binary files /dev/null and b/Common/Textures/Genes/Icons/Spelopede_Dispenser.png differ
diff --git a/Common/Textures/Genes/Icons/Succubus_Tail.dds b/Common/Textures/Genes/Icons/Succubus_Tail.dds
new file mode 100644
index 0000000..068be01
Binary files /dev/null and b/Common/Textures/Genes/Icons/Succubus_Tail.dds differ
diff --git a/Common/Textures/Genes/Icons/Succubus_Tail.png b/Common/Textures/Genes/Icons/Succubus_Tail.png
new file mode 100644
index 0000000..afe26f7
Binary files /dev/null and b/Common/Textures/Genes/Icons/Succubus_Tail.png differ
diff --git a/Common/Textures/Genes/Icons/Succubus_Wings.dds b/Common/Textures/Genes/Icons/Succubus_Wings.dds
new file mode 100644
index 0000000..94bbe7e
Binary files /dev/null and b/Common/Textures/Genes/Icons/Succubus_Wings.dds differ
diff --git a/Common/Textures/Genes/Icons/Succubus_Wings.png b/Common/Textures/Genes/Icons/Succubus_Wings.png
new file mode 100644
index 0000000..62453b0
Binary files /dev/null and b/Common/Textures/Genes/Icons/Succubus_Wings.png differ
diff --git a/Common/Textures/Genes/Icons/Tight_Anus.dds b/Common/Textures/Genes/Icons/Tight_Anus.dds
new file mode 100644
index 0000000..ae0f265
Binary files /dev/null and b/Common/Textures/Genes/Icons/Tight_Anus.dds differ
diff --git a/Common/Textures/Genes/Icons/Tight_Anus.png b/Common/Textures/Genes/Icons/Tight_Anus.png
index dd355fb..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/Tight_Female_Genitalia.png b/Common/Textures/Genes/Icons/Tight_Female_Genitalia.png
deleted file mode 100644
index d0931fa..0000000
Binary files a/Common/Textures/Genes/Icons/Tight_Female_Genitalia.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Tight_Vagina.dds b/Common/Textures/Genes/Icons/Tight_Vagina.dds
new file mode 100644
index 0000000..b94f43b
Binary files /dev/null and b/Common/Textures/Genes/Icons/Tight_Vagina.dds differ
diff --git a/Common/Textures/Genes/Icons/Tight_Vagina.png b/Common/Textures/Genes/Icons/Tight_Vagina.png
new file mode 100644
index 0000000..eab0606
Binary files /dev/null and b/Common/Textures/Genes/Icons/Tight_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/TrialDefend.png b/Common/Textures/Genes/Icons/TrialDefend.png
new file mode 100644
index 0000000..1275bf2
Binary files /dev/null and b/Common/Textures/Genes/Icons/TrialDefend.png differ
diff --git a/Common/Textures/Genes/Icons/Vaginal_cum_absorption.dds b/Common/Textures/Genes/Icons/Vaginal_cum_absorption.dds
new file mode 100644
index 0000000..2cff048
Binary files /dev/null and b/Common/Textures/Genes/Icons/Vaginal_cum_absorption.dds differ
diff --git a/Common/Textures/Genes/Icons/Vaginal_cum_absorption.png b/Common/Textures/Genes/Icons/Vaginal_cum_absorption.png
new file mode 100644
index 0000000..4148bde
Binary files /dev/null and b/Common/Textures/Genes/Icons/Vaginal_cum_absorption.png differ
diff --git a/Common/Textures/Genes/Icons/Very_Much_Cum.dds b/Common/Textures/Genes/Icons/Very_Much_Cum.dds
new file mode 100644
index 0000000..76694ce
Binary files /dev/null and b/Common/Textures/Genes/Icons/Very_Much_Cum.dds differ
diff --git a/Common/Textures/Genes/Icons/Very_Much_Cum.png b/Common/Textures/Genes/Icons/Very_Much_Cum.png
new file mode 100644
index 0000000..f2fedc1
Binary files /dev/null and b/Common/Textures/Genes/Icons/Very_Much_Cum.png differ
diff --git a/Common/Textures/Genes/Icons/Vitality_Drainer.dds b/Common/Textures/Genes/Icons/Vitality_Drainer.dds
new file mode 100644
index 0000000..9f4c08f
Binary files /dev/null and b/Common/Textures/Genes/Icons/Vitality_Drainer.dds differ
diff --git a/Common/Textures/Genes/Icons/Vitality_Drainer.png b/Common/Textures/Genes/Icons/Vitality_Drainer.png
new file mode 100644
index 0000000..1de65a9
Binary files /dev/null and b/Common/Textures/Genes/Icons/Vitality_Drainer.png differ
diff --git a/Common/Textures/Genes/Icons/Worker.dds b/Common/Textures/Genes/Icons/Worker.dds
new file mode 100644
index 0000000..3bcf5b0
Binary files /dev/null and b/Common/Textures/Genes/Icons/Worker.dds differ
diff --git a/Common/Textures/Genes/Icons/Worker.png b/Common/Textures/Genes/Icons/Worker.png
new file mode 100644
index 0000000..1f4e0c8
Binary files /dev/null and b/Common/Textures/Genes/Icons/Worker.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Breeder.dds b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Breeder.dds
new file mode 100644
index 0000000..f993b7e
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Breeder.dds differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Breeder.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Breeder.png
new file mode 100644
index 0000000..9ffab2c
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Breeder.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Cumazon.dds b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Cumazon.dds
new file mode 100644
index 0000000..49bb674
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Cumazon.dds differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Cumazon.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Cumazon.png
new file mode 100644
index 0000000..8d285e5
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Cumazon.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Guard.dds b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Guard.dds
new file mode 100644
index 0000000..f0136b2
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Guard.dds differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Guard.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Guard.png
new file mode 100644
index 0000000..e831799
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Guard.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Incubus.dds b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Incubus.dds
new file mode 100644
index 0000000..29f22ed
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Incubus.dds differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Incubus.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Incubus.png
new file mode 100644
index 0000000..14d6685
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Incubus.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Queen.dds b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Queen.dds
new file mode 100644
index 0000000..d02af1d
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Queen.dds differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Queen.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Queen.png
new file mode 100644
index 0000000..9b0f425
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Queen.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Succubus.dds b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Succubus.dds
new file mode 100644
index 0000000..abb08a2
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Succubus.dds differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Succubus.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Succubus.png
new file mode 100644
index 0000000..dddb34d
Binary files /dev/null and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Succubus.png differ
diff --git a/Common/Textures/Genes/Icons/Zoophile.dds b/Common/Textures/Genes/Icons/Zoophile.dds
new file mode 100644
index 0000000..e7baa19
Binary files /dev/null and b/Common/Textures/Genes/Icons/Zoophile.dds differ
diff --git a/Common/Textures/Genes/Icons/Zoophile.png b/Common/Textures/Genes/Icons/Zoophile.png
index ed45040..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/Zoophile_2.png b/Common/Textures/Genes/Icons/Zoophile_2.png
deleted file mode 100644
index d313bcb..0000000
Binary files a/Common/Textures/Genes/Icons/Zoophile_2.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/bisexuality.png b/Common/Textures/Genes/Icons/bisexuality.png
new file mode 100644
index 0000000..e9356e8
Binary files /dev/null and b/Common/Textures/Genes/Icons/bisexuality.png differ
diff --git a/Common/Textures/Genes/Icons/blocked_masturbation.png b/Common/Textures/Genes/Icons/blocked_masturbation.png
new file mode 100644
index 0000000..f696996
Binary files /dev/null and b/Common/Textures/Genes/Icons/blocked_masturbation.png differ
diff --git a/Common/Textures/Genes/Icons/cockeater.dds b/Common/Textures/Genes/Icons/cockeater.dds
new file mode 100644
index 0000000..31ca306
Binary files /dev/null and b/Common/Textures/Genes/Icons/cockeater.dds differ
diff --git a/Common/Textures/Genes/Icons/cockeater.png b/Common/Textures/Genes/Icons/cockeater.png
new file mode 100644
index 0000000..0b60a46
Binary files /dev/null and b/Common/Textures/Genes/Icons/cockeater.png differ
diff --git a/Common/Textures/Genes/Icons/cumeater.dds b/Common/Textures/Genes/Icons/cumeater.dds
new file mode 100644
index 0000000..d7f870e
Binary files /dev/null and b/Common/Textures/Genes/Icons/cumeater.dds differ
diff --git a/Common/Textures/Genes/Icons/cumeater.png b/Common/Textures/Genes/Icons/cumeater.png
new file mode 100644
index 0000000..3150a18
Binary files /dev/null and b/Common/Textures/Genes/Icons/cumeater.png differ
diff --git a/Common/Textures/Genes/Icons/disease_immunity.png b/Common/Textures/Genes/Icons/disease_immunity.png
new file mode 100644
index 0000000..9567e1a
Binary files /dev/null and b/Common/Textures/Genes/Icons/disease_immunity.png differ
diff --git a/Common/Textures/Genes/Icons/extra_female.png b/Common/Textures/Genes/Icons/extra_female.png
deleted file mode 100644
index 1a6ae6e..0000000
Binary files a/Common/Textures/Genes/Icons/extra_female.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/extra_male.dds b/Common/Textures/Genes/Icons/extra_male.dds
new file mode 100644
index 0000000..ada5226
Binary files /dev/null and b/Common/Textures/Genes/Icons/extra_male.dds differ
diff --git a/Common/Textures/Genes/Icons/extra_male.png b/Common/Textures/Genes/Icons/extra_male.png
index 5390ecc..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/feminizer.png b/Common/Textures/Genes/Icons/feminizer.png
new file mode 100644
index 0000000..fafd7ed
Binary files /dev/null and b/Common/Textures/Genes/Icons/feminizer.png differ
diff --git a/Common/Textures/Genes/Icons/hardwired_progenity.png b/Common/Textures/Genes/Icons/hardwired_progenity.png
new file mode 100644
index 0000000..97811e3
Binary files /dev/null and b/Common/Textures/Genes/Icons/hardwired_progenity.png differ
diff --git a/Common/Textures/Genes/Icons/homosexuality.png b/Common/Textures/Genes/Icons/homosexuality.png
new file mode 100644
index 0000000..cab42c7
Binary files /dev/null and b/Common/Textures/Genes/Icons/homosexuality.png differ
diff --git a/Common/Textures/Genes/Icons/living_cumbucket.png b/Common/Textures/Genes/Icons/living_cumbucket.png
new file mode 100644
index 0000000..b79f8cc
Binary files /dev/null and b/Common/Textures/Genes/Icons/living_cumbucket.png differ
diff --git a/Common/Textures/Genes/Icons/low_fertility.png b/Common/Textures/Genes/Icons/low_fertility.png
new file mode 100644
index 0000000..0522d94
Binary files /dev/null and b/Common/Textures/Genes/Icons/low_fertility.png differ
diff --git a/Common/Textures/Genes/Icons/major_vulnerability.png b/Common/Textures/Genes/Icons/major_vulnerability.png
new file mode 100644
index 0000000..6e96a10
Binary files /dev/null and b/Common/Textures/Genes/Icons/major_vulnerability.png differ
diff --git a/Common/Textures/Genes/Icons/minor_vulnerability.png b/Common/Textures/Genes/Icons/minor_vulnerability.png
new file mode 100644
index 0000000..9a82f52
Binary files /dev/null and b/Common/Textures/Genes/Icons/minor_vulnerability.png differ
diff --git a/Common/Textures/Genes/Icons/penis_rock_icon.dds b/Common/Textures/Genes/Icons/penis_rock_icon.dds
new file mode 100644
index 0000000..22f3f5b
Binary files /dev/null and b/Common/Textures/Genes/Icons/penis_rock_icon.dds differ
diff --git a/Common/Textures/Genes/Icons/penis_rock_icon.png b/Common/Textures/Genes/Icons/penis_rock_icon.png
new file mode 100644
index 0000000..c1c1324
Binary files /dev/null and b/Common/Textures/Genes/Icons/penis_rock_icon.png differ
diff --git a/Common/Textures/Genes/Icons/pregnancy_overwrite.png b/Common/Textures/Genes/Icons/pregnancy_overwrite.png
new file mode 100644
index 0000000..9404a6c
Binary files /dev/null and b/Common/Textures/Genes/Icons/pregnancy_overwrite.png differ
diff --git a/Common/Textures/Genes/Icons/rjw_genes_lips.dds b/Common/Textures/Genes/Icons/rjw_genes_lips.dds
new file mode 100644
index 0000000..120d09a
Binary files /dev/null and b/Common/Textures/Genes/Icons/rjw_genes_lips.dds differ
diff --git a/Common/Textures/Genes/Icons/rjw_genes_lips.png b/Common/Textures/Genes/Icons/rjw_genes_lips.png
new file mode 100644
index 0000000..13062a1
Binary files /dev/null and b/Common/Textures/Genes/Icons/rjw_genes_lips.png differ
diff --git a/Common/Textures/Genes/Icons/rjw_naked_prowess.dds b/Common/Textures/Genes/Icons/rjw_naked_prowess.dds
new file mode 100644
index 0000000..5e11870
Binary files /dev/null and b/Common/Textures/Genes/Icons/rjw_naked_prowess.dds differ
diff --git a/Common/Textures/Genes/Icons/rjw_naked_prowess.png b/Common/Textures/Genes/Icons/rjw_naked_prowess.png
new file mode 100644
index 0000000..d54231c
Binary files /dev/null and b/Common/Textures/Genes/Icons/rjw_naked_prowess.png differ
diff --git a/Common/Textures/Genes/Icons/rut.png b/Common/Textures/Genes/Icons/rut.png
new file mode 100644
index 0000000..05a0d23
Binary files /dev/null and b/Common/Textures/Genes/Icons/rut.png differ
diff --git a/Common/Textures/Genes/Icons/seduce.dds b/Common/Textures/Genes/Icons/seduce.dds
new file mode 100644
index 0000000..9875559
Binary files /dev/null and b/Common/Textures/Genes/Icons/seduce.dds differ
diff --git a/Common/Textures/Genes/Icons/seduce.png b/Common/Textures/Genes/Icons/seduce.png
new file mode 100644
index 0000000..635132c
Binary files /dev/null and b/Common/Textures/Genes/Icons/seduce.png differ
diff --git a/Common/Textures/Genes/Icons/sex_curiosity.png b/Common/Textures/Genes/Icons/sex_curiosity.png
new file mode 100644
index 0000000..b5dcd7f
Binary files /dev/null and b/Common/Textures/Genes/Icons/sex_curiosity.png differ
diff --git a/Common/Textures/Genes/Icons/sex_disabled.png b/Common/Textures/Genes/Icons/sex_disabled.png
new file mode 100644
index 0000000..9ce4983
Binary files /dev/null and b/Common/Textures/Genes/Icons/sex_disabled.png differ
diff --git a/Common/Textures/Genes/Icons/sex_enabled.png b/Common/Textures/Genes/Icons/sex_enabled.png
new file mode 100644
index 0000000..86e0a6b
Binary files /dev/null and b/Common/Textures/Genes/Icons/sex_enabled.png differ
diff --git a/Common/Textures/Genes/Icons/sexual_genetic_swap.png b/Common/Textures/Genes/Icons/sexual_genetic_swap.png
new file mode 100644
index 0000000..b0407c4
Binary files /dev/null and b/Common/Textures/Genes/Icons/sexual_genetic_swap.png differ
diff --git a/Common/Textures/Genes/Icons/sexual_genetic_thief.png b/Common/Textures/Genes/Icons/sexual_genetic_thief.png
new file mode 100644
index 0000000..d871b9f
Binary files /dev/null and b/Common/Textures/Genes/Icons/sexual_genetic_thief.png differ
diff --git a/Common/Textures/Genes/Icons/size_blinded.png b/Common/Textures/Genes/Icons/size_blinded.png
new file mode 100644
index 0000000..824a00d
Binary files /dev/null and b/Common/Textures/Genes/Icons/size_blinded.png differ
diff --git a/Common/Textures/Genes/Icons/stretcher.png b/Common/Textures/Genes/Icons/stretcher.png
new file mode 100644
index 0000000..4c25049
Binary files /dev/null and b/Common/Textures/Genes/Icons/stretcher.png differ
diff --git a/Common/Textures/Genes/Icons/twinkifier.png b/Common/Textures/Genes/Icons/twinkifier.png
new file mode 100644
index 0000000..3b92f1f
Binary files /dev/null and b/Common/Textures/Genes/Icons/twinkifier.png differ
diff --git a/Common/Textures/Genes/Icons/vagina_base.dds b/Common/Textures/Genes/Icons/vagina_base.dds
new file mode 100644
index 0000000..f9a2ee2
Binary files /dev/null and b/Common/Textures/Genes/Icons/vagina_base.dds differ
diff --git a/Common/Textures/Genes/Icons/vagina_base.png b/Common/Textures/Genes/Icons/vagina_base.png
new file mode 100644
index 0000000..3f300a0
Binary files /dev/null and b/Common/Textures/Genes/Icons/vagina_base.png differ
diff --git a/Common/Textures/Other/rjw-genes-previews/Preview.jpg b/Common/Textures/Other/rjw-genes-previews/Preview.jpg
new file mode 100644
index 0000000..94e7eb7
Binary files /dev/null and b/Common/Textures/Other/rjw-genes-previews/Preview.jpg differ
diff --git a/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-10.jpg b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-10.jpg
new file mode 100644
index 0000000..57674c4
Binary files /dev/null and b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-10.jpg differ
diff --git a/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-5.jpg b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-5.jpg
new file mode 100644
index 0000000..103d9cd
Binary files /dev/null and b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-5.jpg differ
diff --git a/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-6.jpg b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-6.jpg
new file mode 100644
index 0000000..3359018
Binary files /dev/null and b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-6.jpg differ
diff --git a/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-7.jpg b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-7.jpg
new file mode 100644
index 0000000..f6dc7c3
Binary files /dev/null and b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-7.jpg differ
diff --git a/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-8.jpg b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-8.jpg
new file mode 100644
index 0000000..e6a0c63
Binary files /dev/null and b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-8.jpg differ
diff --git a/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-9.jpg b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-9.jpg
new file mode 100644
index 0000000..04473ba
Binary files /dev/null and b/Common/Textures/Other/rjw-genes-previews/rjw-genes-preview-9.jpg differ
diff --git a/Common/Textures/Things/Mote/Cocoon/WeaveA.psd b/Common/Textures/Things/Mote/Cocoon/WeaveA.psd
new file mode 100644
index 0000000..2328868
Binary files /dev/null and b/Common/Textures/Things/Mote/Cocoon/WeaveA.psd differ
diff --git a/Common/Textures/Things/Mote/Cocoon/WeaveB.psd b/Common/Textures/Things/Mote/Cocoon/WeaveB.psd
new file mode 100644
index 0000000..c1a852e
Binary files /dev/null and b/Common/Textures/Things/Mote/Cocoon/WeaveB.psd differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_east.dds b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_east.dds
new file mode 100644
index 0000000..bf8cc19
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_east.dds differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_east.png b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_east.png
new file mode 100644
index 0000000..ef191bf
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_east.png differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_north.dds b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_north.dds
new file mode 100644
index 0000000..0f1967e
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_north.dds differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_north.png b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_north.png
new file mode 100644
index 0000000..eb5780a
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_north.png differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_south.dds b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_south.dds
new file mode 100644
index 0000000..021f6ad
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_south.dds differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_south.png b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_south.png
new file mode 100644
index 0000000..8e5e4de
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail_south.png differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_east.dds b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_east.dds
new file mode 100644
index 0000000..7b0c750
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_east.dds differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_east.png b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_east.png
new file mode 100644
index 0000000..0e193da
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_east.png differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_north.dds b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_north.dds
new file mode 100644
index 0000000..9bd784f
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_north.dds differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_north.png b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_north.png
new file mode 100644
index 0000000..37ba8fb
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_north.png differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_south.dds b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_south.dds
new file mode 100644
index 0000000..1128e9e
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_south.dds differ
diff --git a/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_south.png b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_south.png
new file mode 100644
index 0000000..62453b0
Binary files /dev/null and b/Common/Textures/Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings_south.png differ
diff --git a/KNOWN_BUGS.md b/KNOWN_BUGS.md
index 3fe7439..676fc74 100644
--- a/KNOWN_BUGS.md
+++ b/KNOWN_BUGS.md
@@ -2,6 +2,93 @@
Collection of Known Bugs and reasons for their origin.
+## System.MissingMethodException: bool RimWorld.Pawn_GeneTracker.HasActiveGene(Verse.GeneDef)
+
+You might see a bug like this:
+
+```
+Exception in Verse.AI.ThinkNode_Priority TryIssueJobPackage: System.MissingMethodException: bool RimWorld.Pawn_GeneTracker.HasActiveGene(Verse.GeneDef)
+[Ref A8629303] Duplicate stacktrace, see ref for original
+UnityEngine.StackTraceUtility:ExtractStackTrace ()
+(wrapper dynamic-method) MonoMod.Utils.DynamicMethodDefinition:Verse.Log.Error_Patch2 (string)
+Verse.AI.ThinkNode_Priority:TryIssueJobPackage (Verse.Pawn,Verse.AI.JobIssueParams)
+Verse.AI.ThinkNode_SubtreesByTag:TryIssueJobPackage (Verse.Pawn,Verse.AI.JobIssueParams)
+Verse.AI.ThinkNode_Priority:TryIssueJobPackage (Verse.Pawn,Verse.AI.JobIssueParams)
+Verse.AI.Pawn_JobTracker:DetermineNextJob (Verse.ThinkTreeDef&,bool)
+Verse.AI.Pawn_JobTracker:TryFindAndStartJob ()
+(wrapper dynamic-method) MonoMod.Utils.DynamicMethodDefinition:Verse.AI.Pawn_JobTracker.EndCurrentJob_Patch1 (Verse.AI.Pawn_JobTracker,Verse.AI.JobCondition,bool,bool)
+(wrapper dynamic-method) MonoMod.Utils.DynamicMethodDefinition:Verse.AI.Pawn_JobTracker.JobTrackerTick_Patch0 (Verse.AI.Pawn_JobTracker)
+(wrapper dynamic-method) MonoMod.Utils.DynamicMethodDefinition:Verse.Pawn.Tick_Patch2 (Verse.Pawn)
+Verse.TickList:Tick ()
+(wrapper dynamic-method) MonoMod.Utils.DynamicMethodDefinition:Verse.TickManager.DoSingleTick_Patch3 (Verse.TickManager)
+Verse.TickManager:TickManagerUpdate ()
+(wrapper dynamic-method) MonoMod.Utils.DynamicMethodDefinition:Verse.Game.UpdatePlay_Patch2 (Verse.Game)
+Verse.Root_Play:Update ()
+```
+
+This is due to the game not being updated - hasActiveGene has been introduced later than 1.5.
+
+You will have to update your game.
+
+## My Youth Fountain / Age Drainer Pawns do not alter Ages!!!
+
+Issue: You had a pawn with Youth Fountain have Sex with another Pawn, and the other pawn did not get younger.
+
+Please Check:
+
+- Are both pawns in OK Age?
+- Did they maybe change age but you didn't notice? Default settings only change by days.
+- Did they finish sex? If they are interrupted, nothing happens
+
+Otherwise:
+
+Enable the Debug-Settings and provide me with a log.
+
+## I changed Parts of a pawn and my genes do not apply!
+
+Issue: You had a pawn with "huge genitalia" and add a horse-cock with licentia or surgery. This new genitalia is not huge.
+
+Reason: The genes are applied when they are added. This is usually character-spawn. The genes change the attributes of the genitalia-hediff, and thus genitalia added after the genes are not affected.
+
+I think I will not gonna fix this.
+First of all, I think transplants wouldn't reasonably affected by genes.
+Second, for implementation I'd need to regularly check if every gene changed all relevant genitalia already, and do the same every x-ticks.
+This seems like a performance sink, so I will not gonna do it.
+
+## Pawn does not refresh empty Fertilin!
+
+Issue: A pawn has 0 (or low) Fertilin, and a mood debuff. But they do not do anything about it.
+
+Reason: Pawns might go on a mental break when their fertilin is low to rape people. However, if your pawn is generally happy, they will not have a mental break. Then they run around with low fertilin.
+
+Workarounds / Solutions: Depending on your Gene-Setup, you might consider a cum-based diet. You can also tweak sex-settings for more sex need and hookups. Lastly, you can edit the xml to give higher mood penalties, which will lead to more mental breakdowns.
+
+In general, I am happy to hear your feedback. If you have other ideas how to change this to be a bit tricky but not too punishing please let me know.
+
+## Fertilin does not go up after Sex!
+
+Error: An Incubus or Succubus had sex with another pawn, but did not gain Fertilin.
+
+Things to consider:
+
+1. Please read descriptions of the respective genes - did you have "the right sex?"
+2. Check Hediffs of the fucked pawn - was it already drained?
+3. Did you fuck an animal? Check Settings for Fertilin-Multiplier
+4. Did the pawns really *finish* ? In case they throw up or get drafted there is no gain.
+
+There also is a known mod-conflict with `rjw Animations patch` (See #18), so make sure you use up-to-date versions of everything.
+
+## Seduce aborts on sex-start!
+
+Error: You have a succubus using seduce on a hostile pawn, they start sex but immediately abort.
+
+Things to Consider:
+
+1. Is your Succubus drafted? If not, they might have a flight-mode set and are scared of the enemy.
+2. Do you have mods changing combat AI? (CAI5000 or Combat Extended)
+
+It seems that things changing Enemy Combat AI also affect this. One report was about CAI5000 and we also expect Combat Extended to be incompatible.
+
## Random Vaginas for Goblins
Error: Pawns have different genitalia than expected, e.g. if the "no vagina" gene is specified there are pawns with vaginas AND a penis.
@@ -20,6 +107,8 @@ Maybe you can also fix it by changing `` in the Male/Fem
## Full-No-Genital-Genes get Genitals later
+*Update: Should be addressed with 1.1.1 and not appear anymore*
+
Error: I added all "no-XXX" genes but my pawn has genitalia on map!
Reason: If you go with Full-No-Genitals (No Penis, No Anus, No Breasts, No Vagina) then the pawn spawns without any Genitalia on the map,
@@ -29,6 +118,8 @@ however then the RJW base-logic runs the sexualizer.
## Log Pops up for Xenotypes with Female/Male Only Gene
+*Update: Should not appear anymore after 1.1 when used with current rjw versions*
+
Error:
When using a Xenotype with the Female only gene, upon refresh it can open the log with the following (red) statement:
@@ -48,7 +139,7 @@ RimWorld.GeneMaker:MakeGene (Verse.GeneDef,Verse.Pawn)
Reason:
-RJW covers some corner cases when the pawn is changed before creation.
+RJW covers some corner cases when the pawn is changed before creation. This seems a bit legacy and related to Royalty-Content.
Current Solution:
@@ -56,10 +147,25 @@ Ignore this. The pawns seem to have the right sex and genitalia, I cannot "catch
Aimed Solution:
-Patch ChangeSex to skip for pawns with the two genes producing this.
+Patch RJW ChangeSex upstream to skip for pawns with the two genes producing this.
+
+## Error on Game Load: Verse.GeneDef named rjw_genes_human_genitalia (wanter=genes)
+
+Error: Issue #4, Game throws a warning on load that some Genes were not found.
+
+Reason: (Likely) because I removed some genes from Pre-Release to 1.0.0. Now some players have unknown definitions in their safe-files and Xenotype Defs.
+The removed Genes were the ones that performed default behaviour (e.g. normal breast size, normal penis size, ...)
+
+Solution: Should be safe to ignore, when you get this on safe-load make a quick new safe. new safe should not throw the error. For Self-Made Xenotypes remove the Genes.
+
+Sorry about this one, I know removal can break things but hey you were playing with the Prerelease!
## Insect Breeder does not fertilize
+Update:
+
+We changed behaviour in [1.0.1](https://github.com/vegapnk/RJW-Genes/releases/tag/1.0.1) and it seems to work now. Please tell us if you still encounter this.
+
Error:
A pawn with insect breeder fucks a pawn with unfertilized insect eggs, but the eggs stay unfertilized.
@@ -71,4 +177,4 @@ So testing this is super hard.
One thing - you need to have anal or vaginal sex for this to work. Any other sex type is currently not supported.
-For anything else, please help me gather information on this what you did and how things look. I reworked it once but I think it should work now.
\ No newline at end of file
+For anything else, please help me gather information on this what you did and how things look. I reworked it once but I think it should work now.
diff --git a/LoadFolders.xml b/LoadFolders.xml
new file mode 100644
index 0000000..d3c2a27
--- /dev/null
+++ b/LoadFolders.xml
@@ -0,0 +1,21 @@
+
+
+
+
/
+
Common
+
+
Mods/NotRaceSupport
+
Mods/Sanguophage
+
Mods/Saurid
+
Mods/Phytokin
+
Mods/Lycanthrope
+
Mods/Highmate
+
Mods/Genie
+
Mods/Fungoid
+
Mods/Archon
+
Mods/Android
+
Mods/VE_Genetics
+
Mods/LicentiaLabs
+
Mods/Sexperience
+
+
\ No newline at end of file
diff --git a/Mods/Android/Defs/AndroidConvertableGenesDefs/AndroidConvertableGenesDefs.xml b/Mods/Android/Defs/AndroidConvertableGenesDefs/AndroidConvertableGenesDefs.xml
new file mode 100644
index 0000000..2977367
--- /dev/null
+++ b/Mods/Android/Defs/AndroidConvertableGenesDefs/AndroidConvertableGenesDefs.xml
@@ -0,0 +1,11 @@
+
+
+
+ rjw_genes_AndroidConvertableGenesDefs
+
+
rjw_genes_gender
+
+
+
+
+
\ No newline at end of file
diff --git a/Mods/Android/Defs/GeneDefs/GeneDefs_Androids.xml b/Mods/Android/Defs/GeneDefs/GeneDefs_Androids.xml
new file mode 100644
index 0000000..058d719
--- /dev/null
+++ b/Mods/Android/Defs/GeneDefs/GeneDefs_Androids.xml
@@ -0,0 +1,54 @@
+
+
+
+ rjw_genes_bionic_genitalia
+
+ RJW_Genes.Gene_GenitaliaType
+ This piece of hardware is a set of bionic genitals of high quality
+ Genes/Icons/Genitalia_human
+
+
+
+ 802
+ -2
+
+
+
+ rjw_genes_hydrolic_genitalia
+
+ RJW_Genes.Gene_GenitaliaType
+ This piece of hardware is a set of crude hydrolic genitals, at least it come with a suspension system
+ Genes/Icons/Genitalia_human
+
+
+
+ 802
+
+ 1.12
+
+
+
+
+ rjw_genes_SexDisabled
+
+ Androids do not feel satisfaction from sex, and have no need to feel it.
+ Genes/Icons/sex_disabled
+ 3
+ 1
+
+
Sex
+
+ true
+
+
+
\ No newline at end of file
diff --git a/Mods/Android/Patches/Android_Quirk_Patch.xml b/Mods/Android/Patches/Android_Quirk_Patch.xml
new file mode 100644
index 0000000..52f9333
--- /dev/null
+++ b/Mods/Android/Patches/Android_Quirk_Patch.xml
@@ -0,0 +1,26 @@
+
+
+
+ /Defs/VREAndroids.AndroidGeneDef[defName="VREA_SyntheticBody"]
+
+
+
+ -2
+ 2
+
+
+
+ VRE_Curiosity_Sex
+
+ 0
+ The carrier has a natural curiosity for sex which makes them gain recreation whenever they learn it. Furthermore, curiosity prevents skill loss in sex completely.
+
+ Genes/Icons/sex_curiosity
+
+
+ Sex
+ Sex
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Mods/Highmate/Patches/Highmate_Quirk_Patch.xml b/Mods/Highmate/Patches/Highmate_Quirk_Patch.xml
new file mode 100644
index 0000000..0f69977
--- /dev/null
+++ b/Mods/Highmate/Patches/Highmate_Quirk_Patch.xml
@@ -0,0 +1,28 @@
+
+
+
+ /Defs/GeneDef[defName="VRE_FelineEars"]
+
+
+
+
+
+
+ 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/Generous_Donor
+ 538
+
+ 2
+ -1
+
+
+
+
+
+
diff --git a/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml b/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml
new file mode 100644
index 0000000..1d89b7e
--- /dev/null
+++ b/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ rjw_genes_living_cumbucket
+
+ rjw_genes_cum
+ 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/Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml b/Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml
new file mode 100644
index 0000000..2c55a7a
--- /dev/null
+++ b/Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml
@@ -0,0 +1,94 @@
+
+
+
+ rjw_genes_filled_living_cumbucket
+ HediffWithComps
+
+ This pawn is a (filled) living cum bucket. Thanks to a generous donation, this pawn will slowly generate cum for pickup.
+ (240,200,110)
+ false
+
+ false
+ false
+
+
+ -0.5
+
+
+
+
0
+
0.5
+
0.25
+
0.1
+
0.5
+
+
+
+
+
+
+
+ -0.1
+
+
+
+
+ 0.4
+ 0.8
+
+ -0.25
+
+
+
+ Moving
+ -0.05
+
+
+
+
+
+ 0.65
+ 0.75
+
+ -0.25
+
+
+
+ Moving
+ -0.1
+
+
+
+
+
+ 1.1
+ 0.6
+
+ -0.5
+
+
+
+ Moving
+ -0.15
+
+
+
+
+
+ 10.1
+ 0.1
+
+ -1.5
+
+
+
+ Moving
+ -0.55
+
+
+
+
+
+
+
+
diff --git a/Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml b/Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml
new file mode 100644
index 0000000..6cbb372
--- /dev/null
+++ b/Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+ ProcessCumbucket
+ RJW_Genes.JobDriver_ProcessingCumbucket
+ false
+ false
+ processing internal cumbucket.
+ false
+
+
+
diff --git a/Mods/VE_Genetics/Defs/HedifDef/Hediffs_Animals.xml b/Mods/VE_Genetics/Defs/HedifDef/Hediffs_Animals.xml
new file mode 100644
index 0000000..93aa987
--- /dev/null
+++ b/Mods/VE_Genetics/Defs/HedifDef/Hediffs_Animals.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ rjw_genes_animal_control_hediff
+
+ This creature is more controlable with a natural human part.
+ HediffWithComps
+ (0.9, 1.0, 0.35)
+ 1
+
+
+ true
+
+
+ false
+
+
+
\ No newline at end of file
diff --git a/Mods/VE_Genetics/Defs/RaceGeneDef/RaceGeneDefs_VEgenetic.xml b/Mods/VE_Genetics/Defs/RaceGeneDef/RaceGeneDefs_VEgenetic.xml
new file mode 100644
index 0000000..a4d43ef
--- /dev/null
+++ b/Mods/VE_Genetics/Defs/RaceGeneDef/RaceGeneDefs_VEgenetic.xml
@@ -0,0 +1,654 @@
+
+
+
+
+ GR_Manbear_GenGroup
+
+
+
GR_Manbear
+
GR_Bearman
+
+
+
+
+
+ Immunity_Strong
+ 0.8
+
+
+ MinTemp_LargeDecrease
+ 0.8
+
+
+ Aggression_Aggressive
+ 0.8
+
+
+ Sleepy
+ 0.8
+
+
+ Beard_Always
+ 0.8
+
+
+ VoiceRoar
+ 0.8
+
+
+ Body_Fat
+ 0.8
+
+
+ Body_Hulk
+ 0.8
+
+
+ Hair_ReddishBrown
+ 0.8
+
+
+ Hair_DarkBrown
+ 0.8
+
+
+ Hair_DarkSaturatedReddish
+ 0.8
+
+
+ Hair_DarkReddish
+ 0.8
+
+
+ RobustDigestion
+ 0.8
+
+
+ Furskin
+ 0.8
+
+
+ Unstoppable
+ 0.8
+
+
+ AptitudeTerrible_Artistic
+ 0.8
+
+
+ AptitudeTerrible_Social
+ 0.8
+
+
+ AptitudePoor_Intellectual
+ 0.8
+
+
+
+
+
+
+
+ GR_Manalope_GenGroup
+
+
+
GR_Manalope
+
GR_Booman
+
+
+
+
+
+ FireSpew
+ 0.8
+
+
+ Beauty_Ugly
+ 0.8
+
+
+ Hair_Blonde
+ 0.8
+
+
+ Hair_SandyBlonde
+ 0.8
+
+
+ Hair_LightOrange
+ 0.8
+
+
+ rjw_genes_udder
+ 0.8
+
+
+
+
+
+
+
+ GR_Manchicken_GenGroup
+
+
+
GR_Manchicken
+
GR_Turkeyman
+
+
+
+
+
+ Mood_Optimist
+ 0.8
+
+
+ Delicate
+ 0.8
+
+
+ Beauty_Pretty
+ 0.8
+
+
+ Body_Thin
+ 0.8
+
+
+ AptitudeTerrible_Melee
+ 0.8
+
+
+ AptitudeTerrible_Mining
+ 0.8
+
+
+ AptitudeRemarkable_Social
+ 0.8
+
+
+ AptitudeStrong_Intellectual
+ 0.8
+
+
+
+
+
+
+
+ GR_Manffalo_GenGroup
+
+
+
GR_Manffalo
+
GR_Muffaloman
+
+
+
+
+
+ Headbone_Human
+ 0.9
+
+
+ Headbone_MiniHorns
+ 0.9
+
+
+ Furskin
+ 0.9
+
+
+ MinTemp_SmallIncrease
+ 0.9
+
+
+ rjw_genes_big_male_genitalia
+ 0.7
+
+
+ rjw_genes_loose_female_genitalia
+ 0.7
+
+
+ rjw_genes_big_breasts
+ 0.7
+
+
+ rjw_genes_udder
+ 0.7
+
+
+ rjw_genes_Needle_genitalia
+ 0.7
+
+
+ rjw_mc_genes_perm_lactating
+ 0.05
+
+
+ rjw_genes_zoophile
+ 0.5
+
+
+ AptitudeTerrible_Intellectual
+ 0.05
+
+
+ AptitudePoor_Intellectual
+ 0.7
+
+
+
+
+
+
+ GR_Manwolf_GenGroup
+
+
+
GR_Manwolf
+
GR_Dogman
+
+
+
+
+
+ AptitudeTerrible_Mining
+ 0.05
+
+
+ PsychicBonding
+ 0.05
+
+
+ Mood_Sanguine
+ 0.05
+
+
+ Ears_Floppy
+ 0.9
+
+
+ rjw_genes_canine_genitalia
+ 0.9
+
+
+ Furskin
+ 0.9
+
+
+ MinTemp_SmallIncrease
+ 0.9
+
+
+ Libido_High
+ 0.9
+
+
+ AptitudePoor_Mining
+ 0.5
+
+
+ rjw_genes_zoophile
+ 0.5
+
+
+ Mood_Optimist
+ 0.5
+
+
+
+
+
+
+ GR_Mancat_GenGroup
+
+
+
GR_Mancat
+
GR_Catman
+
+
+
+
+
+ PsychicBonding
+ 0.05
+
+
+ AptitudeTerrible_Animals
+ 0.05
+
+
+ Ears_Cat
+ 0.9
+
+
+ Body_Thin
+ 0.9
+
+
+ rjw_genes_feline_genitalia
+ 0.9
+
+
+ Furskin
+ 0.9
+
+
+ MinTemp_SmallIncrease
+ 0.9
+
+
+ rjw_genes_small_male_genitalia
+ 0.7
+
+
+ rjw_genes_tight_female_genitalia
+ 0.7
+
+
+ rjw_genes_small_breasts
+ 0.7
+
+
+ rjw_genes_tight_anus
+ 0.7
+
+
+ DarkVision
+ 0.8
+
+
+ AptitudePoor_Animals
+ 0.5
+
+
+ Beauty_Pretty
+ 0.7
+
+
+ rjw_genes_zoophile
+ 0.5
+
+
+
+
+
+
+ GR_Mansquirrel_GenGroup
+
+
+
GR_Mansquirrel
+
GR_Moleman
+
+
+
+
+
+ MoveSpeed_VeryQuick
+ 0.8
+
+
+ KindInstinct
+ 0.8
+
+
+ Delicate
+ 0.8
+
+
+ Ears_Cat
+ 0.8
+
+
+ Body_Thin
+ 0.8
+
+
+ Tail_Furry
+ 0.8
+
+
+ AptitudeTerrible_Shooting
+ 0.8
+
+
+ AptitudeTerrible_Melee
+ 0.8
+
+
+ AptitudeTerrible_Mining
+ 0.8
+
+
+ AptitudeTerrible_Animals
+ 0.8
+
+
+ AptitudeStrong_Intellectual
+ 0.8
+
+
+ rjw_genes_Needle_genitalia
+ 0.8
+
+
+ rjw_genes_zoophile
+ 0.8
+
+
+
+
+
+
+
+ GR_Thrumboman_GenGroup
+
+
+
GR_Thrumboman
+
+
+
+
+
+ Unstoppable
+ 0.25
+
+
+ Headbone_CenterHorn
+ 0.9
+
+
+ VoiceRoar
+ 0.6
+
+
+ MaxTemp_SmallIncrease
+ 0.7
+
+
+ MaxTemp_LargeIncrease
+ 0.1
+
+
+ rjw_genes_dragon_genitalia
+ 0.6
+
+
+ FireResistant
+ 0.15
+
+
+ rjw_genes_much_cum
+ 0.3
+
+
+ rjw_genes_very_much_cum
+ 0.05
+
+
+ Body_Hulk
+ 0.7
+
+
+
+
+
+
+
+
+
+ GR_Hurseman_GenGroup
+
+
+
GR_Hurseman
+
+
+
+
+
+ Body_Standard
+ 0.9
+
+
+ Body_Hulk
+ 0.7
+
+
+ rjw_genes_equine_genitalia
+ 0.9
+
+
+ rjw_genes_zoophile
+ 0.5
+
+
+ rjw_genes_much_cum
+ 0.5
+
+
+ MoveSpeed_Quick
+ 0.5
+
+
+ AptitudeTerrible_Mining
+ 0.5
+
+
+ AptitudeTerrible_Intellectual
+ 0.5
+
+
+ Furskin
+ 0.9
+
+
+ MinTemp_SmallIncrease
+ 0.9
+
+
+
+
+
+
+
+
+
+ GR_Manscarab_GenGroup
+
+
+
GR_Manscarab
+
+
+
+
+
+ Beauty_Ugly
+ 0.5
+
+
+ Immunity_Strong
+ 0.6
+
+
+ ToxicEnvironmentResistance_Partial
+ 0.4
+
+
+ rjw_genes_ovipositor_genitalia
+ 0.15
+
+
+ rjw_genes_insectincubator
+ 0.1
+
+
+ rjw_genes_insectbreeder
+ 0.1
+
+
+ Body_Thin
+ 0.3
+
+
+
+
+
+
+
+ GR_Lizardman_GenGroup
+
+
+
GR_Lizardman
+
+
+
+
+
+ AcidSpray
+ 0.7
+
+
+ MinTemp_SmallIncrease
+ 0.7
+
+
+ MaxTemp_SmallIncrease
+ 0.7
+
+
+ Robust
+ 0.7
+
+
+ Hair_BaldOnly
+ 0.7
+
+
+ Beard_NoBeardOnly
+ 0.7
+
+
+ Body_Standard
+ 0.7
+
+
+ Headbone_CenterHorn
+ 0.7
+
+
+ AptitudeTerrible_Artistic
+ 0.7
+
+
+ AptitudeTerrible_Social
+ 0.7
+
+
+ rjw_genes_reptilian_genitalia
+ 0.7
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Mods/VE_Genetics/Defs/RaceGroupDef/Hybrid_Group.xml b/Mods/VE_Genetics/Defs/RaceGroupDef/Hybrid_Group.xml
new file mode 100644
index 0000000..ab3ba01
--- /dev/null
+++ b/Mods/VE_Genetics/Defs/RaceGroupDef/Hybrid_Group.xml
@@ -0,0 +1,795 @@
+
+
+
+
+ Bear_Grizzly_Group
+
+
Human
+
Bear_Grizzly
+
+
+
GR_Manbear
+
GR_Bearman
+
+
+
+
+ Bear_Polar_Group
+
+
Human
+
Bear_Polar
+
+
+
+
GR_Manbear
+
GR_Bearman
+
+
+
+
+ GR_Manbear_Group
+
+
Human
+
GR_Manbear
+
+
+
+
Human
+
+
+
+
+ GR_Bearman_Group
+
+
Human
+
GR_Bearman
+
+
+
+
Human
+
+
+
+
+ Boomalope_Group
+
+
Human
+
Boomalope
+
+
+
+
GR_Manalope
+
GR_Booman
+
+
+
+
+ GR_Manalope_Group
+
+
Human
+
GR_Manalope
+
+
+
+
Human
+
+
+
+
+ GR_Booman_Group
+
+
Human
+
GR_Booman
+
+
+
+
Human
+
+
+
+
+ Chicken_Group
+
+
Human
+
Chicken
+
+
+
+
GR_Manchicken
+
GR_Turkeyman
+
+
+
+
+ Duck_Group
+
+
Human
+
Duck
+
+
+
+
GR_Manchicken
+
GR_Turkeyman
+
+
+
+
+ Turkey_Group
+
+
Human
+
Turkey
+
+
+
+
GR_Manchicken
+
GR_Turkeyman
+
+
+
+
+ Goose_Group
+
+
Human
+
Goose
+
+
+
+
GR_Manchicken
+
GR_Turkeyman
+
+
+
+
+ Ostrich_Group
+
+
Human
+
Ostrich
+
+
+
+
GR_Manchicken
+
GR_Turkeyman
+
+
+
+
+ Emu_Group
+
+
Human
+
Emu
+
+
+
+
GR_Manchicken
+
GR_Turkeyman
+
+
+
+
+ Cassowary_Group
+
+
Human
+
Cassowary
+
+
+
+
GR_Manchicken
+
GR_Turkeyman
+
+
+
+
+ GR_Manchicken_Group
+
+
Human
+
GR_Manchicken
+
+
+
+
Human
+
+
+
+
+ GR_Turkeyman_Group
+
+
Human
+
GR_Turkeyman
+
+
+
+
Human
+
+
+
+
+ Cow_Group
+
+
Human
+
Cow
+
+
+
+
GR_Manffalo
+
GR_Muffaloman
+
+
+
+
+ Muffalo_Group
+
+
Human
+
Muffalo
+
+
+
+
GR_Manffalo
+
GR_Muffaloman
+
+
+
+
+ Bison_Group
+
+
Human
+
Bison
+
+
+
+
GR_Manffalo
+
GR_Muffaloman
+
+
+
+
+ Yak_Group
+
+
Human
+
Yak
+
+
+
+
GR_Manffalo
+
GR_Muffaloman
+
+
+
+
+ GR_Manffalo_Group
+
+
Human
+
GR_Manffalo
+
+
+
+
Human
+
+
+
+
+ GR_Muffaloman_Group
+
+
Human
+
GR_Muffaloman
+
+
+
+
Human
+
+
+
+
+ Warg_Group
+
+
Human
+
Warg
+
+
+
+
GR_Manwolf
+
GR_Dogman
+
+
+
+
+ Wolf_Timber_Group
+
+
Human
+
Wolf_Timber
+
+
+
+
GR_Manwolf
+
GR_Dogman
+
+
+
+
+ Wolf_Arctic_Group
+
+
Human
+
Wolf_Arctic
+
+
+
+
GR_Manwolf
+
GR_Dogman
+
+
+
+
+ Fox_Fennec_Group
+
+
Human
+
Fox_Fennec
+
+
+
+
GR_Manwolf
+
GR_Dogman
+
+
+
+
+ Fox_Red_Group
+
+
Human
+
Fox_Red
+
+
+
+
GR_Manwolf
+
GR_Dogman
+
+
+
+
+ Fox_Arctic_Group
+
+
Human
+
Fox_Arctic
+
+
+
+
GR_Manwolf
+
GR_Dogman
+
+
+
+
+ Husky_Group
+
+
Human
+
Husky
+
+
+
+
GR_Manwolf
+
GR_Dogman
+
+
+
+
+ LabradorRetriever_Group
+
+
Human
+
LabradorRetriever
+
+
+
+
GR_Manwolf
+
GR_Dogman
+
+
+
+
+ YorkshireTerrier_Group
+
+
Human
+
YorkshireTerrier
+
+
+
+
GR_Manwolf
+
GR_Dogman
+
+
+
+
+ GR_Manwolf_Group
+
+
Human
+
GR_Manwolf
+
+
+
+
Human
+
+
+
+
+ GR_Dogman_Group
+
+
Human
+
GR_Dogman
+
+
+
+
Human
+
+
+
+
+ Cougar_Group
+
+
Human
+
Cougar
+
+
+
+
GR_Mancat
+
GR_Catman
+
+
+
+
+ Panther_Group
+
+
Human
+
Panther
+
+
+
+
GR_Mancat
+
GR_Catman
+
+
+
+
+ Lynx_Group
+
+
Human
+
Lynx
+
+
+
+
GR_Mancat
+
GR_Catman
+
+
+
+
+ Cat_Group
+
+
Human
+
Cat
+
+
+
+
GR_Mancat
+
GR_Catman
+
+
+
+
+ GR_Mancat_Group
+
+
Human
+
GR_Mancat
+
+
+
+
Human
+
+
+
+
+ GR_Catman_Group
+
+
Human
+
GR_Catman
+
+
+
+
Human
+
+
+
+
+ GuineaPig_Group
+
+
Human
+
GuineaPig
+
+
+
+
GR_Mansquirrel
+
GR_Moleman
+
+
+
+
+ Hare_Group
+
+
Human
+
Hare
+
+
+
+
GR_Mansquirrel
+
GR_Moleman
+
+
+
+
+ Snowhare_Group
+
+
Human
+
Snowhare
+
+
+
+
GR_Mansquirrel
+
GR_Moleman
+
+
+
+
+ Squirrel_Group
+
+
Human
+
Squirrel
+
+
+
+
GR_Mansquirrel
+
GR_Moleman
+
+
+
+
+ Rat_Group
+
+
Human
+
Rat
+
+
+
+
GR_Mansquirrel
+
GR_Moleman
+
+
+
+
+ Raccoon_Group
+
+
Human
+
Raccoon
+
+
+
+
GR_Mansquirrel
+
GR_Moleman
+
+
+
+
+ GR_Mansquirrel_Group
+
+
Human
+
GR_Mansquirrel
+
+
+
+
Human
+
+
+
+
+ GR_Moleman_Group
+
+
Human
+
GR_Moleman
+
+
+
+
Human
+
+
+
+
+ Thrumbo_Group
+
+
Human
+
Thrumbo
+
+
+
+
GR_Thrumboman
+
+
+
+
+ GR_Thrumboman_Group
+
+
Human
+
GR_Thrumboman
+
+
+
+
Human
+
+
+
+
+
+
+
+ Dromedary_Group
+
+
Human
+
Dromedary
+
+
+
+
GR_Hurseman
+
+
+
+
+ Elk_Group
+
+
Human
+
Elk
+
+
+
+
GR_Hurseman
+
+
+
+
+ Horse_Group
+
+
Human
+
Horse
+
+
+
+
GR_Hurseman
+
+
+
+
+ Caribou_Group
+
+
Human
+
Caribou
+
+
+
+
GR_Hurseman
+
+
+
+
+ Donkey_Group
+
+
Human
+
Donkey
+
+
+
+
GR_Hurseman
+
+
+
+
+ GR_Hurseman_Group
+
+
Human
+
GR_Hurseman
+
+
+
+
Human
+
+
+
+
+ Megascarab_Group
+
+
Human
+
Megascarab
+
+
+
+
GR_Manscarab
+
+
+
+
+ Spelopede_Group
+
+
Human
+
Spelopede
+
+
+
+
GR_Manscarab
+
+
+
+
+ Megaspider_Group
+
+
Human
+
Megaspider
+
+
+
+
GR_Manscarab
+
+
+
+
+ GR_Manscarab_Group
+
+
Human
+
GR_Manscarab
+
+
+
+
Human
+
+
+
+
+ Iguana_Group
+
+
Human
+
Iguana
+
+
+
+
GR_Lizardman
+
+
+
+
+ Cobra_Group
+
+
Human
+
Cobra
+
+
+
+
GR_Lizardman
+
+
+
+
+ Tortoise_Group
+
+
Human
+
Tortoise
+
+
+
+
GR_Lizardman
+
+
+
+
+ GR_Lizardman_Group
+
+
Human
+
GR_Lizardman
+
+
+
+
Human
+
+
+
+
diff --git a/README.md b/README.md
index ec21dd7..b9e5d14 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,37 @@
# RJW-Genes [NSFW]
-This mod adds genes related and based on RJW to Rimworld.
+[](https://buymeacoffee.com/vegapnk)
+[](https://opensource.org/licenses/MIT)
-This is my first Mod I started from scratch so any feedback is very welcome.
+This mod adds genes related and based on RJW to Rimworld.
## Current Features
- Different Genitalia Types
- Genitalia Size Scaling
-- Extra Genitalia (and a Futa Attempt)
-- Some Traits, Cumflation Immunity, Elasticity
-- Cum-Amount Changes, Transfer Nutrition
-- Mech Breeding / Insect Breeding Support
+- Extra Genitalia, Male Pregnancy, Futas, Femboys
+- Most RJW Traits
+- Cum-Amount Changes, Transfer Nutrition Boosts
+- Sexual Vampires that need Cum, Cocks or some other sources.
+- Mech Breeding Additions & Orgasmic Mytosis
- Human-Animal Gene Inheritance merged from [Shabakur](https://github.com/Shabakur/RJW_Animal_Gene_Inheritance)
+- Genetic Diseases that spread on Intercourse
+- 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).
+*You might not see all of them. Many genes just show up if other mods are loaded*.
-## Bugs?
+**Conflicts:**
+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.
-I never wrote a bug in my life but if you found one please open an issue or find me somewhere on the RJW Discord.
+## Structure
-Please consider looking at [the known bugs](./KNOWN_BUGS.md)
+- Toplevel: By Function (i.E. "Genes", "Animal Inheritance", "Utility")
+- Then: By Domain, following the Gene-Categories ("Cosmetic","Special", "Damage",...)
+- Last: By Type of Action (Def, Patch, etc.)
-## Genes vs. Races
-
-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.
-
-## Load Order / Deps
-
-Please load this after any mod adding genes, and after the used RJW-Mods (Licentia, Sexperience).
-
-Should not be used with the original RJW_Animal_Gene_Inheritance anymore.
-
-There was an issue with other "Male-Only / Female-Only" Mods --- for which we provide our own Genes now.
\ No newline at end of file
+So if you want to change / add a gene about shrinking cocks you were to go: `Genes -> GenitaliaSize -> Defs`.
\ No newline at end of file
diff --git a/Rjw-Genes.sln b/Rjw-Genes.sln
index 858f9a2..3706653 100644
--- a/Rjw-Genes.sln
+++ b/Rjw-Genes.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rjw-Genes", "Source\Rjw-Genes.csproj", "{D7D21B4A-1DA7-41D8-B202-C58CA8FA62AA}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FB09ADF4-FC35-4C1F-9135-2B4C4E4ED347}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/Source/Animal_Inheritance/Defs/BestialityGeneInheritanceDef.cs b/Source/Animal_Inheritance/Defs/BestialityGeneInheritanceDef.cs
new file mode 100644
index 0000000..ae0c51e
--- /dev/null
+++ b/Source/Animal_Inheritance/Defs/BestialityGeneInheritanceDef.cs
@@ -0,0 +1,8 @@
+namespace RJW_BGS
+{
+ public class BestialityGeneInheritanceDef
+ {
+ public string defName;
+ public float chance = 1f;
+ }
+}
diff --git a/Source/Animal_Inheritance/RaceGeneDef.cs b/Source/Animal_Inheritance/Defs/RaceGeneDef.cs
similarity index 56%
rename from Source/Animal_Inheritance/RaceGeneDef.cs
rename to Source/Animal_Inheritance/Defs/RaceGeneDef.cs
index c4cbcea..10a9149 100644
--- a/Source/Animal_Inheritance/RaceGeneDef.cs
+++ b/Source/Animal_Inheritance/Defs/RaceGeneDef.cs
@@ -10,12 +10,12 @@ namespace RJW_BGS
{
public class RaceGeneDef : Def
{
-
- public String raceGroup;
+ public int priority;
+ public string raceGroup; //keeping this for backwards compatibility
+ public List raceGroups; //racegroup, but in list form so multiple can be entered, preference to use this over racegroup
public List raceNames;
public List pawnKindNames;
public List genes;
- //public List genechances;
- public String hybridName;
+ public string hybridName;
}
}
diff --git a/Source/Animal_Inheritance/Defs/RaceGeneDef_Helper.cs b/Source/Animal_Inheritance/Defs/RaceGeneDef_Helper.cs
new file mode 100644
index 0000000..cd01a47
--- /dev/null
+++ b/Source/Animal_Inheritance/Defs/RaceGeneDef_Helper.cs
@@ -0,0 +1,105 @@
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Verse;
+
+namespace RJW_BGS
+{
+ public class RaceGeneDef_Helper
+ {
+ //code based on racegroupdefinternal which has a similar function
+ public static RaceGeneDef GetRaceGeneDefInternal(Pawn pawn)
+ {
+ List Valids = ValidRaceGeneDefs(pawn);
+ if (Valids.Count > 0)
+ {
+ RaceGeneDef result = Valids.MaxBy(r => r.priority);
+ return result;
+ }
+ return null;
+ }
+
+ public static List ValidRaceGeneDefs(Pawn pawn)
+ {
+ PawnKindDef kindDef = pawn.kindDef;
+ if (kindDef == null)
+ {
+ ModLog.Warning($"Error looking up PawnKindDef for {pawn.Name} - Could not lookup Animal Inheritance Genes");
+ return null;
+ }
+
+ string raceName = kindDef.race.defName;
+ string pawnKindName = kindDef.defName;
+ //Wild animals have no name, so we will use pawnkindname instead
+ string pawnName = pawn.Name != null ? pawn.Name.ToStringFull : pawnKindName;
+ PawnData pawnData = SaveStorage.DataStore.GetPawnData(pawn);
+ RaceGroupDef raceGroupDef = pawnData.RaceSupportDef;
+
+ if (RJW_BGSSettings.rjw_bgs_detailed_debug)
+ ModLog.Message($"Looking up Animal-Inheritable Genes for {pawnName} with KindDef {kindDef.defName},RaceName {raceName}, PawnKind {pawnKindName} and RaceGroup {raceGroupDef.defName}");
+
+ IEnumerable allDefs = DefDatabase.AllDefs;
+ List pawnKindDefs = allDefs.Where(delegate (RaceGeneDef group)
+ {
+ List pawnKindNames = group.pawnKindNames;
+ return pawnKindNames != null && pawnKindNames.Contains(pawnKindName);
+ }).ToList();
+ if (pawnKindDefs.Count() > 0)
+ {
+ DebugPrintRaceGeneDefs("PawnKindDefs", pawnName,pawnKindDefs);
+ return pawnKindDefs;
+ }
+ else if (RJW_BGSSettings.rjw_bgs_detailed_debug)
+ ModLog.Message($"Did not find PawnKindDefs for {pawnName}");
+
+ List raceKindDefs = allDefs.Where(delegate (RaceGeneDef group)
+ {
+ List raceNames = group.raceNames;
+ return raceNames != null && raceNames.Contains(raceName);
+ }).ToList();
+ if (raceKindDefs.Count() > 0)
+ {
+ DebugPrintRaceGeneDefs("PawnKindDefs", pawnName, raceKindDefs);
+ return raceKindDefs;
+ }
+ else if (RJW_BGSSettings.rjw_bgs_detailed_debug)
+ ModLog.Message($"Did not find RaceKindDefs for {pawnName}");
+
+ List raceGroupDefs = new List();
+ if (raceGroupDef != null)
+ {
+ raceGroupDefs = allDefs.Where(delegate (RaceGeneDef group)
+ {
+ string raceGroupDefName = group.raceGroup;
+ List list_raceGroupDefName = group.raceGroups;
+ return (raceGroupDefName != null && raceGroupDefName == raceGroupDef.defName)
+ || (list_raceGroupDefName != null && list_raceGroupDefName.Contains(raceGroupDef.defName));
+ }).ToList();
+ }
+
+ if (raceGroupDefs.Count() > 0)
+ {
+ DebugPrintRaceGeneDefs("RaceKindDefs", pawnName, raceGroupDefs);
+ return raceGroupDefs;
+ }
+ else if (RJW_BGSSettings.rjw_bgs_detailed_debug)
+ ModLog.Message($"Did not find RaceGroupDefs for {pawnName}");
+
+ ModLog.Message($"Did not find any Genes inheritable for {pawnName}");
+ return new List();
+ }
+
+ private static void DebugPrintRaceGeneDefs(String header,String identifier,List defs)
+ {
+ if (RJW_BGSSettings.rjw_bgs_detailed_debug)
+ {
+ var defString = "[";
+ foreach (RaceGeneDef raceGeneDef in defs)
+ defString += $"({raceGeneDef.priority}:{raceGeneDef.defName} - {raceGeneDef.genes.Count} Genes)";
+ defString += "]";
+ ModLog.Message($"Found the following {header}-Genes for {identifier}: {defString}");
+ }
+ }
+ }
+}
diff --git a/Source/Animal_Inheritance/First.cs b/Source/Animal_Inheritance/First.cs
deleted file mode 100644
index 8194ab3..0000000
--- a/Source/Animal_Inheritance/First.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using rjw;
-using Verse;
-using RimWorld;
-
-namespace RJW_BGS
-{
- [StaticConstructorOnStartup]
- internal static class First
- {
- static First()
- {
- //RJWcopy.Racegroupdictbuilder();
- //Prints all found race dicts (debugging only)
- //logAllFoundRaceGroupGenes
-
- }
-
- private static void logAllFoundRaceGroupGenes()
- {
- foreach (RaceGroupDef def in DefDatabase.AllDefs)
- {
- Log.Message("defName = " + def.defName);
- if (def.raceNames != null)
- {
- foreach (string race in def.raceNames)
- {
- Log.Message(race);
- }
- }
- }
- }
- }
-}
diff --git a/Source/Animal_Inheritance/Harmony_Init.cs b/Source/Animal_Inheritance/Harmony_Init.cs
deleted file mode 100644
index 1852e9b..0000000
--- a/Source/Animal_Inheritance/Harmony_Init.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HarmonyLib;
-using Verse;
-
-namespace RJW_BGS
-{
- [StaticConstructorOnStartup]
- internal static class HarmonyInit
- {
- // Token: 0x0600001F RID: 31 RVA: 0x000029A4 File Offset: 0x00000BA4
- static HarmonyInit()
- {
- Harmony harmony = new Harmony("RJW_BGS");
- harmony.PatchAll();
- }
- }
-}
diff --git a/Source/Animal_Inheritance/InheritanceUtility.cs b/Source/Animal_Inheritance/InheritanceUtility.cs
index 2b260dd..de486ae 100644
--- a/Source/Animal_Inheritance/InheritanceUtility.cs
+++ b/Source/Animal_Inheritance/InheritanceUtility.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
using Verse;
using RimWorld;
+using rjw;
namespace RJW_BGS
{
@@ -19,14 +16,18 @@ namespace RJW_BGS
if (mother.RaceProps.Humanlike && father.RaceProps.Humanlike)
return genelist;
-
+ ModLog.Message($"Trigger an Animal-Gene-Inheritance for {father.Name} and {mother.Name}");
//One parent must be an animal and the other must be human, so only one needs to return
if (father != null && !father.RaceProps.Humanlike)
{
+ if (RJW_BGSSettings.rjw_bgs_detailed_debug)
+ ModLog.Message($"Father was found to be animal - looking up genes for {father.Name}");
return SelectGenes(father);
}
if (mother != null && !mother.RaceProps.Humanlike)
{
+ if (RJW_BGSSettings.rjw_bgs_detailed_debug)
+ ModLog.Message($"Mother was found to be animal - looking up genes for {mother.Name}");
return SelectGenes(mother);
}
@@ -42,30 +43,53 @@ namespace RJW_BGS
public static List SelectGenes(Pawn pawn)
{
List genelist = new List();
- RaceGeneDef raceGeneDef = RJWcopy.GetRaceGeneDefInternal(pawn);
+ RaceGeneDef raceGeneDef = RaceGeneDef_Helper.GetRaceGeneDefInternal(pawn);
if (raceGeneDef != null)
{
foreach (BestialityGeneInheritanceDef gene in raceGeneDef.genes)
{
- if (gene.chance >= Rand.Range(0.01f,1f))
+ if (gene.chance * RJW_BGSSettings.rjw_bgs_global_gene_chance >= Rand.Range(0.01f,1f))
{
genelist.Add(DefDatabase.GetNamed(gene.defName));
}
}
}
+ if (RJW_BGSSettings.rjw_bgs_detailed_debug)
+ ModLog.Message($"From {raceGeneDef.genes.Count} possible genes in {raceGeneDef.defName}, {genelist.Count} were added by chance ({RJW_BGSSettings.rjw_bgs_global_gene_chance} chance multiplier from Settings).");
return genelist;
}
+
+ ///
+ /// Adds a list of Genes to the pawns existing GeneSet.
+ /// Whether it is added as a Xenogene or Endogene is configured in Mod-Settings.
+ ///
+ /// The pawn for which Genes will be added
+ /// The Genes to add (Endogene by default, Xenogene with Mod Settings)
public static void AddGenes(Pawn pawn, List genes)
{
foreach (GeneDef gene in genes)
{
- pawn.genes.AddGene(gene, false);
+ pawn.genes.AddGene(gene, RJW_BGSSettings.rjw_bgs_animal_genes_as_xenogenes);
}
}
+ ///
+ /// Initiates a bestiality baby with genes if the baby does not exist earlier.
+ /// This is used to make rjw-egg-pregnancies work.
+ /// Related file: PatchRJWHediffInsect_Egg.cs
+ ///
+ /// The mother of the baby.
+ /// The father of the baby.
+ /// The baby created in non-pregnancy-way (has 0 Genes yet)
public static void NewGenes(Pawn mother, Pawn dad, Pawn baby)
{
+ if (!RJW_BGSSettings.rjw_bgs_enabled)
+ {
+ return;
+ }
+
+ ModLog.Message($"Triggering an New-Gene Animal-Gene-Inheritance for {baby.Name} ({dad.Name} + {mother.Name})");
if (baby.RaceProps.Humanlike)
{
if (baby.genes == null)
@@ -115,5 +139,22 @@ namespace RJW_BGS
}
}
+ ///
+ /// Used only for debugging, to see what you loaded and how it looks.
+ ///
+ private static void logAllFoundRaceGroupGenes()
+ {
+ foreach (RaceGroupDef def in DefDatabase.AllDefs)
+ {
+ Log.Message("defName = " + def.defName);
+ if (def.raceNames != null)
+ {
+ foreach (string race in def.raceNames)
+ {
+ Log.Message(race);
+ }
+ }
+ }
+ }
}
}
diff --git a/Source/Animal_Inheritance/Patches/Patch_RJW_BasePregnancy_VanillaExpandedGenetics.cs b/Source/Animal_Inheritance/Patches/Patch_RJW_BasePregnancy_VanillaExpandedGenetics.cs
new file mode 100644
index 0000000..1395575
--- /dev/null
+++ b/Source/Animal_Inheritance/Patches/Patch_RJW_BasePregnancy_VanillaExpandedGenetics.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using UnityEngine;
+using HarmonyLib;
+using rjw;
+
+namespace RJW_BGS
+{
+ [HarmonyPatch(typeof(Hediff_BasePregnancy))]
+ public class BasePregnancyPatcher
+ {
+ public static List supportedHybridRaces = new List()
+ {
+ "GR_Manbear",
+ "GR_Bearman",
+ "GR_Manalope",
+ "GR_Booman",
+ "GR_Manchicken",
+ "GR_Turkeyman",
+ "GR_Manffalo",
+ "GR_Muffaloman",
+ "GR_Manwolf",
+ "GR_Dogman",
+ "GR_Mancat",
+ "GR_Catman",
+ "GR_Mansquirrel",
+ "GR_Moleman",
+ "GR_Thrumboman",
+ "GR_Hurseman",
+ "GR_Manscarab",
+ "GR_Lizardman"
+ };
+
+ public static List supportedInitialAnimalRaces = new List()
+ {
+ "Bear_Grizzly",
+ "Bear_Polar",
+ "Boomalope",
+ "Chicken",
+ "Duck",
+ "Turkey",
+ "Goose",
+ "Ostrich",
+ "Emu",
+ "Cassowary",
+ "Cow",
+ "Muffalo",
+ "Bison",
+ "Yak",
+ "Warg",
+ "Wolf_Timber",
+ "Wolf_Arctic",
+ "Fox_Fennec",
+ "Fox_Red",
+ "Fox_Arctic",
+ "Husky",
+ "LabradorRetriever",
+ "YorkshireTerrier",
+ "Cougar",
+ "Panther",
+ "Lynx",
+ "Cat",
+ "GuineaPig",
+ "Hare",
+ "Snowhare",
+ "Squirrel",
+ "Rat",
+ "Raccoon",
+ "Thrumbo",
+ "Dromedary",
+ "Elk",
+ "Horse",
+ "Caribou",
+ "Donkey",
+ "Megascarab",
+ "Spelopede",
+ "Megaspider",
+ "Iguana",
+ "Cobra",
+ "Tortoise"
+ };
+
+ public static HediffDef controler = DefDatabase.GetNamed("rjw_genes_animal_control_hediff", false);
+
+ [HarmonyPostfix]
+ [HarmonyPatch("GenerateBabies")]
+ public static void addHedif (Hediff_BasePregnancy __instance)
+ {
+ if (controler == null) return;
+
+ foreach (Pawn baby in __instance.babies)
+ {
+ if(baby != null && supportedHybridRaces.Contains(baby.kindDef.race.defName))
+ baby.health.AddHediff(controler);
+ }
+ }
+
+ }
+}
diff --git a/Source/Animal_Inheritance/PatchRJWBestialityPregnancyUtility.cs b/Source/Animal_Inheritance/Patches/Patch_RJW_BestialityPregnancyUtility.cs
similarity index 64%
rename from Source/Animal_Inheritance/PatchRJWBestialityPregnancyUtility.cs
rename to Source/Animal_Inheritance/Patches/Patch_RJW_BestialityPregnancyUtility.cs
index 5224c4f..d8440e8 100644
--- a/Source/Animal_Inheritance/PatchRJWBestialityPregnancyUtility.cs
+++ b/Source/Animal_Inheritance/Patches/Patch_RJW_BestialityPregnancyUtility.cs
@@ -7,15 +7,20 @@ using HarmonyLib;
using RimWorld;
using Verse;
using rjw;
+using static RimWorld.PsychicRitualRoleDef;
namespace RJW_BGS
{
[HarmonyPatch(typeof(Hediff_BasePregnancy), "Initialize")]
- public static class PatchRJWBestialityPregnancyUtility
+ public static class Patch_RJW_BestialityPregnancyUtility
{
[HarmonyPostfix]
public static void AddGenes(Pawn mother, Pawn dad, ref Hediff_BasePregnancy __instance)
{
+ if (!RJW_BGSSettings.rjw_bgs_enabled)
+ {
+ return;
+ }
foreach (Pawn baby in __instance.babies)
{
if (baby.RaceProps.Humanlike)
@@ -25,20 +30,23 @@ namespace RJW_BGS
baby.genes = new Pawn_GeneTracker(baby);
}
+
//Remove the hair and skin genes pawns always start with, should get correct ones from human parent anyway.
for (int i = baby.genes.Endogenes.Count - 1; i >= 0; i--)
{
baby.genes.RemoveGene(baby.genes.Endogenes[i]);
}
- List genes = PregnancyUtility.GetInheritedGenes(dad, mother);
+ List humangenes = PregnancyUtility.GetInheritedGenes(dad, mother);
List beastgenes = InheritanceUtility.AnimalInheritedGenes(dad, mother);
InheritanceUtility.AddGenes(baby, beastgenes);
- InheritanceUtility.AddGenes(baby, genes);
- //foreach (GeneDef gene in genes)
- //{
- // baby.genes.AddGene(gene, false);
- //}
+ InheritanceUtility.AddGenes(baby, humangenes);
+
+ // The mix-breed babies should be labelled hybrids
+ baby.genes.hybrid = true;
+
+ //reason = "AbilityDisabledNoFertilinGene".Translate(this.parent.pawn);
+ baby.genes.xenotypeName = "rjw_genes_bestiality_hybrid".Translate();
}
}
}
diff --git a/Source/Animal_Inheritance/PatchRJWHediffInsect_Egg.cs b/Source/Animal_Inheritance/Patches/Patch_RJW_HediffInsect_Egg.cs
similarity index 87%
rename from Source/Animal_Inheritance/PatchRJWHediffInsect_Egg.cs
rename to Source/Animal_Inheritance/Patches/Patch_RJW_HediffInsect_Egg.cs
index d52f62d..9861537 100644
--- a/Source/Animal_Inheritance/PatchRJWHediffInsect_Egg.cs
+++ b/Source/Animal_Inheritance/Patches/Patch_RJW_HediffInsect_Egg.cs
@@ -1,19 +1,13 @@
-using System;
-using System.Collections.Generic;
+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_BGS
{
[HarmonyPatch(typeof(Hediff_InsectEgg), "GiveBirth")]
- public static class PatchRJWHediffInsect_Egg
+ public static class Patch_RJW_HediffInsect_Egg
{
[HarmonyTranspiler]
public static IEnumerable Transpiler(IEnumerable instructions)
diff --git a/Source/Animal_Inheritance/Patches/Patch_RJW_PregnancyHelper_VanillaExpandedGenetics.cs b/Source/Animal_Inheritance/Patches/Patch_RJW_PregnancyHelper_VanillaExpandedGenetics.cs
new file mode 100644
index 0000000..fab9645
--- /dev/null
+++ b/Source/Animal_Inheritance/Patches/Patch_RJW_PregnancyHelper_VanillaExpandedGenetics.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RJW_BGS;
+using HarmonyLib;
+using rjw;
+using static rjw.Hediff_BasePregnancy;
+using RJW_Genes;
+
+namespace RJW_BGS
+{
+ [HarmonyPatch(typeof(PregnancyHelper))]
+ public class Patch_RJW_PregnancyHelper_VanillaExpandedGenetics
+ {
+
+ ///
+ /// This Patch changes the pregnancy logic to check for possible hybridization.
+ /// Iff the hybrdiization applies, this prefix skips the normal AddPregnancyHediff (by returning false).
+ ///
+ /// Small Note: Below we use `Hediff_BasePregnancy.Create(mother, father, DnaGivingParent.Mother);`
+ /// This completely creates the pregnancy, it does not need to be assigned to anything or added to some hediffs.
+ ///
+ [HarmonyPrefix]
+ [HarmonyPatch("AddPregnancyHediff")]
+ public static bool AddPregnancyHediffPrefix(Pawn mother, Pawn father)
+ {
+ if (!RJW_BGSSettings.rjw_bgs_VE_genetics) return true;
+ if (mother == null || father == null) return true;
+ bool humanMotherAndSupportedAnimal = mother.IsHuman() && Patch_RJW_BasePregnancy_VanillaExpandedGenetics.supportedInitialAnimalRaces.Contains(father.kindDef.race.defName);
+ bool humanMotherAndSupportedHybrid = mother.IsHuman() && Patch_RJW_BasePregnancy_VanillaExpandedGenetics.supportedHybridRaces.Contains(father.kindDef.race.defName);
+ bool humanFatherAndSupportedAnimal = father.IsHuman() && Patch_RJW_BasePregnancy_VanillaExpandedGenetics.supportedInitialAnimalRaces.Contains(mother.kindDef.race.defName);
+ bool humanFatherAndSupportedHybrid = father.IsHuman() && Patch_RJW_BasePregnancy_VanillaExpandedGenetics.supportedHybridRaces.Contains(mother.kindDef.race.defName);
+
+ if (!(humanMotherAndSupportedAnimal || humanMotherAndSupportedHybrid||humanFatherAndSupportedAnimal|| humanFatherAndSupportedHybrid)) return true;
+ if (humanMotherAndSupportedAnimal)
+ {
+ Hediff_BasePregnancy.Create(mother, father, DnaGivingParent.Father);
+ return false;
+ }
+ else if (humanMotherAndSupportedHybrid)
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ RJW_Genes.ModLog.Message("preg hediffdefof PregnantHuman " + RimWorld.HediffDefOf.PregnantHuman);
+
+ PregnancyHelper.StartVanillaPregnancy(mother, father);
+ return false;
+ }
+ else if (humanFatherAndSupportedAnimal)
+ {
+ Hediff_BasePregnancy.Create(mother, father, DnaGivingParent.Mother);
+ return false;
+ }
+ else if (humanFatherAndSupportedHybrid)
+ {
+ Hediff_BasePregnancy.Create(mother, father, DnaGivingParent.Father);
+ return false;
+ }
+ return true;
+ }
+
+ }
+}
diff --git a/Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs b/Source/Animal_Inheritance/Patches/Patch_Vanilla_PregnancyUtility.cs
similarity index 63%
rename from Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs
rename to Source/Animal_Inheritance/Patches/Patch_Vanilla_PregnancyUtility.cs
index 0f5cc90..28f872f 100644
--- a/Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs
+++ b/Source/Animal_Inheritance/Patches/Patch_Vanilla_PregnancyUtility.cs
@@ -1,15 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using HarmonyLib;
using RimWorld;
using Verse;
-using rjw;
namespace RJW_BGS
{
+ ///
+ /// This Patch is applied to change the normal pregnancy to add animal-inheritance.
+ /// If the settings allow animal gene inheritance,
+ /// the genes are determined and "simply added".
+ ///
[HarmonyPatch(typeof(PregnancyUtility), "GetInheritedGeneSet", new Type[]
{
typeof(Pawn),
@@ -17,11 +19,15 @@ namespace RJW_BGS
//typeof(bool)
}
)]
- public static class PatchVanillaPregnancyUtility
+ public static class Patch_Vanilla_PregnancyUtility
{
[HarmonyPostfix]
public static void AnimalInheritedGenes(Pawn father, Pawn mother, ref GeneSet __result)
{
+ if (!RJW_BGSSettings.rjw_bgs_enabled)
+ {
+ return;
+ }
List genes = InheritanceUtility.AnimalInheritedGenes(father, mother);
if (genes.Any())
{
@@ -29,7 +35,7 @@ namespace RJW_BGS
{
__result.AddGene(gene);
}
- }
+ }
}
}
}
diff --git a/Source/Animal_Inheritance/RJW_BGSSettings.cs b/Source/Animal_Inheritance/RJW_BGSSettings.cs
deleted file mode 100644
index 1d5d859..0000000
--- a/Source/Animal_Inheritance/RJW_BGSSettings.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using UnityEngine;
-
-namespace RJW_Genes.Animal_Inheritance
-{
- public class RJW_BGSSettings : ModSettings
- {
- public static void DoWindowContents(Rect inRect)
- {
- //Copied from RJW settings mostly
- Rect outRect = new Rect(0f, 30f, inRect.width, inRect.height - 30f);
- Rect rect = new Rect(0f, 0f, inRect.width - 16f, inRect.height + 300f);
- //Widgets.BeginScrollView(outRect, ref RJWSettings.scrollPosition, rect, true);
- Listing_Standard listing_Standard = new Listing_Standard();
- listing_Standard.maxOneColumn = true;
- listing_Standard.ColumnWidth = rect.width / 2.05f;
- listing_Standard.Begin(rect);
- listing_Standard.Gap(24f);
- listing_Standard.CheckboxLabeled("enabled", ref enabled, "no function yet", 0f, 1f);
- //listing_Standard.CheckboxLabeled("sexfrenzy", ref sexfrenzy, "disable the effects", 0f, 1f);
- listing_Standard.End();
- }
-
- public override void ExposeData()
- {
- base.ExposeData();
- Scribe_Values.Look(ref RJW_BGSSettings.enabled, "enabled", RJW_BGSSettings.enabled, true);
- }
-
- public static bool enabled;
- }
-}
diff --git a/Source/Animal_Inheritance/RaceGeneDef_Helper.cs b/Source/Animal_Inheritance/RaceGeneDef_Helper.cs
deleted file mode 100644
index ed6541a..0000000
--- a/Source/Animal_Inheritance/RaceGeneDef_Helper.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using rjw;
-using Verse;
-using RimWorld;
-
-namespace RJW_BGS
-{
- internal class RJWcopy
- {
- //code based on racegroupdefinternal which has a similar function
- public static RaceGeneDef GetRaceGeneDefInternal(Pawn pawn)
- {
- PawnKindDef kindDef = pawn.kindDef;
- if (kindDef == null)
- {
- return null;
- }
- string raceName = kindDef.race.defName;
- string pawnKindName = kindDef.defName;
- IEnumerable allDefs = DefDatabase.AllDefs;
- PawnData pawnData = SaveStorage.DataStore.GetPawnData(pawn);
- RaceGroupDef raceGroupDef = pawnData.RaceSupportDef;
- List pawnKindDefs = allDefs.Where(delegate (RaceGeneDef group)
- {
- List pawnKindNames = group.pawnKindNames;
- return pawnKindNames != null && pawnKindNames.Contains(pawnKindName);
- }).ToList();
- List raceKindDefs = allDefs.Where(delegate (RaceGeneDef group)
- {
- List raceNames = group.raceNames;
- return raceNames != null && raceNames.Contains(raceName);
- }).ToList();
- List raceGroupDefs = new List();
- if (raceGroupDef != null)
- {
- raceGroupDefs = allDefs.Where(delegate (RaceGeneDef group)
- {
- String raceGroupDefName = group.raceGroup;
- return raceGroupDefName != null && raceGroupDefName == raceGroupDef.defName;
- }).ToList();
- }
- RaceGeneDef result = null;
- //First check if there is a matching pawnkinddef then race, then racegroup
- if (pawnKindDefs.Any())
- {
- result = pawnKindDefs.RandomElement();
- }
- else if (raceKindDefs.Any() && result == null)
- {
- result = raceKindDefs.RandomElement();
- }
- else if (raceGroupDefs.Any() && result == null)
- {
- result = raceGroupDefs.RandomElement();
- }
- else
- {
- result = null;
- }
- return result;
-
-
- }
- }
-}
diff --git a/Source/Animal_Inheritance/Settings/RJW_BGSSettings.cs b/Source/Animal_Inheritance/Settings/RJW_BGSSettings.cs
new file mode 100644
index 0000000..854df07
--- /dev/null
+++ b/Source/Animal_Inheritance/Settings/RJW_BGSSettings.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using UnityEngine;
+
+namespace RJW_BGS
+{
+ public class RJW_BGSSettings : ModSettings
+ {
+ public static void DoWindowContents(Rect inRect)
+ {
+ //Copied from RJW settings mostly
+ Rect outRect = new Rect(0f, 30f, inRect.width, inRect.height - 30f);
+ Rect rect = new Rect(0f, 0f, inRect.width - 16f, inRect.height + 300f);
+ //Widgets.BeginScrollView(outRect, ref RJWSettings.scrollPosition, rect, true);
+ Listing_Standard listing_Standard = new Listing_Standard();
+ listing_Standard.maxOneColumn = true;
+ listing_Standard.ColumnWidth = rect.width / 2.05f;
+ listing_Standard.Begin(rect);
+ listing_Standard.Gap(24f);
+ listing_Standard.CheckboxLabeled("rjw_genes_animal_inheritance_settings_enabled_key".Translate(), ref rjw_bgs_enabled, "rjw_genes_animal_inheritance_settings_enabled_explanation".Translate(), 0f, 1f);
+ //listing_Standard.CheckboxLabeled("sexfrenzy", ref sexfrenzy, "disable the effects", 0f, 1f);
+ listing_Standard.Gap(5f);
+ listing_Standard.Label("gene inheritance chance"+ ": " +
+ Math.Round((double)(RJW_BGSSettings.rjw_bgs_global_gene_chance * 100f), 0).ToString() + "%", -1f, "modify chance for a gene to be inherited.");
+ RJW_BGSSettings.rjw_bgs_global_gene_chance = listing_Standard.Slider(RJW_BGSSettings.rjw_bgs_global_gene_chance, 0f, 5f);
+ listing_Standard.Gap(5f);
+ listing_Standard.CheckboxLabeled("rjw_genes_animal_inheritance_settings_added_as_xenogene_key".Translate(), ref rjw_bgs_animal_genes_as_xenogenes, "rjw_genes_animal_inheritance_settings_added_as_xenogene_explanation".Translate(), 0f, 1f);
+ listing_Standard.Gap(5f);
+ listing_Standard.CheckboxLabeled("rjw_genes_animal_inheritance_settings_ve_genetics_hybridization_key".Translate(), ref rjw_bgs_VE_genetics, "rjw_genes_animal_inheritance_settings_ve_genetics_hybridization_explanation".Translate(), 0f, 1f);
+ listing_Standard.Gap(5f);
+ listing_Standard.CheckboxLabeled("rjw_genes_animal_inheritance_settings_detailed_debug_key".Translate(), ref rjw_bgs_detailed_debug, "rjw_genes_animal_inheritance_settings_detailed_debug_explanation".Translate(), 0f, 1f);
+ listing_Standard.End();
+ }
+
+ public override void ExposeData()
+ {
+ base.ExposeData();
+ Scribe_Values.Look(ref RJW_BGSSettings.rjw_bgs_enabled, "rjw_bgs_enabled", RJW_BGSSettings.rjw_bgs_enabled, true);
+ Scribe_Values.Look(ref RJW_BGSSettings.rjw_bgs_global_gene_chance, "rjw_bgs_global_gene_chance", RJW_BGSSettings.rjw_bgs_global_gene_chance, true);
+ Scribe_Values.Look(ref RJW_BGSSettings.rjw_bgs_animal_genes_as_xenogenes, "rjw_bgs_animal_genes_as_xenogenes", RJW_BGSSettings.rjw_bgs_animal_genes_as_xenogenes, true);
+ Scribe_Values.Look(ref RJW_BGSSettings.rjw_bgs_detailed_debug, "rjw_bgs_detailed_debug", RJW_BGSSettings.rjw_bgs_detailed_debug, true);
+ Scribe_Values.Look(ref RJW_BGSSettings.rjw_bgs_VE_genetics, "rjw_bgs_VE_genetics", RJW_BGSSettings.rjw_bgs_VE_genetics, true);
+ }
+
+ public static float rjw_bgs_global_gene_chance = 1f;
+ public static bool rjw_bgs_enabled = true;
+ public static bool rjw_bgs_animal_genes_as_xenogenes = false;
+ public static bool rjw_bgs_detailed_debug = false;
+ public static bool rjw_bgs_VE_genetics = true;
+ }
+}
diff --git a/Source/Animal_Inheritance/RJW_BGSSettingsController.cs b/Source/Animal_Inheritance/Settings/RJW_BGSSettingsController.cs
similarity index 94%
rename from Source/Animal_Inheritance/RJW_BGSSettingsController.cs
rename to Source/Animal_Inheritance/Settings/RJW_BGSSettingsController.cs
index 53a7659..12ef107 100644
--- a/Source/Animal_Inheritance/RJW_BGSSettingsController.cs
+++ b/Source/Animal_Inheritance/Settings/RJW_BGSSettingsController.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using Verse;
using UnityEngine;
-namespace RJW_Genes.Animal_Inheritance
+namespace RJW_BGS
{
public class RJW_BGSSettingsController : Mod
{
diff --git a/Source/Animal_Inheritance/BestialityGeneInheritanceDef.cs b/Source/Common/Defs/ChanceExtension.cs
similarity index 51%
rename from Source/Animal_Inheritance/BestialityGeneInheritanceDef.cs
rename to Source/Common/Defs/ChanceExtension.cs
index 04a9735..ff8b260 100644
--- a/Source/Animal_Inheritance/BestialityGeneInheritanceDef.cs
+++ b/Source/Common/Defs/ChanceExtension.cs
@@ -3,12 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Verse;
-namespace RJW_BGS
+namespace RJW_Genes
{
- public class BestialityGeneInheritanceDef
+ public class ChanceExtension : DefModExtension
{
- public string defName;
- public float chance = 1f;
+ public float chance;
}
+
}
diff --git a/Source/Common/Defs/DistanceExtension.cs b/Source/Common/Defs/DistanceExtension.cs
new file mode 100644
index 0000000..8bdd083
--- /dev/null
+++ b/Source/Common/Defs/DistanceExtension.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+
+ ///
+ /// Small Extension that covers distances for Genes.
+ /// This allows to set distance in the XMLs.
+ /// The distance is measured in tiles, so a distance of ~25 means 25 tiles away from the pawn in any direction.
+ ///
+ public class DistanceExtension : DefModExtension
+ {
+ public int distance;
+ }
+}
\ No newline at end of file
diff --git a/Source/Common/Defs/HediffIncreaseOnSexExtension.cs b/Source/Common/Defs/HediffIncreaseOnSexExtension.cs
new file mode 100644
index 0000000..c5f648f
--- /dev/null
+++ b/Source/Common/Defs/HediffIncreaseOnSexExtension.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class HediffIncreaseOnSexExtension: DefModExtension
+ {
+ public HediffDef hediffDef;
+ public float severityIncrease;
+ public float applicationChance;
+
+ public bool canCreateHediff;
+
+ public bool applicableForWomen;
+ public bool applicableForMen;
+ public bool requiresPenetrativeSex;
+ }
+
+}
diff --git a/Source/Common/Defs/ModExtensionHelper.cs b/Source/Common/Defs/ModExtensionHelper.cs
new file mode 100644
index 0000000..d75fc12
--- /dev/null
+++ b/Source/Common/Defs/ModExtensionHelper.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ internal class ModExtensionHelper
+ {
+
+ public static int GetDistanceFromModExtension(GeneDef defOf, int fallback)
+ {
+ DistanceExtension distanceExt = defOf.GetModExtension();
+
+ int potentialDistance = distanceExt?.distance ?? fallback;
+
+ if (potentialDistance > 0)
+ {
+ return potentialDistance;
+ } else {
+ ModLog.Warning($"Retrieved a bad distance ({potentialDistance}) reading the RJW_Genes.DistanceExtension for {defOf.defName}");
+ return 1;
+ }
+ }
+
+
+ public static int GetTickIntervalFromModExtension(GeneDef defOf, int fallback)
+ {
+ TickIntervalExtension tickExt = defOf.GetModExtension();
+
+ int potentialTickInterval = tickExt?.tickInterval ?? fallback;
+
+ if (potentialTickInterval > 0)
+ {
+ return potentialTickInterval;
+ }
+ else
+ {
+ ModLog.Warning($"Retrieved a bad distance ({potentialTickInterval}) reading the RJW_Genes.DistanceExtension for {defOf.defName}");
+ return 1;
+ }
+ }
+
+
+ }
+}
diff --git a/Source/Common/Defs/MultiplierExtension.cs b/Source/Common/Defs/MultiplierExtension.cs
new file mode 100644
index 0000000..5be194e
--- /dev/null
+++ b/Source/Common/Defs/MultiplierExtension.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class MultiplierExtension : DefModExtension
+ {
+ public float multiplier;
+ }
+}
diff --git a/Source/Common/Defs/TickBasedChanceExtension.cs b/Source/Common/Defs/TickBasedChanceExtension.cs
new file mode 100644
index 0000000..1a8feca
--- /dev/null
+++ b/Source/Common/Defs/TickBasedChanceExtension.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 TickBasedChanceExtension : TickIntervalExtension
+ {
+ ///
+ /// Set to 1 for "always", set to 0 for "never".
+ /// Everything else is a bit statistics, but e.g. when set to .5 the chances grow per day from [50%, 75%, 82.25%, ...]
+ ///
+ public float eventChance;
+ }
+}
diff --git a/Source/Common/Defs/TickIntervalExtension.cs b/Source/Common/Defs/TickIntervalExtension.cs
new file mode 100644
index 0000000..3e8184c
--- /dev/null
+++ b/Source/Common/Defs/TickIntervalExtension.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
+{
+ ///
+ /// General DefModExtension to cover various genes that need to tick regularly.
+ /// Defining it like this allows to adjust things in XML.
+ ///
+ public class TickIntervalExtension : DefModExtension
+ {
+ public int tickInterval;
+ }
+}
diff --git a/Source/Common/Either.cs b/Source/Common/Either.cs
new file mode 100644
index 0000000..dcd6dd8
--- /dev/null
+++ b/Source/Common/Either.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RJW_Genes
+{
+ public class Either
+ {
+ public readonly TL left;
+ public readonly TR right;
+ public readonly bool isLeft;
+
+ public Either(TL left)
+ {
+ this.left = left;
+ this.isLeft = true;
+ }
+
+ public Either(TR right)
+ {
+ this.right = right;
+ this.isLeft = false;
+ }
+ }
+
+}
diff --git a/Source/Common/Helpers/FactionUtility.cs b/Source/Common/Helpers/FactionUtility.cs
new file mode 100644
index 0000000..10a4e7c
--- /dev/null
+++ b/Source/Common/Helpers/FactionUtility.cs
@@ -0,0 +1,42 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class FactionUtility
+ {
+
+ ///
+ /// Tries to change the goodwill between the factions of two pawns.
+ /// Exceptions when nothing happens:
+ /// - Pawns, or Pawns Factions, are null
+ /// - The `actors` Faction is not the players faction
+ /// - Both pawns have the same faction
+ /// - The Event is not found
+ ///
+ /// The pawn that initiated a faction-goodwill change by his actions
+ /// The pawn that was harmed/affected by the action
+ /// The event defname, for proper reporting
+ /// How much (positive or negative) the goodwill will change
+ public static void HandleFactionGoodWillPenalties(Pawn actor, Pawn target, string HistoryEventDefname, int goodWillChange, bool canSendHostileLetter=true)
+ {
+ if (actor == null) return;
+ if (target == null) return;
+ if (
+ target.Faction != null && actor.Faction != null
+ && target.Faction != actor.Faction
+ && target.Faction != Faction.OfPlayer)
+ {
+ HistoryEventDef reason = DefDatabase.GetNamedSilentFail(HistoryEventDefname);
+ if (reason == null) return;
+
+ target.Faction.TryAffectGoodwillWith(actor.Faction, goodWillChange, true, canSendHostileLetter, reason, target);
+ }
+ }
+ }
+}
diff --git a/Source/Common/Helpers/LaborState.cs b/Source/Common/Helpers/LaborState.cs
new file mode 100644
index 0000000..8a0e59d
--- /dev/null
+++ b/Source/Common/Helpers/LaborState.cs
@@ -0,0 +1,24 @@
+
+using Verse;
+
+
+namespace RJW_Genes
+{
+ class LaborState
+ {
+ public Pawn pawn;
+ public int birthTotal = 0;
+ public int birthCount = 1;
+ public bool hasOvaryAgitator = false;
+ public bool hasBioscaffold = false;
+
+ public LaborState(Pawn pawn, int birthTotal)
+ {
+ this.pawn = pawn;
+ this.birthTotal = birthTotal;
+ this.birthCount = 0;
+ this.hasOvaryAgitator = pawn.health.hediffSet.HasHediff(HediffDef.Named("OvaryAgitator"));
+ this.hasBioscaffold = pawn.health.hediffSet.HasHediff(HediffDef.Named("OvaryAgitator"));
+ }
+ }
+}
diff --git a/Source/Common/Helpers/MapUtility.cs b/Source/Common/Helpers/MapUtility.cs
new file mode 100644
index 0000000..79e45a6
--- /dev/null
+++ b/Source/Common/Helpers/MapUtility.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class MapUtility
+ {
+ ///
+ /// Checks if the pawn is on the players home map.
+ ///
+ /// Reason is that drones should only be punished for absence of queen if they are on the map and there is no queen.
+ /// If they are on a mission, transport-pod etc. they should not get boni or mali.
+ ///
+ /// The pawn for which to check map-presence.
+ /// True if the pawn is on the home-map, False otherwise.
+ public static bool PawnIsOnHomeMap(Pawn pawn)
+ {
+ if (Find.Maps.NullOrEmpty() || !Find.Maps.Where(mapCandidate => mapCandidate.IsPlayerHome).Any())
+ {
+ return false;
+ }
+ Map homeMap = Find.Maps.Where(mapCandidate => mapCandidate.IsPlayerHome).First();
+ return
+ homeMap != null && pawn != null
+ && pawn.Spawned
+ && pawn.Map == homeMap;
+ }
+
+ }
+}
diff --git a/Source/Common/ModLog.cs b/Source/Common/ModLog.cs
new file mode 100644
index 0000000..b78e675
--- /dev/null
+++ b/Source/Common/ModLog.cs
@@ -0,0 +1,41 @@
+using Verse;
+
+namespace RJW_Genes
+{
+ internal class ModLog
+ {
+ public static string ModId => "RJW-Genes";
+
+ ///
+ /// Logs the given message with [SaveStorage.ModId] appended.
+ ///
+ public static void Error(string message)
+ {
+ Log.Error($"[{ModId}] {message}");
+ }
+
+ ///
+ /// Logs the given message with [SaveStorage.ModId] appended.
+ ///
+ public static void Message(string message)
+ {
+ Log.Message($"[{ModId}] {message}");
+ }
+
+ ///
+ /// Logs the given message with [SaveStorage.ModId] appended.
+ ///
+ public static void Warning(string message)
+ {
+ Log.Warning($"[{ModId}] {message}");
+ }
+
+ public static void Debug(string message)
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ {
+ Log.Message($"[{ModId}][debug] {message}");
+ }
+ }
+ }
+}
diff --git a/Source/Common/patches/PatchImplants.cs b/Source/Common/patches/PatchImplants.cs
new file mode 100644
index 0000000..037e081
--- /dev/null
+++ b/Source/Common/patches/PatchImplants.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using HarmonyLib;
+using RimWorld;
+using Verse;
+using rjw;
+
+
+namespace RJW_Genes
+{
+
+ public class PatchImplants
+ {
+ public static readonly ThoughtDef regretsStealingLovin = DefDatabase.GetNamed("RegretsStealingLovin");
+ public static readonly ThoughtDef stoleSomeLovin = DefDatabase.GetNamed("StoleSomeLovin");
+ public static readonly ThoughtDef bloodlustStoleSomeLovin = DefDatabase.GetNamed("BloodlustStoleSomeLovin");
+ public static readonly TraitDef rapist = DefDatabase.GetNamed("Rapist");
+
+ static Dictionary laborStateMap = new Dictionary();
+ static public void would_rape_PostFix(ref bool __result, Pawn rapist)
+ {
+ if (rapist.health.hediffSet.HasHediff(HediffDef.Named("LimbicStimulator")))
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ {
+ ModLog.Message("Found LimbicStimulator hediff during xxx.would_rape check");
+ ModLog.Message("Pawn: " + rapist.NameShortColored + " (" + rapist.ThingID + ")");
+ ModLog.Message("__result (Before roll): " + __result);
+ }
+ __result = Rand.Chance(0.95f);
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ {
+ ModLog.Message("__result (After roll): " + __result);
+ }
+ }
+ }
+
+ static public void is_rapist_PostFix(ref bool __result, Pawn pawn)
+ {
+ if (pawn.health.hediffSet.HasHediff(HediffDef.Named("LimbicStimulator")))
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ {
+ ModLog.Message("Found LimbicStimulator hediff during xxx.is_rapist check for " + pawn.NameShortColored + " (" + pawn.ThingID + ")" + " with __result = " + __result + " - forcing to true");
+ __result = true;
+ }
+ }
+ }
+
+ static public void think_about_sex_Rapist_PostFix(ref ThoughtDef __result, Pawn pawn)
+ {
+ if (RJW_Genes_Settings.regretStealingLovinThoughtDisabled) return;
+
+ if (pawn.health.hediffSet.HasHediff(HediffDef.Named("LimbicStimulator")) && (__result == stoleSomeLovin || __result == bloodlustStoleSomeLovin) && !pawn.story.traits.HasTrait(rapist))
+ {
+ __result = regretsStealingLovin;
+ }
+ }
+
+
+ public static void MultiplyPregnancy(ref float __result, Pawn pawn)
+ {
+ if (pawn != null && pawn.health.hediffSet.HasHediff(HediffDef.Named("Bioscaffold")))
+ {
+ __result *= 2f;
+ }
+ }
+ }
+}
diff --git a/Source/Common/patches/PatchPregnancyHelper.cs b/Source/Common/patches/PatchPregnancyHelper.cs
new file mode 100644
index 0000000..d646323
--- /dev/null
+++ b/Source/Common/patches/PatchPregnancyHelper.cs
@@ -0,0 +1,261 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using HarmonyLib;
+using RimWorld;
+using Verse;
+using rjw;
+using RJW_Genes;
+using rjw.Modules.Interactions.Enums;
+
+namespace RJW_Genes
+{
+ [HarmonyPatch(typeof(PregnancyHelper))]
+ public class PatchPregnancyHelper
+ {
+ public static HediffDef vasectomydef = DefDatabase.GetNamed("Vasectomy", true);
+ // Token: 0x0600000F RID: 15
+ [HarmonyPostfix]
+ [HarmonyPatch("impregnate")]
+ private static void ImpregnatePostfix(ref SexProps props)
+ {
+
+ if (RJWSettings.DevMode) rjw.ModLog.Message("Rimjobworld::impregnate(" + props.sexType + "):: " + xxx.get_pawnname(props.pawn) + " + " + xxx.get_pawnname(props.partner) + ":");
+
+ //"mech" pregnancy
+ if (props.sexType == xxx.rjwSextype.MechImplant)
+ {
+ return;
+ }
+
+ Pawn giver = props.pawn; // orgasmer
+ Pawn receiver = props.partner;
+
+ if (receiver.genes == null)
+ {
+ return;
+ }
+ Hediff vasectomy;
+ receiver.health.hediffSet.TryGetHediff(vasectomydef, out vasectomy);
+
+
+
+ List pawnparts = giver.GetGenitalsList();
+ List partnerparts = receiver.GetGenitalsList();
+ var interaction = rjw.Modules.Interactions.Helpers.InteractionHelper.GetWithExtension(props.dictionaryKey);
+
+
+ if (!(props.sexType == xxx.rjwSextype.Anal && receiver.genes.HasActiveGene(GeneDefOf.rjw_genes_fertile_anus)))
+ return;
+
+ //"normal" and "beastial" pregnancy
+ if (RJWSettings.DevMode) ModLog.Message(" 'normal' pregnancy checks");
+
+ //interaction stuff if for handling futa/see who penetrates who in interaction
+ if (!props.isReceiver &&
+ interaction.DominantHasTag(GenitalTag.CanPenetrate) &&
+ interaction.SubmissiveHasFamily(GenitalFamily.Anus))
+ {
+ if (RJWSettings.DevMode) ModLog.Message(" impregnate - by initiator");
+ }
+ else if (props.isReceiver && props.isRevese &&
+ interaction.DominantHasFamily(GenitalFamily.Anus) &&
+ interaction.SubmissiveHasTag(GenitalTag.CanPenetrate))
+ {
+ if (RJWSettings.DevMode) ModLog.Message(" impregnate - by receiver (reverse)");
+ }
+ else
+ {
+ if (RJWSettings.DevMode) ModLog.Message(" no valid interaction tags/family");
+ return;
+ }
+
+ if (!rjw.Modules.Interactions.Helpers.PartHelper.FindParts(giver, GenitalTag.CanFertilize).Any())
+ {
+ if (RJWSettings.DevMode) ModLog.Message(xxx.get_pawnname(giver) + " has no parts to Fertilize with");
+ return;
+ }
+ if (vasectomy != null)
+ {
+ if (RJWSettings.DevMode) ModLog.Message("vasectomy check");
+ receiver.health.RemoveHediff(vasectomy);
+ }
+ if (CanImpregnate2(giver, receiver, props.sexType))
+ {
+
+ PregnancyHelper.DoImpregnate(giver, receiver);
+
+ }
+ if (vasectomy != null)
+ {
+ if (RJWSettings.DevMode) ModLog.Message("vasectomy check");
+ receiver.health.AddHediff(vasectomy);
+ }
+ }
+
+ private static bool CanImpregnate2(Pawn fucker, Pawn fucked, xxx.rjwSextype sexType)
+ {
+
+ if (fucker == null || fucked == null)
+ {
+ return false;
+
+ }
+ if (RJWSettings.DevMode)
+ {
+ rjw.ModLog.Message(string.Concat(new string[]
+ {
+ "Rimjobworld::CanImpregnate checks (",
+ sexType.ToString(),
+ "):: ",
+ xxx.get_pawnname(fucker),
+ " + ",
+ xxx.get_pawnname(fucked),
+ ":"
+ }));
+ }
+ if (sexType == xxx.rjwSextype.MechImplant && !RJWPregnancySettings.mechanoid_pregnancy_enabled)
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(" mechanoid 'pregnancy' disabled");
+ }
+ return false;
+
+ }
+ if (sexType != xxx.rjwSextype.Vaginal && sexType != xxx.rjwSextype.DoublePenetration && !(sexType == xxx.rjwSextype.Anal && fucked.genes.HasActiveGene(GeneDefOf.rjw_genes_fertile_anus)))
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(" sextype cannot result in pregnancy");
+ }
+ return false;
+
+ }
+ if (AndroidsCompatibility.IsAndroid(fucker) && AndroidsCompatibility.IsAndroid(fucked))
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(xxx.get_pawnname(fucked) + " androids cant breed/reproduce androids");
+ }
+ return false;
+
+ }
+ if ((fucker.IsUnsexyRobot() || fucked.IsUnsexyRobot()) && sexType != xxx.rjwSextype.MechImplant)
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(" unsexy robot cant be pregnant");
+ }
+ return false;
+
+ }
+ if (!fucker.RaceHasPregnancy())
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(xxx.get_pawnname(fucked) + " filtered race that cant be pregnant");
+ }
+ return false;
+
+ }
+ if (!fucked.RaceHasPregnancy())
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(xxx.get_pawnname(fucker) + " filtered race that cant impregnate");
+ }
+ return false;
+
+ }
+ if (fucked.IsPregnant(false))
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(" already pregnant.");
+ }
+ return false;
+
+ }
+ List source = new List();
+ fucked.health.hediffSet.GetHediffs(ref source, null);
+ if (source.Count > 1)
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(xxx.get_pawnname(fucked) + " cant get pregnant while eggs inside");
+ }
+ return false;
+
+ }
+ List genitalsList = fucker.GetGenitalsList();
+ List genitalsList2 = fucked.GetGenitalsList();
+ if (!Genital_Helper.has_penis_fertile(fucker, genitalsList) && !Genital_Helper.has_penis_fertile(fucked, genitalsList2))
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(" missing genitals for impregnation"+ Genital_Helper.has_penis_fertile(fucker, genitalsList)+" "+ Genital_Helper.has_anus(fucked, genitalsList2)+" "+ Genital_Helper.has_penis_fertile(fucked, genitalsList2)+" "+ Genital_Helper.has_anus(fucker, genitalsList));
+ }
+ return false;
+ }
+ if (fucker.health.capacities.GetLevel(xxx.reproduction) <= 0f || fucked.health.capacities.GetLevel(xxx.reproduction) <= 0f)
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(" one (or both) pawn(s) infertile");
+ }
+ return false;
+
+ }
+ if (xxx.is_human(fucked) && xxx.is_human(fucker) && (RJWPregnancySettings.humanlike_impregnation_chance == 0 || !RJWPregnancySettings.humanlike_pregnancy_enabled))
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(" human pregnancy chance set to 0% or pregnancy disabled.");
+ }
+ return false;
+
+ }
+ if (((xxx.is_animal(fucker) && xxx.is_human(fucked)) || (xxx.is_human(fucker) && xxx.is_animal(fucked))) && !RJWPregnancySettings.bestial_pregnancy_enabled)
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(" bestiality pregnancy chance set to 0% or pregnancy disabled.");
+ }
+ return false;
+
+ }
+ if (xxx.is_animal(fucked) && xxx.is_animal(fucker) && (RJWPregnancySettings.animal_impregnation_chance == 0 || !RJWPregnancySettings.animal_pregnancy_enabled))
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(" animal-animal pregnancy chance set to 0% or pregnancy disabled.");
+ }
+ return false;
+
+ }
+ if (fucker.def.defName != fucked.def.defName && RJWPregnancySettings.interspecies_impregnation_modifier <= 0f && !RJWPregnancySettings.complex_interspecies)
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(" interspecies pregnancy disabled.");
+ }
+ return false;
+
+ }
+ if (fucked.RaceProps.gestationPeriodDays <= 0f && fucked.TryGetComp() == null)
+ {
+ if (RJWSettings.DevMode)
+ {
+ ModLog.Message(xxx.get_pawnname(fucked) + " mother.RaceProps.gestationPeriodDays is " + fucked.RaceProps.gestationPeriodDays.ToString() + " cant impregnate");
+ }
+ return false;
+ }
+
+ return true;
+ }
+
+ }
+}
diff --git a/Source/Common/patches/Patch_HediffIncreaseOnSex.cs b/Source/Common/patches/Patch_HediffIncreaseOnSex.cs
new file mode 100644
index 0000000..55e85a3
--- /dev/null
+++ b/Source/Common/patches/Patch_HediffIncreaseOnSex.cs
@@ -0,0 +1,80 @@
+using HarmonyLib;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+
+ ///
+ /// This patch "only" applies the hediff increase on sex.
+ /// It checks for the hediff, creates it if necessary and applicable,
+ /// and increases it based on the severity, chance and genders specified in the Extension.
+ ///
+ /// Some hediffs want follow up logic, e.g. the Feminization Gene,
+ /// which is handled in an extra patch (that requires the hediff to be present already).
+ ///
+ [HarmonyPatch(typeof(SexUtility), "Aftersex")]
+ public class Patch_HediffIncreaseOnSex
+ {
+
+ public static void Postfix(SexProps props)
+ {
+ if (props == null || props.pawn == null || props.partner == null || props.partner.IsAnimal() || props.pawn.IsAnimal())
+ {
+ return;
+ }
+
+ Pawn pawn = props.pawn;
+ Pawn partner = props.partner;
+
+ if (pawn.genes == null || partner.genes == null) return;
+
+ TryApplyHediffsOfSex(pawn, partner, props);
+ TryApplyHediffsOfSex(partner, pawn, props);
+ }
+
+ ///
+ /// Checks for every gene in a pawn if it applies a hediff or the severity of an existing hediff in a sexual partner.
+ /// If the checks pass, the hediff is added or changed accordingly.
+ ///
+ /// Pawn that holds (one or many) genes that might apply a hediff change
+ /// Pawn that will receive or alter any hediffs, if applicable
+ /// The Sexprops, used for checking if sex is penetrative
+ static void TryApplyHediffsOfSex(Pawn pawn, Pawn partner, SexProps props)
+ {
+ var random = new Random();
+
+ foreach (Gene gene in pawn.genes.GenesListForReading)
+ {
+ HediffIncreaseOnSexExtension ext = gene.def.GetModExtension();
+ if (ext == null) continue;
+
+ if (DiseaseHelper.IsImmuneAgainstGeneticDisease(partner, gene.def)) continue;
+ if (ext.requiresPenetrativeSex && DiseaseHelper.IsPenetrativeSex(props)) continue;
+ if (!ext.applicableForMen && partner.gender == Gender.Male) continue;
+ if (!ext.applicableForWomen && partner.gender == Gender.Female) continue;
+ if (random.NextDouble() >= ext.applicationChance) continue;
+
+ Hediff hediff = partner.health.hediffSet.GetFirstHediffOfDef(ext.hediffDef);
+ if (hediff == null)
+ {
+ if (!ext.canCreateHediff) continue;
+ hediff = partner.health.GetOrAddHediff(ext.hediffDef);
+ hediff.Severity = 0.01f;
+ ModLog.Debug($"{partner} got hediff {hediff.def.defName} from Patch_HediffIncreaseOnSex ({gene.def.defName}) upon sex with {pawn}");
+ }
+ float initial_severity = hediff.Severity;
+ ModLog.Debug($"{partner}s hediff {hediff.def.defName} was changed by Patch_HediffIncreaseOnSex ({gene.def.defName}) upon sex with {pawn} [from {initial_severity} to {initial_severity + ext.severityIncrease}]");
+ hediff.Severity += ext.severityIncrease;
+
+ // DevNote: I also want to have "negative" hediff changes here, but I think its not necessary. Once the severity reaches 0, or below, the hediff should remove itself.
+ }
+ }
+
+ }
+}
diff --git a/Source/Common/patches/Patch_ParentRelationUtility_GetParents.cs b/Source/Common/patches/Patch_ParentRelationUtility_GetParents.cs
new file mode 100644
index 0000000..d6f2d94
--- /dev/null
+++ b/Source/Common/patches/Patch_ParentRelationUtility_GetParents.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using HarmonyLib;
+using RimWorld;
+using Verse;
+using rjw;
+
+namespace RJW_Genes
+{
+ ///
+ /// This Patch handles the changes to Fathers / Mothers when dealing with Femboys and Male/Male Pregnancies.
+ ///
+ /// This is related to
+ ///
+ [HarmonyPatch(typeof(ParentRelationUtility))]
+ public class Patch_ParentRelationUtility_GetParents
+ {
+
+ [HarmonyPostfix]
+ [HarmonyPatch("GetFather")]
+ private static void FatherPostfix(ref Pawn __result, Pawn pawn)
+ {
+ if (__result == null && pawn.RaceProps.IsFlesh && pawn.relations != null)
+ {
+ List directRelations = pawn.relations.DirectRelations;
+ bool flag = false;
+ for (int i = 0; i < directRelations.Count; i++)
+ {
+ DirectPawnRelation directPawnRelation = directRelations[i];
+ if (directPawnRelation.def == PawnRelationDefOf.Parent)
+ {
+ if (flag)
+ {
+ __result = directPawnRelation.otherPawn;
+ return;
+ }
+ flag = true;
+ }
+ }
+ }
+ }
+
+ [HarmonyPostfix]
+ [HarmonyPatch("GetMother")]
+ private static void MotherPostfix(ref Pawn __result, Pawn pawn)
+ {
+ if (__result == null && pawn.RaceProps.IsFlesh && pawn.relations != null)
+ {
+ List directRelations = pawn.relations.DirectRelations;
+ for (int i = 0; i < directRelations.Count; i++)
+ {
+ DirectPawnRelation directPawnRelation = directRelations[i];
+ if (directPawnRelation.def == PawnRelationDefOf.Parent)
+ {
+ __result = directPawnRelation.otherPawn;
+ return;
+ }
+ }
+ }
+ }
+
+
+ [HarmonyPostfix]
+ [HarmonyPatch("HasSameFather")]
+ private static void HasSameFatherPostfix(ref bool __result, Pawn pawn, Pawn other)
+ {
+ if (!__result && pawn.RaceProps.IsFlesh && pawn.relations != null)
+ {
+ Pawn parent = pawn.GetFather();
+ Pawn parent2 = other.GetMother();
+ Pawn parent3 = other.GetFather();
+ Pawn parent4 = pawn.GetMother();
+ if (parent != null && parent2 != null && parent == parent2)
+ {
+ __result = true;
+ return;
+ }
+ if (parent3 != null && parent4 != null && parent3 == parent4)
+ {
+ __result = true;
+ return;
+ }
+ if (parent != null && parent3 != null && parent == parent3)
+ {
+ __result = true;
+ return;
+ }
+ if (parent2 != null && parent4 != null && parent2 == parent4)
+ {
+ __result = true;
+ return;
+ }
+ }
+ }
+
+
+ [HarmonyPostfix]
+ [HarmonyPatch("HasSameMother")]
+ private static void HasSameMotherPostfix(ref bool __result, Pawn pawn, Pawn other)
+ {
+ if (!__result && pawn.RaceProps.IsFlesh && pawn.relations != null)
+ {
+ Pawn parent = pawn.GetFather();
+ Pawn parent2 = other.GetMother();
+ Pawn parent3 = other.GetFather();
+ Pawn parent4 = pawn.GetMother();
+ if (parent != null && parent2 != null && parent == parent2)
+ {
+ __result = true;
+ return;
+ }
+ if (parent3 != null && parent4 != null && parent3 == parent4)
+ {
+ __result = true;
+ return;
+ }
+ if (parent != null && parent3 != null && parent == parent3)
+ {
+ __result = true;
+ return;
+ }
+ if (parent2 != null && parent4 != null && parent2 == parent4)
+ {
+ __result = true;
+ return;
+ }
+ }
+ }
+
+ [HarmonyPrefix]
+ [HarmonyPatch("SetFather")]
+ private static bool SetFatherPrefix(Pawn pawn, Pawn newFather)
+ {
+ Pawn father = pawn.GetFather();
+ if (father != newFather)
+ {
+ if (father != null)
+ {
+ pawn.relations.RemoveDirectRelation(PawnRelationDefOf.Parent, father);
+ }
+ if (newFather != null)
+ {
+ pawn.relations.AddDirectRelation(PawnRelationDefOf.Parent, newFather);
+ }
+ }
+ return false;
+ }
+
+ [HarmonyPrefix]
+ [HarmonyPatch("SetMother")]
+ private static bool SetMotherPrefix(Pawn pawn, Pawn newMother)
+ {
+ Pawn mother = pawn.GetMother();
+ if (mother != newMother)
+ {
+ if (mother != null)
+ {
+ pawn.relations.RemoveDirectRelation(PawnRelationDefOf.Parent, mother);
+ }
+ if (newMother != null)
+ {
+ pawn.relations.AddDirectRelation(PawnRelationDefOf.Parent, newMother);
+ }
+ }
+ return false;
+ }
+ }
+}
diff --git a/Source/First.cs b/Source/First.cs
new file mode 100644
index 0000000..101d3cc
--- /dev/null
+++ b/Source/First.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using rjw;
+using Verse;
+using RimWorld;
+using rjw.Modules.Interactions.Rules.PartKindUsageRules;
+using rjw.Modules.Interactions.Internals.Implementation;
+
+namespace RJW_Genes
+{
+ [StaticConstructorOnStartup]
+ internal static class First
+ {
+ static First()
+ {
+ AddtoIPartPreferenceRule();
+ }
+
+ //Modified code from https://gitgud.io/lutepickle/rjw_menstruation/-/tree/main/1.4/source/RJW_Menstruation/RJW_Menstruation
+ //Summary//
+ //Adds our own partpreferences to rjw's list. Our partpreferences are under Interactions.GenesPartKindUsageRule
+ //
+ private static void InjectIntoRjwInteractionServices()
+ {
+ List partPreferenceRules = Unprivater.GetProtectedValue>("_partKindUsageRules", typeof(PartPreferenceDetectorService));
+ partPreferenceRules.Add(new Interactions.GenesPartKindUsageRule());
+ }
+ }
+}
diff --git a/Source/GeneDefOf.cs b/Source/GeneDefOf.cs
index 744eb11..c410aea 100644
--- a/Source/GeneDefOf.cs
+++ b/Source/GeneDefOf.cs
@@ -1,6 +1,6 @@
using RimWorld;
using Verse;
-
+using Verse.AI;
namespace RJW_Genes
{
[DefOf]
@@ -21,9 +21,22 @@ namespace RJW_Genes
public static readonly GeneDef rjw_genes_ovipositor_genitalia;
public static readonly GeneDef rjw_genes_feline_genitalia;
public static readonly GeneDef rjw_genes_canine_genitalia;
+ public static readonly GeneDef rjw_genes_demonicT_genitalia;
+ public static readonly GeneDef rjw_genes_crocodilian_genitalia;
+ public static readonly GeneDef rjw_genes_racoon_genitalia;
+ public static readonly GeneDef rjw_genes_reptilian_genitalia;
+ public static readonly GeneDef rjw_genes_Ghost_genitalia;
+ public static readonly GeneDef rjw_genes_Golem_genitalia;
+ public static readonly GeneDef rjw_genes_Marine_genitalia;
+ public static readonly GeneDef rjw_genes_Necro_genitalia;
+ public static readonly GeneDef rjw_genes_Needle_genitalia;
+ public static readonly GeneDef rjw_genes_Orc_genitalia;
+ public static readonly GeneDef rjw_genes_Pig_genitalia;
+ public static readonly GeneDef rjw_genes_Tentacle_genitalia;
+ public static readonly GeneDef rjw_genes_human_genitalia;
- // Extra Genitalia
- public static readonly GeneDef rjw_genes_extra_penis;
+ // Extra Genitalia
+ public static readonly GeneDef rjw_genes_extra_penis;
public static readonly GeneDef rjw_genes_no_penis;
public static readonly GeneDef rjw_genes_extra_vagina;
public static readonly GeneDef rjw_genes_no_vagina;
@@ -32,9 +45,12 @@ namespace RJW_Genes
public static readonly GeneDef rjw_genes_extra_anus;
public static readonly GeneDef rjw_genes_no_anus;
public static readonly GeneDef rjw_genes_futa;
+ public static readonly GeneDef rjw_genes_femboy;
+ public static readonly GeneDef rjw_genes_featureless_chest;
+ public static readonly GeneDef rjw_genes_udder;
- // Genitalia Sizes
- public static readonly GeneDef rjw_genes_big_male_genitalia;
+ // Genitalia Sizes
+ public static readonly GeneDef rjw_genes_big_male_genitalia;
public static readonly GeneDef rjw_genes_small_male_genitalia;
public static readonly GeneDef rjw_genes_loose_female_genitalia;
public static readonly GeneDef rjw_genes_tight_female_genitalia;
@@ -42,34 +58,104 @@ namespace RJW_Genes
public static readonly GeneDef rjw_genes_small_breasts;
public static readonly GeneDef rjw_genes_loose_anus;
public static readonly GeneDef rjw_genes_tight_anus;
+ public static readonly GeneDef rjw_genes_evergrowth;
// Gender
public static readonly GeneDef rjw_genes_female_only;
public static readonly GeneDef rjw_genes_male_only;
+ public static readonly GeneDef rjw_genes_gender_fluid;
// Breeding
public static readonly GeneDef rjw_genes_mechbreeder;
- public static readonly GeneDef rjw_genes_insectincubator;
+ public static readonly GeneDef rjw_genes_zoophile;
+ public static readonly GeneDef rjw_genes_fertile_anus;
+ public static readonly GeneDef rjw_genes_mating_call;
+ public static readonly GeneDef rjw_genes_fervent_ovipositor;
public static readonly GeneDef rjw_genes_insectbreeder;
+ public static readonly GeneDef rjw_genes_insectincubator;
+ public static readonly GeneDef rjw_genes_hardwired_progenity;
+ public static readonly GeneDef rjw_genes_blocked_masturbation;
+ public static readonly GeneDef rjw_genes_basic_rut;
- // Cum
- public static readonly GeneDef rjw_genes_no_cum;
+ // Cum
+ public static readonly GeneDef rjw_genes_no_cum;
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;
- [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;
- public static readonly GeneDef rjw_genes_zoophile;
+ [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_generous_donor;
+ [MayRequire("rjw.sexperience")] public static readonly GeneDef rjw_genes_living_cumbucket;
+
- // Damage & Side Effects
- [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_elasticity;
+ // Reproduction
+ public static readonly GeneDef rjw_genes_hypersexual;
+ public static readonly GeneDef rjw_genes_rapist;
+ public static readonly GeneDef rjw_genes_homosexual;
+ public static readonly GeneDef rjw_genes_bisexual;
+ public static readonly GeneDef rjw_genes_no_sex_need;
+ public static readonly GeneDef LitteredBirths;
+
+ // Damage & Side Effects
+ [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_elasticity;
+ public static readonly GeneDef rjw_genes_unbreakable;
// Special
public static readonly GeneDef rjw_genes_orgasm_rush;
+ public static readonly GeneDef rjw_genes_youth_fountain;
+ public static readonly GeneDef rjw_genes_sex_age_drain;
+ public static readonly GeneDef rjw_genes_aphrodisiac_pheromones;
+ public static readonly GeneDef rjw_genes_sexual_mytosis;
+ public static readonly GeneDef rjw_genes_hormonal_saliva;
+ public static readonly GeneDef rjw_genes_cocoonweaver;
+ public static readonly GeneDef rjw_genes_sex_tamer;
+ public static readonly GeneDef rjw_genes_sexual_genetic_swap;
+ public static readonly GeneDef rjw_genes_sexual_genetic_thief;
+ public static readonly GeneDef rjw_genes_pregnancy_overwrite;
+ public static readonly GeneDef rjw_genes_feminizer;
+ public static readonly GeneDef rjw_genes_twinkifier;
+
+ // Cosmetic
+ public static readonly GeneDef rjw_genes_succubus_tail;
+ public static readonly GeneDef rjw_genes_succubus_wings;
+
+ // Life force | Fertilin
+ public static readonly GeneDef rjw_genes_lifeforce;
+ public static readonly GeneDef rjw_genes_pussyhealing;
+ public static readonly GeneDef rjw_genes_lifeforce_drain;
+ public static readonly GeneDef rjw_genes_cum_eater;
+ public static readonly GeneDef rjw_genes_fertilin_absorber;
+ public static readonly GeneDef rjw_genes_drainer;
+ public static readonly GeneDef rjw_genes_seduce;
+ public static readonly GeneDef rjw_genes_paralysingkiss;
+ public static readonly GeneDef rjw_genes_cockeater;
+ public static readonly GeneDef rjw_genes_lifeforce_empath;
+
+ // Diseases
+ public static readonly GeneDef rjw_genes_genetic_disease_immunity;
+ public static readonly GeneDef rjw_genes_minor_vulnerability;
+ public static readonly GeneDef rjw_genes_major_vulnerability;
+ public static readonly GeneDef rjw_genes_fluctual_sexual_needs;
+ public static readonly GeneDef rjw_genes_size_blinded;
+ public static readonly GeneDef rjw_genes_infectious_low_fertility;
+ public static readonly GeneDef rjw_genes_infectious_increased_sex_need;
+ public static readonly GeneDef rjw_genes_infectious_bisexuality;
+ public static readonly GeneDef rjw_genes_infectious_homosexuality;
+ public static readonly GeneDef rjw_genes_infectious_hypersexuality;
+ public static readonly GeneDef rjw_genes_stretcher;
+ public static readonly GeneDef rjw_genes_infectious_blocked_masturbation;
+ public static readonly GeneDef rjw_genes_infectious_rut;
+
+ //Other Defs
+ public static readonly XenotypeDef rjw_genes_succubus;
+ public static readonly DutyDef rjw_genes_flirt;
+ public static readonly MentalBreakDef rjw_genes_lifeforce_randomrape;
+ [MayRequire("resplice.xotr.charmweavers")] public static GeneDef RS_LoveFeed = DefDatabase.GetNamed("RS_LoveFeed", false);
+ [MayRequire("resplice.xotr.charmweavers")] public static GeneDef RS_MultiPregnancy = DefDatabase.GetNamed("RS_MultiPregnancy", false);
+ [MayRequire("redmattis.bigsmall.core")] public static GeneDef VU_VampireLover = DefDatabase.GetNamed("VU_VampireLover", false);
+ [MayRequire("vanillaracesexpanded.highmate")] public static GeneDef VRE_LovinDependency = DefDatabase.GetNamed("VRE_LovinDependency", false);
+
+
+
+ }
- }
}
diff --git a/Source/Genes/Breeding/Abilities/CompAbilityEffect_MatingCall.cs b/Source/Genes/Breeding/Abilities/CompAbilityEffect_MatingCall.cs
new file mode 100644
index 0000000..f09bb94
--- /dev/null
+++ b/Source/Genes/Breeding/Abilities/CompAbilityEffect_MatingCall.cs
@@ -0,0 +1,35 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse.Sound;
+using Verse;
+using RimWorld.Planet;
+using rjw;
+using HarmonyLib;
+using Verse.AI;
+
+namespace RJW_Genes
+{
+ public class CompAbilityEffect_MatingCall : CompAbilityEffect
+ {
+
+ private new CompProperties_AbilityMatingCall Props
+ {
+ get
+ {
+ return (CompProperties_AbilityMatingCall)this.props;
+ }
+ }
+
+ public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
+ {
+ base.Apply(target, dest);
+ ModLog.Message($"{this.parent.pawn} is casting MatingCall");
+ AnimalBreedingHelper.DoAnimalBreedingPulse(this.parent.pawn, Props.calldistance);
+ }
+
+ }
+}
diff --git a/Source/Genes/Breeding/Abilities/CompAbilityEffect_PheromoneSpit.cs b/Source/Genes/Breeding/Abilities/CompAbilityEffect_PheromoneSpit.cs
new file mode 100644
index 0000000..49ae4d7
--- /dev/null
+++ b/Source/Genes/Breeding/Abilities/CompAbilityEffect_PheromoneSpit.cs
@@ -0,0 +1,30 @@
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+
+namespace RJW_Genes
+{
+ public class CompAbilityEffect_PheromoneSpit : CompAbilityEffect
+ {
+ private new CompProperties_AbilityPheromoneSpit Props
+ {
+ get
+ {
+ return (CompProperties_AbilityPheromoneSpit)this.props;
+ }
+ }
+
+ public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
+ {
+ base.Apply(target, dest);
+ AnimalBreedingHelper.DoAnimalBreedingPulse(target.Pawn, Props.calldistance);
+ }
+
+ }
+}
diff --git a/Source/Genes/Breeding/Abilities/CompProperties_AbilityMatingCall.cs b/Source/Genes/Breeding/Abilities/CompProperties_AbilityMatingCall.cs
new file mode 100644
index 0000000..e30485c
--- /dev/null
+++ b/Source/Genes/Breeding/Abilities/CompProperties_AbilityMatingCall.cs
@@ -0,0 +1,20 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RJW_Genes
+{
+ public class CompProperties_AbilityMatingCall : CompProperties_AbilityEffect
+ {
+
+ public int calldistance;
+
+ public CompProperties_AbilityMatingCall()
+ {
+ this.compClass = typeof(CompAbilityEffect_MatingCall);
+ }
+ }
+}
diff --git a/Source/Genes/Breeding/Abilities/CompProperties_AbilityPheromoneSpit.cs b/Source/Genes/Breeding/Abilities/CompProperties_AbilityPheromoneSpit.cs
new file mode 100644
index 0000000..381843f
--- /dev/null
+++ b/Source/Genes/Breeding/Abilities/CompProperties_AbilityPheromoneSpit.cs
@@ -0,0 +1,18 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RJW_Genes {
+ public class CompProperties_AbilityPheromoneSpit : CompProperties_AbilityEffect
+ {
+ public int calldistance;
+
+ public CompProperties_AbilityPheromoneSpit()
+ {
+ this.compClass = typeof(CompAbilityEffect_PheromoneSpit);
+ }
+ }
+}
diff --git a/Source/Genes/Breeding/AnimalBreedingHelper.cs b/Source/Genes/Breeding/AnimalBreedingHelper.cs
new file mode 100644
index 0000000..c44a4c3
--- /dev/null
+++ b/Source/Genes/Breeding/AnimalBreedingHelper.cs
@@ -0,0 +1,75 @@
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse.AI;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class AnimalBreedingHelper
+ {
+
+ ///
+ /// Finds animals in a distance around a pawn, and schedules a breeding job.
+ /// This is done regardless of the animals genitalia at the moment.
+ /// This function has no checks if the Pawn is hostile, downed, etc., such checks must be done upstream!
+ ///
+ /// The pawn that will be target of breeding animals
+ /// The range around the pawn for which animals will be triggered.
+ public static void DoAnimalBreedingPulse(Pawn toBeBred, int pulse_distance, bool ends_manhunter = true)
+ {
+ IEnumerable animals = GetAnimalsInRange(toBeBred.Map, toBeBred.Position, pulse_distance);
+ int breeder_counter = 0;
+
+ foreach (Pawn animal in animals)
+ {
+ if (ends_manhunter)
+ EndManHunter(animal);
+
+ if (!RJW_Genes_Settings.animalMatingPulseCheckForGenitals || rjw.xxx.can_rape(animal))
+ {
+ ForceBreedingJob(toBeBred, animal);
+ breeder_counter++;
+ }
+
+ }
+ ModLog.Message($"{breeder_counter} of {animals.Count()} Animals in range are trying to breed {toBeBred}");
+ }
+
+ private static IEnumerable GetAnimalsInRange(Map map, IntVec3 position, int distance)
+ {
+ IEnumerable animals =
+ map.mapPawns
+ .AllPawnsSpawned
+ .Where((Func)(p =>
+ p.IsNonMutantAnimal
+ && p.Position.InHorDistOf(position, distance)
+ && xxx.is_healthy_enough(p))
+ );
+
+ return animals;
+ }
+
+ private static void ForceBreedingJob(Pawn toBeBred, Pawn animal)
+ {
+ // Stopping all Jobs in this way is a bit heavy - but as it's only about Animals this should be fine.
+ animal.jobs.CaptureAndClearJobQueue();
+ animal.jobs.StopAll();
+ Job job = JobMaker.MakeJob(xxx.animalBreed, toBeBred);
+ animal.jobs.TryTakeOrderedJob(job);
+ }
+
+ private static void EndManHunter(Pawn animal)
+ {
+ if (animal.MentalState != null && (animal.MentalState.def == MentalStateDefOf.Manhunter || animal.MentalState.def == MentalStateDefOf.ManhunterPermanent))
+ {
+ animal?.MentalState?.RecoverFromState();
+ }
+
+ }
+ }
+}
diff --git a/Source/Genes/Breeding/ConditionalStatAffecters/ConditionalStatAffecter_ManyChildren.cs b/Source/Genes/Breeding/ConditionalStatAffecters/ConditionalStatAffecter_ManyChildren.cs
new file mode 100644
index 0000000..c483eb3
--- /dev/null
+++ b/Source/Genes/Breeding/ConditionalStatAffecters/ConditionalStatAffecter_ManyChildren.cs
@@ -0,0 +1,38 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class ConditionalStatAffecter_ManyChildren : ConditionalStatAffecter
+ {
+ public override string Label => (string)"StatsReport_ManyChildren".Translate();
+
+ public const int THRESHOLD_FOR_CHILDREN = 3;
+
+ public override bool Applies(StatRequest req)
+ {
+ if (req == null || req.Thing == null || !req.Thing.Spawned) return false;
+
+ if (req.Thing is Pawn pawn)
+ {
+ // Do nothing if Pawn is Baby or Child (#25)
+ if (!pawn.ageTracker.Adult)
+ return false;
+
+ if (GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_hardwired_progenity))
+ {
+ // This "middle" Conditional Stat Affecter only fires if the other one does not apply
+ return pawn.relations.ChildrenCount >= THRESHOLD_FOR_CHILDREN
+ && pawn.relations.ChildrenCount < ConditionalStatAffecter_VeryManyChildren.THRESHOLD_FOR_CHILDREN;
+ }
+ }
+
+ return false;
+ }
+ }
+}
diff --git a/Source/Genes/Breeding/ConditionalStatAffecters/ConditionalStatAffecter_NoChildren.cs b/Source/Genes/Breeding/ConditionalStatAffecters/ConditionalStatAffecter_NoChildren.cs
new file mode 100644
index 0000000..4f50994
--- /dev/null
+++ b/Source/Genes/Breeding/ConditionalStatAffecters/ConditionalStatAffecter_NoChildren.cs
@@ -0,0 +1,43 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ ///
+ /// This conditional stat affecter "fires" if the pawn has no children.
+ ///
+ /// DevNote: I salvaged this from 1.3.3 Halamyr Conditional Stat Affecters.
+ /// It seems that with RW 1.5 there was a change how these work, as the req.Pawn seems to be null.
+ /// Now, the pawn is in req.Thing.
+ ///
+ public class ConditionalStatAffecter_NoChildren : ConditionalStatAffecter
+ {
+ public override string Label => (string)"StatsReport_NoChildren".Translate();
+
+ public override bool Applies(StatRequest req)
+ {
+ if (req == null || req.Thing == null || !req.Thing.Spawned) return false;
+
+ if (req.Thing is Pawn pawn)
+ {
+ // Do nothing if Pawn is Baby or Child (#25)
+ if (!pawn.ageTracker.Adult)
+ return false;
+
+ if (GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_hardwired_progenity))
+ {
+ return pawn.relations.ChildrenCount == 0;
+ }
+ }
+
+ return false;
+ }
+
+ }
+
+}
diff --git a/Source/Genes/Breeding/ConditionalStatAffecters/ConditionalStatAffecter_VeryManyChildren.cs b/Source/Genes/Breeding/ConditionalStatAffecters/ConditionalStatAffecter_VeryManyChildren.cs
new file mode 100644
index 0000000..e14d4f1
--- /dev/null
+++ b/Source/Genes/Breeding/ConditionalStatAffecters/ConditionalStatAffecter_VeryManyChildren.cs
@@ -0,0 +1,36 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class ConditionalStatAffecter_VeryManyChildren : ConditionalStatAffecter
+ {
+ public override string Label => (string)"StatsReport_VeryManyChildren".Translate();
+
+ public const int THRESHOLD_FOR_CHILDREN = 8;
+
+ public override bool Applies(StatRequest req)
+ {
+ if (req == null || req.Thing == null || !req.Thing.Spawned) return false;
+
+ if (req.Thing is Pawn pawn)
+ {
+ // Do nothing if Pawn is Baby or Child (#25)
+ if (!pawn.ageTracker.Adult)
+ return false;
+
+ if (GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_hardwired_progenity))
+ {
+ return pawn.relations.ChildrenCount >= THRESHOLD_FOR_CHILDREN;
+ }
+ }
+
+ return false;
+ }
+ }
+}
diff --git a/Source/Genes/Breeding/Genes/Gene_FerventOvipositor.cs b/Source/Genes/Breeding/Genes/Gene_FerventOvipositor.cs
new file mode 100644
index 0000000..3d8f612
--- /dev/null
+++ b/Source/Genes/Breeding/Genes/Gene_FerventOvipositor.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Verse;
+using rjw;
+
+namespace RJW_Genes
+{
+
+ ///
+ /// Manages the rjw_genes_fervent_ovipositor to grow eggs much faster.
+ ///
+ /// TODO: Move the Multiplier into XML
+ /// TODO: This gene only works after the first egg, the first egg for two new pawns spawns at the same time (strange).
+ ///
+ public class Gene_FerventOvipositor : Gene
+ {
+
+ const int MULTIPLIER = 3; // Tick 3 times as much, making a pawn with this Gene Produce Eggs 4 times as fast as the normal.
+
+ public override void Tick()
+ {
+ base.Tick();
+
+ if (pawn == null) return;
+
+ Hediff_PartBaseNatural OvipositorF = (Hediff_PartBaseNatural)pawn.health.hediffSet.GetFirstHediffOfDef(rjw.Genital_Helper.ovipositorF);
+
+ if (OvipositorF == null) return;
+
+ OvipositorF.nextEggTick = Math.Max(OvipositorF.nextEggTick - MULTIPLIER, -1);
+
+ // DevNote: I first had a for-loop calling OviPositorF.tick(), but I fear that would be a performance sink.
+ // Also, it would double other aspects as well, such as bleeding out through your insect-PP or dropping out the eggs.
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/Breeding/Genes/Gene_InsectIncubator.cs b/Source/Genes/Breeding/Genes/Gene_InsectIncubator.cs
new file mode 100644
index 0000000..ce53827
--- /dev/null
+++ b/Source/Genes/Breeding/Genes/Gene_InsectIncubator.cs
@@ -0,0 +1,67 @@
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+
+ ///
+ /// This Gene checks for all parasitic Insect-Eggs in a Pawn:
+ /// 1. Is it fertilized ? => tick it down "extra".
+ /// 2. Is it not fertilized? => fertilize it with the Incubator as parent
+ ///
+ /// To save performance, this gene fires (default) every 0.5h, which also means a slight delay until fertilization happens.
+ ///
+ public class Gene_InsectIncubator : Gene
+ {
+ const int TICK_INTERVAL = 60000 / 48; // 60k = 1 day, we want 0.5h which is 1/48th of 1 day.
+
+ public override void Tick()
+ {
+ base.Tick();
+
+ // Don't check too often, only in the HashTickInterval to safe some computing power
+ if (this.pawn.IsHashIntervalTick(TICK_INTERVAL) && this.pawn.Map != null)
+ {
+ List eggs = new List();
+ pawn.health.hediffSet.GetHediffs(ref eggs);
+ // This part works as intended and shows Non-Human Eggs too
+ //if (RJW_Genes_Settings.rjw_genes_detailed_debug) ModLog.Message($"Gene_InsectIncubator: Found {eggs.Count} Hediff_InsectEgg in {pawn}");
+
+
+ foreach (Hediff_InsectEgg egg in eggs)
+ {
+ // The implanter check checks if the egg is still in an ovipositor.
+ if (egg.implanter == null || egg.implanter == pawn)
+ continue;
+
+ if (!egg.fertilized && egg.implanter != null)
+ {
+ egg.Fertilize(pawn);
+ // DevNote Issue 38: Sometimes Eggs are not fertilized here, because the normal Fertilize Function is called which has an upper Limit on Gestation.
+ // I will not do anything about it here, maybe upstream, but I print here.
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ {
+ if (egg.fertilized)
+ ModLog.Message($"Gene_InsectIncubator: fertilized egg {egg} in {pawn}");
+ else if (egg.GestationProgress > 0.5)
+ ModLog.Message($"Gene_InsectIncubator: Failed to fertilize {egg} in {pawn} due to high gestation progress");
+ else
+ ModLog.Message($"Gene_InsectIncubator: failed to fertiliz egg {egg} in {pawn}");
+ }
+ }
+ // DevNote: There is an issue with Eggs reaching too much gestation progress (>100%), which causes DownStream bugs. To avoid this, there are some extra checks in place.
+ else if (egg.fertilized && egg.GestationProgress <= .93)
+ {
+ egg.lastTick += TICK_INTERVAL;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/Source/Genes/Breeding/Gene_MechBreeder.cs b/Source/Genes/Breeding/Genes/Gene_MechBreeder.cs
similarity index 100%
rename from Source/Genes/Breeding/Gene_MechBreeder.cs
rename to Source/Genes/Breeding/Genes/Gene_MechBreeder.cs
diff --git a/Source/Genes/Breeding/Genes/Gene_Rut.cs b/Source/Genes/Breeding/Genes/Gene_Rut.cs
new file mode 100644
index 0000000..9240dcd
--- /dev/null
+++ b/Source/Genes/Breeding/Genes/Gene_Rut.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class Gene_Rut : Gene
+ {
+ public override void Tick()
+ {
+ base.Tick();
+
+ if (pawn == null || pawn.genes == null)
+ return;
+
+ var chanceExtension = this.def.GetModExtension();
+ if (chanceExtension == null) return;
+
+ if (pawn.IsHashIntervalTick(chanceExtension.tickInterval)){
+ Random r = new Random();
+ if (r.NextDouble() < chanceExtension.eventChance)
+ {
+ Hediff rut = pawn.health.GetOrAddHediff(HediffDefOf.rjw_genes_genetic_rut);
+ rut.Severity = 1;
+ ModLog.Debug($"Pawn {pawn} gained rjw_genes_genetic_rut based on chance.");
+ }
+ }
+ }
+ }
+}
diff --git a/Source/Genes/Breeding/PatchPawnExtensions.cs b/Source/Genes/Breeding/PatchPawnExtensions.cs
deleted file mode 100644
index be2e2dc..0000000
--- a/Source/Genes/Breeding/PatchPawnExtensions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using HarmonyLib;
-using rjw;
-using Verse;
-
-namespace RJW_Genes
-{
- ///
- /// Kindly provided by 'shabalox' https://github.com/Shabalox/RJW_Genes_Addons/
- ///
- /// Note on the logic: the result mentioned below is changing the result of fertilization (true or false) to true if the pawn has the insect-breeder gene.
- ///
- [HarmonyPatch(typeof(PawnExtensions), "RaceImplantEggs")]
- public static class PatchPawnExtensions
- {
- [HarmonyPostfix]
- public static void Postfix(Pawn pawn, ref bool __result)
- {
- if (!__result)
- {
- __result = GeneUtility.IsInsectBreeder(pawn);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Source/Genes/Breeding/PatchPregnancyHelper.cs b/Source/Genes/Breeding/PatchPregnancyHelper.cs
deleted file mode 100644
index 81a0ad4..0000000
--- a/Source/Genes/Breeding/PatchPregnancyHelper.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection.Emit;
-using System.Reflection;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HarmonyLib;
-using Verse;
-using RimWorld;
-using rjw;
-
-namespace RJW_Genes
-{
- ///
- /// This Class patches the RJW-DoEgg to allow up to MaxEggSizeMul times the original amount of eggs.
- /// This harmony patch was kindly provided by 'shabalox' https://github.com/Shabalox/RJW_Genes_Addons/
- ///
- [HarmonyPatch(typeof(PregnancyHelper), "DoEgg")]
- static class PatchPregnancyHelper
- {
- [HarmonyTranspiler]
- public static IEnumerable Transpiler(IEnumerable instructions, ILGenerator il)
- {
- //MethodInfo isinsectincubator = AccessTools.Method(typeof(GeneUtility), "IsInsectIncubator");
- MethodInfo maxeggsizemul = AccessTools.Method(typeof(GeneUtility), "MaxEggSizeMul");
- FieldInfo partner = AccessTools.Field(typeof(SexProps), "partner");
-
- Label skiplabel = il.DefineLabel();
- bool finished = false;
- foreach (CodeInstruction codeInstruction in instructions)
- {
- if (!finished)
- {
- if (codeInstruction.opcode == OpCodes.Ldc_R4 && codeInstruction.operand.ToString() == "0")
- {
- yield return new CodeInstruction(OpCodes.Ldarg_0, null);
- yield return new CodeInstruction(OpCodes.Ldfld, partner);
- //yield return new CodeInstruction(OpCodes.Call, isinsectincubator);
- yield return new CodeInstruction(OpCodes.Callvirt, maxeggsizemul);
- //yield return new CodeInstruction(OpCodes.Brfalse_S, skiplabel);
- yield return new CodeInstruction(OpCodes.Ldloc_0, null);
- //yield return new CodeInstruction(OpCodes.Ldc_R4, 2f);
- yield return new CodeInstruction(OpCodes.Mul, null);
- yield return new CodeInstruction(OpCodes.Stloc_0, null);
- //codeInstruction.labels.Add(skiplabel);
- finished = true;
- }
- }
- yield return codeInstruction;
- }
- }
- }
-}
diff --git a/Source/Genes/Breeding/Patch_EggFertilization.cs b/Source/Genes/Breeding/Patch_EggFertilization.cs
deleted file mode 100644
index 46ec598..0000000
--- a/Source/Genes/Breeding/Patch_EggFertilization.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using HarmonyLib;
-using Verse;
-using rjw;
-
-namespace RJW_Genes
-{
- ///
- /// This Class patches the AfterSexUtility to also fertilize eggs if Pawn A has "InsectBreeder" and Pawn B has Insect Eggs.
- /// Patched Class is https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Common/Helpers/SexUtility.cs
- ///
- /// Normal Egg-Pregnancy logic is in https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Modules/Pregnancy/Pregnancy_Helper.cs
- ///
- [HarmonyPatch(typeof(SexUtility), "Aftersex")]
- static class PatchEggFertilizationHelper
- {
- [HarmonyTranspiler]
- public static void Postfix(SexProps props)
- {
- // Only Fertilize on vaginal / anal sex
- if (!(props.sexType == xxx.rjwSextype.Vaginal || props.sexType == xxx.rjwSextype.Anal))
- {
- return;
- }
-
-
- if (canDoEggFertilization(props.pawn, props.partner))
- {
- // Pawn has gene and Partner has eggs
- if (props.pawn.genes.GenesListForReading.Any(x => x.def == GeneDefOf.rjw_genes_insectbreeder) && !getEggsforPawn(props.partner).NullOrEmpty())
- {
- Pawn eggHolder = props.partner;
- Pawn impregnator = props.pawn;
-
- foreach (Hediff_InsectEgg egg in getEggsforPawn(eggHolder))
- {
- if (!egg.fertilized)
- egg.Fertilize(impregnator);
- }
- }
-
- // Partner has gene and Pawn has eggs
- if (props.partner.genes.GenesListForReading.Any(x => x.def == GeneDefOf.rjw_genes_insectbreeder) && !getEggsforPawn(props.pawn).NullOrEmpty())
- {
- Pawn eggHolder = props.pawn;
- Pawn impregnator = props.partner;
-
- foreach (Hediff_InsectEgg egg in getEggsforPawn(eggHolder))
- {
- if (!egg.fertilized)
- egg.Fertilize(impregnator);
- }
- }
-
-
- }
- }
-
-
- private static Boolean canDoEggFertilization(Pawn a, Pawn b)
- {
-
- // No Partner / Other Errors
- if (a != null || b != null)
- return false;
- // None of the pawns has the relevant gene
- if (!a.genes.GenesListForReading.Any(x => x.def == GeneDefOf.rjw_genes_insectbreeder) && !b.genes.GenesListForReading.Any(x => x.def == GeneDefOf.rjw_genes_insectbreeder))
- return false;
- // None of the pawns has eggs
- if (getEggsforPawn(a).NullOrEmpty() && getEggsforPawn(b).NullOrEmpty())
- return false;
-
- // A has gene and B has eggs
- if (a.genes.GenesListForReading.Any(x => x.def == GeneDefOf.rjw_genes_insectbreeder) && !getEggsforPawn(b).NullOrEmpty())
- {
- return true;
- }
- // B has gene and A has eggs
- if (b.genes.GenesListForReading.Any(x => x.def == GeneDefOf.rjw_genes_insectbreeder) && !getEggsforPawn(a).NullOrEmpty())
- {
- return true;
- }
- // Any other case: Do nothing
- return false;
- }
-
- private static List getEggsforPawn(Pawn pawn)
- {
- List eggs = new List();
- pawn.health.hediffSet.GetHediffs(ref eggs);
- foreach (var egg in eggs)
- egg.Fertilize(pawn);
-
- return eggs;
- }
- }
-}
diff --git a/Source/Genes/Breeding/PatchMechBirth.cs b/Source/Genes/Breeding/Patches/PatchMechBirth.cs
similarity index 100%
rename from Source/Genes/Breeding/PatchMechBirth.cs
rename to Source/Genes/Breeding/Patches/PatchMechBirth.cs
diff --git a/Source/Genes/Breeding/Patches/Patch_BlockedMasturbation.cs b/Source/Genes/Breeding/Patches/Patch_BlockedMasturbation.cs
new file mode 100644
index 0000000..c888bda
--- /dev/null
+++ b/Source/Genes/Breeding/Patches/Patch_BlockedMasturbation.cs
@@ -0,0 +1,26 @@
+using HarmonyLib;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ [HarmonyPatch(typeof(xxx), "can_masturbate")]
+ public class Patch_BlockedMasturbation
+ {
+ public void PostFix(Pawn pawn, ref bool __result)
+ {
+ if (pawn != null && !pawn.IsAnimal() && pawn.genes != null)
+ {
+ __result = __result
+ && !pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_blocked_masturbation)
+ && !pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_infectious_blocked_masturbation);
+ }
+ }
+
+ }
+}
diff --git a/Source/Genes/Cum/CumUtility.cs b/Source/Genes/Cum/CumUtility.cs
index ea049cc..dba96b1 100644
--- a/Source/Genes/Cum/CumUtility.cs
+++ b/Source/Genes/Cum/CumUtility.cs
@@ -33,5 +33,50 @@ namespace RJW_Genes
}
}
+
+ ///
+ /// Looks up the "MultiplierExtensions" Value for a given Gene, with a fall back.
+ /// Returns the fallback if there is no Extension, or if the Multiplier is smaller than 0.
+ ///
+
+ public static float LookupCumMultiplier(Gene gene, float FALLBACK = 3.0f) => LookupCumMultiplier(gene.def,FALLBACK);
+ public static float LookupCumMultiplier(GeneDef def, float FALLBACK = 3.0f)
+ {
+ MultiplierExtension multiplier = def.GetModExtension();
+ if (multiplier == null || multiplier.multiplier < 0)
+ return FALLBACK;
+ else return multiplier.multiplier;
+ }
+
+
+ //Get total fluidamount a person has.
+ public static float GetTotalFluidAmount(Pawn pawn, float multiplier = 1f)
+ {
+ var partBPR = Genital_Helper.get_genitalsBPR(pawn);
+ var parts = Genital_Helper.get_PartsHediffList(pawn, partBPR);
+ float total_cum = 0;
+ if (!parts.NullOrEmpty())
+ {
+ CompHediffBodyPart CompHediff;
+
+ foreach (Hediff part in parts)
+ {
+ if (GenitaliaChanger.IsArtificial(part))
+ continue;
+
+ if (rjw.Genital_Helper.is_penis(part))
+ {
+ CompHediff = part.TryGetComp();
+ if (CompHediff != null)
+ {
+ total_cum += CompHediff.FluidAmmount * CompHediff.FluidModifier * multiplier;
+ }
+ }
+ }
+
+ }
+ return total_cum;
+
+ }
}
}
diff --git a/Source/Genes/Cum/Gene_MuchCum.cs b/Source/Genes/Cum/Gene_MuchCum.cs
deleted file mode 100644
index e88ac3f..0000000
--- a/Source/Genes/Cum/Gene_MuchCum.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace RJW_Genes
-{
- public class Gene_MuchCum : RJW_Gene
- {
- bool has_been_fired = false;
-
- float multiplier_much_cum = 3f;
-
- public override void PostMake()
- {
- base.PostMake();
-
- CumUtility.MultiplyFluidAmountBy(pawn, multiplier_much_cum);
- has_been_fired = true;
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
- if (!has_been_fired) {
- CumUtility.MultiplyFluidAmountBy(pawn, multiplier_much_cum);
- has_been_fired = true;
- }
- }
-
-
- public override void PostRemove()
- {
- base.PostAdd();
-
- if (has_been_fired)
- {
- CumUtility.MultiplyFluidAmountBy(pawn, 1/multiplier_much_cum);
- has_been_fired = false;
- }
- }
-
- }
-}
diff --git a/Source/Genes/Cum/Gene_NoCum.cs b/Source/Genes/Cum/Gene_NoCum.cs
deleted file mode 100644
index 0c3e888..0000000
--- a/Source/Genes/Cum/Gene_NoCum.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace RJW_Genes
-{
- public class Gene_NoCum : RJW_Gene
- {
- bool has_been_fired = false;
-
-
- public override void PostMake()
- {
- base.PostMake();
-
- CumUtility.MultiplyFluidAmountBy(pawn, 0f);
- has_been_fired = true;
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
- if (!has_been_fired) {
- CumUtility.MultiplyFluidAmountBy(pawn, 0f);
- has_been_fired = true;
- }
- }
-
-
- public override void PostRemove()
- {
- // Cum Removal does not do at the moment :/ I would need to safe the old cum amount but I don't want to at the moment
- base.PostAdd();
-
- }
-
- }
-}
diff --git a/Source/Genes/Cum/Gene_VeryMuchCum.cs b/Source/Genes/Cum/Genes/Gene_ChangeCumAmount.cs
similarity index 51%
rename from Source/Genes/Cum/Gene_VeryMuchCum.cs
rename to Source/Genes/Cum/Genes/Gene_ChangeCumAmount.cs
index 21faecc..dc10ba4 100644
--- a/Source/Genes/Cum/Gene_VeryMuchCum.cs
+++ b/Source/Genes/Cum/Genes/Gene_ChangeCumAmount.cs
@@ -1,36 +1,38 @@
namespace RJW_Genes
{
- public class Gene_VeryMuchCum : RJW_Gene
+ public class Gene_ChangeCumAmount : RJW_Gene
{
bool has_been_fired = false;
- float multiplier_much_cum = 10f;
public override void PostMake()
{
base.PostMake();
- CumUtility.MultiplyFluidAmountBy(pawn, multiplier_much_cum);
+ float multipier = CumUtility.LookupCumMultiplier(this);
+ CumUtility.MultiplyFluidAmountBy(pawn, multipier);
has_been_fired = true;
}
public override void PostAdd()
{
base.PostAdd();
- if (!has_been_fired) {
- CumUtility.MultiplyFluidAmountBy(pawn, multiplier_much_cum);
+ if (!has_been_fired)
+ {
+ float multipier = CumUtility.LookupCumMultiplier(this);
+ CumUtility.MultiplyFluidAmountBy(pawn, multipier);
has_been_fired = true;
}
}
-
public override void PostRemove()
{
base.PostAdd();
if (has_been_fired)
{
- CumUtility.MultiplyFluidAmountBy(pawn, 1/multiplier_much_cum);
+ float multipier = CumUtility.LookupCumMultiplier(this);
+ CumUtility.MultiplyFluidAmountBy(pawn, 1/ multipier);
has_been_fired = false;
}
}
diff --git a/Source/Genes/Cum/HediffComp_ProcessCumbucket.cs b/Source/Genes/Cum/HediffComp_ProcessCumbucket.cs
new file mode 100644
index 0000000..48708cb
--- /dev/null
+++ b/Source/Genes/Cum/HediffComp_ProcessCumbucket.cs
@@ -0,0 +1,28 @@
+
+using RimWorld;
+using System;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class HediffComp_ProcessCumbucket : HediffComp
+ {
+
+ public HediffsCompProperties_ProcessCumbucketMTB Props
+ {
+ get
+ {
+ return (HediffsCompProperties_ProcessCumbucketMTB)this.props;
+ }
+ }
+
+ public override void CompPostTick(ref float severityAdjustment)
+ {
+ if (this.Props.mtbDaysPerStage[this.parent.CurStageIndex] > 0f && base.Pawn.IsHashIntervalTick(60) && Rand.MTBEventOccurs(this.Props.mtbDaysPerStage[this.parent.CurStageIndex], 60000f, 60f))
+ {
+ ModLog.Debug($"Triggered HediffComp_ProcessCumbucket CompPostTick - Starting a JobDriver ProcessCumbucket for {this.parent.pawn}");
+ this.Pawn.jobs.StartJob(JobMaker.MakeJob(DefDatabase.GetNamed("ProcessCumbucket")), lastJobEndCondition: Verse.AI.JobCondition.InterruptForced, resumeCurJobAfterwards: true);
+ }
+ }
+ }
+}
diff --git a/Source/Genes/Cum/HediffsCompProperties_ProcessCumbucketMTB.cs b/Source/Genes/Cum/HediffsCompProperties_ProcessCumbucketMTB.cs
new file mode 100644
index 0000000..919b715
--- /dev/null
+++ b/Source/Genes/Cum/HediffsCompProperties_ProcessCumbucketMTB.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class HediffsCompProperties_ProcessCumbucketMTB : HediffCompProperties
+ {
+ public HediffsCompProperties_ProcessCumbucketMTB()
+ {
+ this.compClass = typeof(HediffComp_ProcessCumbucket);
+ }
+
+ public override IEnumerable ConfigErrors(HediffDef parentDef)
+ {
+ foreach (string text in base.ConfigErrors(parentDef))
+ {
+ yield return text;
+ }
+ if (this.mtbDaysPerStage == null)
+ {
+ yield return "mtbDaysPerStage is not defined";
+ }
+ else if (this.mtbDaysPerStage.Count != parentDef.stages.Count)
+ {
+ yield return "mtbDaysPerStage count doesn't match Hediffs number of stages";
+ }
+ yield break;
+ }
+
+ public List mtbDaysPerStage;
+ }
+}
diff --git a/Source/Genes/Cum/JobDriver_ProcessingCumbucket.cs b/Source/Genes/Cum/JobDriver_ProcessingCumbucket.cs
new file mode 100644
index 0000000..b924a6d
--- /dev/null
+++ b/Source/Genes/Cum/JobDriver_ProcessingCumbucket.cs
@@ -0,0 +1,132 @@
+using LicentiaLabs;
+using System.Collections.Generic;
+using Verse;
+using Verse.AI;
+using UnityEngine;
+using System;
+using rjw;
+using RimWorld;
+
+namespace RJW_Genes
+{
+ ///
+ /// Shamelessly stolen from LicentaLabs
+ /// [Jaals Fork] https://gitgud.io/Jaaldabaoth/licentia-labs/-/blob/master/Source/LicentiaLabs/LicentiaLabs/JobDriver_VomitCum.cs
+ ///
+ class JobDriver_ProcessingCumbucket : JobDriver_Vomit
+ {
+ public override bool CanBeginNowWhileLyingDown()
+ {
+ return true;
+ }
+
+ protected override IEnumerable MakeNewToils()
+ {
+ if (!ModsConfig.IsActive("rjw.sexperience"))
+ yield break;
+
+ Toil toil = new Toil();
+ toil.initAction = delegate ()
+ {
+ this.ticksLeft = Rand.Range(150, 600);
+ int num = 0;
+ IntVec3 c;
+ for (; ; )
+ {
+ c = this.pawn.Position + GenAdj.AdjacentCellsAndInside[Rand.Range(0, 9)];
+ num++;
+ if (num > 12)
+ {
+ break;
+ }
+ if (c.InBounds(this.pawn.Map) && c.Standable(this.pawn.Map))
+ {
+ // DevNote: I am not 100% what this all means, but IL_77 is a jump to the case below (it says IL_77).
+ // basically, this calls the next part of the function, but I am not super sure why this has to be like this.
+ // JobDrivers are scary.
+ goto IL_77;
+ }
+ }
+ c = this.pawn.Position;
+ IL_77:
+ this.job.targetA = c;
+ this.pawn.pather.StopDead();
+ };
+ toil.tickAction = delegate ()
+ {
+ if (this.ticksLeft % 150 == 149)
+ {
+ if (!sourceName.NullOrEmpty())
+ {
+ if (ModsConfig.IsActive("LustLicentia.RJWLabs"))
+ FilthMaker.TryMakeFilth(this.job.targetA.Cell, base.Map, Licentia.ThingDefs.FilthCum, sourceName);
+ SpawnCum(this.pawn, this.job.targetA.Cell, base.Map);
+ }
+ else
+ {
+ if (ModsConfig.IsActive("LustLicentia.RJWLabs"))
+ FilthMaker.TryMakeFilth(this.job.targetA.Cell, base.Map, Licentia.ThingDefs.FilthCum);
+ SpawnCum(this.pawn, this.job.targetA.Cell, base.Map);
+ }
+ }
+ this.ticksLeft--;
+ if (this.ticksLeft <= 0)
+ {
+ base.ReadyForNextToil();
+ TaleRecorder.RecordTale(Licentia.TaleDefs.VomitedCum, new object[]
+ {
+ this.pawn
+ });
+ }
+ };
+ toil.defaultCompleteMode = ToilCompleteMode.Never;
+ toil.WithEffect(EffecterDefOf.Vomit, TargetIndex.A, new Color(100f, 100f, 100f, 0.5f));
+ toil.PlaySustainerOrSound(() => SoundDefOf.Vomit, 1f);
+ yield return toil;
+ yield break;
+ }
+
+ private void SpawnCum(Pawn pawn, IntVec3 cell, Map map)
+ {
+ ThingDef cumDef = DefDatabase.GetNamed("GatheredCum", true);
+
+ Hediff hediff = pawn.health.hediffSet.GetFirstHediffOfDef(HediffDefOf.rjw_genes_filled_living_cumbucket);
+ if (hediff == null)
+ {
+ ModLog.Warning($"{pawn} has the JobDriver_ProcessCumbucket but does not have the Hediff for filled cumbucket.");
+ return;
+ }
+
+ // Case 1: "Normal Severity", just puke out a bit of cum here and there.
+ if (hediff.Severity <= 10)
+ {
+ Thing cum = ThingMaker.MakeThing(cumDef);
+ cum.Position = cell;
+ int stacks = Math.Max(1, (int)(hediff.Severity * 1.5));
+ stacks = Math.Min(stacks, 75); // 75 is the default max stacksize ...
+ cum.stackCount = stacks;
+ cum.SpawnSetup(map, false);
+ hediff.Severity -= (stacks / 50);
+ } else
+ // Case 2: Reserviour mode, put out a lot of cum at once but less often.
+ {
+ int stacks = Math.Max(1, (int)(hediff.Severity * 1.5));
+
+ while (stacks > 0)
+ {
+ Thing cum = ThingMaker.MakeThing(cumDef);
+ cum.Position = cell;
+ var curStacks = Math.Min(stacks, 75); // 75 is the default max stacksize ...
+ cum.stackCount = stacks;
+ cum.SpawnSetup(map, false);
+ hediff.Severity -= (curStacks / 50);
+ stacks -= curStacks;
+ }
+ }
+ }
+
+ private int ticksLeft;
+
+ public string sourceName;
+ }
+}
diff --git a/Source/Genes/Cum/Patch_Cumflation.cs b/Source/Genes/Cum/Patches/Patch_CumflationImmunity.cs
similarity index 96%
rename from Source/Genes/Cum/Patch_Cumflation.cs
rename to Source/Genes/Cum/Patches/Patch_CumflationImmunity.cs
index 9e26a26..49f8e73 100644
--- a/Source/Genes/Cum/Patch_Cumflation.cs
+++ b/Source/Genes/Cum/Patches/Patch_CumflationImmunity.cs
@@ -9,7 +9,6 @@ using HarmonyLib;
using rjw;
using RimWorld;
using Verse;
-using LicentiaLabs;
namespace RJW_Genes
{
@@ -19,7 +18,7 @@ namespace RJW_Genes
/// Patched File: https://gitgud.io/John-the-Anabaptist/licentia-labs/-/blob/master/Source/LicentiaLabs/LicentiaLabs/Cumflation.cs
///
///
- class Patch_Cumflation
+ class Patch_CumflationImmunity
{
// This patch does not need the normal Harmony Targetting,
// as it needs to be added only on demand (See HarmonyInit.cs)
diff --git a/Source/Genes/Cum/Patches/Patch_LikesCumflation.cs b/Source/Genes/Cum/Patches/Patch_LikesCumflation.cs
new file mode 100644
index 0000000..6b78068
--- /dev/null
+++ b/Source/Genes/Cum/Patches/Patch_LikesCumflation.cs
@@ -0,0 +1,79 @@
+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.Message($"{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.Message($"{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/Source/Genes/Cum/Patches/Patch_LivingCumbucket_StackHediff.cs b/Source/Genes/Cum/Patches/Patch_LivingCumbucket_StackHediff.cs
new file mode 100644
index 0000000..67ec45e
--- /dev/null
+++ b/Source/Genes/Cum/Patches/Patch_LivingCumbucket_StackHediff.cs
@@ -0,0 +1,64 @@
+using HarmonyLib;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using static System.Net.Mime.MediaTypeNames;
+
+namespace RJW_Genes
+{
+
+ [HarmonyPatch(typeof(SexUtility), nameof(SexUtility.SatisfyPersonal))]
+ public class Patch_LivingCumbucket_StackHediff
+ {
+
+ ///
+ /// This is the amount of fluid required if the pawn has a bodysize of 1, to reach a severity in the hediff of 1.
+ /// The hediff can still be increased over 1.0.
+ ///
+ const float fluid_amount_required_for_hediff_severity_ = 100.0f;
+
+ public static void Postfix(SexProps props)
+ {
+ if (!ModsConfig.IsActive("rjw.sexperience"))
+ return;
+
+ // ShortCuts: Exit Early if Pawn or Partner are null (can happen with Masturbation or other nieche-cases)
+ if (props == null || props.pawn == null || !props.hasPartner())
+ return;
+
+ Pawn pawnA = props.pawn;
+ Pawn pawnB = props.partner;
+
+ if (pawnA.genes != null && pawnA.genes.HasActiveGene(GeneDefOf.rjw_genes_living_cumbucket) && CumUtility.GetTotalFluidAmount(pawnB) > 0)
+ {
+ ProcessLivingCumbucket(pawnA, CumUtility.GetTotalFluidAmount(pawnB));
+ }
+
+ if (pawnB.genes != null && pawnB.genes.HasActiveGene(GeneDefOf.rjw_genes_living_cumbucket) && CumUtility.GetTotalFluidAmount(pawnA) > 0)
+ {
+ ProcessLivingCumbucket(pawnB, CumUtility.GetTotalFluidAmount(pawnA));
+ }
+ }
+
+ public static void ProcessLivingCumbucket(Pawn pawn, float cumamount)
+ {
+ float bodysize = pawn.BodySize;
+ float result_severity_increase = cumamount / (fluid_amount_required_for_hediff_severity_ * bodysize);
+
+
+ Hediff hediff = pawn.health.hediffSet.GetFirstHediffOfDef(HediffDefOf.rjw_genes_filled_living_cumbucket);
+ if (hediff == null)
+ {
+ hediff = pawn.health.GetOrAddHediff(HediffDefOf.rjw_genes_filled_living_cumbucket);
+ hediff.Severity = 0.01f;
+ }
+
+ hediff.Severity += result_severity_increase;
+ ModLog.Debug($"Pumping the living cumbucket {pawn} (Bodysize {bodysize}) with {cumamount} cum, resulting in severity {hediff.Severity} (+{result_severity_increase})");
+ }
+ }
+}
diff --git a/Source/Genes/Cum/Patch_TransferNutrition.cs b/Source/Genes/Cum/Patches/Patch_TransferNutrition.cs
similarity index 90%
rename from Source/Genes/Cum/Patch_TransferNutrition.cs
rename to Source/Genes/Cum/Patches/Patch_TransferNutrition.cs
index cf8d92d..3e81a5f 100644
--- a/Source/Genes/Cum/Patch_TransferNutrition.cs
+++ b/Source/Genes/Cum/Patches/Patch_TransferNutrition.cs
@@ -11,6 +11,7 @@ using RimWorld;
using Verse;
using LicentiaLabs;
+
namespace RJW_Genes
{
///
@@ -28,14 +29,16 @@ namespace RJW_Genes
// 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)) {
+ 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;
+ if (inflatorFood != null)
+ inflatorFood.CurLevel += donatedNutrition;
}
+
}
}
}
\ No newline at end of file
diff --git a/Source/Genes/Damage/Gene_Elasticity.cs b/Source/Genes/Damage/Gene_Elasticity.cs
index 603a18d..c66caf5 100644
--- a/Source/Genes/Damage/Gene_Elasticity.cs
+++ b/Source/Genes/Damage/Gene_Elasticity.cs
@@ -1,6 +1,7 @@
using LicentiaLabs;
using Verse;
+
namespace RJW_Genes
{
///
@@ -10,27 +11,23 @@ namespace RJW_Genes
///
public class Gene_Elasticity : Gene
{
-
- private int ticksToReset = RESET_INTERVAL;
private const int RESET_INTERVAL = 60000; // 60k should be 1 day
+
public override void PostAdd()
{
base.PostAdd();
// Doing it like this will add the hediff with a severity of ~0.5, but it will decay.
// Hence we check with the Ticks to update.
- this.pawn.health.AddHediff(Licentia.HediffDefs.Elasticised);
+ this.pawn.health.AddHediff(Licentia.HediffDefs.Elasticised);
ResetSeverity();
}
public override void Tick()
{
base.Tick();
- --this.ticksToReset;
- if (this.ticksToReset > 0)
- return;
- this.ticksToReset = RESET_INTERVAL;
- ResetSeverity();
+ if (pawn.IsHashIntervalTick(RESET_INTERVAL))
+ ResetSeverity();
}
public override void PostRemove()
@@ -52,5 +49,6 @@ namespace RJW_Genes
candidate.Severity = severity;
}
}
+
}
-}
+}
\ No newline at end of file
diff --git a/Source/Genes/Damage/Gene_Unbreakable.cs b/Source/Genes/Damage/Gene_Unbreakable.cs
new file mode 100644
index 0000000..578ed8a
--- /dev/null
+++ b/Source/Genes/Damage/Gene_Unbreakable.cs
@@ -0,0 +1,40 @@
+using rjw;
+using Verse;
+
+namespace RJW_Genes
+{
+ ///
+ /// This Gene regularly removes the broken hediff of a pawn.
+ /// Blocking / Removing thoughts are done in an XML Patch.
+ ///
+ public class Gene_Unbreakable : Gene
+ {
+ /// DevNote: I first tried to Harmony-Postfix the AfterSexUtility and never add it - but that failed?
+
+ private const int RESET_INTERVAL = 30000; // 30k should be 0.5 day
+ public override void PostAdd()
+ {
+ base.PostAdd();
+ RemoveBrokenHediff();
+ }
+
+ public override void Tick()
+ {
+ base.Tick();
+ if (pawn.IsHashIntervalTick(RESET_INTERVAL))
+ RemoveBrokenHediff();
+ }
+
+
+
+ private void RemoveBrokenHediff()
+ {
+ // Clean-Up of existing feeling brokens
+ var maybeBrokenHediff = pawn.health.hediffSet.GetFirstHediffOfDef(xxx.feelingBroken);
+ if (maybeBrokenHediff != null)
+ {
+ pawn.health.RemoveHediff(maybeBrokenHediff);
+ }
+ }
+ }
+}
diff --git a/Source/Genes/Diseases/Defs/GeneticDiseaseExtension.cs b/Source/Genes/Diseases/Defs/GeneticDiseaseExtension.cs
new file mode 100644
index 0000000..e156195
--- /dev/null
+++ b/Source/Genes/Diseases/Defs/GeneticDiseaseExtension.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 GeneticDiseaseExtension : DefModExtension
+ {
+ ///
+ /// The chance for this gene to spread upon (finished) sex.
+ ///
+ public float infectionChance;
+ }
+
+}
diff --git a/Source/Genes/Diseases/Defs/GeneticInfectorExtension.cs b/Source/Genes/Diseases/Defs/GeneticInfectorExtension.cs
new file mode 100644
index 0000000..2f00ce5
--- /dev/null
+++ b/Source/Genes/Diseases/Defs/GeneticInfectorExtension.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class GeneticInfectorExtension : DefModExtension
+ {
+ public float infectionChance;
+
+ public List infectionGenes;
+ }
+
+}
diff --git a/Source/Genes/Diseases/Defs/ImmunityAgainstGenesExtension.cs b/Source/Genes/Diseases/Defs/ImmunityAgainstGenesExtension.cs
new file mode 100644
index 0000000..18fe8e0
--- /dev/null
+++ b/Source/Genes/Diseases/Defs/ImmunityAgainstGenesExtension.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class ImmunityAgainstGenesExtension : DefModExtension
+ {
+ ///
+ /// A list of the exact defnames of disease-genes that this extension will make immune against.
+ /// Must perfectly match!
+ ///
+ public List givesImmunityAgainst;
+ }
+
+}
diff --git a/Source/Genes/Diseases/DiseaseHelper.cs b/Source/Genes/Diseases/DiseaseHelper.cs
new file mode 100644
index 0000000..873a0e1
--- /dev/null
+++ b/Source/Genes/Diseases/DiseaseHelper.cs
@@ -0,0 +1,145 @@
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public static class DiseaseHelper
+ {
+
+ ///
+ /// Checks for a pawn if it is immune against a disease.
+ ///
+ /// The pawn for which immunity is checked
+ /// The genetic disease that is checked against
+ /// True if the pawn is immune, false if the pawn can be infected by it.
+ public static bool IsImmuneAgainstGeneticDisease(Pawn pawn, GeneDef disease)
+ {
+ // Case 1: Something is null / not working, return Immune (to have less follow up effects)
+ if (pawn == null || pawn.genes == null) return true;
+ if (disease == null) return true;
+ // Case 1.B: Dead people can spread, but not receive, diseases.
+ if (pawn.Dead) return true;
+
+ // Case 2: The pawn has general genetic immunity to diseases
+ if (GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_genetic_disease_immunity))
+ return true;
+
+ // Case 3: The pawn already has the genetic disease
+ if (GeneUtility.HasGeneNullCheck(pawn, disease))
+ return true;
+
+ // Case 4: Check all genes if one of them has the Immunity Extension that covers the GeneDef
+ List genes = pawn.genes.GenesListForReading;
+ genes = genes.Where(x => pawn.genes.HasActiveGene(x.def)).ToList();
+
+ foreach (Gene gene in genes)
+ {
+ ImmunityAgainstGenesExtension ext = gene.def.GetModExtension();
+ if (ext != null) {
+ foreach (string defname in ext.givesImmunityAgainst)
+ if (disease.defName == defname)
+ return true;
+ }
+ }
+
+ // Case 5: Nothing special happens, so return false (not immune)
+ return false;
+ }
+
+ ///
+ /// Returns all active Genes with the `GeneticDiseaseExtension`.
+ ///
+ ///
+ /// List of all active Genes with the `GeneticDiseaseExtension` in pawn
+ public static List GetGeneticDiseaseGenes(Pawn pawn)
+ {
+ if (pawn != null && pawn.genes != null)
+ {
+ return pawn.genes
+ .GenesListForReading
+ .ConvertAll(gene => gene.def)
+ .Where(genedef => pawn.genes.HasActiveGene(genedef))
+ .Where(IsGeneticDiseaseGene)
+ .ToList();
+ }
+
+ return new List() { };
+ }
+
+ public static List GetGeneticInfectorGenes(Pawn pawn)
+ {
+ if (pawn != null && pawn.genes != null)
+ {
+ return pawn.genes
+ .GenesListForReading
+ .ConvertAll(gene => gene.def)
+ .Where(genedef => pawn.genes.HasActiveGene(genedef))
+ .Where(IsGeneticInfectorGene)
+ .ToList();
+ }
+
+ return new List() { };
+ }
+
+ public static List LookupInfectionGeneDefs(GeneticInfectorExtension infectorExt)
+ {
+ if (infectorExt == null) new List();
+
+ return RimWorld.GeneUtility
+ .GenesInOrder
+ .Where(genedef => infectorExt.infectionGenes.Contains(genedef.defName))
+ .ToList();
+ }
+
+ ///
+ /// Checks if the performed sex was penetrative.
+ /// Condom check is not done here!
+ ///
+ /// The sexprops
+ ///
+ public static bool IsPenetrativeSex(SexProps props)
+ {
+ if (props == null) return false;
+
+ return props.sexType ==
+ xxx.rjwSextype.Vaginal
+ || props.sexType == xxx.rjwSextype.Anal
+ || props.sexType == xxx.rjwSextype.Oral
+ || props.sexType == xxx.rjwSextype.DoublePenetration
+ || props.sexType == xxx.rjwSextype.Fellatio
+ || props.sexType == xxx.rjwSextype.Sixtynine;
+ }
+
+ public static bool IsGeneticDiseaseGene(GeneDef geneDef)
+ {
+ if (geneDef == null) return false;
+ GeneticDiseaseExtension diseaseExt = geneDef.GetModExtension();
+ return diseaseExt != null;
+ }
+
+ public static bool IsGeneticInfectorGene(GeneDef geneDef)
+ {
+ if (geneDef == null) return false;
+ GeneticInfectorExtension infectorExt = geneDef.GetModExtension();
+ return infectorExt != null;
+ }
+
+ public static float LookupDiseaseInfectionChance(GeneDef geneDef)
+ {
+ if (IsGeneticDiseaseGene(geneDef))
+ {
+ GeneticDiseaseExtension diseaseExt = geneDef.GetModExtension();
+ return diseaseExt != null ? diseaseExt.infectionChance : 0.0f;
+ }
+ else
+ return 0.0f;
+ }
+
+
+ }
+}
diff --git a/Source/Genes/Diseases/Genes/Gene_FluctualSexualNeed.cs b/Source/Genes/Diseases/Genes/Gene_FluctualSexualNeed.cs
new file mode 100644
index 0000000..b25e812
--- /dev/null
+++ b/Source/Genes/Diseases/Genes/Gene_FluctualSexualNeed.cs
@@ -0,0 +1,57 @@
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using static HarmonyLib.Code;
+using static RimWorld.ColonistBar;
+
+namespace RJW_Genes
+{
+ public class Gene_FluctualSexualNeed : Gene
+ {
+
+ int event_interval;
+ float event_chance;
+
+ const float REST_INCREASE = 0.1f;
+ const float SET_SEXNEED_TO = 0.1f;
+
+ public Gene_FluctualSexualNeed() : base()
+ {
+ TickBasedChanceExtension tickbasedChanceExt = GeneDefOf.rjw_genes_fluctual_sexual_needs.GetModExtension();
+ event_interval = tickbasedChanceExt?.tickInterval ?? 30000; // 30K = 1/2 day
+ event_chance = tickbasedChanceExt?.eventChance ?? 0.1f;
+ }
+
+
+ public override void Tick()
+ {
+ base.Tick();
+
+ if (pawn.IsHashIntervalTick(event_interval) && (new Random()).NextDouble() < event_chance)
+ {
+ ModLog.Debug($"Firing Gene_FluctualSexualNeed for {pawn}");
+ ApplyFluctualSexNeedEffect(pawn);
+ }
+ }
+
+ public static void ApplyFluctualSexNeedEffect(Pawn pawn)
+ {
+ if (pawn == null || pawn.needs == null) return;
+
+ var sexneed = pawn.needs.TryGetNeed();
+ if (sexneed != null)
+ {
+ sexneed.CurLevelPercentage = SET_SEXNEED_TO;
+ }
+
+ // Pump up Wake-Ness
+ if (pawn.needs.rest != null)
+ pawn.needs.rest.CurLevel += REST_INCREASE;
+ }
+
+ }
+}
diff --git a/Source/Genes/Diseases/Patches/Patch_AfterSexUtility_ApplyGeneticInfectors.cs b/Source/Genes/Diseases/Patches/Patch_AfterSexUtility_ApplyGeneticInfectors.cs
new file mode 100644
index 0000000..06b0998
--- /dev/null
+++ b/Source/Genes/Diseases/Patches/Patch_AfterSexUtility_ApplyGeneticInfectors.cs
@@ -0,0 +1,64 @@
+using HarmonyLib;
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Remoting.Lifetime;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+
+ [HarmonyPatch(typeof(SexUtility), "Aftersex")]
+ public class Patch_AfterSexUtility_ApplyGeneticInfectors
+ {
+
+ const int FACTION_GOODWILL_CHANGE = -3;
+
+ public static void Postfix(SexProps props)
+ {
+ if (props == null || props.pawn == null || props.partner == null) return;
+
+ Pawn pawn = props.pawn;
+ Pawn partner = props.partner;
+
+ if (pawn == partner) return;
+ if (pawn.IsAnimal() || partner.IsAnimal()) return;
+ if (pawn.genes == null || partner.genes == null) return;
+ // No Infections on Condom Use
+ if (props.usedCondom) return;
+
+ // Exit early if settings require penetrative sex, but this is not penetrative sex
+ if (!DiseaseHelper.IsPenetrativeSex(props) && RJW_Genes_Settings.rjw_genes_genetic_disease_spread_only_on_penetrative_sex) return;
+
+ TryApplyGeneticInfections(pawn, partner);
+ TryApplyGeneticInfections(partner, pawn);
+ }
+
+ private static void TryApplyGeneticInfections(Pawn infector, Pawn partner)
+ {
+ foreach (GeneDef infectorGeneDef in DiseaseHelper.GetGeneticInfectorGenes(infector))
+ {
+ GeneticInfectorExtension diseaseExt = infectorGeneDef.GetModExtension();
+ if (diseaseExt == null) continue;
+ float application_chance = diseaseExt.infectionChance;
+
+ foreach (GeneDef diseaseGeneDef in DiseaseHelper.LookupInfectionGeneDefs(diseaseExt))
+ {
+ if (DiseaseHelper.IsImmuneAgainstGeneticDisease(partner, diseaseGeneDef))
+ continue;
+
+ if ((new Random()).NextDouble() < application_chance)
+ {
+ partner.genes.AddGene(diseaseGeneDef, !RJW_Genes_Settings.rjw_genes_genetic_disease_as_endogenes);
+ FactionUtility.HandleFactionGoodWillPenalties(infector, partner, "rjw_genes_GoodwillChangedReason_infected_with_disease",FACTION_GOODWILL_CHANGE);
+ }
+ }
+ }
+ }
+
+ }
+}
diff --git a/Source/Genes/Diseases/Patches/Patch_AftersexUtility_TransferGeneticDiseases.cs b/Source/Genes/Diseases/Patches/Patch_AftersexUtility_TransferGeneticDiseases.cs
new file mode 100644
index 0000000..a00d40f
--- /dev/null
+++ b/Source/Genes/Diseases/Patches/Patch_AftersexUtility_TransferGeneticDiseases.cs
@@ -0,0 +1,60 @@
+using HarmonyLib;
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ [HarmonyPatch(typeof(SexUtility), "Aftersex")]
+ public class Patch_AftersexUtility_TransferGeneticDiseases
+ {
+
+ public const int FACTION_GOODWILL_CHANGE = -2;
+
+ public static void Postfix(SexProps props)
+ {
+ if (!RJW_Genes_Settings.rjw_genes_genetic_disease_spread) return;
+
+ if (props == null || props.pawn == null || props.partner == null) return;
+
+ Pawn pawn = props.pawn;
+ Pawn partner = props.partner;
+
+ if (pawn == partner) return;
+ if (pawn.IsAnimal() || partner.IsAnimal()) return;
+ if (pawn.genes == null || partner.genes == null) return;
+ // No Infections on Condom Use
+ if (props.usedCondom) return;
+
+ // Exit early if settings require penetrative sex, but this is not penetrative sex
+ if (!DiseaseHelper.IsPenetrativeSex(props) && RJW_Genes_Settings.rjw_genes_genetic_disease_spread_only_on_penetrative_sex) return;
+
+ //ModLog.Debug($"Firing Patch_TransferGeneticDiseases for {pawn} and {partner}");
+ TryTransferGeneticDiseases(pawn, partner, props);
+ TryTransferGeneticDiseases(partner, pawn, props);
+ }
+
+ private static void TryTransferGeneticDiseases(Pawn infector, Pawn infected, SexProps props)
+ {
+
+ foreach (GeneDef disease in DiseaseHelper.GetGeneticDiseaseGenes(infector)) {
+ ModLog.Debug($"Found genetic disease {disease} in {infector}, trying to infect {infected}");
+
+ if (DiseaseHelper.IsImmuneAgainstGeneticDisease(infected,disease))
+ continue;
+
+ if ((new Random()).NextDouble() <= DiseaseHelper.LookupDiseaseInfectionChance(disease))
+ {
+ infected.genes.AddGene(disease, !RJW_Genes_Settings.rjw_genes_genetic_disease_as_endogenes);
+ FactionUtility.HandleFactionGoodWillPenalties(infector, infected, "rjw_genes_GoodwillChangedReason_spread_genetic_disease", FACTION_GOODWILL_CHANGE);
+ }
+ }
+ }
+
+ }
+}
diff --git a/Source/Genes/Diseases/Patches/Patch_SecondaryRomanceChanceFactor_Gene_SizeBlinded.cs b/Source/Genes/Diseases/Patches/Patch_SecondaryRomanceChanceFactor_Gene_SizeBlinded.cs
new file mode 100644
index 0000000..fa36398
--- /dev/null
+++ b/Source/Genes/Diseases/Patches/Patch_SecondaryRomanceChanceFactor_Gene_SizeBlinded.cs
@@ -0,0 +1,56 @@
+using HarmonyLib;
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ ///
+ /// This patch helps with the gene `rjw_genes_size_blinded`.
+ /// Within RJW the CasualSexHelper utilizes the basefunction "pawn.relations.SecondaryRomanceChanceFactor"
+ /// https://gitgud.io/Ed86/rjw/-/blob/master/1.5/Source/Common/Helpers/CasualSex_Helper.cs
+ ///
+ /// We check on hookup for the other pawn if they have a penis.
+ /// If yes, we modulate the romance chance based on the following:
+ /// (Severity * BodySize - 0.5) * romance_multiplier
+ /// So pawns with a cock smaller than 0.5 will be penalized, while pawns with more than 0.5 will be preferred.
+ ///
+ [HarmonyPatch(typeof(Pawn_RelationsTracker), "SecondaryRomanceChanceFactor")]
+ public class Patch_SecondaryRomanceChanceFactor_Gene_SizeBlinded
+ {
+
+ const float romance_multiplier = 2f;
+
+ public static void Postfix( Pawn ___pawn, Pawn otherPawn, ref float __result)
+ {
+ if (otherPawn == null || ___pawn == null || ___pawn.genes == null || otherPawn.genes == null)
+ {
+ return;
+ }
+ if (___pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_size_blinded) && Genital_Helper.has_penis_fertile(otherPawn) || (Genital_Helper.has_penis_infertile(otherPawn)))
+ {
+ Hediff biggest_cock = GenitaliaUtility.GetBiggestPenis(otherPawn);
+ if (biggest_cock != null)
+ {
+ float bodysize = GenitaliaUtility.GetBodySizeOfSexPart(biggest_cock);
+ // Bodysize can only be a bonus, not a minus.
+ bodysize = Math.Max(1.0f, bodysize);
+
+ float attraction_bonus = (biggest_cock.Severity * bodysize - 0.5f) * romance_multiplier;
+ float result_backup = __result;
+ __result += attraction_bonus;
+ // Don't make it smaller than 0, to not get issues.
+ __result = __result < 0 ? 0.0f : __result;
+
+ ModLog.Debug($"Gene_SizeBlind: Modulate Romance-Chance {___pawn}-->{otherPawn} from {result_backup} by {attraction_bonus} to {__result}");
+ }
+ }
+ }
+
+ }
+}
diff --git a/Source/Genes/Diseases/Thoughts/ThoughtWorker_HasMoreDiseasesThanMe_Social.cs b/Source/Genes/Diseases/Thoughts/ThoughtWorker_HasMoreDiseasesThanMe_Social.cs
new file mode 100644
index 0000000..7a85eb3
--- /dev/null
+++ b/Source/Genes/Diseases/Thoughts/ThoughtWorker_HasMoreDiseasesThanMe_Social.cs
@@ -0,0 +1,59 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class ThoughtWorker_HasMoreDiseasesThanMe_Social : ThoughtWorker
+ {
+ protected override ThoughtState CurrentSocialStateInternal(Pawn pawn, Pawn other)
+ {
+ // Return for trivial errors
+ if (pawn == null || other == null || pawn == other)
+ return (ThoughtState)false;
+ // Check for position-existance
+ if (pawn.Position == null || other.Position == null || pawn.Map == null || other.Map == null)
+ return (ThoughtState)false;
+ // Do nothing if pawn is carried
+ if (pawn.CarriedBy != null)
+ return (ThoughtState)false;
+ // Do nothing if Pawn is Baby or Child (#25)
+ if (!pawn.ageTracker.Adult)
+ return (ThoughtState)false;
+ if (!other.ageTracker.Adult)
+ return (ThoughtState)false;
+ // Only check if they are spawned humans
+ if (!pawn.Spawned || !other.Spawned)
+ return (ThoughtState)false;
+ if (!pawn.RaceProps.Humanlike)
+ return (ThoughtState)false;
+ if (!other.RaceProps.Humanlike)
+ return (ThoughtState)false;
+
+ // Pawns that have not "met" wont give each other Mali
+ // Known-Each-Other is a key-word for Rimworld that shows they have had any interaction and stored each other in relations.
+ if (!RelationsUtility.PawnsKnowEachOther(pawn, other))
+ return (ThoughtState)false;
+ // If the pawn is not on Map (e.g. caravan), no mali
+ if (!MapUtility.PawnIsOnHomeMap(pawn))
+ return (ThoughtState)false;
+
+ int pawn_diseases = DiseaseHelper.GetGeneticDiseaseGenes(pawn).Count();
+ int other_diseases = DiseaseHelper.GetGeneticDiseaseGenes(other).Count();
+ int disease_diff = other_diseases - pawn_diseases;
+
+ if (disease_diff >= 5)
+ return ThoughtState.ActiveAtStage(2);
+ else if (disease_diff >= 2)
+ return ThoughtState.ActiveAtStage(1);
+ else if (disease_diff >= 1)
+ return ThoughtState.ActiveAtStage(0);
+ else
+ return (ThoughtState)false;
+ }
+ }
+}
diff --git a/Source/Genes/Diseases/Thoughts/ThoughtWorker_SizeBlinded_Social.cs b/Source/Genes/Diseases/Thoughts/ThoughtWorker_SizeBlinded_Social.cs
new file mode 100644
index 0000000..61199a6
--- /dev/null
+++ b/Source/Genes/Diseases/Thoughts/ThoughtWorker_SizeBlinded_Social.cs
@@ -0,0 +1,69 @@
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class ThoughtWorker_SizeBlinded_Social : ThoughtWorker
+ {
+ protected override ThoughtState CurrentSocialStateInternal(Pawn pawn, Pawn other)
+ {
+ // Return for trivial errors
+ if (pawn == null || other == null || pawn == other)
+ return (ThoughtState)false;
+ // Check for position-existance
+ if (pawn.Position == null || other.Position == null || pawn.Map == null || other.Map == null)
+ return (ThoughtState)false;
+ // Do nothing if pawn is carried
+ if (pawn.CarriedBy != null)
+ return (ThoughtState)false;
+ // Do nothing if Pawn is Baby or Child (#25)
+ if (!pawn.ageTracker.Adult)
+ return (ThoughtState)false;
+ if (!other.ageTracker.Adult)
+ return (ThoughtState)false;
+ // Only check if they are spawned humans
+ if (!pawn.Spawned || !other.Spawned)
+ return (ThoughtState)false;
+ if (!pawn.RaceProps.Humanlike)
+ return (ThoughtState)false;
+ if (!other.RaceProps.Humanlike)
+ return (ThoughtState)false;
+
+ // Pawns that have not "met" wont give each other Mali
+ // Known-Each-Other is a key-word for Rimworld that shows they have had any interaction and stored each other in relations.
+ if (!RelationsUtility.PawnsKnowEachOther(pawn, other))
+ return (ThoughtState)false;
+ // If the pawn is not on Map (e.g. caravan), no mali
+ if (!MapUtility.PawnIsOnHomeMap(pawn))
+ return (ThoughtState)false;
+
+
+ // Do nothing if there is no size-blinded involved
+ if (!GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_size_blinded))
+ return (ThoughtState)false;
+ else
+ ModLog.Debug($"{pawn} has the size blinded gene");
+
+ // Iff the pawn has a penis, retrieve it's size.
+ var penis = GenitaliaUtility.GetBiggestPenis(other);
+ // Do Nothing if the other pawn has no penis
+ if (penis == null) return (ThoughtState)false;
+ var bodysize = GenitaliaUtility.GetBodySizeOfSexPart(penis);
+
+ if (penis.Severity + (bodysize) - 1.0 > 1.0)
+ return ThoughtState.ActiveAtStage(2);
+ else if (penis.Severity >= 0.8f)
+ return ThoughtState.ActiveAtStage(1);
+ else
+ return ThoughtState.ActiveAtStage(0);
+
+ }
+ }
+}
diff --git a/Source/Genes/ExtraGenitalia/Gene_ExtraAnus.cs b/Source/Genes/ExtraGenitalia/Gene_ExtraAnus.cs
index cea77f2..65121e9 100644
--- a/Source/Genes/ExtraGenitalia/Gene_ExtraAnus.cs
+++ b/Source/Genes/ExtraGenitalia/Gene_ExtraAnus.cs
@@ -1,6 +1,7 @@
using Verse;
using rjw;
using RimWorld;
+using System.Linq;
namespace RJW_Genes
{
@@ -13,6 +14,13 @@ namespace RJW_Genes
{
base.PostMake();
+ // Some sources add Genes before they fire, e.g. Character Editor
+ // This should harden the gene, to solve #19
+ if (HasAlreadyTwoAnus())
+ {
+ return;
+ }
+
if (additional_anus == null)
{
CreateAndAddAnus();
@@ -23,6 +31,13 @@ namespace RJW_Genes
{
base.PostAdd();
+ // Some sources add Genes before they fire, e.g. Character Editor
+ // This should harden the gene, to solve #19
+ if (HasAlreadyTwoAnus())
+ {
+ return;
+ }
+
if (additional_anus == null)
{
CreateAndAddAnus();
@@ -53,5 +68,15 @@ namespace RJW_Genes
pawn.health.AddHediff(additional_anus, partBPR);
}
+ internal bool HasAlreadyTwoAnus()
+ {
+ if (pawn == null)
+ return false;
+
+ var possible_breasts =
+ Genital_Helper.get_AllPartsHediffList(pawn).Where(t => Genital_Helper.is_anus(t));
+
+ return possible_breasts.Count() >= 2;
+ }
}
}
diff --git a/Source/Genes/ExtraGenitalia/Gene_ExtraBreasts.cs b/Source/Genes/ExtraGenitalia/Gene_ExtraBreasts.cs
index 8829854..84fb107 100644
--- a/Source/Genes/ExtraGenitalia/Gene_ExtraBreasts.cs
+++ b/Source/Genes/ExtraGenitalia/Gene_ExtraBreasts.cs
@@ -1,6 +1,7 @@
using Verse;
using rjw;
using RimWorld;
+using System.Linq;
namespace RJW_Genes
{
@@ -13,6 +14,13 @@ namespace RJW_Genes
{
base.PostMake();
+ // Some sources add Genes before they fire, e.g. Character Editor
+ // This should harden the gene, to solve #19
+ if (HasAlreadyTwoBreasts())
+ {
+ return;
+ }
+
// Tits are only added for female pawns!
if (GenderUtility.IsFemale(pawn) && additional_breasts == null)
{
@@ -24,6 +32,13 @@ namespace RJW_Genes
{
base.PostAdd();
+ // Some sources add Genes before they fire, e.g. Character Editor
+ // This should harden the gene, to solve #19
+ if (HasAlreadyTwoBreasts())
+ {
+ return;
+ }
+
// Tits are only added for female pawns!
if (GenderUtility.IsFemale(pawn) && additional_breasts == null)
{
@@ -55,5 +70,16 @@ namespace RJW_Genes
pawn.health.AddHediff(additional_breasts, partBPR);
}
+ internal bool HasAlreadyTwoBreasts()
+ {
+ if (pawn == null)
+ return false;
+
+ var possible_breasts =
+ Genital_Helper.get_AllPartsHediffList(pawn).Where(t => t.def.defName.Contains("breast"));
+
+ return possible_breasts.Count() >= 2;
+ }
+
}
}
diff --git a/Source/Genes/ExtraGenitalia/Gene_ExtraPenis.cs b/Source/Genes/ExtraGenitalia/Gene_ExtraPenis.cs
index aee18c7..7b8fcb4 100644
--- a/Source/Genes/ExtraGenitalia/Gene_ExtraPenis.cs
+++ b/Source/Genes/ExtraGenitalia/Gene_ExtraPenis.cs
@@ -1,6 +1,7 @@
using Verse;
using rjw;
using RimWorld;
+using System.Linq;
namespace RJW_Genes
{
@@ -13,6 +14,13 @@ namespace RJW_Genes
{
base.PostMake();
+ // Some sources add Genes before they fire, e.g. Character Editor
+ // This should harden the gene, to solve #19
+ if (HasAlreadyTwoPenis())
+ {
+ return;
+ }
+
// Penis are only added for male pawns!
if (GenderUtility.IsMale(pawn) && additional_penis == null)
{
@@ -24,6 +32,13 @@ namespace RJW_Genes
{
base.PostAdd();
+ // Some sources add Genes before they fire, e.g. Character Editor
+ // This should harden the gene, to solve #19
+ if (HasAlreadyTwoPenis())
+ {
+ return;
+ }
+
// Penis are only added for male pawns!
if (GenderUtility.IsMale(pawn) && additional_penis == null)
{
@@ -55,5 +70,17 @@ namespace RJW_Genes
pawn.health.AddHediff(additional_penis, partBPR);
}
+
+ internal bool HasAlreadyTwoPenis()
+ {
+ if (pawn == null)
+ return false;
+
+ var possible_breasts =
+ Genital_Helper.get_AllPartsHediffList(pawn).Where(t => Genital_Helper.is_penis(t));
+
+ return possible_breasts.Count() >= 2;
+ }
+
}
}
diff --git a/Source/Genes/ExtraGenitalia/Gene_ExtraVagina.cs b/Source/Genes/ExtraGenitalia/Gene_ExtraVagina.cs
index 9940de0..fa02b87 100644
--- a/Source/Genes/ExtraGenitalia/Gene_ExtraVagina.cs
+++ b/Source/Genes/ExtraGenitalia/Gene_ExtraVagina.cs
@@ -1,6 +1,7 @@
using Verse;
using rjw;
using RimWorld;
+using System.Linq;
namespace RJW_Genes
{
@@ -18,6 +19,13 @@ namespace RJW_Genes
{
base.PostMake();
+ // Some sources add Genes before they fire, e.g. Character Editor
+ // This should harden the gene, to solve #19
+ if (HasAlreadyTwoVaginas())
+ {
+ return;
+ }
+
// Vaginas are only added for female pawns!
if (GenderUtility.IsFemale(pawn) && additional_vagina == null)
{
@@ -29,6 +37,13 @@ namespace RJW_Genes
{
base.PostAdd();
+ // Some sources add Genes before they fire, e.g. Character Editor
+ // This should harden the gene, to solve #19
+ if (HasAlreadyTwoVaginas())
+ {
+ return;
+ }
+
// Vaginas are only added for female pawns!
if (GenderUtility.IsFemale(pawn) && additional_vagina == null)
{
@@ -60,5 +75,15 @@ namespace RJW_Genes
pawn.health.AddHediff(additional_vagina, partBPR);
}
+ internal bool HasAlreadyTwoVaginas()
+ {
+ if (pawn == null)
+ return false;
+
+ var possible_breasts =
+ Genital_Helper.get_AllPartsHediffList(pawn).Where(t => Genital_Helper.is_vagina(t));
+
+ return possible_breasts.Count() >= 2;
+ }
}
}
diff --git a/Source/Genes/ExtraGenitalia/Gene_FeaturelessChest.cs b/Source/Genes/ExtraGenitalia/Gene_FeaturelessChest.cs
new file mode 100644
index 0000000..00b4c82
--- /dev/null
+++ b/Source/Genes/ExtraGenitalia/Gene_FeaturelessChest.cs
@@ -0,0 +1,60 @@
+using Verse;
+using rjw;
+
+namespace RJW_Genes
+{
+ public class Gene_FeaturelessChest : RJW_Gene
+ {
+ internal Hediff removed_breasts;
+ internal Hediff added_nipples;
+ public override void PostMake()
+ {
+ base.PostMake();
+
+ if (removed_breasts == null)
+ {
+ RemoveButStoreBreasts();
+ AddFeaturelessBreast();
+ }
+ }
+
+ public override void PostAdd()
+ {
+ base.PostAdd();
+
+ if (removed_breasts == null)
+ {
+ RemoveButStoreBreasts();
+ AddFeaturelessBreast();
+ }
+ }
+
+ public override void PostRemove()
+ {
+ base.PostRemove();
+ if (added_nipples != null)
+ pawn.health.RemoveHediff(added_nipples);
+ if (removed_breasts != null)
+ pawn.health.AddHediff(removed_breasts);
+ }
+
+ internal void RemoveButStoreBreasts()
+ {
+ var partBPR = Genital_Helper.get_breastsBPR(pawn);
+ Hediff breastsToRemove = Genital_Helper.get_AllPartsHediffList(pawn).FindLast(x => GenitaliaUtility.IsBreasts(x));
+
+ if (breastsToRemove != null)
+ {
+ removed_breasts = breastsToRemove;
+ pawn.health.RemoveHediff(breastsToRemove);
+ }
+ }
+
+ internal void AddFeaturelessBreast()
+ {
+ var partBPR = Genital_Helper.get_breastsBPR(pawn);
+ added_nipples = pawn.health.AddHediff(Genital_Helper.featureless_chest, partBPR);
+ }
+
+ }
+}
diff --git a/Source/Genes/ExtraGenitalia/Gene_Femboy.cs b/Source/Genes/ExtraGenitalia/Gene_Femboy.cs
new file mode 100644
index 0000000..e86beed
--- /dev/null
+++ b/Source/Genes/ExtraGenitalia/Gene_Femboy.cs
@@ -0,0 +1,75 @@
+using Verse;
+using rjw;
+using RimWorld;
+
+namespace RJW_Genes
+{
+ public class Gene_Femboy : RJW_Gene
+ {
+ // Token: 0x06000335 RID: 821 RVA: 0x0000401D File Offset: 0x0000221D
+ public override void PostMake()
+ {
+ base.PostMake();
+ if (GenderUtility.IsMale(this.pawn) && this.additional_genital == null)
+ {
+ this.CreateAndAddVagina();
+ }
+ }
+
+ // Token: 0x06000336 RID: 822 RVA: 0x00004040 File Offset: 0x00002240
+ public override void PostAdd()
+ {
+ base.PostAdd();
+ if (this.pawn.gender == Gender.Male && this.additional_genital == null)
+ {
+ this.CreateAndAddVagina();
+ }
+ }
+
+ // Token: 0x06000337 RID: 823 RVA: 0x0000EE4C File Offset: 0x0000D04C
+ internal void CreateAndAddVagina()
+ {
+ if (this.pawn.gender != Gender.Female)
+ {
+ GenderHelper.ChangeSex(this.pawn, delegate ()
+ {
+ this.pawn.gender = Gender.Female;
+ GenitaliaChanger.RemoveAllGenitalia(this.pawn);
+ Sexualizer.sexualize_pawn(this.pawn);
+ });
+ GenderUtility.AdjustBodyToTargetGender(this.pawn, Gender.Female);
+ }
+ BodyPartRecord bodyPartRecord = Genital_Helper.get_genitalsBPR(this.pawn);
+ Hediff hediff = Genital_Helper.get_AllPartsHediffList(this.pawn).FindLast((Hediff x) => Genital_Helper.is_vagina(x));
+ if (hediff != null)
+ {
+ this.pawn.health.RemoveHediff(hediff);
+ }
+ HediffDef penisForGene = GenitaliaUtility.GetPenisForGene(GenitaliaUtility.GetGenitaliaTypeGeneForPawn(this.pawn));
+ BodyPartRecord part = Genital_Helper.get_genitalsBPR(this.pawn);
+ this.additional_genital = HediffMaker.MakeHediff(penisForGene, this.pawn, null);
+ CompHediffBodyPart compHediffBodyPart = this.additional_genital.TryGetComp();
+ if (compHediffBodyPart != null)
+ {
+ compHediffBodyPart.initComp(this.pawn, false);
+ compHediffBodyPart.updatesize(0f);
+ }
+ this.pawn.health.AddHediff(this.additional_genital, part, null, null);
+ foreach (Gene g in pawn.genes.GenesListForReading)
+ {
+ if (g.def.defName == "rjw_genes_hydrolic_genitalia")
+ {
+ g.PostAdd();
+ }
+ if (g.def.defName == "rjw_genes_bionic_genitalia")
+ {
+ g.PostAdd();
+ return;
+ }
+ }
+ }
+
+ // Token: 0x040001B0 RID: 432
+ internal Hediff additional_genital;
+ }
+}
diff --git a/Source/Genes/ExtraGenitalia/Gene_Futa.cs b/Source/Genes/ExtraGenitalia/Gene_Futa.cs
index 2d9f367..812f381 100644
--- a/Source/Genes/ExtraGenitalia/Gene_Futa.cs
+++ b/Source/Genes/ExtraGenitalia/Gene_Futa.cs
@@ -13,6 +13,12 @@ namespace RJW_Genes
{
base.PostMake();
+ // If the Pawn is already a Futa, do not do anything. Can Happen by Base-RJW Spawn Chance or potentially races / other mods.
+ if (IsAlreadyFuta(pawn))
+ {
+ return;
+ }
+
if (GenderUtility.IsFemale(pawn) && additional_genital == null)
{
createAndAddPenis();
@@ -27,6 +33,12 @@ namespace RJW_Genes
{
base.PostAdd();
+ // If the Pawn is already a Futa, do not do anything. Can Happen by Base-RJW Spawn Chance or potentially races / other mods.
+ if (IsAlreadyFuta(pawn))
+ {
+ return;
+ }
+
if (pawn.gender == Gender.Female && additional_genital == null)
{
createAndAddPenis();
@@ -79,5 +91,15 @@ namespace RJW_Genes
pawn.health.AddHediff(additional_genital, partBPR);
}
+ private static bool IsAlreadyFuta(Pawn pawn)
+ {
+ if (pawn == null)
+ return false;
+ if (!Genital_Helper.has_genitals(pawn))
+ return false;
+ return
+ (Genital_Helper.has_penis_fertile(pawn) || Genital_Helper.has_penis_infertile(pawn))
+ && Genital_Helper.has_vagina(pawn) ;
+ }
}
}
diff --git a/Source/Genes/ExtraGenitalia/Gene_NoAnus.cs b/Source/Genes/ExtraGenitalia/Gene_NoAnus.cs
index d23b2df..8aad9ab 100644
--- a/Source/Genes/ExtraGenitalia/Gene_NoAnus.cs
+++ b/Source/Genes/ExtraGenitalia/Gene_NoAnus.cs
@@ -9,9 +9,6 @@ namespace RJW_Genes
internal Hediff removed_anus;
- // TODO: This gene only works if another Gene was set specifying the genitalia.
- // If it is added later, it still works, but on creation it needs a different
- // TODO: If all Genitalia are removed by genes, RJW adds some to the pawns at spawn
public override void PostMake()
{
base.PostMake();
diff --git a/Source/Genes/ExtraGenitalia/Gene_NoBreasts.cs b/Source/Genes/ExtraGenitalia/Gene_NoBreasts.cs
index ddc75a1..caa0a5c 100644
--- a/Source/Genes/ExtraGenitalia/Gene_NoBreasts.cs
+++ b/Source/Genes/ExtraGenitalia/Gene_NoBreasts.cs
@@ -6,18 +6,15 @@ namespace RJW_Genes
{
public class Gene_NoBreasts : RJW_Gene
{
+ Hediff breastsToShrink;
+ internal float oldSize = -1f;
- internal Hediff removed_breasts;
-
- // TODO: This gene only works if another Gene was set specifying the genitalia.
- // If it is added later, it still works, but on creation it needs a different
- // TODO: If all Genitalia are removed by genes, RJW adds some to the pawns at spawn. IDEA: Add male-nipples ?
public override void PostMake()
{
base.PostMake();
// Breasts are removed for female pawns!
- if (GenderUtility.IsFemale(pawn) && removed_breasts == null)
+ if (GenderUtility.IsFemale(pawn) && oldSize < 0)
{
RemoveButStoreBreasts();
}
@@ -28,7 +25,7 @@ namespace RJW_Genes
base.PostAdd();
// Breasts are removed for female pawns!
- if (GenderUtility.IsFemale(pawn) && removed_breasts == null)
+ if (GenderUtility.IsFemale(pawn) && oldSize < 0)
{
RemoveButStoreBreasts();
}
@@ -37,19 +34,21 @@ namespace RJW_Genes
public override void PostRemove()
{
base.PostRemove();
- if(removed_breasts != null)
- pawn.health.AddHediff(removed_breasts);
+ // Re-Add the old breasts
+ if (oldSize != null)
+ breastsToShrink.Severity = oldSize;
}
internal void RemoveButStoreBreasts()
{
var partBPR = Genital_Helper.get_breastsBPR(pawn);
- Hediff breastsToRemove = Genital_Helper.get_AllPartsHediffList(pawn).FindLast(x => GenitaliaUtility.IsBreasts(x));
+ breastsToShrink = Genital_Helper.get_AllPartsHediffList(pawn).FindLast(x => GenitaliaUtility.IsBreasts(x));
- if(breastsToRemove != null)
+ if(breastsToShrink != null)
{
- removed_breasts = breastsToRemove;
- pawn.health.RemoveHediff(breastsToRemove);
+ oldSize = breastsToShrink.Severity;
+ //pawn.health.RemoveHediff(breastsToRemove);
+ breastsToShrink.Severity = 0f;
}
}
diff --git a/Source/Genes/ExtraGenitalia/Gene_NoPenis.cs b/Source/Genes/ExtraGenitalia/Gene_NoPenis.cs
index be67ef4..b107a5a 100644
--- a/Source/Genes/ExtraGenitalia/Gene_NoPenis.cs
+++ b/Source/Genes/ExtraGenitalia/Gene_NoPenis.cs
@@ -9,9 +9,6 @@ namespace RJW_Genes
internal Hediff removed_penis;
- // TODO: This gene only works if another Gene was set specifying the genitalia.
- // If it is added later, it still works, but on creation it needs a different
- // TODO: If all Genitalia are removed by genes, RJW adds some to the pawns at spawn
public override void PostMake()
{
base.PostMake();
diff --git a/Source/Genes/ExtraGenitalia/Gene_NoVagina.cs b/Source/Genes/ExtraGenitalia/Gene_NoVagina.cs
index 8083f58..438d76e 100644
--- a/Source/Genes/ExtraGenitalia/Gene_NoVagina.cs
+++ b/Source/Genes/ExtraGenitalia/Gene_NoVagina.cs
@@ -8,10 +8,7 @@ namespace RJW_Genes
{
internal Hediff removed_vagina;
-
- // TODO: This gene only works if another Gene was set specifying the genitalia.
- // If it is added later, it still works, but on creation it needs a different
- // TODO: If all Genitalia are removed by genes, RJW adds some to the pawns at spawn
+
public override void PostMake()
{
base.PostMake();
diff --git a/Source/Genes/ExtraGenitalia/Gene_UdderBreasts.cs b/Source/Genes/ExtraGenitalia/Gene_UdderBreasts.cs
new file mode 100644
index 0000000..87f2a20
--- /dev/null
+++ b/Source/Genes/ExtraGenitalia/Gene_UdderBreasts.cs
@@ -0,0 +1,58 @@
+using rjw;
+using Verse;
+
+namespace RJW_Genes
+{
+
+ ///
+ /// Removes breasts for female (and trap, futa) pawns and adds Udders.
+ /// Wished for in Issue #27.
+ ///
+ /// TODO: Currently, the sexualizer over-writes the added udders and just adds another pair of breasts!
+ /// I commented out the gene in .xml for now.
+ ///
+ public class Gene_UdderBreasts : RJW_Gene
+ {
+
+ Hediff added_udders;
+
+ public override void PostMake()
+ {
+ base.PostMake();
+
+
+ }
+
+ public override void PostAdd()
+ {
+ base.PostAdd();
+
+ AddUdders();
+
+ }
+
+ public override void PostRemove()
+ {
+ base.PostRemove();
+
+ if (added_udders != null)
+ pawn.health.RemoveHediff(added_udders);
+ }
+
+
+ internal void AddUdders()
+ {
+ CompHediffBodyPart CompHediff = null;
+ BodyPartRecord bpr = Genital_Helper.get_uddersBPR(pawn);
+ added_udders = pawn.health.AddHediff(Genital_Helper.udder_breasts, bpr);
+ added_udders.TryGetComp();
+ if (CompHediff != null)
+ {
+ CompHediff.initComp(pawn);
+ CompHediff.updatesize();
+ }
+
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/Source/Genes/Gender/GenderUtility.cs b/Source/Genes/Gender/GenderUtility.cs
index ea0e1d6..15c7c02 100644
--- a/Source/Genes/Gender/GenderUtility.cs
+++ b/Source/Genes/Gender/GenderUtility.cs
@@ -1,9 +1,10 @@
using Verse;
using rjw;
using RimWorld;
-using System.Collections;
using System.Linq;
using System;
+using System.Collections.Generic;
+using HarmonyLib;
namespace RJW_Genes
{
@@ -30,7 +31,8 @@ namespace RJW_Genes
}
///
- /// Adjusts the Body Type to match the given target gender
+ /// Adjusts the Body Type to match the given target gender.
+ /// This is only for "drawing" attributes of the pawn, the genitalia are untouched at this point.
/// (for male and female only, baby,child and hulks don't change)
///
///
@@ -67,7 +69,52 @@ namespace RJW_Genes
}
// Force Redraw at the spot
- pawn.Drawer.renderer.graphics.SetAllGraphicsDirty();
+ }
+
+ // Fetch these once at load time because they don't change inside RJW
+ private static readonly List wasSexThoughts = Traverse.Create(typeof(GenderHelper)).Field("old_sex_list").GetValue>();
+ private static readonly List sexChangeThoughts = Traverse.Create(typeof(GenderHelper)).Field("SexChangeThoughts").GetValue>();
+
+ ///
+ /// This method removes all RJW-Sexchange-Hediffs from the pawn.
+ /// It used with the RJW_Gene.Notify_OnPawnGeneration() to check for pawns on spawn.
+ ///
+ /// Fixes Issue #32, where pawns that spawn fresh with a "all female" gene may have m2f thoughts.
+ ///
+ /// The pawn that needs to have SexChange-Thoughts removed.
+ public static void RemoveAllSexChangeThoughts(Pawn pawn)
+ {
+ // Shouldn't ever be true in the normal case, but this stops someone from calling this with an incorrect setup
+ if (pawn?.health == null)
+ return;
+
+ if(wasSexThoughts == null || sexChangeThoughts == null || !wasSexThoughts.Any() || !sexChangeThoughts.Any())
+ {
+ Log.Warning($"Couldn't get values from RJW.\nold_sex_list: {wasSexThoughts.ToStringSafeEnumerable()}\nSexChangeThoughts: {sexChangeThoughts.ToStringSafeEnumerable()}");
+ return;
+ }
+
+ foreach(var def in wasSexThoughts.Concat(sexChangeThoughts))
+ {
+ var hediff = pawn.health.hediffSet.GetFirstHediffOfDef(def);
+ if (hediff != null)
+ pawn.health.RemoveHediff(hediff);
+ }
+ }
+
+ ///
+ /// This check helps to get babies after birth, if the pawn was born with the gene it does not need to have thoughts.
+ /// There are very different ways to do the life stages, and there are also HAR people still around,
+ /// so instead of checking for stages I intentionally check for the biological ticks to be very low (that they can only exist basically if they are born right before).
+ /// Issue is tracked in #103.
+ ///
+ ///
+ public static void RemoveSexChangeThoughtsIfTooYoung(Pawn pawn)
+ {
+ if (pawn.ageTracker.AgeBiologicalTicks < 1000)
+ {
+ GenderUtility.RemoveAllSexChangeThoughts(pawn);
+ }
}
}
}
diff --git a/Source/Genes/Gender/Gene_FemaleOnly.cs b/Source/Genes/Gender/Genes/Gene_FemaleOnly.cs
similarity index 53%
rename from Source/Genes/Gender/Gene_FemaleOnly.cs
rename to Source/Genes/Gender/Genes/Gene_FemaleOnly.cs
index 0cfbe0d..c3d5ef6 100644
--- a/Source/Genes/Gender/Gene_FemaleOnly.cs
+++ b/Source/Genes/Gender/Genes/Gene_FemaleOnly.cs
@@ -4,7 +4,7 @@ using rjw;
namespace RJW_Genes
{
- public class Gene_FemaleOnly : Gene
+ public class Gene_FemaleOnly : RJW_Gene
{
public override void PostMake()
{
@@ -14,12 +14,15 @@ namespace RJW_Genes
// Here we call Sexualization after the Sex-Change
if (GenitaliaUtility.PawnStillNeedsGenitalia(pawn))
Sexualizer.sexualize_pawn(pawn);
+
+ GenderUtility.RemoveSexChangeThoughtsIfTooYoung(this.pawn);
}
public override void PostAdd()
{
base.PostMake();
AdjustPawnToFemale();
+ GenderUtility.RemoveSexChangeThoughtsIfTooYoung(this.pawn);
}
private void AdjustPawnToFemale()
@@ -36,7 +39,25 @@ namespace RJW_Genes
});
GenderUtility.AdjustBodyToTargetGender(pawn, Gender.Female);
}
+ foreach(Gene g in pawn.genes.GenesListForReading)
+ {
+ if(g.def.defName== "rjw_genes_hydrolic_genitalia")
+ {
+ g.PostAdd();
+ }
+ if (g.def.defName == "rjw_genes_bionic_genitalia")
+ {
+ g.PostAdd();
+ return;
+ }
+ }
}
+ public override void Notify_OnPawnGeneration()
+ {
+ base.Notify_OnPawnGeneration();
+ // If this is Pawn generation, then we can assume that the pawn was never any gender other than female, so they shouldn't have sex change thoughts. (Issue #32)
+ GenderUtility.RemoveAllSexChangeThoughts(pawn);
+ }
}
}
diff --git a/Source/Genes/Gender/Genes/Gene_GenderFluid.cs b/Source/Genes/Gender/Genes/Gene_GenderFluid.cs
new file mode 100644
index 0000000..fe75f5d
--- /dev/null
+++ b/Source/Genes/Gender/Genes/Gene_GenderFluid.cs
@@ -0,0 +1,242 @@
+using HarmonyLib;
+using RimWorld;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+
+namespace RJW_Genes
+{
+
+ /*
+ * Once per day (or slightly different per configuration) checks if the pawn changes gender.
+ * At the triggered tick, there is a random chance to change gender.
+ * This will swap genitalia, appearance and breasts.
+ *
+ * For some situations, the pawn better not change genitalia, e.g. while having vaginal sex. This would throw errors.
+ * For these cases a check is implemented, and if there was a block the change happens a bit later when "unblocked".
+ *
+ * TODO: Keep pregnancies.
+ * The pregnancies remove their things on Tick at the end, which kills it for male pawns.
+ * This seems to be an upstream RJW thing, but needs a bit of investigation.
+ */
+ public class Gene_GenderFluid : RJW_Gene
+ {
+
+ //public const int CHANGE_INTERVAL_FALLBACK = 1000; // Test value for Quick Trials
+ const int CHANGE_INTERVAL_FALLBACK = 60000; // 60k == 1 day
+ const float SWITCH_CHANCE_FALLBACK = 0.25f;
+
+ int change_interval;
+ float switch_chance;
+
+ List storedBreasts = new List();
+
+ private bool sexChangeWasBlocked = false;
+
+ public Gene_GenderFluid() : base() {
+ TickBasedChanceExtension tickbasedChanceExt = GeneDefOf.rjw_genes_gender_fluid.GetModExtension();
+ change_interval = tickbasedChanceExt?.tickInterval ?? CHANGE_INTERVAL_FALLBACK;
+ switch_chance = tickbasedChanceExt?.eventChance ?? SWITCH_CHANCE_FALLBACK;
+ }
+
+ public override void Tick()
+ {
+ base.Tick();
+
+ // Case 1: We had a blocked SexChange, now Pawn is free, apply sexchange a bit delayed.
+ if (pawn.IsHashIntervalTick(1500) && sexChangeWasBlocked && !SexChangeBlocked(pawn)){
+ ChangeSex();
+ sexChangeWasBlocked = false;
+ }
+ // Case 2: Check every interval if the Chance triggers
+ else if (pawn.IsHashIntervalTick(change_interval) && (new Random()).NextDouble() < switch_chance)
+ {
+
+ // Case 2.A) SexChange was blocked, postpone it
+ if (SexChangeBlocked(pawn))
+ {
+ sexChangeWasBlocked |= true;
+ return;
+ }
+ // Case 2.B) Nothing blocking, change the sex.
+ else { ChangeSex();}
+ }
+
+ }
+
+ private void ChangeSex()
+ {
+ if (rjw.Genital_Helper.is_futa(pawn))
+ {
+ // Handle Futa Pawns - Keep Genitalia as is, just change RW Gender
+ pawn.gender = pawn.gender == Gender.Male? Gender.Female: Gender.Male;
+ }
+ // Handle Non-Futas - Change Genitalia and Store breasts.
+ else
+ {
+ if (pawn.gender == Gender.Female)
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug) ModLog.Message($"genderfluid pawn {pawn} is changing from female to male");
+ SwitchToMale();
+ }
+ else if (pawn.gender == Gender.Male)
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug) ModLog.Message($"genderfluid pawn {pawn} is changing from male to female");
+ SwitchToFemale();
+ }
+ }
+ GenderUtility.RemoveAllSexChangeThoughts(pawn);
+ }
+
+ private void SwitchToFemale()
+ {
+ // Change Drawing
+ GenderUtility.AdjustBodyToTargetGender(pawn, Verse.Gender.Female);
+ // Change Gender
+ pawn.gender = Verse.Gender.Female;
+
+ // Switch Penisses to Vaginas
+ var genitalsToRemove = pawn.GetGenitalsList().FindAll(g => Genital_Helper.is_penis(g) || Genital_Helper.is_vagina(g));
+ foreach (var genital in genitalsToRemove)
+ {
+ var genitaliaHediffDef = GenitaliaUtility.GetVaginaForGene(GenitaliaUtility.GetGenitaliaTypeGeneForPawn(pawn));
+ float size = genital.Severity;
+ pawn.health.RemoveHediff(genital);
+
+ var newVagina = HediffMaker.MakeHediff(genitaliaHediffDef, pawn, Genital_Helper.get_genitalsBPR(pawn));
+ pawn.health.AddHediff(newVagina);
+ newVagina.Severity = size;
+ }
+
+ SwitchBreasts();
+ }
+
+ private void SwitchToMale()
+ {
+ // Change Drawing
+ GenderUtility.AdjustBodyToTargetGender(pawn, Verse.Gender.Male);
+ // Change Gender
+ pawn.gender = Verse.Gender.Male;
+
+ // Switch Vaginas to Penisses
+ var genitalsToRemove = pawn.GetGenitalsList().FindAll(g => Genital_Helper.is_penis(g) || Genital_Helper.is_vagina(g));
+ foreach (var genital in genitalsToRemove)
+ {
+ var genitaliaHediffDef = GenitaliaUtility.GetPenisForGene(GenitaliaUtility.GetGenitaliaTypeGeneForPawn(pawn));
+ float size = genital.Severity;
+ pawn.health.RemoveHediff(genital);
+
+ var newPenis = HediffMaker.MakeHediff(genitaliaHediffDef, pawn, Genital_Helper.get_genitalsBPR(pawn));
+ pawn.health.AddHediff(newPenis);
+ newPenis.Severity = size;
+ }
+
+ SwitchBreasts();
+
+ }
+
+
+ private void SwitchBreasts()
+ {
+ List current_breasts = pawn.GetBreastList();
+
+ // Stored_Breasts can be empty when the pawn first ever switches gender!
+ if (storedBreasts.NullOrEmpty())
+ {
+ foreach (var breasts in current_breasts)
+ {
+ // Is Male, and does not have the "no breast gene"
+ if (pawn.gender == Gender.Male && !GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_no_breasts))
+ {
+ storedBreasts.Add(CreateNewBreasts());
+ }
+ else if (pawn.gender == Gender.Female && !GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_featureless_chest) )
+ {
+ storedBreasts.Add(CreateNewBreasts());
+ }
+ }
+ }
+
+
+ foreach (var breast in current_breasts)
+ {
+ pawn.health.RemoveHediff(breast);
+ }
+ foreach (var breast in storedBreasts)
+ {
+ pawn.health.AddHediff(breast);
+ }
+
+ storedBreasts.Clear();
+ storedBreasts.AddRange(current_breasts);
+ }
+
+
+ internal Hediff CreateNewBreasts()
+ {
+ var correctGene = GenitaliaUtility.GetGenitaliaTypeGeneForPawn(pawn);
+ var breastDef = GenitaliaUtility.GetBreastsForGene(correctGene);
+ var partBPR = Genital_Helper.get_breastsBPR(pawn);
+ var additional_breasts = HediffMaker.MakeHediff(breastDef, pawn,partBPR);
+
+ var CompHediff = additional_breasts.TryGetComp();
+ if (CompHediff != null)
+ {
+ CompHediff.initComp(pawn);
+ CompHediff.updatesize();
+ }
+
+ return additional_breasts;
+ }
+
+ ///
+ /// Checks the pawn if it has any of the vagina-related hediffs (e.g. stretched) and removes them.
+ /// Anal Soreness, Stretching etc. remains.
+ ///
+
+
+
+ ///
+ /// There are some actions that block sex change,
+ /// being drafted or having sex.
+ ///
+ /// The pawn that want to sexchange.
+ /// False if the SexChange is applicable, True if there needs to be a wait timer.
+ internal bool SexChangeBlocked(Pawn pawn)
+ {
+ // DEVNOTE: This list might extend on new cases, thus the explicit method.
+ return pawn == null
+ || pawn.health.Dead
+ || (pawn.jobs.curDriver is JobDriver_Masturbate)
+ || (pawn.jobs.curDriver is JobDriver_Sex)
+ || (pawn.jobs.curDriver is JobDriver_SexBaseReciever)
+ || (pawn.jobs.curDriver is JobDriver_SexBaseInitiator)
+ || (pawn.jobs.curDriver is JobDriver_JoinInBed)
+
+ || (pawn.jobs.curDriver is JobDriver_SexQuick)
+ || (pawn.jobs.curDriver is JobDriver_SexBaseRecieverQuickie)
+
+ || (pawn.jobs.curDriver is JobDriver_Knotted)
+ || (pawn.jobs.curDriver is JobDriver_Mate)
+ || (pawn.jobs.curDriver is JobDriver_Mating)
+ || (pawn.jobs.curDriver is JobDriver_Breeding)
+
+ || (pawn.jobs.curDriver is JobDriver_Rape)
+ || (pawn.jobs.curDriver is JobDriver_SexBaseRecieverRaped)
+ || (pawn.jobs.curDriver is JobDriver_RandomRape)
+ || (pawn.jobs.curDriver is JobDriver_RapeComfortPawn)
+ || (pawn.jobs.curDriver is JobDriver_RapeEnemy)
+ || pawn.jobs.curDriver is JobDriver_Lovin
+
+ // This is a heavy check, but this is necessary because sometimes the pawns go somewhere to have sex and then they start despite missing genitalia!
+ || (pawn.jobs.curDriver is JobDriver_Goto)
+
+ || pawn.Drafted;
+ }
+ }
+}
diff --git a/Source/Genes/Gender/Gene_MaleOnly.cs b/Source/Genes/Gender/Genes/Gene_MaleOnly.cs
similarity index 51%
rename from Source/Genes/Gender/Gene_MaleOnly.cs
rename to Source/Genes/Gender/Genes/Gene_MaleOnly.cs
index 51806cf..daca649 100644
--- a/Source/Genes/Gender/Gene_MaleOnly.cs
+++ b/Source/Genes/Gender/Genes/Gene_MaleOnly.cs
@@ -4,7 +4,7 @@ using rjw;
namespace RJW_Genes
{
- public class Gene_MaleOnly : Gene
+ public class Gene_MaleOnly : RJW_Gene
{
public override void PostMake()
{
@@ -14,12 +14,15 @@ namespace RJW_Genes
// Here we call Sexualization after the Sex-Change
if (GenitaliaUtility.PawnStillNeedsGenitalia(pawn))
Sexualizer.sexualize_pawn(pawn);
+
+ GenderUtility.RemoveSexChangeThoughtsIfTooYoung(this.pawn);
}
public override void PostAdd()
{
base.PostMake();
AdjustPawnToMale();
+ GenderUtility.RemoveSexChangeThoughtsIfTooYoung(this.pawn);
}
private void AdjustPawnToMale()
@@ -36,7 +39,25 @@ namespace RJW_Genes
});
GenderUtility.AdjustBodyToTargetGender(pawn, Gender.Male);
}
+ foreach (Gene g in pawn.genes.GenesListForReading)
+ {
+ if (g.def.defName == "rjw_genes_hydrolic_genitalia")
+ {
+ g.PostAdd();
+ }
+ if (g.def.defName == "rjw_genes_bionic_genitalia")
+ {
+ g.PostAdd();
+ return;
+ }
+ }
}
+ public override void Notify_OnPawnGeneration()
+ {
+ base.Notify_OnPawnGeneration();
+ // If this is Pawn generation, then we can assume that the pawn was never any gender other than male, so they shouldn't have sex change thoughts. (Issue #32)
+ GenderUtility.RemoveAllSexChangeThoughts(pawn);
+ }
}
}
diff --git a/Source/Genes/GeneUtility.cs b/Source/Genes/GeneUtility.cs
index ce022ba..f0892af 100644
--- a/Source/Genes/GeneUtility.cs
+++ b/Source/Genes/GeneUtility.cs
@@ -1,71 +1,126 @@
using System;
+using System.Collections.Generic;
using Verse;
-
+using RimWorld;
namespace RJW_Genes
{
public class GeneUtility
{
- public static bool IsMechbreeder(Pawn pawn)
+
+ //Split function so I can offsetlifeforce from gene without needing to look for the gene agian (for the constant drain tick)
+ public static Gene_LifeForce GetLifeForceGene(Pawn pawn)
{
- if (pawn.genes == null)
- {
- return false;
- }
- return pawn.genes.HasGene(GeneDefOf.rjw_genes_mechbreeder);
+ Pawn_GeneTracker genes = pawn.genes;
+ Gene_LifeForce gene_LifeForce = genes.GetFirstGeneOfType();
+ return gene_LifeForce;
}
- public static bool IsInsectIncubator(Pawn pawn)
+ public static void OffsetLifeForce(IGeneResourceDrain drain, float offset)
{
- if (pawn.genes == null)
+ if (drain.Resource != null && drain.Resource.Active)
{
- return false;
+ float old_value = drain.Resource.Value;
+ drain.Resource.Value += offset;
+ PostOffSetLifeForce(drain, old_value);
}
- return pawn.genes.HasGene(GeneDefOf.rjw_genes_insectincubator);
}
- public static bool IsInsectBreeder(Pawn pawn)
+ public static void PostOffSetLifeForce(IGeneResourceDrain drain, float old_value)
{
- if (pawn.genes == null)
+
+ if (drain.Resource != null && drain.Resource.Active)
{
- return false;
+ if (old_value > 0.2f && drain.Resource.Value <= 0.2f)
+ {
+ //TODO: Mood debuff
+ }
+ else if (old_value > 0f && drain.Resource.Value <= 0f)
+ {
+ Pawn pawn = drain.Pawn;
+ if (!drain.Pawn.health.hediffSet.HasHediff(HediffDefOf.rjw_genes_fertilin_craving))
+ {
+ drain.Pawn.health.AddHediff(HediffDefOf.rjw_genes_fertilin_craving);
+ }
+ }
}
- return pawn.genes.HasGene(GeneDefOf.rjw_genes_insectbreeder);
}
- public static float MaxEggSizeMul(Pawn pawn)
+
+ public static bool HasLowLifeForce(Pawn pawn)
{
- float MaxEggSize = 1;
- if (IsInsectIncubator(pawn))
+ if (HasLifeForce(pawn))
{
- MaxEggSize *= 2;
+ Gene_LifeForce gene = pawn.genes.GetFirstGeneOfType();
+ if (gene == null || !gene.Active)
+ return false;
+ if (gene.Resource.Value < gene.targetValue)
+ {
+ return true;
+ }
}
- return MaxEggSize;
+ return false;
}
- internal static bool IsElastic(Pawn pawn)
+ public static bool HasCriticalLifeForce(Pawn pawn)
{
- if (pawn.genes == null)
+ if (HasLifeForce(pawn))
{
- return false;
+ Gene_LifeForce gene = pawn.genes.GetFirstGeneOfType();
+ if (gene == null || !gene.Active)
+ return false;
+ if (gene.Resource.Value < gene.MinLevelForAlert)
+ {
+ return true;
+ }
}
- return pawn.genes.HasGene(GeneDefOf.rjw_genes_elasticity);
+ return false;
}
- public static bool IsCumflationImmune(Pawn pawn)
+
+ public static List GetGenitaliaResizingGenes(Pawn pawn)
+ {
+ var ResizingGenes = new List();
+
+ // Error Handling: Issue with Pawn or Genes return empty.
+ if (pawn == null || pawn.genes == null)
+ return ResizingGenes;
+
+ foreach (Gene gene in pawn.genes.GenesListForReading)
+ if (gene is Gene_GenitaliaResizingGene resizing_gene)
+ ResizingGenes.Add(resizing_gene);
+
+ return ResizingGenes;
+ }
+
+ ///
+ /// Unified small check for a pawn if it has a specified Gene.
+ /// Handles some errors and returns false as default.
+ ///
+ /// The pawn for which to look up a gene.
+ /// The gene to look up.
+ ///
+ public static bool HasGeneNullCheck(Pawn pawn, GeneDef genedef)
{
if (pawn.genes == null)
{
return false;
}
- 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);
+ return pawn.genes.HasActiveGene(genedef);
}
+
+ public static bool HasLifeForce(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_lifeforce); }
+ public static bool IsMechbreeder(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_mechbreeder); }
+ 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); }
+ public static bool HasParalysingKiss(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_paralysingkiss); }
+ public static bool HasSeduce(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_seduce); }
+ public static bool IsSexualDrainer(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_drainer); }
+ public static bool IsCumEater(Pawn pawn) { return HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_cum_eater); }
+
}
-}
\ No newline at end of file
+}
diff --git a/Source/Genes/Genitalia/Defs/GenitaliaTypeExtension.cs b/Source/Genes/Genitalia/Defs/GenitaliaTypeExtension.cs
new file mode 100644
index 0000000..61430a2
--- /dev/null
+++ b/Source/Genes/Genitalia/Defs/GenitaliaTypeExtension.cs
@@ -0,0 +1,18 @@
+using Verse;
+using RimWorld;
+using rjw;
+
+namespace RJW_Genes
+{
+ public class GenitaliaTypeExtension : DefModExtension
+ {
+ public HediffDef_PartBase penis;
+
+ public HediffDef_PartBase vagina;
+
+ public HediffDef_PartBase anus;
+
+ public HediffDef_PartBase breasts;
+
+ }
+}
diff --git a/Source/Genes/Genitalia/Gene_CanineGenitalia.cs b/Source/Genes/Genitalia/Gene_CanineGenitalia.cs
deleted file mode 100644
index 01f0015..0000000
--- a/Source/Genes/Genitalia/Gene_CanineGenitalia.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Verse;
-using rjw;
-
-namespace RJW_Genes
-{
- public class Gene_CanineGenitalia : RJW_Gene
- {
- public override void PostMake()
- {
- base.PostMake();
-
- GenitaliaChanger.ChangeGenitalia(this.pawn,Genital_Helper.canine_penis,Genital_Helper.canine_vagina,Genital_Helper.generic_anus);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
- GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.canine_penis, Genital_Helper.canine_vagina, Genital_Helper.generic_anus);
- }
- }
-
-}
diff --git a/Source/Genes/Genitalia/Gene_DemonicGenitalia.cs b/Source/Genes/Genitalia/Gene_DemonicGenitalia.cs
deleted file mode 100644
index cc0cc29..0000000
--- a/Source/Genes/Genitalia/Gene_DemonicGenitalia.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Verse;
-using RimWorld;
-using rjw;
-
-namespace RJW_Genes
-{
- public class Gene_DemonicGenitalia : RJW_Gene
- {
- public override void PostMake()
- {
- base.PostMake();
-
- GenitaliaChanger.ChangeGenitalia(this.pawn,Genital_Helper.demon_penis,Genital_Helper.demon_vagina,Genital_Helper.demon_anus);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
- GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.demon_penis, Genital_Helper.demon_vagina, Genital_Helper.demon_anus);
- }
- }
-
-}
diff --git a/Source/Genes/Genitalia/Gene_DragonGenitalia.cs b/Source/Genes/Genitalia/Gene_DragonGenitalia.cs
deleted file mode 100644
index 34d24f6..0000000
--- a/Source/Genes/Genitalia/Gene_DragonGenitalia.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Verse;
-using rjw;
-
-namespace RJW_Genes
-{
- public class Gene_DragonGenitalia : RJW_Gene
- {
- public override void PostMake()
- {
- base.PostMake();
-
- GenitaliaChanger.ChangeGenitalia(this.pawn,Genital_Helper.dragon_penis,Genital_Helper.dragon_vagina,Genital_Helper.generic_anus);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
- GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.dragon_penis, Genital_Helper.dragon_vagina, Genital_Helper.generic_anus);
- }
- }
-
-}
diff --git a/Source/Genes/Genitalia/Gene_EquineGenitalia.cs b/Source/Genes/Genitalia/Gene_EquineGenitalia.cs
deleted file mode 100644
index 74b8b2f..0000000
--- a/Source/Genes/Genitalia/Gene_EquineGenitalia.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Verse;
-using rjw;
-
-namespace RJW_Genes
-{
- public class Gene_EquineGenitalia : RJW_Gene
- {
- public override void PostMake()
- {
- base.PostMake();
-
- GenitaliaChanger.ChangeGenitalia(this.pawn,Genital_Helper.equine_penis,Genital_Helper.equine_vagina,Genital_Helper.generic_anus);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
- GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.equine_penis, Genital_Helper.equine_vagina, Genital_Helper.generic_anus);
- }
- }
-
-}
diff --git a/Source/Genes/Genitalia/Gene_FelineGenitalia.cs b/Source/Genes/Genitalia/Gene_FelineGenitalia.cs
deleted file mode 100644
index 2fe4882..0000000
--- a/Source/Genes/Genitalia/Gene_FelineGenitalia.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Verse;
-using rjw;
-
-namespace RJW_Genes
-{
- public class Gene_FelineGenitalia : RJW_Gene
- {
- public override void PostMake()
- {
- base.PostMake();
-
- GenitaliaChanger.ChangeGenitalia(this.pawn,Genital_Helper.feline_penis,Genital_Helper.feline_vagina,Genital_Helper.generic_anus);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
- GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.feline_penis, Genital_Helper.feline_vagina, Genital_Helper.generic_anus);
- }
- }
-
-}
diff --git a/Source/Genes/Genitalia/Gene_GenitaliaType.cs b/Source/Genes/Genitalia/Gene_GenitaliaType.cs
new file mode 100644
index 0000000..21fada8
--- /dev/null
+++ b/Source/Genes/Genitalia/Gene_GenitaliaType.cs
@@ -0,0 +1,34 @@
+using rjw;
+
+namespace RJW_Genes
+{
+ // bleh plural attributive noun in keeping with naming convention
+ public class Gene_GenitaliaType : RJW_Gene
+ {
+ public override void PostMake()
+ {
+ base.PostMake();
+
+ }
+
+ public override void PostAdd()
+ {
+ base.PostAdd();
+ Apply();
+ }
+
+ public virtual void Apply()
+ {
+ if (this.Active)
+ {
+ GenitaliaTypeExtension genitals = def.GetModExtension();
+ if (genitals == null && RJW_Genes_Settings.rjw_genes_detailed_debug)
+ {
+ ModLog.Error($"Gene {def} failed to change genitals - Need a modExtension with Class=\"{typeof(GenitaliaTypeExtension).FullName}\".");
+ return;
+ }
+ GenitaliaChanger.ChangeGenitalia(pawn, genitals.penis, genitals.vagina, genitals.anus, genitals.breasts);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/Genitalia/Gene_OvipositorGenitalia.cs b/Source/Genes/Genitalia/Gene_OvipositorGenitalia.cs
deleted file mode 100644
index b7a1141..0000000
--- a/Source/Genes/Genitalia/Gene_OvipositorGenitalia.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Verse;
-using rjw;
-
-namespace RJW_Genes
-{
- public class Gene_OvipositorGenitalia : RJW_Gene
- {
- public override void PostMake()
- {
- base.PostMake();
-
- GenitaliaChanger.ChangeGenitalia(this.pawn,Genital_Helper.ovipositorM,Genital_Helper.ovipositorF,Genital_Helper.insect_anus);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
- GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.ovipositorM, Genital_Helper.ovipositorF, Genital_Helper.insect_anus);
- }
- }
-
-}
diff --git a/Source/Genes/Genitalia/Gene_SlimeGenitalia.cs b/Source/Genes/Genitalia/Gene_SlimeGenitalia.cs
deleted file mode 100644
index 5671f1f..0000000
--- a/Source/Genes/Genitalia/Gene_SlimeGenitalia.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Verse;
-using rjw;
-
-namespace RJW_Genes
-{
- public class Gene_SlimeGenitalia : RJW_Gene
- {
- public override void PostMake()
- {
- base.PostMake();
-
- GenitaliaChanger.ChangeGenitalia(this.pawn,Genital_Helper.slime_penis,Genital_Helper.slime_vagina,Genital_Helper.slime_anus);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
- GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.slime_penis, Genital_Helper.slime_vagina, Genital_Helper.slime_anus);
- }
- }
-
-}
diff --git a/Source/Genes/Genitalia/GenitaliaChanger.cs b/Source/Genes/Genitalia/GenitaliaChanger.cs
index 48ddc4d..71f0f05 100644
--- a/Source/Genes/Genitalia/GenitaliaChanger.cs
+++ b/Source/Genes/Genitalia/GenitaliaChanger.cs
@@ -2,6 +2,7 @@
using RimWorld;
using Verse;
using System.Collections.Generic;
+using rjw.Modules.Interactions.DefModExtensions;
namespace RJW_Genes
{
@@ -16,7 +17,7 @@ namespace RJW_Genes
/// the new type of penis
/// the new type of vagina
/// the new type of anus
- public static void ChangeGenitalia(Pawn pawn, HediffDef penisReplacement, HediffDef vaginaReplacement, HediffDef anusReplacement)
+ public static void ChangeGenitalia(Pawn pawn, HediffDef penisReplacement = null, HediffDef vaginaReplacement = null, HediffDef anusReplacement = null , HediffDef breastsReplacement = null)
{
var oldParts = Genital_Helper.get_AllPartsHediffList(pawn);
BodyPartRecord correctBPR;
@@ -34,13 +35,19 @@ namespace RJW_Genes
replacementGenital = null;
CompHediff = null;
- if (Genital_Helper.is_penis(existingGenital))
+ if (Genital_Helper.is_penis(existingGenital) && penisReplacement != null && existingGenital.def != penisReplacement)
replacementGenital = HediffMaker.MakeHediff(penisReplacement, pawn, correctBPR);
- if (Genital_Helper.is_vagina(existingGenital))
+ if (Genital_Helper.is_vagina(existingGenital) && vaginaReplacement != null && existingGenital.def != vaginaReplacement)
replacementGenital = HediffMaker.MakeHediff(vaginaReplacement, pawn, correctBPR);
- if (IsAnus(existingGenital))
+ if (is_breast(existingGenital) && breastsReplacement != null && existingGenital.def != breastsReplacement)
+ {
+ correctBPR = Genital_Helper.get_breastsBPR(pawn);
+ replacementGenital = HediffMaker.MakeHediff(breastsReplacement, pawn, correctBPR);
+ }
+
+ if (IsAnus(existingGenital) && anusReplacement != null && existingGenital.def != anusReplacement)
{
correctBPR = Genital_Helper.get_anusBPR(pawn);
replacementGenital = HediffMaker.MakeHediff(anusReplacement, pawn, correctBPR);
@@ -74,7 +81,18 @@ namespace RJW_Genes
{
return candidate.def.defName.ToLower().Contains("anus"); }
- public static bool IsArtificial(Hediff candidate)
+
+ public static bool is_breast(Hediff hed)
+ {
+ if (!GenitalPartExtension.TryGet(hed, out var ext))
+ {
+ return false;
+ }
+
+ return ext.family == rjw.Modules.Interactions.Enums.GenitalFamily.Breasts;
+ }
+
+ public static bool IsArtificial(Hediff candidate)
{
return candidate.def.defName.ToLower().Contains("bionic") || candidate.def.defName.ToLower().Contains("archo");
}
@@ -88,5 +106,7 @@ namespace RJW_Genes
}
}
+
+
}
}
diff --git a/Source/Genes/Genitalia/GenitaliaUtility.cs b/Source/Genes/Genitalia/GenitaliaUtility.cs
index 4dc289a..581ba64 100644
--- a/Source/Genes/Genitalia/GenitaliaUtility.cs
+++ b/Source/Genes/Genitalia/GenitaliaUtility.cs
@@ -16,12 +16,11 @@ namespace RJW_Genes
/// The first GeneDef of the pawn related to GenitaliaTypes
public static GeneDef GetGenitaliaTypeGeneForPawn(Pawn pawn)
{
-
- foreach (var gene in pawn.genes.GenesListForReading)
- {
- if (gene.def.defName.Contains("rjw_genes") && gene.def.defName.EndsWith("_genitalia"))
+ foreach (var gene in pawn.genes.GenesListForReading)
+ {
+ if (gene is Gene_GenitaliaType)
if (!gene.Overridden)
- return gene.def;
+ return gene.def;
}
return null;
}
@@ -29,80 +28,24 @@ namespace RJW_Genes
public static HediffDef GetPenisForGene(GeneDef gene)
{
- if (gene == null)
- return Genital_Helper.average_penis;
-
- switch (gene.defName)
- {
- case "rjw_genes_equine_genitalia": return Genital_Helper.equine_penis;
- case "rjw_genes_canine_genitalia": return Genital_Helper.canine_penis;
- case "rjw_genes_feline_genitalia": return Genital_Helper.feline_penis;
- case "rjw_genes_demonic_genitalia": return Genital_Helper.demon_penis;
- case "rjw_genes_dragon_genitalia": return Genital_Helper.dragon_penis;
- case "rjw_genes_slime_genitalia": return Genital_Helper.slime_penis;
- case "rjw_genes_ovipositor_genitalia": return Genital_Helper.ovipositorM;
-
- default: return Genital_Helper.average_penis;
- }
+ return gene?.GetModExtension()?.penis ?? Genital_Helper.average_penis;
}
public static HediffDef GetVaginaForGene(GeneDef gene)
{
- if (gene == null)
- return Genital_Helper.average_vagina;
-
- switch (gene.defName)
- {
- case "rjw_genes_equine_genitalia": return Genital_Helper.equine_vagina;
- case "rjw_genes_canine_genitalia": return Genital_Helper.canine_vagina;
- case "rjw_genes_feline_genitalia": return Genital_Helper.feline_vagina;
- case "rjw_genes_demonic_genitalia": return Genital_Helper.demon_vagina;
- case "rjw_genes_dragon_genitalia": return Genital_Helper.dragon_vagina;
- case "rjw_genes_slime_genitalia": return Genital_Helper.slime_vagina;
- case "rjw_genes_ovipositor_genitalia": return Genital_Helper.ovipositorF;
-
- default: return Genital_Helper.average_vagina;
- }
+ return gene?.GetModExtension()?.vagina ?? Genital_Helper.average_vagina;
}
public static HediffDef GetAnusForGene(GeneDef gene)
{
- if (gene == null)
- return Genital_Helper.average_anus;
- switch (gene.defName)
- {
- //TODO: Do I want the default to be generic or average for feline,equine and canine?
- case "rjw_genes_equine_genitalia": return Genital_Helper.average_anus;
- case "rjw_genes_canine_genitalia": return Genital_Helper.average_anus;
- case "rjw_genes_feline_genitalia": return Genital_Helper.average_anus;
- case "rjw_genes_demonic_genitalia": return Genital_Helper.demon_anus;
- case "rjw_genes_dragon_genitalia": return Genital_Helper.average_anus;
- case "rjw_genes_slime_genitalia": return Genital_Helper.slime_anus;
- case "rjw_genes_ovipositor_genitalia": return Genital_Helper.insect_anus;
-
- default: return Genital_Helper.generic_anus;
- }
+ //TODO: Do I want the default to be generic or average for feline,equine and canine?
+ return gene?.GetModExtension()?.anus ?? Genital_Helper.average_anus;
}
public static HediffDef GetBreastsForGene(GeneDef gene)
{
- if (gene == null)
- return Genital_Helper.average_breasts;
-
- switch (gene.defName)
- {
- //TODO: Do I want the default to be generic or average?
- case "rjw_genes_equine_genitalia": return Genital_Helper.average_breasts;
- case "rjw_genes_canine_genitalia": return Genital_Helper.average_breasts;
- case "rjw_genes_feline_genitalia": return Genital_Helper.average_breasts;
- case "rjw_genes_demonic_genitalia": return Genital_Helper.average_breasts;
- case "rjw_genes_dragon_genitalia": return Genital_Helper.average_breasts;
- case "rjw_genes_slime_genitalia": return Genital_Helper.slime_breasts;
- case "rjw_genes_ovipositor_genitalia": return Genital_Helper.average_breasts;
-
- default: return Genital_Helper.generic_breasts;
- }
+ return gene?.GetModExtension()?.breasts ?? Genital_Helper.average_breasts;
}
public static bool PawnStillNeedsGenitalia(Pawn pawn)
@@ -130,5 +73,48 @@ namespace RJW_Genes
{
return candidate.def.defName.ToLower().Contains("breast");
}
+
+ ///
+ /// Returns the biggest penis of a pawn.
+ /// In case of a identical severity, the highest body size is returned.
+ /// For women, or pawns without a penis, null is returned.
+ ///
+ ///
+ /// The biggest penis of a pawn. Null on women or error.
+ public static Hediff GetBiggestPenis(Pawn pawn)
+ {
+ Hediff best = null;
+ var parts = Genital_Helper.get_AllPartsHediffList(pawn);
+
+ foreach (var part in parts)
+ {
+ if (Genital_Helper.is_sex_part(part) && Genital_Helper.is_penis(part))
+ {
+ if (best == null) best = part;
+
+ // On a draw of size, we check the body-size.
+ if (part.Severity == best.Severity) {
+ var partSize = part.TryGetComp();
+ var bestSize = part.TryGetComp();
+ if (partSize == null || bestSize == null) { continue; }
+
+ best = partSize.SizeOwner > bestSize.SizeOwner ? part : best;
+ } else if (part.Severity > best.Severity) {
+ best = part;
+ }
+ }
+ }
+
+ return best;
+ }
+
+ public static float GetBodySizeOfSexPart(Hediff part)
+ {
+ if (part == null || part.TryGetComp() == null)
+ return 0.0f;
+ else
+ return part.TryGetComp().SizeOwner;
+ }
}
+
}
diff --git a/Source/Genes/GenitaliaSize/Gene_BigBreasts.cs b/Source/Genes/GenitaliaSize/Gene_BigBreasts.cs
index b0e61ad..b1c6e4f 100644
--- a/Source/Genes/GenitaliaSize/Gene_BigBreasts.cs
+++ b/Source/Genes/GenitaliaSize/Gene_BigBreasts.cs
@@ -1,24 +1,12 @@
using Verse;
namespace RJW_Genes
{
- public class Gene_BigBreasts : RJW_Gene
+ public class Gene_BigBreasts : Gene_GenitaliaResizingGene
{
-
- public override void PostMake()
+ public override void Resize()
{
- base.PostMake();
-
- if (pawn.gender == Gender.Female)
- SizeAdjuster.AdjustAllBreastSizes(pawn,0.5f,1.0f);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
if (pawn.gender == Gender.Female)
SizeAdjuster.AdjustAllBreastSizes(pawn, 0.5f, 1.0f);
}
-
-
}
-}
+}
\ No newline at end of file
diff --git a/Source/Genes/GenitaliaSize/Gene_BigMaleGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_BigMaleGenitalia.cs
index b04df46..8cee1ef 100644
--- a/Source/Genes/GenitaliaSize/Gene_BigMaleGenitalia.cs
+++ b/Source/Genes/GenitaliaSize/Gene_BigMaleGenitalia.cs
@@ -1,20 +1,10 @@
namespace RJW_Genes
{
- public class Gene_BigMaleGenitalia : RJW_Gene
+ public class Gene_BigMaleGenitalia : Gene_GenitaliaResizingGene
{
-
- public override void PostMake()
+ public override void Resize()
{
- base.PostMake();
-
- SizeAdjuster.AdjustAllPenisSizes(pawn,0.5f,1.0f);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
SizeAdjuster.AdjustAllPenisSizes(pawn, 0.5f, 1.0f);
}
-
}
-}
+}
\ 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..493eadf
--- /dev/null
+++ b/Source/Genes/GenitaliaSize/Gene_EvergrowingGenitalia.cs
@@ -0,0 +1,106 @@
+using Verse;
+using RimWorld;
+using rjw;
+using System.Collections.Generic;
+using System;
+
+namespace RJW_Genes
+{
+ public class Gene_EvergrowingGenitalia : RJW_Gene
+ {
+
+ const int BASE_TICKS = 60000;
+
+ public override void Tick()
+ {
+ base.Tick();
+
+ int interval = ModExtensionHelper.GetTickIntervalFromModExtension(GeneDefOf.rjw_genes_evergrowth, ModExtensionHelper.GetTickIntervalFromModExtension(this.def, BASE_TICKS));
+ if (pawn.IsHashIntervalTick(interval)
+ && this.pawn.Map != null
+ && pawn.ageTracker.AgeBiologicalYears >= RJW_Genes_Settings.rjw_genes_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);
+
+ if (!xxx.is_nympho(pawn))
+ {
+ pawn.story.traits.GainTrait(new Trait(xxx.nymphomaniac));
+ }
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/GenitaliaSize/Gene_GenitaliaResizingGene.cs b/Source/Genes/GenitaliaSize/Gene_GenitaliaResizingGene.cs
new file mode 100644
index 0000000..b7de209
--- /dev/null
+++ b/Source/Genes/GenitaliaSize/Gene_GenitaliaResizingGene.cs
@@ -0,0 +1,68 @@
+using Verse;
+
+namespace RJW_Genes
+{
+ ///
+ /// Parent Gene for Genitalia Resizing. All Resizing genes should inherit for this class.
+ /// There is a companion-patch `Patch_ResizingOnAdulthood`.
+ ///
+ /// This helps with some functions (e.g. "hasGenitaliaResizingGenes(pawn)") but also to fire genitalia resizing later in life for Pawns.
+ /// (No Children with huge ding dongs, and I don't want kids with tight anuses I am not that degenerate)
+ ///
+ ///
+ /// There was an Issue (#34) that re-sized the genitalia over multiple birthdays.
+ /// Before the addition of `ExposeData`, it lost track whether the resizing was already run,
+ /// leading to a change with every birthday over multiple game starts.
+ ///
+ public abstract class Gene_GenitaliaResizingGene : RJW_Gene
+ {
+
+ ///
+ /// Whether or not the gene was already applied.
+ /// If not, it is checked on every birthday and will be applied accordingly.
+ ///
+ private bool resizingWasApplied = false;
+ public bool ResizingWasApplied { get => resizingWasApplied; set => resizingWasApplied = value; }
+
+
+ public override void PostMake()
+ {
+ base.PostMake();
+ if (pawn.ageTracker.AgeBiologicalYears >= RJW_Genes_Settings.rjw_genes_resizing_age)
+ {
+ Resize();
+ ResizingWasApplied = true;
+ }
+ }
+
+ public override void PostAdd()
+ {
+ base.PostAdd();
+ if (pawn.ageTracker.AgeBiologicalYears >= RJW_Genes_Settings.rjw_genes_resizing_age)
+ {
+ Resize();
+ ResizingWasApplied = true;
+ }
+ }
+
+ public override void ExposeData()
+ {
+ base.ExposeData();
+ Scribe_Values.Look(ref resizingWasApplied, "wasApplied");
+ }
+
+ ///
+ /// Used to resize the pawns genitalia.
+ /// All Logic should be put here:
+ /// 1. Filters for Gender
+ /// 2. Filters for Genitalia Existence
+ /// 3. Selection of right Genitalia
+ /// 4. Adjustment of Size
+ ///
+ /// I kept it intentionally broad, so that e.g. the Penis Resize can resize multiple penises and or futas,
+ /// while the breast-gene is female only.
+ ///
+ public abstract void Resize();
+
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/GenitaliaSize/Gene_LooseAnus.cs b/Source/Genes/GenitaliaSize/Gene_LooseAnus.cs
index f5a5312..520eb5a 100644
--- a/Source/Genes/GenitaliaSize/Gene_LooseAnus.cs
+++ b/Source/Genes/GenitaliaSize/Gene_LooseAnus.cs
@@ -1,22 +1,12 @@
-namespace RJW_Genes
+using Verse;
+
+namespace RJW_Genes
{
- public class Gene_LooseAnus : RJW_Gene
+ public class Gene_LooseAnus : Gene_GenitaliaResizingGene
{
-
- public override void PostMake()
+ public override void Resize()
{
- base.PostMake();
-
SizeAdjuster.AdjustAllAnusSizes(pawn, 0.5f, 1.0f);
}
-
- public override void PostAdd()
- {
- base.PostAdd();
- SizeAdjuster.AdjustAllAnusSizes(pawn, 0.5f, 1.0f);
- }
-
-
-
}
}
diff --git a/Source/Genes/GenitaliaSize/Gene_LooseFemaleGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_LooseFemaleGenitalia.cs
index 68578b6..2885c07 100644
--- a/Source/Genes/GenitaliaSize/Gene_LooseFemaleGenitalia.cs
+++ b/Source/Genes/GenitaliaSize/Gene_LooseFemaleGenitalia.cs
@@ -1,22 +1,12 @@
-namespace RJW_Genes
+using Verse;
+
+namespace RJW_Genes
{
- public class Gene_LooseFemaleGenitalia : RJW_Gene
+ public class Gene_LooseFemaleGenitalia : Gene_GenitaliaResizingGene
{
-
- public override void PostMake()
+ public override void Resize()
{
- base.PostMake();
-
SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.5f, 1.0f);
}
-
- public override void PostAdd()
- {
- base.PostAdd();
- SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.5f, 1.0f);
- }
-
-
-
}
}
diff --git a/Source/Genes/GenitaliaSize/Gene_SmallBreasts.cs b/Source/Genes/GenitaliaSize/Gene_SmallBreasts.cs
index d5b4a4e..2e8af43 100644
--- a/Source/Genes/GenitaliaSize/Gene_SmallBreasts.cs
+++ b/Source/Genes/GenitaliaSize/Gene_SmallBreasts.cs
@@ -1,18 +1,11 @@
-namespace RJW_Genes
+using Verse;
+
+namespace RJW_Genes
{
- public class Gene_SmallBreasts : RJW_Gene
+ public class Gene_SmallBreasts : Gene_GenitaliaResizingGene
{
-
- public override void PostMake()
+ public override void Resize()
{
- base.PostMake();
-
- SizeAdjuster.AdjustAllBreastSizes(pawn, 0.0f, 0.5f);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
SizeAdjuster.AdjustAllBreastSizes(pawn, 0.0f, 0.5f);
}
}
diff --git a/Source/Genes/GenitaliaSize/Gene_SmallMaleGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_SmallMaleGenitalia.cs
index 12ba154..ce5d33a 100644
--- a/Source/Genes/GenitaliaSize/Gene_SmallMaleGenitalia.cs
+++ b/Source/Genes/GenitaliaSize/Gene_SmallMaleGenitalia.cs
@@ -1,20 +1,10 @@
namespace RJW_Genes
{
- public class Gene_SmallMaleGenitalia : RJW_Gene
+ public class Gene_SmallMaleGenitalia : Gene_GenitaliaResizingGene
{
-
- public override void PostMake()
+ public override void Resize()
{
- base.PostMake();
-
- SizeAdjuster.AdjustAllPenisSizes(pawn,0.0f,0.5f);
- }
-
- public override void PostAdd()
- {
- base.PostAdd();
SizeAdjuster.AdjustAllPenisSizes(pawn, 0.0f, 0.5f);
}
-
}
-}
+}
\ No newline at end of file
diff --git a/Source/Genes/GenitaliaSize/Gene_TightAnus.cs b/Source/Genes/GenitaliaSize/Gene_TightAnus.cs
index 56f52cd..443aba7 100644
--- a/Source/Genes/GenitaliaSize/Gene_TightAnus.cs
+++ b/Source/Genes/GenitaliaSize/Gene_TightAnus.cs
@@ -1,21 +1,10 @@
namespace RJW_Genes
{
- public class Gene_TightAnus : RJW_Gene
+ public class Gene_TightAnus : Gene_GenitaliaResizingGene
{
-
- public override void PostMake()
+ public override void Resize()
{
- base.PostMake();
-
SizeAdjuster.AdjustAllAnusSizes(pawn, 0.0f, 0.5f);
}
-
- public override void PostAdd()
- {
- base.PostAdd();
- SizeAdjuster.AdjustAllAnusSizes(pawn, 0.0f, 0.5f);
- }
-
-
}
-}
+}
\ No newline at end of file
diff --git a/Source/Genes/GenitaliaSize/Gene_TightFemaleGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_TightFemaleGenitalia.cs
index 53ec2a7..306635d 100644
--- a/Source/Genes/GenitaliaSize/Gene_TightFemaleGenitalia.cs
+++ b/Source/Genes/GenitaliaSize/Gene_TightFemaleGenitalia.cs
@@ -1,20 +1,10 @@
namespace RJW_Genes
{
- public class Gene_TightFemaleGenitalia : RJW_Gene
+ public class Gene_TightFemaleGenitalia : Gene_GenitaliaResizingGene
{
-
- public override void PostMake()
+ public override void Resize()
{
- base.PostMake();
-
SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.0f, 0.5f);
}
-
- public override void PostAdd()
- {
- base.PostAdd();
- SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.0f, 0.5f);
- }
-
}
-}
+}
\ No newline at end of file
diff --git a/Source/Genes/GenitaliaSize/Patch_ResizingOnAdulthood.cs b/Source/Genes/GenitaliaSize/Patch_ResizingOnAdulthood.cs
new file mode 100644
index 0000000..448c873
--- /dev/null
+++ b/Source/Genes/GenitaliaSize/Patch_ResizingOnAdulthood.cs
@@ -0,0 +1,32 @@
+using HarmonyLib;
+using Verse;
+
+namespace RJW_Genes
+{
+ ///
+ /// This Patch adds behavior to all resizing genes:
+ /// At Age RESIZING_MIN_AGE the Pawns Resizing Genes will trigger again, if not already triggered somewhere else.
+ /// This is meant to allow kids to grow up without resized genitals, and resize later (Fixing #11).
+ ///
+ /// See `Gene_GenitaliaResizingGene` for a short summary of Issue #34.
+ ///
+ [HarmonyPatch(typeof(Pawn_AgeTracker), "BirthdayBiological")]
+ public class Patch_ResizingOnAdulthood
+ {
+
+ static void Postfix(Pawn ___pawn, int birthdayAge)
+ {
+ if (birthdayAge >= RJW_Genes_Settings.rjw_genes_resizing_age)
+ {
+ foreach(Gene_GenitaliaResizingGene gene in GeneUtility.GetGenitaliaResizingGenes(___pawn))
+ {
+ if (!gene.ResizingWasApplied)
+ {
+ gene.Resize();
+ gene.ResizingWasApplied = true;
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/GenitaliaSize/SizeAdjuster.cs b/Source/Genes/GenitaliaSize/SizeAdjuster.cs
index e87f490..6a67dcd 100644
--- a/Source/Genes/GenitaliaSize/SizeAdjuster.cs
+++ b/Source/Genes/GenitaliaSize/SizeAdjuster.cs
@@ -58,7 +58,7 @@ namespace RJW_Genes
public static void AdjustAllBreastSizes(Pawn pawn, float lowerLimit = 0.0f, float upperLimit = 1.0f)
{
- List AllBreasts = Genital_Helper.get_AllPartsHediffList(pawn).FindAll(x => x.def.defName.Contains("breasts"));
+ List AllBreasts = Genital_Helper.get_AllPartsHediffList(pawn).FindAll(x => x.def.defName.ToLower().Contains("breasts"));
ResizeAll(AllBreasts,lowerLimit,upperLimit);
}
diff --git a/Source/Genes/Life_Force/Abilities/AbilityUtility.cs b/Source/Genes/Life_Force/Abilities/AbilityUtility.cs
new file mode 100644
index 0000000..77fba03
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/AbilityUtility.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse.Sound;
+using Verse;
+using RimWorld;
+using rjw;
+using rjw.Modules.Interactions.Helpers;
+using rjw.Modules.Interactions.Enums;
+
+namespace RJW_Genes
+{
+ public class AbilityUtility
+ {
+ public static void PussyHeal(SexProps props)
+ {
+ if (InteractionHelper.GetWithExtension(props.dictionaryKey).DominantHasFamily(GenitalFamily.Vagina) || InteractionHelper.GetWithExtension(props.dictionaryKey).SubmissiveHasFamily(GenitalFamily.Vagina))
+ {
+ Pawn pawn = props.pawn;
+ Pawn partner = props.partner;
+ FloatRange tendQualityRange;
+ tendQualityRange.min = 0.4f;
+ tendQualityRange.max = 0.8f;
+ if (GeneUtility.IsPussyHealer(pawn))
+ {
+ Heal(partner, tendQualityRange);
+ }
+ if (GeneUtility.IsPussyHealer(partner))
+ {
+ Heal(pawn, tendQualityRange);
+ }
+ }
+ }
+
+ public static bool Heal(Pawn pawn, FloatRange tendQualityRange)
+ {
+ bool any_wound_tended = false;
+ List hediffs = pawn.health.hediffSet.hediffs;
+ for (int i = hediffs.Count - 1; i >= 0; i--)
+ {
+ if ((hediffs[i] is Hediff_Injury || hediffs[i] is Hediff_MissingPart) && hediffs[i].TendableNow(false))
+ {
+ hediffs[i].Tended(tendQualityRange.RandomInRange, tendQualityRange.TrueMax, 1);
+ any_wound_tended = true;
+ }
+ }
+ return any_wound_tended;
+ }
+
+ public static float LifeForceCost(Ability ability)
+ {
+ if (ability.comps != null)
+ {
+ using (List.Enumerator enumerator = ability.comps.GetEnumerator())
+ {
+ while (enumerator.MoveNext())
+ {
+ CompAbilityEffect_LifeForceCost compAbilityEffect_HemogenCost;
+ if ((compAbilityEffect_HemogenCost = (enumerator.Current as CompAbilityEffect_LifeForceCost)) != null)
+ {
+ return compAbilityEffect_HemogenCost.Props.fertilinCost;
+ }
+ }
+ }
+ }
+ return 0f;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/Life_Force/Abilities/CompAbilityEffect_CasterIsNaked.cs b/Source/Genes/Life_Force/Abilities/CompAbilityEffect_CasterIsNaked.cs
new file mode 100644
index 0000000..aa1d61a
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/CompAbilityEffect_CasterIsNaked.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+using Verse.AI;
+using rjw;
+
+namespace RJW_Genes
+{
+ //Summary//
+ //Returns invalid if a pawn is not naked
+ //Summary//
+ public class CompAbilityEffect_CasterIsNaked : CompAbilityEffect_WithDest
+ {
+ private new CompProperties_CasterIsNaked Props
+ {
+ get
+ {
+ return (CompProperties_CasterIsNaked)this.props;
+ }
+ }
+
+ public override bool GizmoDisabled(out string reason)
+ {
+ Pawn pawn = this.CasterPawn;
+ if (pawn != null)
+ {
+ //Copied from ThoughtWorker_NudistNude.CurrentStateInternal
+ List wornApparel = pawn.apparel.WornApparel;
+ for (int i = 0; i < wornApparel.Count; i++)
+ {
+ Apparel apparel = wornApparel[i];
+ if (apparel.def.apparel.countsAsClothingForNudity)
+ {
+ for (int j = 0; j < apparel.def.apparel.bodyPartGroups.Count; j++)
+ {
+ if (apparel.def.apparel.bodyPartGroups[j] == BodyPartGroupDefOf.Torso)
+ {
+ reason = pawn.Name + " is not naked";
+ return true;
+ }
+ if (apparel.def.apparel.bodyPartGroups[j] == BodyPartGroupDefOf.Legs)
+ {
+ reason = pawn.Name + " is not naked";
+ return true;
+
+ }
+ }
+ }
+ }
+ }
+ reason = null;
+ return false;
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/Abilities/CompAbilityEffect_CockEater.cs b/Source/Genes/Life_Force/Abilities/CompAbilityEffect_CockEater.cs
new file mode 100644
index 0000000..977c77b
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/CompAbilityEffect_CockEater.cs
@@ -0,0 +1,121 @@
+using Verse;
+using RimWorld;
+using rjw;
+
+namespace RJW_Genes
+{
+ ///
+ /// The CockEater Ability bites off the first found non-artifical cock of an target pawn.
+ /// It will restore {MINIMUM_LIFEFORCE_GAIN} multiplied by up to 2-times the Cock-Size.
+ /// Consuming a "towering" cock will give 2*{MINIMUM_LIFEFORCE_GAIN}, resulting in default 0.5f LifeForce.
+ /// This number is reduced for consuming animals by Settings.
+ ///
+ /// Balancing note: With the Cock-Eaters a drain of 0.08 is normal per day. This means 1 average cock should hold for 3-4 days of fertilin-fuel and half a day for an animal.
+ ///
+ public class CompAbilityEffect_CockEater : CompAbilityEffect
+ {
+ private new CompProperties_AbilityCockEater Props
+ {
+ get
+ {
+ return (CompProperties_AbilityCockEater)this.props;
+ }
+ }
+
+ public const float MINIMUM_LIFEFORCE_GAIN = 0.25f;
+
+ public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
+ {
+ base.Apply(target, dest);
+ Pawn CockBiter = this.parent.pawn;
+ Pawn CockBittenPawn = target.Pawn;
+ if (CockBittenPawn == null)
+ {
+ return;
+ }
+ var partBPR = Genital_Helper.get_genitalsBPR(CockBittenPawn);
+ var parts = Genital_Helper.get_PartsHediffList(CockBittenPawn, partBPR);
+ if (!parts.NullOrEmpty())
+ {
+ foreach (Hediff part in parts)
+ {
+ if (GenitaliaChanger.IsArtificial(part))
+ continue;
+
+ if (Genital_Helper.is_penis(part))
+ {
+ float gained_lifeforce = MINIMUM_LIFEFORCE_GAIN * (1 + part.Severity);
+ if (CockBittenPawn.IsAnimal())
+ {
+ gained_lifeforce *= RJW_Genes_Settings.rjw_genes_fertilin_from_animals_factor;
+ }
+ // Increase LifeForce for Biter
+ GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(CockBiter), gained_lifeforce);
+ // Handle Damage for Bitten
+ CockBittenPawn.TakeDamage(new DamageInfo(DamageDefOf.Bite, 99999f, 999f, hitPart: Genital_Helper.get_genitalsBPR(CockBittenPawn)));
+ //CockBittenPawn.health.RemoveHediff(part);
+ CockBittenPawn.needs.mood.thoughts.memories.TryGainMemory(ThoughtDefOf.rjw_genes_cock_eaten, CockBittenPawn, null);
+
+ //Only one penis at the time
+ break;
+ }
+ }
+ }
+ }
+
+ ///
+ /// For validity, there are a few checks:
+ /// 1. Target has Penis
+ /// 2. Target is either Colonist / Prisoner
+ /// 3. If the Target is an enemy, it must be downed.
+ ///
+ public override bool Valid(LocalTargetInfo target, bool throwMessages = false)
+ {
+ Pawn CockBiteTarget = target.Pawn;
+ if (CockBiteTarget != null)
+ {
+ bool CockBiteTargetIsColonistOrPrisoner = CockBiteTarget.Faction == this.parent.pawn.Faction || CockBiteTarget.IsPrisonerOfColony;
+ bool CockBiteTargetIsHostile = CockBiteTarget.HostileTo(this.parent.pawn);
+ bool CockBiteTargetIsDowned = CockBiteTarget.Downed;
+
+ if (!CockBiteTargetIsColonistOrPrisoner && !(CockBiteTargetIsHostile && CockBiteTargetIsDowned))
+ {
+ if (throwMessages)
+ {
+ if(CockBiteTargetIsHostile && !CockBiteTargetIsDowned)
+ {
+ Messages.Message(CockBiteTarget.Name + " is hostile, but not downed.", CockBiteTarget, MessageTypeDefOf.RejectInput, false);
+ }
+ else if (!CockBiteTargetIsColonistOrPrisoner)
+ {
+ Messages.Message(CockBiteTarget.Name + " is not a part of the colony or hostile.", CockBiteTarget, MessageTypeDefOf.RejectInput, false);
+ }
+ }
+ return false;
+ }
+ if (!Genital_Helper.has_penis_fertile(CockBiteTarget))
+ {
+ if (throwMessages)
+ {
+ Messages.Message(CockBiteTarget.Name + " has no penis", CockBiteTarget, MessageTypeDefOf.RejectInput, false);
+ }
+ return false;
+ }
+ }
+ return base.Valid(target, throwMessages);
+ }
+
+ public override bool GizmoDisabled(out string reason)
+ {
+ Pawn_GeneTracker genes = this.parent.pawn.genes;
+ Gene_LifeForce gene_LifeForce = (genes != null) ? genes.GetFirstGeneOfType() : null;
+ if (gene_LifeForce == null)
+ {
+ reason = "AbilityDisabledNoFertilinGene".Translate(this.parent.pawn);
+ return true;
+ }
+ reason = null;
+ return false;
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/Abilities/CompAbilityEffect_LifeForceCost.cs b/Source/Genes/Life_Force/Abilities/CompAbilityEffect_LifeForceCost.cs
new file mode 100644
index 0000000..44aec81
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/CompAbilityEffect_LifeForceCost.cs
@@ -0,0 +1,107 @@
+using Verse;
+using Verse.AI;
+using RimWorld;
+namespace RJW_Genes
+{
+ public class CompAbilityEffect_LifeForceCost : CompAbilityEffect
+ {
+
+ public new CompProperties_AbilityLifeForceCost Props
+ {
+ get
+ {
+ return (CompProperties_AbilityLifeForceCost)this.props;
+ }
+ }
+
+ private bool HasEnoughFertilin
+ {
+ get
+ {
+ Pawn_GeneTracker genes = this.parent.pawn.genes;
+ Gene_LifeForce gene_lifeforce = (genes != null) ? genes.GetFirstGeneOfType < Gene_LifeForce>() : null;
+ return gene_lifeforce != null && gene_lifeforce.Value >= this.Props.fertilinCost;
+ }
+ }
+
+ public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
+ {
+ base.Apply(target, dest);
+ GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(this.parent.pawn), -this.Props.fertilinCost);
+ }
+
+
+ public override bool GizmoDisabled(out string reason)
+ {
+ Pawn_GeneTracker genes = this.parent.pawn.genes;
+ Gene_LifeForce gene_LifeForce = (genes != null) ? genes.GetFirstGeneOfType() : null;
+ if (gene_LifeForce == null)
+ {
+ reason = "AbilityDisabledNoFertilinGene".Translate(this.parent.pawn);
+ return true;
+ }
+ if (gene_LifeForce.Value < this.Props.fertilinCost)
+ {
+ reason = "AbilityDisabledNoFertilin".Translate(this.parent.pawn);
+ return true;
+ }
+ float num = this.TotalLifeForceCostOfQueuedAbilities();
+ float num2 = this.Props.fertilinCost + num;
+ if (this.Props.fertilinCost > 1E-45f && num2 > gene_LifeForce.Value)
+ {
+ reason = "AbilityDisabledNoFertilin".Translate(this.parent.pawn);
+ return true;
+ }
+ reason = null;
+ return false;
+ }
+
+ public override bool AICanTargetNow(LocalTargetInfo target)
+ {
+ return this.HasEnoughFertilin;
+ }
+
+ private float TotalLifeForceCostOfQueuedAbilities()
+ {
+ Pawn_JobTracker jobs = this.parent.pawn.jobs;
+ object obj;
+ if (jobs == null)
+ {
+ obj = null;
+ }
+ else
+ {
+ Job curJob = jobs.curJob;
+ obj = ((curJob != null) ? curJob.verbToUse : null);
+ }
+ Verb_CastAbility verb_CastAbility = obj as Verb_CastAbility;
+ float num;
+ if (verb_CastAbility == null)
+ {
+ num = 0f;
+ }
+ else
+ {
+ Ability ability = verb_CastAbility.ability;
+ num = ((ability != null) ? AbilityUtility.LifeForceCost(ability) : 0f);
+ }
+ float num2 = num;
+ if (this.parent.pawn.jobs != null)
+ {
+ for (int i = 0; i < this.parent.pawn.jobs.jobQueue.Count; i++)
+ {
+ Verb_CastAbility verb_CastAbility2;
+ if ((verb_CastAbility2 = (this.parent.pawn.jobs.jobQueue[i].job.verbToUse as Verb_CastAbility)) != null)
+ {
+ float num3 = num2;
+ Ability ability2 = verb_CastAbility2.ability;
+ num2 = num3 + ((ability2 != null) ? AbilityUtility.LifeForceCost(ability2) : 0f);
+ }
+ }
+ }
+ return num2;
+ }
+
+
+ }
+}
diff --git a/Source/Genes/Life_Force/Abilities/CompAbilityEffect_PussyHeal.cs b/Source/Genes/Life_Force/Abilities/CompAbilityEffect_PussyHeal.cs
new file mode 100644
index 0000000..fdb0c7c
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/CompAbilityEffect_PussyHeal.cs
@@ -0,0 +1,95 @@
+using System.Collections.Generic;
+using Verse;
+using RimWorld;
+using rjw;
+
+namespace RJW_Genes
+{
+ public class CompAbilityEffect_PussyHeal : CompAbilityEffect
+ {
+ private new CompProperties_AbilityPussyHeal Props
+ {
+ get
+ {
+ return (CompProperties_AbilityPussyHeal)this.props;
+ }
+ }
+ public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
+ {
+ base.Apply(target, dest);
+ Pawn pawn = target.Pawn;
+ if (pawn == null)
+ {
+ return;
+ }
+ bool any_wound_tended = AbilityUtility.Heal(pawn, this.Props.tendQualityRange);
+ if (any_wound_tended)
+ {
+ MoteMaker.ThrowText(pawn.DrawPos, pawn.Map, "Sex tended wounds", 3.65f);
+ }
+ }
+
+ //Not yet implemented, but the heal should also trigger after normal sex
+ public void AfterSex(Pawn pawn, Pawn target)
+ {
+ List hediffs = target.health.hediffSet.hediffs;
+ for (int i = 0; i < hediffs.Count; i++)
+ {
+ if ((hediffs[i] is Hediff_Injury || hediffs[i] is Hediff_MissingPart) && hediffs[i].TendableNow(false))
+ {
+ //target.needs.mood.thoughts.memories.TryGainMemory(ThoughtDefOf.Pussy_Healed, pawn, null);
+ break;
+ }
+ }
+ //InteractionHelper.GetWithExtension(dictionaryKey).DominantHasTag("CanBePenetrated")
+
+
+ }
+
+ public override bool Valid(LocalTargetInfo target, bool throwMessages = false)
+ {
+ Pawn pawn = target.Pawn;
+ if (pawn != null)
+ {
+ //to be replaced with severel checks to make it clear why target is unable to have sex
+ if (!CasualSex_Helper.CanHaveSex(pawn))
+ {
+ if (throwMessages)
+ {
+ Messages.Message(pawn.Name + " is unable to have sex", pawn, MessageTypeDefOf.RejectInput, false);
+ }
+ return false;
+ }
+ else if (pawn.IsAnimal() && !RJWSettings.bestiality_enabled)
+ {
+ if (throwMessages)
+ {
+ Messages.Message("bestiality is disabled", pawn, MessageTypeDefOf.RejectInput, false);
+ }
+ return false;
+ }
+ //TODO: Only make pawns targetable that have tendable wounds
+
+ }
+ return base.Valid(target, throwMessages);
+ }
+
+ public override bool GizmoDisabled(out string reason)
+ {
+ reason = null;
+ if (!Genital_Helper.has_vagina(this.parent.pawn))
+ {
+ reason = this.parent.pawn.Name + " has no vagina to use.";
+ return true;
+ }
+ else if (!RJWSettings.rape_enabled)
+ {
+ reason = "Rape is disabled";
+ return true;
+ }
+ return false;
+ }
+
+
+ }
+}
diff --git a/Source/Genes/Life_Force/Abilities/CompAbilityEffect_Seduce.cs b/Source/Genes/Life_Force/Abilities/CompAbilityEffect_Seduce.cs
new file mode 100644
index 0000000..b8819a8
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/CompAbilityEffect_Seduce.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+using Verse.AI;
+using rjw;
+
+namespace RJW_Genes
+{
+ public class CompAbilityEffect_Seduce : CompAbilityEffect_WithDest
+ {
+ private new CompProperties_Seduce Props
+ {
+ get
+ {
+ return (CompProperties_Seduce)this.props;
+ }
+ }
+ public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
+ {
+ base.Apply(target, dest);
+ Pawn pawn = target.Thing as Pawn;
+ Pawn pawn2 = this.parent.pawn;
+ if (pawn != null && pawn2 != null && !pawn.Downed)
+ {
+ Job job = JobMaker.MakeJob(JobDefOf.rjw_genes_lifeforce_seduced, pawn2);
+ job.mote = MoteMaker.MakeThoughtBubble(pawn, this.parent.def.iconPath, true);
+ pawn.jobs.StopAll(false, true);
+ pawn.jobs.StartJob(job, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true);
+ }
+ }
+
+ public override bool Valid(LocalTargetInfo target, bool throwMessages = false)
+ {
+
+ Pawn pawn = target.Pawn;
+ if (pawn != null)
+ {
+ if (!xxx.can_be_fucked(pawn))
+ {
+ if (throwMessages)
+ {
+ Messages.Message(pawn.Name + " is unable to have sex", pawn, MessageTypeDefOf.RejectInput, false);
+ }
+ return false;
+ }
+ else if (pawn.IsAnimal() && !RJWSettings.bestiality_enabled)
+ {
+ if (throwMessages)
+ {
+ Messages.Message("bestiality is disabled", pawn, MessageTypeDefOf.RejectInput, false);
+ }
+ return false;
+ }
+ else if (GeneUtility.HasSeduce(pawn))
+ {
+ if (throwMessages)
+ {
+ Messages.Message(pawn.Name + " cannot be seduced, as they also have the Seduce-Ability", pawn, MessageTypeDefOf.RejectInput, false);
+ }
+ return false;
+ }
+ else if (pawn.Downed)
+ {
+ if (throwMessages)
+ {
+ Messages.Message(pawn.Name + " is unable to move", pawn, MessageTypeDefOf.RejectInput, false);
+ }
+ return false;
+ }
+
+ }
+ return base.Valid(target, throwMessages);
+ }
+
+ public override bool GizmoDisabled(out string reason)
+ {
+ reason = null;
+ if (!RJWSettings.rape_enabled)
+ {
+ reason = "Rape is disabled";
+ return true;
+ }
+ return false;
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/Abilities/CompProperties_AbilityCockEater.cs b/Source/Genes/Life_Force/Abilities/CompProperties_AbilityCockEater.cs
new file mode 100644
index 0000000..b64b346
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/CompProperties_AbilityCockEater.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+
+namespace RJW_Genes
+{
+ public class CompProperties_AbilityCockEater : CompProperties_AbilityEffect
+ {
+ public CompProperties_AbilityCockEater()
+ {
+ this.compClass = typeof(CompAbilityEffect_CockEater);
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/Abilities/CompProperties_AbilityLifeForceCost.cs b/Source/Genes/Life_Force/Abilities/CompProperties_AbilityLifeForceCost.cs
new file mode 100644
index 0000000..5a05d5f
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/CompProperties_AbilityLifeForceCost.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using Verse;
+using RimWorld;
+
+namespace RJW_Genes
+{
+ // Token: 0x02000F65 RID: 3941
+ public class CompProperties_AbilityLifeForceCost : CompProperties_AbilityEffect
+ {
+ // Token: 0x06005D16 RID: 23830 RVA: 0x001FA73F File Offset: 0x001F893F
+ public CompProperties_AbilityLifeForceCost()
+ {
+ this.compClass = typeof(CompAbilityEffect_LifeForceCost);
+ }
+
+ // Token: 0x06005D17 RID: 23831 RVA: 0x001FA757 File Offset: 0x001F8957
+ public override IEnumerable ExtraStatSummary()
+ {
+ yield return "AbilityFertilinCost" + ": " + Mathf.RoundToInt(this.fertilinCost * 100f);
+ yield break;
+ }
+
+ // Token: 0x040038CD RID: 14541
+ public float fertilinCost;
+ }
+}
diff --git a/Source/Genes/Life_Force/Abilities/CompProperties_AbilityPussyHeal.cs b/Source/Genes/Life_Force/Abilities/CompProperties_AbilityPussyHeal.cs
new file mode 100644
index 0000000..16ba74d
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/CompProperties_AbilityPussyHeal.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+
+namespace RJW_Genes
+{
+ public class CompProperties_AbilityPussyHeal : CompProperties_AbilityEffect
+ {
+ public CompProperties_AbilityPussyHeal()
+ {
+ this.compClass = typeof(CompAbilityEffect_PussyHeal);
+ }
+
+ public FloatRange tendQualityRange;
+ }
+}
diff --git a/Source/Genes/Life_Force/Abilities/CompProperties_CasterIsNaked.cs b/Source/Genes/Life_Force/Abilities/CompProperties_CasterIsNaked.cs
new file mode 100644
index 0000000..8cb300e
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/CompProperties_CasterIsNaked.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+
+namespace RJW_Genes
+{
+ public class CompProperties_CasterIsNaked : CompProperties_EffectWithDest
+ {
+ public CompProperties_CasterIsNaked()
+ {
+ this.compClass = typeof(CompAbilityEffect_CasterIsNaked);
+ }
+ }
+}
+
diff --git a/Source/Genes/Life_Force/Abilities/CompProperties_Seduce.cs b/Source/Genes/Life_Force/Abilities/CompProperties_Seduce.cs
new file mode 100644
index 0000000..21e0cde
--- /dev/null
+++ b/Source/Genes/Life_Force/Abilities/CompProperties_Seduce.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+
+namespace RJW_Genes
+{
+ public class CompProperties_Seduce : CompProperties_EffectWithDest
+ {
+ public CompProperties_Seduce()
+ {
+ this.compClass = typeof(CompAbilityEffect_Seduce);
+ }
+
+ public StatDef durationMultiplier;
+ }
+}
+
diff --git a/Source/Genes/Life_Force/Defs/LifeForceEmpathExtension.cs b/Source/Genes/Life_Force/Defs/LifeForceEmpathExtension.cs
new file mode 100644
index 0000000..ccc037b
--- /dev/null
+++ b/Source/Genes/Life_Force/Defs/LifeForceEmpathExtension.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace RJW_Genes
+{
+ public class LifeForceEmpathExtension : DefModExtension
+ {
+ public float aheagoIncrement;
+ public float satisfactionIncrement;
+ public float frustratedDecrement;
+ }
+}
diff --git a/Source/Genes/Life_Force/Events/SuccubusVisit/IncidentWorker_SuccubusVisit.cs b/Source/Genes/Life_Force/Events/SuccubusVisit/IncidentWorker_SuccubusVisit.cs
new file mode 100644
index 0000000..22808f8
--- /dev/null
+++ b/Source/Genes/Life_Force/Events/SuccubusVisit/IncidentWorker_SuccubusVisit.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+using Verse.AI.Group;
+using RimWorld;
+using rjw;
+namespace RJW_Genes
+{
+ public class IncidentWorker_SuccubusDreamVisit : IncidentWorker
+ {
+ //This incidint will only fire if there is a pawn asleep and sexneed is lower than 0.25
+ protected override bool CanFireNowSub(IncidentParms parms)
+ {
+ if (!base.CanFireNowSub(parms))
+ {
+ return false;
+ }
+ Map map = (Map)parms.target;
+ if (!map.mapTemperature.SeasonAcceptableFor(ThingDefOf.Human))
+ {
+ return false;
+ }
+ if (!RJW_Genes_Settings.rjw_genes_sexdemon_visit_incubi && !RJW_Genes_Settings.rjw_genes_sexdemon_visit_succubi)
+ {
+ return false;
+ }
+
+ foreach (Pawn pawn in map.mapPawns.FreeColonistsAndPrisonersSpawned)
+ {
+ if (pawn.jobs.curDriver.asleep && xxx.need_some_sex(pawn) > 1f)
+ {
+ return true;
+ }
+ }
+ return false;
+
+ }
+
+ protected override bool TryExecuteWorker(IncidentParms parms)
+ {
+ Map map = (Map)parms.target;
+ List victims = ValidVictims(map).ToList();
+ if (victims.NullOrEmpty())
+ {
+ return false;
+ }
+ Faction faction;
+ if (!this.TryFindFormerFaction(out faction))
+ {
+ return false;
+ }
+ int pawn_amount = RJW_Genes_Settings.rjw_genes_sexdemon_visit_groups ? Rand.Range(1, victims.Count) : 1;
+ List new_sexdemons = new List();
+ for (int i = 0; i < pawn_amount; i++)
+ {
+ Pawn victim = victims.RandomElement();
+ IntVec3 loc = victim.Position;
+
+ PawnKindDef pawnKindDef;
+ Gender gender;
+ if (victim.gender == Gender.Male || !RJW_Genes_Settings.rjw_genes_sexdemon_visit_incubi)
+ {
+
+ }
+ if ((Rand.Bool && RJW_Genes_Settings.rjw_genes_sexdemon_visit_succubi) || !RJW_Genes_Settings.rjw_genes_sexdemon_visit_incubi)
+ {
+ pawnKindDef = PawnKindDef.Named("rjw_genes_succubus");
+ gender = Gender.Female;
+ }
+ else
+ {
+ pawnKindDef = PawnKindDef.Named("rjw_genes_incubus");
+ gender = Gender.Male;
+ }
+
+ //Spawn succubus at pawn
+ Pawn sexdemon = PawnGenerator.GeneratePawn(new PawnGenerationRequest(pawnKindDef, faction, PawnGenerationContext.NonPlayer, -1,
+ false, false, false, true, false, 1f, false, true, false, true, true, false, false, false, false, 0f, 0f, null, 1f, null, null,
+ null, null, null, null, null, gender, null, null, null, null, false, false, false, false, null, null, null, null, null, 0f,
+ DevelopmentalStage.Adult, null, null, null, false));
+ sexdemon.SetFaction(null, null);
+ GenSpawn.Spawn(sexdemon, loc, map, WipeMode.Vanish);
+ List sexdemons = new List { sexdemon };
+ new_sexdemons.Add(sexdemon);
+
+
+ LordMaker.MakeNewLord(Faction.OfPlayer, this.CreateLordJob(parms, sexdemon, victim), map, sexdemons);
+
+ //Make succubus rape victim.
+ if (RJWSettings.rape_enabled)
+ {
+ //follow rjw rules
+ if (SexAppraiser.would_fuck(sexdemon, victim) > 0f)
+ {
+ sexdemon.pather.StopDead();
+ sexdemon.jobs.StopAll();
+ Job newJob = JobMaker.MakeJob(xxx.RapeRandom, victim);
+ sexdemon.jobs.StartJob(newJob, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true);
+ }
+
+ }
+ }
+ Find.LetterStack.ReceiveLetter("rjw_genes_sexdemon_visit_incident_label".Translate(), "rjw_genes_sexdemon_visit_incident_description".Translate(), RimWorld.LetterDefOf.PositiveEvent, new_sexdemons, null, null, null, null);
+
+ return true;
+ }
+
+ private IEnumerable ValidVictims(Map map)
+ {
+ foreach (Pawn pawn in map.mapPawns.FreeColonistsAndPrisonersSpawned)
+ {
+ if (pawn.jobs.curDriver.asleep && xxx.need_some_sex(pawn) > 1f)
+ {
+ yield return pawn;
+ }
+ }
+ yield break;
+ }
+
+ private bool TryFindFormerFaction(out Faction formerFaction)
+ {
+ return Find.FactionManager.TryGetRandomNonColonyHumanlikeFaction(out formerFaction, false, true, TechLevel.Undefined, false);
+ }
+
+ protected virtual LordJob_SuccubusVisit CreateLordJob(IncidentParms parms, Pawn succubus, Pawn target)
+ {
+ return new LordJob_SuccubusVisit(target);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/Life_Force/Events/SuccubusVisit/LordJob_SuccubusVisit.cs b/Source/Genes/Life_Force/Events/SuccubusVisit/LordJob_SuccubusVisit.cs
new file mode 100644
index 0000000..887a324
--- /dev/null
+++ b/Source/Genes/Life_Force/Events/SuccubusVisit/LordJob_SuccubusVisit.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using Verse;
+using Verse.AI.Group;
+using RimWorld;
+using rjw;
+namespace RJW_Genes
+{
+ //Based on LordJob_VisitColony
+ public class LordJob_SuccubusVisit : LordJob
+ {
+ public LordJob_SuccubusVisit() { }
+ public LordJob_SuccubusVisit(Pawn target)
+ {
+ this.target = target;
+ }
+
+ //
+ //Stategraph has lordtoils which say what a pawn should be doing
+ //Transitions say when active lordtoil for pawn should change
+ //
+ public override StateGraph CreateGraph()
+ {
+ StateGraph stateGraph = new StateGraph();
+
+ //Flirt
+ LordToil_Flirt lordToil_Flirt = new LordToil_Flirt(this.target, 7f);
+ stateGraph.AddToil(lordToil_Flirt);
+ stateGraph.StartingToil = lordToil_Flirt;
+
+ //Leave
+ LordToil_ExitMapRandom lordToil_ExitMapRandom = new LordToil_ExitMapRandom();
+ stateGraph.AddToil(lordToil_ExitMapRandom);
+ LordToil_ExitMapAndDefendSelf lordToil_ExitMapAndDefendSelf = new LordToil_ExitMapAndDefendSelf();
+ stateGraph.AddToil(lordToil_ExitMapAndDefendSelf);
+
+ //Leave after some time
+ Transition transition1 = new Transition(lordToil_Flirt, lordToil_ExitMapRandom, false, true);
+ int tickLimit;
+ if (this.durationTicks != null)
+ {
+ tickLimit = this.durationTicks.Value;
+ }
+ else
+ {
+ tickLimit = Rand.Range(60000, 180000); //~1-3 days
+ }
+ transition1.AddTrigger(new Trigger_TicksPassed(tickLimit));
+ transition1.AddPreAction(new TransitionAction_Custom(new Action(this.SuccubiLeave))); //Join or leave colony
+ stateGraph.AddTransition(transition1);
+
+ //If they become hostile
+ Transition transition3 = new Transition(lordToil_Flirt, lordToil_ExitMapAndDefendSelf, false, true);
+ transition3.AddSource(lordToil_ExitMapRandom); //Not sure what this does
+ transition3.AddTrigger(new Trigger_BecamePlayerEnemy());
+ transition3.AddTrigger(new Trigger_PawnKilled());
+ transition3.AddPostAction(new TransitionAction_EndAllJobs());
+ stateGraph.AddTransition(transition3, false);
+
+ Transition transition4 = new Transition(lordToil_ExitMapRandom, lordToil_ExitMapAndDefendSelf, false, true);
+ transition4.AddSource(lordToil_Flirt); //Not sure what this does
+ transition4.AddTrigger(new Trigger_PawnHarmed(1f, true, Faction.OfPlayer));
+ stateGraph.AddTransition(transition4, false);
+
+ return stateGraph;
+ }
+
+ //add toggleable gizmo to allow playes to have colonists sex the succubus into joining your colony
+ //comfort pawn? cooldown?
+ public override IEnumerable GetPawnGizmos(Pawn p)
+ {
+ return base.GetPawnGizmos(p);
+ }
+
+ public override void ExposeData()
+ {
+ Scribe_Values.Look(ref this.durationTicks, "durationTicks", null, false);
+ Scribe_References.Look(ref this.target, "target", false);
+ }
+
+ public void SuccubiLeave()
+ {
+ foreach (Pawn pawn in this.lord.ownedPawns)
+ {
+ if (colonyJoiners.Contains(pawn))
+ {
+ RecruitUtility.Recruit(pawn, Faction.OfPlayer);
+ Find.LetterStack.ReceiveLetter("rjw_genes_succubus_joins_letter_label".Translate(), string.Format("rjw_genes_succubus_joins_letter_description".Translate(), xxx.get_pawnname(pawn)), RimWorld.LetterDefOf.PositiveEvent, pawn, null, null, null, null);
+ }
+ else
+ {
+ Messages.Message("SuccubusLeaving".Translate(xxx.get_pawnname(pawn)), pawn, MessageTypeDefOf.NeutralEvent, true);
+ }
+ }
+
+ }
+
+ public Pawn target;
+ private int? durationTicks;
+ public List colonyJoiners = new List();
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/Life_Force/Genes/Gene_LifeForce.cs b/Source/Genes/Life_Force/Genes/Gene_LifeForce.cs
new file mode 100644
index 0000000..8cac6b3
--- /dev/null
+++ b/Source/Genes/Life_Force/Genes/Gene_LifeForce.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using Verse;
+using RimWorld;
+using rjw;
+
+namespace RJW_Genes
+{
+ public class Gene_LifeForce : Gene_Resource, IGeneResourceDrain
+ {
+ //Gene should only be active if sex is allowed for this pawn
+ public override bool Active
+ {
+ get
+ {
+ if (this.Overridden)
+ {
+ return false;
+ }
+ Pawn pawn = this.pawn;
+
+ return ((pawn != null) ? pawn.ageTracker : null) == null ||
+ ((float)this.pawn.ageTracker.AgeBiologicalYears >= this.def.minAgeActive);
+ }
+ }
+
+ public override void ExposeData()
+ {
+ base.ExposeData();
+ Scribe_Values.Look(ref this.StoredCumAllowed, "StoredCumAllowed", true, false);
+ }
+
+ public bool ShouldConsumeLifeForceNow()
+ {
+ return this.Value < this.targetValue;
+ }
+
+ //Same as Gene_Hemogen
+ public override IEnumerable GetGizmos()
+ {
+ foreach (Gizmo gizmo in base.GetGizmos())
+ {
+ yield return gizmo;
+ }
+ yield break;
+ }
+
+ //every tick it decreases fertilin value and everyday if fertilin is below alert minimum there a ~50 chance for mental break
+ public override void Tick()
+ {
+ base.Tick();
+ if (this.CanOffset && this.Resource != null)
+ {
+ GeneUtility.OffsetLifeForce(this, -this.ResourceLossPerDay / 60000f);
+
+ }
+
+ }
+
+ public bool StoredCumAllowed = true;
+ public Gene_Resource Resource
+ {
+ get
+ {
+ return this;
+ }
+ }
+ public Pawn Pawn
+ {
+ get
+ {
+ return this.pawn;
+ }
+ }
+ public bool CanOffset
+ {
+ get
+ {
+ return this.pawn.Spawned && this.Active;
+ }
+ }
+
+ public float ResourceLossPerDay
+ {
+ get
+ {
+ return this.def.resourceLossPerDay;
+ }
+ }
+
+ public string DisplayLabel
+ {
+ get
+ {
+ return this.def.resourceLabel;
+ }
+ }
+
+ public override float InitialResourceMax
+ {
+ get
+ {
+ return 1f;
+ }
+ }
+
+ public override float MinLevelForAlert
+ {
+ get
+ {
+ return 0.2f;
+ }
+ }
+ public override float MaxLevelOffset
+ {
+ get
+ {
+ return base.MaxLevelOffset;
+ }
+ }
+ protected override Color BarColor
+ {
+ get
+ {
+ return Color.grey;
+ }
+ }
+ protected override Color BarHighlightColor
+ {
+ get
+ {
+ return Color.white;
+ }
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/Genes/Gene_LifeForceDrain.cs b/Source/Genes/Life_Force/Genes/Gene_LifeForceDrain.cs
new file mode 100644
index 0000000..c50dae5
--- /dev/null
+++ b/Source/Genes/Life_Force/Genes/Gene_LifeForceDrain.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using Verse;
+using RimWorld;
+
+namespace RJW_Genes
+{
+ public class Gene_LifeForceDrain : Gene, IGeneResourceDrain
+ {
+ public Gene_Resource Resource
+ {
+ get
+ {
+ if (this.cachedLifeForceGene == null || !this.cachedLifeForceGene.Active)
+ {
+ this.cachedLifeForceGene = this.pawn.genes.GetFirstGeneOfType();
+ }
+ return this.cachedLifeForceGene;
+ }
+ }
+
+ public bool CanOffset
+ {
+ get
+ {
+ return this.Active && this.Resource != null && this.Resource.Active;
+ }
+ }
+
+ public float ResourceLossPerDay
+ {
+ get
+ {
+ return this.def.resourceLossPerDay;
+ }
+ }
+
+ public Pawn Pawn
+ {
+ get
+ {
+ return this.pawn;
+ }
+ }
+
+ public string DisplayLabel
+ {
+ get
+ {
+ return this.Label + " (" + "Gene".Translate() + ")";
+ }
+ }
+
+ public override void Tick()
+ {
+ base.Tick();
+ if (this.CanOffset && this.Resource != null)
+ {
+ GeneUtility.OffsetLifeForce(this, -this.ResourceLossPerDay / 60000);
+ }
+ }
+
+ [Unsaved(false)]
+ private Gene_LifeForce cachedLifeForceGene;
+
+ private const float MinAgeForDrain = 3f;
+ }
+}
diff --git a/Source/Genes/Life_Force/Genes/Gene_LifeForce_Empath.cs b/Source/Genes/Life_Force/Genes/Gene_LifeForce_Empath.cs
new file mode 100644
index 0000000..e355fb4
--- /dev/null
+++ b/Source/Genes/Life_Force/Genes/Gene_LifeForce_Empath.cs
@@ -0,0 +1,118 @@
+using System.Collections.Generic;
+using Verse;
+using RimWorld;
+
+namespace RJW_Genes
+{
+ public class Gene_LifeForce_Empath : Gene
+ {
+
+ const int EMPATH_DISTANCE_FALLBACK = 25;
+ const int TICK_INTERVAL_FALLBACK = 60000 / 48;
+
+ const float AHEAGO_FALLBACK = 0.02f, SATISFIED_FALLBACK = 0.01f, FRUSTRATED_FALLBACK = -0.01f;
+
+ int empathDistance = 25;
+ int tickInterval = 60000 / 48 ; // 60k = 1 day, we want 0.5h which is 1/48th of 1 day.
+
+ float aheagoIncrement = 0.02f;
+ float satisfiedIncrement = 0.01f;
+ float frustratedDecrement = -0.01f;
+
+
+ public Gene_LifeForce_Empath() : base()
+ {
+ SetValuesFromExtension();
+ }
+
+ private void SetValuesFromExtension()
+ {
+ LifeForceEmpathExtension empathExt = GeneDefOf.rjw_genes_lifeforce_empath.GetModExtension();
+
+ tickInterval = ModExtensionHelper.GetTickIntervalFromModExtension(GeneDefOf.rjw_genes_lifeforce_empath, TICK_INTERVAL_FALLBACK);
+ empathDistance = ModExtensionHelper.GetTickIntervalFromModExtension(GeneDefOf.rjw_genes_lifeforce_empath, EMPATH_DISTANCE_FALLBACK);
+
+ aheagoIncrement = empathExt?.aheagoIncrement ?? AHEAGO_FALLBACK;
+ satisfiedIncrement = empathExt?.satisfactionIncrement ?? SATISFIED_FALLBACK;
+ frustratedDecrement = empathExt?.frustratedDecrement ?? FRUSTRATED_FALLBACK;
+ }
+
+ public override void Tick()
+ {
+ base.Tick();
+ if (this.pawn.IsHashIntervalTick(tickInterval) && this.pawn.Map != null)
+ {
+ foreach (Pawn pawn in this.AffectedPawns(this.pawn.Position, this.pawn.Map))
+ {
+ this.FarmLifeForce(pawn);
+ }
+
+ }
+ }
+
+ ///
+ /// Creates an IEnumerable of all pawns which are closeby and in lineofsight, self and other pawns with lifeforce gene are skipped (to prevent loops).
+ ///
+ /// The position of the empath on the map
+ /// The map the empath is on
+ /// A list of all pawns that are close enough for the empath to connect.
+ private IEnumerable AffectedPawns(IntVec3 pos, Map map)
+ {
+ foreach (Pawn pawn in map.mapPawns.AllPawns)
+ {
+ // Return for trivial errors
+ if (pawn == null || this.pawn == null || pawn == this.pawn)
+ continue;
+ // Check for position-existance
+ if (pawn.Position == null || pos == null || pawn.Map == null)
+ continue;
+ // Do nothing if pawn is carried
+ if (pawn.CarriedBy != null)
+ continue;
+ // Do nothing if Pawn is Baby or Child (#25)
+ if (!pawn.ageTracker.Adult)
+ continue;
+ // Do nothing for pawns that also have lifeforce
+ if (GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_lifeforce))
+ continue;
+
+ // Actual Logic:
+ // Pawn qualifies in right distance and needs line of sight.
+ if (pos.DistanceTo(pawn.Position) < empathDistance && GenSight.LineOfSight(pos, pawn.Position, pawn.Map))
+ {
+ yield return pawn;
+ }
+ }
+
+ yield break;
+ }
+
+ ///
+ /// Adjust the empaths lifeforce depending on the farmed pawns sexneed.
+ ///
+ /// The pawn affecting the empath, increasing or decreasing his lifeforce.
+ private void FarmLifeForce(Pawn farmedPawn)
+ {
+ // Short rename to make rest more obvious.
+ Pawn empath = pawn;
+
+ if (farmedPawn == null)
+ return;
+
+ var sexneed = farmedPawn.needs.TryGetNeed();
+
+ // Shortwire: do nothing on no sexneed.
+ if (sexneed == null)
+ return;
+
+ if (sexneed.CurLevel >= sexneed.thresh_ahegao())
+ GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(empath), aheagoIncrement);
+ else if (sexneed.CurLevel >= sexneed.thresh_satisfied())
+ GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(empath), satisfiedIncrement);
+ else if (sexneed.CurLevel <= sexneed.thresh_frustrated())
+ GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(empath), frustratedDecrement);
+
+ }
+
+ }
+}
diff --git a/Source/Genes/Life_Force/HediffCompProperties_SeverityFromFertilin.cs b/Source/Genes/Life_Force/HediffCompProperties_SeverityFromFertilin.cs
new file mode 100644
index 0000000..558c3e0
--- /dev/null
+++ b/Source/Genes/Life_Force/HediffCompProperties_SeverityFromFertilin.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+namespace RJW_Genes
+{
+ public class HediffCompProperties_SeverityFromFertilin : HediffCompProperties
+ {
+ public HediffCompProperties_SeverityFromFertilin()
+ {
+ this.compClass = typeof(HediffComp_SeverityFromFertilin);
+ }
+
+ // Token: 0x04001162 RID: 4450
+ public float severityPerHourEmpty;
+
+ // Token: 0x04001163 RID: 4451
+ public float severityPerHourHemogen;
+ }
+}
diff --git a/Source/Genes/Life_Force/HediffComp_SeverityFromFertilin.cs b/Source/Genes/Life_Force/HediffComp_SeverityFromFertilin.cs
new file mode 100644
index 0000000..eda55b2
--- /dev/null
+++ b/Source/Genes/Life_Force/HediffComp_SeverityFromFertilin.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+namespace RJW_Genes
+{
+ public class HediffComp_SeverityFromFertilin : HediffComp
+ {
+ public HediffCompProperties_SeverityFromFertilin Props
+ {
+ get
+ {
+ return (HediffCompProperties_SeverityFromFertilin)this.props;
+ }
+ }
+ public override bool CompShouldRemove
+ {
+ get
+ {
+ Pawn_GeneTracker genes = base.Pawn.genes;
+ return ((genes != null) ? genes.GetFirstGeneOfType() : null) == null;
+ }
+ }
+ private Gene_LifeForce LifeForce
+ {
+ get
+ {
+ if (this.cachedLifeForceGene == null)
+ {
+ this.cachedLifeForceGene = base.Pawn.genes.GetFirstGeneOfType();
+ }
+ return this.cachedLifeForceGene;
+ }
+ }
+ public override void CompPostTick(ref float severityAdjustment)
+ {
+ base.CompPostTick(ref severityAdjustment);
+ severityAdjustment += ((this.LifeForce.Value > 0f) ? this.Props.severityPerHourHemogen : this.Props.severityPerHourEmpty) / 2500f;
+ this.MentalBreak();
+ }
+
+ public void MentalBreak()
+ {
+ if (cachedLifeForceGene.Resource.Value <= cachedLifeForceGene.Resource.MinLevelForAlert && this.Pawn.IsHashIntervalTick(2500) && Rand.Chance(0.03f)) //~50% chance each day for mental break
+ {
+ if (this.Pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_cum_eater)
+ || this.Pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_fertilin_absorber) || this.Pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_drainer))
+ {
+ //TODO: use mentalstatedef instead of mentalbreakdef
+ MentalBreakDef randomrape = GeneDefOf.rjw_genes_lifeforce_randomrape;
+ if (ModsConfig.BiotechActive &&
+ this.Pawn.Spawned && !this.Pawn.InMentalState && !this.Pawn.Downed &&
+ randomrape.Worker.BreakCanOccur(this.Pawn))
+ {
+ randomrape.Worker.TryStart(this.Pawn, "MentalBreakNoFertilin".Translate(), false);
+ }
+ }
+ }
+ }
+
+ private Gene_LifeForce cachedLifeForceGene;
+ }
+}
diff --git a/Source/Genes/Life_Force/IngestionOutcomeDoer_LifeForceOffset.cs b/Source/Genes/Life_Force/IngestionOutcomeDoer_LifeForceOffset.cs
new file mode 100644
index 0000000..feae482
--- /dev/null
+++ b/Source/Genes/Life_Force/IngestionOutcomeDoer_LifeForceOffset.cs
@@ -0,0 +1,24 @@
+using RimWorld;
+using Verse;
+
+namespace RJW_Genes
+{
+ ///
+ /// This class checks for pawns with LifeForce and Cumeater Gene to add Fertilin when eating cum (the Item from RJW-Sexperience).
+ ///
+ public class IngestionOutcomeDoer_LifeForceOffset : IngestionOutcomeDoer
+ {
+ public const float DEFAULT_FERTILIN_PER_UNIT = 1f;
+ public float FertilinPerUnit = 1f;
+
+ protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested, int ingestedCount)
+ {
+ if (GeneUtility.HasLifeForce(pawn) && GeneUtility.IsCumEater(pawn))
+ {
+ float num = ingestedCount * this.FertilinPerUnit / 100;
+ GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(pawn), num);
+ }
+ }
+
+ }
+}
diff --git a/Source/Genes/Life_Force/Interactions/SuccubusTailjob/DomSuccubusTailCustomRequirementHandler.cs b/Source/Genes/Life_Force/Interactions/SuccubusTailjob/DomSuccubusTailCustomRequirementHandler.cs
new file mode 100644
index 0000000..67fafae
--- /dev/null
+++ b/Source/Genes/Life_Force/Interactions/SuccubusTailjob/DomSuccubusTailCustomRequirementHandler.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+using rjw.Modules.Interactions;
+using rjw.Modules.Interactions.Internals.Implementation;
+using rjw.Modules.Interactions.Objects;
+using rjw;
+using rjw.Modules.Interactions.Enums;
+
+//Modefied code based of RJW-AI code at https://gitgud.io/Ed86/rjw-ia/-/tree/master/
+namespace RJW_Genes
+{
+ [StaticConstructorOnStartup]
+ public class DomSuccubusTailCustomRequirementHandler : ICustomRequirementHandler
+ {
+ public string HandlerKey
+ {
+ get
+ {
+ return "DomSuccubusTailCustomRequirementHandler";
+ }
+ }
+
+
+ static DomSuccubusTailCustomRequirementHandler()
+ {
+ Register();
+ }
+ public static void Register()
+ {
+ InteractionRequirementService.CustomRequirementHandlers.Add(new DomSuccubusTailCustomRequirementHandler());
+ if (Prefs.DevMode)
+ {
+ Log.Message("DomSuccubusTailCustomRequirementHandler registered: ");
+ }
+ }
+
+ public bool FufillRequirements(InteractionWithExtension interaction, InteractionPawn dominant, InteractionPawn submissive)
+ {
+ if (GeneUtility.HasGeneNullCheck(dominant.Pawn, GeneDefOf.rjw_genes_succubus_tail))
+ {
+ return true;
+ }
+ return false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/Life_Force/Interactions/SuccubusTailjob/GenesPartKindUsageRule.cs b/Source/Genes/Life_Force/Interactions/SuccubusTailjob/GenesPartKindUsageRule.cs
new file mode 100644
index 0000000..371f06d
--- /dev/null
+++ b/Source/Genes/Life_Force/Interactions/SuccubusTailjob/GenesPartKindUsageRule.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using rjw;
+using rjw.Modules.Interactions.Contexts;
+using rjw.Modules.Interactions.Enums;
+using rjw.Modules.Interactions.Rules.PartKindUsageRules;
+using rjw.Modules.Shared;
+using Verse;
+
+namespace RJW_Genes.Interactions
+{
+ //Summary//
+ //Set custom preferences for pawn. Gets integrated into rjw by AddtoIPartPreferenceRule in First
+ //Depending on the level of lifeforce increase the chance for using the mouth.
+ public class GenesPartKindUsageRule : IPartPreferenceRule
+ {
+ public IEnumerable> ModifiersForDominant(InteractionContext context)
+ {
+ Pawn pawn = context.Internals.Dominant.Pawn;
+ Gene_LifeForce gene = pawn.genes.GetFirstGeneOfType();
+ if (gene != null)
+ {
+ float weight = 2f;
+ if (gene.Value < gene.MinLevelForAlert)
+ {
+ weight *= 10;
+ }
+ else if (gene.Value < gene.targetValue)
+ {
+ weight *= 2.5f;
+ }
+ if (pawn.genes.HasGene(GeneDefOf.rjw_genes_cum_eater))
+ {
+ yield return new Weighted(weight, LewdablePartKind.Mouth);
+ yield return new Weighted(weight, LewdablePartKind.Beak);
+ }
+
+ if (pawn.genes.HasGene(GeneDefOf.rjw_genes_fertilin_absorber))
+ {
+ yield return new Weighted(weight, LewdablePartKind.Vagina);
+ yield return new Weighted(weight, LewdablePartKind.Anus);
+ }
+ }
+ yield break;
+ }
+
+ public IEnumerable> ModifiersForSubmissive(InteractionContext context)
+ {
+ Pawn pawn = context.Internals.Dominant.Pawn;
+ Gene_LifeForce gene = pawn.genes.GetFirstGeneOfType();
+ if (gene != null)
+ {
+ float weight = 2f;
+ if (gene.Value < gene.MinLevelForAlert)
+ {
+ weight *= 10;
+ }
+ else if (gene.Value < gene.targetValue)
+ {
+ weight *= 2.5f;
+ }
+ yield return new Weighted(weight, LewdablePartKind.Mouth);
+ yield return new Weighted(weight, LewdablePartKind.Beak);
+
+ if (pawn.genes.HasGene(GeneDefOf.rjw_genes_fertilin_absorber))
+ {
+ yield return new Weighted(weight, LewdablePartKind.Vagina);
+ yield return new Weighted(weight, LewdablePartKind.Anus);
+ }
+ }
+ yield break;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/Life_Force/Interactions/SuccubusTailjob/SubSuccubusTailCustomRequirementHandler.cs b/Source/Genes/Life_Force/Interactions/SuccubusTailjob/SubSuccubusTailCustomRequirementHandler.cs
new file mode 100644
index 0000000..04d7657
--- /dev/null
+++ b/Source/Genes/Life_Force/Interactions/SuccubusTailjob/SubSuccubusTailCustomRequirementHandler.cs
@@ -0,0 +1,43 @@
+using Verse;
+using rjw.Modules.Interactions;
+using rjw.Modules.Interactions.Internals.Implementation;
+using rjw.Modules.Interactions.Objects;
+
+//Modified code based of RJW-AI code at https://gitgud.io/Ed86/rjw-ia/-/tree/master/
+namespace RJW_Genes
+{
+ [StaticConstructorOnStartup]
+ public class SubSuccubusTailCustomRequirementHandler : ICustomRequirementHandler
+ {
+ public string HandlerKey
+ {
+ get
+ {
+ return "SubSuccubusTailCustomRequirementHandler";
+ }
+ }
+
+ static SubSuccubusTailCustomRequirementHandler()
+ {
+ Register();
+ }
+ public static void Register()
+ {
+ InteractionRequirementService.CustomRequirementHandlers.Add(new SubSuccubusTailCustomRequirementHandler());
+ if (Prefs.DevMode)
+ {
+ Log.Message("SubSuccubusTailCustomRequirementHandler registered: ");
+ }
+ }
+
+ public bool FufillRequirements(InteractionWithExtension interaction, InteractionPawn dominant, InteractionPawn submissive)
+ {
+ if (GeneUtility.HasGeneNullCheck(submissive.Pawn, GeneDefOf.rjw_genes_succubus_tail))
+ {
+ return true;
+ }
+ return false;
+ }
+ }
+}
+
diff --git a/Source/Genes/Life_Force/JobDrivers/JobDriver_CastAbilityAfterSex.cs b/Source/Genes/Life_Force/JobDrivers/JobDriver_CastAbilityAfterSex.cs
new file mode 100644
index 0000000..d604cca
--- /dev/null
+++ b/Source/Genes/Life_Force/JobDrivers/JobDriver_CastAbilityAfterSex.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RimWorld;
+using Verse;
+using Verse.AI;
+using rjw;
+
+namespace RJW_Genes
+{
+ public class JobDriver_CastAbilityAfterSex : JobDriver_SexBaseInitiator
+ {
+ //Summary//
+ //Similar to jobdriver rape, but it cast an ability after sex and tries to limit what kind of sexinteractions are allowed.
+ protected override IEnumerable MakeNewToils()
+ {
+ base.setup_ticks();
+ //this.FailOnDespawnedOrNull(TargetIndex.A);
+ //this.FailOnCannotTouch(TargetIndex.B, PathEndMode.OnCell);
+ this.FailOnDespawnedNullOrForbidden(this.iTarget);
+ //this.FailOn(() => !target.health.capacities.CanBeAwake);
+ JobDef PartnerJob = xxx.gettin_raped;
+ yield return Toils_Goto.Goto(TargetIndex.A, PathEndMode.OnCell);
+ yield return new Toil
+ {
+ defaultCompleteMode = ToilCompleteMode.Instant,
+ socialMode = RandomSocialMode.Off,
+ initAction = delegate ()
+ {
+ Job newJob = JobMaker.MakeJob(PartnerJob, this.pawn, this.Partner);
+ this.Partner.jobs.StartJob(newJob, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true);
+ }
+ };
+ Toil toil = new Toil();
+ toil.defaultCompleteMode = ToilCompleteMode.Never;
+ toil.socialMode = RandomSocialMode.Off;
+ toil.defaultDuration = this.duration;
+ toil.handlingFacing = true;
+ toil.FailOn(() => this.Partner.CurJob.def != PartnerJob);
+ toil.initAction = delegate ()
+ {
+ this.Partner.pather.StopDead();
+ this.Partner.jobs.curDriver.asleep = false;
+
+ //Tries to find CompProperties_SexInteractionRequirements and if it finds it it will try and generate sexprops based on the sexpropsrequirements.
+ foreach (AbilityComp comp in this.job.ability.comps)
+ {
+ if (comp.props is CompProperties_SexInteractionRequirements)
+ {
+ CompProperties_SexInteractionRequirements sexpropsreq = comp.props as CompProperties_SexInteractionRequirements;
+ this.Sexprops = CustomSexInteraction_Helper.GenerateSexProps(this.pawn, this.Partner, sexpropsreq);
+ }
+ }
+ this.Start();
+ this.Sexprops.usedCondom = (CondomUtility.TryUseCondom(this.pawn) || CondomUtility.TryUseCondom(this.Partner));
+ };
+ toil.AddPreTickAction(delegate
+ {
+ if (this.pawn.IsHashIntervalTick(this.ticks_between_hearts))
+ {
+ this.ThrowMetaIconF(this.pawn.Position, this.pawn.Map, FleckDefOf.Heart);
+ }
+ this.SexTick(this.pawn, this.Partner, true, true);
+ SexUtility.reduce_rest(this.Partner, 1f);
+ SexUtility.reduce_rest(this.pawn, 1f);
+ if (this.ticks_left <= 0)
+ {
+ this.ReadyForNextToil();
+ }
+ });
+ toil.AddFinishAction(delegate
+ {
+ this.End();
+ });
+ yield return toil;
+ yield return new Toil
+ {
+ initAction = delegate ()
+ {
+ SexUtility.ProcessSex(this.Sexprops);
+ },
+ defaultCompleteMode = ToilCompleteMode.Instant
+ };
+ yield return Toils_Combat.CastVerb(TargetIndex.A, TargetIndex.B, false);
+ yield break;
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/JobDrivers/JobDriver_Flirt.cs b/Source/Genes/Life_Force/JobDrivers/JobDriver_Flirt.cs
new file mode 100644
index 0000000..337a9b2
--- /dev/null
+++ b/Source/Genes/Life_Force/JobDrivers/JobDriver_Flirt.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+using RimWorld;
+using rjw;
+namespace RJW_Genes
+{
+ public class JobDriver_Flirt : JobDriver
+ {
+ private Pawn Target
+ {
+ get
+ {
+ return (Pawn)((Thing)this.pawn.CurJob.GetTarget(TargetIndex.A));
+ }
+ }
+ public override bool TryMakePreToilReservations(bool errorOnFailed)
+ {
+ return true;
+ }
+
+ //Some wait toils to induce delay
+ protected override IEnumerable MakeNewToils()
+ {
+ this.FailOnDespawnedOrNull(TargetIndex.A);
+ yield return Toils_Interpersonal.GotoInteractablePosition(TargetIndex.A);
+ yield return Toils_General.Wait(300, TargetIndex.A);
+ yield return Toils_Interpersonal.WaitToBeAbleToInteract(this.pawn);
+ Toil toil = Toils_Interpersonal.GotoInteractablePosition(TargetIndex.A);
+ toil.socialMode = RandomSocialMode.Off;
+ yield return toil;
+ yield return this.InteractToil();
+ Toil toil1 = Toils_General.Wait(300, TargetIndex.A);
+ toil1.socialMode = RandomSocialMode.Off;
+ yield return toil1;
+ yield break;
+ }
+ private Toil InteractToil()
+ {
+ return Toils_General.Do(delegate
+ {
+ if (this.pawn.interactions.TryInteractWith(this.Target, ThoughtDefOf.rjw_genes_flirt))
+ {
+ Need_Sex need_Sex = this.Target.needs.TryGetNeed();
+ need_Sex.CurLevel += -0.01f;
+ }
+ });
+ }
+
+ private const TargetIndex TargetInd = TargetIndex.A;
+ }
+}
+
diff --git a/Source/Genes/Life_Force/JobDrivers/JobDriver_Seduced.cs b/Source/Genes/Life_Force/JobDrivers/JobDriver_Seduced.cs
new file mode 100644
index 0000000..2d38d75
--- /dev/null
+++ b/Source/Genes/Life_Force/JobDrivers/JobDriver_Seduced.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RimWorld;
+using Verse;
+using Verse.AI;
+using rjw;
+using rjw.Modules.Interactions.Enums;
+using rjw.Modules.Interactions.Helpers;
+using rjw.Modules.Interactions.Objects;
+using rjw.Modules.Interactions.Contexts;
+using rjw.Modules.Interactions.Implementation;
+
+namespace RJW_Genes
+{
+ public class JobDriver_Seduced : JobDriver
+ {
+ //Summary//
+ //Makes a pawn move to seducing pawn and then tries to rape them.
+ protected override IEnumerable MakeNewToils()
+ {
+
+ this.FailOnDespawnedNullOrForbidden(TargetIndex.A);
+ this.FailOn(() => !this.pawn.CanReserve(TargetA, xxx.max_rapists_per_prisoner, 0, null, false));
+ this.FailOn(() => this.pawn.IsFighting());
+ this.FailOn(() => this.pawn.Drafted);
+
+ Pawn partner = this.job.GetTarget(TargetIndex.A).Pawn;
+ yield return Toils_Goto.GotoThing(TargetIndex.A, PathEndMode.Touch);
+ yield return new Toil
+ {
+ defaultCompleteMode = ToilCompleteMode.Instant,
+ socialMode = RandomSocialMode.Off,
+ initAction = delegate ()
+ {
+ if(partner != null)
+ {
+ partner.drafter.Drafted = false;
+ this.pawn.needs.mood.thoughts.memories.TryGainMemory(ThoughtDefOf.rjw_genes_seduced, partner, null);
+ Job newJob = JobMaker.MakeJob(JobDefOf.sex_on_spot, pawn);
+ partner.jobs.StartJob(newJob, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true);
+ }
+ }
+ };
+ yield break;
+ }
+
+ public override bool TryMakePreToilReservations(bool errorOnFailed)
+ {
+ return this.pawn.Reserve(TargetA, this.job, xxx.max_rapists_per_prisoner, 0, null, errorOnFailed);
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/JobDrivers/JobDriver_SexOnSpot.cs b/Source/Genes/Life_Force/JobDrivers/JobDriver_SexOnSpot.cs
new file mode 100644
index 0000000..05c9d5b
--- /dev/null
+++ b/Source/Genes/Life_Force/JobDrivers/JobDriver_SexOnSpot.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RimWorld;
+using Verse;
+using Verse.AI;
+using rjw;
+using rjw.Modules.Interactions.Enums;
+using rjw.Modules.Interactions.Helpers;
+using rjw.Modules.Interactions.Objects;
+using rjw.Modules.Interactions.Contexts;
+using rjw.Modules.Interactions.Implementation;
+
+namespace RJW_Genes
+{
+ public class JobDriver_SexOnSpot : JobDriver_SexBaseInitiator
+ {
+ protected override IEnumerable MakeNewToils()
+ {
+ if (RJWSettings.DebugRape)
+ {
+ ModLog.Message(base.GetType().ToString() + "::MakeNewToils() called");
+ }
+ base.setup_ticks();
+ JobDef PartnerJob = JobDefOf.sex_on_spot_reciever;
+ this.FailOnDespawnedNullOrForbidden(this.iTarget);
+ this.FailOn(() => !this.pawn.CanReserve(this.Partner, xxx.max_rapists_per_prisoner, 0, null, false));
+ this.FailOn(() => this.pawn.IsFighting());
+ this.FailOn(() => this.Partner.IsFighting());
+ this.FailOn(() => this.pawn.Drafted);
+ yield return Toils_Goto.GotoThing(this.iTarget, PathEndMode.Touch);
+ if (this.pawn.HostileTo(this.Partner))
+ {
+ Partner.health.AddHediff(xxx.submitting);
+ }
+ yield return Toils_Goto.GotoThing(this.iTarget, PathEndMode.OnCell);
+ //Give thought malus to partner (I was seduced into having sex against my will)
+ yield return new Toil
+ {
+ defaultCompleteMode = ToilCompleteMode.Instant,
+ socialMode = RandomSocialMode.Off,
+ initAction = delegate ()
+ {
+ if (!(this.Partner.jobs.curDriver is JobDriver_SexOnSpotReciever))
+ {
+ Job newJob = JobMaker.MakeJob(PartnerJob, this.pawn);
+ Building_Bed building_Bed = null;
+ if (this.Partner.GetPosture() == PawnPosture.LayingInBed)
+ {
+ building_Bed = this.Partner.CurrentBed();
+ }
+ this.Partner.jobs.StartJob(newJob, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true);
+ if (building_Bed != null)
+ {
+ JobDriver_SexOnSpotReciever jobDriver_SexOnSpotReciever = this.Partner.jobs.curDriver as JobDriver_SexOnSpotReciever;
+ if (jobDriver_SexOnSpotReciever == null)
+ {
+ return;
+ }
+ jobDriver_SexOnSpotReciever.Set_bed(building_Bed);
+ }
+ }
+ }
+ };
+ Toil toil = new Toil();
+ toil.defaultCompleteMode = ToilCompleteMode.Never;
+ toil.defaultDuration = this.duration;
+ toil.handlingFacing = true;
+ toil.FailOn(() => this.Partner.CurJob.def != PartnerJob);
+ toil.initAction = delegate ()
+ {
+ this.Partner.pather.StopDead();
+ this.Partner.jobs.curDriver.asleep = false;
+ this.Start();
+ };
+ toil.tickAction = delegate ()
+ {
+ if (this.pawn.IsHashIntervalTick(this.ticks_between_hearts))
+ {
+ this.ThrowMetaIconF(this.pawn.Position, this.pawn.Map, FleckDefOf.Heart);
+ }
+ this.SexTick(this.pawn, this.Partner, true, true);
+ SexUtility.reduce_rest(this.Partner, 1f);
+ SexUtility.reduce_rest(this.pawn, 2f);
+ if (this.ticks_left <= 0)
+ {
+ this.ReadyForNextToil();
+ }
+ };
+ toil.AddFinishAction(delegate
+ {
+ this.End();
+ });
+ yield return toil;
+ yield return new Toil
+ {
+ initAction = delegate ()
+ {
+ SexUtility.ProcessSex(this.Sexprops);
+ },
+ defaultCompleteMode = ToilCompleteMode.Instant
+ };
+ yield break;
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/JobDrivers/JobDriver_SexOnSpotReceiver.cs b/Source/Genes/Life_Force/JobDrivers/JobDriver_SexOnSpotReceiver.cs
new file mode 100644
index 0000000..82967d6
--- /dev/null
+++ b/Source/Genes/Life_Force/JobDrivers/JobDriver_SexOnSpotReceiver.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RimWorld;
+using Verse;
+using Verse.AI;
+using rjw;
+using rjw.Modules.Interactions.Enums;
+using rjw.Modules.Interactions.Helpers;
+using rjw.Modules.Interactions.Objects;
+using rjw.Modules.Interactions.Contexts;
+using rjw.Modules.Interactions.Implementation;
+
+namespace RJW_Genes
+{
+ //Modified JobDriver_SexBaseRecieverLoved from rjw
+ public class JobDriver_SexOnSpotReciever : JobDriver_SexBaseReciever
+ {
+ protected override IEnumerable MakeNewToils()
+ {
+ base.setup_ticks();
+ this.parteners.Add(base.Partner);
+ if (this.pawn.relations.OpinionOf(base.Partner) < 0)
+ {
+ this.ticks_between_hearts += 50;
+ }
+ else if (this.pawn.relations.OpinionOf(base.Partner) > 60)
+ {
+ this.ticks_between_hearts -= 25;
+ }
+ this.FailOnDespawnedOrNull(this.iTarget);
+ this.FailOn(() => !base.Partner.health.capacities.CanBeAwake);
+ this.FailOn(() => this.pawn.Drafted);
+ this.FailOn(() => base.Partner.Drafted);
+ yield return Toils_Reserve.Reserve(this.iTarget, 1, 0, null);
+ Toil toil2 = this.MakeSexToil();
+ toil2.handlingFacing = false;
+ yield return toil2;
+ yield break;
+ }
+
+ private Toil MakeSexToil()
+ {
+ Toil toil = new Toil();
+ toil.defaultCompleteMode = ToilCompleteMode.Never;
+ toil.socialMode = RandomSocialMode.Off;
+ toil.handlingFacing = true;
+ toil.tickAction = delegate ()
+ {
+ if (this.pawn.IsHashIntervalTick(this.ticks_between_hearts))
+ {
+ base.ThrowMetaIconF(this.pawn.Position, this.pawn.Map, FleckDefOf.Heart);
+ }
+ };
+ toil.AddEndCondition(delegate
+ {
+ if (this.parteners.Count <= 0)
+ {
+ return JobCondition.Succeeded;
+ }
+ return JobCondition.Ongoing;
+ });
+ toil.AddFinishAction(delegate
+ {
+
+ GlobalTextureAtlasManager.TryMarkPawnFrameSetDirty(this.pawn);
+ Hediff submitting = this.pawn.health.hediffSet.GetFirstHediffOfDef(xxx.submitting);
+ if (submitting != null)
+ {
+ this.pawn.health.RemoveHediff(submitting);
+ this.pawn.stances.stunner.StunFor(60, this.pawn, true, true);
+ }
+ });
+ toil.socialMode = RandomSocialMode.Off;
+ return toil;
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/JobGivers/JobGiver_Flirt.cs b/Source/Genes/Life_Force/JobGivers/JobGiver_Flirt.cs
new file mode 100644
index 0000000..a629e0e
--- /dev/null
+++ b/Source/Genes/Life_Force/JobGivers/JobGiver_Flirt.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+using RimWorld;
+namespace RJW_Genes
+{
+ public class JobGiver_Flirt : ThinkNode_JobGiver
+ {
+ // Token: 0x0600405A RID: 16474 RVA: 0x0017271C File Offset: 0x0017091C
+ protected override Job TryGiveJob(Pawn pawn)
+ {
+ Pawn target = pawn.mindState.duty.focus.Pawn;
+ if (pawn.CanReach(target, PathEndMode.InteractionCell, Danger.Deadly) && !target.jobs.curDriver.asleep)
+ {
+ return JobMaker.MakeJob(JobDefOf.rjw_genes_flirt, target);
+ }
+ return null;
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/JobGivers/JobGiver_GetLifeForce.cs b/Source/Genes/Life_Force/JobGivers/JobGiver_GetLifeForce.cs
new file mode 100644
index 0000000..f6b26e4
--- /dev/null
+++ b/Source/Genes/Life_Force/JobGivers/JobGiver_GetLifeForce.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using Verse;
+using Verse.AI;
+using RimWorld;
+using rjw;
+
+namespace RJW_Genes
+{
+ public class JobGiver_GetLifeForce : ThinkNode_JobGiver
+ {
+ protected override Job TryGiveJob(Pawn pawn)
+ {
+ Pawn_GeneTracker genes = pawn.genes;
+ Gene_LifeForce gene_lifeforce = (genes != null) ? genes.GetFirstGeneOfType() : null;
+ if (gene_lifeforce == null)
+ {
+ return null;
+ }
+ if (!gene_lifeforce.ShouldConsumeLifeForceNow())
+ {
+ return null;
+ }
+
+
+ if (ModsConfig.IsActive("rjw.sexperience") && gene_lifeforce.StoredCumAllowed && genes.HasActiveGene(GeneDefOf.rjw_genes_cum_eater))
+ {
+ Thing gatheredCum = this.GetStoredCum(pawn);
+ if (gatheredCum == null)
+ {
+ return null;
+ }
+ IngestionOutcomeDoer_LifeForceOffset ingestionOutcomeDoer = (IngestionOutcomeDoer_LifeForceOffset)gatheredCum.def.ingestible.outcomeDoers.First((IngestionOutcomeDoer x) => x is IngestionOutcomeDoer_LifeForceOffset);
+ if (ingestionOutcomeDoer == null)
+ {
+ return null;
+ }
+ int num = Mathf.RoundToInt(((gene_lifeforce.targetValue - gene_lifeforce.Value) * 100 + 10) / IngestionOutcomeDoer_LifeForceOffset.DEFAULT_FERTILIN_PER_UNIT);
+ if (gatheredCum != null && num > 0)
+ {
+ Job job = JobMaker.MakeJob(RimWorld.JobDefOf.Ingest, gatheredCum);
+ job.count = Mathf.Min(gatheredCum.stackCount, num);
+ job.ingestTotalCount = true;
+ return job;
+ }
+ }
+ return null;
+ }
+
+ //From JobGiver_GetHemogen, dont know exactly what this influences
+ public override float GetPriority(Pawn pawn)
+ {
+ if (!ModsConfig.BiotechActive)
+ {
+ return 0f;
+ }
+ Pawn_GeneTracker genes = pawn.genes;
+ if (((genes != null) ? genes.GetFirstGeneOfType() : null) == null)
+ {
+ return 0f;
+ }
+ return 9.1f;
+ }
+
+ private Thing GetStoredCum(Pawn pawn)
+ {
+ Thing carriedThing = pawn.carryTracker.CarriedThing;
+ ThingDef gatheredCum = ThingDef.Named("GatheredCum");
+ if (carriedThing != null && carriedThing.def == gatheredCum)
+ {
+ return carriedThing;
+ }
+ for (int i = 0; i < pawn.inventory.innerContainer.Count; i++)
+ {
+ if (pawn.inventory.innerContainer[i].def == gatheredCum)
+ {
+ return pawn.inventory.innerContainer[i];
+ }
+ }
+ return GenClosest.ClosestThing_Global_Reachable(pawn.Position, pawn.Map, pawn.Map.listerThings.ThingsOfDef(gatheredCum), PathEndMode.OnCell, TraverseParms.For(pawn, Danger.Deadly, TraverseMode.ByPawn, false, false, false), 9999f, (Thing t) => pawn.CanReserve(t, 1, -1, null, false) && !t.IsForbidden(pawn), null);
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/JobGivers/JobGiver_LifeForce_RandomRape.cs b/Source/Genes/Life_Force/JobGivers/JobGiver_LifeForce_RandomRape.cs
new file mode 100644
index 0000000..f710c62
--- /dev/null
+++ b/Source/Genes/Life_Force/JobGivers/JobGiver_LifeForce_RandomRape.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using Verse;
+using Verse.AI;
+using RimWorld;
+using rjw;
+
+namespace RJW_Genes
+{
+ public class JobGiver_LifeForce_RandomRape : JobGiver_RandomRape
+ {
+ protected override Job TryGiveJob(Pawn pawn)
+ {
+ if (!can_rape(pawn, false))
+ {
+ return null;
+ }
+ Pawn pawn2 = this.find_victim(pawn, pawn.Map);
+ if (pawn2 == null)
+ {
+ return null;
+ }
+ return JobMaker.MakeJob(JobDefOf.rjw_genes_lifeforce_randomrape, pawn2);
+ }
+
+ //same as xxx.canrape from rjw, but without last requirements.
+ public static bool can_rape(Pawn pawn, bool forced = false)
+ {
+ return RJWSettings.rape_enabled && (xxx.is_mechanoid(pawn) || ((xxx.can_fuck(pawn) ||
+ (!xxx.is_male(pawn) && xxx.get_vulnerability(pawn) < RJWSettings.nonFutaWomenRaping_MaxVulnerability &&
+ xxx.can_be_fucked(pawn))) && (!xxx.is_human(pawn) || ((pawn.ageTracker.Growth >= 1f || pawn.ageTracker.CurLifeStage.reproductive)))));
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/JobGivers/JobGiver_TryQuickieWith.cs b/Source/Genes/Life_Force/JobGivers/JobGiver_TryQuickieWith.cs
new file mode 100644
index 0000000..6c17b75
--- /dev/null
+++ b/Source/Genes/Life_Force/JobGivers/JobGiver_TryQuickieWith.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using rjw;
+using RJWSexperience;
+using RimWorld;
+using Verse;
+using Verse.AI;
+using Verse.AI.Group;
+using UnityEngine;
+namespace RJW_Genes
+{
+ public class JobGiver_TryQuickieWith : ThinkNode_JobGiver
+ {
+ protected override Job TryGiveJob(Pawn pawn)
+ {
+ Pawn target = pawn.mindState.duty.focus.Pawn;
+ Pawn_JobTracker jobs = target.jobs;
+ string pawn_name = xxx.get_pawnname(pawn);
+ string target_name = xxx.get_pawnname(target);
+ //can reserve eachother
+ if (pawn.CanReserveAndReach(target, PathEndMode.InteractionCell, Danger.Some) && target.CanReserve(pawn, 1, 0, null, false))
+ {
+ //Dont interrupt player
+ if (!(((jobs != null) ? jobs.curJob : null) != null && jobs.curJob.playerForced))
+ {
+ float willingness = TargetWillingness(pawn, target);
+ if (Rand.Chance(willingness))
+ {
+ Job newJob =JobMaker.MakeJob(xxx.quick_sex, target);
+
+
+ return newJob;
+ }
+ else
+ {
+ if (RJWSettings.DebugLogJoinInBed) //change this when we have our own settigns
+ {
+ ModLog.Message(string.Format("{0} was not interested in having sex with {1}: ({2} chance)", pawn_name, target_name, willingness));
+ }
+ }
+ }
+ else
+ {
+ if (RJWSettings.DebugLogJoinInBed) //change this when we have our own settigns
+ {
+ //ModLog.Message(string.Format(" find_pawn_to_fuck({0}): lover has important job ({1}), skipping", pawn_name, target.jobs.curJob.def));
+ }
+ }
+ }
+ else
+ {
+ if (RJWSettings.DebugLogJoinInBed) //change this when we have our own settigns
+ {
+ ModLog.Message(" (" + pawn_name + "): cannot reach or reserve " + target_name);
+ }
+ }
+ return null;
+ }
+ public static float TargetWillingness(Pawn pawn, Pawn target)
+ {
+ string pawn_name = xxx.get_pawnname(pawn);
+ float willingness = SexAppraiser.would_fuck(target,pawn);
+ bool nymph = xxx.is_nympho(target);
+ bool loverelation = LovePartnerRelationUtility.LovePartnerRelationExists(pawn, target);
+ if (nymph || loverelation)
+ {
+ willingness *= 2;
+ }
+ if (xxx.HasNonPolyPartner(pawn, false) && !loverelation)
+ {
+ if (RJWHookupSettings.NymphosCanCheat && nymph && xxx.is_frustrated(pawn))
+ {
+ if (RJWSettings.DebugLogJoinInBed)
+ {
+ ModLog.Message(" find_partner(" + pawn_name + "): I'm a nympho and I'm so frustrated that I'm going to cheat");
+ }
+ }
+ else
+ {
+ if (!pawn.health.hediffSet.HasHediff(HediffDef.Named("AlcoholHigh"), false))
+ {
+ if (RJWSettings.DebugLogJoinInBed)
+ {
+ ModLog.Message(" find_partner(" + pawn_name + "): I interested in banging but that's cheating");
+ }
+ //Succubus has a small chance to seduce even if target is in relationship
+ willingness *= 0.1f;
+ }
+ else
+ {
+ if (RJWSettings.DebugLogJoinInBed)
+ {
+ ModLog.Message(" find_partner(" + pawn_name + "): I want to bang and im too drunk to care if its cheating");
+ }
+ //No change
+ }
+ }
+ }
+ return willingness;
+ }
+
+ public static float JoinChance(Pawn pawn ,Pawn target)
+ {
+
+ float chance = 0.1f;
+
+ //Sex satisfaction, how good the target is at sex
+ chance *= xxx.get_sex_satisfaction(target);
+
+ //Succubus mood
+ if (pawn.needs != null && pawn.needs.mood != null)
+ {
+ chance *= pawn.needs.mood.CurLevelPercentage + 0.5f;
+ }
+
+ //Size of genitals
+ bool size_matters = true; //To be placed in modsettings
+ if (size_matters)
+ {
+ //The larger the penis to greater the chance
+ if (RelationsUtility.AttractedToGender(pawn, Gender.Male))
+ {
+ chance *= GetGenitalSize(target, true) + 0.5f;
+ }
+
+ //The tighter the vagine the greater the chance, a size above 1 is considered as 1
+ if (RelationsUtility.AttractedToGender(pawn, Gender.Female))
+ {
+ chance *= 1f - Mathf.Min(GetGenitalSize(target, false),1f) + 0.5f;
+ }
+ }
+
+ //Sex ability from sexperience
+ if (ModsConfig.IsActive("rjw.sexperience"))
+ {
+ chance *= RJWSexperience.PawnExtensions.GetSexStat(pawn);
+ }
+ return Mathf.Max(chance,0f);
+ }
+
+ //Gets the size of the largest penis or the tightest vagina
+ public static float GetGenitalSize(Pawn pawn, bool penis_else_vagina)
+ {
+ List genitals = rjw.PawnExtensions.GetGenitalsList(pawn);
+ if(!genitals.NullOrEmpty())
+ {
+ if (penis_else_vagina)
+ {
+ List penises = genitals.Where(genital => Genital_Helper.is_penis(genital)).ToList();
+ {
+ if (!penises.NullOrEmpty())
+ {
+ return penises.Max(genital => genital.Severity);
+ }
+ }
+ }
+ else
+ {
+ List vaginas = genitals.Where(genital => Genital_Helper.is_vagina(genital)).ToList();
+ {
+ if (!vaginas.NullOrEmpty())
+ {
+ return vaginas.Min(genital => genital.Severity);
+ }
+ }
+ }
+ }
+ return 0f;
+
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/LordToil_Flirt.cs b/Source/Genes/Life_Force/LordToil_Flirt.cs
new file mode 100644
index 0000000..0bd1e38
--- /dev/null
+++ b/Source/Genes/Life_Force/LordToil_Flirt.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+using Verse.AI.Group;
+using RimWorld;
+namespace RJW_Genes
+{
+ //Based on LordToil_EscortPawn
+ public class LordToil_Flirt : LordToil
+ {
+ public LordToil_Flirt(Pawn victim, float followRadius)
+ {
+ this.victim = victim;
+ this.followRadius = followRadius;
+ }
+
+
+ public override void UpdateAllDuties()
+ {
+ for (int i = 0; i < this.lord.ownedPawns.Count; i++)
+ {
+ PawnDuty duty = new PawnDuty(GeneDefOf.rjw_genes_flirt, this.victim, this.followRadius);
+ this.lord.ownedPawns[i].mindState.duty = duty;
+ }
+ }
+
+ public Pawn victim;
+ public float followRadius;
+ }
+}
diff --git a/Source/Genes/Life_Force/MentalStates/LifeForceMentalBreakWorker.cs b/Source/Genes/Life_Force/MentalStates/LifeForceMentalBreakWorker.cs
new file mode 100644
index 0000000..36b47b0
--- /dev/null
+++ b/Source/Genes/Life_Force/MentalStates/LifeForceMentalBreakWorker.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using Verse;
+using RimWorld;
+using Verse.AI;
+
+namespace RJW_Genes
+{
+ public class LifeForceMentalBreakWorker : MentalBreakWorker
+ {
+ public override bool BreakCanOccur(Pawn pawn)
+ {
+ if (pawn.Spawned && base.BreakCanOccur(pawn))
+ {
+ if (!GeneUtility.HasLifeForce(pawn))
+ {
+ return false;
+ }
+ Gene_LifeForce gene = pawn.genes.GetFirstGeneOfType();
+ if( gene.Resource.Value <= 0)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/MentalStates/LifeForceMentalState.cs b/Source/Genes/Life_Force/MentalStates/LifeForceMentalState.cs
new file mode 100644
index 0000000..9c22f4e
--- /dev/null
+++ b/Source/Genes/Life_Force/MentalStates/LifeForceMentalState.cs
@@ -0,0 +1,23 @@
+using System;
+using Verse;
+using Verse.AI;
+using rjw;
+namespace RJW_Genes
+{
+ public class LifeForceMentalState : MentalState
+ {
+ public override void MentalStateTick()
+ {
+ if (this.pawn.IsHashIntervalTick(150) && !GeneUtility.HasCriticalLifeForce(this.pawn))
+ {
+ Pawn_JobTracker jobs = this.pawn.jobs;
+ if (!(((jobs != null) ? jobs.curDriver : null) is JobDriver_Sex))
+ {
+ base.RecoverFromState();
+ return;
+ }
+ }
+ base.MentalStateTick();
+ }
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/Life_Force/MentalStates/LifeForceMentalStateWorker.cs b/Source/Genes/Life_Force/MentalStates/LifeForceMentalStateWorker.cs
new file mode 100644
index 0000000..eaeaf89
--- /dev/null
+++ b/Source/Genes/Life_Force/MentalStates/LifeForceMentalStateWorker.cs
@@ -0,0 +1,14 @@
+using System;
+using Verse;
+using Verse.AI;
+using rjw;
+namespace RJW_Genes
+{
+ public class LifeForceMentalStateWorker : MentalStateWorker
+ {
+ public override bool StateCanOccur(Pawn pawn)
+ {
+ return base.StateCanOccur(pawn) && (xxx.is_human(pawn) && JobGiver_LifeForce_RandomRape.can_rape(pawn));
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs b/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs
new file mode 100644
index 0000000..4388cf0
--- /dev/null
+++ b/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs
@@ -0,0 +1,209 @@
+using HarmonyLib;
+using rjw;
+using RimWorld;
+using Verse;
+
+namespace RJW_Genes
+{
+ ///
+ /// This Patch hooks after "SatisfyPersonal"(i.E. when the pawn finished fucking) and covers LifeForceGain.
+ /// If the pawn has LifeForce, all relevant Genes are checked and applied.
+ ///
+ [HarmonyPatch(typeof(SexUtility), nameof(SexUtility.SatisfyPersonal))]
+ public static class Patch_SatisfyPersonal_LifeForceGain
+ {
+ public const float LIFEFORCE_GAINED_FROM_DRAINER_GENE = 0.25f;
+
+ public static void Postfix(SexProps props)
+ {
+ // ShortCuts: Exit Early if Pawn or Partner are null (can happen with Animals or Masturbation)
+ if (props.pawn == null || !props.hasPartner())
+ return;
+
+ // Exit if pawn has fertilin themself, it won't give any if it has lifeforce themself.
+ if (GeneUtility.HasLifeForce(props.pawn))
+ {
+ return;
+ }
+ // Exit if the pawn has ONLY an archotech penis, and no other penises. Issue #72
+ if (props.pawn.health.hediffSet.hediffs.Any(x => x.def == rjw.Genital_Helper.archotech_penis)
+ && !(Genital_Helper.has_multipenis(props.pawn)))
+ {
+ return;
+ }
+
+ //Summary//
+ //We use the positions of the pawn (dom or sub) and based on that which interactions will transfer fertilin
+ //By checking isreceiver we know if the succubus is the dom or the sub and if the situation is reverse we also swap the function we use
+ float absorb_factor = 0f;
+ if (GeneUtility.HasLifeForce(props.partner))
+ {
+ Pawn PawnWithLifeForce = props.partner;
+
+ if (!props.isRevese)
+ {
+ if (props.isReceiver)
+ {
+ // Scenario Dom Succubus, normal
+ absorb_factor = BaseDom(props, PawnWithLifeForce);
+ }
+ else
+ {
+ // Scenario Sub Succubus, normal
+ absorb_factor = BaseSub(props, PawnWithLifeForce);
+ }
+ }
+ else
+ {
+ if (props.isReceiver)
+ {
+ // Scenario Dom Succubus, Reverse
+ absorb_factor = BaseSub(props, PawnWithLifeForce);
+ }
+ else
+ {
+ // Scenario Sub Succubus, Reverse
+ absorb_factor = BaseDom(props, PawnWithLifeForce);
+ }
+ }
+
+ // If we remove this check fertilin is always lost, but the succubus doesn't always gain any
+ if (absorb_factor != 0f)
+ {
+ TransferFertilin(props, absorb_factor);
+ }
+
+ // Handle Gene: Sexual_Drainer
+ // to be drained, a pawn must not-be-drained-already and drainers cannot be drained either.
+ if (GeneUtility.IsSexualDrainer(PawnWithLifeForce)
+ && !props.pawn.health.hediffSet.HasHediff(HediffDefOf.rjw_genes_succubus_drained)
+ && !GeneUtility.IsSexualDrainer(props.pawn))
+ {
+ if (GeneUtility.IsGenerousDonor(props.pawn) && RJW_Genes_Settings.rjw_genes_generous_donor_cheatmode)
+ {
+ // Cheatmode is on, do not drain but give life
+ GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(PawnWithLifeForce), LIFEFORCE_GAINED_FROM_DRAINER_GENE);
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ ModLog.Message($"{props.pawn.Name} was not (sexually) drained by {PawnWithLifeForce.Name}, because Cheatmode for Generous Donors is on");
+ } else
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ ModLog.Message($"{props.pawn.Name} has been (sexually) drained by {PawnWithLifeForce.Name}");
+ props.pawn.health.AddHediff(HediffDefOf.rjw_genes_succubus_drained);
+ GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(PawnWithLifeForce), LIFEFORCE_GAINED_FROM_DRAINER_GENE);
+ }
+ }
+ }
+ }
+
+ public static void TransferFertilin(SexProps props, float absorb_percentage = 1f)
+ {
+ Pawn_GeneTracker genes = props.partner.genes;
+ Gene_LifeForce gene = genes.GetFirstGeneOfType();
+
+ Hediff fertilin_lost = props.pawn.health.hediffSet.GetFirstHediffOfDef(HediffDefOf.rjw_genes_fertilin_lost);
+ //Around quarter get ejected everytime pawn cums
+ float multiplier = Rand.Range(0.10f, 0.40f);
+
+ if (GeneUtility.IsGenerousDonor(props.pawn) && RJW_Genes_Settings.rjw_genes_generous_donor_cheatmode)
+ {
+ // Do nothing, Cheatmode is on
+ multiplier = 1;
+ }
+ else
+ {
+ //Create a new ferilin_lost hediff or increase it
+ if (fertilin_lost == null)
+ {
+ Hediff new_fertilin_lost = HediffMaker.MakeHediff(HediffDefOf.rjw_genes_fertilin_lost, props.pawn);
+ props.pawn.health.AddHediff(new_fertilin_lost);
+ new_fertilin_lost.Severity = multiplier;
+ } else
+ {
+ multiplier *= 1 - fertilin_lost.Severity;
+ fertilin_lost.Severity += multiplier;
+ }
+ }
+
+ multiplier *= absorb_percentage;
+ //Currently taking the sum of all penises, maybe I should just consider one at random
+ float valuechange = TotalFertilinAmount(props, multiplier);
+
+ if (props.partner.IsAnimal())
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ ModLog.Message($"Fertilin-Source of {props.pawn.Name} was an Animal, Fertilin-Gain is being adjusted by {RJW_Genes_Settings.rjw_genes_fertilin_from_animals_factor}%");
+ valuechange *= RJW_Genes_Settings.rjw_genes_fertilin_from_animals_factor;
+ }
+
+ GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(props.partner), valuechange);
+ }
+
+ public static float TotalFertilinAmount(SexProps props, float multiplier)
+ {
+ float total_fluid = CumUtility.GetTotalFluidAmount(props.pawn) / 100;
+
+ //More in the tank means more to give
+ if (props.pawn.Has(Quirk.Messy))
+ {
+ total_fluid *= 2;
+ }
+ if (props.pawn.RaceProps.Animal)
+ {
+ total_fluid *= 0.1f; //Should make this settable in settings
+ }
+
+ return total_fluid;
+ }
+
+ ///
+ /// Handles the Case that the Life-Force wielder initiated the Sex (They are "Dom").
+ ///
+ /// The summary of the sex act, used for checking conditions.
+ /// The pawn that might gain LifeForce through this method.
+ /// A factor between 0 and 1 how much of output-fertilin will be used for input-lifeforce
+ public static float BaseDom(SexProps props, Pawn PawnWithLifeForce)
+ {
+ float absorb_factor = 0f;
+ if (props.sexType == xxx.rjwSextype.Sixtynine && GeneUtility.IsCumEater(PawnWithLifeForce))
+ {
+ absorb_factor += 1f;
+ }
+ return absorb_factor;
+ }
+
+ ///
+ /// Handles the Case that the Life-Force wielder got initiated into sex (They are "Sub").
+ ///
+ /// The summary of the sex act, used for checking conditions.
+ /// The pawn that might gain LifeForce through this method.
+ /// A factor between 0 and 1 how much of output-fertilin will be used for input-lifeforce
+ public static float BaseSub(SexProps props, Pawn PawnWithLifeForce)
+ {
+ float absorb_factor = 0f;
+ if ((props.sexType == xxx.rjwSextype.Oral || props.sexType == xxx.rjwSextype.Fellatio || props.sexType == xxx.rjwSextype.Sixtynine)
+ && GeneUtility.IsCumEater(PawnWithLifeForce))
+ {
+ absorb_factor += 1f;
+ }
+ else if (props.sexType == xxx.rjwSextype.Vaginal && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_fertilin_absorber))
+ {
+ absorb_factor += 1f;
+ }
+ else if (props.sexType == xxx.rjwSextype.Anal && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_fertilin_absorber))
+ {
+ absorb_factor += 1f;
+ }
+ else if (props.sexType == xxx.rjwSextype.DoublePenetration && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_fertilin_absorber))
+ {
+ absorb_factor += 1f;
+ }
+ else if (props.sexType == xxx.rjwSextype.Scissoring || props.sexType == xxx.rjwSextype.Cunnilingus)
+ {
+ //with vaginal cum absorbtion
+ //absorb_factor += 1f;
+ }
+ return absorb_factor;
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/Patches/Patch_SexTicks_ChangePsyfocus.cs b/Source/Genes/Life_Force/Patches/Patch_SexTicks_ChangePsyfocus.cs
new file mode 100644
index 0000000..dfc359b
--- /dev/null
+++ b/Source/Genes/Life_Force/Patches/Patch_SexTicks_ChangePsyfocus.cs
@@ -0,0 +1,62 @@
+using HarmonyLib;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RimWorld;
+using Verse;
+
+namespace RJW_Genes
+{
+
+ ///
+ /// This patch enables cum-eater pawns to drain cumflations for more fertilin drain by passively having sex.
+ /// It is hooked after RJWs Change-Psyfocus so that pawns that are having prolonged sex (e.g. by overdrive) can fully drain the cumflation over time.
+ ///
+ /// It is conditionally loaded only when LicentiaLabs is enabled, as this is the necessary source for cumflation-hediffs.
+ /// The patched function is: [HarmonyPatch(typeof(JobDriver_Sex), nameof(JobDriver_Sex.ChangePsyfocus))]
+ ///
+ public static class Patch_SexTicks_ChangePsyfocus
+ {
+ public const float LIFEFORCE_GAIN_PER_TICK = 0.05f;
+ public const float CUMFLATION_SEVERITY_LOSS_PER_TICK = 0.1f;
+
+ //Using ChangePsyfocus as it is something that fires every 60 ticks
+ public static void Postfix(ref JobDriver_Sex __instance, ref Pawn pawn, ref Thing target)
+ {
+ SexProps props = __instance.Sexprops;
+ if (props != null && props.sexType == xxx.rjwSextype.Cunnilingus && props.partner != null && target != null)
+ {
+ Pawn pawn2 = target as Pawn;
+ // Case 1: Pawn is "drinking" and has CumEater Gene
+ if (props.isRevese && GeneUtility.IsCumEater(pawn))
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ ModLog.Message($"{pawn.Name} is draining {pawn2.Name}'s cumflation for additional fertilin (CumEater-Gene ChangePsyFocus-Trigger).");
+ DrinkCumflation(pawn2, pawn);
+ }
+ // Case 2: Pawn2 is "drinking" and has CumEater Gene
+ else if (GeneUtility.IsCumEater(pawn2))
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ ModLog.Message($"{pawn.Name} is draining {pawn2.Name}'s cumflation for additional fertilin (CumEater-Gene ChangePsyFocus-Trigger).");
+ DrinkCumflation(pawn, pawn2);
+ }
+ }
+ }
+
+ public static void DrinkCumflation(Pawn source, Pawn consumer)
+ {
+ if (GeneUtility.HasLifeForce(consumer) && GeneUtility.IsCumEater(consumer)
+ && source.health.hediffSet.HasHediff(HediffDef.Named("Cumflation")))
+ {
+ Hediff cumflation = source.health.hediffSet.GetFirstHediffOfDef(HediffDef.Named("Cumflation"));
+ Gene_LifeForce gene_LifeForce = consumer.genes.GetFirstGeneOfType();
+ cumflation.Severity = Math.Max(0f,cumflation.Severity - CUMFLATION_SEVERITY_LOSS_PER_TICK);
+ gene_LifeForce.Resource.Value += LIFEFORCE_GAIN_PER_TICK;
+ }
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/Patches/Patch_Vanilla_Inheritance_Fertilin.cs b/Source/Genes/Life_Force/Patches/Patch_Vanilla_Inheritance_Fertilin.cs
new file mode 100644
index 0000000..3d1f684
--- /dev/null
+++ b/Source/Genes/Life_Force/Patches/Patch_Vanilla_Inheritance_Fertilin.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HarmonyLib;
+using RimWorld;
+using Verse;
+
+namespace RJW_Genes
+{
+ ///
+ /// This Patch is applied to add a absorption gene for fertilin if it has none, but it does have the fertilin gene
+ /// First tries to get one from the parents else chooses one of them at random
+ /// the genes are determined and "simply added".
+ ///
+ /// This fixes the potential problem that Pawns could inherit Fertilin, but no gene to gain Fertilin.
+ ///
+ [HarmonyPatch(typeof(PregnancyUtility), "GetInheritedGeneSet", new Type[]
+ {
+ typeof(Pawn),
+ typeof(Pawn)
+ }
+ )]
+ public static class Patch_Vanilla_Inheritance_Fertilin
+ {
+ [HarmonyPostfix]
+ public static void InheritedGenes(Pawn father, Pawn mother, ref GeneSet __result)
+ {
+ //Also make a setting for this
+ if (__result.GenesListForReading.Contains(GeneDefOf.rjw_genes_lifeforce))
+ {
+ List babies_genes = __result.GenesListForReading;
+
+ //If there is no absorption gene get one from the parents, else a random one
+ if(!Has_Fertilin_Source_Gene(babies_genes))
+ {
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ ModLog.Message($"Child of ({father.Name};{mother.Name}) has Genes with LifeForce-Resource but no Source-Gene, adding one of parents random if possible or any random otherwise.");
+ // Gather Parents Source-Genes
+ List absorption_genes_parents = new List();
+ foreach (GeneDef geneDef in FertilinSourceGenes)
+ {
+ if(mother.genes != null && mother.genes.HasActiveGene(geneDef))
+ absorption_genes_parents.Add(geneDef);
+
+ if (father.genes != null && father.genes.HasActiveGene(geneDef))
+ absorption_genes_parents.Add(geneDef);
+ }
+ // Parents had Genes - Pick a random one of them
+ if (!absorption_genes_parents.NullOrEmpty())
+ __result.AddGene(absorption_genes_parents.RandomElement());
+ // Create a fully random one for your little Cumfueled missbreed
+ else
+ __result.AddGene(FertilinSourceGenes.RandomElement());
+ }
+ }
+ }
+
+ private static List FertilinSourceGenes = new List() {
+ GeneDefOf.rjw_genes_drainer,
+ GeneDefOf.rjw_genes_cum_eater,
+ GeneDefOf.rjw_genes_fertilin_absorber,
+ GeneDefOf.rjw_genes_cockeater
+ };
+
+ private static bool Has_Fertilin_Source_Gene(List genes)
+ {
+ foreach (GeneDef gene in genes)
+ {
+ if (FertilinSourceGenes.Contains(gene))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ }
+}
diff --git a/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalCannotInteract.cs b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalCannotInteract.cs
new file mode 100644
index 0000000..06e05b4
--- /dev/null
+++ b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalCannotInteract.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+namespace RJW_Genes
+{
+ public class ThinkNode_ConditionalCannotInteract : ThinkNode_Conditional
+ {
+ protected override bool Satisfied(Pawn pawn)
+ {
+ Pawn target = pawn.mindState.duty.focus.Pawn;
+ if (target == null)
+ {
+ return true;
+ }
+ return (target.jobs != null && target.jobs.curDriver.asleep) || !pawn.CanReach(target, PathEndMode.InteractionCell, Danger.Deadly);
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalCritcalLifeForce.cs b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalCritcalLifeForce.cs
new file mode 100644
index 0000000..dbb3f6b
--- /dev/null
+++ b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalCritcalLifeForce.cs
@@ -0,0 +1,14 @@
+using System;
+using Verse;
+using Verse.AI;
+
+namespace RJW_Genes
+{
+ public class ThinkNode_ConditionalCritcalLifeForce : ThinkNode_Conditional
+ {
+ protected override bool Satisfied(Pawn p)
+ {
+ return GeneUtility.HasCriticalLifeForce(p);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalLowLifeForce.cs b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalLowLifeForce.cs
new file mode 100644
index 0000000..0e71ce7
--- /dev/null
+++ b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalLowLifeForce.cs
@@ -0,0 +1,14 @@
+using System;
+using Verse;
+using Verse.AI;
+
+namespace RJW_Genes
+{
+ public class ThinkNode_ConditionalLowLifeForce : ThinkNode_Conditional
+ {
+ protected override bool Satisfied(Pawn p)
+ {
+ return GeneUtility.HasLowLifeForce(p);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Source/Genes/Life_Force/ThinkNodes/ThinkNode_NewFlirtTarget.cs b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_NewFlirtTarget.cs
new file mode 100644
index 0000000..9dee5ad
--- /dev/null
+++ b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_NewFlirtTarget.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+using rjw;
+namespace RJW_Genes
+{
+ public class ThinkNode_NewFlirtTarget : ThinkNode
+ {
+ public override ThinkResult TryIssueJobPackage(Pawn pawn, JobIssueParams jobParams)
+ {
+ List validTargets = ValidTargets(pawn, pawn.Map).ToList();
+ Pawn new_target = validTargets.NullOrEmpty() ? null : validTargets.RandomElement();
+ if (new_target != null)
+ {
+ pawn.mindState.duty.focus = new_target;
+ }
+ return ThinkResult.NoJob;
+ }
+
+ private IEnumerable ValidTargets(Pawn pawn, Map map)
+ {
+ foreach (Pawn pawn2 in map.mapPawns.FreeAdultColonistsSpawned)
+ {
+ if (pawn != null && pawn2 != null && pawn != pawn2 && !pawn2.jobs.curDriver.asleep && SexAppraiser.would_fuck(pawn, pawn2) > 0.1f)
+ {
+ yield return pawn2;
+ }
+ }
+ //IEnumerator enumerator = null;
+ yield break;
+ }
+ }
+}
diff --git a/Source/Genes/Life_Force/UI/Alert_LowFertilin.cs b/Source/Genes/Life_Force/UI/Alert_LowFertilin.cs
new file mode 100644
index 0000000..09601de
--- /dev/null
+++ b/Source/Genes/Life_Force/UI/Alert_LowFertilin.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RimWorld.Planet;
+using Verse;
+using RimWorld;
+namespace RJW_Genes
+{
+ public class Alert_CriticalFertilin : Alert
+ {
+ private List Targets
+ {
+ get
+ {
+ this.CalculateTargets();
+ return this.targets;
+ }
+ }
+
+ public override string GetLabel()
+ {
+ if (this.Targets.Count == 1)
+ {
+ return "AlertLowFertilin".Translate() + ": " + this.targetLabels[0];
+ }
+ return "AlertLowFertilin".Translate();
+ }
+
+ private void CalculateTargets()
+ {
+ this.targets.Clear();
+ this.targetLabels.Clear();
+ if (!ModsConfig.BiotechActive)
+ {
+ return;
+ }
+ foreach (Pawn pawn in PawnsFinder.AllMapsCaravansAndTravelingTransportPods_Alive)
+ {
+ if (pawn.RaceProps.Humanlike && pawn.Faction == Faction.OfPlayer)
+ {
+ Pawn_GeneTracker genes = pawn.genes;
+ Gene_LifeForce gene_Lifeforce = (genes != null) ? genes.GetFirstGeneOfType() : null;
+ if (gene_Lifeforce != null && gene_Lifeforce.Active && gene_Lifeforce.Value < gene_Lifeforce.MinLevelForAlert)
+ {
+ this.targets.Add(pawn);
+ this.targetLabels.Add(pawn.NameShortColored.Resolve());
+ }
+ }
+ }
+ }
+
+ public override TaggedString GetExplanation()
+ {
+ return "AlertLowFertilinDesc".Translate() + ":\n" + this.targetLabels.ToLineList(" - ");
+ }
+
+ public override AlertReport GetReport()
+ {
+ return AlertReport.CulpritsAre(this.Targets);
+ }
+
+ private List targets = new List();
+
+ private List targetLabels = new List();
+ }
+}
diff --git a/Source/Genes/Life_Force/UI/GeneGizmo_ResourceLifeForce.cs b/Source/Genes/Life_Force/UI/GeneGizmo_ResourceLifeForce.cs
new file mode 100644
index 0000000..edd2e5f
--- /dev/null
+++ b/Source/Genes/Life_Force/UI/GeneGizmo_ResourceLifeForce.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using RimWorld;
+using UnityEngine;
+namespace RJW_Genes
+{
+ //Copied from GeneGizmo_ResourceHemogen, with small modifications
+ public class GeneGizmo_ResourceLifeForce : GeneGizmo_Resource
+ {
+ public GeneGizmo_ResourceLifeForce(Gene_Resource gene, List drainGenes, Color barColor, Color barhighlightColor) : base(gene, drainGenes, barColor, barhighlightColor)
+ {
+
+ }
+
+ public override GizmoResult GizmoOnGUI(Vector2 topLeft, float maxWidth, GizmoRenderParms parms)
+ {
+ return base.GizmoOnGUI(topLeft, maxWidth, parms);
+ }
+
+ protected override string GetTooltip()
+ {
+
+ this.tmpDrainGenes.Clear();
+ string text = string.Format("{0}: {1} / {2}\n", this.gene.ResourceLabel.CapitalizeFirst().Colorize(ColoredText.TipSectionTitleColor), this.gene.ValueForDisplay, this.gene.MaxForDisplay);
+ if (this.gene.pawn.IsColonistPlayerControlled || this.gene.pawn.IsPrisonerOfColony)
+ {
+ if (this.gene.targetValue <= 0f)
+ {
+ text += "NeverSeekFertilin";
+ }
+ else
+ {
+ text = text + ("SeekFertilinBelow" + ": ") + this.gene.PostProcessValue(this.gene.targetValue);
+ }
+ }
+ if (!this.drainGenes.NullOrEmpty())
+ {
+ float num = 0f;
+ foreach (IGeneResourceDrain geneResourceDrain in this.drainGenes)
+ {
+ if (geneResourceDrain.CanOffset)
+ {
+ this.tmpDrainGenes.Add(new Pair(geneResourceDrain, geneResourceDrain.ResourceLossPerDay));
+ num += geneResourceDrain.ResourceLossPerDay;
+ }
+ }
+ if (num != 0f)
+ {
+ string text2 = (num < 0f) ? "RegenerationRate".Translate() : "DrainRate".Translate();
+ text = string.Concat(new string[]
+ {
+ text,
+ "\n\n",
+ text2,
+ ": ",
+ "PerDay".Translate(Mathf.Abs(this.gene.PostProcessValue(num))).Resolve()
+ });
+ foreach (Pair pair in this.tmpDrainGenes)
+ {
+ text = string.Concat(new string[]
+ {
+ text,
+ "\n - ",
+ pair.First.DisplayLabel.CapitalizeFirst(),
+ ": ",
+ "PerDay".Translate(this.gene.PostProcessValue(-pair.Second).ToStringWithSign()).Resolve()
+ });
+ }
+ }
+ }
+ if (!this.gene.def.resourceDescription.NullOrEmpty())
+ {
+ text = text + "\n\n" + this.gene.def.resourceDescription.Formatted(this.gene.pawn.Named("PAWN")).Resolve();
+ }
+ return text;
+ }
+ private List