Merge branch 'dev' into main

This commit is contained in:
vegapnk 2023-01-15 16:43:21 +01:00 committed by GitHub
commit f3cc5e7ee2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 763 additions and 232 deletions

View file

@ -57,7 +57,7 @@
<GeneCategoryDef>
<defName>rjw_genes_special</defName>
<label>Genital Related Damage</label>
<label>Genital Based Special Abilities</label>
<displayPriorityInXenotype>8</displayPriorityInXenotype>
</GeneCategoryDef>

View file

@ -8,7 +8,9 @@
<description>Pawns with this gene are able to birth mechanoids unharmed.</description>
<iconPath>World/WorldObjects/Expanding/Mechanoids</iconPath>
<displayOrderInCategory>51</displayOrderInCategory>
<displayCategory>rjw_genes_breeding</displayCategory>
<displayCategory>rjw_genes_breeding</displayCategory>
<biostatCpx>1</biostatCpx>
<biostatMet>-1</biostatMet>
</GeneDef>
<GeneDef>
@ -17,7 +19,9 @@
<description>Pawns with this gene are able to hold more insect eggs.</description>
<iconPath>Genes/Icons/More_Egg_Space</iconPath>
<displayOrderInCategory>52</displayOrderInCategory>
<displayCategory>rjw_genes_breeding</displayCategory>
<displayCategory>rjw_genes_breeding</displayCategory>
<biostatCpx>1</biostatCpx>
<biostatMet>-1</biostatMet>
</GeneDef>
<GeneDef>
@ -27,6 +31,8 @@
<iconPath>World/WorldObjects/Expanding/Insects</iconPath>
<displayOrderInCategory>53</displayOrderInCategory>
<displayCategory>rjw_genes_breeding</displayCategory>
<biostatCpx>1</biostatCpx>
<biostatMet>-1</biostatMet>
</GeneDef>
<GeneDef>

View file

@ -8,7 +8,25 @@
<description>This Xenotype cannot get stretched by huge penetrators.</description>
<iconPath>Genes/Icons/Elasticity</iconPath>
<geneClass>RJW_Genes.Gene_Elasticity</geneClass>
<biostatMet>-1</biostatMet>
<biostatCpx>1</biostatCpx>
<displayOrderInCategory>1</displayOrderInCategory>
</GeneDef>
<GeneDef >
<defName>rjw_genes_unbreakable</defName>
<label>Unbreakable</label>
<displayCategory>rjw_genes_damage</displayCategory>
<description>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.</description>
<iconPath>UI/Icons/Rituals/TrialDefend</iconPath>
<displayOrderInCategory>2</displayOrderInCategory>
<biostatMet>-1</biostatMet>
<biostatCpx>1</biostatCpx>
<!-- Note: This Gene is mostly handled by patching XMLs -->
<geneClass>RJW_Genes.Gene_Unbreakable</geneClass>
<hediffGiversCannotGive>
<li>FeelingBroken</li>
</hediffGiversCannotGive>
</GeneDef>
</Defs>

View file

