From 7b138a72d91adb4f039b771ed68c2e2fc86b3f50 Mon Sep 17 00:00:00 2001 From: c0ffeeeeeeee Date: Wed, 28 Oct 2020 20:21:19 -0700 Subject: [PATCH] reorder actors button --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 55808 -> 56320 bytes Source/Comps/CompBodyAnimator.cs | 22 +++++++++++++++--- .../MainTabWindow_OffsetConfigure.cs | 18 ++++++++++++-- ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 2 +- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 77ee47d62955de4245f273d3ebafd75676b80fd0..57a3061c5d05e37118783a02ee37acdd22b1f718 100644 GIT binary patch delta 21953 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 Xw>SIG-zo9~1NM5}{JXTJpY?wMHYr;o delta 21530 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 z actorsInCurrentAnimation; + public bool controlGenitalAngle = false; private AnimationDef anim; @@ -102,8 +105,9 @@ namespace Rimworld_Animations { anchor = thing.Position.ToVector3Shifted(); } } - public void StartAnimation(AnimationDef anim, int actor, bool mirror = false, bool shiver = false, bool fastAnimForQuickie = false) { + public void StartAnimation(AnimationDef anim, List actors, int actor, bool mirror = false, bool shiver = false, bool fastAnimForQuickie = false) { + actorsInCurrentAnimation = actors; AlienRaceOffset raceOffset = anim?.actors[actor]?.raceOffsets?.Find(x => x.defName == pawn.def.defName); if (raceOffset != null) { @@ -198,7 +202,7 @@ namespace Rimworld_Animations { if (animTicks < anim.animationTimeTicks) { tickStage(); } else { - + isAnimating = false; } } @@ -326,7 +330,6 @@ namespace Rimworld_Animations { } - public AnimationDef CurrentAnimation { get { return anim; @@ -370,5 +373,18 @@ namespace Rimworld_Animations { Scribe_Values.Look(ref quiver, "orgasmQuiver"); } + public void shiftActorPositionAndRestartAnimation() { + actor = (actor == anim.actors.Count - 1 ? 0 : actor + 1); + + curStage = 0; + animTicks = 0; + stageTicks = 0; + clipTicks = 0; + + controlGenitalAngle = anim.actors[actor].controlGenitalAngle; + + tickAnim(); + } + } } diff --git a/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs b/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs index 4b76b17..420e53b 100644 --- a/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs +++ b/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs @@ -11,7 +11,7 @@ namespace Rimworld_Animations { class MainTabWindow_OffsetConfigure : MainTabWindow { - public override Vector2 RequestedTabSize => new Vector2(505, 340); + public override Vector2 RequestedTabSize => new Vector2(505, 380); public override void DoWindowContents(Rect inRect) { Rect position = new Rect(inRect.x, inRect.y, inRect.width, inRect.height); @@ -20,7 +20,7 @@ namespace Rimworld_Animations { Listing_Standard listingStandard = new Listing_Standard(); listingStandard.Begin(position); - listingStandard.Label("Offset Manager"); + listingStandard.Label("Animation Manager"); listingStandard.GapLine(); @@ -72,6 +72,20 @@ namespace Rimworld_Animations { rotation = 0; } + listingStandard.GapLine(); + + if(listingStandard.ButtonText("Shift Actors")) { + + if(AnimationSettings.debugMode) { + Log.Message("Shifting actors in animation..."); + } + + for(int i = 0; i < curPawn.TryGetComp().actorsInCurrentAnimation.Count; i++) { + curPawn.TryGetComp().actorsInCurrentAnimation[i].TryGetComp()?.shiftActorPositionAndRestartAnimation(); + } + + } + if (offsetX != AnimationSettings.offsets[def.defName + curPawn.def.defName + ActorIndex].x || offsetZ != AnimationSettings.offsets[def.defName + curPawn.def.defName + ActorIndex].y) { AnimationSettings.offsets[def.defName + curPawn.def.defName + ActorIndex] = new Vector2(offsetX, offsetZ); diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index b3a6e88..c4813f0 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -102,7 +102,7 @@ namespace Rimworld_Animations { } bool shiver = pawnsToAnimate[i].jobs.curDriver is JobDriver_SexBaseRecieverRaped; - pawnsToAnimate[i].TryGetComp().StartAnimation(anim, i, mirror, shiver, fastAnimForQuickie); + pawnsToAnimate[i].TryGetComp().StartAnimation(anim, pawnsToAnimate, i, mirror, shiver, fastAnimForQuickie); (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_left = anim.animationTimeTicks; (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticksLeftThisToil = anim.animationTimeTicks; (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).duration = anim.animationTimeTicks;