fixed a bug with traitsOnUnequip not actually replacing traits in tra…

…itsOnEquip
AndroidQuazar · May 17, 2022 · a3c7547 · a3c7547
1 parent 3a91ec2
commit a3c7547
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 8 deletions.
diff --git a/1.3/Assemblies/VFECore.dll b/1.3/Assemblies/VFECore.dll
diff --git a/Source/VFECore/VFECore/HarmonyPatches/Patch_Pawn_ApparelTracker.cs b/Source/VFECore/VFECore/HarmonyPatches/Patch_Pawn_ApparelTracker.cs
@@ -46,9 +46,9 @@ public static void Postfix(Pawn ___pawn, bool __result, Apparel ap, ref Apparel
                     {
 						if (___pawn.story?.traits != null)
                         {
-							if (extension.traitsOnUnequip != null)
+							if (extension.traitsOnEquip != null)
                             {
-								foreach (var traitDef in extension.traitsOnUnequip)
+								foreach (var traitDef in extension.traitsOnEquip)
 								{
 									var trait = ___pawn.story.traits.GetTrait(traitDef);
 									if (trait != null)
@@ -57,8 +57,18 @@ public static void Postfix(Pawn ___pawn, bool __result, Apparel ap, ref Apparel
 									}
 								}
 							}
+							if (extension.traitsOnUnequip != null)
+                            {
+								foreach (var traitDef in extension.traitsOnUnequip)
+								{
+									if (!___pawn.story.traits.HasTrait(traitDef))
+                                    {
+										var trait = new Trait(traitDef);
+										___pawn.story.traits.GainTrait(trait);
+									}
+								}
+							}
 						}
-
                     }
 				}
 			}
@@ -77,14 +87,28 @@ public static void Postfix(Pawn ___pawn, Apparel ap)
 				{
 					if (___pawn.story?.traits != null)
 					{
-						if (extension.traitsOnUnequip != null)
+						if (___pawn.story?.traits != null)
 						{
-							foreach (var traitDef in extension.traitsOnUnequip)
+							if (extension.traitsOnEquip != null)
 							{
-								var trait = ___pawn.story.traits.GetTrait(traitDef);
-								if (trait != null)
+								foreach (var traitDef in extension.traitsOnEquip)
 								{
-									___pawn.story.traits.RemoveTrait(trait);
+									var trait = ___pawn.story.traits.GetTrait(traitDef);
+									if (trait != null)
+									{
+										___pawn.story.traits.RemoveTrait(trait);
+									}
+								}
+							}
+							if (extension.traitsOnUnequip != null)
+							{
+								foreach (var traitDef in extension.traitsOnUnequip)
+								{
+									if (!___pawn.story.traits.HasTrait(traitDef))
+                                    {
+										var trait = new Trait(traitDef);
+										___pawn.story.traits.GainTrait(trait);
+									}
 								}
 							}
 						}
@@ -132,6 +156,17 @@ public static void Postfix(Pawn_ApparelTracker __instance, Apparel newApparel, b
 								}
 							}
 						}
+						if (extension.traitsOnUnequip != null)
+						{
+							foreach (var traitDef in extension.traitsOnUnequip)
+							{
+								var trait = __instance.pawn.story.traits.GetTrait(traitDef);
+								if (trait != null)
+								{
+									__instance.pawn.story.traits.RemoveTrait(trait);
+								}
+							}
+						}
 					}
 				}
 			}