From acfb864629b035f328fcec04088dec91ae9cad23 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 7 May 2021 19:03:48 -0700 Subject: [PATCH] code readability tweaks --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 59904 -> 59392 bytes Source/Patches/HarmonyPatch_AlienRace.cs | 16 ++-------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 0c115d3f4b6b85390a261cb5f960409eddd3c0be..29cbe88a3e154e90fea998aedf3941f5eddf325a 100644 GIT binary patch delta 4738 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 S`#;d$VQt#QA4ubU(*FP>Q9(5T delta 4786 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 diff --git a/Source/Patches/HarmonyPatch_AlienRace.cs b/Source/Patches/HarmonyPatch_AlienRace.cs index 0391195..d184a04 100644 --- a/Source/Patches/HarmonyPatch_AlienRace.cs +++ b/Source/Patches/HarmonyPatch_AlienRace.cs @@ -53,8 +53,8 @@ namespace Rimworld_Animations { if (!ba.CanDrawAddon(pawn: pawn)) continue; AlienPartGenerator.RotationOffset offset; - if (ba.drawnInBed || ba.alignWithHead) { - offset = pawnAnimator.headFacing == Rot4.South ? + + offset = ((ba.drawnInBed || ba.alignWithHead) ? pawnAnimator.headFacing : rotation) == Rot4.South ? ba.offsets.south : pawnAnimator.headFacing == Rot4.North ? ba.offsets.north : @@ -62,19 +62,7 @@ namespace Rimworld_Animations { ba.offsets.east : ba.offsets.west; - } else { - offset = rotation == Rot4.South ? - ba.offsets.south : - rotation == Rot4.North ? - ba.offsets.north : - rotation == Rot4.East ? - ba.offsets.east : - ba.offsets.west; - - } - - Vector2 bodyOffset = (portrait ? offset?.portraitBodyTypes ?? offset?.bodyTypes : offset?.bodyTypes)?.FirstOrDefault(predicate: to => to.bodyType == pawn.story.bodyType) ?.offset ?? Vector2.zero;