diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll
index aaf664b..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/JobDefs/Jobs_CRIALactation.xml b/CRIALactation/Defs/JobDefs/Jobs_CRIALactation.xml
index 970f70b..776d708 100644
--- a/CRIALactation/Defs/JobDefs/Jobs_CRIALactation.xml
+++ b/CRIALactation/Defs/JobDefs/Jobs_CRIALactation.xml
@@ -6,4 +6,4 @@
stimulating TargetA's breasts.
true
-
+
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 3b29d9c..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
@@ -157,4 +159,159 @@
+
+
+
+
+ Lactating_MandatoryHucow
+ Lactating
+ required (mandatory hucow)
+ 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
+
+
+ producing milk (hucow)
+ Watching people's satisfied faces drink what I expressed gives me a motherly sense of pride. I'm the colony's cow. Moo!
+ 8
+
+
+
+ producing milk
+ I'm producing milk, but I'm not a cow yet.
+ -1
+
+
+
+ not producing milk
+ It pains me to think my breasts aren't producing milk when we need it most.
+ -3
+
+
+
+ not producing milk
+ My milk has run dry. I'm so embarrassed I don't think I can show my face in public.
+ -6
+
+
+
+ not producing milk
+ 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
+
+
+ hucow
+ 25
+
+
+ producing milk
+ -2
+
+
+ not producing milk (low expectations)
+ -5
+
+
+ not producing milk (moderate expectations)
+ -10
+
+
+ not producing milk (high expectations)
+ -15
+
+
+
+
+
+
+ DrankMilkRaw_MandatoryHucow
+ 1
+
+
+ Drank human milk
+ So divine, so succulent. Our cows produce delicious milk.
+ 7
+
+
+
+
+
+ DrankMilkMeal_MandatoryHucow
+ 1
+
+
+ Ate meal with human milk
+ The breast milk accentuated my meal beautifully.
+ 3
+
+
+
+
+
+ DrankNonMilkMeal_MandatoryHucow
+ 1
+
+
+ Ate non-human milk food
+ 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
+
+
+ want human milk
+ I haven't had breast milk in days. My body feels weak.
+ -7
+
+
+
+
diff --git a/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs b/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs
index cd8ebf5..a722532 100644
--- a/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs
+++ b/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs
@@ -18,7 +18,6 @@ namespace CRIALactation
public static HediffDef Lactating_Drug;
public static HediffDef Lactating_Permanent;
public static HediffDef Heavy_Lactating_Permanent;
- public static HediffDef Orassan_Lactating_Permanent;
public static HediffDef Lactating_Natural;
public static HediffDef Hucow;
diff --git a/CRIALactation/Source/LactationUtility.cs b/CRIALactation/Source/LactationUtility.cs
index 14dbc0d..a32e055 100644
--- a/CRIALactation/Source/LactationUtility.cs
+++ b/CRIALactation/Source/LactationUtility.cs
@@ -19,8 +19,7 @@ namespace CRIALactation
p.health.hediffSet.HasHediff(HediffDefOf_Milk.Lactating_Natural, false) ||
p.health.hediffSet.HasHediff(HediffDefOf_Milk.Lactating_Drug, false) ||
p.health.hediffSet.HasHediff(HediffDefOf_Milk.Lactating_Permanent, false) ||
- p.health.hediffSet.HasHediff(HediffDefOf_Milk.Heavy_Lactating_Permanent, false) ||
- p.health.hediffSet.HasHediff(HediffDefOf_Milk.Orassan_Lactating_Permanent, false);
+ p.health.hediffSet.HasHediff(HediffDefOf_Milk.Heavy_Lactating_Permanent, false);
}
@@ -72,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))