Version 1.3.5

pipe01 · Dec 13, 2019 · e32c7b1 · e32c7b1
1 parent 5b228e5
commit e32c7b1
Show file tree

Hide file tree

Showing 23 changed files with 32 additions and 580 deletions.
diff --git a/LCU.NET b/LCU.NET
diff --git a/Legendary Rune Maker/Data/Providers/UGGProvider.cs b/Legendary Rune Maker/Data/Providers/UGGProvider.cs
@@ -15,7 +15,7 @@ namespace Legendary_Rune_Maker.Data.Providers
     internal class UGGProvider : Provider
     {
         public override string Name => "U.GG";
-        public override Options ProviderOptions => Options.RunePages | Options.ItemSets | Options.SkillOrder;
+        public override Options ProviderOptions => Options.RunePages | Options.ItemSets | Options.SkillOrder | Options.Counters;
 
         private const int OverviewWorld = 12;
         private const int OverviewPlatPlus = 10;
@@ -52,7 +52,7 @@ private async Task<string> GetLolUGGVersion()
             return _LolUGGVersion;
         }
 
-        private IDictionary<int, JObject> ChampionData = new Dictionary<int, JObject>();
+        private readonly IDictionary<int, JObject> ChampionData = new Dictionary<int, JObject>();
         protected async Task<JObject> GetChampionData(int championId)
         {
             if (!ChampionData.TryGetValue(championId, out var data))
@@ -161,5 +161,16 @@ public async Task<IEnumerable<PositionData>> GetDeepRoles(int championId)
                 .OrderByDescending(o => o.Value[0][0][0])
                 .Select(o => new PositionData(IdToPosition[int.Parse(o.Name)], o.Value[0][0][0].ToObject<float>() / totalGames));
         }
+
+        public override async Task<Champion[]> GetCountersFor(int championId, Position position, int maxCount = 5)
+        {
+            var json = JObject.Parse(await WebCache.String($"https://stats2.u.gg/lol/{UGGApiVersion}/matchups/{await GetLolUGGVersion()}/ranked_solo_5x5/{championId}/{UGGOverviewVersion}.json"));
+
+            var ret = await Task.WhenAll(json["1"]["1"][IdToPosition.Invert()[position].ToString()][0]
+                .Take(maxCount)
+                .Select(o => Riot.GetChampionAsync(o[0].Value<int>())).ToArray());
+
+            return ret;
+        }
     }
 }
diff --git a/Legendary Rune Maker/Game/Actuator.Game.cs b/Legendary Rune Maker/Game/Actuator.Game.cs
@@ -34,7 +34,7 @@ public async Task PickChampion(Position pos, LolChampSelectChampSelectAction myA
             LogTo.Debug("possiblePicks: {0}", string.Join(", ", picks.Values.ToArray()));
 
             //Get the first valid one
-            int preferredPick = possiblePicks.FirstOrDefault(pickable.championIds.Contains);
+            int preferredPick = possiblePicks.FirstOrDefault(pickable.Contains);
             LogTo.Debug("Preferred champ: {0}", preferredPick);
 
             if (preferredPick == 0)
@@ -83,7 +83,7 @@ public async Task BanChampion(Position pos, LolChampSelectChampSelectAction myAc
             possibleBans.Add(bans[Position.Fill]);
             LogTo.Debug("possibleBans: {0}", string.Join(", ", possibleBans));
 
-            int preferredBan = possibleBans.FirstOrDefault(bannable.championIds.Contains);
+            int preferredBan = possibleBans.FirstOrDefault(bannable.Contains);
             var banName = preferredBan > 0 ? Riot.GetChampion(preferredBan).Name : "None";
             LogTo.Debug("Preferred ban: {0}", banName);
 

diff --git a/Legendary Rune Maker/Overlay/Enemy.cs b/Legendary Rune Maker/Overlay/Enemy.cs
@@ -8,13 +8,15 @@ public readonly struct Enemy
         public Champion[] GoodPicks { get; }
         public Champion[] BadPicks { get; }
         public string Position { get; }
+        public bool IsOpponent { get; }
 
-        public Enemy(Champion champion, Champion[] goodPicks, Champion[] badPicks, string position)
+        public Enemy(Champion champion, Champion[] goodPicks, Champion[] badPicks, string position, bool isOpponent)
         {
             this.Champion = champion;
             this.GoodPicks = goodPicks;
             this.BadPicks = badPicks;
             this.Position = position;
+            this.IsOpponent = isOpponent;
         }
     }
 }
diff --git a/Legendary Rune Maker/Properties/AssemblyInfo.cs b/Legendary Rune Maker/Properties/AssemblyInfo.cs
@@ -16,7 +16,7 @@
 
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: AssemblyVersion("1.3.4")]
+[assembly: AssemblyVersion("1.3.5")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = "log4net.config")]

