From 65b629481b8bfb6960768c23ab0c1c59fa6bfe6b Mon Sep 17 00:00:00 2001 From: Alex Zeier Date: Thu, 17 Aug 2023 12:18:36 -0700 Subject: [PATCH] feat: add RemoteConfig flag to disable tier7 --- .../BattlegroundsHeroPickingViewModel.cs | 8 ++++++++ .../Tier7/OverlayMessageViewModel.cs | 2 ++ .../Battlegrounds/Tier7/Tier7PreLobby.xaml | 9 +++++++++ .../Tier7/Tier7PreLobbyViewModel.cs | 20 +++++++++++++++++-- Hearthstone Deck Tracker/Core.cs | 1 + .../Utility/RemoteData/RemoteData.Config.cs | 9 +++++++++ 6 files changed, 47 insertions(+), 2 deletions(-) diff --git a/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/HeroPicking/BattlegroundsHeroPickingViewModel.cs b/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/HeroPicking/BattlegroundsHeroPickingViewModel.cs index 83d3f41b62..7bf42be253 100644 --- a/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/HeroPicking/BattlegroundsHeroPickingViewModel.cs +++ b/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/HeroPicking/BattlegroundsHeroPickingViewModel.cs @@ -9,6 +9,7 @@ using Hearthstone_Deck_Tracker.HsReplay; using Hearthstone_Deck_Tracker.Utility; using Hearthstone_Deck_Tracker.Utility.MVVM; +using Hearthstone_Deck_Tracker.Utility.RemoteData; using HSReplay.Requests; using static System.Windows.Visibility; @@ -99,6 +100,13 @@ public async void SetHeroes(int[] heroIds) if(!HSReplayNetOAuth.IsFullyAuthenticated) return; + if(Remote.Config.Data?.Tier7?.Disabled ?? false) + { + Message.Disabled(); + Visibility = Visible; + return; + } + var userOwnsTier7 = HSReplayNetOAuth.AccountData?.IsTier7 ?? false; if(!userOwnsTier7 && (Tier7Trial.RemainingTrials ?? 0) == 0) diff --git a/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/Tier7/OverlayMessageViewModel.cs b/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/Tier7/OverlayMessageViewModel.cs index be55ec13eb..1c707b6af5 100644 --- a/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/Tier7/OverlayMessageViewModel.cs +++ b/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/Tier7/OverlayMessageViewModel.cs @@ -36,6 +36,8 @@ public async void Error() public void Loading() => Text = LocUtil.Get("BattlegroundsOverlayMessage_Loading"); + public void Disabled() => Text = LocUtil.Get("BattlegroundsOverlayMessage_Disabled"); + private static readonly Dictionary MmrPercentValues = new() { { "TOP_1_PERCENT", 1 }, diff --git a/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/Tier7/Tier7PreLobby.xaml b/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/Tier7/Tier7PreLobby.xaml index 9312cea54e..05d97e393f 100644 --- a/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/Tier7/Tier7PreLobby.xaml +++ b/Hearthstone Deck Tracker/Controls/Overlay/Battlegrounds/Tier7/Tier7PreLobby.xaml @@ -158,6 +158,15 @@