mirror of
				https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git
				synced 2024-08-15 00:43:45 +00:00 
			
		
		
		
	build
This commit is contained in:
		
							parent
							
								
									8a4c934215
								
							
						
					
					
						commit
						fed18860f6
					
				
					 7 changed files with 116 additions and 2 deletions
				
			
		
										
											Binary file not shown.
										
									
								
							| 
						 | 
					@ -90,6 +90,7 @@
 | 
				
			||||||
    <Compile Include="Source\JobDrivers\JobDriver_SexCasualForAnimation.cs" />
 | 
					    <Compile Include="Source\JobDrivers\JobDriver_SexCasualForAnimation.cs" />
 | 
				
			||||||
    <Compile Include="Source\MainTabWindows\MainTabWindow_SexAnimator.cs" />
 | 
					    <Compile Include="Source\MainTabWindows\MainTabWindow_SexAnimator.cs" />
 | 
				
			||||||
    <Compile Include="Source\Patches\HarmonyPatch_AlienRace.cs" />
 | 
					    <Compile Include="Source\Patches\HarmonyPatch_AlienRace.cs" />
 | 
				
			||||||
 | 
					    <Compile Include="Source\Patches\HarmonyPatch_CSL.cs" />
 | 
				
			||||||
    <Compile Include="Source\Patches\HarmonyPatch_FacialAnimation.cs" />
 | 
					    <Compile Include="Source\Patches\HarmonyPatch_FacialAnimation.cs" />
 | 
				
			||||||
    <Compile Include="Source\Patches\HarmonyPatch_PawnRenderer.cs" />
 | 
					    <Compile Include="Source\Patches\HarmonyPatch_PawnRenderer.cs" />
 | 
				
			||||||
    <Compile Include="Source\Patches\HarmonyPatch_PawnRotation.cs" />
 | 
					    <Compile Include="Source\Patches\HarmonyPatch_PawnRotation.cs" />
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -161,5 +161,26 @@ namespace Rimworld_Animations {
 | 
				
			||||||
                GenDraw.DrawMeshNowOrLater(mesh, pawnHeadPosition, Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up), material, portrait);
 | 
					                GenDraw.DrawMeshNowOrLater(mesh, pawnHeadPosition, Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up), material, portrait);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        public static void RenderPawnHeadMeshInAnimation(Mesh mesh, Vector3 loc, Quaternion quaternion, Material material, bool portrait, Pawn pawn, float bodySizeFactor = 1) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (pawn == null) {
 | 
				
			||||||
 | 
					                GenDraw.DrawMeshNowOrLater(mesh, loc, quaternion, material, portrait);
 | 
				
			||||||
 | 
					                return;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            CompBodyAnimator pawnAnimator = pawn.TryGetComp<CompBodyAnimator>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (pawnAnimator == null || !pawnAnimator.isAnimating || portrait) {
 | 
				
			||||||
 | 
					                GenDraw.DrawMeshNowOrLater(mesh, loc, quaternion, material, portrait);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            else {
 | 
				
			||||||
 | 
					                Vector3 pawnHeadPosition = pawnAnimator.getPawnHeadPosition();
 | 
				
			||||||
 | 
					                pawnHeadPosition.x *= bodySizeFactor;
 | 
				
			||||||
 | 
					                pawnHeadPosition.x *= bodySizeFactor;
 | 
				
			||||||
 | 
					                pawnHeadPosition.y = loc.y;
 | 
				
			||||||
 | 
					                GenDraw.DrawMeshNowOrLater(mesh, pawnHeadPosition, Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up), material, portrait);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										86
									
								
								Source/Patches/HarmonyPatch_CSL.cs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										86
									
								
								Source/Patches/HarmonyPatch_CSL.cs
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,86 @@
 | 
				
			||||||
 | 
					using System;
 | 
				
			||||||
 | 
					using System.Collections.Generic;
 | 
				
			||||||
 | 
					using System.Linq;
 | 
				
			||||||
 | 
					using System.Text;
 | 
				
			||||||
 | 
					using System.Threading.Tasks;
 | 
				
			||||||
 | 
					using HarmonyLib;
 | 
				
			||||||
 | 
					using rjw;
 | 
				
			||||||
 | 
					using Verse;
 | 
				
			||||||
 | 
					using RimWorld;
 | 
				
			||||||
 | 
					using System.Reflection.Emit;
 | 
				
			||||||
 | 
					using System.Reflection;
 | 
				
			||||||
 | 
					using UnityEngine;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					namespace Rimworld_Animations {
 | 
				
			||||||
 | 
						[StaticConstructorOnStartup]
 | 
				
			||||||
 | 
						public static class HarmonyPatch_CSL {
 | 
				
			||||||
 | 
							static HarmonyPatch_CSL() {
 | 
				
			||||||
 | 
								try {
 | 
				
			||||||
 | 
									((Action)(() => {
 | 
				
			||||||
 | 
										if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "Children, school and learning")) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
											(new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("PawnRenderer_RenderPawnInternal_Patch"), "RenderPawnInternalScaled"),
 | 
				
			||||||
 | 
												prefix: new HarmonyMethod(AccessTools.Method(typeof(HarmonyPatch_CSL), "Prefix_CSL")),
 | 
				
			||||||
 | 
												transpiler: new HarmonyMethod(AccessTools.Method(typeof(HarmonyPatch_CSL), "Transpiler_CSL")));
 | 
				
			||||||
 | 
										}
 | 
				
			||||||
 | 
									}))();
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
								catch (TypeLoadException ex) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							public static void Prefix_CSL(PawnRenderer __instance, Pawn pawn, ref Vector3 rootLoc, ref float angle, bool renderBody, ref Rot4 bodyFacing, ref Rot4 headFacing, RotDrawMode bodyDrawType, bool portrait, bool headStump, bool invisible) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								PawnGraphicSet graphics = __instance.graphics;
 | 
				
			||||||
 | 
								CompBodyAnimator bodyAnim = pawn.TryGetComp<CompBodyAnimator>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								if (!graphics.AllResolved) {
 | 
				
			||||||
 | 
									graphics.ResolveAllGraphics();
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								if (bodyAnim != null && bodyAnim.isAnimating && !portrait) {
 | 
				
			||||||
 | 
									bodyAnim.tickGraphics(graphics);
 | 
				
			||||||
 | 
									pawn.TryGetComp<CompBodyAnimator>().animatePawn(ref rootLoc, ref angle, ref bodyFacing, ref headFacing);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							public static IEnumerable<CodeInstruction> Transpiler_CSL(IEnumerable<CodeInstruction> instructions) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								MethodInfo drawMeshNowOrLater = AccessTools.Method(typeof(GenDraw), "DrawMeshNowOrLater");
 | 
				
			||||||
 | 
								FieldInfo headGraphic = AccessTools.Field(typeof(PawnGraphicSet), "headGraphic");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								List<CodeInstruction> codes = instructions.ToList();
 | 
				
			||||||
 | 
								bool forHead = true;
 | 
				
			||||||
 | 
								for (int i = 0; i < codes.Count(); i++) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									//Instead of calling drawmeshnoworlater, add pawn to the stack and call my special static method
 | 
				
			||||||
 | 
									if (codes[i].OperandIs(drawMeshNowOrLater) && forHead) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
										yield return new CodeInstruction(OpCodes.Ldarg_0);
 | 
				
			||||||
 | 
										yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.DeclaredField(typeof(PawnRenderer), "pawn"));
 | 
				
			||||||
 | 
										yield return new CodeInstruction(OpCodes.Ldarg_2);
 | 
				
			||||||
 | 
										yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(AnimationUtility), nameof(AnimationUtility.RenderPawnHeadMeshInAnimation), new Type[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool), typeof(Pawn), typeof(float) }));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
									//checking for if(graphics.headGraphic != null)
 | 
				
			||||||
 | 
									else if (codes[i].opcode == OpCodes.Ldfld && codes[i].OperandIs(headGraphic)) {
 | 
				
			||||||
 | 
										forHead = true;
 | 
				
			||||||
 | 
										yield return codes[i];
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
									//checking for if(renderbody)
 | 
				
			||||||
 | 
									else if (codes[i].opcode == OpCodes.Ldarg_3) {
 | 
				
			||||||
 | 
										forHead = false;
 | 
				
			||||||
 | 
										yield return codes[i];
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
									else {
 | 
				
			||||||
 | 
										yield return codes[i];
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -64,7 +64,7 @@ namespace Rimworld_Animations {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
					yield return new CodeInstruction(OpCodes.Ldarg_0);
 | 
										yield return new CodeInstruction(OpCodes.Ldarg_0);
 | 
				
			||||||
					yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.DeclaredField(typeof(PawnRenderer), "pawn"));
 | 
										yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.DeclaredField(typeof(PawnRenderer), "pawn"));
 | 
				
			||||||
					yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(AnimationUtility), nameof(AnimationUtility.RenderPawnHeadMeshInAnimation)));
 | 
										yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(AnimationUtility), nameof(AnimationUtility.RenderPawnHeadMeshInAnimation), new Type[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool), typeof(Pawn) }));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
				//checking for if(graphics.headGraphic != null)
 | 
									//checking for if(graphics.headGraphic != null)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,6 +6,7 @@ using System.Reflection;
 | 
				
			||||||
