diff --git a/1.4/Assemblies/Rimworld-Animations.dll b/1.4/Assemblies/Rimworld-Animations.dll index 2880d39..91ec017 100644 Binary files a/1.4/Assemblies/Rimworld-Animations.dll and b/1.4/Assemblies/Rimworld-Animations.dll differ diff --git a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs index 57ee1cc..9577b0c 100644 --- a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs +++ b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs @@ -78,7 +78,7 @@ namespace Rimworld_Animations { Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, pawn.story.headType) : Vector3.zero); vector2.y = (ba.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y)); float num = ba.angle; - if (((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing) == Rot4.North) + if (rotation == Rot4.North) { if (ba.layerInvert) { @@ -86,7 +86,7 @@ namespace Rimworld_Animations { } num = 0f; } - if (((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing) == Rot4.East) + if (rotation == Rot4.East) { num = 0f - num; vector2.x = 0f - vector2.x; @@ -95,12 +95,71 @@ 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, 0.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 + { + 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 + (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), + 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), quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: addonGraphic.MatAt(rot: pawnAnimator.headFacing), renderFlags.FlagSet(PawnRenderFlags.DrawNow)); diff --git a/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll b/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll index 1680010..c8811d7 100644 Binary files a/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll and b/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll differ