Keep compatible with Bannerlord e1.6.1

lzh-mb-mod · Aug 21, 2021 · 6c2d43a · 6c2d43a
1 parent 052f073
commit 6c2d43a
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 43 deletions.
diff --git a/.github/resources/config.env b/.github/resources/config.env
@@ -1,3 +1,3 @@
-GAME_VERSION=e1.6.0
-GAME_BRANCH=beta
-MOD_VERSION=v2.1.3
+GAME_VERSION=e1.6.1
+GAME_BRANCH=master
+MOD_VERSION=v2.1.4
diff --git a/...ce/EnhancedBattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/EnhancedBattleTestScreen.xml b/...ce/EnhancedBattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/EnhancedBattleTestScreen.xml
@@ -249,7 +249,7 @@
                       </Children>
                     </ScrollbarWidget>
 
-                    <ScrollablePanel Id="SearchResultListScrollablePanel" DataSource="{MapSelectionGroup}" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="330" SuggestedHeight="380" HorizontalAlignment="Center" VerticalAlignment="Top" MarginTop="510" Sprite="SPOptions\standart_dropdown_extension" AutoHideScrollBarHandle="true" AutoHideScrollBars="true" ClipRect="SearchResultListRect" InnerPanel="SearchResultListRect\SearchResultList" MouseScrollAxis="Vertical" VerticalScrollbar="..\SearchResultListScrollbar">
+                    <ScrollablePanel Id="SearchResultListScrollablePanel" DataSource="{MapSelectionGroup}" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="330" SuggestedHeight="380" HorizontalAlignment="Center" VerticalAlignment="Top" MarginTop="510" Sprite="SPGeneral\SPOptions\standart_dropdown_extension" AutoHideScrollBarHandle="true" AutoHideScrollBars="true" ClipRect="SearchResultListRect" InnerPanel="SearchResultListRect\SearchResultList" MouseScrollAxis="Vertical" VerticalScrollbar="..\SearchResultListScrollbar">
                       <Children>
 
                         <Widget Id="SearchResultListRect" WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" MarginLeft="17" MarginRight="10" MarginTop="8" MarginBottom="17" ClipContents="true">

diff --git a/source/EnhancedBattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/EnhancedBattleTestSide.xml b/source/EnhancedBattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/EnhancedBattleTestSide.xml
@@ -21,13 +21,13 @@
 
                 <SliderWidget DataSource="{TacticLevel}" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="338" SuggestedHeight="42" MarginLeft="20" VerticalAlignment="Center" DoNotUpdateHandleSize="true" Filler="Filler" Handle="SliderHandle" IsDiscrete="@IsDiscrete" MaxValueFloat="@Max" MinValueFloat="@Min" ValueFloat="@Value">
                   <Children>
-                    <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="362" SuggestedHeight="38" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_canvas" IsEnabled="false" />
-                    <Widget Id="Filler" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_fill" ClipContents="true">
+                    <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="362" SuggestedHeight="38" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_canvas" IsEnabled="false" />
+                    <Widget Id="Filler" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_fill" ClipContents="true">
                       <Children>
-                        <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" HorizontalAlignment="Left" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_fill" />
+                        <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" HorizontalAlignment="Left" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_fill" />
                       </Children>
                     </Widget>
-                    <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="400" SuggestedHeight="65" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_frame" IsEnabled="false" />
+                    <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="400" SuggestedHeight="65" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_frame" IsEnabled="false" />
                     <Widget Id="SliderHandle" DoNotAcceptEvents="true" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="14" SuggestedHeight="38" HorizontalAlignment="Left" VerticalAlignment="Center" Brush="SPOptions.Slider.Handle" />
                   </Children>
                 </SliderWidget>

diff --git a/source/EnhancedBattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/MPCharacterConfig.xml b/source/EnhancedBattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/MPCharacterConfig.xml
@@ -28,13 +28,13 @@
 
             <SliderWidget DataSource="{FemaleRatio}" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="338" SuggestedHeight="42" MarginLeft="20" VerticalAlignment="Center" DoNotUpdateHandleSize="true" Filler="Filler" Handle="SliderHandle" IsDiscrete="@IsDiscrete" MaxValueFloat="@Max" MinValueFloat="@Min" ValueFloat="@Value">
               <Children>
