From 2c6732310c08a074d6a048af1b3806288a2b893f Mon Sep 17 00:00:00 2001 From: c0ffeeeeeeee Date: Tue, 15 Sep 2020 13:52:15 -0700 Subject: [PATCH] facial anim patch --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 57856 -> 56320 bytes .../CompatibilityPatch_FacialAnimation.xml | 87 +++++++++++++++++- Source/AnimationUtility.cs | 2 +- .../Patches/HarmonyPatch_FacialAnimation.cs | 13 +-- 4 files changed, 90 insertions(+), 12 deletions(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 8096e9da9172563d98963ca2fd9b0f4ccea7b618..55af9b2ae23f650e7a155e9d1abd453e5dcf0e29 100644 GIT binary patch delta 18945 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 Z-`Xg(C;#;aMSfyXyX(Dgq%D2S{~sNkKOq1B diff --git a/Patches/CompatibilityPatch_FacialAnimation.xml b/Patches/CompatibilityPatch_FacialAnimation.xml index edc59b2..125d79f 100644 --- a/Patches/CompatibilityPatch_FacialAnimation.xml +++ b/Patches/CompatibilityPatch_FacialAnimation.xml @@ -1,3 +1,87 @@ + + + + +
  • [NL] Facial Animation - WIP
  • +
    + + Always + +
  • + /Defs/FacialAnimation.FaceAnimationDef[defName="Lovin" or defName="Lovin2"]/targetJobs + Always + +
  • RJW_Masturbate
  • +
  • GettinBred
  • +
  • Bestiality
  • +
  • BestialityForFemale
  • +
  • ViolateCorpse
  • +
  • Quickie
  • +
  • GettingQuickie
  • +
  • GettinRaped
  • +
  • JoinInBed
  • +
  • GettinLoved
  • +
  • GettinLicked
  • +
  • GettinSucked
  • +
  • WhoreIsServingVisitors
  • +
  • JoinInBedAnimation
  • +
  • GettinLovedAnimation
  • + + +
  • + /Defs/FacialAnimation.FaceAnimationDef[defName="WaitCombat" or defName="Wait_Combat_Rare"]/targetJobs + Always + +
  • RapeComfortPawn
  • +
  • RandomRape
  • +
  • RapeEnemy
  • + + +
  • + /Defs/FacialAnimation.FaceAnimationDef[defName="StandAndBeSociallyActive"]/targetJobs + Always + +
  • WhoreInvitingVisitors
  • + + +
  • + /Defs/FacialAnimation.FaceAnimationDef[defName="Wear" or defName="Wear2" or defName="Wear3"]/targetJobs + Always + +
  • CleanSelf
  • +
  • StruggleInBondageGear
  • + + +
  • + +
  • Rimworld-Animations
  • + + + Always + +
  • + /Defs/FacialAnimation.FaceAnimationDef[defName="Lovin" or defName="Lovin2"]/animationFrames/li[1]/headOffset + Always +
  • +
  • + /Defs/FacialAnimation.FaceAnimationDef[defName="Lovin"]/animationFrames/li[2]/headOffset + Always +
  • +
  • + /Defs/FacialAnimation.FaceAnimationDef[defName="Lovin"]/animationFrames/li[3]/headOffset + Always +
  • +
    +
    + +
    +
    +
    +
    + + \ No newline at end of file diff --git a/Source/AnimationUtility.cs b/Source/AnimationUtility.cs index 29940d3..38c2de3 100644 --- a/Source/AnimationUtility.cs +++ b/Source/AnimationUtility.cs @@ -242,7 +242,7 @@ namespace Rimworld_Animations { if (optionsWithSexTypeAndInitiator.Any()) { if (AnimationSettings.debugMode) Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + " and initiators..."); - return optionsWithSexType.RandomElement(); + return optionsWithSexTypeAndInitiator.RandomElement(); } if (optionsWithSexType.Any()) { diff --git a/Source/Patches/HarmonyPatch_FacialAnimation.cs b/Source/Patches/HarmonyPatch_FacialAnimation.cs index 20c6e15..9c01ccb 100644 --- a/Source/Patches/HarmonyPatch_FacialAnimation.cs +++ b/Source/Patches/HarmonyPatch_FacialAnimation.cs @@ -20,13 +20,6 @@ namespace Rimworld_Animations { if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "[NL] Facial Animation - WIP")) { (new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("FacialAnimation.DrawFaceGraphicsComp"), "DrawGraphics"), prefix: new HarmonyMethod(AccessTools.Method(typeof(Patch_FacialAnimation), "Prefix"))); - - - (new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("FacialAnimation.FaceAnimationDef"), "IsSame", new Type[] { typeof(JobDef) }), - prefix: new HarmonyMethod(AccessTools.Method(typeof(Patch_FacialAnimation), "Prefix_IsSameA"))); - - (new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("FacialAnimation.FaceAnimationDef"), "IsSame", new Type[] { typeof(string) }), - prefix: new HarmonyMethod(AccessTools.Method(typeof(Patch_FacialAnimation), "Prefix_IsSameB"))); } }))(); } @@ -48,7 +41,7 @@ namespace Rimworld_Animations { return true; } - + /* public static List rjwLovinDefNames = new List{ "Lovin", "Quickie", @@ -78,7 +71,6 @@ namespace Rimworld_Animations { "RapeEnemy" }; - public static bool Prefix_IsSameA(JobDef job, string ___jobDef, ref bool __result) { if(___jobDef != null && ___jobDef == "Lovin" && job?.defName != null && rjwLovinDefNames.Contains(job?.defName)) { @@ -107,5 +99,6 @@ namespace Rimworld_Animations { return true; } + */ } -} +} \ No newline at end of file