diff --git a/1.3/Assemblies/Rimworld-Animations.dll b/1.3/Assemblies/Rimworld-Animations.dll index 888b1ed..cf307d7 100644 Binary files a/1.3/Assemblies/Rimworld-Animations.dll and b/1.3/Assemblies/Rimworld-Animations.dll differ diff --git a/1.3/Source/Comps/CompBodyAnimator.cs b/1.3/Source/Comps/CompBodyAnimator.cs index 9f5f95c..e0ac52a 100644 --- a/1.3/Source/Comps/CompBodyAnimator.cs +++ b/1.3/Source/Comps/CompBodyAnimator.cs @@ -312,7 +312,7 @@ namespace Rimworld_Animations { if (clip.SoundEffects[clipTicks] == "Cum") { sound.volumeFactor *= RJWSettings.sounds_cum_volume; - considerApplyingSemen(); + //considerApplyingSemen(); } else { @@ -342,7 +342,7 @@ namespace Rimworld_Animations { if (anim.sexTypes.Contains((pawn.jobs.curDriver as JobDriver_Sex).Sexprops.sexType)) { - SemenHelper.calculateAndApplySemen((pawn.jobs.curDriver as JobDriver_Sex).Sexprops); + //SemenHelper.calculateAndApplySemen((pawn.jobs.curDriver as JobDriver_Sex).Sexprops); } } } diff --git a/1.3/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs b/1.3/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs index 6f48d1d..b7198da 100644 --- a/1.3/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs +++ b/1.3/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs @@ -67,6 +67,65 @@ namespace Rimworld_Animations { addonGraphic.drawSize = ((renderFlags.FlagSet(PawnRenderFlags.Portrait) && ba.drawSizePortrait != Vector2.zero) ? ba.drawSizePortrait : ba.drawSize) * (ba.scaleWithPawnDrawsize ? (ba.alignWithHead ? (renderFlags.FlagSet(PawnRenderFlags.Portrait) ? comp.customPortraitHeadDrawSize : comp.customHeadDrawSize) : (renderFlags.FlagSet(PawnRenderFlags.Portrait) ? comp.customPortraitDrawSize : comp.customDrawSize)) : 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.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.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.Contains("right")) + { + //orassanv.x += 0.3f; + } + else + { + //orassanv.x -= 0.3f; + } + } + orassanv = orassanv.RotatedBy(pawnAnimator.headAngle); + } + } + + if ((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead) { @@ -81,7 +140,7 @@ namespace Rimworld_Animations { */ - GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: pawnAnimator.headFacing), loc: vector /*rootloc*/ + (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 /*rootloc*/ + 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/1.3/Source/Patches/RJWPatches/HarmonyPatch_WorkGiverSex.cs b/1.3/Source/Patches/RJWPatches/HarmonyPatch_WorkGiverSex.cs index 5b7479f..af4a755 100644 --- a/1.3/Source/Patches/RJWPatches/HarmonyPatch_WorkGiverSex.cs +++ b/1.3/Source/Patches/RJWPatches/HarmonyPatch_WorkGiverSex.cs @@ -10,7 +10,7 @@ using RimWorld; using Verse.AI; namespace Rimworld_Animations { - + /* [HarmonyPatch(typeof(WorkGiver_Sex), "JobOnThing")] public static class HarmonyPatch_WorkGiverSex { @@ -26,4 +26,6 @@ namespace Rimworld_Animations { } } + + */ } diff --git a/Patch_SexToysMasturbation/1.3/Assemblies/Patch_SexToysMasturbation.dll b/Patch_SexToysMasturbation/1.3/Assemblies/Patch_SexToysMasturbation.dll index 3df90a6..b7c0a4e 100644 Binary files a/Patch_SexToysMasturbation/1.3/Assemblies/Patch_SexToysMasturbation.dll and b/Patch_SexToysMasturbation/1.3/Assemblies/Patch_SexToysMasturbation.dll differ