From 84be102c0f5b4a70b62186174a5163f4c8311554 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 30 Apr 2024 22:43:50 -0700 Subject: [PATCH] Fixes for orgy job, made psychic arouse incidentworker fireable --- 1.5/Assemblies/RJW-Events.dll | Bin 0 -> 23040 bytes About/About.xml | 1 + RJW-Events.csproj | 15 ++++++++++--- .../IncidentWorker_PsychicArouse.cs | 20 +++-------------- Source/JobDrivers/JobDriver_GetNaked.cs | 1 - Source/LordJobs/LordJob_Joinable_Orgy.cs | 15 ++----------- Source/Patches/HarmonyPatch_Need_Sex.cs | 4 ++-- Source/Patches/HarmonyPatch_ReclotheOnEnd.cs | 2 +- .../HarmonyPatch_ReclotheOnRemovePawn.cs | 2 +- .../Patches/HarmonyPatch_StayNudeForOrgy.cs | 4 +++- .../ThinkNodes/ThinkNode_ConditionalNude.cs | 21 +----------------- 11 files changed, 26 insertions(+), 59 deletions(-) create mode 100644 1.5/Assemblies/RJW-Events.dll diff --git a/1.5/Assemblies/RJW-Events.dll b/1.5/Assemblies/RJW-Events.dll new file mode 100644 index 0000000000000000000000000000000000000000..8884bdc09d94560e9a961e8647ea1787f853c38d GIT binary patch literal 23040 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 literal 0 HcmV?d00001 diff --git a/About/About.xml b/About/About.xml index 837eb8c..8fa35f7 100644 --- a/About/About.xml +++ b/About/About.xml @@ -8,6 +8,7 @@
  • 1.2
  • 1.3
  • 1.4
  • +
  • 1.5
  • c0ffee.rjw.events diff --git a/RJW-Events.csproj b/RJW-Events.csproj index 1af1cb7..8e6227c 100644 --- a/RJW-Events.csproj +++ b/RJW-Events.csproj @@ -18,7 +18,7 @@ false none false - 1.4\Assemblies\ + 1.5\Assemblies\ DEBUG;TRACE prompt 4 @@ -33,7 +33,7 @@ - ..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll + ..\..\..\..\workshop\content\294100\839005762\1.5\Assemblies\0Harmony.dll False @@ -41,7 +41,7 @@ False - ..\rjw\1.4\Assemblies\RJW.dll + ..\rjw\1.5\Assemblies\RJW.dll False @@ -52,6 +52,14 @@ + + ..\..\RimWorldWin64_Data\Managed\UnityEngine.dll + False + + + ..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + False + @@ -79,6 +87,7 @@ + diff --git a/Source/IncidentWorkers/IncidentWorker_PsychicArouse.cs b/Source/IncidentWorkers/IncidentWorker_PsychicArouse.cs index 11ec827..b4ddc11 100644 --- a/Source/IncidentWorkers/IncidentWorker_PsychicArouse.cs +++ b/Source/IncidentWorkers/IncidentWorker_PsychicArouse.cs @@ -16,32 +16,18 @@ namespace RJW_Events { if (base.TryExecuteWorker(parms)) { - SoundDefOf.PsychicSootheGlobal.PlayOneShotOnCamera((Map)parms.target); - return true; + SoundDefOf.PsychicSootheGlobal.PlayOneShotOnCamera(null); + return true; } return false; } protected override void DoConditionAndLetter(IncidentParms parms, Map map, int duration, Gender gender, float points) { - PsychicDroneLevel level; - if (points < 800f) - { - level = PsychicDroneLevel.BadLow; - } - else if (points < 2000f) - { - level = PsychicDroneLevel.BadMedium; - } - else - { - level = PsychicDroneLevel.BadHigh; - } - GameCondition_PsychicArouse gameCondition_PsychicEmanation = (GameCondition_PsychicArouse)GameConditionMaker.MakeCondition(GameConditionDefOf.PsychicArouse, duration); + GameCondition_PsychicEmanation gameCondition_PsychicEmanation = (GameCondition_PsychicEmanation)GameConditionMaker.MakeCondition(GameConditionDefOf.PsychicArouse, duration); gameCondition_PsychicEmanation.gender = gender; - gameCondition_PsychicEmanation.level = level; map.gameConditionManager.RegisterCondition(gameCondition_PsychicEmanation); base.SendStandardLetter(gameCondition_PsychicEmanation.LabelCap, gameCondition_PsychicEmanation.LetterText, gameCondition_PsychicEmanation.def.letterDef, parms, LookTargets.Invalid, Array.Empty()); diff --git a/Source/JobDrivers/JobDriver_GetNaked.cs b/Source/JobDrivers/JobDriver_GetNaked.cs index 19f4e19..bae7041 100644 --- a/Source/JobDrivers/JobDriver_GetNaked.cs +++ b/Source/JobDrivers/JobDriver_GetNaked.cs @@ -20,7 +20,6 @@ namespace RJW_Events { Toil t = new Toil(); t.AddFinishAction(() => { - GlobalTextureAtlasManager.TryMarkPawnFrameSetDirty(pawn); SexUtility.DrawNude(pawn); }); diff --git a/Source/LordJobs/LordJob_Joinable_Orgy.cs b/Source/LordJobs/LordJob_Joinable_Orgy.cs index e4248e0..ea14f99 100644 --- a/Source/LordJobs/LordJob_Joinable_Orgy.cs +++ b/Source/LordJobs/LordJob_Joinable_Orgy.cs @@ -73,11 +73,6 @@ namespace RJW_Events return base.VoluntaryJoinPriorityFor(p); } - public new bool IsGatheringAboutToEnd() - { - return timeoutTrigger.TicksLeft < 300; - } - public override void Notify_PawnAdded(Pawn p) { if(participants == null) @@ -93,14 +88,8 @@ namespace RJW_Events foreach(Pawn participant in participants) { - if (participant != null) - { - participant.mindState.Notify_OutfitChanged(); - - GlobalTextureAtlasManager.TryMarkPawnFrameSetDirty(participant); - if (xxx.is_human(participant)) - participant.Drawer.renderer.graphics.ResolveAllGraphics(); - } + participant.TryGetComp().drawNude = false; + participant.Drawer.renderer.SetAllGraphicsDirty(); } participants = null; diff --git a/Source/Patches/HarmonyPatch_Need_Sex.cs b/Source/Patches/HarmonyPatch_Need_Sex.cs index 9ee48f1..1f051fd 100644 --- a/Source/Patches/HarmonyPatch_Need_Sex.cs +++ b/Source/Patches/HarmonyPatch_Need_Sex.cs @@ -33,7 +33,7 @@ namespace RJW_Events case PsychicDroneLevel.None: break; case PsychicDroneLevel.GoodMedium: - __result *= 3; + __result *= 1.5f; break; case PsychicDroneLevel.BadLow: __result *= 3; @@ -45,7 +45,7 @@ namespace RJW_Events __result *= 9; break; case PsychicDroneLevel.BadExtreme: - __result *= 9; + __result *= 12; break; default: throw new NotImplementedException(); diff --git a/Source/Patches/HarmonyPatch_ReclotheOnEnd.cs b/Source/Patches/HarmonyPatch_ReclotheOnEnd.cs index 8dc1ddd..eb1fe12 100644 --- a/Source/Patches/HarmonyPatch_ReclotheOnEnd.cs +++ b/Source/Patches/HarmonyPatch_ReclotheOnEnd.cs @@ -17,7 +17,7 @@ namespace RJW_Events List ownedPawns = toil.lord.ownedPawns; for (int i = 0; i < ownedPawns.Count; i++) { - ownedPawns[i].Drawer.renderer.graphics.ResolveApparelGraphics(); + ownedPawns[i].Drawer.renderer.SetAllGraphicsDirty(); } } } diff --git a/Source/Patches/HarmonyPatch_ReclotheOnRemovePawn.cs b/Source/Patches/HarmonyPatch_ReclotheOnRemovePawn.cs index 832dc2e..65da06d 100644 --- a/Source/Patches/HarmonyPatch_ReclotheOnRemovePawn.cs +++ b/Source/Patches/HarmonyPatch_ReclotheOnRemovePawn.cs @@ -16,7 +16,7 @@ namespace RJW_Events { if(__instance?.LordJob != null && __instance.LordJob is LordJob_Joinable_Orgy) { - p.Drawer.renderer.graphics.ResolveApparelGraphics(); + p.Drawer.renderer.SetAllGraphicsDirty(); } } } diff --git a/Source/Patches/HarmonyPatch_StayNudeForOrgy.cs b/Source/Patches/HarmonyPatch_StayNudeForOrgy.cs index b3f9c2a..600ca1a 100644 --- a/Source/Patches/HarmonyPatch_StayNudeForOrgy.cs +++ b/Source/Patches/HarmonyPatch_StayNudeForOrgy.cs @@ -9,7 +9,7 @@ using Verse.AI.Group; namespace RJW_Events { - + /* [HarmonyPatch(typeof(PawnGraphicSet), "ResolveApparelGraphics")] public static class HarmonyPatch_StayNudeForOrgy { @@ -24,4 +24,6 @@ namespace RJW_Events return true; } } + + */ } diff --git a/Source/ThinkNodes/ThinkNode_ConditionalNude.cs b/Source/ThinkNodes/ThinkNode_ConditionalNude.cs index 2f47e06..7356c23 100644 --- a/Source/ThinkNodes/ThinkNode_ConditionalNude.cs +++ b/Source/ThinkNodes/ThinkNode_ConditionalNude.cs @@ -16,27 +16,8 @@ namespace RJW_Events protected override bool Satisfied(Pawn pawn) { - //if pawn is rendering apparel they shouldn't be, - if (pawn.Drawer.renderer.graphics.apparelGraphics.Any((x) => { - - if ( - x.sourceApparel.def is bondage_gear_def - || x.sourceApparel.def.defName.ToLower().ContainsAny(new string[] - { - "vibrator", - "piercing", - "strapon" - }) - || x.sourceApparel.def.apparel.bodyPartGroups.Contains(BodyPartGroupDefOf.UpperHead) - ) - return false; - - Log.Message("[c0ffee] " + x.sourceApparel.def.defName + " does not count as nude for Pawn " + pawn.Name.ToStringSafe()); - return true; - - })) + if (!pawn.TryGetComp().drawNude) { - //they aren't nude return false; }