Skip to content

Restrict Animals That Are Sick / Need Tending #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1.2
Choose a base branch
from
Open

Restrict Animals That Are Sick / Need Tending #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Languages/English/Keyed/Manager_Keyed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@
<FML.SendToMilkingArea.Tip>Restrict animals with milk fullness above 94% to a specific area.</FML.SendToMilkingArea.Tip>
<FML.SendToShearingArea>Restrict animals ready to be sheared</FML.SendToShearingArea>
<FML.SendToShearingArea.Tip>Restrict animals with shearing fullness above 94% to a specific area</FML.SendToShearingArea.Tip>
<FML.SendToSickArea>Restrict animals that are sick/injured</FML.SendToSickArea>
<FML.SendToSickArea.Tip>Restrict animals that are sick/injured to a specific area</FML.SendToSickArea.Tip>
<FM.Livestock.TargetCountsHeader>Target counts</FM.Livestock.TargetCountsHeader>
<FM.Livestock.AreaRestrictionsHeader>Area restrictions</FM.Livestock.AreaRestrictionsHeader>
<FM.Livestock.TrainingHeader>Training</FM.Livestock.TrainingHeader>
Expand Down
8 changes: 8 additions & 0 deletions Source/Helpers/Livestock/Utilities_Livestock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,14 @@ public static bool VisiblyPregnant( this Pawn pawn )
return pawn?.health.hediffSet.GetHediffs<Hediff_Pregnant>().Any( hp => hp.Visible ) ?? false;
}

public static bool AnimalIsSick( this Pawn pawn )
{
if (pawn.health.hediffSet.HasImmunizableNotImmuneHediff()) { return true; }
if (pawn.health.HasHediffsNeedingTend()) { return true; }
if (!pawn.health.capacities.CapableOf(PawnCapacityDefOf.Moving)) { return true; }
return false;
}

private static bool _milkable( this Pawn pawn )
{
var comp = pawn?.TryGetComp<CompMilkable>();
Expand Down
19 changes: 19 additions & 0 deletions Source/ManagerJobs/ManagerJob_Livestock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ public class ManagerJob_Livestock : ManagerJob
public bool RespectBonds = true;
public List<Area> RestrictArea;
public bool RestrictToArea;
public bool SendToSickArea;
public bool SendToMilkingArea;
public bool SendToShearingArea;
public bool SendToSlaughterArea;
public bool SendToTrainingArea;
public bool SetFollow;
public Area ShearArea;
public Area SickArea;
public Area SlaughterArea;
public Area TameArea;
public Pawn Trainer;
Expand Down Expand Up @@ -79,6 +81,10 @@ public ManagerJob_Livestock( Manager manager ) : base( manager )
SendToSlaughterArea = false;
SlaughterArea = null;

// set up sick area
SendToSickArea = false;
SickArea = null;

// set up milking area
SendToMilkingArea = false;
MilkArea = null;
Expand Down Expand Up @@ -306,6 +312,7 @@ public override void ExposeData()

// settings, references first!
Scribe_References.Look( ref TameArea, "TameArea" );
Scribe_References.Look( ref SickArea, "SickArea" );
Scribe_References.Look( ref SlaughterArea, "SlaughterArea" );
Scribe_References.Look( ref MilkArea, "MilkArea" );
Scribe_References.Look( ref ShearArea, "ShearArea" );
Expand All @@ -322,6 +329,7 @@ public override void ExposeData()
Scribe_Values.Look( ref ButcherBonded, "ButcherBonded" );
Scribe_Values.Look( ref RestrictToArea, "RestrictToArea" );
Scribe_Values.Look( ref SendToSlaughterArea, "SendToSlaughterArea" );
Scribe_Values.Look( ref SendToSickArea, "SendToSickArea" );
Scribe_Values.Look( ref SendToMilkingArea, "SendToMilkingArea" );
Scribe_Values.Look( ref SendToShearingArea, "SendToShearingArea" );
Scribe_Values.Look( ref SendToTrainingArea, "SendToTrainingArea" );
Expand Down Expand Up @@ -510,6 +518,17 @@ private void DoAreaRestrictions( ref bool actionTaken )
p.playerSettings.AreaRestriction = SlaughterArea;
}

// sick
else if (SendToSickArea && p.AnimalIsSick())
{
if (p.playerSettings.AreaRestriction != SickArea)
{
actionTaken = true;
p.playerSettings.AreaRestriction = SickArea;
}
}


// milking
else if ( SendToMilkingArea &&
p.GetComp<CompMilkable>() != null &&
Expand Down
21 changes: 21 additions & 0 deletions Source/ManagerTabs/ManagerTab_Livestock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,27 @@ private float DrawAreaRestrictionsSection( Vector2 pos, float width )
color: Color.grey );
}

// i think all tamed animals can at least require tending, if not get sick
// if there is some def-wide tamable animal that never gets sick or needs tending
// like pet mechanoids or something, that condition would go here. idk what it is.
if (true)
{
var sendToSickAreaRect = new Rect(pos.x, pos.y, width, ListEntryHeight);
pos.y += ListEntryHeight;
DrawToggle(sendToSickAreaRect,
"FML.SendToSickArea".Translate(),
"FML.SendToSickArea.Tip".Translate(),
ref _selectedCurrent.SendToSickArea);

if (_selectedCurrent.SendToSickArea)
{
var sickAreaRect = new Rect(pos.x, pos.y, width, ListEntryHeight);
AreaAllowedGUI.DoAllowedAreaSelectors(sickAreaRect, ref _selectedCurrent.SickArea,
manager);
pos.y += ListEntryHeight;
}
}

if ( _selectedCurrent.Trigger.pawnKind.Milkable() )
{
var sendToMilkingAreaRect = new Rect( pos.x, pos.y, width, ListEntryHeight );
Expand Down