Merge pull request #249 from DiplomacyTeam/dev

Release 1.2.9

Author: bennyz

build/common.props

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

changelog.txt

@@ -1,6 +1,10 @@
 ---------------------------------------------------------------------------------------------------
+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
+---------------------------------------------------------------------------------------------------
 Version: 1.2.8
-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
+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
 * Add support for v1.2.4
 ---------------------------------------------------------------------------------------------------
 Version: 1.2.7

src/Bannerlord.Diplomacy/SubModule.cs

@@ -20,6 +20,7 @@
 using TaleWorlds.Core;
 using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
+using TaleWorlds.Localization;
 
 namespace Diplomacy
 {
@@ -28,7 +29,7 @@ public sealed class SubModule : MBSubModuleBase
         public static readonly string Version = $"v{typeof(SubModule).Assembly.GetName().Version.ToString(3)}";
 
         public static readonly string Name = typeof(SubModule).Namespace;
-        public static readonly string DisplayName = Name;
+        public static readonly string DisplayName = new TextObject($"{{=MYz8nKqq}}{Name}").ToString();
         public static readonly string MainHarmonyDomain = "bannerlord." + Name.ToLower();
         public static readonly string CampaignHarmonyDomain = MainHarmonyDomain + ".campaign";
         public static readonly string WidgetHarmonyDomain = MainHarmonyDomain + ".widgets";
@@ -74,7 +75,7 @@ protected override void OnBeforeInitialModuleScreenSetAsRoot()
                 _hasLoaded = true;
                 Log.LogInformation($"Loaded {Name} {Version}!");
 
-                InformationManager.DisplayMessage(new InformationMessage($"Loaded {DisplayName}", StdTextColor));
+                InformationManager.DisplayMessage(new InformationMessage(new TextObject($"{{=hPERH3u4}}Loaded {{NAME}}").SetTextVariable("NAME", DisplayName).ToString(), StdTextColor));
             }
         }
 

src/Bannerlord.Diplomacy/ViewModel/RebelFactionsVM.cs

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

src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/civil_war_strings_xml.xml

@@ -97,7 +97,7 @@
     <string id="6kNmdLxZ" text="Faction Creation Influence Cost" />
     <string id="EwbXg3va" text="The influence cost of starting a faction. Default value is 100." />
     <string id="7wK0mmw1" text="Faction Tendency" />
-    <string id="7wK0mmw1" text="Score modifier affecting the tendency of clans to create or join factions. Increasing the modifier increases faction participation. Default value is 0." />
+    <string id="aqvIdG7w" text="Score modifier affecting the tendency of clans to create or join factions. Increasing the modifier increases faction participation. Default value is 0." />
 
   </strings>
 </base>

src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/language_data.xml

@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LanguageData id="English" />
+<LanguageData id="English">
+ <LanguageFile xml_path="civil_war_strings_xml.xml" />
+ <LanguageFile xml_path="faction_names_xml.xml" />
+ <LanguageFile xml_path="help_strings_xml.xml" />
+ <LanguageFile xml_path="std_module_strings_xml.xml" />
+ <LanguageFile xml_path="war_exhaustion_strings.xml" />
+</LanguageData>

src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/std_module_strings_xml.xml

@@ -62,7 +62,7 @@
     <string id="DrnXprup" text="You have been at war too recently to consider an alliance. It has only been {ELAPSED_DAYS} days out of a required {REQUIRED_DAYS} days." />
     <string id="KHJyWj9H" text="Cannot be in an alliance." />
     <string id="UQZmdLzc" text="Cannot be at war." />
-    <string id="PdN5g5ub" text="Alliance Formed" />
+    <string id="qIa19an4" text="Alliance Formed" />
     <string id="3pbwc8sh" text="Alliance Proposal"/>
     <string id="QbOqatd7" text="{KINGDOM} is proposing an alliance with {PLAYER_KINGDOM}." />
 
@@ -101,7 +101,7 @@
     <string id="gyLjlpJB" text="{KINGDOM} is proposing a non-aggression pact with {PLAYER_KINGDOM}."/>
 
     <string id="9pY0NQrk" text="Form Pact"/>
-    <string id="9zlQNtlX" text="Form a non-aggression pact lasting {PACT_DURATION_DAYS} days."/>
+    <string id="9zlQNtlX" text="Form a non-aggression pact lasting {DAYS} days."/>
 
     <string id="1occw3EF" text="Stats"/>
     <string id="OvbY5qxL" text="Overview"/>
@@ -136,6 +136,7 @@
     <string id="qbLPBlIv" text="Calradia grows wary of the inexorable expansion of the {EXPANSIONIST_KINGDOM}. A coalition led by the {COALITION_KINGDOM} has been formed to fight them!"/>
 
     <string id="vB3RrMNf" text="The {KINGDOM} has formed a non-aggression pact with the {OTHER_KINGDOM}." />
+    <string id="PdN5g5ub" text="{KINGDOM} has formed an alliance with {OTHER_KINGDOM}!">
     <string id="5r6fsHgm" text="Current Score"/>
     <string id="XIBUWDlT" text="Required Score"/>
 

supported-game-versions.txt

@@ -1,3 +1,4 @@
+v1.2.5
 v1.2.4
 v1.2.3
 v1.2.2