Merge branch 'dev' into dev

This commit is contained in:
Shabakur 2023-01-08 14:12:58 +01:00 committed by GitHub
commit 6f2c4dc374
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 444 additions and 77 deletions

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

@ -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>

View file

@ -6,6 +6,7 @@
<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>
@ -14,11 +15,34 @@
<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>Carriers of this gene create an aphrodisiac pheremones which induce an increased sexdrive to others nearby, increasing in strength as the sexdrive of the carrier increases.\n\nCarriers are unaffected by others with this gene.</description>
<iconPath>Things/Mote/Heart</iconPath>
<displayOrderInCategory>2</displayOrderInCategory>
<biostatCpx>1</biostatCpx>
<biostatMet>1</biostatMet>
<biostatCpx>1</biostatCpx>
<biostatMet>1</biostatMet>
</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>
</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>