Merge pull request #27 from BUTR/dev

v0.6.2
BUTR · Jun 26, 2022 · af8546d · af8546d
2 parents e41dd3f + 9a0fb12
commit af8546d
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 6 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -30,7 +30,7 @@ jobs:
       shell: pwsh
 
     - name: Upload Bannerlord folder
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: bannerlord
         path: ./bannerlord/
@@ -49,7 +49,7 @@ jobs:
         github-token: ${{secrets.GITHUB_TOKEN}}
 
     - name: Download bannerlord folder
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: bannerlord
         path: ./bannerlord

diff --git a/...ord.YellToInspire/MissionBehaviors/AgentComponents/InspireCooldownPlayerAgentComponent.cs b/...ord.YellToInspire/MissionBehaviors/AgentComponents/InspireCooldownPlayerAgentComponent.cs
@@ -1,6 +1,10 @@
 using Bannerlord.YellToInspire.HotKeys;
 
+#if e172
 using TaleWorlds.Core;
+#elif e180
+using TaleWorlds.Library;
+#endif
 using TaleWorlds.Localization;
 using TaleWorlds.MountAndBlade;
 

diff --git a/...lord.YellToInspire/MissionBehaviors/AgentComponents/InspireKillingPlayerAgentComponent.cs b/...lord.YellToInspire/MissionBehaviors/AgentComponents/InspireKillingPlayerAgentComponent.cs
@@ -1,6 +1,10 @@
 using Bannerlord.YellToInspire.HotKeys;
 
+#if e172
 using TaleWorlds.Core;
+#elif e180
+using TaleWorlds.Library;
+#endif
 using TaleWorlds.Localization;
 using TaleWorlds.MountAndBlade;
 

diff --git a/src/Bannerlord.YellToInspire/MissionBehaviors/InspireHotKeyBehaviour.cs b/src/Bannerlord.YellToInspire/MissionBehaviors/InspireHotKeyBehaviour.cs
@@ -1,6 +1,10 @@
 using Bannerlord.YellToInspire.HotKeys;
 
+#if e172
 using TaleWorlds.MountAndBlade.View.Missions;
+#elif e180
+using TaleWorlds.MountAndBlade.View.MissionViews;
+#endif
 
 namespace Bannerlord.YellToInspire.MissionBehaviors
 {

diff --git a/src/Bannerlord.YellToInspire/SubModule.cs b/src/Bannerlord.YellToInspire/SubModule.cs
@@ -3,10 +3,6 @@
 using Bannerlord.YellToInspire.HotKeys;
 using Bannerlord.YellToInspire.MissionBehaviors;
 
-using BUTR.DependencyInjection;
-
-using MCM.Abstractions.Settings.Providers;
-
 using System;
 using System.IO;
 
@@ -53,14 +49,17 @@ protected override void OnSubModuleLoad()
 
             var moduleInfo = ModuleInfoHelper.GetModuleByType(typeof(SubModule));
             var path = Path.Combine(ModuleHelper.GetModuleFullPath(moduleInfo!.Id), "ModuleData", "module_strings.xml");
+#if e172
             Module.CurrentModule.GlobalTextManager.LoadGameTexts(path);
+#endif
             HotKeyManager.AddAuxiliaryCategory(new YellToInspireHotkeyCategory());
 
             base.OnSubModuleLoad();
         }
 
         protected override void InitializeGameStarter(Game game, IGameStarter starterObject)
         {
+#if e172
             void OnHeroGainedSkill(Hero hero, SkillObject skill, bool hasNewPerk, int change, bool shouldNotify)
             {
                 if (hero != Hero.MainHero) return;
@@ -69,6 +68,16 @@ void OnHeroGainedSkill(Hero hero, SkillObject skill, bool hasNewPerk, int change
 
                 RefreshPerks();
             }
+#elif e180
+            void OnHeroGainedSkill(Hero hero, SkillObject skill, int change, bool shouldNotify)
+            {
+                if (hero != Hero.MainHero) return;
+
+                if (skill != DefaultSkills.Leadership && skill != DefaultSkills.Roguery) return;
+
+                RefreshPerks();
+            }
+#endif
 
             if (starterObject is CampaignGameStarter campaignStarter)
             {

diff --git a/src/Bannerlord.YellToInspire/Utils.cs b/src/Bannerlord.YellToInspire/Utils.cs
@@ -10,6 +10,9 @@
 
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
+#if e180
+using TaleWorlds.Library;
+#endif
 using TaleWorlds.Localization;
 using TaleWorlds.MountAndBlade;
 

diff --git a/src/Bannerlord.YellToInspire/changelog.txt b/src/Bannerlord.YellToInspire/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.6.2
+Game Versions: e1.8.0
+* Adapted to 1.8.0
+---------------------------------------------------------------------------------------------------
 Version: 0.6.1
 Game Versions: e1.7.2
 * Split settings into categories

diff --git a/src/Bannerlord.YellToInspire/supported-game-versions.txt b/src/Bannerlord.YellToInspire/supported-game-versions.txt
@@ -1 +1,2 @@
+e1.8.0
 e1.7.2