v1.0.2

Nutritional drugs (Beer and Ambrosia) can now be disallowed in Food Restriction Presets
Jaxe-Dev · Aug 25, 2018 · e68a0ad · e68a0ad
1 parent 1575cea
commit e68a0ad
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -3,7 +3,7 @@
 <ModSyncNinjaData>
   <ID>59f538ed-f86d-4506-a4a5-7e9faaa37509</ID>
   <ModName>Pawn Rules</ModName>
-  <Version>v1.0.1</Version>
+  <Version>v1.0.2</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>Jaxe-Dev</Owner>

diff --git a/Languages/English/Keyed/PawnRules.xml b/Languages/English/Keyed/PawnRules.xml
@@ -51,11 +51,11 @@
   <PawnRules.Preset.None>None</PawnRules.Preset.None>
   <PawnRules.Preset.Personalized>&lt;i&gt;Personalized&lt;/i&gt;</PawnRules.Preset.Personalized>
 
-  <PawnRules.RestrictionType.Food>Food Preset</PawnRules.RestrictionType.Food>
-  <PawnRules.RestrictionType.FoodPlural>Food Presets</PawnRules.RestrictionType.FoodPlural>
+  <PawnRules.RestrictionType.Food>Food Restriction Preset</PawnRules.RestrictionType.Food>
+  <PawnRules.RestrictionType.FoodPlural>Food Restriction Presets</PawnRules.RestrictionType.FoodPlural>
   <PawnRules.RestrictionType.FoodCategorization>Edibles</PawnRules.RestrictionType.FoodCategorization>
-  <PawnRules.RestrictionType.Bonding>Bonding Preset</PawnRules.RestrictionType.Bonding>
-  <PawnRules.RestrictionType.BondingPlural>Bonding Presets</PawnRules.RestrictionType.BondingPlural>
+  <PawnRules.RestrictionType.Bonding>Bonding Restriction Preset</PawnRules.RestrictionType.Bonding>
+  <PawnRules.RestrictionType.BondingPlural>Bonding Restriction Presets</PawnRules.RestrictionType.BondingPlural>
   <PawnRules.RestrictionType.BondingCategorization>Animals</PawnRules.RestrictionType.BondingCategorization>
 
   <PawnRules.PawnType.Colonist>Colonist</PawnRules.PawnType.Colonist>

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Pawn Rules
-![](https://img.shields.io/badge/Version-1.0.1-brightgreen.svg)
+![](https://img.shields.io/badge/Version-1.0.2-brightgreen.svg)
 
 Built for **RimWorld 1.0.x / 0.19.x**\
 Powered by **Harmony**\

diff --git a/Source/Data/Restriction.cs b/Source/Data/Restriction.cs
@@ -6,7 +6,6 @@ namespace PawnRules.Data
 {
     internal class Restriction : Presetable
     {
-        //public static readonly Restriction None = new Restriction(null, Lang.Get("Preset.None"));
         public new RestrictionType Type { get => (RestrictionType) base.Type; private set => base.Type = value; }
 
         private List<string> _defs = new List<string>();

diff --git a/Source/Data/RestrictionTemplate.cs b/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();
-        private static readonly ThingDef[] FoodCache = DefDatabase<ThingDef>.AllDefs.Where(food => food.IsNutritionGivingIngestible && !food.IsDrug).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.IsNutritionGivingIngestible).ToList().OrderBy(food => food.category).ThenBy(food => food.FirstThingCategory?.index).ThenBy(food => food.label).ToArray();
         public readonly IEnumerable<Category> Categories;
 
         public RestrictionTemplate(IEnumerable<Category> list) => Categories = list;

diff --git a/Source/Mod.cs b/Source/Mod.cs
@@ -7,7 +7,7 @@ internal class Mod : Verse.Mod
         public const string Id = "PawnRules";
         public const string Name = "Pawn Rules";
         public const string Author = "Jaxe";
-        public const string Version = "1.0.1";
+        public const string Version = "1.0.2";
 
         public static ModContentPack ContentPack { get; private set; }