Merge pull request #268 from DiplomacyTeam/dev

v1.2.12 release
DiplomacyTeam · May 15, 2024 · da8f3e1 · da8f3e1
2 parents 5a528ec + 01b79e1
commit da8f3e1
Show file tree

Hide file tree

Showing 37 changed files with 180 additions and 132 deletions.
diff --git a/.github/workflows/Publish.yml b/.github/workflows/Publish.yml
@@ -22,7 +22,7 @@ jobs:
       mod_description: ${{ steps.changelog.outputs.mod_description }}
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@master
@@ -31,15 +31,26 @@ jobs:
 
     - name: Build Diplomacy Module
       run: |
-        $impl = $PWD.Path + '/bannerlord-implementations';
         $path = $PWD.Path + '/bannerlord';
-        $final = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/';
+
+        $implFX = $PWD.Path + '/bannerlord-implementationsFX';
+        $implCore = $PWD.Path + '/bannerlord-implementationsCore';
+
+        $finalFX = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/';
+        $finalCore = $path + '/Modules/Bannerlord.Diplomacy/bin/Gaming.Desktop.x64_Shipping_Client/';
+
         $proj = 'src/Bannerlord.Diplomacy/Bannerlord.Diplomacy.csproj';
-        $pdll = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.dll';
-        $ppdb = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.pdb';
+
+        $pdllFX = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.dll';
+        $ppdbFX = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.pdb';
+        $pdllCore = $path + '/Modules/Bannerlord.Diplomacy/bin/Gaming.Desktop.x64_Shipping_Client/Bannerlord.Diplomacy*.dll';
+        $ppdbCore = $path + '/Modules/Bannerlord.Diplomacy/bin/Gaming.Desktop.x64_Shipping_Client/Bannerlord.Diplomacy*.pdb';
+
         # The folders are required to be created before executing the script
-        New-Item -ItemType directory -Force -Path $impl;
         New-Item -ItemType directory -Force -Path $path;
+        New-Item -ItemType directory -Force -Path $implFX;
+        New-Item -ItemType directory -Force -Path $implCore;
+
         [string[]]$gameversions = Get-Content -Path supported-game-versions.txt;
         # Process all implementations
         For ($i = 0; $i -le $gameversions.Length - 1; $i++)
@@ -51,15 +62,22 @@ jobs:
             echo "Start building for gameversion = $gameversion"
             dotnet clean $proj --configuration Release;
             dotnet build $proj --configuration Release -p:OverrideGameVersion=$gameversion -p:GameFolder="$path" -p:ConstGameVersionWithPrefix="$constgameversion";
+
             # Copy Implementations to the Implementations folder
-            Copy-Item $pdll $impl/;
-            Copy-Item $ppdb $impl/;
+            Copy-Item $pdllFX $implFX/;
+            Copy-Item $ppdbFX $implFX/;
+            Copy-Item $pdllCore $implCore/;
+            Copy-Item $ppdbCore $implCore/;
+
             echo "::endgroup::"
         }
         # Copy Implementations to the Module
