Compare commits

...

4 commits

Author SHA1 Message Date
ADHD_Coder
32b4eb9f34 Merge branch 'forceTwinDrug' into 'dev'
Add drug forcing enzygotic twin creation

See merge request lutepickle/rjw_menstruation!9
2024-06-23 12:55:25 +00:00
lutepickle
fae1d4f2e1 Update changelog 2024-06-23 05:41:29 -07:00
lutepickle
b999c82ebd Check for null genes in VEGeneBloodDef 2024-06-23 05:38:49 -07:00
ADHD_Coder
b5705ccbd9 Add Doublex, identical twin creating drug 2024-06-09 09:24:07 -07:00
8 changed files with 88 additions and 3 deletions

Binary file not shown.

View file

@ -91,6 +91,48 @@
</comps>
</ThingDef>
<ThingDef ParentName="MakeableDrugPillBase">
<defName>Doublex</defName>
<label>doublex</label>
<description>Glittertech drug that causes fertilized eggs to produce enzygotic twins.</description>
<graphicData>
<texPath>Things/Item/SIA</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<rotatable>false</rotatable>
<statBases>
<WorkToMake>800</WorkToMake>
<MarketValue>250</MarketValue>
<Mass>0.01</Mass>
</statBases>
<techLevel>Ultra</techLevel>
<ingestible>
<drugCategory>Medical</drugCategory>
<outcomeDoers>
<li Class="IngestionOutcomeDoer_GiveHediff">
<hediffDef>Hediff_Doublex</hediffDef>
<severity>1.0</severity>
</li>
</outcomeDoers>
</ingestible>
<recipeMaker>
<researchPrerequisite>DrugProduction</researchPrerequisite>
<recipeUsers>
<li>DrugLab</li>
</recipeUsers>
</recipeMaker>
<costList>
<MedicineUltratech>3</MedicineUltratech>
<Neutroamine>2</Neutroamine>
</costList>
<comps>
<li Class="CompProperties_Drug">
<addictiveness>0</addictiveness>
<listOrder>1000</listOrder>
</li>
</comps>
</ThingDef>
<ThingDef ParentName="MakeableDrugPillBase">
<defName>PainReliever</defName>
<label>Pain reliever</label>

View file

@ -164,6 +164,32 @@
</comps>
</HediffDef>
<HediffDef Name="Hediff_Doublex">
<hediffClass>HediffWithComps</hediffClass>
<defName>Hediff_Doublex</defName>
<label>Doublex</label>
<labelNoun>doublex</labelNoun>
<description>Ultratech drug that causes fertilized eggs to split resulting in identical twins.</description>
<defaultLabelColor>(0.75,0.75,1.0)</defaultLabelColor>
<isBad>false</isBad>
<tendable>false</tendable>
<makesSickThought>false</makesSickThought>
<makesAlert>false</makesAlert>
<maxSeverity>5</maxSeverity>
<initialSeverity>1.0</initialSeverity>
<stages>
<li>
<becomeVisible>true</becomeVisible>
</li>
</stages>
<comps>
<li Class="HediffCompProperties_SeverityPerDay">
<severityPerDay>-0.5</severityPerDay>
</li>
</comps>
</HediffDef>
<HediffDef Name="Hediff_PainReliever">
<hediffClass>HediffWithComps</hediffClass>

View file

@ -8,7 +8,7 @@ namespace RJW_Menstruation
{
public static ThingDef VEGeneBloodDef(Pawn pawn)
{
if (!ModsConfig.BiotechActive) return null;
if (!ModsConfig.BiotechActive || pawn.genes == null) return null;
foreach(Gene gene in pawn.genes.GenesListForReading.Where(gene => gene.Active))
{
ThingDef bloodDef = gene.def.GetModExtension<GeneExtension>()?.customBloodThingDef;

View file

@ -320,7 +320,20 @@ namespace RJW_Menstruation
Pawn firstbaby = null;
int traitSeed = Rand.Int;
List<Trait> parentTraits = GetInheritableTraits(mother, father);
while (Rand.Chance(Configurations.EnzygoticTwinsChance) && division < Configurations.MaxEnzygoticTwins) division++;
//TODO: turn this into a proper function that can handle genes, fertility boosts, genital type effects etc.
float eTwinChance = Configurations.EnzygoticTwinsChance;
//Log.Message($"RJW_Menstration :: Configurations.EnzygoticTwinsChance = {Configurations.EnzygoticTwinsChance}");
if (mother.health.hediffSet.HasHediff(VariousDefOf.Hediff_Doublex))
{
division++;
eTwinChance = eTwinChance + (1 - eTwinChance) / 4;
}
//Log.Message($"RJW_Menstration :: TwinChance = {eTwinChance}");
while (Rand.Chance(eTwinChance) && division < Configurations.MaxEnzygoticTwins) division++;
//Log.Message($"RJW_Menstration :: division = {division}");
for (int i = 0; i < division; i++)
{
Pawn baby = GenerateBaby(request, mother, father, parentTraits, traitSeed);

View file

@ -22,6 +22,7 @@ namespace RJW_Menstruation
public static readonly HediffDef Hediff_Estrus_Concealed = DefDatabase<HediffDef>.GetNamed("Hediff_Estrus_Concealed");
public static readonly HediffDef Hediff_AffectedByPheromones = DefDatabase<HediffDef>.GetNamed("Hediff_AffectedByPheromones");
public static readonly HediffDef Hediff_ASA = DefDatabase<HediffDef>.GetNamed("Hediff_ASA");
public static readonly HediffDef Hediff_Doublex = DefDatabase<HediffDef>.GetNamed("Hediff_Doublex");
public static readonly StatDef MaxAbsorbable = DefDatabase<StatDef>.GetNamed("MaxAbsorbable");
public static readonly NeedDef SexNeed = DefDatabase<NeedDef>.GetNamed("Sex");
public static readonly JobDef VaginaWashing = DefDatabase<JobDef>.GetNamed("VaginaWashing");

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>RJW Menstruation</identifier>
<version>1.5.0.0</version>
<version>1.5.0.1</version>
<dependencies>
</dependencies>
<incompatibleWith />

View file

@ -1,3 +1,6 @@
Version 1.5.0.1
- Fix error getting blood color of pawns without genes.
Version 1.5.0.0
- Support for RimWorld 1.5. All future changes to Menstruation will only be for RimWorld 1.5.
- Updated Traditional Chinese translation by Hydrogen.