AblativeAbsolute/coffees-rjw-ideology-addons
1
0
Fork 0
mirror of https://gitgud.io/c0ffeeeeeeee/coffees-rjw-ideology-addons.git synced 2024-08-14 23:57:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge from master

Browse source
This commit is contained in:
c0ffee 2021-11-23 16:51:46 -08:00
commit b8490c185a
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
CRIALactation/Source/Comps/CompInduceLactation.cs
View file

@ -31,13 +31,7 @@ namespace CRIALactation
{ {
return; return;
} }
if (LactationUtility.IsLactating(p)) if (LactationUtility.IsLactating(p) || !isActive)
{
InductionCompletionPercent = 0.8f;
isActive = false;
return;
}
if (!isActive)
{ {
return; return;
} }
@ -54,8 +48,7 @@ namespace CRIALactation
Find.LetterStack.ReceiveLetter(letter); Find.LetterStack.ReceiveLetter(letter);
LactationUtility.StartLactating(p, true); LactationUtility.StartLactating(p, true);
isActive = false; InductionCompletionPercent = 0.90f + Random.Range(0f, 5f); //start at 90-95% in case they ever lose lactating again
InductionCompletionPercent = 0.80f; //start at 80% in case they ever lose lactating again
} }
} }
@ -83,7 +76,7 @@ namespace CRIALactation
if(isActive) if(isActive)
{ {
//stop trying to induce lactation //stop trying to induce lactation
yield return new FloatMenuOption("Undesignate induce lactation", () => yield return new FloatMenuOption("Stop inducing lactation", () =>
{ {
isActive = false; isActive = false;
}); });
@ -91,7 +84,7 @@ namespace CRIALactation
else else
{ {
//induce lactation //induce lactation
yield return new FloatMenuOption("Designate induce lactation", () => yield return new FloatMenuOption("Start inducing lactation", () =>
{ {
isActive = true; isActive = true;
}); });
@ -99,7 +92,7 @@ namespace CRIALactation
} }
else else
{ {
yield return new FloatMenuOption("Designate induce lactation (no milkable breasts)", null); yield return new FloatMenuOption("Start inducing lactation (no milkable breasts)", null);
} }
yield break; yield break;

7
CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential.cs
View file

@ -36,7 +36,12 @@ namespace CRIALactation
return ThoughtState.ActiveAtStage(1); return ThoughtState.ActiveAtStage(1);
} }
if(ExpectationsUtility.CurrentExpectationFor(p).order <= ExpectationDefOf.VeryLow.order) if (!p.ageTracker.Adult)
{
return false;
}
if (ExpectationsUtility.CurrentExpectationFor(p).order <= ExpectationDefOf.VeryLow.order)
{ {
return ThoughtState.ActiveAtStage(2); return ThoughtState.ActiveAtStage(2);
} }

5
CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs
View file

@ -27,6 +27,11 @@ namespace CRIALactation
} }
if(!otherPawn.ageTracker.Adult)
{
return false;
}
if (ExpectationsUtility.CurrentExpectationFor(p).order <= ExpectationDefOf.VeryLow.order) if (ExpectationsUtility.CurrentExpectationFor(p).order <= ExpectationDefOf.VeryLow.order)
{ {
return ThoughtState.ActiveAtStage(2); return ThoughtState.ActiveAtStage(2);