v3.805

juanosarg · Jun 3, 2022 · e1aaf14 · e1aaf14
1 parent df08fc7
commit e1aaf14
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/1.3/Assemblies/AlphaBehavioursAndEvents.dll b/1.3/Assemblies/AlphaBehavioursAndEvents.dll
diff --git a/1.3/Source/AlphaBehavioursAndEvents/.vs/AlphaBehavioursAndEvents/v16/.suo b/1.3/Source/AlphaBehavioursAndEvents/.vs/AlphaBehavioursAndEvents/v16/.suo
diff --git a/...BehavioursAndEvents/AlphaBehavioursAndEvents/Options and Utility/AlphaAnimals_Settings.cs b/...BehavioursAndEvents/AlphaBehavioursAndEvents/Options and Utility/AlphaAnimals_Settings.cs
@@ -43,8 +43,15 @@ public void DoWindowContents(Rect inRect)
             {
                 if (num == keys.Count/2) { ls.NewColumn(); }
                 bool test = pawnSpawnStates[keys[num]];
-                ls.CheckboxLabeled("AA_DisableAnimal".Translate(PawnKindDef.Named(keys[num]).LabelCap), ref test);
-                pawnSpawnStates[keys[num]] = test;
+                if (DefDatabase<PawnKindDef>.GetNamedSilentFail(keys[num]) == null)
+                {
+                    pawnSpawnStates.Remove(keys[num]);
+                }
+                else
+                {
+                    ls.CheckboxLabeled("AA_DisableAnimal".Translate(PawnKindDef.Named(keys[num]).LabelCap), ref test);
+                    pawnSpawnStates[keys[num]] = test;
+                }
             }
 
             ls.End();

diff --git a/...AndEvents/AlphaBehavioursAndEvents/Options and Utility/AlphaAnimals_SettingsController.cs b/...AndEvents/AlphaBehavioursAndEvents/Options and Utility/AlphaAnimals_SettingsController.cs
@@ -48,7 +48,7 @@ public override void DoSettingsWindowContents(Rect inRect)
                 if (settings.pawnSpawnStates == null) settings.pawnSpawnStates = new Dictionary<string, bool>();
                 foreach (string defName in toggleablespawndef.toggleablePawns)
                 {
-                    if (!settings.pawnSpawnStates.ContainsKey(defName))
+                    if (!settings.pawnSpawnStates.ContainsKey(defName) && DefDatabase<ThingDef>.GetNamedSilentFail(defName) != null)
                     {
                         settings.pawnSpawnStates[defName] = false;
                     }

diff --git a/...phaBehavioursAndEvents/obj/Release/AlphaBehavioursAndEvents.csprojAssemblyReference.cache b/...phaBehavioursAndEvents/obj/Release/AlphaBehavioursAndEvents.csprojAssemblyReference.cache
diff --git a/...lphaBehavioursAndEvents/AlphaBehavioursAndEvents/obj/Release/AlphaBehavioursAndEvents.dll b/...lphaBehavioursAndEvents/AlphaBehavioursAndEvents/obj/Release/AlphaBehavioursAndEvents.dll