resolve
This commit is contained in:
parent
8ea085a4ac
commit
5945acadf9
|
@ -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)
|
||||||
=======
|
|
||||||
public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data)
|
|
||||||
>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
|
|
||||||
{
|
{
|
||||||
return new ExpectedOutcomeDesc
|
return new ExpectedOutcomeDesc
|
||||||
{
|
{
|
||||||
|
|
|
@ -220,20 +220,13 @@ namespace RJWSexperience
|
||||||
|
|
||||||
public static void Prefix(SexProps props, ref float satisfaction)
|
public static void Prefix(SexProps props, ref float satisfaction)
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
Pawn pawn = props.pawn;
|
Pawn pawn = props.pawn;
|
||||||
>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
|
|
||||||
Pawn partner = props.partner;
|
Pawn partner = props.partner;
|
||||||
satisfaction = Mathf.Max(base_sat_per_fuck, satisfaction * partner.GetSexStat());
|
satisfaction = Mathf.Max(base_sat_per_fuck, satisfaction * partner.GetSexStat());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Postfix(SexProps props, float satisfaction)
|
public static void Postfix(SexProps props, float satisfaction)
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
|
|
||||||
Pawn pawn = props.pawn;
|
Pawn pawn = props.pawn;
|
||||||
Pawn partner = props.partner;
|
Pawn partner = props.partner;
|
||||||
float? lust = pawn.records?.GetValue(VariousDefOf.Lust);
|
float? lust = pawn.records?.GetValue(VariousDefOf.Lust);
|
||||||
|
|
Loading…
Reference in New Issue