diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0e2154e..ad8ad27 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,18 +9,10 @@ As your help is highly appreciated, there are only three *hard constraints*: But please consider also the following: -* Please try to make an issue with your idea first or ping me (Vegapnk) +* Please try to make an issue with your idea first or ping me (Vegapunk) * Keep commit messages on the topic and meaningful * Give me some time to review things. I can either mod, play or have a life. ## Contributors -- Shabalox (MechBreeding, InsectBreeding, Animal Gene Inheritance) - -## Other Credits - -**Image Credits** - -- 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 +- Shabalox (MechBreeding, InsectBreeding) \ No newline at end of file diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll index bd8049f..5e1c60b 100644 Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ diff --git a/Common/Defs/Genes/GeneDefs_Breeding.xml b/Common/Defs/Genes/GeneDefs_Breeding.xml index fa65c52..793492f 100644 --- a/Common/Defs/Genes/GeneDefs_Breeding.xml +++ b/Common/Defs/Genes/GeneDefs_Breeding.xml @@ -15,7 +15,7 @@ rjw_genes_insectincubator Pawns with this gene are able to hold more insect eggs. - Genes/Icons/More_Egg_Space + World/WorldObjects/Expanding/Mechanoids 52 rjw_genes_breeding @@ -24,7 +24,7 @@ rjw_genes_insectbreeder Pawns with this gene are able to fertilize eggs with any fertile penis. - World/WorldObjects/Expanding/Insects + World/WorldObjects/Expanding/Mechanoids 53 rjw_genes_breeding @@ -34,7 +34,7 @@ rjw_genes_breeding Xenotypes with this Gene are Zoophile. - Genes/Icons/Zoophile_2 + Genes/Icons/Placeholder 54
  • diff --git a/Common/Defs/Genes/GeneDefs_Cum.xml b/Common/Defs/Genes/GeneDefs_Cum.xml index d410319..89334fe 100644 --- a/Common/Defs/Genes/GeneDefs_Cum.xml +++ b/Common/Defs/Genes/GeneDefs_Cum.xml @@ -12,7 +12,7 @@ rjw_genes_no_cum Males of these species have no fluid. - Genes/Icons/No_Cum + Genes/Icons/Placeholder RJW_Genes.Gene_NoCum 533 0 @@ -23,7 +23,7 @@ rjw_genes_much_cum Males of this species produce a lot of fluid. - Genes/Icons/Bonus_Cum + Genes/Icons/Placeholder RJW_Genes.Gene_MuchCum 534 1 @@ -34,7 +34,7 @@ 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 + Genes/Icons/Placeholder RJW_Genes.Gene_VeryMuchCum 535 1 @@ -46,7 +46,7 @@ rjw_genes_cum This Xenotype loves being cumflated. - Genes/Icons/Cumflation + Genes/Icons/Placeholder 536
  • @@ -63,7 +63,7 @@ rjw_genes_cum This Xenotype cannot get cumflated. - Genes/Icons/Cumflation_Immunity + Genes/Icons/Placeholder 537
  • NotCumflatable
    • @@ -76,7 +76,7 @@ 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 + Genes/Icons/Placeholder 538 diff --git a/Common/Defs/Genes/GeneDefs_Damage.xml b/Common/Defs/Genes/GeneDefs_Damage.xml index 5922066..c44e937 100644 --- a/Common/Defs/Genes/GeneDefs_Damage.xml +++ b/Common/Defs/Genes/GeneDefs_Damage.xml @@ -6,7 +6,7 @@ rjw_damage This Xenotype cannot get stretched by huge penetrators. - Genes/Icons/Elasticity + Genes/Icons/Placeholder RJW_Genes.Gene_Elasticity 1 diff --git a/Common/Defs/Genes/GeneDefs_ExtraGenitalia.xml b/Common/Defs/Genes/GeneDefs_ExtraGenitalia.xml index c2acd4c..3459de5 100644 --- a/Common/Defs/Genes/GeneDefs_ExtraGenitalia.xml +++ b/Common/Defs/Genes/GeneDefs_ExtraGenitalia.xml @@ -9,7 +9,7 @@ rjw_genes_extra_penis Males of this species grow an additional penis . - Genes/Icons/extra_male + Genes/Icons/Placeholder RJW_Genes.Gene_ExtraPenis 701 @@ -21,7 +21,7 @@ rjw_genes_no_penis Males of this do not have a penis. - Genes/Icons/No_Male_Genitalia + Genes/Icons/Placeholder RJW_Genes.Gene_NoPenis 702 @@ -34,7 +34,7 @@ rjw_genes_extra_vagina Females of this species grow an additional vagina . - Genes/Icons/extra_female + Genes/Icons/Placeholder RJW_Genes.Gene_ExtraVagina 703 @@ -46,7 +46,7 @@ rjw_genes_no_vagina Females of this do not have a vagina. - Genes/Icons/No_Female_Genitalia + Genes/Icons/Placeholder RJW_Genes.Gene_NoVagina 704 @@ -59,7 +59,7 @@ rjw_genes_extra_breasts Females of this species grow an additional pair of breasts . - Genes/Icons/Extra_Breasts + Genes/Icons/Placeholder RJW_Genes.Gene_ExtraBreasts 705 @@ -71,7 +71,7 @@ rjw_genes_no_breasts Females of this do not have a pair of breasts. - Genes/Icons/No_Breasts + Genes/Icons/Placeholder RJW_Genes.Gene_NoBreasts 706 @@ -83,7 +83,7 @@ rjw_genes_extra_anus This specias has an extra anus. - Genes/Icons/Extra_Anus + Genes/Icons/Placeholder RJW_Genes.Gene_ExtraAnus 707 @@ -95,7 +95,7 @@ rjw_genes_no_anus This specias has no anus. - Genes/Icons/No_Anus + Genes/Icons/Placeholder RJW_Genes.Gene_NoAnus 708 @@ -107,7 +107,7 @@ rjw_genes_futa Males of this xenotype grow additional female genitalia, Females grow additional male genitalia. - Genes/Icons/Futa + Genes/Icons/Placeholder RJW_Genes.Gene_Futa 709 diff --git a/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml b/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml index 89bc7f9..72d2c53 100644 --- a/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml +++ b/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml @@ -10,7 +10,7 @@ rjw_genes_big_male_genitalia Penises of this Xenotype are bigger. - Genes/Icons/Small_Male_Genitalia + Genes/Icons/Placeholder RJW_Genes.Gene_BigMaleGenitalia 751 @@ -18,11 +18,23 @@ + + rjw_genes_normal_male_genitalia + + Penises of this Xenotype can be any size. + Genes/Icons/Placeholder + RJW_Genes.Gene_NormalMaleGenitalia + 752 + +
  • PenisSize
    • +     +     + rjw_genes_small_male_genitalia Penises of this Xenotype are smaller. - Genes/Icons/Big_Male_Genitalia + Genes/Icons/Placeholder RJW_Genes.Gene_SmallMaleGenitalia 753 @@ -35,7 +47,7 @@ rjw_genes_loose_female_genitalia Vaginas of this Xenotype are quite spacy. - Genes/Icons/Loose_Female_Genitalia + Genes/Icons/Placeholder RJW_Genes.Gene_LooseFemaleGenitalia 754 @@ -43,11 +55,23 @@ + + rjw_genes_normal_female_genitalia + + Vaginas of this Xenotype can be any size. + Genes/Icons/Placeholder + RJW_Genes.Gene_NormalFemaleGenitalia + 755 + +
  • VaginaSize
    • +     +     + rjw_genes_tight_female_genitalia Vaginas of this Xenotype are pretty tight. - Genes/Icons/Tight_Female_Genitalia + Genes/Icons/Placeholder RJW_Genes.Gene_TightFemaleGenitalia 756 @@ -60,7 +84,7 @@ rjw_genes_big_breasts Females of this Xenotype have big honkers. - Genes/Icons/Big_Breasts + Genes/Icons/Placeholder RJW_Genes.Gene_BigBreasts 757 @@ -68,11 +92,23 @@ + + rjw_genes_normal_breasts + + Females of this Xenotype have breasts of any size. + Genes/Icons/Placeholder + RJW_Genes.Gene_NormalBreasts + 758 + +
  • BreastSize
    • +     +     + rjw_genes_small_breasts Females of this Xenotype have smaller breasts. - Genes/Icons/Small_Breasts + Genes/Icons/Placeholder RJW_Genes.Gene_SmallBreasts 759 @@ -85,7 +121,7 @@ rjw_genes_loose_anus The Anus of this Xenotype is roomy. - Genes/Icons/Loose_Anus + Genes/Icons/Placeholder RJW_Genes.Gene_LooseAnus 760 @@ -93,11 +129,23 @@ + + rjw_genes_normal_anus + + Anus of this Xenotype can be any size. + Genes/Icons/Placeholder + RJW_Genes.Gene_NormalAnus + 761 + +
  • AnusSize
    • +     +     + rjw_genes_tight_anus The anus of this Xenotype is small. - Genes/Icons/Tight_Anus + Genes/Icons/Placeholder RJW_Genes.Gene_TightAnus 762 diff --git a/Common/Defs/Genes/GeneDefs_GenitaliaTypes.xml b/Common/Defs/Genes/GeneDefs_GenitaliaTypes.xml index f7ab982..b646058 100644 --- a/Common/Defs/Genes/GeneDefs_GenitaliaTypes.xml +++ b/Common/Defs/Genes/GeneDefs_GenitaliaTypes.xml @@ -7,13 +7,25 @@
  • GenitalType
    •  0 + +     + + + rjw_genes_human_genitalia + + Carriers of this carry genitalia similar to humans. + Genes/Icons/Placeholder + RJW_Genes.Gene_HumanGenitalia + 801 rjw_genes_equine_genitalia Carriers of this gene develop equine genitalia. - Genes/Icons/Genitalia_Equine + Genes/Icons/Placeholder RJW_Genes.Gene_EquineGenitalia 802 @@ -22,7 +34,7 @@ rjw_genes_canine_genitalia Carriers of this gene develop canine genitalia. - Genes/Icons/Genitalia_Canine_2 + Genes/Icons/Placeholder RJW_Genes.Gene_CanineGenitalia 803 @@ -31,7 +43,7 @@ rjw_genes_feline_genitalia Carriers of this gene develop feline genitalia. - Genes/Icons/Genitalia_Feline + Genes/Icons/Placeholder RJW_Genes.Gene_FelineGenitalia 804 @@ -40,7 +52,7 @@ rjw_genes_demonic_genitalia Carriers of this gene have demonic genitalia. - Genes/Icons/Genitalia_Demon + Genes/Icons/Placeholder RJW_Genes.Gene_DemonicGenitalia 805 @@ -49,7 +61,7 @@ rjw_genes_dragon_genitalia Carriers of this gene develop dragon genitalia. - Genes/Icons/Genitalia_Draconic + Genes/Icons/Placeholder RJW_Genes.Gene_DragonGenitalia 806 @@ -58,7 +70,7 @@ rjw_genes_slime_genitalia Carriers of this gene have slime genitalia. - Genes/Icons/Genitalia_Slime + Genes/Icons/Placeholder RJW_Genes.Gene_SlimeGenitalia 807 @@ -67,7 +79,7 @@ rjw_genes_ovipositor_genitalia Carriers of this gene have ovipositors similar to insects. - Genes/Icons/Genitalia_Insect + Genes/Icons/Placeholder RJW_Genes.Gene_OvipositorGenitalia 808 diff --git a/Common/Defs/Genes/GeneDefs_Reproduction.xml b/Common/Defs/Genes/GeneDefs_Reproduction.xml index ef348fd..3599418 100644 --- a/Common/Defs/Genes/GeneDefs_Reproduction.xml +++ b/Common/Defs/Genes/GeneDefs_Reproduction.xml @@ -6,7 +6,7 @@ Reproduction Xenotypes with this Gene are Hypersexual (Nymphs). - Genes/Icons/Hypersexual + Genes/Icons/Placeholder 1
  • @@ -20,7 +20,7 @@ Reproduction Xenotypes with this Gene are Rapists. - Genes/Icons/Rape + Genes/Icons/Placeholder 2
  • diff --git a/Common/Defs/Genes/GeneDefs_SpecifiedGender.xml b/Common/Defs/Genes/GeneDefs_SpecifiedGender.xml index e168411..521e878 100644 --- a/Common/Defs/Genes/GeneDefs_SpecifiedGender.xml +++ b/Common/Defs/Genes/GeneDefs_SpecifiedGender.xml @@ -6,7 +6,7 @@ rjw_genes_gender This Xenotype only has females. 0 - Genes/Icons/Female_Only + Genes/Icons/Placeholder RJW_Genes.Gene_FemaleOnly 1 @@ -17,7 +17,7 @@ This Xenotype only has males. 0 - Genes/Icons/Male_Only + Genes/Icons/Placeholder RJW_Genes.Gene_MaleOnly 2 diff --git a/Common/Patches/Xenotypes/GenitaliaUpdate.xml b/Common/Patches/Xenotypes/GenitaliaUpdate.xml index f0af1b5..cda55ba 100644 --- a/Common/Patches/Xenotypes/GenitaliaUpdate.xml +++ b/Common/Patches/Xenotypes/GenitaliaUpdate.xml @@ -16,6 +16,7 @@ + --> Defs/XenotypeDef[defName="Dirtmole"]/genes @@ -38,10 +39,12 @@ - --> Defs/XenotypeDef[defName="Neanderthal"]/genes +
  • rjw_genes_human_genitalia
    • +
  • rjw_genes_normal_anus
    • +
  • rjw_genes_normal_breasts
  • rjw_genes_big_male_genitalia
  • rjw_genes_loose_female_genitalia
    • @@ -50,21 +53,31 @@ Defs/XenotypeDef[defName="Pigskin"]/genes -
  • rjw_genes_much_cum
    • -
  • rjw_genes_zoophile
    • +
  • rjw_genes_human_genitalia
    • +
  • rjw_genes_normal_anus
    • +
  • rjw_genes_normal_breasts
    • +
  • rjw_genes_normal_male_genitalia
    • +
  • rjw_genes_normal_female_genitalia
    •      Defs/XenotypeDef[defName="Waster"]/genes -
  • rjw_genes_insectbreeder
    • +
  • rjw_genes_human_genitalia
    • +
  • rjw_genes_normal_anus
    • +
  • rjw_genes_normal_breasts
    • +
  • rjw_genes_normal_male_genitalia
    • +
  • rjw_genes_normal_female_genitalia
    •      Defs/XenotypeDef[defName="Yttakin"]/genes +
  • rjw_genes_human_genitalia
    • +
  • rjw_genes_normal_anus
    • +
  • rjw_genes_normal_breasts
  • rjw_genes_big_male_genitalia
  • rjw_genes_loose_female_genitalia
    •  @@ -73,15 +86,22 @@ Defs/XenotypeDef[defName="Highmate"]/genes -
  • rjw_genes_hypersexual
    • -
  • rjw_genes_likes_cumflation
    • +
  • rjw_genes_human_genitalia
    • +
  • rjw_genes_normal_anus
    • +
  • rjw_genes_normal_breasts
    • +
  • rjw_genes_normal_male_genitalia
    • +
  • rjw_genes_normal_female_genitalia
    •      Defs/XenotypeDef[defName="Genie"]/genes -
  • rjw_genes_mechbreeder
    • +
  • rjw_genes_human_genitalia
    • +
  • rjw_genes_normal_anus
    • +
  • rjw_genes_normal_breasts
    • +
  • rjw_genes_normal_male_genitalia
    • +
  • rjw_genes_normal_female_genitalia
    •      @@ -89,6 +109,10 @@ Defs/XenotypeDef[defName="Sanguophage"]/genes
  • rjw_genes_demonic_genitalia
    • +
  • rjw_genes_normal_anus
    • +
  • rjw_genes_normal_breasts
    • +
  • rjw_genes_normal_male_genitalia
    • +
  • rjw_genes_normal_female_genitalia
    •      @@ -96,10 +120,10 @@ Defs/XenotypeDef[defName="Impid"]/genes
  • rjw_genes_demonic_genitalia
    • +
  • rjw_genes_normal_anus
  • rjw_genes_small_breasts
  • rjw_genes_small_male_genitalia
  • rjw_genes_tight_female_genitalia
    • -
  • rjw_genes_tight_anus
    •  diff --git a/Common/Textures/Genes/Icons/Big_Breasts.png b/Common/Textures/Genes/Icons/Big_Breasts.png deleted file mode 100644 index 904613e..0000000 Binary files a/Common/Textures/Genes/Icons/Big_Breasts.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Big_Male_Genitalia.png b/Common/Textures/Genes/Icons/Big_Male_Genitalia.png deleted file mode 100644 index ed4810d..0000000 Binary files a/Common/Textures/Genes/Icons/Big_Male_Genitalia.png and /dev/null 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/Cumflation.png b/Common/Textures/Genes/Icons/Cumflation.png deleted file mode 100644 index 4d8d470..0000000 Binary files a/Common/Textures/Genes/Icons/Cumflation.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Cumflation_Immunity.png b/Common/Textures/Genes/Icons/Cumflation_Immunity.png deleted file mode 100644 index 643e0bf..0000000 Binary files a/Common/Textures/Genes/Icons/Cumflation_Immunity.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Elasticity.png b/Common/Textures/Genes/Icons/Elasticity.png deleted file mode 100644 index 91a8fd7..0000000 Binary files a/Common/Textures/Genes/Icons/Elasticity.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Empty.png b/Common/Textures/Genes/Icons/Empty.png deleted file mode 100644 index 1f295f8..0000000 Binary files a/Common/Textures/Genes/Icons/Empty.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Extra_Anus.png b/Common/Textures/Genes/Icons/Extra_Anus.png deleted file mode 100644 index 1075bbd..0000000 Binary files a/Common/Textures/Genes/Icons/Extra_Anus.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Extra_Breasts.png b/Common/Textures/Genes/Icons/Extra_Breasts.png deleted file mode 100644 index f2c470e..0000000 Binary files a/Common/Textures/Genes/Icons/Extra_Breasts.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Futa.png b/Common/Textures/Genes/Icons/Futa.png deleted file mode 100644 index dfadd1c..0000000 Binary files a/Common/Textures/Genes/Icons/Futa.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Generous_Donor.png b/Common/Textures/Genes/Icons/Generous_Donor.png deleted file mode 100644 index e49daf1..0000000 Binary files a/Common/Textures/Genes/Icons/Generous_Donor.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Genitalia_Canine.png b/Common/Textures/Genes/Icons/Genitalia_Canine.png deleted file mode 100644 index 84df9d2..0000000 Binary files a/Common/Textures/Genes/Icons/Genitalia_Canine.png and /dev/null 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.png b/Common/Textures/Genes/Icons/Genitalia_Demon.png deleted file mode 100644 index 7831b4d..0000000 Binary files a/Common/Textures/Genes/Icons/Genitalia_Demon.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Genitalia_Draconic.png b/Common/Textures/Genes/Icons/Genitalia_Draconic.png deleted file mode 100644 index cb763d6..0000000 Binary files a/Common/Textures/Genes/Icons/Genitalia_Draconic.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Genitalia_Equine.png b/Common/Textures/Genes/Icons/Genitalia_Equine.png deleted file mode 100644 index 51c7c1c..0000000 Binary files a/Common/Textures/Genes/Icons/Genitalia_Equine.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Genitalia_Feline.png b/Common/Textures/Genes/Icons/Genitalia_Feline.png deleted file mode 100644 index c03cc27..0000000 Binary files a/Common/Textures/Genes/Icons/Genitalia_Feline.png and /dev/null 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/Hypersexual.png b/Common/Textures/Genes/Icons/Hypersexual.png deleted file mode 100644 index 417196d..0000000 Binary files a/Common/Textures/Genes/Icons/Hypersexual.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Loose_Anus.png b/Common/Textures/Genes/Icons/Loose_Anus.png deleted file mode 100644 index c96dec3..0000000 Binary files a/Common/Textures/Genes/Icons/Loose_Anus.png and /dev/null 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/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/Necrophile.png b/Common/Textures/Genes/Icons/Necrophile.png deleted file mode 100644 index 5b2bf61..0000000 Binary files a/Common/Textures/Genes/Icons/Necrophile.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/No_Anus.png b/Common/Textures/Genes/Icons/No_Anus.png deleted file mode 100644 index f5a9a03..0000000 Binary files a/Common/Textures/Genes/Icons/No_Anus.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/No_Breasts.png b/Common/Textures/Genes/Icons/No_Breasts.png deleted file mode 100644 index 28729b8..0000000 Binary files a/Common/Textures/Genes/Icons/No_Breasts.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/No_Cum.png b/Common/Textures/Genes/Icons/No_Cum.png deleted file mode 100644 index 2084b5e..0000000 Binary files a/Common/Textures/Genes/Icons/No_Cum.png and /dev/null 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.png b/Common/Textures/Genes/Icons/No_Male_Genitalia.png deleted file mode 100644 index ce1fa4e..0000000 Binary files a/Common/Textures/Genes/Icons/No_Male_Genitalia.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Rape.png b/Common/Textures/Genes/Icons/Rape.png deleted file mode 100644 index 8ad84ea..0000000 Binary files a/Common/Textures/Genes/Icons/Rape.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Small_Breasts.png b/Common/Textures/Genes/Icons/Small_Breasts.png deleted file mode 100644 index bfae844..0000000 Binary files a/Common/Textures/Genes/Icons/Small_Breasts.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Small_Male_Genitalia.png b/Common/Textures/Genes/Icons/Small_Male_Genitalia.png deleted file mode 100644 index 58aa367..0000000 Binary files a/Common/Textures/Genes/Icons/Small_Male_Genitalia.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/Tight_Anus.png b/Common/Textures/Genes/Icons/Tight_Anus.png deleted file mode 100644 index dd355fb..0000000 Binary files a/Common/Textures/Genes/Icons/Tight_Anus.png and /dev/null 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/Zoophile.png b/Common/Textures/Genes/Icons/Zoophile.png deleted file mode 100644 index ed45040..0000000 Binary files a/Common/Textures/Genes/Icons/Zoophile.png and /dev/null 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/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.png b/Common/Textures/Genes/Icons/extra_male.png deleted file mode 100644 index 5390ecc..0000000 Binary files a/Common/Textures/Genes/Icons/extra_male.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/female_only.png b/Common/Textures/Genes/Icons/female_only.png deleted file mode 100644 index 7b97f02..0000000 Binary files a/Common/Textures/Genes/Icons/female_only.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/male_only.png b/Common/Textures/Genes/Icons/male_only.png deleted file mode 100644 index 7e15cbc..0000000 Binary files a/Common/Textures/Genes/Icons/male_only.png and /dev/null differ diff --git a/KNOWN_BUGS.md b/KNOWN_BUGS.md index 3fe7439..d1153c0 100644 --- a/KNOWN_BUGS.md +++ b/KNOWN_BUGS.md @@ -56,19 +56,4 @@ 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. - -## Insect Breeder does not fertilize - -Error: - -A pawn with insect breeder fucks a pawn with unfertilized insect eggs, but the eggs stay unfertilized. - - -Notes: - -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 +Patch ChangeSex to skip for pawns with the two genes producing this. \ No newline at end of file diff --git a/README.md b/README.md index 5abb92e..c5dc677 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,8 @@ This is my first Mod I started from scratch so any feedback is very welcome. - Some Traits, Cumflation Immunity, Elasticity - Cum-Amount Changes, Transfer Nutrition - Mech Breeding / Insect Breeding Support -- Human-Animal Gene Inheritance merged from [Shabakur](https://github.com/Shabakur/RJW_Animal_Gene_Inheritance) 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. ## Bugs? @@ -27,12 +24,4 @@ Please consider looking at [the known bugs](./KNOWN_BUGS.md) ## 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 +One of the main motivations was to have genes being added to the xenotypes that other mods and the base game add, e.g. adding demonic penis for impids. \ No newline at end of file diff --git a/Source/Animal_Inheritance/First.cs b/Source/Animal_Inheritance/First.cs index 8d353f7..74eeb6c 100644 --- a/Source/Animal_Inheritance/First.cs +++ b/Source/Animal_Inheritance/First.cs @@ -15,24 +15,17 @@ namespace RJW_BGS 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); - } - } - } + //foreach (RaceGroupDef raceGroupDef2 in DefDatabase.AllDefs) + //{ + //Log.Message("defName = " + raceGroupDef2.defName); + // if (raceGroupDef2.raceNames != null) + // { + // foreach (string race in raceGroupDef2.raceNames) + // { + //Log.Message(race); + // } + // } + //} } } } diff --git a/Source/Animal_Inheritance/BestialityGeneInheritanceDef.cs b/Source/Animal_Inheritance/GeneChance.cs similarity index 82% rename from Source/Animal_Inheritance/BestialityGeneInheritanceDef.cs rename to Source/Animal_Inheritance/GeneChance.cs index 04a9735..2c5453f 100644 --- a/Source/Animal_Inheritance/BestialityGeneInheritanceDef.cs +++ b/Source/Animal_Inheritance/GeneChance.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace RJW_BGS { - public class BestialityGeneInheritanceDef + public class GeneChance { public string defName; public float chance = 1f; diff --git a/Source/Animal_Inheritance/InheritanceUtility.cs b/Source/Animal_Inheritance/InheritanceUtility.cs index 8456f45..8d5e953 100644 --- a/Source/Animal_Inheritance/InheritanceUtility.cs +++ b/Source/Animal_Inheritance/InheritanceUtility.cs @@ -12,33 +12,40 @@ namespace RJW_BGS { public static List AnimalInheritedGenes(Pawn father, Pawn mother) { - List genelist = new List(); - //If Both are Humans, or Both are animals, do nothing & return empty GeneList - if (!mother.RaceProps.Humanlike && !father.RaceProps.Humanlike) - return genelist; - if (mother.RaceProps.Humanlike && father.RaceProps.Humanlike) - return genelist; - - //One parent must be an animal and the other must be human, so only one needs to return + List genelist = new List(); if (father != null && !father.RaceProps.Humanlike) { return SelectGenes(father); } + if (mother != null && !mother.RaceProps.Humanlike) { return SelectGenes(mother); + //PawnKindDef pawnKindDef = mother.kindDef; + //RaceGeneDef raceGeneDef = RJWcopy.GetRaceGenDefInternal(pawnKindDef); + //if (raceGeneDef != null) + //{ + // GeneDef gene = null; + //In case you hit a modded gene not currently active try again. + // for (int i = 0; i < 50 || gene == null; i++) + // { + // if (raceGeneDef.genes.Any()) + // { + // gene = DefDatabase.GetNamed(raceGeneDef.genes.RandomElement()); + // } + // } + // if (gene != null) + // { + // genelist.Add(gene); +// + // } + // + // } } - return genelist; } - /// - /// Looks up potential genes for an animal, - /// checks their chance and returns all 'triggered' genes. - /// - /// The animal for which to look up genes (Animals are Pawns in RW) - /// The genes that will be inherited from this animal. public static List SelectGenes(Pawn pawn) { List genelist = new List(); @@ -46,7 +53,7 @@ namespace RJW_BGS RaceGeneDef raceGeneDef = RJWcopy.GetRaceGenDefInternal(pawnKindDef); if (raceGeneDef != null) { - foreach (BestialityGeneInheritanceDef gene in raceGeneDef.genes) + foreach (GeneChance gene in raceGeneDef.genes) { if (gene.chance >= Rand.Range(0.01f,1f)) { diff --git a/Source/Animal_Inheritance/RJWcopies.cs b/Source/Animal_Inheritance/RJWcopies.cs index 2c11074..cabfd63 100644 --- a/Source/Animal_Inheritance/RJWcopies.cs +++ b/Source/Animal_Inheritance/RJWcopies.cs @@ -41,37 +41,33 @@ namespace RJW_BGS string raceName = kindDef.race.defName; string pawnKindName = kindDef.defName; IEnumerable allDefs = DefDatabase.AllDefs; - List pawnKindDefs = allDefs.Where(delegate (RaceGroupDef group) + List list = allDefs.Where(delegate (RaceGroupDef group) { List pawnKindNames = group.pawnKindNames; return pawnKindNames != null && pawnKindNames.Contains(pawnKindName); }).ToList(); - List raceNameDefs = allDefs.Where(delegate (RaceGroupDef group) + List list2 = allDefs.Where(delegate (RaceGroupDef group) { List raceNames = group.raceNames; return raceNames != null && raceNames.Contains(raceName); }).ToList(); - - int availableDefs = pawnKindDefs.Count() + raceNameDefs.Count(); - if (availableDefs == 0) + int num = list.Count() + list2.Count(); + if (num == 0) { - //Exit Early return null; } - if (availableDefs == 1) + if (num == 1) { - return pawnKindDefs.Concat(raceNameDefs).Single(); + return list.Concat(list2).Single(); } - RaceGroupDef result; - if ((result = pawnKindDefs.FirstOrDefault((RaceGroupDef match) => !IsThisMod(match))) == null) + if ((result = list.FirstOrDefault((RaceGroupDef match) => !IsThisMod(match))) == null) { - if ((result = raceNameDefs.FirstOrDefault((RaceGroupDef match) => !IsThisMod(match))) == null) + if ((result = list2.FirstOrDefault((RaceGroupDef match) => !IsThisMod(match))) == null) { - result = (pawnKindDefs.FirstOrDefault() ?? raceNameDefs.FirstOrDefault()); + result = (list.FirstOrDefault() ?? list2.FirstOrDefault()); } } - return result; } @@ -85,31 +81,29 @@ namespace RJW_BGS string raceName = kindDef.race.defName; string pawnKindName = kindDef.defName; RaceGroupDef raceGroupDef = GetRaceGroupDef(kindDef); + //string raceGroupName = GetRaceGroupDef(kindDef).defName; IEnumerable allDefs = DefDatabase.AllDefs; Log.Message(allDefs.Count().ToString()); - List pawnKindDefs = allDefs.Where(delegate (RaceGeneDef group) + List list = allDefs.Where(delegate (RaceGeneDef group) { List pawnKindNames = group.pawnKindNames; return pawnKindNames != null && pawnKindNames.Contains(pawnKindName); }).ToList(); - List raceKindDefs = allDefs.Where(delegate (RaceGeneDef group) + List list2 = allDefs.Where(delegate (RaceGeneDef group) { List raceNames = group.raceNames; return raceNames != null && raceNames.Contains(raceName); }).ToList(); - List raceGroupDefs = new List(); + List list3 = new List(); if (raceGroupDef != null) { - /* - // Log Messages for Debugging Only, prints the Genes found for this individual Log.Message("found a raceGroupDef"); Log.Message(raceGroupDef.defName); foreach (RaceGeneDef rgd in allDefs) { Log.Message(rgd.defName); } - */ - raceGroupDefs = allDefs.Where(delegate (RaceGeneDef group) + list3 = allDefs.Where(delegate (RaceGeneDef group) { String raceGroupDefName = group.raceGroup; return raceGroupDefName != null && raceGroupDefName == raceGroupDef.defName; @@ -117,17 +111,17 @@ namespace RJW_BGS } RaceGeneDef result = null; //First check if there is a matching pawnkinddef then race, then racegroup - if (pawnKindDefs.Any()) + if (list.Any()) { - result = pawnKindDefs.RandomElement(); + result = list.RandomElement(); } - else if (raceKindDefs.Any() && result == null) + else if (list2.Any() && result == null) { - result = raceKindDefs.RandomElement(); + result = list2.RandomElement(); } - else if (raceGroupDefs.Any() && result == null) + else if (list3.Any() && result == null) { - result = raceGroupDefs.RandomElement(); + result = list3.RandomElement(); } else { diff --git a/Source/Animal_Inheritance/RaceGeneDef.cs b/Source/Animal_Inheritance/RaceGeneDef.cs index c4cbcea..1d7e42b 100644 --- a/Source/Animal_Inheritance/RaceGeneDef.cs +++ b/Source/Animal_Inheritance/RaceGeneDef.cs @@ -14,7 +14,7 @@ namespace RJW_BGS public String raceGroup; public List raceNames; public List pawnKindNames; - public List genes; + public List genes; //public List genechances; public String hybridName; } diff --git a/Source/GeneDefOf.cs b/Source/GeneDefOf.cs index 859f9e3..88cf099 100644 --- a/Source/GeneDefOf.cs +++ b/Source/GeneDefOf.cs @@ -12,6 +12,7 @@ namespace RJW_Genes public static readonly GeneCategoryDef rjw_genes_breeding; // Base Genitalia Types + public static readonly GeneDef rjw_genes_human_genitalia; public static readonly GeneDef rjw_genes_equine_genitalia; public static readonly GeneDef rjw_genes_demonic_genitalia; public static readonly GeneDef rjw_genes_dragon_genitalia; @@ -33,12 +34,16 @@ namespace RJW_Genes // Genitalia Sizes public static readonly GeneDef rjw_genes_big_male_genitalia; + public static readonly GeneDef rjw_genes_normal_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_normal_female_genitalia; public static readonly GeneDef rjw_genes_tight_female_genitalia; public static readonly GeneDef rjw_genes_big_breasts; + public static readonly GeneDef rjw_genes_normal_breasts; public static readonly GeneDef rjw_genes_small_breasts; public static readonly GeneDef rjw_genes_loose_anus; + public static readonly GeneDef rjw_genes_normal_anus; public static readonly GeneDef rjw_genes_tight_anus; // Gender 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/Genitalia/Gene_HumanGenitalia.cs b/Source/Genes/Genitalia/Gene_HumanGenitalia.cs new file mode 100644 index 0000000..077e0c4 --- /dev/null +++ b/Source/Genes/Genitalia/Gene_HumanGenitalia.cs @@ -0,0 +1,23 @@ +using Verse; +using rjw; + +namespace RJW_Genes +{ + public class Gene_HumanGenitalia : RJW_Gene + { + public override void PostMake() + { + base.PostMake(); + + GenitaliaChanger.ChangeGenitalia(this.pawn,Genital_Helper.average_penis,Genital_Helper.average_vagina,Genital_Helper.average_anus); + } + + public override void PostAdd() + { + base.PostAdd(); + GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.average_penis, Genital_Helper.average_vagina, Genital_Helper.average_anus); + } + + } + +} diff --git a/Source/Genes/Genitalia/GenitaliaUtility.cs b/Source/Genes/Genitalia/GenitaliaUtility.cs index 4dc289a..e11f06f 100644 --- a/Source/Genes/Genitalia/GenitaliaUtility.cs +++ b/Source/Genes/Genitalia/GenitaliaUtility.cs @@ -23,17 +23,16 @@ namespace RJW_Genes if (!gene.Overridden) return gene.def; } - return null; + + return GeneDefOf.rjw_genes_human_genitalia; } public static HediffDef GetPenisForGene(GeneDef gene) { - if (gene == null) - return Genital_Helper.average_penis; - switch (gene.defName) { + case "rjw_genes_human_genitalia": return Genital_Helper.average_penis; 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; @@ -49,11 +48,9 @@ namespace RJW_Genes public static HediffDef GetVaginaForGene(GeneDef gene) { - if (gene == null) - return Genital_Helper.average_vagina; - switch (gene.defName) { + case "rjw_genes_human_genitalia": return Genital_Helper.average_vagina; 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; @@ -68,11 +65,10 @@ namespace RJW_Genes 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_human_genitalia": return Genital_Helper.average_anus; 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; @@ -87,12 +83,10 @@ namespace RJW_Genes 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_human_genitalia": return Genital_Helper.average_breasts; 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; diff --git a/Source/Genes/GenitaliaSize/Gene_NormalAnus.cs b/Source/Genes/GenitaliaSize/Gene_NormalAnus.cs new file mode 100644 index 0000000..8ee0a45 --- /dev/null +++ b/Source/Genes/GenitaliaSize/Gene_NormalAnus.cs @@ -0,0 +1,18 @@ +using Verse; +using rjw; + +namespace RJW_Genes +{ + /// + /// Dummy Gene that does not alter the genitalia size. Normal RJW Logic and rolled sizes are kept. + /// + public class Gene_NormalAnus : RJW_Gene + { + + public override void PostMake() + { + base.PostMake(); + } + + } +} diff --git a/Source/Genes/GenitaliaSize/Gene_NormalBreasts.cs b/Source/Genes/GenitaliaSize/Gene_NormalBreasts.cs new file mode 100644 index 0000000..2b8f193 --- /dev/null +++ b/Source/Genes/GenitaliaSize/Gene_NormalBreasts.cs @@ -0,0 +1,17 @@ +using rjw; + +namespace RJW_Genes +{ + /// + /// Dummy Gene that does not alter the genitalia size. Normal RJW Logic and rolled sizes are kept. + /// + public class Gene_NormalBreasts : RJW_Gene + { + + public override void PostMake() + { + base.PostMake(); + } + + } +} diff --git a/Source/Genes/GenitaliaSize/Gene_NormalFemaleGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_NormalFemaleGenitalia.cs new file mode 100644 index 0000000..fce0c87 --- /dev/null +++ b/Source/Genes/GenitaliaSize/Gene_NormalFemaleGenitalia.cs @@ -0,0 +1,19 @@ +using Verse; +using rjw; + +namespace RJW_Genes +{ + /// + /// Dummy Gene that does not alter the genitalia size. Normal RJW Logic and rolled sizes are kept. + /// + public class Gene_NormalFemaleGenitalia : RJW_Gene + { + + public override void PostMake() + { + base.PostMake(); + } + + + } +} diff --git a/Source/Genes/GenitaliaSize/Gene_NormalMaleGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_NormalMaleGenitalia.cs new file mode 100644 index 0000000..2fa6247 --- /dev/null +++ b/Source/Genes/GenitaliaSize/Gene_NormalMaleGenitalia.cs @@ -0,0 +1,15 @@ +namespace RJW_Genes +{ + /// + /// Dummy Gene that does not alter the genitalia size. Normal RJW Logic and rolled sizes are kept. + /// + public class Gene_NormalMaleGenitalia : RJW_Gene + { + + public override void PostMake() + { + base.PostMake(); + } + + } +} diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj index 94d2403..b8edc5b 100644 --- a/Source/Rjw-Genes.csproj +++ b/Source/Rjw-Genes.csproj @@ -27,7 +27,7 @@ False - ..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False @@ -35,7 +35,7 @@ False - ..\..\rjw\1.4\Assemblies\RJW.dll + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RJW\1.4\Assemblies\RJW.dll False @@ -51,12 +51,7 @@ - ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll - False - - - ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll - False + ..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll @@ -70,12 +65,11 @@ - + - @@ -100,6 +94,10 @@ + + + + @@ -113,6 +111,7 @@ + diff --git a/TODOS.md b/TODOS.md index a03b835..5bf70df 100644 --- a/TODOS.md +++ b/TODOS.md @@ -6,16 +6,10 @@ So any help is very appreciated, even if it is just pointing me to existing simi ## Planned Genes **Sanguophage like Cumwhores** adding Hemogen and refilling it by getting semen. -Showstopper here is the amount of code required, and that I need to understand a bit better of harmony to run the AfterSexUtility and modulate SexChances. My first attempt exploded on adding UI Elements. +Showstopper here is the amount of code required, and that I need to understand a bit better of harmony to run the AfterSexUtility and modulate SexChances. **Adjustable Cock-Size** like e.g. artificial genitalia have -**Infectious Hypersexuality Gene** (Maybe?) add Hypersexuality Gene through sex with a certain chance. - -**Stat Boost on Orgasm** restore stamina - -**Cum Addiction** add Cum-Addiction from Sexpererience, slowly loose conciousness while addiction is not attended. - ## Animal Gene Inheritance It should be doable to have a per-category list of genes that a child can inherit on bestiality. @@ -31,7 +25,7 @@ Issues: There were some suggestions on the Discord I saved them somewhere else. I am far away from making that work, but to have them here: -- Genitalia deal damage as per size (on normal sex-use) -- Genitalia can cause Terror (as ability) +- Genitalia deal damage as per size +- Genitalia can cause Terror - Cumshot Sniper Abilities - Healing Pussy \ No newline at end of file