Refactor scouting lore perks

Remove the creation of instances in contructors as it creates errors when running other configs not launching the game. Add implementation for influential trader perk
BUTR · Jun 14, 2020 · 852ae0b · 852ae0b
1 parent 641f33b
commit 852ae0b
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 98 deletions.
diff --git a/src/CommunityPatch/Patches/PartySpeedSubPatch.cs b/src/CommunityPatch/Patches/PartySpeedSubPatch.cs
@@ -6,14 +6,13 @@ namespace CommunityPatch.Patches {
 
   public abstract class PartySpeedSubPatch<TPatch> : PerkPatchBase<TPatch>, IPartySpeed where TPatch : PartySpeedSubPatch<TPatch> {
 
-    private readonly IPartySpeed _modifyPartySpeed;
-
-    protected PartySpeedSubPatch(string perkId) : base(perkId)
-      => _modifyPartySpeed = new ModifyPartySpeed(Perk);
+    protected PartySpeedSubPatch(string perkId) : base(perkId) { }
 
     void IPartySpeed.ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
+      IPartySpeed modifyPartySpeed = new ModifyPartySpeed(Perk);
+
       if (IsPerkConditionFulfilled(mobileParty, baseSpeed, finalSpeed))
-        _modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed);
+        modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed);
     }
 
     protected virtual bool IsPerkConditionFulfilled(MobileParty mobileParty, float baseSpeed, ExplainedNumber finalSpeed)

diff --git a/src/CommunityPatch/Patches/PerkPatchBase.cs b/src/CommunityPatch/Patches/PerkPatchBase.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using CommunityPatchAnalyzer;
 using JetBrains.Annotations;
@@ -47,7 +48,6 @@ public PerkObject Perk {
         _perk = PerkObjectHelpers.Load(_finder);
 
         if (_perk == null) {
-          //throw new KeyNotFoundException($"Can't find the {PerkName} ({_perkId}) perk.");
           CommunityPatchSubModule.Error($"Can't find the {PerkName} ({PerkId}) perk.");
         }
 

diff --git a/src/CommunityPatch/Patches/Perks/Cunning/Scouting/DesertLorePatch.cs b/src/CommunityPatch/Patches/Perks/Cunning/Scouting/DesertLorePatch.cs
@@ -1,33 +1,24 @@
-using Patches;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
 using static TaleWorlds.Core.TerrainType;
 
 namespace CommunityPatch.Patches.Perks.Cunning.Scouting {
 
-  public class DesertLorePatch : PerkPatchBase<DesertLorePatch>, IPartySpeed, IDailyFoodConsumption {
+  public class DesertLorePatch : ScoutingLorePerk<DesertLorePatch> {
 
-    private readonly IDailyFoodConsumption _halfDailyFoodConsumption;
-    private readonly IPartySpeed _modifyPartySpeed;
-
-    public DesertLorePatch() : base("EeQv1qRD") {
-      _halfDailyFoodConsumption = new HalfDailyFoodConsumption(Perk);
-      _modifyPartySpeed = new ModifyPartySpeed(Perk);
-    }
+    public DesertLorePatch() : base("EeQv1qRD") { }
 
     public override void Apply(Game game) {
       Perk.SetPrimaryBonus(0.05f);
       base.Apply(game);
     }
 
-    public void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
-      if (mobileParty.IsInTerrainType(Desert))
-        _modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed); 
+    public override void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
+      if (!mobileParty.IsInTerrainType(Desert))
+        return;
+      base.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed);
     }
 
-    public void ModifyDailyFoodConsumption(ref float dailyFoodConsumption, MobileParty mobileParty, StatExplainer dailyFoodConsumptionExplanation)
-      => _halfDailyFoodConsumption.ModifyDailyFoodConsumption(ref dailyFoodConsumption, mobileParty, dailyFoodConsumptionExplanation);
-
   }
 
 }
