ignore borrowed animals

so that we don't accidentally slaughter any Empire pets :D
lockmatrix · May 22, 2020 · 548d9cd · 548d9cd
1 parent 12c8939
commit 548d9cd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -72,7 +72,7 @@ maarxx:    Various fixes and improvements
 rimpy-custom:    Fix for Russian translation
 
 &lt;size=24&gt;Version&lt;/size&gt;
-This is version 4.30.612, for RimWorld 1.1.2624.
+This is version 4.30.615, for RimWorld 1.1.2624.
 
 </description>
   <supportedVersions>

diff --git a/Assemblies/Fluffy_ColonyManager.dll b/Assemblies/Fluffy_ColonyManager.dll
diff --git a/Readme.md b/Readme.md
@@ -79,4 +79,4 @@ Show your appreciation by buying me a coffee (or contribute towards a nice singl
 [![I Have a Black Dog](https://i.ibb.co/ss59Rwy/New-Project-2.png)](https://www.youtube.com/watch?v=XiCrniLQGYc)
 
 # Version
-This is version 4.30.612, for RimWorld 1.1.2624.
+This is version 4.30.615, for RimWorld 1.1.2624.
diff --git a/Source/Helpers/Livestock/Utilities_Livestock.cs b/Source/Helpers/Livestock/Utilities_Livestock.cs
@@ -88,9 +88,12 @@ public static IEnumerable<Pawn> GetAll( this PawnKindDef pawnKind, Map map )
 
             // if not, set up a cache
             Func<IEnumerable<Pawn>> getter = () => map.mapPawns.AllPawns
-                                                      .Where( p => p.RaceProps.Animal       // is animal
-                                                                && !p.Dead                  // is alive
-                                                                && p.kindDef == pawnKind ); // is our managed pawnkind
+                                                      .Where( p => p.RaceProps.Animal    // is animal
+                                                                && !p.Dead               // is alive
+                                                                && p.kindDef == pawnKind // is our managed pawnkind
+                                                                && !( p.Faction == Faction.OfPlayer &&
+                                                                      p.HasExtraHomeFaction()
+                                                                       ) ); // was not borrowed to us
 
             AllCache.Add( key, getter );
             return getter();

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -39,4 +39,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.30.612")]
+[assembly: AssemblyFileVersion("4.30.615")]