From 0d513a46c25635a0056153cc989a841725c64323 Mon Sep 17 00:00:00 2001 From: moreoreganostodump Date: Sun, 28 Mar 2021 23:58:52 +0900 Subject: [PATCH] 1.0.1.14 --- About/Manifest.xml | 2 +- Assemblies/RJW_Menstruation.dll | Bin 87040 -> 87040 bytes changelogs.txt | 4 +++ .../HediffComps/HediffComp_Menstruation.cs | 32 ++++++++++-------- .../RJW_Menstruation/Utility.cs | 24 ++++--------- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/About/Manifest.xml b/About/Manifest.xml index ced33c3..b6ce083 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW Menstruation - 1.0.1.13 + 1.0.1.14 diff --git a/Assemblies/RJW_Menstruation.dll b/Assemblies/RJW_Menstruation.dll index 977494d8697502ea84e385ca2426c26381250ace..24913f1888b7f7fdfeeec26a22ef58a7b895b1ca 100644 GIT binary patch delta 13227 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 delta 13206 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 T-BU?#XKpe+%YI>1i7x*Q2ft|w diff --git a/changelogs.txt b/changelogs.txt index 0574f05..d0137d1 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,3 +1,7 @@ +Version 1.0.1.14 + - requires RJW 4.6.1 or later + - fixed interspecies factor applied to normal pregnancy + Version 1.0.1.13 - requires RJW 4.6.1 or later - added induced ovulator diff --git a/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index b3df198..a7c2ef2 100644 --- a/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -1020,7 +1020,7 @@ namespace RJW_Menstruation return false; } - private Pawn Fertilize() + protected Pawn Fertilize() { if (cums.NullOrEmpty()) return null; foreach (Cum cum in cums) @@ -1036,7 +1036,7 @@ namespace RJW_Menstruation } //for now, only one egg can be implanted - private bool Implant() + protected bool Implant() { if (!eggs.NullOrEmpty()) { @@ -1107,7 +1107,7 @@ namespace RJW_Menstruation return false; } - private void BleedOut() + protected void BleedOut() { //FilthMaker.TryMakeFilth(parent.pawn.Position, parent.pawn.Map, ThingDefOf.Filth_Blood,parent.pawn.Label); CumIn(parent.pawn, Rand.Range(0.02f * Configurations.BleedingAmount, 0.04f * Configurations.BleedingAmount), Translations.Menstrual_Blood, -5.0f, ThingDefOf.Filth_Blood); @@ -1119,7 +1119,7 @@ namespace RJW_Menstruation /// /// /// - private void MakeCumFilth(Cum cum, float amount) + protected void MakeCumFilth(Cum cum, float amount) { if (amount >= minmakefilthvalue) FilthMaker.TryMakeFilth(parent.pawn.Position, parent.pawn.Map, cum.FilthDef, cum.pawn?.LabelShort ?? "Unknown"); } @@ -1131,7 +1131,7 @@ namespace RJW_Menstruation /// /// /// - private float AbsorbCum(Cum cum, float amount, Absorber absorber) + protected float AbsorbCum(Cum cum, float amount, Absorber absorber) { if (absorber != null) @@ -1163,7 +1163,7 @@ namespace RJW_Menstruation return 0; } - private float MakeCumFilthMixture(float amount, List cumlabels) + protected float MakeCumFilthMixture(float amount, List cumlabels) { if (amount >= minmakefilthvalue) @@ -1176,7 +1176,7 @@ namespace RJW_Menstruation - private void EggDecay() + protected void EggDecay() { List deadeggs = new List(); foreach (Egg egg in eggs) @@ -1196,7 +1196,7 @@ namespace RJW_Menstruation } } - private void AddCrampPain() + protected void AddCrampPain() { Hediff hediff = HediffMaker.MakeHediff(VariousDefOf.Hediff_MenstrualCramp, parent.pawn); hediff.Severity = crampPain * Rand.Range(0.9f, 1.1f); @@ -1578,18 +1578,22 @@ namespace RJW_Menstruation } - private int PeriodRandomizer(int intervalhours, float deviation) + protected int PeriodRandomizer(int intervalhours, float deviation) { return intervalhours + (int)(intervalhours * Rand.Range(-deviation, deviation)); } - private float InterspeciesImplantFactor(Pawn fertilizer) + protected float InterspeciesImplantFactor(Pawn fertilizer) { - if (RJWPregnancySettings.complex_interspecies) return SexUtility.BodySimilarity(parent.pawn, fertilizer); - else return RJWPregnancySettings.interspecies_impregnation_modifier; + if (fertilizer.def.defName == parent.pawn.def.defName) return 1.0f; + else + { + if (RJWPregnancySettings.complex_interspecies) return SexUtility.BodySimilarity(parent.pawn, fertilizer); + else return RJWPregnancySettings.interspecies_impregnation_modifier; + } } - private float PainRandomizer() + protected float PainRandomizer() { float rand = Rand.Range(0.0f, 1.0f); if (rand < 0.01f) return Rand.Range(0.0f, 0.2f); @@ -1599,7 +1603,7 @@ namespace RJW_Menstruation else return Rand.Range(0.6f, 1.0f); } - private Stage RandomStage() + protected Stage RandomStage() { int rand = Rand.Range(0, 2); diff --git a/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/source/RJW_Menstruation/RJW_Menstruation/Utility.cs index 61324fe..e47f545 100644 --- a/source/RJW_Menstruation/RJW_Menstruation/Utility.cs +++ b/source/RJW_Menstruation/RJW_Menstruation/Utility.cs @@ -139,22 +139,12 @@ namespace RJW_Menstruation if (hediff is Hediff_BasePregnancy) { Hediff_BasePregnancy h = (Hediff_BasePregnancy)hediff; - return h?.babies?.First() ?? null; - } - //else if (hediff is Hediff_HumanlikePregnancy) - //{ - // Hediff_HumanlikePregnancy h = (Hediff_HumanlikePregnancy)hediff; - // return h?.babies?.First() ?? null; - //} - //else if (hediff is Hediff_BestialPregnancy) - //{ - // Hediff_BestialPregnancy h = (Hediff_BestialPregnancy)hediff; - // return h?.babies?.First() ?? null; - //} - else if (hediff is Hediff_MechanoidPregnancy) - { - Hediff_MechanoidPregnancy h = (Hediff_MechanoidPregnancy)hediff; - return h?.babies?.First() ?? null; + if (!h.babies.NullOrEmpty()) return h.babies.First(); + else + { + Log.Error("Baby not exist: baby was not created or removed"); + return null; + } } @@ -368,7 +358,7 @@ namespace RJW_Menstruation } } - + } }