Merge branch 'dev'

1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs

@@ -1199,7 +1199,7 @@ namespace RJW_Menstruation
                 if (!absorber.dirty)
                 {
                     absorber.absorbedfluids += amount;
-                    if (absorber.absorbedfluids > absorbable)
+                    if (absorber.absorbedfluids > absorbable && !parent.pawn.apparel.IsLocked(absorber))
                     {
                         absorber.def = absorber.DirtyDef;
                         //absorber.fluidColor = GetCumMixtureColor;
@@ -1299,9 +1299,9 @@ namespace RJW_Menstruation
             {
                 eggnum = 1 + eggstack;
             }
-            catch(ArgumentException)
+            catch(ArgumentException e)
             {
-                Log.Warning($"Invalid litterSizeCurve for {parent.pawn.RaceProps}");
+                Log.Warning($"Invalid litterSizeCurve for {parent.pawn.RaceProps}: {e}");
                 eggnum = 1 + eggstack;
             }
 
@@ -1453,7 +1453,9 @@ namespace RJW_Menstruation
         {
             if (xxx.is_human(parent.pawn) && xxx.is_human(cummer))
             {
-                if (parent.pawn.GetStatValue(StatDefOf.PawnBeauty) >= 0 || cummer.Has(Quirk.ImpregnationFetish) || cummer.Has(Quirk.Breeder))
+                if ((cummer.Has(Quirk.Teratophile) != (parent.pawn.GetStatValue(StatDefOf.PawnBeauty) >= 0)) ||
+                    cummer.Has(Quirk.ImpregnationFetish) ||
+                    cummer.Has(Quirk.Breeder))
                 {
                     if (cummer.relations.OpinionOf(parent.pawn) <= -25)
                     {

1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs

@@ -229,23 +229,30 @@ namespace RJW_Menstruation
         private static readonly FieldInfo MinimumRelationshipToHookup = AccessTools.Field(typeof(RJWHookupSettings), nameof(RJWHookupSettings.MinimumRelationshipToHookup));
         public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
         {
+            object pawn_index = null;
             // Like in the last one, we're only interested in the first of each
             bool found_first_attractiveness = false;
             bool found_first_relationship = false;
             foreach(CodeInstruction instruction in instructions)
             {
-                if (!found_first_attractiveness && instruction.LoadsField(MinimumAttractivenessToHookup))
+                // Get where the compiler decided to index the pawn at
+                if (pawn_index is null && instruction.opcode == OpCodes.Stloc_S)    // the first stloc.s in the IL is the pawn being loaded out of the list
+                {                                                                   // a future RJW or compiler update might change this, or maybe another mod's patch
+                    pawn_index = instruction.operand;
+                    yield return instruction;
+                }
+                else if (!found_first_attractiveness && instruction.LoadsField(MinimumAttractivenessToHookup))
                 {
                     found_first_attractiveness = true;
                     yield return new CodeInstruction(OpCodes.Ldarg_0);
-                    yield return new CodeInstruction(OpCodes.Ldarg_1);
+                    yield return new CodeInstruction(OpCodes.Ldloc_S, pawn_index);
                     yield return CodeInstruction.Call(typeof(FindBestPartner_Patch), nameof(AttractivenessThreshold));
                 }
                 else if (!found_first_relationship && instruction.LoadsField(MinimumRelationshipToHookup))
                 {
                     found_first_relationship = true;
                     yield return new CodeInstruction(OpCodes.Ldarg_0);
-                    yield return new CodeInstruction(OpCodes.Ldarg_1);
+                    yield return new CodeInstruction(OpCodes.Ldloc_S, pawn_index);
                     yield return CodeInstruction.Call(typeof(FindBestPartner_Patch), nameof(RelationshipThreshold));
                 }
                 else yield return instruction;

1.3/source/RJW_Menstruation/RJW_Menstruation/Things.cs

@@ -256,7 +256,7 @@ namespace RJW_Menstruation
 
         public override void DirtyEffect()
         {
-            if (wearhours > MinHrstoDirtyEffect && Rand.Chance(0.01f))
+            if (wearhours > MinHrstoDirtyEffect && Rand.Chance(0.01f) && !Wearer.apparel.IsLocked(this))
             {
                 Wearer.health.AddHediff(HediffDefOf.WoundInfection, Genital_Helper.get_genitalsBPR(Wearer));
             }

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW Menstruation</identifier>
-	<version>1.0.6.1</version>
+	<version>1.0.6.2</version>
 	<dependencies>
 	</dependencies>
 	<incompatibleWith />

changelogs.txt

@@ -1,3 +1,8 @@
+Version 1.0.6.2
+ - Fix error/crash when a pawn in estrus (with hookup override enabled) looks for partners.
+ - Teratophiles get the "I came inside" mood buff for ugly partners instead of pretty ones.
+ - Locked absorbers (e.g. that guests have) won't get dirty or cause infections.
+
 Version 1.0.6.1
  - Requires RJW 4.9.6 or later
  - Fix errors when a hybrid refers to an invalid race.