mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed userpresence, added runes

Browse Source
This commit is contained in:
Master Kwoth 2016-02-23 09:04:52 +01:00
parent 19d6d79297
commit 19b4e7d401
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
NadekoBot/Commands/LoLCommands.cs
View File

@ -76,6 +76,8 @@ namespace NadekoBot.Commands {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
items[i] = buildData["items"][i].ToString(); items[i] = buildData["items"][i].ToString();
} }
//get matchup data to show counters and countered champions
var matchupDatas = JArray.Parse(await Classes.SearchHelper.GetResponseAsync($"http://api.champion.gg/champion/{name}/matchup?api_key={NadekoBot.creds.LOLAPIKey}")); var matchupDatas = JArray.Parse(await Classes.SearchHelper.GetResponseAsync($"http://api.champion.gg/champion/{name}/matchup?api_key={NadekoBot.creds.LOLAPIKey}"));
List<MatchupModel> matchupDataIE = null; List<MatchupModel> matchupDataIE = null;
for (int i = 0; i < matchupDatas.Count; i++) { for (int i = 0; i < matchupDatas.Count; i++) {
@ -91,6 +93,19 @@ namespace NadekoBot.Commands {
var countered = new[] { matchupData[0].Name, matchupData[1].Name, matchupData[2].Name }; var countered = new[] { matchupData[0].Name, matchupData[1].Name, matchupData[2].Name };
var counters = new[] { matchupData[matchupData.Length - 1].Name, matchupData[matchupData.Length - 2].Name, matchupData[matchupData.Length - 3].Name }; var counters = new[] { matchupData[matchupData.Length - 1].Name, matchupData[matchupData.Length - 2].Name, matchupData[matchupData.Length - 3].Name };
var runeDatas = JArray.Parse(await Classes.SearchHelper.GetResponseAsync($"http://api.champion.gg/champion/{name}/runes/mostPopular?api_key={NadekoBot.creds.LOLAPIKey}"));
JToken runeData = null;
for (int i = 0; i < runeDatas.Count; i++) {
if (runeDatas[i]["role"].ToString() == role) {
runeData = runeDatas[i];
}
}
if (runeData == null)
return;
var runesJArray = runeData["runes"] as JArray;
var runes = string.Join("\n", runesJArray.OrderBy(jt => int.Parse(jt["number"].ToString())).Select(jt => jt["number"].ToString() + "x" + jt["name"]));
//todo save this for at least 1 hour //todo save this for at least 1 hour
Image img = Image.FromFile("data/lol/bg.png"); Image img = Image.FromFile("data/lol/bg.png");
using (Graphics g = Graphics.FromImage(img)) { using (Graphics g = Graphics.FromImage(img)) {
@ -119,11 +134,7 @@ Assists: {general["assists"]} Ban: {general["banRate"]}%
//draw masteries //draw masteries
g.DrawString($"MASTERIES: 18 / 0 / 12", normalFont, Brushes.WhiteSmoke, margin, margin + imageSize + margin + 20); g.DrawString($"MASTERIES: 18 / 0 / 12", normalFont, Brushes.WhiteSmoke, margin, margin + imageSize + margin + 20);
//draw runes //draw runes
g.DrawString(@"RUNES g.DrawString($"{runes}", smallFont, Brushes.WhiteSmoke, margin, margin + imageSize + margin + 40);
9 x Greater Mark of Attack Damage
9 x Greater Glyph of Scaling Magic Resist
9 x Greater Seal of Armor
3 x Greater Quintessence of Attack Speed", normalFont, Brushes.WhiteSmoke, margin, margin + imageSize + margin + 40);
//draw counters //draw counters
g.DrawString($"Best against", smallFont, Brushes.WhiteSmoke, margin, img.Height - imageSize + margin); g.DrawString($"Best against", smallFont, Brushes.WhiteSmoke, margin, img.Height - imageSize + margin);
int smallImgSize = 50; int smallImgSize = 50;

9
NadekoBot/Commands/LogCommand.cs
View File

@ -70,13 +70,8 @@ namespace NadekoBot.Commands {
if (loggingPresences.TryGetValue(e.Server, out ch)) if (loggingPresences.TryGetValue(e.Server, out ch))
if (e.Before.Status != e.After.Status) { if (e.Before.Status != e.After.Status) {
var msg = await ch.SendMessage($"**{e.Before.Name}** is now **{e.After.Status}**."); var msg = await ch.SendMessage($"**{e.Before.Name}** is now **{e.After.Status}**.");
Task.Run(async () => { await Task.Delay(4000);
try { await msg.Delete();
Task.Delay(4000);
msg.Delete();
}
catch { }
});
} }
} }
catch { } catch { }