AblativeAbsolute
/
RJW-Sexperience
mirror of https://github.com/amevarashi/RJW-Sexperience.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move InteractionSelectorService patch to InteractionScoringService

This commit is contained in:
amevarashi 2022-06-18 23:48:30 +05:00
parent d270674bef
commit 63692c517f
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
RJWSexperience/IdeologyAddon/Ideology/PreceptDefExtension_PreferSextype.cs
View File

@ -7,6 +7,15 @@ namespace RJWSexperience.Ideology
public class PreceptDefExtension_PreferSextype : DefModExtension public class PreceptDefExtension_PreferSextype : DefModExtension
{ {
[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
public HashSet<string> sextypes = new HashSet<string>(); public List<string> sextypes = new List<string>();
private HashSet<string> sextypesHashSet;
public bool HasSextype(string sextype)
{
if (sextypesHashSet == null)
sextypesHashSet = new HashSet<string>(sextypes);
return sextypesHashSet.Contains(sextype);
}
} }
} }

23
RJWSexperience/IdeologyAddon/Ideology/RJW_Patch_Ideo.cs
View File

@ -1,12 +1,9 @@
using HarmonyLib; using HarmonyLib;
using RimWorld; using RimWorld;
using rjw; using rjw;
using rjw.Modules.Interactions.Contexts;
using rjw.Modules.Interactions.Internals.Implementation; using rjw.Modules.Interactions.Internals.Implementation;
using rjw.Modules.Interactions.Objects; using rjw.Modules.Interactions.Objects;
using rjw.Modules.Interactions.Rules.InteractionRules;
using System; using System;
using System.Collections.Generic;
using Verse; using Verse;
namespace RJWSexperience.Ideology namespace RJWSexperience.Ideology
@ -267,28 +264,28 @@ namespace RJWSexperience.Ideology
/// <summary> /// <summary>
/// Set prefer sextype using precepts /// Set prefer sextype using precepts
/// </summary> /// </summary>
[HarmonyPatch(typeof(InteractionSelectorService), "Score")] [HarmonyPatch(typeof(InteractionScoringService), nameof(InteractionScoringService.Score), new Type[] { typeof(InteractionWithExtension), typeof(InteractionPawn), typeof(InteractionPawn) })]
public static class RJW_Patch_DetermineSexScores public static class RJW_Patch_DetermineSexScores
{ {
public static void Postfix(InteractionContext context, InteractionWithExtension interaction, IInteractionRule rule, ref float __result) public static void Postfix(InteractionWithExtension interaction, InteractionPawn dominant, InteractionPawn submissive, ref InteractionScore __result)
{ {
Ideo ideo = context.Inputs.Initiator.Ideo; Ideo ideo = dominant.Pawn.Ideo;
if (ideo != null) PreceptSextype(ideo, context.Inputs.Initiator.GetStatValue(xxx.sex_drive_stat), ref __result, interaction); if (ideo != null) __result.Dominant = PreceptSextype(ideo, dominant.Pawn.GetStatValue(xxx.sex_drive_stat), __result.Dominant, interaction);
ideo = context.Inputs.Partner.Ideo; ideo = submissive.Pawn.Ideo;
if (!context.Inputs.IsRape && ideo != null) PreceptSextype(ideo, context.Inputs.Partner.GetStatValue(xxx.sex_drive_stat), ref __result, interaction); if (ideo != null) __result.Submissive = PreceptSextype(ideo, submissive.Pawn.GetStatValue(xxx.sex_drive_stat), __result.Submissive, interaction);
} }
public static void PreceptSextype(Ideo ideo, float sexdrive, ref float result, InteractionWithExtension interaction) public static float PreceptSextype(Ideo ideo, float sexdrive, float score, InteractionWithExtension interaction)
{ {
Precept sextypePrecept = ideo.GetPreceptOfIssue(Ideology.IssueDefOf.Sextype); Precept sextypePrecept = ideo.GetPreceptOfIssue(Ideology.IssueDefOf.Sextype);
bool boostSextype = sextypePrecept.def.GetModExtension<PreceptDefExtension_PreferSextype>().sextypes.Contains(interaction.Extension.rjwSextype); bool boostSextype = sextypePrecept.def.GetModExtension<PreceptDefExtension_PreferSextype>().HasSextype(interaction.Extension.rjwSextype);
if (!boostSextype) if (!boostSextype)
return; return score;
float mult = 8.0f * Math.Max(0.3f, 1 / Math.Max(0.01f, sexdrive)); float mult = 8.0f * Math.Max(0.3f, 1 / Math.Max(0.01f, sexdrive));
result *= mult; return score * mult;
} }
} }