Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Dota 2 Layout + Added Rust integration via Razer Chroma SDK #2344

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Update Dota 2 Layout + Added Rust integration via Razer Chroma SDK #2344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ccf041
Dota 2 Added Backpack and bug fixes
Crapy Sep 1, 2021
9b62215
Changed to CamelCase
Crapy Sep 1, 2021
d429144
Added Rust integration with Razer Chroma SDK
Sep 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,4 @@ Project-Aurora/.idea/*
Project-Aurora/Project-Aurora/Resources/Win64/

Project-Aurora/Project-Aurora/Resources/Win32/
/NZXTSharp
4 changes: 2 additions & 2 deletions Project-Aurora/Aurora-LightFXWrapper/Aurora-LightFXWrapper.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ProjectGuid>{A759300D-9550-47BA-8616-C24B6BC05A02}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>AuroraLightFXWrapper</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -193,4 +193,4 @@
<Target Name="AfterBuild">
<MSBuild Condition=" '$(Platform)' == 'x64' " Projects="$(MSBuildProjectFile)" Properties="Platform=Win32;PlatFormTarget=Win32" RunEachTargetSeparately="true" />
</Target>
</Project>
</Project>
4 changes: 2 additions & 2 deletions Project-Aurora/Aurora-LogiLEDWrapper/Aurora-LogiLEDWrapper.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ProjectGuid>{20259BE1-55C9-4EFB-9D30-C933F621B9D4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>AuroraLogiLEDWrapper</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -198,4 +198,4 @@
<Target Name="AfterBuild">
<MSBuild Condition=" '$(Platform)' == 'x64' " Projects="$(MSBuildProjectFile)" Properties="Platform=Win32;PlatFormTarget=Win32" RunEachTargetSeparately="true" />
</Target>
</Project>
</Project>
4 changes: 2 additions & 2 deletions Project-Aurora/Aurora-RazerLEDWrapper/Aurora-RazerLEDWrapper.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ProjectGuid>{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>AuroraRazerLEDWrapper</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -193,4 +193,4 @@
<Target Name="AfterBuild">
<MSBuild Condition=" '$(Platform)' == 'x64' " Projects="$(MSBuildProjectFile)" Properties="Platform=Win32;PlatFormTarget=Win32" RunEachTargetSeparately="true" />
</Target>
</Project>
</Project>
37 changes: 19 additions & 18 deletions Project-Aurora/Project-Aurora/Profiles/Dota 2/GSI/Nodes/Items.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class Items_Dota2 : Node
/// <summary>
/// Gets the array of the inventory items
/// </summary>
[Range(0, 5)]
[Range(0, 8)]
public Item[] InventoryItems
{
get { return inventory.ToArray(); }
Expand All @@ -42,12 +42,13 @@ public Item[] StashItems
internal Items_Dota2(string json_data) : base(json_data)
{
List<string> slots = _ParsedData.Properties().Select(p => p.Name).ToList();
foreach (string item_slot in slots)

foreach (string ItemSlot in slots)
{
if (item_slot.StartsWith("slot"))
this.inventory.Add(new Item(_ParsedData[item_slot].ToString()));
else
this.stash.Add(new Item(_ParsedData[item_slot].ToString()));
if (ItemSlot.StartsWith("slot"))
this.inventory.Add(new Item(_ParsedData[ItemSlot].ToString()));
else if(ItemSlot.StartsWith("stash"))
this.stash.Add(new Item(_ParsedData[ItemSlot].ToString()));
}
}

Expand Down Expand Up @@ -80,13 +81,13 @@ public Item GetStashAt(int index)
/// <summary>
/// Checks if item exists in the inventory
/// </summary>
/// <param name="itemname">The item name</param>
/// <param name="itemName">The item name</param>
/// <returns>A boolean if item is in the inventory</returns>
public bool InventoryContains(string itemname)
public bool InventoryContains(string ItemName)
{
foreach(Item inventory_item in this.inventory)
foreach(Item InventoryItem in this.inventory)
{
if (inventory_item.Name.Equals(itemname))
if (InventoryItem.Name.Equals(ItemName))
return true;
}

Expand All @@ -98,11 +99,11 @@ public bool InventoryContains(string itemname)
/// </summary>
/// <param name="itemname">The item name</param>
/// <returns>A boolean if item is in the stash</returns>
public bool StashContains(string itemname)
public bool StashContains(string ItemName)
{
foreach (Item stash_item in this.stash)
foreach (Item StashItem in this.stash)
{
if (stash_item.Name.Equals(itemname))
if (StashItem.Name.Equals(ItemName))
return true;
}

Expand All @@ -112,13 +113,13 @@ public bool StashContains(string itemname)
/// <summary>
/// Gets index of the first occurence of the item in the inventory
/// </summary>
/// <param name="itemname">The item name</param>
/// <param name="itemName">The item name</param>
/// <returns>The first index at which item is found, -1 if not found.</returns>
public int InventoryIndexOf(string itemname)
public int InventoryIndexOf(string ItemName)
{
for (int x = 0; x < this.inventory.Count; x++)
{
if (this.inventory[x].Name.Equals(itemname))
if (this.inventory[x].Name.Equals(ItemName))
return x;
}

Expand All @@ -130,11 +131,11 @@ public int InventoryIndexOf(string itemname)
/// </summary>
/// <param name="itemname">The item name</param>
/// <returns>The first index at which item is found, -1 if not found.</returns>
public int StashIndexOf(string itemname)
public int StashIndexOf(string ItemName)
{
for (int x = 0; x < this.stash.Count; x++)
{
if (this.stash[x].Name == itemname)
if (this.stash[x].Name == ItemName)
return x;
}

Expand Down
34 changes: 32 additions & 2 deletions Project-Aurora/Project-Aurora/Profiles/Dota 2/Layers/Control_Dota2ItemLayer.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aurora.Profiles.Dota_2.Layers"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" x:Class="Aurora.Profiles.Dota_2.Layers.Control_Dota2ItemLayer"
mc:Ignorable="d" Loaded="UserControl_Loaded">
mc:Ignorable="d" Loaded="UserControl_Loaded" Height="173.701">
<Grid>
<xctk:ColorPicker x:Name="ColorPicker_Item_Empty" Margin="91,0,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="152" ColorMode="ColorCanvas" UsingAlphaChannel="True" SelectedColorChanged="ColorPicker_Item_Empty_SelectedColorChanged" />
<Label HorizontalAlignment="Left" Margin="0,3,0,0" Padding="0" Content="Item slot empty:" VerticalAlignment="Top"/>
<xctk:ColorPicker x:Name="ColorPicker_Item_Cooldown" Margin="136,29,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="107" ColorMode="ColorCanvas" UsingAlphaChannel="True" SelectedColorChanged="ColorPicker_Item_Cooldown_SelectedColorChanged" />
<Label HorizontalAlignment="Left" Margin="0,32,0,0" Padding="0" Content="Item on cooldown Color:" VerticalAlignment="Top"/>
<GroupBox Header="Inventory &amp; Stash Keys" HorizontalAlignment="Left" Margin="248,0,0,0" VerticalAlignment="Top" Height="102" Width="256" BorderBrush="DimGray">
<GroupBox Header="Inventory &amp; Stash Keys" HorizontalAlignment="Left" Margin="248,0,0,0" VerticalAlignment="Top" Height="166" Width="256" BorderBrush="DimGray" RenderTransformOrigin="0.5,0.5">
<GroupBox.RenderTransform>
<TransformGroup>
<ScaleTransform/>
<SkewTransform AngleX="-0.095"/>
<RotateTransform/>
<TranslateTransform X="-0.122"/>
</TransformGroup>
</GroupBox.RenderTransform>
<Grid Margin="0,0,0,0">
<Border BorderBrush="Gray" BorderThickness="1" HorizontalAlignment="Left" Margin="12,10,0,0" VerticalAlignment="Top" CornerRadius="5">
<TextBlock x:Name="item_slot1_textblock" TextWrapping="Wrap" Width="30" Height="30" FontWeight="Bold" TextAlignment="Center" Text="KEY" MouseDown="item_slot1_textblock_MouseDown" FontSize="9"/>
Expand All @@ -32,6 +40,18 @@
<TextBlock x:Name="item_slot6_textblock" TextWrapping="Wrap" Width="30" Height="30" FontWeight="Bold" TextAlignment="Center" Text="KEY" MouseDown="item_slot6_textblock_MouseDown" FontSize="9"/>
</Border>

<Border BorderBrush="Gray" BorderThickness="1" HorizontalAlignment="Left" Margin="12,94,0,0" VerticalAlignment="Top" CornerRadius="5">
<TextBlock x:Name="item_slot7_textblock" TextWrapping="Wrap" Width="30" Height="30" FontWeight="Bold" TextAlignment="Center" Text="KEY" MouseDown="item_slot7_textblock_MouseDown" FontSize="9"/>
</Border>

<Border BorderBrush="Gray" BorderThickness="1" HorizontalAlignment="Left" Margin="49,94,0,0" VerticalAlignment="Top" CornerRadius="5">
<TextBlock x:Name="item_slot8_textblock" TextWrapping="Wrap" Width="30" Height="30" FontWeight="Bold" TextAlignment="Center" Text="KEY" MouseDown="item_slot8_textblock_MouseDown" FontSize="9"/>
</Border>

<Border BorderBrush="Gray" BorderThickness="1" HorizontalAlignment="Left" Margin="86,94,0,0" VerticalAlignment="Top" CornerRadius="5">
<TextBlock x:Name="item_slot9_textblock" TextWrapping="Wrap" Width="30" Height="30" FontWeight="Bold" TextAlignment="Center" Text="KEY" MouseDown="item_slot9_textblock_MouseDown" FontSize="9"/>
</Border>


<Border BorderBrush="Gray" BorderThickness="1" HorizontalAlignment="Left" Margin="135,10,0,0" VerticalAlignment="Top" CornerRadius="5">
<TextBlock x:Name="stash_slot1_textblock" TextWrapping="Wrap" Width="30" Height="30" FontWeight="Bold" TextAlignment="Center" Text="KEY" MouseDown="stash_slot1_textblock_MouseDown" FontSize="9"/>
Expand Down Expand Up @@ -71,6 +91,16 @@
</TransformGroup>
</Label.RenderTransform>
</Label>
<Label Content="Backpack" HorizontalAlignment="Left" Margin="-27,97,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5">
<Label.RenderTransform>
<TransformGroup>
<ScaleTransform/>
<SkewTransform/>
<RotateTransform Angle="-90"/>
<TranslateTransform/>
</TransformGroup>
</Label.RenderTransform>
</Label>
</Grid>
</GroupBox>
<xctk:ColorPicker x:Name="ColorPicker_Item_NoCharges" Margin="125,58,0,0" Height="24" VerticalAlignment="Top" HorizontalAlignment="Left" Width="118" ColorMode="ColorCanvas" UsingAlphaChannel="True" SelectedColorChanged="ColorPicker_Item_NoCharges_SelectedColorChanged" />
Expand Down
Loading