From 642536fc46a9ec0d15f242bf43732c0970c1e581 Mon Sep 17 00:00:00 2001 From: Stardust3D <3dstardust@gmail.com> Date: Sat, 13 Apr 2024 19:45:24 +0200 Subject: [PATCH] hack around removed traits https://gitgud.io/jikulopo/rjw/-/blob/721156233a496c73465651315bd0d8eeabfabb0f/1.5/Source/DefOf/VanillaTraitDefOf.cs --- 1.5/Assemblies/RJW_PlasticSurgeries.dll | Bin 26048 -> 28096 bytes .../1.5/Recipe_Surgery_Beautify.cs | 11 ++++---- .../1.5/VanillaTraitDefOf.cs | 26 ++++++++++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs diff --git a/1.5/Assemblies/RJW_PlasticSurgeries.dll b/1.5/Assemblies/RJW_PlasticSurgeries.dll index 15e63fdea1c2dd2652850be2c0c22740251b3824..c0dc90ec438a57b58e3f1756d3481f211c006614 100644 GIT binary patch delta 12805 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 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