v1.2.1

- Renamed Food policy to Ingestible policy
- Ingestible policy now includes all ingestibles including drinks from other mods

About/About.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <ModMetaData>
   <name>Pawn Rules</name>
   <author>Jaxe</author>
   <targetVersion>1.0.0</targetVersion>
-  <description>Mod Version: 1.2.0\n\n\nPawn Rules is a mod that allows custom rules to be assigned individually to your colonists, animals, guests and prisoners.\n\nCurrently the following rules can be applied:\n\n- Disallow certain foods\n- Disallow bonding with certain animals\n- Disallow new romances\n- Disallow constructing items that have a quality level\n\nAny of these rules can be disabled and hidden from the rules window. Rules presets and defaults can be imported and exported between games.</description>
+  <description>Mod Version: 1.2.1\n\n\nPawn Rules is a mod that allows custom rules to be assigned individually to your colonists, animals, guests and prisoners.\n\nCurrently the following rules can be applied:\n\n- Disallow certain foods\n- Disallow bonding with certain animals\n- Disallow new romances\n- Disallow constructing items that have a quality level\n\nAny of these rules can be disabled and hidden from the rules window. Rules presets and defaults can be imported and exported between games.</description>
 </ModMetaData>

About/Manifest.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
 <Manifest>
   <identifier>PawnRules</identifier>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
   <manifestUri>https://raw.githubusercontent.com/Jaxe-Dev/PawnRules/master/About/Manifest.xml</manifestUri>
   <downloadUri>https://github.com/Jaxe-Dev/PawnRules/releases/latest</downloadUri>
 </Manifest>

Languages/English/Keyed/Keys.xml

@@ -52,9 +52,9 @@
   <PawnRules.Preset.None>Unrestricted</PawnRules.Preset.None>
   <PawnRules.Preset.Personalized>Personalized</PawnRules.Preset.Personalized>
 
-  <PawnRules.RestrictionType.Food>Food Policy</PawnRules.RestrictionType.Food>
-  <PawnRules.RestrictionType.FoodPlural>Food Policies</PawnRules.RestrictionType.FoodPlural>
-  <PawnRules.RestrictionType.FoodCategorization>Edibles</PawnRules.RestrictionType.FoodCategorization>
+  <PawnRules.RestrictionType.Food>Ingestible Policy</PawnRules.RestrictionType.Food>
+  <PawnRules.RestrictionType.FoodPlural>Ingestible Policies</PawnRules.RestrictionType.FoodPlural>
+  <PawnRules.RestrictionType.FoodCategorization>Ingestibles</PawnRules.RestrictionType.FoodCategorization>
   <PawnRules.RestrictionType.Bonding>Bonding Policy</PawnRules.RestrictionType.Bonding>
   <PawnRules.RestrictionType.BondingPlural>Bonding Policies</PawnRules.RestrictionType.BondingPlural>
   <PawnRules.RestrictionType.BondingCategorization>Animals</PawnRules.RestrictionType.BondingCategorization>
@@ -71,8 +71,8 @@
   <PawnRules.PawnType.PersonPlural>Persons</PawnRules.PawnType.PersonPlural>
   <PawnRules.PawnType.Individual>Individual</PawnRules.PawnType.Individual>
 
-  <PawnRules.Rules.FoodRestrictions>Food policy: {0}</PawnRules.Rules.FoodRestrictions>
-  <PawnRules.Rules.FoodRestrictionsDesc>Click to choose which foods can be eaten.</PawnRules.Rules.FoodRestrictionsDesc>
+  <PawnRules.Rules.FoodRestrictions>Ingestible policy: {0}</PawnRules.Rules.FoodRestrictions>
+  <PawnRules.Rules.FoodRestrictionsDesc>Click to choose which ingestibles can be consumed.</PawnRules.Rules.FoodRestrictionsDesc>
   <PawnRules.Rules.BondingRestrictions>Bonding policy: {0}</PawnRules.Rules.BondingRestrictions>
   <PawnRules.Rules.BondingRestrictionsDesc>Click to choose which animals can be bonded with.</PawnRules.Rules.BondingRestrictionsDesc>
   <PawnRules.Rules.AllowCourting>Allow Courting</PawnRules.Rules.AllowCourting>

README.md

@@ -1,5 +1,5 @@
 # Pawn Rules
-![Mod Version](https://img.shields.io/badge/Mod_Version-1.2.0-blue.svg)
+![Mod Version](https://img.shields.io/badge/Mod_Version-1.2.1-blue.svg)
 ![RimWorld Version](https://img.shields.io/badge/Built_for_RimWorld-1.0-blue.svg)
 ![Harmony Version](https://img.shields.io/badge/Powered_by_Harmony-1.2.0.1-blue.svg)\
 ![Steam Subscribers](https://img.shields.io/badge/dynamic/xml.svg?label=Steam+Subscribers&query=//table/tr[2]/td[1]&colorB=blue&url=https://steamcommunity.com/sharedfiles/filedetails/%3Fid=1499843448&suffix=+total)

Source/Data/RestrictionTemplate.cs

@@ -9,7 +9,7 @@ namespace PawnRules.Data
     internal class RestrictionTemplate
     {
         private static readonly PawnKindDef[] AnimalCache = DefDatabase<PawnKindDef>.AllDefs.Where(kindDef => kindDef.RaceProps.Animal).OrderBy(animal => animal.label).ToArray();
-        public static readonly ThingDef[] FoodCache = DefDatabase<ThingDef>.AllDefs.Where(food => food.IsNutritionGivingIngestible).ToList().OrderBy(food => food.category).ThenBy(food => food.FirstThingCategory?.index).ThenBy(food => food.label).ToArray();
+        private static readonly ThingDef[] FoodCache = DefDatabase<ThingDef>.AllDefs.Where(food => food.IsIngestible).ToList().OrderBy(food => food.category).ThenBy(food => food.FirstThingCategory?.index).ThenBy(food => food.label).ToArray();
         public readonly IEnumerable<Category> Categories;
 
         private RestrictionTemplate(IEnumerable<Category> list) => Categories = list;

Source/Mod.cs

@@ -13,7 +13,7 @@ internal class Mod : Verse.Mod
     {
         public const string Id = "PawnRules";
         public const string Name = "Pawn Rules";
-        public const string Version = "1.2.0";
+        public const string Version = "1.2.1";
 
         public static readonly DirectoryInfo ConfigDirectory = new DirectoryInfo(Path.Combine(GenFilePaths.ConfigFolderPath, Id));