fixed notification service injection, fixed subscriber pagination, ch…

…anged meter on reset
TalicZealot · Apr 11, 2022 · d315aca · d315aca
1 parent 5c8e7ae
commit d315aca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/SotnRandoTools/src/Khaos/ChannelPointsController.cs b/SotnRandoTools/src/Khaos/ChannelPointsController.cs
@@ -145,7 +145,7 @@ private async void GetSubscribers()
 				GetBroadcasterSubscriptionsResponse subsPageTwoData = await RetryRequest.Do(
 				async () => await api.Helix.Subscriptions.GetBroadcasterSubscriptions(
 					broadcasterId,
-					MaxSubscribers.ToString(),
+					subs.Pagination.Cursor,
 					MaxSubscribers,
 					api.Settings.AccessToken
 				),

diff --git a/SotnRandoTools/src/Khaos/KhaosController.cs b/SotnRandoTools/src/Khaos/KhaosController.cs
@@ -170,6 +170,7 @@ public class KhaosController : IKhaosController
 		private int hnkToggled = 0;
 
 		private int bankruptLevel = 1;
+		private short mainMenuCounter = 0;
 
 		public KhaosController(IToolConfig toolConfig, ISotnApi sotnApi, ICheatCollectionAdapter cheats, INotificationService notificationService, IInputService inputService, IKhaosActionsInfoDisplay statusInfoDisplay)
 		{
@@ -2987,7 +2988,8 @@ private void CheckMainMenu()
 				inMainMenu = sotnApi.GameApi.Status == SotnApi.Constants.Values.Game.Status.MainMenu;
 				if (inMainMenu)
 				{
-					GainKhaosMeter((short) toolConfig.Khaos.MeterOnReset);
+					GainKhaosMeter((short) (toolConfig.Khaos.MeterOnReset * mainMenuCounter));
+					mainMenuCounter++;
 					battleOrdersBonusHp = 0;
 					battleOrdersBonusMp = 0;
 				}

diff --git a/SotnRandoTools/src/SotnRandoTools.csproj b/SotnRandoTools/src/SotnRandoTools.csproj
@@ -11,7 +11,7 @@
     <OutputType>Library</OutputType>
     <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
     <AnalysisLevel>5.0</AnalysisLevel>
-    <Version>1.3.2</Version>
+    <Version>1.3.3</Version>
     <Description>A collection of tools to enhance the experience of playign the SotN randomizer.</Description>
     <Copyright />
     <PackageProjectUrl>https://taliczealot.github.io/</PackageProjectUrl>

diff --git a/SotnRandoTools/src/ToolMainForm.cs b/SotnRandoTools/src/ToolMainForm.cs
@@ -148,6 +148,10 @@ private void ToolMainForm_Load(object sender, EventArgs e)
 
 			khaosSettingsPanel = new KhaosSettingsPanel(toolConfig);
 			khaosSettingsPanel.Location = new Point(0, PanelOffset);
+			if (notificationService is not null)
+			{
+				khaosSettingsPanel.NotificationService = notificationService;
+			}
 			this.Controls.Add(khaosSettingsPanel);
 
 			coopSettingsPanel = new CoopSettingsPanel(toolConfig);