Merge branch 'feature/SwitchToPostfixPatch'

CactusPie · Oct 16, 2021 · bdbae9e · bdbae9e
2 parents 903ad05 + b9d82b1
commit bdbae9e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -12,11 +12,21 @@
 			<downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
 		</li>
 	</modDependencies>
+    <loadAfter>
+        <li>syrchalis.individuality</li>
+    </loadAfter>
 	<supportedVersions>
 		<li>1.3</li>
 	</supportedVersions>
-	<description>Completely disables romance option for slaves.
-Only prevents new romance from occuring, it will not affect any existing romances.
+	<description>This mod prevents slaves from falling in love.
+Only prevents new romance from occurring, it will not affect any existing romances.
+
+Mod settings allow you to enable or disable the following options:
+- Prevent slaves from romancing other slaves
+- Prevent slaves from romancing colonists
+
+By default both settings are enabled, which means all romance for slaves will be disabled.
+
 Required mod: Harmony.
 
 GitHub: https://github.com/CactusPie/RimWorld-NoSlaveRomance</description>

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
-	<identifier>NoSalveRomance</identifier>
-	<version>1.1</version>
+	<identifier>NoSlaveRomance</identifier>
+	<version>1.2</version>
 </Manifest>
diff --git a/src/Rimworld.CactusPie.NoSlaveRomance/DisableSlaveRomancePatch.cs b/src/Rimworld.CactusPie.NoSlaveRomance/DisableSlaveRomancePatch.cs
@@ -9,7 +9,7 @@ internal class DisableSlaveRomancePatch
     {
         private static readonly NoSlaveRomanceSettings Settings = LoadedModManager.GetMod<NoSlaveRomanceMod>().GetSettings<NoSlaveRomanceSettings>();
 
-        private static bool Prefix(ref float __result, Pawn initiator, Pawn recipient)
+        private static void Postfix(ref float __result, Pawn initiator, Pawn recipient)
         {
             if (Settings.PreventRomanceWithColonists)
             {
@@ -18,24 +18,21 @@ private static bool Prefix(ref float __result, Pawn initiator, Pawn recipient)
                     if (initiator.IsSlave || recipient.IsSlave)
                     {
                         __result = 0f;
-                        return false;
+                        return;
                     }
                 }
 
                 if (initiator.IsSlave ^ recipient.IsSlave)
                 {
                     __result = 0f;
-                    return false;
+                    return;
                 }
             }
 
             if (Settings.PreventRomanceWithSlaves && initiator.IsSlave && recipient.IsSlave)
             {
                 __result = 0f;
-                return false;
             }
-
-            return true; 
         }
     }
 }