Methods now check for 'StartsWith [DefName]' instead

Two-Kay · Oct 20, 2020 · f8019fd · f8019fd
1 parent ed5bad4
commit f8019fd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/Assemblies/Plushies.dll b/Assemblies/Plushies.dll
diff --git a/Source/Plushies/.vs/Plushies/v16/.suo b/Source/Plushies/.vs/Plushies/v16/.suo
diff --git a/Source/Plushies/HarmonyPatches.cs b/Source/Plushies/HarmonyPatches.cs
@@ -70,7 +70,8 @@ static void Postfix(Pawn actor)
             if (comp == null)
                 return;
 
-            var hasPlushie = comp.LinkedFacilitiesListForReading.Any(thing => thing.def.defName == "Plushie");
+            //var hasPlushie = comp.LinkedFacilitiesListForReading.Any(thing => thing.def.defName == "Plushie");
+            var hasPlushie = comp.LinkedFacilitiesListForReading.Any(thing => thing.def.defName.StartsWith("Plushie"));
             if (hasPlushie) {
                 if (actor.story != null && actor.story.traits != null && actor.story.traits.HasTrait(TraitDefOf.Kind)) {
                     actor.needs.mood.thoughts.memories.TryGainMemory(PlushiesThoughtDefOf.PlushieCuddleKind);

diff --git a/Source/Plushies/JoyGiver_CuddlePlushie.cs b/Source/Plushies/JoyGiver_CuddlePlushie.cs
@@ -30,7 +30,8 @@ public override Job TryGiveJob(Pawn pawn)
 						Log.Error("No CompArt on thing being considered for viewing: " + thing, false);
 						return false;
 					}
-					if (thing.def.defName != "Plushie")
+					//if (thing.def.defName != "Plushie")
+					if (thing.def.defName.StartsWith("Plushie") == false)
 					{
 						return false;
 					}