From 17e7fb1374c4631dae68ae3975ab0005b24445b6 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 28 Oct 2022 15:04:30 -0700 Subject: [PATCH] removed extraneous code --- 1.4/Assemblies/Rimworld-Animations.dll | Bin 61440 -> 61440 bytes .../OtherModPatches/HarmonyPatch_AlienRace.cs | 61 +----------------- 2 files changed, 1 insertion(+), 60 deletions(-) diff --git a/1.4/Assemblies/Rimworld-Animations.dll b/1.4/Assemblies/Rimworld-Animations.dll index 0fd1ae91014cb66b081f38c7c77aa03c55698390..2880d39a91dbce1f61739a3aaf748fb6c00708ae 100644 GIT binary patch delta 4775 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 MWV_r+0{!HF1A3ZsuK)l5 delta 4864 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 CB!7?q diff --git a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs index 2c54831..57ee1cc 100644 --- a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs +++ b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs @@ -95,71 +95,12 @@ namespace Rimworld_Animations { addonGraphic.drawSize = ((flag && ba.drawSizePortrait != Vector2.zero) ? ba.drawSizePortrait : ba.drawSize) * (ba.scaleWithPawnDrawsize ? (ba.alignWithHead ? ((flag ? comp.customPortraitHeadDrawSize : comp.customHeadDrawSize) * (ModsConfig.BiotechActive ? (pawn.ageTracker.CurLifeStage.headSizeFactor ?? 1.5f) : 1.5f)) : ((flag ? comp.customPortraitDrawSize : comp.customDrawSize) * (ModsConfig.BiotechActive ? pawn.ageTracker.CurLifeStage.bodySizeFactor : 1f) * 1.5f)) : (Vector2.one * 1.5f)); - Vector3 orassanv = Vector3.zero; - bool orassan = false; - /* - if ((pawn.def as ThingDef_AlienRace).defName == "Alien_Orassan") - { - orassan = true; - - if (ba.path.Contains("closed")) - { - continue; - } - - if (ba.bodyPart.defName.Contains("ear")) - - { - orassan = true; - - orassanv = new Vector3(0, 0, 1.23f); - if (pawnAnimator.headFacing == Rot4.North) - { - orassanv.z -= 0.1f; - orassanv.y += 1f; - - if (ba.bodyPart.defName.Contains("left")) - { - orassanv.x += 0.03f; - } - else - { - orassanv.x -= 0.03f; - } - - } - else if (pawnAnimator.headFacing == Rot4.East) - { - orassanv.x -= 0.1f; - } - else if (pawnAnimator.headFacing == Rot4.West) - { - orassanv.x = 0.1f; - } - else //south - { - orassanv.z += 0.1f; - orassanv.y += 1f; - - if (ba.bodyPart.defName.Contains("right")) - { - //orassanv.x += 0.3f; - } - else - { - //orassanv.x -= 0.3f; - } - } - orassanv = orassanv.RotatedBy(pawnAnimator.headAngle); - } - } - */ if ((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead) { Quaternion addonRotation = Quaternion.AngleAxis(pawnAnimator.headAngle < 0 ? 360 - (360 % pawnAnimator.headAngle) : pawnAnimator.headAngle, Vector3.up); - GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: pawnAnimator.headFacing), loc: vector + orassanv + (ba.alignWithHead && !orassan ? headOffset : headOffset - addonRotation * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.headFacing)) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f), + GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: pawnAnimator.headFacing), loc: vector + (ba.alignWithHead ? headOffset : headOffset - addonRotation * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.headFacing)) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f), quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: addonGraphic.MatAt(rot: pawnAnimator.headFacing), renderFlags.FlagSet(PawnRenderFlags.DrawNow));