diff --git a/src/CommunityPatch/Patches/Perks/Cunning/Scouting/ForcedMarchPatch.cs b/src/CommunityPatch/Patches/Perks/Cunning/Scouting/ForcedMarchPatch.cs
@@ -4,27 +4,21 @@
 
 namespace CommunityPatch.Patches.Perks.Cunning.Scouting {
 
-  namespace CommunityPatch.Patches.Perks.Cunning.Scouting {
+  public class ForcedMarchPatch : PerkPatchBase<ForcedMarchPatch>, IPartySpeed {
 
-    public class ForcedMarchPatch : PerkPatchBase<ForcedMarchPatch>, IPartySpeed {
-
-      private readonly IPartySpeed _modifyPartySpeed;
-
-      public ForcedMarchPatch() : base("jhZe9Mfo")
-        => _modifyPartySpeed = new ModifyPartySpeed(Perk);
-
-      public override void Apply(Game game) {
-        Perk.SetPrimaryBonus(0.03f);
-        base.Apply(game);
-      }
-
-      public void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
-        if (mobileParty.Morale > 70f) {
-          _modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed);
-        }
-
-      }
+    public ForcedMarchPatch() : base("jhZe9Mfo") { }
+
+    public override void Apply(Game game) {
+      Perk.SetPrimaryBonus(0.03f);
+      base.Apply(game);
+    }
 
+    public void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
+      if (mobileParty.Morale <= 70f)
+        return;
+
+      IPartySpeed modifyPartySpeed = new ModifyPartySpeed(Perk);
+      modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed);
     }
 
   }

diff --git a/src/CommunityPatch/Patches/Perks/Cunning/Scouting/ForestLorePatch.cs b/src/CommunityPatch/Patches/Perks/Cunning/Scouting/ForestLorePatch.cs
@@ -1,33 +1,25 @@
-using Patches;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
 using static TaleWorlds.Core.TerrainType;
 
 namespace CommunityPatch.Patches.Perks.Cunning.Scouting {
 
-  public class ForestLorePatch : PerkPatchBase<ForestLorePatch>, IPartySpeed, IDailyFoodConsumption {
+  public class ForestLorePatch : ScoutingLorePerk<ForestLorePatch> {
 
-    private readonly IDailyFoodConsumption _halfDailyFoodConsumption;
-    private readonly IPartySpeed _modifyPartySpeed;
-
-    public ForestLorePatch() : base("TgOwisdD") {
-      _halfDailyFoodConsumption = new HalfDailyFoodConsumption(Perk);
-      _modifyPartySpeed = new ModifyPartySpeed(Perk);
-    }
+    public ForestLorePatch() : base("TgOwisdD") { }
 
     public override void Apply(Game game) {
       Perk.SetPrimaryBonus(0.05f);
       base.Apply(game);
     }
 
-    public void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
-      if (mobileParty.IsInTerrainType(Forest))
-        _modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed); 
+    public override void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
+      if (!mobileParty.IsInTerrainType(Forest))
+        return;
+
+      base.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed); 
     }
 
-    public void ModifyDailyFoodConsumption(ref float dailyFoodConsumption, MobileParty mobileParty, StatExplainer dailyFoodConsumptionExplanation)
-      => _halfDailyFoodConsumption.ModifyDailyFoodConsumption(ref dailyFoodConsumption, mobileParty, dailyFoodConsumptionExplanation);
-
   }
 
 }
diff --git a/src/CommunityPatch/Patches/Perks/Cunning/Scouting/GrasslandNavigatorPatch.cs b/src/CommunityPatch/Patches/Perks/Cunning/Scouting/GrasslandNavigatorPatch.cs
@@ -7,19 +7,19 @@ namespace CommunityPatch.Patches.Perks.Cunning.Scouting {
 
   public class GrasslandNavigatorPatch : PerkPatchBase<GrasslandNavigatorPatch>, IPartySpeed {
 
-    private readonly IPartySpeed _modifyPartySpeed;
-
-    public GrasslandNavigatorPatch() : base("Ekqj9IFR")
-      => _modifyPartySpeed = new ModifyPartySpeed(Perk);
+    public GrasslandNavigatorPatch() : base("Ekqj9IFR") { }
 
     public override void Apply(Game game) {
       Perk.SetPrimaryBonus(0.05f);
       base.Apply(game);
     }
 
     public void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
-      if (!mobileParty.IsInSnowyTerrain() && mobileParty.IsInTerrainType(Plain) || mobileParty.IsInTerrainType(Steppe))
-        _modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed); 
+      if (mobileParty.IsInSnowyTerrain() || !mobileParty.IsInTerrainType(Plain) && !mobileParty.IsInTerrainType(Steppe))
+        return;
+
+      IPartySpeed modifyPartySpeed = new ModifyPartySpeed(Perk);
+      modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed); 
     }
 
   }

