From 15b7e76f437c66f1c535fa1d0b0ab94cd27daf9e Mon Sep 17 00:00:00 2001 From: c0ffeeeeeeee Date: Wed, 28 Oct 2020 20:53:38 -0700 Subject: [PATCH] tidier code --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 57856 -> 57856 bytes .../MainTabWindow_OffsetConfigure.cs | 15 +++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 3c1bb66790dd1dffc0fe3ba1b47429ff52d77e8d..f202842ee4c858978939c90a0d6e9a541fe7b1f8 100644 GIT binary patch delta 4509 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 NXgBwLOBz$Y*1NQ&` delta 4540 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.actorsInCurrentAnimation.Count; i++) { - curPawn.TryGetComp().actorsInCurrentAnimation[i].TryGetComp()?.shiftActorPositionAndRestartAnimation(); + + Pawn actor = curPawn.TryGetComp().actorsInCurrentAnimation[i]; + + actor.TryGetComp()?.shiftActorPositionAndRestartAnimation(); //reset the clock time of every pawn in animation - if(curPawn.TryGetComp().actorsInCurrentAnimation[i].jobs.curDriver is rjw.JobDriver_Sex) { - (curPawn.TryGetComp().actorsInCurrentAnimation[i].jobs.curDriver as rjw.JobDriver_Sex).ticks_left = def.animationTimeTicks; - (curPawn.TryGetComp().actorsInCurrentAnimation[i].jobs.curDriver as rjw.JobDriver_Sex).ticksLeftThisToil = def.animationTimeTicks; - (curPawn.TryGetComp().actorsInCurrentAnimation[i].jobs.curDriver as rjw.JobDriver_Sex).duration = def.animationTimeTicks; - (curPawn.TryGetComp().actorsInCurrentAnimation[i].jobs.curDriver as rjw.JobDriver_Sex).ticks_remaining = def.animationTimeTicks; + if(actor.jobs.curDriver is rjw.JobDriver_Sex) { + (actor.jobs.curDriver as rjw.JobDriver_Sex).ticks_left = def.animationTimeTicks; + (actor.jobs.curDriver as rjw.JobDriver_Sex).ticksLeftThisToil = def.animationTimeTicks; + (actor.jobs.curDriver as rjw.JobDriver_Sex).duration = def.animationTimeTicks; + (actor.jobs.curDriver as rjw.JobDriver_Sex).ticks_remaining = def.animationTimeTicks; } }