diff --git a/About/Preview.png b/About/Preview.png index 9df3f331..8d797649 100644 Binary files a/About/Preview.png and b/About/Preview.png differ diff --git a/Assemblies/Manager.dll b/Assemblies/Manager.dll index f630a1b4..f0ad304a 100644 Binary files a/Assemblies/Manager.dll and b/Assemblies/Manager.dll differ diff --git a/Languages/English/Keyed/Manager_Keyed.xml b/Languages/English/Keyed/Manager_Keyed.xml index 85337429..6345e4e6 100644 --- a/Languages/English/Keyed/Manager_Keyed.xml +++ b/Languages/English/Keyed/Manager_Keyed.xml @@ -212,6 +212,8 @@ Restrict animals designated for training to a specific area. Disabled because no training target is set. {0} are too small to train this. + {0} cannot be restricted + {0} cannot be restricted to an area because it is a roaming animal. Following diff --git a/Source/ManagerTabs/ManagerTab_Livestock.cs b/Source/ManagerTabs/ManagerTab_Livestock.cs index 97ab3dc9..e25e623b 100644 --- a/Source/ManagerTabs/ManagerTab_Livestock.cs +++ b/Source/ManagerTabs/ManagerTab_Livestock.cs @@ -465,8 +465,14 @@ private float DrawAreaRestrictionsSection(Vector2 pos, float width) var start = pos; // skip for animals that can't be restricted - if (_selectedCurrent.Trigger.pawnKind.race.race.Roamer) - return 0f; + if (_selectedCurrent.Trigger.pawnKind.RaceProps.Roamer) + { + var unavailableLabelRect = new Rect(pos.x, pos.y, width, ListEntryHeight); + unavailableLabelRect.xMin += Margin; + Label(unavailableLabelRect, "FM.Livestock.DisabledBecauseRoamingAnimal".Translate(), "FM.Livestock.DisabledBecauseRoamingAnimalTip".Translate(), TextAnchor.MiddleLeft, + color: Color.grey); + return ListEntryHeight; + } // restrict to area diff --git a/Source/preview.svg b/Source/preview.svg new file mode 100644 index 00000000..89d827ad --- /dev/null +++ b/Source/preview.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modinfo.json b/modinfo.json index 81910c27..29bfe363 100644 --- a/modinfo.json +++ b/modinfo.json @@ -6,7 +6,7 @@ "version": { "major": 5, "minor": 0, - "build": 662 + "build": 663 }, "author": { "name": "Fluffy", @@ -19,6 +19,15 @@ "url": "https://github.com/fluffy-mods/ColonyManager" }, "changelog": [ + { + "date": "2021-07-27T15:15:06.000Z", + "message": "remove area management for roaming animals", + "author": { + "name": "Fluffy", + "email": "fluffy.l2032@gmail.com" + }, + "hash": "21b41395089762c3a23af3a969378387e7192bf8" + }, { "date": "2021-07-27T09:17:29.000Z", "message": "req squiglies be gone, switch to sdk style project", @@ -320,5 +329,19 @@ "description": "Add minified attribute to Benchbase" } ] - } + }, + "attributions": [ + { + "description": "mustache icon", + "author": "DinosoftLabs", + "license": "BY-NC", + "url": "https://www.flaticon.com/authors/dinosoftlabs" + }, + { + "description": "top hat icon", + "author": "Smashicons", + "license": "BY-NC", + "url": "https://www.flaticon.com/authors/smashicons" + } + ] } \ No newline at end of file