diff --git a/1.5/Assemblies/RJW_PlasticSurgeries.dll b/1.5/Assemblies/RJW_PlasticSurgeries.dll index 15e63fd..c0dc90e 100644 Binary files a/1.5/Assemblies/RJW_PlasticSurgeries.dll and b/1.5/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs b/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs index 496dba1..bdf4023 100644 --- a/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs +++ b/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using RimWorld; using Verse; -using static RimWorld.TraitDefOf; +using static rjw.VanillaTraitDefOf; namespace RJW_PlasticSurgeries { @@ -11,10 +11,9 @@ namespace RJW_PlasticSurgeries /// public override IEnumerable GetPartsToApplyOn(Pawn pawn, RecipeDef recipe) { - /* if (!pawn.story.traits.HasTrait(Beauty) || + if (!pawn.story.traits.HasTrait(Beauty) || pawn.story.traits.HasTrait(Beauty) && pawn.story.traits.GetTrait(Beauty).Degree < 2) - yield return pawn.RaceProps.body.corePart; */ - return new HashSet(); + yield return pawn.RaceProps.body.corePart; } /// @@ -42,14 +41,14 @@ namespace RJW_PlasticSurgeries /// the new severity of the pawn's Beautiful trait protected void SurgeryX(Pawn pawn, int severity) { - /* if (pawn.story.traits.HasTrait(Beauty)) + if (pawn.story.traits.HasTrait(Beauty)) { pawn.story.traits.allTraits.FindAll(t => Beauty.ConflictsWith(t)) .ForEach(t => pawn.story.traits.RemoveTrait(t)); pawn.story.traits.RemoveTrait(pawn.story.traits.allTraits.Find(t => t.def == Beauty)); } - pawn.story.traits.GainTrait(new Trait(Beauty, severity)); */ + pawn.story.traits.GainTrait(new Trait(Beauty, severity)); } } diff --git a/Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs b/Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs new file mode 100644 index 0000000..918c7ca --- /dev/null +++ b/Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs @@ -0,0 +1,26 @@ +using Verse; +using RimWorld; + +namespace rjw +{ + [DefOf] + public static class VanillaTraitDefOf + { + public static TraitDef Tough; + + public static TraitDef Nerves; + + public static TraitDef Beauty; + + public static TraitDef TooSmart; + + public static TraitDef NaturalMood; + + public static TraitDef Cannibal; + + static VanillaTraitDefOf() + { + DefOfHelper.EnsureInitializedInCtor(typeof(VanillaTraitDefOf)); + } + } +} \ No newline at end of file