diff --git a/src/CommunityPatch/Patches/Perks/Cunning/Scouting/HillsLorePatch.cs b/src/CommunityPatch/Patches/Perks/Cunning/Scouting/HillsLorePatch.cs
@@ -1,32 +1,25 @@
-using Patches;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
 
 namespace CommunityPatch.Patches.Perks.Cunning.Scouting {
 
-  public class HillsLorePatch : PerkPatchBase<HillsLorePatch>, IPartySpeed, IDailyFoodConsumption {
+  public class HillsLorePatch : ScoutingLorePerk<HillsLorePatch> {
 
-    private readonly IDailyFoodConsumption _halfDailyFoodConsumption;
-    private readonly IPartySpeed _modifyPartySpeed;
 
-    public HillsLorePatch() : base("67UGQ0Kd") {
-      _halfDailyFoodConsumption = new HalfDailyFoodConsumption(Perk);
-      _modifyPartySpeed = new ModifyPartySpeed(Perk);
-    }
+    public HillsLorePatch() : base("67UGQ0Kd") { }
 
     public override void Apply(Game game) {
       Perk.SetPrimaryBonus(0.05f);
       base.Apply(game);
     }
 
-    public void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
-      if (mobileParty.IsInHillTerrain())
-        _modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed); 
+    public override void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
+      if (!mobileParty.IsInHillTerrain())
+        return;
+
+      base.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed); 
     }
 
-    public void ModifyDailyFoodConsumption(ref float dailyFoodConsumption, MobileParty mobileParty, StatExplainer dailyFoodConsumptionExplanation)
-      => _halfDailyFoodConsumption.ModifyDailyFoodConsumption(ref dailyFoodConsumption, mobileParty, dailyFoodConsumptionExplanation);
-
   }
 
 }
diff --git a/src/CommunityPatch/Patches/Perks/Cunning/Scouting/LayOfTheLandPatch.cs b/src/CommunityPatch/Patches/Perks/Cunning/Scouting/LayOfTheLandPatch.cs
@@ -6,19 +6,16 @@ namespace CommunityPatch.Patches.Perks.Cunning.Scouting {
 
   public class LayOfTheLandPatch : PerkPatchBase<LayOfTheLandPatch>, IPartySpeed {
 
-    private readonly IPartySpeed _modifyPartySpeed;
-
-    public LayOfTheLandPatch() : base("P68GX3zY")
-      => _modifyPartySpeed = new ModifyPartySpeed(Perk);
-
+    public LayOfTheLandPatch() : base("P68GX3zY") { }
     public override void Apply(Game game) {
       Perk.SetPrimaryBonus(0.03f);
       base.Apply(game);
     }
 
-    public void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) 
-    // Party Member
-      => _modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed);
+    public void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
+      IPartySpeed modifyPartySpeed = new ModifyPartySpeed(Perk);
+      modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed);
+    }
 
   }
 

