diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll index ef1e04b..1855410 100644 Binary files a/CRIALactation/1.3/Assemblies/CRIALactation.dll and b/CRIALactation/1.3/Assemblies/CRIALactation.dll differ diff --git a/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml b/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml index f70d22a..d115507 100644 --- a/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml +++ b/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml @@ -18,6 +18,7 @@
  • Lactating_Essential
  • +
  • Lactating_MandatoryHucow
  • IdeoRole_HucowHandler
  • diff --git a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml index ed4be1b..6d76e2d 100644 --- a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml +++ b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml @@ -9,6 +9,8 @@ UI/Issues/Lactating + + Lactating_Essential Lactating @@ -86,7 +88,7 @@
  • - 15 + 20
  • @@ -157,4 +159,159 @@
  • + + + + + Lactating_MandatoryHucow + Lactating + + High + +
  • Hucow
  • +
    + 10 + 100 + Breast milk is the most natural sustenance. For all sizeable bosoms, maximum expression and hucow conversion is a duty. To not produce or eat a meal without breast milk is unthinkable. + +
  • + Lactating_MandatoryHucow + Colonists with sizeable breasts must become hucows + true +
  • +
  • + Lactating_MandatoryHucow_Social + true +
  • +
  • + DrankNonMilkMeal + DrankNonMilkMeal_MandatoryHucow +
  • +
  • + DrankMilkRaw + DrankMilkRaw_MandatoryHucow +
  • +
  • + DrankMilkMeal + DrankMilkMeal_MandatoryHucow +
  • +
    +
    + + + Lactating_MandatoryHucow + Thought_Situational + CRIALactation.ThoughtWorker_Precept_Lactating_Essential + +
  • + + Watching people's satisfied faces drink what I expressed gives me a motherly sense of pride. I'm the colony's cow. Moo! + 8 +
  • + +
  • + + I'm producing milk, but I'm not a cow yet. + -1 +
  • + +
  • + + It pains me to think my breasts aren't producing milk when we need it most. + -3 +
  • + +
  • + + My milk has run dry. I'm so embarrassed I don't think I can show my face in public. + -6 +
  • + +
  • + + What's my purpose if I have breasts but can't express milk? I'm useless! + -9 +
  • +
    +
    + + + Lactating_MandatoryHucow_Social + Thought_SituationalSocial + CRIALactation.ThoughtWorker_Precept_Lactating_Essential_Social + +
  • + + 25 +
  • +
  • + + -2 +
  • +
  • + + -5 +
  • +
  • + + -10 +
  • +
  • + + -15 +
  • + +
    +
    + + + DrankMilkRaw_MandatoryHucow + 1 + +
  • + + So divine, so succulent. Our cows produce delicious milk. + 7 +
  • +
    +
    + + + DrankMilkMeal_MandatoryHucow + 1 + +
  • + + The breast milk accentuated my meal beautifully. + 3 +
  • +
    +
    + + + DrankNonMilkMeal_MandatoryHucow + 1 + +
  • + + Gross! I had to eat food that didn't contain breast milk. This is a disgrace to my beliefs. + -4 +
  • +
    +
    + + + NoRecentHumanMilk_MandatoryHucow + Thought_Situational + CRIALactation.ThoughtWorker_Precept_NoRecentHumanMilk + True + +
  • + + I haven't had breast milk in days. My body feels weak. + -7 +
  • +
    +
    + diff --git a/CRIALactation/Source/LactationUtility.cs b/CRIALactation/Source/LactationUtility.cs index 99be2a4..a32e055 100644 --- a/CRIALactation/Source/LactationUtility.cs +++ b/CRIALactation/Source/LactationUtility.cs @@ -71,13 +71,13 @@ namespace CRIALactation var drugLact = p.health.hediffSet.GetFirstHediffOfDef(HediffDefOf_Milk.Lactating_Drug); if(drugLact != null) { - drugLact.TryGetComp().ticksToDisappear = 600000; + drugLact.TryGetComp().ticksToDisappear = 1800000; } var naturalLact = p.health.hediffSet.GetFirstHediffOfDef(HediffDefOf_Milk.Lactating_Natural); if (naturalLact != null) { - naturalLact.TryGetComp().ticksToDisappear = 600000; + naturalLact.TryGetComp().ticksToDisappear = 1800000; } } diff --git a/CRIALactation/Source/PreceptDefOf/PreceptDefOf_Lactation.cs b/CRIALactation/Source/PreceptDefOf/PreceptDefOf_Lactation.cs index ac0a438..0418597 100644 --- a/CRIALactation/Source/PreceptDefOf/PreceptDefOf_Lactation.cs +++ b/CRIALactation/Source/PreceptDefOf/PreceptDefOf_Lactation.cs @@ -17,6 +17,7 @@ namespace CRIALactation } public static PreceptDef Lactating_Essential; + public static PreceptDef Lactating_MandatoryHucow; //public static PreceptDef IdeoRole_Hucow; } diff --git a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs index ba9cdf0..57e788c 100644 --- a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs +++ b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs @@ -16,8 +16,9 @@ namespace CRIALactation public override void Notify_MemberGenerated(Pawn pawn, Precept precept) { - if(precept.def == PreceptDefOf_Lactation.Lactating_Essential && - LactationUtility.HasMilkableBreasts(pawn)) + if((precept.def == PreceptDefOf_Lactation.Lactating_Essential + || precept.def == PreceptDefOf_Lactation.Lactating_MandatoryHucow) + && LactationUtility.HasMilkableBreasts(pawn)) { if (!LactationUtility.IsLactating(pawn))