From 6ab4a43498f356ed81cce7d94b359d20f4f729cb Mon Sep 17 00:00:00 2001 From: c0ffeeeeeeee Date: Fri, 28 Aug 2020 00:24:55 -0700 Subject: [PATCH] debug mode to stop spamming log --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 57344 -> 57856 bytes Source/AnimationUtility.cs | 59 +++++++++++------- .../MainTabWindow_OffsetConfigure.cs | 6 +- ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 6 +- .../HarmonyPatch_PlayAnimJoinInBedRMB.cs | 3 +- Source/Settings/AnimationSettings.cs | 5 +- 6 files changed, 50 insertions(+), 29 deletions(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index e414570095f9f402fec7aaea19684e6984ec0b46..c34b8a1a67f16b35ebb1203bc4b1264ada51c1f2 100644 GIT binary patch delta 18531 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 diff --git a/Source/AnimationUtility.cs b/Source/AnimationUtility.cs index 104856c..29940d3 100644 --- a/Source/AnimationUtility.cs +++ b/Source/AnimationUtility.cs @@ -44,18 +44,16 @@ namespace Rimworld_Animations { } if ((x.actors[i].blacklistedRaces != null) && x.actors[i].blacklistedRaces.Contains(localParticipants[i].def.defName)) { - if (rjw.RJWSettings.DevMode) { + if(AnimationSettings.debugMode) Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " is blacklisted"); - } return false; } if(x.actors[i].defNames.Contains("Human")) { if (!rjw.xxx.is_human(localParticipants[i])) { - if(rjw.RJWSettings.DevMode) { + if (AnimationSettings.debugMode) Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " is not human"); - } - + return false; } @@ -69,7 +67,8 @@ namespace Rimworld_Animations { foreach(String defname in x.actors[i].defNames) { animInfo += defname + ", "; } - Log.Message(animInfo); + if (AnimationSettings.debugMode) + Log.Message(animInfo); } return false; @@ -80,7 +79,8 @@ namespace Rimworld_Animations { if (x.actors[i].requiredGenitals.Contains("Vagina")) { if (!rjw.Genital_Helper.has_vagina(localParticipants[i])) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have vagina"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have vagina"); return false; } @@ -89,7 +89,8 @@ namespace Rimworld_Animations { if (x.actors[i].requiredGenitals.Contains("Penis")) { if (!(rjw.Genital_Helper.has_multipenis(localParticipants[i]) || rjw.Genital_Helper.has_penis_infertile(localParticipants[i]) || rjw.Genital_Helper.has_penis_fertile(localParticipants[i]))) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have penis"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have penis"); return false; } @@ -98,7 +99,8 @@ namespace Rimworld_Animations { if (x.actors[i].requiredGenitals.Contains("Mouth")) { if (!rjw.Genital_Helper.has_mouth(localParticipants[i])) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have mouth"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have mouth"); return false; } @@ -107,7 +109,8 @@ namespace Rimworld_Animations { if (x.actors[i].requiredGenitals.Contains("Anus")) { if (!rjw.Genital_Helper.has_anus(localParticipants[i])) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have anus"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have anus"); return false; } @@ -115,7 +118,8 @@ namespace Rimworld_Animations { if(x.actors[i].requiredGenitals.Contains("Breasts")) { if (!rjw.Genital_Helper.can_do_breastjob(localParticipants[i])) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have breasts"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have breasts"); return false; } } @@ -123,7 +127,8 @@ namespace Rimworld_Animations { if (x.actors[i].requiredGenitals.Contains("NoVagina")) { if (rjw.Genital_Helper.has_vagina(localParticipants[i])) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has vagina"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has vagina"); return false; } @@ -132,7 +137,8 @@ namespace Rimworld_Animations { if (x.actors[i].requiredGenitals.Contains("NoPenis")) { if ((rjw.Genital_Helper.has_multipenis(localParticipants[i]) || rjw.Genital_Helper.has_penis_infertile(localParticipants[i]) || rjw.Genital_Helper.has_penis_fertile(localParticipants[i]))) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has penis"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has penis"); return false; } @@ -141,7 +147,8 @@ namespace Rimworld_Animations { if (x.actors[i].requiredGenitals.Contains("NoMouth")) { if (rjw.Genital_Helper.has_mouth(localParticipants[i])) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has mouth"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has mouth"); return false; } @@ -150,7 +157,8 @@ namespace Rimworld_Animations { if (x.actors[i].requiredGenitals.Contains("NoAnus")) { if (rjw.Genital_Helper.has_anus(localParticipants[i])) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has anus"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has anus"); return false; } @@ -158,7 +166,8 @@ namespace Rimworld_Animations { if (x.actors[i].requiredGenitals.Contains("NoBreasts")) { if (rjw.Genital_Helper.can_do_breastjob(localParticipants[i])) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has breasts"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has breasts"); return false; } } @@ -174,12 +183,14 @@ namespace Rimworld_Animations { if (x.actors[i].isFucking && !rjw.xxx.can_fuck(localParticipants[i])) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " can't fuck"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " can't fuck"); return false; } if (x.actors[i].isFucked && !rjw.xxx.can_be_fucked(localParticipants[i])) { - Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " can't be fucked"); + if (AnimationSettings.debugMode) + Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " can't be fucked"); return false; } } @@ -229,21 +240,25 @@ namespace Rimworld_Animations { if (optionsWithSexTypeAndInitiator.Any()) { - Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + " and initiators..."); + if (AnimationSettings.debugMode) + Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + " and initiators..."); return optionsWithSexType.RandomElement(); } if (optionsWithSexType.Any()) { - Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + "..."); + if (AnimationSettings.debugMode) + Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + "..."); return optionsWithSexType.RandomElement(); } if(optionsWithInitiator.Any()) { - Log.Message("Selecting animation for initiators..."); + if (AnimationSettings.debugMode) + Log.Message("Selecting animation for initiators..."); } if (options != null && options.Any()) { - Log.Message("Randomly selecting animation..."); + if (AnimationSettings.debugMode) + Log.Message("Randomly selecting animation..."); return options.RandomElement(); } else diff --git a/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs b/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs index ab2a354..fdc1370 100644 --- a/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs +++ b/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs @@ -98,12 +98,14 @@ namespace Rimworld_Animations { public override void PreOpen() { base.PreOpen(); if(AnimationSettings.offsets == null) { - Log.Message("New offsets"); + if (AnimationSettings.debugMode) + Log.Message("New offsets"); AnimationSettings.offsets = new Dictionary(); } if(AnimationSettings.rotation == null) { - Log.Message("New rotation"); + if (AnimationSettings.debugMode) + Log.Message("New rotation"); AnimationSettings.rotation = new Dictionary(); } } diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index 04cdef2..3b2686d 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -64,7 +64,7 @@ namespace Rimworld_Animations { public static void RerollAnimations(Pawn pawn, int duration, Thing bed = null, xxx.rjwSextype sexType = xxx.rjwSextype.None, bool fastAnimForQuickie = false, rjw.SexProps sexProps = null) { if(pawn == null || !(pawn.jobs?.curDriver is JobDriver_SexBaseReciever)) { - Log.Message("Error: Tried to reroll animations when pawn isn't sexing"); + Log.Error("Error: Tried to reroll animations when pawn isn't sexing"); return; } @@ -80,7 +80,7 @@ namespace Rimworld_Animations { bool mirror = GenTicks.TicksGame % 2 == 0; - Log.Message("Now playing " + anim.defName + (mirror ? " mirrored" : "")); + Log.Message("Now playing " + anim.defName + (AnimationSettings.debugMode && mirror ? " mirrored" : "")); IntVec3 pos = pawn.Position; @@ -106,7 +106,7 @@ namespace Rimworld_Animations { } } else { - Log.Message("Anim not found"); + Log.Message("No animation found"); //if pawn isn't already animating, if (!pawn.TryGetComp().isAnimating) { (pawn.jobs.curDriver as JobDriver_SexBaseReciever).increase_time(duration); diff --git a/Source/Patches/rjwPatches/HarmonyPatch_PlayAnimJoinInBedRMB.cs b/Source/Patches/rjwPatches/HarmonyPatch_PlayAnimJoinInBedRMB.cs index aab9e41..5fa4cd8 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_PlayAnimJoinInBedRMB.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_PlayAnimJoinInBedRMB.cs @@ -15,7 +15,8 @@ namespace Rimworld_Animations { class HarmonyPatch_PlayAnimJoinInBedRMB { public static void Prefix(ref Job job) { if(job.def == xxx.casual_sex) { - Log.Message("Replacing vanilla RJW JoinInBed JobDriver for animation JobDriver"); + if (AnimationSettings.debugMode || RJWSettings.DevMode) + Log.Message("Replacing vanilla RJW JoinInBed JobDriver for animation JobDriver"); job = new Job(DefDatabase.GetNamed("JoinInBedAnimation", true), job.targetA, job.targetB, job.targetC); } diff --git a/Source/Settings/AnimationSettings.cs b/Source/Settings/AnimationSettings.cs index 75308b8..eec6a7c 100644 --- a/Source/Settings/AnimationSettings.cs +++ b/Source/Settings/AnimationSettings.cs @@ -12,7 +12,7 @@ namespace Rimworld_Animations { public class AnimationSettings : ModSettings { public static bool orgasmQuiver, rapeShiver, soundOverride = true, hearts = true, controlGenitalRotation = false, applySemenOnAnimationOrgasm = false, fastAnimForQuickie = false; - public static bool offsetTab = false; + public static bool offsetTab = false, debugMode = false; public static float shiverIntensity = 2f; public static Dictionary offsets = new Dictionary(); @@ -22,6 +22,7 @@ namespace Rimworld_Animations { base.ExposeData(); + Scribe_Values.Look(ref debugMode, "AnimsDebugMode", false); Scribe_Values.Look(ref offsetTab, "EnableOffsetTab", false); Scribe_Values.Look(ref controlGenitalRotation, "controlGenitalRotation", false); Scribe_Values.Look(ref orgasmQuiver, "orgasmQuiver"); @@ -75,6 +76,8 @@ namespace Rimworld_Animations { listingStandard.Label("Shiver/Quiver Intensity (default 2): " + AnimationSettings.shiverIntensity); AnimationSettings.shiverIntensity = listingStandard.Slider(AnimationSettings.shiverIntensity, 0.0f, 12f); + listingStandard.CheckboxLabeled("Debug Mode", ref AnimationSettings.debugMode); + listingStandard.End(); base.DoSettingsWindowContents(inRect);