From 1ba5e0e117bf2edc769ea3ee0fd7576e64f59804 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 23 Apr 2024 14:21:47 -0700 Subject: [PATCH] better offset tweaks for position --- 1.5/Assemblies/Rimworld-Animations.dll | Bin 41984 -> 41984 bytes 1.5/Defs/AnimationDefs/TestAnimation2.xml | 8 ++++---- .../ExtendedAnimatorAnchor_Thing.cs | 1 + .../MainTabWindow_OffsetConfigure.cs | 4 +++- .../HarmonyPatch_Pawn_DrawTracker.cs | 16 ++++++++-------- .../Keyed/RJWAnimations-LanguageData.xml | 3 ++- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 1ee843e26b285702236961d027643653f7c514d4..292a90595e276e08e9b9a6b6b6b2e1ebd4d8d344 100644 GIT binary patch delta 9038 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 JV(YqT{}1Cz_doyu diff --git a/1.5/Defs/AnimationDefs/TestAnimation2.xml b/1.5/Defs/AnimationDefs/TestAnimation2.xml index 04fb662..8125f0c 100644 --- a/1.5/Defs/AnimationDefs/TestAnimation2.xml +++ b/1.5/Defs/AnimationDefs/TestAnimation2.xml @@ -13,25 +13,25 @@ Rimworld_Animations.AnimationWorker_KeyframesExtended
  • - (1, -1, 0) + (1, 0, 0) 0 0 North
  • - (0, -1, 0) + (0, 0, 0) 30 15 North
  • - (-1, -1, 0) + (-1, 0, 0) 60 0 North
  • - (0, -1, 0) + (0, 0, 0) 90 -15 North diff --git a/1.5/Source/Comps/ExtendedAnimatorAnchor/ExtendedAnimatorAnchor_Thing.cs b/1.5/Source/Comps/ExtendedAnimatorAnchor/ExtendedAnimatorAnchor_Thing.cs index 8b61405..4331046 100644 --- a/1.5/Source/Comps/ExtendedAnimatorAnchor/ExtendedAnimatorAnchor_Thing.cs +++ b/1.5/Source/Comps/ExtendedAnimatorAnchor/ExtendedAnimatorAnchor_Thing.cs @@ -22,6 +22,7 @@ namespace Rimworld_Animations public override Vector3 getDrawPos() { + //vector3.up means stand above the thing return thing.DrawPos; } diff --git a/1.5/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs b/1.5/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs index 058518a..18ba6d6 100644 --- a/1.5/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs +++ b/1.5/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs @@ -8,7 +8,7 @@ namespace Rimworld_Animations { class MainTabWindow_OffsetConfigure : MainTabWindow { - public override Vector2 RequestedTabSize => new Vector2(505, 450); + public override Vector2 RequestedTabSize => new Vector2(505, 500); public override void DoWindowContents(Rect inRect) { Rect position = new Rect(inRect.x, inRect.y, inRect.width, inRect.height); @@ -76,6 +76,8 @@ namespace Rimworld_Animations { } + listingStandard.Label("RimAnims_ShareSettings".Translate()); + extendedAnimator.Offset = newOffsetVector; extendedAnimator.Rotation = rot; diff --git a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs index 8b467e1..31c4692 100644 --- a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs +++ b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs @@ -7,20 +7,20 @@ namespace Rimworld_Animations { [HarmonyPatch(typeof(Pawn_DrawTracker), "DrawPos", MethodType.Getter)] public static class HarmonyPatch_Pawn_DrawTracker { - public static bool Prefix(ref Pawn ___pawn, ref Vector3 __result) { - - CompExtendedAnimator animator = ___pawn.TryGetComp(); + //switch to postfix to get pawn original height first + public static void Postfix(ref Pawn ___pawn, ref Vector3 __result) { //align pos on top of partner, position, etc., based on animatoranchor - if (animator != null && animator.IsAnchored) + if (___pawn.TryGetComp() is CompExtendedAnimator animator + && animator.IsAnchored) { - __result = animator.getAnchor(); - return false; + Vector3 anchor = animator.getAnchor(); + //ignore y so that pawns don't clip through stuff + __result.x = anchor.x; + __result.z = anchor.z; } - return true; - } } } diff --git a/Languages/English/Keyed/RJWAnimations-LanguageData.xml b/Languages/English/Keyed/RJWAnimations-LanguageData.xml index bf1b69d..95ecca6 100644 --- a/Languages/English/Keyed/RJWAnimations-LanguageData.xml +++ b/Languages/English/Keyed/RJWAnimations-LanguageData.xml @@ -14,8 +14,9 @@ Debug Mode + Animation Manager Warning--You generally don't want to change human offsets, only alien offsets or animals Copy Offset to Clipboard - Animation Manager + Paste offset values in OffsetDef, or share in Discord \ No newline at end of file