From 6ba2417969be18576cf4a870d5d6fe53501ea81f Mon Sep 17 00:00:00 2001 From: Logan Saso Date: Sat, 26 Mar 2016 12:55:15 -0700 Subject: [PATCH] Did a total of nothing, made a design choice --- .../Modules/Effects/Debug/DebugEffectModel.cs | 10 ++++---- .../Modules/Games/Dota2/Dota2DataModel.cs | 23 +------------------ .../Modules/Games/Dota2/Dota2View.xaml | 7 +++--- 3 files changed, 9 insertions(+), 31 deletions(-) diff --git a/Artemis/Artemis/Modules/Effects/Debug/DebugEffectModel.cs b/Artemis/Artemis/Modules/Effects/Debug/DebugEffectModel.cs index c6577f2b9..dc3456ed9 100644 --- a/Artemis/Artemis/Modules/Effects/Debug/DebugEffectModel.cs +++ b/Artemis/Artemis/Modules/Effects/Debug/DebugEffectModel.cs @@ -34,13 +34,13 @@ namespace Artemis.Modules.Effects.Debug KeyboardRectangle = new KeyboardRectangle(MainManager.KeyboardManager.ActiveKeyboard, 0, 0, new List { - //Color.Red, - //Color.OrangeRed, - //Color.Yellow, + Color.Red, + Color.OrangeRed, + Color.Yellow, Color.Green, Color.Blue, - //Color.Purple, - //Color.DeepPink + Color.Purple, + Color.DeepPink }, LinearGradientMode.Horizontal); Initialized = true; diff --git a/Artemis/Artemis/Modules/Games/Dota2/Dota2DataModel.cs b/Artemis/Artemis/Modules/Games/Dota2/Dota2DataModel.cs index 2cfd1e871..39bacb414 100644 --- a/Artemis/Artemis/Modules/Games/Dota2/Dota2DataModel.cs +++ b/Artemis/Artemis/Modules/Games/Dota2/Dota2DataModel.cs @@ -85,6 +85,7 @@ public Ability1 ability1 { get; set; } public Ability2 ability2 { get; set; } public Ability3 ability3 { get; set; } + public Attributes attributes { get; set; } } @@ -132,28 +133,6 @@ public bool ultimate { get; set; } } - public class Ability4 - { - public string name { get; set; } - public int level { get; set; } - public bool can_cast { get; set; } - public bool passive { get; set; } - public bool ability_active { get; set; } - public int cooldown { get; set; } - public bool ultimate { get; set; } - } - - public class Ability5 - { - public string name { get; set; } - public int level { get; set; } - public bool can_cast { get; set; } - public bool passive { get; set; } - public bool ability_active { get; set; } - public int cooldown { get; set; } - public bool ultimate { get; set; } - } - public class Attributes { public int level { get; set; } diff --git a/Artemis/Artemis/Modules/Games/Dota2/Dota2View.xaml b/Artemis/Artemis/Modules/Games/Dota2/Dota2View.xaml index 39d4758a4..edadf0f70 100644 --- a/Artemis/Artemis/Modules/Games/Dota2/Dota2View.xaml +++ b/Artemis/Artemis/Modules/Games/Dota2/Dota2View.xaml @@ -6,8 +6,7 @@ xmlns:cal="http://www.caliburnproject.org" xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" - mc:Ignorable="d" - d:DesignHeight="495" d:DesignWidth="635"> + mc:Ignorable="d" d:DesignWidth="635" Height="515.691"> @@ -46,8 +45,8 @@ - - + +