diff --git a/Legendary Rune Maker/Windows/OverlayWindow.xaml.cs b/Legendary Rune Maker/Windows/OverlayWindow.xaml.cs
@@ -85,16 +85,20 @@ await Dispatcher.Invoke(async () =>
                         this.Visibility = Visibility.Visible;
                     }
 
-                    await UpdateTeam(data.theirTeam.Select(o => o.championId).ToArray());
+                    await UpdateTeam(data);
                 }
             });
         }
 
-        private async Task UpdateTeam(int[] team)
+        private async Task UpdateTeam(LolChampSelectChampSelectSession data)
         {
+            int[] team = data.theirTeam.Select(o => o.championId).ToArray();
+
             if (PreviousTeam != null && team.SequenceEqual(PreviousTeam))
                 return;
 
+            var myPosition = data.myTeam.Single(o => o.cellId == data.localPlayerCellId).assignedPosition.ToPosition();
+
             var guessedPositions = Guesser.Guess(team.Where(o => o != 0).ToArray());
 
             for (int i = EnemySummoners.Count; i < team.Length; i++)
@@ -108,11 +112,14 @@ private async Task UpdateTeam(int[] team)
 
                 if (theirChamp != 0)
                 {
+                    var enemyPosition = guessedPositions.Invert()[theirChamp];
+
                     EnemySummoners[i] = new Enemy(
                         await Riot.GetChampionAsync(theirChamp),
                         await new METAsrcProvider().GetCountersFor(theirChamp, Position.Fill),
                         null,
-                        guessedPositions.Invert()[theirChamp].ToString().ToUpper());
+                        enemyPosition.ToString().ToUpper(),
+                        enemyPosition == myPosition);
                 }
             }
 
@@ -173,6 +180,8 @@ private async void Window_Initialized(object sender, EventArgs e)
 
             await LoL?.Socket.SubscribeAndUpdate<LolChampSelectChampSelectSession>("/lol-champ-select/v1/session", ChampSelectSessionCallback);
 
+            var c = await new UGGProvider().GetCountersFor(84, Position.Mid);
+
             //var events = JsonConvert.DeserializeObject<EventData[]>(File.ReadAllText("events.json"));
             //Client.Socket.Playback(events, 10);
         }

diff --git a/LoL Rune Maker.sln b/LoL Rune Maker.sln
@@ -25,8 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotifyIconWpf", "notifyicon
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Legendary Rune Maker Tests", "Legendary Rune Maker Tests\Legendary Rune Maker Tests.csproj", "{5850F2F4-BFD1-4386-89F8-34D6EC8FF03D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp2", "WpfApp2\WpfApp2.csproj", "{0A587E01-B671-449E-9531-5CF672E34B89}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -116,16 +114,6 @@ Global
 		{5850F2F4-BFD1-4386-89F8-34D6EC8FF03D}.Release 4.6.1|Any CPU.Build.0 = Release|Any CPU
 		{5850F2F4-BFD1-4386-89F8-34D6EC8FF03D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5850F2F4-BFD1-4386-89F8-34D6EC8FF03D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A587E01-B671-449E-9531-5CF672E34B89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A587E01-B671-449E-9531-5CF672E34B89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A587E01-B671-449E-9531-5CF672E34B89}.Release 4.0|Any CPU.ActiveCfg = Release|Any CPU
-		{0A587E01-B671-449E-9531-5CF672E34B89}.Release 4.0|Any CPU.Build.0 = Release|Any CPU
-		{0A587E01-B671-449E-9531-5CF672E34B89}.Release 4.5|Any CPU.ActiveCfg = Release|Any CPU
-		{0A587E01-B671-449E-9531-5CF672E34B89}.Release 4.5|Any CPU.Build.0 = Release|Any CPU
-		{0A587E01-B671-449E-9531-5CF672E34B89}.Release 4.6.1|Any CPU.ActiveCfg = Release|Any CPU
-		{0A587E01-B671-449E-9531-5CF672E34B89}.Release 4.6.1|Any CPU.Build.0 = Release|Any CPU
-		{0A587E01-B671-449E-9531-5CF672E34B89}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A587E01-B671-449E-9531-5CF672E34B89}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/WpfApp1/App.xaml b/WpfApp1/App.xaml
diff --git a/WpfApp1/App.xaml.cs b/WpfApp1/App.xaml.cs
diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml
diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs
diff --git a/WpfApp1/WpfApp1.csproj b/WpfApp1/WpfApp1.csproj
diff --git a/WpfApp2/App.config b/WpfApp2/App.config
diff --git a/WpfApp2/App.xaml b/WpfApp2/App.xaml
diff --git a/WpfApp2/App.xaml.cs b/WpfApp2/App.xaml.cs
diff --git a/WpfApp2/MainWindow.xaml b/WpfApp2/MainWindow.xaml
diff --git a/WpfApp2/MainWindow.xaml.cs b/WpfApp2/MainWindow.xaml.cs
diff --git a/WpfApp2/Properties/AssemblyInfo.cs b/WpfApp2/Properties/AssemblyInfo.cs