AblativeAbsolute/rjw-genes
1
0
Fork 0
mirror of https://github.com/vegapnk/RJW-Genes.git synced 2024-08-15 00:23:31 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity

Fixed PregnancyOVerwrite by only taking into account male fertility

Browse source
This commit is contained in:
Vegapnk 2024-07-08 19:43:33 +02:00
parent 991edfdff0
commit 980458e4fa
3 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Common/Defs/GeneDefs/GeneDefs_Breeding.xml
View file

@ -153,21 +153,4 @@
<biostatMet>0</biostatMet> <biostatMet>0</biostatMet>
</GeneDef> </GeneDef>
<GeneDef ParentName="BreedingBase">
<defName>rjw_genes_pregnancy_overwrite</defName>
<label>Sperm Displacement</label>
<description>Carriers of this gene can 'overwrite' an existing pregnancy, keeping the progress but effectively replacing the father.</description>
<iconPath>Genes/Icons/RJW_Genes_PheromoneSpit</iconPath>
<displayOrderInCategory>75</displayOrderInCategory>
<biostatCpx>4</biostatCpx>
<biostatMet>-2</biostatMet>
<modExtensions>
<!-- DevNote: The chance will be multiplied by both pawns' Fertility! -->
<li Class="RJW_Genes.ChanceExtension">
<chance>0.5</chance>
</li>
</modExtensions>
</GeneDef>
</Defs> </Defs>

2
Common/Defs/GeneDefs/GeneDefs_Cum.xml
View file

@ -60,7 +60,7 @@
<biostatMet>-1</biostatMet> <biostatMet>-1</biostatMet>
<modExtensions> <modExtensions>
<li Class="RJW_Genes.MultiplierExtension"> <li Class="RJW_Genes.MultiplierExtension">
<multiplier>20.0</multiplier> <multiplier>15.0</multiplier>
</li> </li>
</modExtensions> </modExtensions>
</GeneDef> </GeneDef>

17
Source/Genes/Special/Patches/Patch_PregnancyOverwrite.cs
View file

@ -40,8 +40,6 @@ namespace RJW_Genes
if (!pawn.IsPregnant() && !partner.IsPregnant()) if (!pawn.IsPregnant() && !partner.IsPregnant())
return; return;
ModLog.Debug("Firing Pregnancy Overwrite Patch - Passed Simple NullChecks");
if (pawn.IsPregnant() if (pawn.IsPregnant()
&& GeneUtility.HasGeneNullCheck(partner, GeneDefOf.rjw_genes_pregnancy_overwrite)) && GeneUtility.HasGeneNullCheck(partner, GeneDefOf.rjw_genes_pregnancy_overwrite))
TryReplacePregnancy(partner, pawn); TryReplacePregnancy(partner, pawn);
@ -62,9 +60,10 @@ namespace RJW_Genes
/// <param name="pregnant"></param> /// <param name="pregnant"></param>
public static void TryReplacePregnancy(Pawn replacer, Pawn pregnant) public static void TryReplacePregnancy(Pawn replacer, Pawn pregnant)
{ {
ModLog.Debug($"Firing Pregnancy Overwrite for {replacer} and {pregnant}");
// DevNote:
// There are some issues with just checking PregnancyUtility.PregnancyChanceForPartners or rjw.PregnancyHelper.CanImpregnate
// Both do give 0.0 chance when the pawn is already pregnant, which does not help me :/
Hediff pregnancyHediff = PregnancyUtility.GetPregnancyHediff(pregnant); Hediff pregnancyHediff = PregnancyUtility.GetPregnancyHediff(pregnant);
if (pregnancyHediff == null) if (pregnancyHediff == null)
return; return;
@ -77,10 +76,12 @@ namespace RJW_Genes
ChanceExtension chanceExt = GeneDefOf.rjw_genes_pregnancy_overwrite.GetModExtension<ChanceExtension>(); ChanceExtension chanceExt = GeneDefOf.rjw_genes_pregnancy_overwrite.GetModExtension<ChanceExtension>();
float chance = chanceExt != null ? chanceExt.chance : 0.25f; float chance = chanceExt != null ? chanceExt.chance : 0.25f;
chance *= PregnancyUtility.PregnancyChanceForPartners(pregnant, replacer); float replacerFert = replacer.GetStatValueForPawn(StatDefOf.Fertility, replacer);
chance *= replacerFert ;
if ((new Random()).Next() < chance) double roll = (new Random()).NextDouble();
if (roll < chance)
{ {
ModLog.Debug($"Pregnancy-Overwrite for {replacer} and {pregnant}.");
float gestationProgress = pregnancyHediff.Severity; float gestationProgress = pregnancyHediff.Severity;
PregnancyUtility.ForceEndPregnancy(pregnant); PregnancyUtility.ForceEndPregnancy(pregnant);
@ -92,7 +93,7 @@ namespace RJW_Genes
FactionUtility.HandleFactionGoodWillPenalties(replacer, pregnant, "rjw_genes_GoodwillChangedReason_OverwritePregnancy", FACTION_GOODWILL_CHANGE); FactionUtility.HandleFactionGoodWillPenalties(replacer, pregnant, "rjw_genes_GoodwillChangedReason_OverwritePregnancy", FACTION_GOODWILL_CHANGE);
} else } else
{ {
ModLog.Debug($"Did not Pregnancy-Overwrite for {replacer} and {pregnant}. Failed: roll<({chanceExt.chance} x {PregnancyUtility.PregnancyChanceForPartners(pregnant,replacer)}[PregnancyChance for Pawns])"); ModLog.Debug($"Did not Pregnancy-Overwrite for {replacer} and {pregnant}. Failed: Rolled {roll} <({chanceExt.chance}[XML-Chance] x {replacerFert} [Fert:{replacer}])");
} }
} }