v1.0.6

- Better handling of default rules - Pawns who have been disallowed new romances should now no longer still try
Jaxe-Dev · Sep 3, 2018 · bde66cc · bde66cc
1 parent a906c90
commit bde66cc
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 33 deletions.
diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -3,7 +3,7 @@
 <ModSyncNinjaData>
   <ID>59f538ed-f86d-4506-a4a5-7e9faaa37508</ID>
   <ModName>Pawn Rules</ModName>
-  <Version>v1.0.5</Version>
+  <Version>v1.0.6</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>Jaxe-Dev</Owner>

diff --git a/README.md b/README.md
@@ -1,11 +1,12 @@
 # Pawn Rules
 ![](https://img.shields.io/badge/Version-1.0.5-brightgreen.svg)
 
-Built for **RimWorld 1.0.x / 0.19.x**\
+Built for **RimWorld B19**\
 Powered by **Harmony**\
 Supports **ModSync RW**
 
-[Link to Ludeon Forum Post](https://ludeon.com/forums/index.php?topic=43086.0)
+[Link to Ludeon Forum thread](https://ludeon.com/forums/index.php?topic=43086.0)\
+[Link to Steam Workshop page](https://steamcommunity.com/sharedfiles/filedetails/?id=1499843448)
 
 ------------
 
@@ -47,6 +48,7 @@ RimWorld.FoodUtility.BestFoodSourceOnMap : Prefix
 RimWorld.FoodUtility.BestFoodInInventory : Prefix
 RimWorld.FoodUtility.TryFindBestFoodSourceFor : Prefix
 RimWorld.GenConstruct.CanConstruct : Postfix
+RimWorld.InteractionWorker_RomanceAttempt.RandomSelectionWeight : Prefix
 RimWorld.InteractionWorker_RomanceAttempt.SuccessChance : Prefix
 RimWorld.JobGiver_PackFood.IsGoodPackableFoodFor : Postfix
 RimWorld.JoyGiver_Ingest.CanIngestForJoy : Prefix
@@ -56,6 +58,6 @@ Verse.Game.FinalizeInit : Postfix
 Verse.Pawn.GetGizmos : Postfix
 Verse.Pawn.Kill : Postfix
 Verse.Pawn.SetFaction : Prefix
-Verse.Pawn.SetFactionDirect : Prefix
+Verse.PawnGenerator.GeneratePawn : Postfix
 Verse.Pawn_GuestTracker.SetGuestStatus : Prefix
 ```
diff --git a/Source/Data/Registry.cs b/Source/Data/Registry.cs
@@ -139,7 +139,18 @@ public static Rules GetRules(Pawn pawn)
             return Instance._rules.ContainsKey(pawn) ? Instance._rules[pawn] : null;
         }
 
-        public static Rules GetOrCreateRules(Pawn pawn)
+        public static Rules GetOrNewRules(Pawn pawn)
+        {
+            if (!pawn.CanHaveRules()) { return null; }
+            if (Instance._rules.ContainsKey(pawn)) { return Instance._rules[pawn]; }
+
+            var rules = GetVoidPreset<Rules>(pawn.GetTargetType()).CloneRulesFor(pawn);
+            Instance._rules.Add(pawn, rules);
+
+            return rules;
+        }
+
+        public static Rules GetOrDefaultRules(Pawn pawn)
         {
             if (!pawn.CanHaveRules()) { return null; }
             if (Instance._rules.ContainsKey(pawn)) { return Instance._rules[pawn]; }
@@ -163,7 +174,7 @@ private static Rules ChangeTypeOrCreateRules(Pawn pawn, PawnType type)
         public static Rules CloneRules(Pawn original, Pawn cloner)
         {
             if (!original.CanHaveRules()) { return null; }
-            if (!Instance._rules.ContainsKey(original)) { return GetOrCreateRules(cloner); }
+            if (!Instance._rules.ContainsKey(original)) { return GetOrDefaultRules(cloner); }
             if (Instance._rules.ContainsKey(cloner)) { DeleteRules(cloner); }
 
             var cloned = Instance._rules[original].CloneRulesFor(cloner);
@@ -196,7 +207,7 @@ public static void FactionUpdate(Thing thing, Faction newFaction, bool? guest =
             }
             else { return; }
 
-            if (GetDefaultRules(type).IsIgnored()) { return; }
+            if (GetDefaultRules(type).IsVoid) { return; }
 
             ChangeTypeOrCreateRules(pawn, type);
         }
@@ -251,6 +262,7 @@ public override void PostAdd()
             InitVoids();
             InitDefaults();
         }
+
         public override void SpawnSetup()
         { }
 

diff --git a/Source/Interface/Dialog_Rules.cs b/Source/Interface/Dialog_Rules.cs
@@ -38,7 +38,7 @@ private Dialog_Rules(Pawn pawn, Rules rules) : base(new Vector2(700f, 600f))
             _floatMenuAssign = GetAssignmentOptions();
         }
 
-        public static void OpenFromPawn(Pawn pawn) => Find.WindowStack.Add(new Dialog_Rules(pawn, Registry.GetOrCreateRules(pawn)));
+        public static void OpenFromPawn(Pawn pawn) => Find.WindowStack.Add(new Dialog_Rules(pawn, Registry.GetOrNewRules(pawn)));
 
         private void ChangeType(PawnType type)
         {
@@ -47,7 +47,7 @@ private void ChangeType(PawnType type)
             _preset.FixedPresets = _type == null ? new[] { _personalized } : new[] { Registry.GetVoidPreset<Rules>(_template.Type) };
             if (type == null)
             {
-                var rules = Registry.GetOrCreateRules(_pawn);
+                var rules = Registry.GetOrNewRules(_pawn);
                 _preset.Selected = rules.IsPreset ? rules : _personalized;
             }
             else { _preset.Selected = Registry.GetDefaultRules(type); }

diff --git a/Source/Mod.cs b/Source/Mod.cs
@@ -7,7 +7,7 @@ internal class Mod : Verse.Mod
         public const string Id = "PawnRules";
         public const string Name = "Pawn Rules";
         public const string Author = "Jaxe";
-        public const string Version = "1.0.5";
+        public const string Version = "1.0.6";
 
         public static ModContentPack ContentPack { get; private set; }
 

diff --git a/Source/Patch/RimWorld_FoodUtility_TryFindBestFoodSourceFor.cs b/Source/Patch/RimWorld_FoodUtility_TryFindBestFoodSourceFor.cs
@@ -15,10 +15,7 @@ private static bool Prefix(ref bool __result, Pawn getter, Pawn eater, bool desp
             var thing1 = (Thing) null;
             if (canUseInventory)
             {
-                if (flag)
-                {
-                    thing1 = FoodUtility.BestFoodInInventory(getter, eater, FoodPreferability.MealAwful);
-                }
+                if (flag) { thing1 = FoodUtility.BestFoodInInventory(getter, eater, FoodPreferability.MealAwful); }
                 if (thing1 != null)
                 {
                     if (getter.Faction != Faction.OfPlayer)
@@ -28,6 +25,7 @@ private static bool Prefix(ref bool __result, Pawn getter, Pawn eater, bool desp
                         __result = true;
                         return false;
                     }
+
                     var comp = thing1.TryGetComp<CompRottable>();
                     if ((comp != null) && (comp.Stage == RotStage.Fresh) && (comp.TicksUntilRotAtCurrentTemp < 30000))
                     {

diff --git a/Source/Patch/RimWorld_InteractionWorker_RomanceAttempt_RandomSelectionWeight.cs b/Source/Patch/RimWorld_InteractionWorker_RomanceAttempt_RandomSelectionWeight.cs
@@ -0,0 +1,24 @@
+using Harmony;
+using PawnRules.Data;
+using RimWorld;
+using Verse;
+
+namespace PawnRules.Patch
+{
+    [HarmonyPatch(typeof(InteractionWorker_RomanceAttempt), nameof(InteractionWorker_RomanceAttempt.RandomSelectionWeight))]
+    internal static class RimWorld_InteractionWorker_RomanceAttempt_RandomSelectionWeight
+    {
+        private static bool Prefix(ref float __result, Pawn initiator, Pawn recipient)
+        {
+            if (!Registry.IsActive) { return true; }
+
+            var initiatorCanCourt = Registry.GetRules(initiator)?.AllowCourting ?? true;
+            var recipientCanCourt = Registry.GetRules(recipient)?.AllowCourting ?? true;
+
+            if (initiatorCanCourt && recipientCanCourt) { return true; }
+
+            __result = 0f;
+            return false;
+        }
+    }
+}
diff --git a/Source/Patch/Verse_PawnGenerator_GeneratePawn.cs b/Source/Patch/Verse_PawnGenerator_GeneratePawn.cs
@@ -0,0 +1,20 @@
+using Harmony;
+using PawnRules.Data;
+using RimWorld;
+using Verse;
+
+namespace PawnRules.Patch
+{
+    [HarmonyPatch(typeof(PawnGenerator), nameof(PawnGenerator.GeneratePawn), typeof(PawnGenerationRequest))]
+    internal static class Verse_PawnGenerator_GeneratePawn
+    {
+        private static void Postfix(ref Pawn __result)
+        {
+            if (!Registry.IsActive) { return; }
+
+            if ((__result == null) || ((__result.Faction != Faction.OfPlayer) && (__result.HostFaction != Faction.OfPlayer))) { return; }
+
+            Registry.GetOrDefaultRules(__result);
+        }
+    }
+}
diff --git a/Source/Patch/Verse_Pawn_SetFactionDirect.cs b/Source/Patch/Verse_Pawn_SetFactionDirect.cs
diff --git a/Source/PawnRules.csproj b/Source/PawnRules.csproj
@@ -53,6 +53,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Patch\RimWorld_InteractionWorker_RomanceAttempt_RandomSelectionWeight.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Mod.cs" />
     <Compile Include="Controller.cs" />
@@ -93,10 +94,10 @@
     <Compile Include="Patch\RimWorld_RelationsUtility_TryDevelopBondRelation.cs" />
     <Compile Include="Patch\Verse_Game_FinalizeInit.cs" />
     <Compile Include="Patch\Verse_Pawn_GetGizmos.cs" />
-    <Compile Include="Patch\Verse_Pawn_GuestTracker_SetGuestStatus.cs" />
     <Compile Include="Patch\Verse_Pawn_Kill.cs" />
     <Compile Include="Patch\Verse_Pawn_SetFaction.cs" />
-    <Compile Include="Patch\Verse_Pawn_SetFactionDirect.cs" />
+    <Compile Include="Patch\Verse_PawnGenerator_GeneratePawn.cs" />
+    <Compile Include="Patch\Verse_Pawn_GuestTracker_SetGuestStatus.cs" />
     <Compile Include="SDK\OptionHandle.cs" />
     <Compile Include="SDK\OptionTarget.cs" />
     <Compile Include="SDK\PawnRulesLink.cs" />