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

resolve

This commit is contained in:
moreoreganostodump 2021-09-12 18:02:55 +09:00
parent 8ea085a4ac
commit 5945acadf9
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs
View File

@ -40,12 +40,8 @@ namespace RJWSexperience.Ideology
}
<<<<<<< HEAD
public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data)
=======
public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data)
>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
{
return new ExpectedOutcomeDesc
{

7
RJWSexperience/RJWSexperience/RJW_Patch.cs
View File

@ -220,20 +220,13 @@ namespace RJWSexperience
public static void Prefix(SexProps props, ref float satisfaction)
{
<<<<<<< HEAD
=======
Pawn pawn = props.pawn;
>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
Pawn partner = props.partner;
satisfaction = Mathf.Max(base_sat_per_fuck, satisfaction * partner.GetSexStat());
}
public static void Postfix(SexProps props, float satisfaction)
{
<<<<<<< HEAD
=======
>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
Pawn pawn = props.pawn;
Pawn partner = props.partner;
float? lust = pawn.records?.GetValue(VariousDefOf.Lust);