using System.Reflection.Emit;
 | 
					using System.Reflection.Emit;
 | 
				
			||||||
using System.Text;
 | 
					using System.Text;
 | 
				
			||||||
using System.Threading.Tasks;
 | 
					using System.Threading.Tasks;
 | 
				
			||||||
 | 
					using UnityEngine;
 | 
				
			||||||
using Verse;
 | 
					using Verse;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Rimworld_Animations {
 | 
					namespace Rimworld_Animations {
 | 
				
			||||||
| 
						 | 
					@ -38,7 +39,7 @@ namespace Rimworld_Animations {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
					yield return new CodeInstruction(OpCodes.Ldarg_0);
 | 
										yield return new CodeInstruction(OpCodes.Ldarg_0);
 | 
				
			||||||
					yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.DeclaredField(typeof(PawnRenderer), "pawn"));
 | 
										yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.DeclaredField(typeof(PawnRenderer), "pawn"));
 | 
				
			||||||
					yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(AnimationUtility), nameof(AnimationUtility.RenderPawnHeadMeshInAnimation)));
 | 
										yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(AnimationUtility), nameof(AnimationUtility.RenderPawnHeadMeshInAnimation), new Type[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool), typeof(Pawn) }));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
				else {
 | 
									else {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -43,6 +43,11 @@ namespace Rimworld_Animations {
 | 
				
			||||||
            listingStandard.CheckboxLabeled("Enable Sound Override", ref AnimationSettings.soundOverride);
 | 
					            listingStandard.CheckboxLabeled("Enable Sound Override", ref AnimationSettings.soundOverride);
 | 
				
			||||||
            listingStandard.CheckboxLabeled("Control Genital Rotation", ref AnimationSettings.controlGenitalRotation);
 | 
					            listingStandard.CheckboxLabeled("Control Genital Rotation", ref AnimationSettings.controlGenitalRotation);
 | 
				
			||||||
            listingStandard.CheckboxLabeled("Apply Semen on Animation Orgasm", ref AnimationSettings.applySemenOnAnimationOrgasm);
 | 
					            listingStandard.CheckboxLabeled("Apply Semen on Animation Orgasm", ref AnimationSettings.applySemenOnAnimationOrgasm);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if(AnimationSettings.applySemenOnAnimationOrgasm) {
 | 
				
			||||||
 | 
					                listingStandard.Label("Recommended--turn down \"Cum on body percent\" in RJW settings to about 33%");
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            listingStandard.CheckboxLabeled("Enable Orgasm Quiver", ref AnimationSettings.orgasmQuiver);
 | 
					            listingStandard.CheckboxLabeled("Enable Orgasm Quiver", ref AnimationSettings.orgasmQuiver);
 | 
				
			||||||
            listingStandard.CheckboxLabeled("Enable Rape Shiver", ref AnimationSettings.rapeShiver);
 | 
					            listingStandard.CheckboxLabeled("Enable Rape Shiver", ref AnimationSettings.rapeShiver);
 | 
				
			||||||
            listingStandard.CheckboxLabeled("Enable hearts during lovin'", ref AnimationSettings.hearts);
 | 
					            listingStandard.CheckboxLabeled("Enable hearts during lovin'", ref AnimationSettings.hearts);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue