Merge pull request #253 from DiplomacyTeam/dev

Release v1.2.10

Author: bennyz

build/common.props

@@ -2,7 +2,7 @@
 
     <!--Module Version-->
     <PropertyGroup>
-        <Version>1.2.9</Version>
+        <Version>1.2.10</Version>
         <GameVersion>1.0.0</GameVersion>
     </PropertyGroup>
 

changelog.txt

@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.10
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,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
+* Add support for v1.2.6,v1.2.7,v1.2.8
+* Localization issues (Gedevan-Aleksizde)
+* Hero without party crash (arunasradv)
+---------------------------------------------------------------------------------------------------
 Version: 1.2.9
 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,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
 * Add support for v1.2.5

src/Bannerlord.Diplomacy/CampaignBehaviors/CivilWarBehavior.cs

@@ -25,7 +25,7 @@ internal sealed class CivilWarBehavior : CampaignBehaviorBase
         public override void RegisterEvents()
         {
             CampaignEvents.DailyTickClanEvent.AddNonSerializedListener(this, DailyTickClan);
-#if v124
+#if v124 || v125 || v126 || v127 || v128
             CampaignEvents.OnClanChangedKingdomEvent.AddNonSerializedListener(this, (x, y, z, _, _) => RemoveClanFromRebelFaction(x, y, z));
 #elif v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116 || v120 || v121 || v122 || v123
             CampaignEvents.ClanChangedKingdom.AddNonSerializedListener(this, (x, y, z, _, _) => RemoveClanFromRebelFaction(x, y, z));

src/Bannerlord.Diplomacy/CampaignBehaviors/WarExhaustionBehavior.cs

@@ -169,7 +169,7 @@ private void OnHeroKilled(Hero victim, Hero killer, KillCharacterAction.KillChar
                     return;
             }
 
-            _warExhaustionManager.AddHeroPerishedWarExhaustion(kingdoms, victim, killer.PartyBelongedTo.Name ?? effector!.Name, detail);
+            _warExhaustionManager.AddHeroPerishedWarExhaustion(kingdoms, victim, killer.PartyBelongedTo?.Name ?? effector!.Name, detail);
         }
 
 
@@ -251,4 +251,4 @@ public override void SyncData(IDataStore dataStore)
             }
         }
     }
-}
+}

src/Bannerlord.Diplomacy/ViewModel/RebelFactionsVM.cs

@@ -139,7 +139,7 @@ public void OnCreateFaction()
                 inquiryElements,
                 true,
                 1,
-#if v120 || v121 || v122 || v123 || v124 || v125
+#if v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128
                 1,
 #endif
                 GameTexts.FindText("str_ok").ToString(),

src/Bannerlord.Diplomacy/ViewModel/WarExhaustionMapIndicatorVM.cs

@@ -19,7 +19,7 @@ public WarExhaustionMapIndicatorVM()
             _kingdomsAtWar = new MBBindingList<WarExhaustionMapIndicatorItemVM>();
             RefreshValues();
             DiplomacyEvents.WarExhaustionInitialized.AddNonSerializedListener(this, HandleStanceChange);
-#if v124
+#if v124 || v125 || v126 || v127 || v128
             CampaignEvents.OnClanChangedKingdomEvent.AddNonSerializedListener(this, (x, _, _, _, _) => HandleClanChangedKingdom(x));
 #elif v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116 || v120 || v121 || v122 || v123
             CampaignEvents.ClanChangedKingdom.AddNonSerializedListener(this, (x, _, _, _, _) => HandleClanChangedKingdom(x));
@@ -51,7 +51,7 @@ public override void OnFinalize()
         {
             base.OnFinalize();
 
-#if v124
+#if v124 || v125 || v126 || v127 || v128
             CampaignEvents.OnClanChangedKingdomEvent.ClearListeners(this);
 #elif v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116 || v120 || v121 || v122 || v123
             CampaignEvents.ClanChangedKingdom.ClearListeners(this);

src/Bannerlord.Diplomacy/ViewModelMixin/KingdomTruceItemVmMixin.cs

@@ -36,7 +36,7 @@ internal sealed class KingdomTruceItemVMMixin : BaseViewModelMixin<KingdomTruceI
         private static readonly TextObject _TPacts = new(StringConstants.NonAggressionPacts);
 
         private static readonly TextObject _TNapHelpText = new("{=9zlQNtlX}Form a non-aggression pact lasting {DAYS} days.");
-        private static readonly TextObject _TWarExhaustion = new("{=XmV_TQ0bH}War Exhaustion");
+        private static readonly TextObject _TWarExhaustion = new("{=XmVTQ0bH}War Exhaustion");
 
         private static readonly TextObject _TBreakAlliance = new("{=K4GraLTn}Break Alliance");
 

supported-game-versions.txt

@@ -1,3 +1,6 @@
+v1.2.8
+v1.2.7
+v1.2.6
 v1.2.5
 v1.2.4
 v1.2.3