AblativeAbsolute
/
rjw_menstruation
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1.0.1.14

This commit is contained in:
moreoreganostodump 2021-03-28 23:58:52 +09:00
parent 924d085a5b
commit 0d513a46c2
5 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
About/Manifest.xml
View File

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

BIN
Assemblies/RJW_Menstruation.dll
View File

Binary file not shown.

4
changelogs.txt
View File

@ -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 Version 1.0.1.13
- requires RJW 4.6.1 or later - requires RJW 4.6.1 or later
- added induced ovulator - added induced ovulator

32
source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
View File

@ -1020,7 +1020,7 @@ namespace RJW_Menstruation
return false; return false;
} }
private Pawn Fertilize() protected Pawn Fertilize()
{ {
if (cums.NullOrEmpty()) return null; if (cums.NullOrEmpty()) return null;
foreach (Cum cum in cums) foreach (Cum cum in cums)
@ -1036,7 +1036,7 @@ namespace RJW_Menstruation
} }
//for now, only one egg can be implanted //for now, only one egg can be implanted
private bool Implant() protected bool Implant()
{ {
if (!eggs.NullOrEmpty()) if (!eggs.NullOrEmpty())
{ {
@ -1107,7 +1107,7 @@ namespace RJW_Menstruation
return false; return false;
} }
private void BleedOut() protected void BleedOut()
{ {
//FilthMaker.TryMakeFilth(parent.pawn.Position, parent.pawn.Map, ThingDefOf.Filth_Blood,parent.pawn.Label); //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); 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
/// </summary> /// </summary>
/// <param name="cum"></param> /// <param name="cum"></param>
/// <param name="amount"></param> /// <param name="amount"></param>
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"); if (amount >= minmakefilthvalue) FilthMaker.TryMakeFilth(parent.pawn.Position, parent.pawn.Map, cum.FilthDef, cum.pawn?.LabelShort ?? "Unknown");
} }
@ -1131,7 +1131,7 @@ namespace RJW_Menstruation
/// <param name="amount"></param> /// <param name="amount"></param>
/// <param name="absorber"></param> /// <param name="absorber"></param>
/// <returns></returns> /// <returns></returns>
private float AbsorbCum(Cum cum, float amount, Absorber absorber) protected float AbsorbCum(Cum cum, float amount, Absorber absorber)
{ {
if (absorber != null) if (absorber != null)
@ -1163,7 +1163,7 @@ namespace RJW_Menstruation
return 0; return 0;
} }
private float MakeCumFilthMixture(float amount, List<string> cumlabels) protected float MakeCumFilthMixture(float amount, List<string> cumlabels)
{ {
if (amount >= minmakefilthvalue) if (amount >= minmakefilthvalue)
@ -1176,7 +1176,7 @@ namespace RJW_Menstruation
private void EggDecay() protected void EggDecay()
{ {
List<Egg> deadeggs = new List<Egg>(); List<Egg> deadeggs = new List<Egg>();
foreach (Egg egg in eggs) 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 hediff = HediffMaker.MakeHediff(VariousDefOf.Hediff_MenstrualCramp, parent.pawn);
hediff.Severity = crampPain * Rand.Range(0.9f, 1.1f); 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)); 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); if (fertilizer.def.defName == parent.pawn.def.defName) return 1.0f;
else return RJWPregnancySettings.interspecies_impregnation_modifier; 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); float rand = Rand.Range(0.0f, 1.0f);
if (rand < 0.01f) return Rand.Range(0.0f, 0.2f); 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); else return Rand.Range(0.6f, 1.0f);
} }
private Stage RandomStage() protected Stage RandomStage()
{ {
int rand = Rand.Range(0, 2); int rand = Rand.Range(0, 2);

24
source/RJW_Menstruation/RJW_Menstruation/Utility.cs
View File

@ -139,22 +139,12 @@ namespace RJW_Menstruation
if (hediff is Hediff_BasePregnancy) if (hediff is Hediff_BasePregnancy)
{ {
Hediff_BasePregnancy h = (Hediff_BasePregnancy)hediff; Hediff_BasePregnancy h = (Hediff_BasePregnancy)hediff;
return h?.babies?.First() ?? null; if (!h.babies.NullOrEmpty()) return h.babies.First();
} else
//else if (hediff is Hediff_HumanlikePregnancy) {
//{ Log.Error("Baby not exist: baby was not created or removed");
// Hediff_HumanlikePregnancy h = (Hediff_HumanlikePregnancy)hediff; return null;
// 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;
} }
@ -368,7 +358,7 @@ namespace RJW_Menstruation
} }
} }
} }
} }