-                <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="362" SuggestedHeight="38" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_canvas" IsEnabled="false" />
-                <Widget Id="Filler" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_fill" ClipContents="true">
+                <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="362" SuggestedHeight="38" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_canvas" IsEnabled="false" />
+                <Widget Id="Filler" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_fill" ClipContents="true">
                   <Children>
-                    <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" HorizontalAlignment="Left" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_fill" />
+                    <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" HorizontalAlignment="Left" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_fill" />
                   </Children>
                 </Widget>
-                <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="400" SuggestedHeight="65" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_frame" IsEnabled="false" />
+                <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="400" SuggestedHeight="65" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_frame" IsEnabled="false" />
                 <Widget Id="SliderHandle" DoNotAcceptEvents="true" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="14" SuggestedHeight="38" HorizontalAlignment="Left" VerticalAlignment="Center" Brush="SPOptions.Slider.Handle" />
               </Children>
             </SliderWidget>

diff --git a/source/EnhancedBattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/SPCharacterConfig.xml b/source/EnhancedBattleTest/Modules/EnhancedBattleTest/GUI/Prefabs/SPCharacterConfig.xml
@@ -11,13 +11,13 @@
 
             <SliderWidget DataSource="{FemaleRatio}" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="338" SuggestedHeight="42" MarginLeft="20" VerticalAlignment="Center" DoNotUpdateHandleSize="true" Filler="Filler" Handle="SliderHandle" IsDiscrete="@IsDiscrete" MaxValueFloat="@Max" MinValueFloat="@Min" ValueFloat="@Value">
               <Children>
-                <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="362" SuggestedHeight="38" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_canvas" IsEnabled="false" />
-                <Widget Id="Filler" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_fill" ClipContents="true">
+                <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="362" SuggestedHeight="38" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_canvas" IsEnabled="false" />
+                <Widget Id="Filler" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_fill" ClipContents="true">
                   <Children>
-                    <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" HorizontalAlignment="Left" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_fill" />
+                    <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="345" SuggestedHeight="35" HorizontalAlignment="Left" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_fill" />
                   </Children>
                 </Widget>
-                <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="400" SuggestedHeight="65" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPOptions\standart_slider_frame" IsEnabled="false" />
+                <Widget WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="400" SuggestedHeight="65" HorizontalAlignment="Center" VerticalAlignment="Center" Sprite="SPGeneral\SPOptions\standart_slider_frame" IsEnabled="false" />
                 <Widget Id="SliderHandle" DoNotAcceptEvents="true" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="14" SuggestedHeight="38" HorizontalAlignment="Left" VerticalAlignment="Center" Brush="SPOptions.Slider.Handle" />
               </Children>
             </SliderWidget>

diff --git a/source/EnhancedBattleTest/Modules/EnhancedBattleTest/SubModule.xml b/source/EnhancedBattleTest/Modules/EnhancedBattleTest/SubModule.xml
@@ -2,14 +2,15 @@
 <Module>
   <Name value="EnhancedBattleTest"/>
   <Id value="EnhancedBattleTest"/>
-  <Version value="v2.1.3"/>
+  <Version value="v2.1.4"/>
   <SingleplayerModule value="true"/>
   <MultiplayerModule value="false"/>
   <DependedModules>
-    <DependedModule Id="Native" DependentVersion="e1.6.0" />
-    <DependedModule Id="SandBoxCore" DependentVersion="e1.6.0" />
-    <DependedModule Id="Sandbox" DependentVersion="e1.6.0" />
-    <DependedModule Id="StoryMode" DependentVersion="e1.6.0" />
+    <DependedModule Id="Native" DependentVersion="e1.6.1" />
+    <DependedModule Id="SandBoxCore" DependentVersion="e1.6.1" />
+    <DependedModule Id="Sandbox" DependentVersion="e1.6.1" />
+	<DependedModule Id="CustomBattle" DependentVersion="e1.6.1"/>
+    <DependedModule Id="StoryMode" DependentVersion="e1.6.1" />
   </DependedModules>
   <SubModules>
     <SubModule>

