From e68a0ad5edf9d24be399b0d3a024d1bcc295a254 Mon Sep 17 00:00:00 2001 From: Jaxe Date: Sat, 25 Aug 2018 16:35:52 +0800 Subject: [PATCH] v1.0.2 Nutritional drugs (Beer and Ambrosia) can now be disallowed in Food Restriction Presets --- About/ModSync.xml | 2 +- Languages/English/Keyed/PawnRules.xml | 8 ++++---- README.md | 2 +- Source/Data/Restriction.cs | 1 - Source/Data/RestrictionTemplate.cs | 2 +- Source/Mod.cs | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/About/ModSync.xml b/About/ModSync.xml index 0355562..ff01235 100644 --- a/About/ModSync.xml +++ b/About/ModSync.xml @@ -3,7 +3,7 @@ 59f538ed-f86d-4506-a4a5-7e9faaa37509 Pawn Rules - v1.0.1 + v1.0.2 False Jaxe-Dev diff --git a/Languages/English/Keyed/PawnRules.xml b/Languages/English/Keyed/PawnRules.xml index 3a89033..51426f1 100644 --- a/Languages/English/Keyed/PawnRules.xml +++ b/Languages/English/Keyed/PawnRules.xml @@ -51,11 +51,11 @@ None <i>Personalized</i> - Food Preset - Food Presets + Food Restriction Preset + Food Restriction Presets Edibles - Bonding Preset - Bonding Presets + Bonding Restriction Preset + Bonding Restriction Presets Animals Colonist diff --git a/README.md b/README.md index ed40ce4..9d47f05 100644 --- 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 index 50e5102..16be8d0 100644 --- 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 _defs = new List(); diff --git a/Source/Data/RestrictionTemplate.cs b/Source/Data/RestrictionTemplate.cs index 3a4ec7e..9d85708 100644 --- 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.AllDefs.Where(kindDef => kindDef.RaceProps.Animal).OrderBy(animal => animal.label).ToArray(); - private static readonly ThingDef[] FoodCache = DefDatabase.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.AllDefs.Where(food => food.IsNutritionGivingIngestible).ToList().OrderBy(food => food.category).ThenBy(food => food.FirstThingCategory?.index).ThenBy(food => food.label).ToArray(); public readonly IEnumerable Categories; public RestrictionTemplate(IEnumerable list) => Categories = list; diff --git a/Source/Mod.cs b/Source/Mod.cs index 2c1d8a2..8cd6aa7 100644 --- 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; }