Useful skills and perks

BannerKings/BannerKings.csproj

@@ -8,16 +8,19 @@
 		<Nullable>disable</Nullable>
 		<ModuleId>$(MSBuildProjectName)</ModuleId>
 		<ModuleName>$(MSBuildProjectName)</ModuleName>
+		<OtherTestingMods>$(OTHER_TESTING_MODS)</OtherTestingMods>
 		<GameFolder>$(BANNERLORD_GAME_DIR)</GameFolder>
 		<OutputPath>C:\Program Files (x86)\Steam\steamapps\common\Mount &amp; Blade II Bannerlord\Modules\BannerKings\bin\Win64_Shipping_Client</OutputPath>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 		<DebugType>portable</DebugType>
+		<Optimize>False</Optimize>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 		<DebugType>portable</DebugType>
+		<Optimize>True</Optimize>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -58,8 +61,4 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" PrivateAssets="all" IncludeAssets="compile" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="Patches\" />
-	</ItemGroup>
-
 </Project>

BannerKings/Behaviours/BKPartyBehavior.cs

@@ -479,7 +479,7 @@ private void AddCaravanFees(MobileParty party, Settlement target, PopulationData
             }
 
             int fee = data.EconomicData.CaravanFee(party);
-            if (fee > 0)
+            if (fee > 0&& target.Town!=null)
             {
                 party.PartyTradeGold -= fee;
                 target.Town.TradeTaxAccumulated += fee;

BannerKings/Campaign/Skills/BKSkillEffects.cs

@@ -1,4 +1,5 @@
 using BannerKings.Managers.Skills;
+using BannerKings.Settings;
 using System;
 using System.Collections.Generic;
 using TaleWorlds.CampaignSystem;
@@ -30,17 +31,17 @@ public class BKSkillEffects : DefaultTypeInitializer<BKSkillEffects, SkillEffect
         public override void Initialize()
         {
             PietyGain = Game.Current.ObjectManager.RegisterPresumedObject(new SkillEffect("PietyGain"));
-            PietyGain.Initialize(new TextObject("{=3MDmvuVf}Daily piety gain: +{a0}"), 
+            PietyGain.Initialize(new TextObject("{=3MDmvuVf}Daily piety gain: +{a0}"),
                 new SkillObject[]
                 {
                     BKSkills.Instance.Theology
-                }, 
-                SkillEffect.PerkRole.Personal, 
-                0.01f, 
+                },
+                SkillEffect.PerkRole.Personal,
+                0.01f,
                 SkillEffect.PerkRole.None,
-                0f, 
-                SkillEffect.EffectIncrementType.Add, 
-                0f, 
+                0f,
+                SkillEffect.EffectIncrementType.Add,
+                0f,
                 0f);
 
             FaithPresence = Game.Current.ObjectManager.RegisterPresumedObject(new SkillEffect("FaithPresence"));
@@ -201,34 +202,68 @@ public void AddVanilla()
                 0f,
                 0f);
 
-            SupplyEfficiency = Game.Current.ObjectManager.RegisterPresumedObject(new SkillEffect("SupplyEfficiency"));
-            SupplyEfficiency.Initialize(new TextObject("{=wMcipFaM}Party supply efficiency: +{a0}%"),
-                new SkillObject[]
-                {
+
+            if (BannerKingsSettings.Instance.EnableUsefulPerks && BannerKingsSettings.Instance.EnableUsefulStewardSkills && BannerKingsSettings.Instance.EnableUsefulPerksFromAllPartyMembers)
+            {
+                SupplyEfficiency = Game.Current.ObjectManager.RegisterPresumedObject(new SkillEffect("SupplyEfficiency"));
+                SupplyEfficiency.Initialize(new TextObject("{=wMcipFaM}Party supply efficiency: +{a0}%"),
+                    new SkillObject[]
+                    {
                     DefaultSkills.Steward
-                },
-                SkillEffect.PerkRole.Quartermaster,
-                0.15f,
-                SkillEffect.PerkRole.None,
-                0f,
-                SkillEffect.EffectIncrementType.AddFactor,
-                0f,
-                0f);
+                    },
+                    SkillEffect.PerkRole.Quartermaster,
+                    0.15f,
+                    SkillEffect.PerkRole.PartyMember,
+                    0.015f,
+                    SkillEffect.EffectIncrementType.AddFactor,
+                    0f,
+                    0f);
 
-            Stability = Game.Current.ObjectManager.RegisterPresumedObject(new SkillEffect("Stability"));
-            Stability.Initialize(new TextObject("{=dSjTJUjU}Fief stability: +{a0}"),
-                new SkillObject[]
-                {
+                Stability = Game.Current.ObjectManager.RegisterPresumedObject(new SkillEffect("Stability"));
+                Stability.Initialize(new TextObject("{=dSjTJUjU}Fief stability: +{a0}"),
+                    new SkillObject[]
+                    {
                     DefaultSkills.Steward
-                },
-                SkillEffect.PerkRole.Governor,
-                0.001f,
-                SkillEffect.PerkRole.None,
-                0f,
-                SkillEffect.EffectIncrementType.Add,
-                0f,
-                0f);
+                    },
+                    SkillEffect.PerkRole.Governor,
+                    0.001f,
+                    SkillEffect.PerkRole.ClanLeader,
+                    0.0001f,
+                    SkillEffect.EffectIncrementType.Add,
+                    0f,
+                    0f);
+            }
+            else
+            {
+                SupplyEfficiency = Game.Current.ObjectManager.RegisterPresumedObject(new SkillEffect("SupplyEfficiency"));
+                SupplyEfficiency.Initialize(new TextObject("{=wMcipFaM}Party supply efficiency: +{a0}%"),
+                    new SkillObject[]
+                    {
+                    DefaultSkills.Steward
+                    },
+                    SkillEffect.PerkRole.Quartermaster,
+                    0.15f,
+                    SkillEffect.PerkRole.None,
+                    0f,
+                    SkillEffect.EffectIncrementType.AddFactor,
+                    0f,
+                    0f);
+
+                Stability = Game.Current.ObjectManager.RegisterPresumedObject(new SkillEffect("Stability"));
+                Stability.Initialize(new TextObject("{=dSjTJUjU}Fief stability: +{a0}"),
+                    new SkillObject[]
+                    {
+                    DefaultSkills.Steward
+                    },
+                    SkillEffect.PerkRole.Governor,
+                    0.001f,
+                    SkillEffect.PerkRole.None,
+                    0f,
+                    SkillEffect.EffectIncrementType.Add,
+                    0f,
+                    0f);
 
+            }
             TradePower = Game.Current.ObjectManager.RegisterPresumedObject(new SkillEffect("TradePower"));
             TradePower.Initialize(new TextObject("{=vSqWjxNU}Fief trade power: +{a0}%"),
                 new SkillObject[]

BannerKings/Main.cs

@@ -112,11 +112,13 @@ protected override void OnGameStart(Game game, IGameStarter gameStarter)
             campaignStarter.AddModel(new BKMapTrackModel());
             campaignStarter.AddModel(new BKAgentDamageModel());
             campaignStarter.AddModel(new BKAgentStatsModel());
+            campaignStarter.AddModel(new BKBuildingEffectModel());
             campaignStarter.AddModel(new BKPartySpeedModel());
             campaignStarter.AddModel(new BKBattleSimulationModel());
             campaignStarter.AddModel(new BKPartyConsumptionModel());
             campaignStarter.AddModel(new BKWallHitpointModel());
             campaignStarter.AddModel(new BKInventoryCapacityModel());
+            campaignStarter.AddModel(new BKItemDiscardModel());
             campaignStarter.AddModel(new BKMapVisibilityModel());
             campaignStarter.AddModel(new BKPartyImpairmentModel());
             campaignStarter.AddModel(BannerKingsConfig.Instance.CrimeModel);
@@ -131,7 +133,7 @@ protected override void OnGameStart(Game game, IGameStarter gameStarter)
             campaignStarter.AddModel(new BKBanditModel());
             campaignStarter.AddModel(new BKPartyTrainningModel());
             campaignStarter.AddModel(new BKDiplomacyModel());
-            //campaignStarter.AddModel(new BKTargetScoreModel());
+            campaignStarter.AddModel(new BKCharacterStatsModel());
             campaignStarter.AddModel(new BKPartyBuyingFoodModel());
             campaignStarter.AddModel(new BKCategorySelector());
             campaignStarter.AddModel(new BKSettlementAccessModel());

BannerKings/Managers/Court/CouncilMember.cs

@@ -48,6 +48,7 @@ public void Initialize(SkillObject primary, SkillObject secondary,
         public void PostInitialize()
         {
             CouncilMember c = DefaultCouncilPositions.Instance.GetById(this);
+
             Initialize(c.PrimarySkill, c.SecondarySkill, c.Tasks, c.Privileges,
                 c.isAdequate, c.isValidCandidateInternal, c.getCulturalName);
             SetStrings();