From 266356123e8bf5eff4b0268c8c7546dcb7567eea Mon Sep 17 00:00:00 2001
From: c0ffee <platinumspoons@gmail.com>
Date: Wed, 10 Aug 2022 19:13:43 -0700
Subject: [PATCH] removed ability for handler to convert themselves to hucow
 buffed hucow movement speed added role requirement min animal skill to hucow
 handler buffed their gather speed and milk induction yield

---
 .../Defs/AbilityDefs/Abilities_Hucow.xml        | 10 +++++++---
 CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml |  2 +-
 .../PreceptDefs/Precepts_Lactating_Role.xml     | 17 ++++++++++++++++-
 .../HarmonyPatches/HarmonyPatch_FoodUtility.cs  |  2 +-
 .../JobDrivers/JobDriver_MassageBreasts.cs      |  1 +
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml b/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml
index f16e646..285604d 100644
--- a/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml
+++ b/CRIALactation/Defs/AbilityDefs/Abilities_Hucow.xml
@@ -11,7 +11,11 @@
         <showPsycastEffects>False</showPsycastEffects>
         <displayGizmoWhileUndrafted>True</displayGizmoWhileUndrafted>
         <disableGizmoWhileUndrafted>False</disableGizmoWhileUndrafted>
-        <hotKey>Misc12</hotKey>
+
+		<overrideGroupCooldown>True</overrideGroupCooldown>
+		<cooldownTicksRange>30000</cooldownTicksRange>
+
+		<hotKey>Misc12</hotKey>
         <uiOrder>4</uiOrder>
         <warmupStartSound>WorkDrive_Warmup</warmupStartSound>
         <statBases>
@@ -24,10 +28,10 @@
           <warmupTime>3.0</warmupTime>
           <targetParams>
             <canTargetAnimals>false</canTargetAnimals>
-            <canTargetSelf>true</canTargetSelf>
+            <canTargetSelf>false</canTargetSelf>
             <canTargetBuildings>false</canTargetBuildings>
             <canTargetMechs>false</canTargetMechs>
-            <onlyTargetColonists>true</onlyTargetColonists>
+			<onlyTargetColonistsOrPrisonersOrSlaves>true</onlyTargetColonistsOrPrisonersOrSlaves>
           </targetParams>
         </verbProperties>
         <comps>
diff --git a/CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml b/CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml
index 9ef22fb..fa48966 100644
--- a/CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml
+++ b/CRIALactation/Defs/HediffDefs/Hediffs_Hucow.xml
@@ -16,7 +16,7 @@
 					<MilkProductionYield>2.75</MilkProductionYield>
 					<MilkProductionSpeed>0.5</MilkProductionSpeed>
 					<WorkSpeedGlobal>0.4</WorkSpeedGlobal>
-					<MoveSpeed>0.4</MoveSpeed>
+					<MoveSpeed>0.65</MoveSpeed>
 				</statFactors>
 			</li>
 		</stages>
diff --git a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml
index 465ae3c..cab6710 100644
--- a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml
+++ b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating_Role.xml
@@ -33,17 +33,32 @@
 	<PreceptDef ParentName="PreceptRoleSingleBase">
 		<defName>IdeoRole_HucowHandler</defName>
 		<label>hucow handler</label>
-		<description>A special ideoligious status which can convert lactating pawns to hucows, increasing their lactation yield at the cost of their work and movement speed.</description>
+		<description>A special ideoligious status which can convert lactating pawns to hucows, increasing their lactation yield at the cost of their work and movement speed. \n\nThey also receive an increase in the speed at which they harvest milk, and the speed at which they induce lactation in other pawns.</description>
 		<iconPath>UI/Roles/SpecialistMelee</iconPath>
 		<nameMaker>NamerRoleMoralist</nameMaker>
 		<roleTags>
 			<li>HucowHandler</li>
 		</roleTags>
+		
 		<roleRequirements>
 			<li Class="RoleRequirement_SameIdeo">
 				<labelKey>RoleRequirementLabelSameIdeo</labelKey>
 			</li>
+			<li Class="RoleRequirement_MinSkillAny">
+				<skills>
+					<Animals>6</Animals>
+				</skills>
+			</li>
+
 		</roleRequirements>
+
+		<roleEffects>
+			<li Class="RoleEffect_PawnStatOffset">
+				<statDef>AnimalGatherSpeed</statDef>
+				<modifier>0.7</modifier>
+			</li>
+		</roleEffects>
+		
 		<roleApparelRequirements>
 			<li>
 				<requirement>
diff --git a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs
index 57c52de..dbcc083 100644
--- a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs
+++ b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs
@@ -81,4 +81,4 @@ namespace CRIALactation
         }
 
     }
-}
+}
\ No newline at end of file
diff --git a/CRIALactation/Source/JobDrivers/JobDriver_MassageBreasts.cs b/CRIALactation/Source/JobDrivers/JobDriver_MassageBreasts.cs
index 4092ef0..7910b6a 100644
--- a/CRIALactation/Source/JobDrivers/JobDriver_MassageBreasts.cs
+++ b/CRIALactation/Source/JobDrivers/JobDriver_MassageBreasts.cs
@@ -37,6 +37,7 @@ namespace CRIALactation
             massage.tickAction = delegate ()
             {
                 pawn.skills.Learn(SkillDefOf.Animals, 0.13f, false);
+
                 massageProgress += pawn.GetStatValue(StatDefOf.AnimalGatherSpeed, true);
 
             };