From aa85ce078634820895a90c8de2bf8c4142a4f787 Mon Sep 17 00:00:00 2001 From: Vegapnk Date: Tue, 4 Jun 2024 16:48:10 +0200 Subject: [PATCH] Revert "Conditionalised the Quirk Patches - only if their VRE Mod is loaded" This reverts commit ea63db147d17540a7ceb2ee99f195b15bc5d6c37. --- CHANGELOG.md | 2 + .../HediffDefs/Hediffs_Extra_PrivateParts.xml | 47 ++++---------- .../Defs/ThingDefs/Items_BodyParts_Added.xml | 25 ++++--- .../Genes/VRE_AndroidConvertableGenesDefs.xml | 11 ++++ .../Patches/Genes/VRE_GeneDefs_Androids.xml | 54 +++++++++++++++ .../VRE_Genie_GeneDefs_Curiosity_sex.xml | 30 +++++++++ .../QuirkPatches/Android_Quirk_Patch.xml | 32 ++------- .../QuirkPatches/Archon_Quirk_Patch.xml | 16 ++--- .../QuirkPatches/Fungoid_Quirk_Patch.xml | 34 +++------- .../QuirkPatches/Highmate_Quirk_Patch.xml | 33 +++------- .../QuirkPatches/Lycanthrope_Quirk_Patch.xml | 24 ++----- .../QuirkPatches/Phytokin_Quirk_Patch.xml | 34 +++------- .../QuirkPatches/Sanguophage_Quirk_Patch.xml | 54 ++++----------- .../QuirkPatches/Saurid_Quirk_Patch.xml | 65 +++++-------------- 14 files changed, 192 insertions(+), 269 deletions(-) create mode 100644 Common/Patches/Genes/VRE_AndroidConvertableGenesDefs.xml create mode 100644 Common/Patches/Genes/VRE_GeneDefs_Androids.xml create mode 100644 Common/Patches/Genes/VRE_Genie_GeneDefs_Curiosity_sex.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index dec6bfc..11cf3f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ - 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) **Fixes**: diff --git a/Common/Defs/HediffDefs/Hediffs_Extra_PrivateParts.xml b/Common/Defs/HediffDefs/Hediffs_Extra_PrivateParts.xml index 2604962..647b7a2 100644 --- a/Common/Defs/HediffDefs/Hediffs_Extra_PrivateParts.xml +++ b/Common/Defs/HediffDefs/Hediffs_Extra_PrivateParts.xml @@ -1,14 +1,11 @@ - + - NeedlePenis a needle penis A long thin needle penis - - NeedlePenis - + NeedlePenis NeedlePenis
  • @@ -19,15 +16,12 @@
    • - PigPenis a screw penis A large screw penis. - - PigPenis - + PigPenis PigPenis
  • @@ -39,15 +33,12 @@
    • - MarinePenis a marine penis A penis similar to those of marine mammals. - - MarinePenis - + MarinePenis MarinePenis
  • @@ -58,15 +49,12 @@
    • - TentaclePenis an alien penis A alien penis featuring multiples tentacles. - - TentaclePenis - + TentaclePenis TentaclePenis
  • @@ -83,9 +71,7 @@ an golem penis A large rocky golem penis. - - GolemPenis - + GolemPenis GolemPenis
  • @@ -97,15 +83,12 @@
    • - OrcPenis an orc penis A large orc penis. - - OrcPenis - + OrcPenis OrcPenis
  • @@ -116,15 +99,12 @@
    • - GhostPenis an ghost penis A evanescent ghost penis, you can barely feel it. - - GhostPenis - + GhostPenis GhostPenis
  • @@ -135,15 +115,12 @@
    • - NecroPenis an undead penis A rotten, reanimated penis. - - NecroPenis - + NecroPenis NecroPenis
  • @@ -154,15 +131,12 @@
    • - GhostVagina a ghost vagina A evanescent ghost vagina, you can barely feel it. - - GhostVagina - + GhostVagina GhostVagina
  • @@ -174,4 +148,5 @@ + \ No newline at end of file diff --git a/Common/Defs/ThingDefs/Items_BodyParts_Added.xml b/Common/Defs/ThingDefs/Items_BodyParts_Added.xml index 0916c33..9608642 100644 --- a/Common/Defs/ThingDefs/Items_BodyParts_Added.xml +++ b/Common/Defs/ThingDefs/Items_BodyParts_Added.xml @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ 0.40 - + PigPenis @@ -20,7 +20,7 @@ 0.40 - + MarinePenis @@ -30,7 +30,7 @@ 0.40 - + TentaclePenis @@ -40,7 +40,7 @@ 0.40 - + GolemPenis @@ -50,7 +50,7 @@ 0.40 - + OrcPenis @@ -60,7 +60,7 @@ 0.40 - + GhostPenis @@ -70,7 +70,7 @@ 0.40 - + NecroPenis @@ -80,18 +80,17 @@ 0.40 - + GhostVagina - - GhostVagina - + GhostVagina 250 0.40 + - \ No newline at end of file + diff --git a/Common/Patches/Genes/VRE_AndroidConvertableGenesDefs.xml b/Common/Patches/Genes/VRE_AndroidConvertableGenesDefs.xml new file mode 100644 index 0000000..2977367 --- /dev/null +++ b/Common/Patches/Genes/VRE_AndroidConvertableGenesDefs.xml @@ -0,0 +1,11 @@ + + + + rjw_genes_AndroidConvertableGenesDefs + +
  • rjw_genes_gender
    • + + + + +     \ No newline at end of file diff --git a/Common/Patches/Genes/VRE_GeneDefs_Androids.xml b/Common/Patches/Genes/VRE_GeneDefs_Androids.xml new file mode 100644 index 0000000..058d719 --- /dev/null +++ b/Common/Patches/Genes/VRE_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 + +
  • + BionicPenis + BionicVagina + BionicAnus + BionicBreasts +
    • +     + 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 + +
  • + HydraulicPenis + HydraulicVagina + HydraulicAnus + HydraulicBreasts +
    • +     + 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/Common/Patches/Genes/VRE_Genie_GeneDefs_Curiosity_sex.xml b/Common/Patches/Genes/VRE_Genie_GeneDefs_Curiosity_sex.xml new file mode 100644 index 0000000..98cd404 --- /dev/null +++ b/Common/Patches/Genes/VRE_Genie_GeneDefs_Curiosity_sex.xml @@ -0,0 +1,30 @@ + + + + + VRE_Curiosity + +
  • VRE_Curiosity
    • +
  • Curiosity
    • +     + -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/Common/Patches/QuirkPatches/Android_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Android_Quirk_Patch.xml index 996279c..52f9333 100644 --- a/Common/Patches/QuirkPatches/Android_Quirk_Patch.xml +++ b/Common/Patches/QuirkPatches/Android_Quirk_Patch.xml @@ -1,44 +1,26 @@ - + - - - -
  • Vanilla Races Expanded - Android
    • -     - + /Defs/VREAndroids.AndroidGeneDef[defName="VREA_SyntheticBody"]
  • - RobotLoverQuirk + RobotLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Android
    • -     - + /Defs/VREAndroids.AndroidGeneDef[defName="VREA_SyntheticSkin"]
  • - RobotLoverQuirk + RobotLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Android
    • -     - + /Defs/GeneCategoryDef[defName="VREA_Subroutine"]/displayPriorityInXenotype 10 -     +     - \ No newline at end of file diff --git a/Common/Patches/QuirkPatches/Archon_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Archon_Quirk_Patch.xml index e6446ee..0f7e119 100644 --- a/Common/Patches/QuirkPatches/Archon_Quirk_Patch.xml +++ b/Common/Patches/QuirkPatches/Archon_Quirk_Patch.xml @@ -1,18 +1,12 @@ - + - - - -
  • Vanilla Races Expanded - Archon
    • -     - + /Defs/GeneDef[defName="VRE_Leatherskin"]
  • - SkinLoverQuirk + SkinLoverQuirk
    • -     - -     \ No newline at end of file + + diff --git a/Common/Patches/QuirkPatches/Fungoid_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Fungoid_Quirk_Patch.xml index 6d1c323..bcb1e72 100644 --- a/Common/Patches/QuirkPatches/Fungoid_Quirk_Patch.xml +++ b/Common/Patches/QuirkPatches/Fungoid_Quirk_Patch.xml @@ -1,46 +1,28 @@ - + - - - -
  • Vanilla Races Expanded - Fungoid
    • -     - + /Defs/GeneDef[defName="VRE_FungalCrest"]
  • - PlantLoverQuirk + PlantLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Fungoid
    • -     - + /Defs/GeneDef[defName="VRE_HairMushroom"]
  • - PlantLoverQuirk + PlantLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Fungoid
    • -     - + /Defs/GeneDef[defName="VRE_FungalFlesh"]
  • - PlantLoverQuirk + PlantLoverQuirk
    • -     +     - \ No newline at end of file diff --git a/Common/Patches/QuirkPatches/Highmate_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Highmate_Quirk_Patch.xml index 96a8448..0f69977 100644 --- a/Common/Patches/QuirkPatches/Highmate_Quirk_Patch.xml +++ b/Common/Patches/QuirkPatches/Highmate_Quirk_Patch.xml @@ -1,45 +1,28 @@ - + - - -
  • Vanilla Races Expanded - Highmate
    • -     - + /Defs/GeneDef[defName="VRE_FelineEars"]
  • - FurLoverQuirk + FurLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Highmate
    • -     - + /Defs/GeneDef[defName="VRE_FelineTail"]
  • - FurLoverQuirk + FurLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Highmate
    • -     - + /Defs/GeneDef[defName="VRE_PerfectBody"]
  • - SkinLoverQuirk + SkinLoverQuirk
    • -     +     - \ No newline at end of file diff --git a/Common/Patches/QuirkPatches/Lycanthrope_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Lycanthrope_Quirk_Patch.xml index 4f029aa..475950c 100644 --- a/Common/Patches/QuirkPatches/Lycanthrope_Quirk_Patch.xml +++ b/Common/Patches/QuirkPatches/Lycanthrope_Quirk_Patch.xml @@ -1,32 +1,20 @@ - + - - - -
  • Vanilla Races Expanded - Lycanthrope
    • -     - + /Defs/GeneDef[defName="VRE_ChestFur"]
  • - FurLoverQuirk + FurLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Lycanthrope
    • -     - + /Defs/GeneDef[defName="VRE_CanineTail"]
  • - FurLoverQuirk + FurLoverQuirk
    • -     +     - \ No newline at end of file diff --git a/Common/Patches/QuirkPatches/Phytokin_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Phytokin_Quirk_Patch.xml index daeaf09..78089d4 100644 --- a/Common/Patches/QuirkPatches/Phytokin_Quirk_Patch.xml +++ b/Common/Patches/QuirkPatches/Phytokin_Quirk_Patch.xml @@ -1,46 +1,28 @@ - + - - - -
  • Vanilla Races Expanded - Phytokin
    • -     - + /Defs/GeneDef[defName="VRE_BarkSkin"]
  • - PlantLoverQuirk + PlantLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Phytokin
    • -     - + /Defs/GeneDef[defName="VRE_FoliageHair"]
  • - PlantLoverQuirk + PlantLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Phytokin
    • -     - + /Defs/GeneDef[defName="VRE_SapBlood"]
  • - PlantLoverQuirk + PlantLoverQuirk
    • -     +     - \ No newline at end of file diff --git a/Common/Patches/QuirkPatches/Sanguophage_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Sanguophage_Quirk_Patch.xml index f225827..cf01f46 100644 --- a/Common/Patches/QuirkPatches/Sanguophage_Quirk_Patch.xml +++ b/Common/Patches/QuirkPatches/Sanguophage_Quirk_Patch.xml @@ -1,74 +1,44 @@ - + - - - -
  • Vanilla Races Expanded - Sanguophage
    • -     - + /Defs/GeneDef[defName="VRE_SanguineHair"]
  • - DemonLoverQuirk + DemonLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Sanguophage
    • -     - + /Defs/GeneDef[defName="VRE_BatEars"]
  • - TeratophileQuirk + TeratophileQuirk
    • -     - - - -
  • Vanilla Races Expanded - Sanguophage
    • -     - + /Defs/GeneDef[defName="VRE_UpperBatEars"]
  • - TeratophileQuirk + TeratophileQuirk
    • -     - - - -
  • Vanilla Races Expanded - Sanguophage
    • -     - + /Defs/GeneDef[defName="VRE_Talons"]
  • - DemonLoverQuirk + DemonLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Sanguophage
    • -     - + /Defs/GeneDef[defName="VRE_BatNose"]
  • - TeratophileQuirk + TeratophileQuirk
    • -     +     - \ No newline at end of file diff --git a/Common/Patches/QuirkPatches/Saurid_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Saurid_Quirk_Patch.xml index c948d44..37188ff 100644 --- a/Common/Patches/QuirkPatches/Saurid_Quirk_Patch.xml +++ b/Common/Patches/QuirkPatches/Saurid_Quirk_Patch.xml @@ -1,73 +1,44 @@ - + - - -
  • Vanilla Races Expanded - Saurid
    • -     - + /Defs/GeneDef[defName="VRESaurids_FrilledEars"]
  • - ScaleLoverQuirk + ScaleLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Saurid
    • -     - - /Defs/GeneDef[defName="VRESaurids_GeckoTail"] - -
  • - ScaleLoverQuirk -
    • -     -     -     - - - -
  • Vanilla Races Expanded - Saurid
    • -     - + /Defs/GeneDef[defName="VRESaurids_CenterFrill"]
  • - ScaleLoverQuirk + ScaleLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Saurid
    • -     - + + /Defs/GeneDef[defName="VRESaurids_GeckoTail"] + +
  • + ScaleLoverQuirk +
    • +     +     + /Defs/GeneDef[defName="VRESaurids_SauridClaws"]
  • - ScaleLoverQuirk + ScaleLoverQuirk
    • -     - - - -
  • Vanilla Races Expanded - Saurid
    • -     - + /Defs/GeneDef[defName="VRESaurids_ScaleSkin"]
  • - ScaleLoverQuirk + ScaleLoverQuirk
    • -     +     - \ No newline at end of file