diff --git a/src/CommunityPatch/Patches/Perks/Cunning/Scouting/MarshesLorePatch.cs b/src/CommunityPatch/Patches/Perks/Cunning/Scouting/MarshesLorePatch.cs
@@ -1,33 +1,25 @@
-using Patches;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
 using static TaleWorlds.Core.TerrainType;
 
 namespace CommunityPatch.Patches.Perks.Cunning.Scouting {
 
-  public class MarshesLorePatch : PerkPatchBase<MarshesLorePatch>, IPartySpeed, IDailyFoodConsumption {
+  public class MarshesLorePatch : ScoutingLorePerk<MarshesLorePatch> {
 
-    private readonly IDailyFoodConsumption _halfDailyFoodConsumption;
-    private readonly IPartySpeed _modifyPartySpeed;
-
-    public MarshesLorePatch() : base("ywmjNJnH") {
-      _halfDailyFoodConsumption = new HalfDailyFoodConsumption(Perk);
-      _modifyPartySpeed = new ModifyPartySpeed(Perk);
-    }
+    public MarshesLorePatch() : base("ywmjNJnH") { }
 
     public override void Apply(Game game) {
       Perk.SetPrimaryBonus(0.05f);
       base.Apply(game);
     }
 
-    public void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
-      if (mobileParty.IsInTerrainType(Swamp) || mobileParty.IsInTerrainType(ShallowRiver))
-        _modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed); 
+    public override void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
+      if (!mobileParty.IsInTerrainType(Swamp) && !mobileParty.IsInTerrainType(ShallowRiver))
+        return;
+
+      base.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed); 
     }
 
-    public void ModifyDailyFoodConsumption(ref float dailyFoodConsumption, MobileParty mobileParty, StatExplainer dailyFoodConsumptionExplanation)
-      => _halfDailyFoodConsumption.ModifyDailyFoodConsumption(ref dailyFoodConsumption, mobileParty, dailyFoodConsumptionExplanation);
-
   }
 
 }
diff --git a/src/CommunityPatch/Patches/Perks/Social/Trade/InfluentialTrader.cs b/src/CommunityPatch/Patches/Perks/Social/Trade/InfluentialTrader.cs
@@ -0,0 +1,31 @@
+using System.Linq;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.Localization;
+
+namespace CommunityPatch.Patches.Perks.Social.Trade {
+
+  public class InfluentialTrader : DailyInfluenceGainSubPatch<InfluentialTrader> {
+
+    public InfluentialTrader() : base("esgxog1B") { }
+
+    public override void ModifyDailyInfluenceGain(Clan clan, ref ExplainedNumber influenceChange) {
+      var perk = Perk;
+      if (perk == null || !(clan?.Leader?.GetPerkValue(perk) ?? false))
+        return;
+
+      var influenceBonus = 0.25f;
+      var caravans = clan.Leader.OwnedCaravans?.Count() ?? 0f;
+      var workshops = clan.Leader.OwnedWorkshops?.Count ?? 0f;
+      var extraCaravanInfluence =  influenceBonus * caravans;
+      var extraWorkshopInfluence = influenceBonus * workshops;
+
+      if (extraCaravanInfluence > 0)
+        influenceChange.Add(extraCaravanInfluence, new TextObject(perk.Name + " (caravans)"));
+
+      if (extraWorkshopInfluence > 0)
+        influenceChange.Add(extraWorkshopInfluence, new TextObject(perk.Name + " (workshops)"));
+    } 
+
+  }
+
+}
diff --git a/src/CommunityPatch/ScoutingLorePerk.cs b/src/CommunityPatch/ScoutingLorePerk.cs
@@ -0,0 +1,22 @@
+using Patches;
+using TaleWorlds.CampaignSystem;
+
+namespace CommunityPatch.Patches {
+
+  public abstract class ScoutingLorePerk<TPatch> : PerkPatchBase<TPatch>, IPartySpeed, IDailyFoodConsumption where TPatch : ScoutingLorePerk<TPatch> {
+
+    protected ScoutingLorePerk(string perkId) : base(perkId) { }
+
+    public virtual void ModifyFinalSpeed(MobileParty mobileParty, float baseSpeed, ref ExplainedNumber finalSpeed) {
+      IPartySpeed modifyPartySpeed = new ModifyPartySpeed(Perk);
+      modifyPartySpeed.ModifyFinalSpeed(mobileParty, baseSpeed, ref finalSpeed); 
+    }
+
+    public virtual void ModifyDailyFoodConsumption(ref float dailyFoodConsumption, MobileParty mobileParty, StatExplainer dailyFoodConsumptionExplanation) {
+      IDailyFoodConsumption halfDailyFoodConsumption = new HalfDailyFoodConsumption(Perk);
+      halfDailyFoodConsumption.ModifyDailyFoodConsumption(ref dailyFoodConsumption, mobileParty, dailyFoodConsumptionExplanation); 
+    }
+
+  }
+
+}