-        Copy-Item $impl/* $final;
+        Copy-Item $implFX/* $finalFX;
+        Copy-Item $implCore/* $finalCore;
+
         # Delete Implementations folder
-        Remove-Item -Recurse $impl;
+        Remove-Item -Recurse $implFX;
+        Remove-Item -Recurse $implCore;
       shell: pwsh
 
     - name: Install and Run ChangelogParser

diff --git a/.github/workflows/TestBuild.yml b/.github/workflows/TestBuild.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v3.1.0
+      uses: actions/checkout@v4
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@master
@@ -36,15 +36,26 @@ jobs:
 
     - name: Build Diplomacy Module for testing
       run: |
-        $impl = $PWD.Path + '/bannerlord-implementations';
         $path = $PWD.Path + '/bannerlord';
-        $final = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/';
+
+        $implFX = $PWD.Path + '/bannerlord-implementationsFX';
+        $implCore = $PWD.Path + '/bannerlord-implementationsCore';
+
+        $finalFX = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/';
+        $finalCore = $path + '/Modules/Bannerlord.Diplomacy/bin/Gaming.Desktop.x64_Shipping_Client/';
+
         $proj = 'src/Bannerlord.Diplomacy/Bannerlord.Diplomacy.csproj';
-        $pdll = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.dll';
-        $ppdb = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.pdb';
+
+        $pdllFX = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.dll';
+        $ppdbFX = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.pdb';
+        $pdllCore = $path + '/Modules/Bannerlord.Diplomacy/bin/Gaming.Desktop.x64_Shipping_Client/Bannerlord.Diplomacy*.dll';
+        $ppdbCore = $path + '/Modules/Bannerlord.Diplomacy/bin/Gaming.Desktop.x64_Shipping_Client/Bannerlord.Diplomacy*.pdb';
+
         # The folders are required to be created before executing the script
-        New-Item -ItemType directory -Force -Path $impl;
         New-Item -ItemType directory -Force -Path $path;
+        New-Item -ItemType directory -Force -Path $implFX;
+        New-Item -ItemType directory -Force -Path $implCore;
+
         [string[]]$gameversions = Get-Content -Path supported-game-versions.txt;
         # Process all implementations
         For ($i = 0; $i -le $gameversions.Length - 1; $i++)
@@ -56,13 +67,20 @@ jobs:
             echo "Start building for gameversion = $gameversion"
             dotnet clean $proj --configuration Release;
             dotnet build $proj --configuration Release -p:OverrideGameVersion=$gameversion -p:GameFolder="$path" -p:ConstGameVersionWithPrefix="$constgameversion";
+            
             # Copy Implementations to the Implementations folder
-            Copy-Item $pdll $impl/;
-            Copy-Item $ppdb $impl/;
+            Copy-Item $pdllFX $implFX/;
+            Copy-Item $ppdbFX $implFX/;
+            Copy-Item $pdllCore $implCore/;
+            Copy-Item $ppdbCore $implCore/;
+
             echo "::endgroup::"
         }
         # Copy Implementations to the Module
-        Copy-Item $impl/* $final;
+        Copy-Item $implFX/* $finalFX;
+        Copy-Item $implCore/* $finalCore;
+
         # Delete Implementations folder
-        Remove-Item -Recurse $impl;
+        Remove-Item -Recurse $implFX;
+        Remove-Item -Recurse $implCore;
       shell: pwsh
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright © 2020-2023 Diplomacy Team
+Copyright © 2020-2024 Diplomacy Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/build/common.props b/build/common.props
@@ -2,7 +2,7 @@
 
     <!--Module Version-->
     <PropertyGroup>
-        <Version>1.2.11</Version>
+        <Version>1.2.12</Version>
         <GameVersion>1.0.0</GameVersion>
     </PropertyGroup>
 
@@ -11,27 +11,24 @@
         <!--BuildResources Version-->
         <BuildResourcesVersion>1.1.0.104</BuildResourcesVersion>
         <!--Harmony Version-->
-        <HarmonyVersion>2.2.2</HarmonyVersion>
+        <HarmonyVersion>2.3.3</HarmonyVersion>
         <!--ButterLib Version-->
-        <ButterLibVersion>2.8.16</ButterLibVersion>
+        <ButterLibVersion>2.9.7</ButterLibVersion>
         <!--MCM Version-->
         <MCMVersion>5.9.2</MCMVersion>
         <!--UIExtenderEx Version-->
         <UIExtenderExVersion>2.11.0</UIExtenderExVersion>
         <!--BUTRShared Version-->
-        <BUTRSharedVersion>3.0.0.138</BUTRSharedVersion>
+        <BUTRSharedVersion>3.0.0.139</BUTRSharedVersion>
         <!--BUTRModuleManager Version-->
-        <BUTRModuleManagerVersion>5.0.209</BUTRModuleManagerVersion>
+        <BUTRModuleManagerVersion>5.0.222</BUTRModuleManagerVersion>
         <!--ModuleLoader Version-->
         <BUTRModuleLoaderVersion>1.0.1.44</BUTRModuleLoaderVersion>
         <!--Harmony Extensions Version-->
         <HarmonyExtensionsVersion>3.2.0.77</HarmonyExtensionsVersion>
     </PropertyGroup>
+
     <PropertyGroup>
-        <TargetFramework>net472</TargetFramework>
-        <Platforms>x64</Platforms>
-        <LangVersion>9.0</LangVersion>
-        <Nullable>enable</Nullable>
         <ModuleId>Bannerlord.Diplomacy</ModuleId>
         <ModuleName>$(ModuleId)</ModuleName>
         <DisplayName>Diplomacy</DisplayName>
@@ -42,7 +39,7 @@
         <Authors>Diplomacy Team</Authors>
         <Product>Diplomacy Library mod for Bannerlord</Product>
         <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-        <Copyright>Copyright © 2020-2022 Diplomacy Team</Copyright>
+        <Copyright>Copyright © 2020-2024 Diplomacy Team</Copyright>
         <Description>Diplomacy system overhaul for Mount &amp; Blade II: Bannerlord</Description>
     </PropertyGroup>
 
@@ -117,4 +114,4 @@
         </PackageReference>
     </ItemGroup>
 
-</Project>
+</Project>
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.12
+Game Versions: v1.0.x, v1.1.x, v1.2.x
+* Added Xbox support
+* Restored version support
+---------------------------------------------------------------------------------------------------
 Version: 1.2.11
 Game Versions: v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.0,v1.2.1,v1.2.2,v1.2.3,v1.2.4,v1.2.5,v1.2.6,v1.2.7,v1.2.8,1.2.9
 * Add support for v1.2.9

diff --git a/src/Bannerlord.Diplomacy.sln b/src/Bannerlord.Diplomacy.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31005.135
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34728.123
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bannerlord.Diplomacy", "Bannerlord.Diplomacy\Bannerlord.Diplomacy.csproj", "{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}"
 EndProject
@@ -24,17 +24,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{AE56
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{8CBC023C-EB40-415D-8A78-B6B7F82523E9}"
 	ProjectSection(SolutionItems) = preProject
-		..\.github\workflows\build.yml = ..\.github\workflows\build.yml
 		..\.github\workflows\dotnet-format-daily.yml = ..\.github\workflows\dotnet-format-daily.yml
+		..\.github\workflows\Publish.yml = ..\.github\workflows\Publish.yml
 		..\.github\workflows\TestBuild.yml = ..\.github\workflows\TestBuild.yml
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Beta_Debug|x64 = Beta_Debug|x64
 		Beta_Release|x64 = Beta_Release|x64
+		Debug|x64 = Debug|x64
 		Minimal_Debug|x64 = Minimal_Debug|x64
 		Minimal_Release|x64 = Minimal_Release|x64
+		Release|x64 = Release|x64
 		Stable_Debug|x64 = Stable_Debug|x64
 		Stable_Release|x64 = Stable_Release|x64
 	EndGlobalSection
@@ -43,10 +45,14 @@ Global
 		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Beta_Debug|x64.Build.0 = Beta_Debug|x64
 		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Beta_Release|x64.ActiveCfg = Beta_Release|x64
 		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Beta_Release|x64.Build.0 = Beta_Release|x64
-		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Minimal_Debug|x64.ActiveCfg = Stable_Debug|x64
-		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Minimal_Debug|x64.Build.0 = Stable_Debug|x64
-		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Minimal_Release|x64.ActiveCfg = Stable_Release|x64
-		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Minimal_Release|x64.Build.0 = Stable_Release|x64
+		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Debug|x64.ActiveCfg = Debug|x64
+		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Debug|x64.Build.0 = Debug|x64
+		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Minimal_Debug|x64.ActiveCfg = Debug|x64
+		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Minimal_Debug|x64.Build.0 = Debug|x64
+		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Minimal_Release|x64.ActiveCfg = Release|x64
+		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Minimal_Release|x64.Build.0 = Release|x64
+		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Release|x64.ActiveCfg = Release|x64
+		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Release|x64.Build.0 = Release|x64
 		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Stable_Debug|x64.ActiveCfg = Stable_Debug|x64
 		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Stable_Debug|x64.Build.0 = Stable_Debug|x64
 		{AD3695A8-2BDD-44AF-A115-54F839A9EC2A}.Stable_Release|x64.ActiveCfg = Stable_Release|x64

diff --git a/src/Bannerlord.Diplomacy/Bannerlord.Diplomacy.csproj b/src/Bannerlord.Diplomacy/Bannerlord.Diplomacy.csproj
@@ -1,8 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <PropertyGroup>
+        <TargetFrameworks>net472;net6</TargetFrameworks>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <Platforms>x64</Platforms>
+        <BuildForWindows>false</BuildForWindows>
+        <BuildForWindowsStore>false</BuildForWindowsStore>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$(TargetFramework) == 'net472'">
+        <BuildForWindows>true</BuildForWindows>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(TargetFramework) == 'net6'">
+        <BuildForWindowsStore>true</BuildForWindowsStore>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    </PropertyGroup>
+
     <PropertyGroup>
         <AssemblyName>$(ModuleName).$(GameVersion)</AssemblyName>
-        <Configurations>Stable_Debug;Stable_Release;Beta_Debug;Beta_Release</Configurations>
+        <Configurations>Stable_Debug;Stable_Release;Beta_Debug;Beta_Release;Debug;Release</Configurations>
     </PropertyGroup>
 
     <!-- STABLE, BETA, and e.g., e157 / e158 Constants Defined in Code -->
@@ -26,7 +44,7 @@
       <PackageReference Include="Bannerlord.ModuleManager.Source" Version="$(BUTRModuleManagerVersion)" />
         <PackageReference Include="Bannerlord.ButterLib" Version="$(ButterLibVersion)" IncludeAssets="compile" />
         <PackageReference Include="Bannerlord.MCM" Version="$(MCMVersion)" IncludeAssets="compile" />
-        <PackageReference Include="ColorMinePortable" Version="2.0.1" />
+        <PackageReference Include="ColorMinePortable" Version="2.0.4" />
         <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)" IncludeAssets="compile" />
         <PackageReference Include="Bannerlord.UIExtenderEx" Version="$(UIExtenderExVersion)" IncludeAssets="compile" />
         <!-- Microsoft.CSharp is used for its source-only 'dynamic' implementation. -->

diff --git a/src/Bannerlord.Diplomacy/CampaignBehaviors/CivilWarBehavior.cs b/src/Bannerlord.Diplomacy/CampaignBehaviors/CivilWarBehavior.cs
@@ -60,12 +60,13 @@ private void DailyTick()
                 foreach (var kingdom in KingdomExtensions.AllActiveKingdoms.Where(x => (x.IsRebelKingdom() || x.HasRebellion()) && x.Fiefs.IsEmpty()).ToList())
                 {
                     var rebelFaction = RebelFactionManager.GetRebelFactionForRebelKingdom(kingdom) ?? kingdom.GetRebelFactions().FirstOrDefault();
-
-                    var otherKingdom = kingdom.IsRebelKingdom() ? rebelFaction.ParentKingdom : rebelFaction.RebelKingdom!;
-                    if (rebelFaction != null)
+                    if (rebelFaction is null)
                     {
-                        KingdomPeaceAction.ApplyPeace(kingdom, otherKingdom);
+                        continue;
                     }
+
+                    var otherKingdom = kingdom.IsRebelKingdom() ? rebelFaction.ParentKingdom : rebelFaction.RebelKingdom!;
+                    KingdomPeaceAction.ApplyPeace(kingdom, otherKingdom);
                 }
             }
         }

diff --git a/src/Bannerlord.Diplomacy/CampaignBehaviors/WarExhaustionBehavior.cs b/src/Bannerlord.Diplomacy/CampaignBehaviors/WarExhaustionBehavior.cs
@@ -172,7 +172,6 @@ private void OnHeroKilled(Hero victim, Hero killer, KillCharacterAction.KillChar
             _warExhaustionManager.AddHeroPerishedWarExhaustion(kingdoms, victim, killer.PartyBelongedTo?.Name ?? effector!.Name, detail);
         }
 
-
         private static bool VerifyEventSides(PartyBase attackerSideLeaderParty, PartyBase defenderSideLeaderParty, out Kingdom? attacker, out Kingdom? defender)
         {
             if ((attackerSideLeaderParty.IsMobile && (attackerSideLeaderParty.MobileParty?.IsBandit ?? false)) || (defenderSideLeaderParty.IsMobile && (defenderSideLeaderParty.MobileParty?.IsBandit ?? false))
@@ -195,7 +194,7 @@ private static bool VerifyEventSides(PartyBase attackerSideLeaderParty, PartyBas
 
         private static bool VerifyEventSides(PartyBase effectorSideParty, Hero effectedSideHero, out Kingdom? effector, out Kingdom? effected)
         {
-            if (effectorSideParty.IsMobile && (effectorSideParty.MobileParty?.IsBandit ?? false)
+            if ((effectorSideParty.IsMobile && (effectorSideParty.MobileParty?.IsBandit ?? false))
                 || effectorSideParty.MapFaction == null || effectorSideParty.MapFaction.IsBanditFaction
                 || effectedSideHero.MapFaction == null || effectedSideHero.MapFaction.IsBanditFaction
                 || effectorSideParty.MapFaction is not Kingdom effectorKingdom || effectedSideHero.MapFaction is not Kingdom effectedKingdom
@@ -251,4 +250,4 @@ public override void SyncData(IDataStore dataStore)
             }
         }
     }
-}
+}
diff --git a/src/Bannerlord.Diplomacy/CivilWar/Actions/ChangeKingdomBannerAction.cs b/src/Bannerlord.Diplomacy/CivilWar/Actions/ChangeKingdomBannerAction.cs
@@ -153,7 +153,7 @@ private static uint GetUniqueSigilColor(uint backgroundColor)
                     .Where(x => !currentSigilColors.Contains(x))
                     .ToList();
 
-                if (colors.Any())
+                if (colors.Count > 0)
                     selectedColor = colors.GetRandomElementInefficiently();
             }
 

diff --git a/src/Bannerlord.Diplomacy/CivilWar/FactionNameGenerator.cs b/src/Bannerlord.Diplomacy/CivilWar/FactionNameGenerator.cs
@@ -290,7 +290,7 @@ public static TextObject GenerateKingdomName(RebelFaction rebelFaction)
             string? kingdomTitle;
             var culture = rebelFaction.Clans.Where(x => !x.IsEliminated).Select(x => x.Culture.StringId).GroupBy(x => x).OrderByDescending(x => x.Count()).First().Key;
             CultureToKingdomTitles.TryGetValue(culture, out var cultureTitles);
-            if (cultureTitles is not null && cultureTitles.Any() && MBRandom.RandomFloat < 0.5)
+            if (cultureTitles is not null && cultureTitles.Count > 0 && MBRandom.RandomFloat < 0.5)
             {
                 kingdomTitle = ResolveTitle(cultureTitles);
             }
@@ -299,7 +299,7 @@ public static TextObject GenerateKingdomName(RebelFaction rebelFaction)
                 kingdomTitle = ResolveTitle(CommonKingdomTitles);
             }
 
-            var kingdomName = CultureToKingdomNames.TryGetValue(culture, out var value) && value.Any() ? new TextObject(value.GetRandomElement()) : rebelFaction.SponsorClan.Name;
+            var kingdomName = CultureToKingdomNames.TryGetValue(culture, out var value) && value.Count > 0 ? new TextObject(value.GetRandomElement()) : rebelFaction.SponsorClan.Name;
 
             return new TextObject(kingdomTitle, new Dictionary<string, object> { { "CLAN_NAME", kingdomName } });
         }

diff --git a/src/Bannerlord.Diplomacy/CivilWar/Factions/RebelFaction.cs b/src/Bannerlord.Diplomacy/CivilWar/Factions/RebelFaction.cs
@@ -138,7 +138,7 @@ public void RemoveClan(Clan clan)
             if (_participatingClans.Contains(clan))
             {
                 var remainingClanList = _participatingClans.Where(x => x != clan && !x.IsEliminated).ToList();
-                if (!remainingClanList.Any())
+                if (remainingClanList.Count <= 0)
                 {
                     RebelFactionManager.DestroyRebelFaction(this);
                     return;

diff --git a/src/Bannerlord.Diplomacy/CivilWar/RebelFactionManager.cs b/src/Bannerlord.Diplomacy/CivilWar/RebelFactionManager.cs
@@ -109,7 +109,7 @@ public static Kingdom GetCivilWarLoser(Kingdom kingdomMakingPeace, Kingdom other
         {
             return (WarExhaustionManager.Instance?.GetWarResult(kingdomMakingPeace, otherKingdom) ?? WarExhaustionManager.WarResult.None) switch
             {
-                WarExhaustionManager.WarResult.Tie when kingdomMakingPeace.Fiefs.Any() => TributeHelper.GetBaseValueForTrubute(kingdomMakingPeace, otherKingdom) < 0 ? otherKingdom : kingdomMakingPeace,
+                WarExhaustionManager.WarResult.Tie when kingdomMakingPeace.Fiefs.Count > 0 => TributeHelper.GetBaseValueForTrubute(kingdomMakingPeace, otherKingdom) < 0 ? otherKingdom : kingdomMakingPeace,
                 >= WarExhaustionManager.WarResult.PyrrhicVictory => otherKingdom,
                 _ => kingdomMakingPeace,
             };

diff --git a/src/Bannerlord.Diplomacy/DiplomaticAction/WarPeace/DeclareWarConditions.cs b/src/Bannerlord.Diplomacy/DiplomaticAction/WarPeace/DeclareWarConditions.cs
@@ -17,7 +17,7 @@ internal sealed class DeclareWarConditions : AbstractConditionEvaluator<DeclareW
             new HasEnoughTimeElapsedForWarCondition(),
             new NotRebelKingdomCondition(),
             new NotEliminatedCondition(),
-			new BadRelationCondition()
+            new BadRelationCondition()
         };
 
         public DeclareWarConditions() : base(Conditions) { }