cleanup, update MCM to 3.1.8

Cytraen · Jun 14, 2020 · 0c0bc8d · 0c0bc8d
1 parent b8869de
commit 0c0bc8d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/Overrides/OverridesClan.cs b/Overrides/OverridesClan.cs
@@ -2,7 +2,6 @@
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
-using TaleWorlds.Localization;
 using UnlimitLord.Settings;
 
 namespace UnlimitLord.Overrides
@@ -31,14 +30,13 @@ public static int Postfix(int result, PartyBase party, StatExplainer explanation
                 if (!party.IsGarrison() || !party.IsPlayerOwnedParty())
                     return result;
 
-                else if (party.PartyBelongsToCastle())
+                if (party.PartyBelongsToCastle())
                     return (int)Helpers.ClampAndExplain((int)(result * settings.CastleGarrisonSizeMult), explanation, settings.MinCastleGarrisonSize, settings.MaxCastleGarrisonSize);
 
-                else if (party.PartyBelongsToTown())
+                if (party.PartyBelongsToTown())
                     return (int)Helpers.ClampAndExplain((int)(result * settings.TownGarrisonSizeMult), explanation, settings.MinTownGarrisonSize, settings.MaxTownGarrisonSize);
 
-                else
-                    return result;
+                return result;
             }
         }
 

diff --git a/SubModule.xml b/SubModule.xml
@@ -1,7 +1,7 @@
 <Module>
 	<Name value="UnlimitLord"/>
 	<Id value="UnlimitLord"/>
-	<Version value="v0.3.2"/>
+	<Version value="v0.3.3"/>
 	<SingleplayerModule value="true"/>
 	<MultiplayerModule value="false"/>
 	<DependedModules>

diff --git a/UnlimitLord.csproj b/UnlimitLord.csproj
@@ -31,7 +31,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Lib.Harmony" Version="2.0.1" />
-		<PackageReference Include="Bannerlord.MCM" Version="3.1.5" />
+		<PackageReference Include="Bannerlord.MCM" Version="3.1.8" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/UnlimitLord.sln.DotSettings b/UnlimitLord.sln.DotSettings
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bannerlord/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unlimit/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>