@ -9,7 +9,7 @@
<GeneDef ParentName="GeneGenitaliaSizeBase">
<defName>rjw_genes_big_male_genitalia</defName>
<label>Big Male Genitaliasize</label>
<description>Penises of this Xenotype are bigger.</description>
<description>Penises of this Xenotype are bigger.(Resizing takes place at 20th Birthday)</description>
<iconPath>Genes/Icons/Small_Male_Genitalia</iconPath>
<geneClass>RJW_Genes.Gene_BigMaleGenitalia</geneClass>
<displayOrderInCategory>751</displayOrderInCategory>
@ -21,7 +21,7 @@
<GeneDef ParentName="GeneGenitaliaSizeBase">
<defName>rjw_genes_small_male_genitalia</defName>
<label>Small Male Genitaliasize</label>
<description>Penises of this Xenotype are smaller.</description>
<description>Penises of this Xenotype are smaller. (Resizing takes place at 20th Birthday)</description>
<iconPath>Genes/Icons/Big_Male_Genitalia</iconPath>
<geneClass>RJW_Genes.Gene_SmallMaleGenitalia</geneClass>
<displayOrderInCategory>753</displayOrderInCategory>
@ -34,7 +34,7 @@
<GeneDef ParentName="GeneGenitaliaSizeBase">
<defName>rjw_genes_loose_female_genitalia</defName>
<label>Loose Female Genitalia</label>
<description>Vaginas of this Xenotype are quite spacy.</description>
<description>Vaginas of this Xenotype are quite spacy. (Resizing takes place at 20th Birthday)</description>
<iconPath>Genes/Icons/Loose_Female_Genitalia</iconPath>
<geneClass>RJW_Genes.Gene_LooseFemaleGenitalia</geneClass>
<displayOrderInCategory>754</displayOrderInCategory>
@ -46,7 +46,7 @@
<GeneDef ParentName="GeneGenitaliaSizeBase">
<defName>rjw_genes_tight_female_genitalia</defName>
<label>Tight Female Genitalia</label>
<description>Vaginas of this Xenotype are pretty tight.</description>
<description>Vaginas of this Xenotype are pretty tight.(Resizing takes place at 20th Birthday)</description>
<iconPath>Genes/Icons/Tight_Female_Genitalia</iconPath>
<geneClass>RJW_Genes.Gene_TightFemaleGenitalia</geneClass>
<displayOrderInCategory>756</displayOrderInCategory>
@ -59,7 +59,7 @@
<GeneDef ParentName="GeneGenitaliaSizeBase">
<defName>rjw_genes_big_breasts</defName>
<label>Big Breasts</label>
<description>Females of this Xenotype have big honkers.</description>
<description>Females of this Xenotype have big honkers.(Resizing takes place at 20th Birthday)</description>
<iconPath>Genes/Icons/Big_Breasts</iconPath>
<geneClass>RJW_Genes.Gene_BigBreasts</geneClass>
<displayOrderInCategory>757</displayOrderInCategory>
@ -71,7 +71,7 @@
<GeneDef ParentName="GeneGenitaliaSizeBase">
<defName>rjw_genes_small_breasts</defName>
<label>Small Breasts</label>
<description>Females of this Xenotype have smaller breasts.</description>
<description>Females of this Xenotype have smaller breasts.(Resizing takes place at 20th Birthday)</description>
<iconPath>Genes/Icons/Small_Breasts</iconPath>
<geneClass>RJW_Genes.Gene_SmallBreasts</geneClass>
<displayOrderInCategory>759</displayOrderInCategory>
@ -84,7 +84,7 @@
<GeneDef ParentName="GeneGenitaliaSizeBase">
<defName>rjw_genes_loose_anus</defName>
<label>Loose Anus</label>
<description>The Anus of this Xenotype is roomy.</description>
<description>The Anus of this Xenotype is roomy.(Resizing takes place at 20th Birthday)</description>
<iconPath>Genes/Icons/Loose_Anus</iconPath>
<geneClass>RJW_Genes.Gene_LooseAnus</geneClass>
<displayOrderInCategory>760</displayOrderInCategory>
@ -96,7 +96,7 @@
<GeneDef ParentName="GeneGenitaliaSizeBase">
<defName>rjw_genes_tight_anus</defName>
<label>Tight Anus</label>
<description>The anus of this Xenotype is small.</description>
<description>The anus of this Xenotype is small.(Resizing takes place at 20th Birthday)</description>
<iconPath>Genes/Icons/Tight_Anus</iconPath>
<geneClass>RJW_Genes.Gene_TightAnus</geneClass>
<displayOrderInCategory>762</displayOrderInCategory>

View file

@ -21,6 +21,7 @@
<displayCategory>Reproduction</displayCategory>
<description>Xenotypes with this Gene are Rapists.</description>
<iconPath>Genes/Icons/Rape</iconPath>
<biostatMet>1</biostatMet>
<displayOrderInCategory>2</displayOrderInCategory>
<forcedTraits>
<li>
@ -28,4 +29,41 @@
</li>
</forcedTraits>
</GeneDef>
<GeneDef>
<defName>rjw_genes_homosexual</defName>
<label>Homosexual</label>
<displayCategory>Reproduction</displayCategory>
<description>This Gene makes you gay.</description>
<iconPath>UI\Ideoligions\Universal\RoundC</iconPath>
<biostatMet>0</biostatMet>
<displayOrderInCategory>3</displayOrderInCategory>
<forcedTraits>
<li>
<def>Gay</def>
</li>
</forcedTraits>
<exclusionTags>
<li>rjw_genes_sexual_orientation</li>
</exclusionTags>
</GeneDef>
<GeneDef>
<defName>rjw_genes_bisexual</defName>
<label>Bisexual</label>
<displayCategory>Reproduction</displayCategory>
<description>Carriers of this Gene are Bisexual.</description>
<iconPath>UI\Ideoligions\Universal\RoundC</iconPath>
<biostatMet>0</biostatMet>
<displayOrderInCategory>4</displayOrderInCategory>
<forcedTraits>
<li>
<def>Bisexual</def>
</li>
</forcedTraits>
<exclusionTags>
<li>rjw_genes_sexual_orientation</li>
</exclusionTags>
</GeneDef>
</Defs>