diff --git a/source/EnhancedBattleTest/src/Data/MissionData/EnhancedBattleTestMissions.cs b/source/EnhancedBattleTest/src/Data/MissionData/EnhancedBattleTestMissions.cs
@@ -184,8 +184,8 @@ public static Mission OpenEnhancedBattleTestSiege(
 
             List<CharacterObject> charactersInPlayerSideByPriority = null;
             List<CharacterObject> charactersInEnemySideByPriority = null;
-            string playerTeamGeneralName = null;
-            string enemyTeamGeneralName = null;
+            TextObject playerTeamGeneralName = null;
+            TextObject enemyTeamGeneralName = null;
             if (!isMultiplayer)
             {
                 var playerCharacter = player.CharacterObject as CharacterObject;
@@ -200,20 +200,14 @@ public static Mission OpenEnhancedBattleTestSiege(
                 if (playerGeneral != null)
                 {
                     charactersInPlayerSideByPriority.Remove(playerGeneral);
-                    playerTeamGeneralName = TextObject.ConvertToStringList(new List<TextObject>
-                    {
-                        playerGeneral.Name
-                    }).FirstOrDefault();
+                    playerTeamGeneralName = playerGeneral.Name;
                 }
                 charactersInEnemySideByPriority = Utility.OrderHeroesByPriority(config.EnemyTeamConfig);
                 var enemyGeneral = charactersInEnemySideByPriority.FirstOrDefault();
                 if (enemyGeneral != null)
                 {
                     charactersInEnemySideByPriority.Remove(enemyGeneral);
-                    enemyTeamGeneralName = TextObject.ConvertToStringList(new List<TextObject>
-                    {
-                        enemyGeneral.Name
-                    }).FirstOrDefault();
+                    enemyTeamGeneralName = enemyGeneral.Name;
 
                 }
             }
@@ -319,8 +313,8 @@ public static Mission OpenEnhancedBattleTestField(
 
             List<CharacterObject> charactersInPlayerSideByPriority = null;
             List<CharacterObject> charactersInEnemySideByPriority = null;
-            string playerTeamGeneralName = null;
-            string enemyTeamGeneralName = null;
+            TextObject playerTeamGeneralName = null;
+            TextObject enemyTeamGeneralName = null;
             if (!isMultiplayer)
             {
                 var playerCharacter = config.PlayerTeamConfig.Generals.Troops.FirstOrDefault()?.Character.CharacterObject as CharacterObject;
@@ -335,20 +329,14 @@ public static Mission OpenEnhancedBattleTestField(
                 if (playerGeneral != null)
                 {
                     charactersInPlayerSideByPriority.Remove(playerGeneral);
-                    playerTeamGeneralName = TextObject.ConvertToStringList(new List<TextObject>
-                    {
-                        playerGeneral.Name
-                    }).FirstOrDefault();
+                    playerTeamGeneralName = playerGeneral.Name;
                 }
                 charactersInEnemySideByPriority = Utility.OrderHeroesByPriority(config.EnemyTeamConfig);
                 var enemyGeneral = charactersInEnemySideByPriority.FirstOrDefault();
                 if (enemyGeneral != null)
                 {
                     charactersInEnemySideByPriority.Remove(enemyGeneral);
-                    enemyTeamGeneralName = TextObject.ConvertToStringList(new List<TextObject>
-                    {
-                        enemyGeneral.Name
-                    }).FirstOrDefault();
+                    enemyTeamGeneralName = enemyGeneral.Name;
                 }
             }
 

diff --git a/source/EnhancedBattleTest/src/SinglePlayer/Data/MissionData/SPCombatant.cs b/source/EnhancedBattleTest/src/SinglePlayer/Data/MissionData/SPCombatant.cs
@@ -45,12 +45,12 @@ public SPCombatant(PartyBase party, BattleSideEnum side, int tacticLevel, BasicC
         public static SPCombatant CreateParty(PartyBase party, BattleSideEnum side, BasicCultureObject culture,
             TeamConfig teamConfig, bool isPlayerTeam)
         {
-            party.Owner = null;
+            party.SetCustomOwner(null);
             if (teamConfig.HasGeneral)
             {
                 var characterObject = (teamConfig.Generals.Troops.FirstOrDefault()?.Character as SPCharacterConfig)?.ActualCharacterObject;
                 if (characterObject?.IsHero ?? false)
-                    party.Owner = characterObject.HeroObject;
+                    party.SetCustomOwner(characterObject.HeroObject);
             }
             Utility.FillPartyMembers(party, side, culture, teamConfig, isPlayerTeam);
             bool isAttacker = side == BattleSideEnum.Attacker;