View file

@ -6,19 +6,44 @@
<displayCategory>rjw_genes_special</displayCategory>
<description>On Orgasm, carriers of this gene get a boost in activity. (rest-need is partially filled)</description>
<biostatCpx>1</biostatCpx>
<biostatMet>-2</biostatMet>
<iconPath>UI/Memes/FleshPurity</iconPath>
<displayOrderInCategory>1</displayOrderInCategory>
</GeneDef>
<GeneDef>
<defName>rjw_genes_youth_fountain</defName>
<label>Youth Fountain</label>
<displayCategory>rjw_genes_special</displayCategory>
<description>Having sex with a carrier of this gene makes the partner slightly younger. (Partner stays adult)</description>
<biostatCpx>2</biostatCpx>
<biostatMet>-2</biostatMet>
<iconPath>UI/Ideoligions/FireLeaves</iconPath>
<displayOrderInCategory>2</displayOrderInCategory>
</GeneDef>
<GeneDef>
<defName>rjw_genes_sex_age_drain</defName>
<label>Sexual Age Drain</label>
<displayCategory>rjw_genes_special</displayCategory>
<description>Having sex transfers some of the partners life-time to themselves. (Pawn stays adult)</description>
<biostatCpx>2</biostatCpx>
<biostatMet>-1</biostatMet>
<iconPath>UI/Icons/ColonistBar/Idle</iconPath>
<displayOrderInCategory>3</displayOrderInCategory>
</GeneDef>
<GeneDef>
<defName>rjw_genes_aphrodisiac_pheromones</defName>
<label>Aphrodisiac Pheromones</label>
<displayCategory>rjw_genes_special</displayCategory>
<geneClass>RJW_Genes.Gene_Aphrodisiac_Pheromones</geneClass>
<geneClass>RJW_Genes.Gene_Aphrodisiac_Pheromones</geneClass>
<description>Pheremones of this pawn induce an incressed sexdrive to others nearby.</description>
<iconPath>UI/Memes/FleshPurity</iconPath>
<displayOrderInCategory>2</displayOrderInCategory>
<biostatCpx>1</biostatCpx>
<biostatMet>1</biostatMet>
<displayOrderInCategory>4</displayOrderInCategory>
<biostatCpx>1</biostatCpx>
<biostatMet>1</biostatMet>
</GeneDef>
</Defs>

View file

@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<HediffDef>
<defName>rjw_genes_orgasm_rush_hediff</defName>
<hediffClass>HediffWithComps</hediffClass>
<label>Orgasm Rush</label>
<description>Xenotypes with this Gene are pushed beyond normal limits when they have an orgasm.</description>
<defaultLabelColor>(240,200,110)</defaultLabelColor>
<scenarioCanAdd>false</scenarioCanAdd>
<maxSeverity>1.0</maxSeverity>
<isBad>false</isBad>
<tendable>false</tendable>
<comps>
<li Class="HediffCompProperties_SeverityPerDay">
<severityPerDay>-0.75</severityPerDay>
</li>
</comps>
<stages>
<li>
<label>pumped</label>
<statOffsets>
<MeleeDodgeChance>4</MeleeDodgeChance>
<ShootingAccuracyPawn>4</ShootingAccuracyPawn>
</statOffsets>
<capMods>
<li>
<capacity>Consciousness</capacity>
<offset>0.05</offset>
</li>
</capMods>
</li>
<li>
<label>charged</label>
<minSeverity>0.4</minSeverity>
<statOffsets>
<MeleeDodgeChance>8</MeleeDodgeChance>
<ShootingAccuracyPawn>8</ShootingAccuracyPawn>
</statOffsets>
<capMods>
<li>
<capacity>Moving</capacity>
<offset>0.08</offset>
</li>
<li>
<capacity>Consciousness</capacity>
<offset>0.08</offset>
</li>
</capMods>
</li>
<li>
<label>super-charged</label>
<minSeverity>0.7</minSeverity>
<statOffsets>
<MeleeDodgeChance>10</MeleeDodgeChance>
<ShootingAccuracyPawn>10</ShootingAccuracyPawn>
</statOffsets>
<capMods>
<li>
<capacity>Moving</capacity>
<offset>0.1</offset>
</li>
<li>
<capacity>Consciousness</capacity>
<offset>0.1</offset>
</li>
<li>
<capacity>BloodPumping</capacity>
<offset>0.1</offset>
</li>
</capMods>
</li>
</stages>
</HediffDef>
</Defs>

View file

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="FeelingBroken"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="GotRaped"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="GotAnalRaped"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="GotAnalRapedByFemale"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="GotRapedUnconscious"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="HateMyRapist"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="AllowedMeToGetRaped"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
</Patch>

View file

@ -1,44 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<!--TODO: The Baseline does not show up with human genitalia? -->
<!--
<Operation Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Baseline"]</xpath>
<value>
<genes>
<li>rjw_genes_human_genitalia</li>
<li>rjw_genes_normal_anus</li>
<li>rjw_genes_normal_breasts</li>
<li>rjw_genes_normal_male_genitalia</li>
<li>rjw_genes_normal_female_genitalia</li>
</genes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Dirtmole"]/genes</xpath>
<value>
<li>rjw_genes_human_genitalia</li>
<li>rjw_genes_normal_anus</li>
<li>rjw_genes_normal_breasts</li>
<li>rjw_genes_normal_male_genitalia</li>
<li>rjw_genes_normal_female_genitalia</li>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Hussar"]/genes</xpath>
<value>
<li>rjw_genes_human_genitalia</li>
<li>rjw_genes_normal_anus</li>
<li>rjw_genes_normal_breasts</li>
<li>rjw_genes_normal_male_genitalia</li>
<li>rjw_genes_normal_female_genitalia</li>
</value>
</Operation>
-->
<Operation Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Neanderthal"]/genes</xpath>
<value>
@ -74,8 +36,21 @@
<xpath>Defs/XenotypeDef[defName="Highmate"]/genes</xpath>
<value>
<li>rjw_genes_hypersexual</li>
</value>
</Operation>
<!-- Conditional Patch, only add these Genes for players with Licentia
I tried "mayRequire" but that cannot be put so fine-grained into the <li> -->
<Operation Class="PatchOperationFindMod">
<mods>
<li>LustLicentia.RJWLabs</li>
</mods>
<match Class="PatchOperationAddModExtension">
<xpath>Defs/XenotypeDef[defName="Highmate"]/genes</xpath>
<value>
<li>rjw_genes_likes_cumflation</li>
</value>
</match>
</Operation>
<Operation Class="PatchOperationAdd">

View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Biotech Nyaron</li>
</mods>
<match Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Nyaron"]/genes</xpath>
<value>
<li>rjw_genes_feline_genitalia</li>
</value>
</match>
</Operation>
</Patch>

View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>NaraiXenotype</li>
</mods>
<match Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Narai"]/genes</xpath>
<value>
<li>rjw_genes_canine_genitalia</li>
<li>rjw_genes_zoophile</li>
</value>
</match>
</Operation>
</Patch>

View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Papou Race : emotional birds</li>
</mods>
<match Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="papago"]/genes</xpath>
<value>
<li>rjw_genes_orgasm_rush</li>
<li>rjw_genes_damage</li>
<li>rjw_genes_tight_female_genitalia</li>
<li>rjw_genes_tight_anus</li>
</value>
</match>
</Operation>
</Patch>

View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Vanilla Races Expanded - Saurid</li>
</mods>
<match Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="VRESaurids_Saurid"]/genes</xpath>
<value>
<li>rjw_genes_dragon_genitalia</li>
</value>
</match>
</Operation>
</Patch>