DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Fixed Rocket League, fixed volume overlay

Browse Source
This commit is contained in:
SpoinkyNL 2016-01-29 22:21:44 +01:00
parent 1ba2db0bba
commit f158acbb14
11 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Artemis/Artemis/App.config
View File

@ -3,6 +3,7 @@
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="Artemis.Modules.Games.RocketLeague.RocketLeague" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Settings.Offsets" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Modules.Games.Witcher3.Witcher3" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Modules.Effects.AudioVisualizer.AudioVisualization" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
@ -21,6 +22,17 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<userSettings>
<Artemis.Modules.Games.RocketLeague.RocketLeague>
<setting name="Enabled" serializeAs="String">
<value>True</value>
</setting>
<setting name="MainColor" serializeAs="String">
<value>#FFFF5000</value>
</setting>
<setting name="SecondaryColor" serializeAs="String">
<value>#FFFF0000</value>
</setting>
</Artemis.Modules.Games.RocketLeague.RocketLeague>
<Artemis.Settings.Offsets>
<setting name="RocketLeague" serializeAs="String">
<value>{"Game":"RocketLeague","GameVersion":"1.10","GameAddresses":[{"Description":"Boost","BasePointer":{"value":21998084},"Offsets":[88,1452,1780,540]}]}</value>

2
Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveModel.cs
View File

@ -117,7 +117,7 @@ namespace Artemis.Modules.Effects.TypeWave
Waves.Add(Settings.IsRandomColors
? new Wave(new Point(keyMatch.PosX, keyMatch.PosY), 0, ColorHelpers.GetRandomRainbowColor())
: new Wave(new Point(keyMatch.PosX, keyMatch.PosY), 0,
ColorHelpers.MediaColorToDrawingColor(Settings.WaveColor)));
ColorHelpers.ToDrawingColor(Settings.WaveColor)));
}
}

4
Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs
View File

@ -145,8 +145,8 @@ namespace Artemis.Modules.Games.CounterStrike
AmmoRect.Width = ((int) Math.Floor((16/100.00)*ammoPercentage))*Scale;
AmmoRect.Colors = new List<Color>
{
ColorHelpers.MediaColorToDrawingColor(_counterStrikeSettings.AmmoMainColor),
ColorHelpers.MediaColorToDrawingColor(_counterStrikeSettings.AmmoSecondaryColor)
ColorHelpers.ToDrawingColor(_counterStrikeSettings.AmmoMainColor),
ColorHelpers.ToDrawingColor(_counterStrikeSettings.AmmoSecondaryColor)
};
// Low ammo indicator

4
Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.Designer.cs generated
View File

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Artemis.Settings {
namespace Artemis.Modules.Games.RocketLeague {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@ -25,7 +25,7 @@ namespace Artemis.Settings {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool Enabled {
get {
return ((bool)(this["Enabled"]));

6
Artemis/Artemis/Modules/Games/RocketLeague/RocketLeague.settings
View File

@ -1,11 +1,9 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
GeneratedClassNamespace="Artemis.Settings" GeneratedClassName="RocketLeague">
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Artemis.Modules.Games.RocketLeague" GeneratedClassName="RocketLeague">
<Profiles />
<Settings>
<Setting Name="Enabled" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="MainColor" Type="System.Windows.Media.Color" Scope="User">
<Value Profile="(Default)">#FFFF5000</Value>

24
Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs
View File

@ -17,9 +17,9 @@ namespace Artemis.Modules.Games.RocketLeague
public class RocketLeagueModel : GameModel
{
private readonly RocketLeagueSettings _settings;
private KeyboardRectangle _boostRect;
private int _boostAmount;
private bool _boostGrowing;
private KeyboardRectangle _boostRect;
private Memory _memory;
private GamePointersCollectionModel _pointer;
private int _previousBoost;
@ -45,13 +45,12 @@ namespace Artemis.Modules.Games.RocketLeague
{
_boostRect = new KeyboardRectangle(MainModel.ActiveKeyboard, 0, 0, new List<Color>
{
ColorHelpers.MediaColorToDrawingColor(_settings.MainColor),
ColorHelpers.MediaColorToDrawingColor(_settings.SecondaryColor)
ColorHelpers.ToDrawingColor(_settings.MainColor),
ColorHelpers.ToDrawingColor(_settings.SecondaryColor)
}, LinearGradientMode.Horizontal);
MemoryHelpers.GetPointers();
_pointer = JsonConvert
.DeserializeObject<GamePointersCollectionModel>(Offsets.Default.RocketLeague);
_pointer = JsonConvert.DeserializeObject<GamePointersCollectionModel>(Offsets.Default.RocketLeague);
var tempProcess = MemoryHelpers.GetProcessIfRunning(ProcessName);
_memory = new Memory(tempProcess);
@ -77,7 +76,12 @@ namespace Artemis.Modules.Games.RocketLeague
if (_boostAmount > 100)
_boostAmount = 100;
_boostRect.Width = (int) Math.Ceiling(((Scale*21)/100.00)*_boostAmount);
_boostRect.Width = (int) Math.Ceiling(((MainModel.ActiveKeyboard.Width*Scale)/100.00)*_boostAmount);
_boostRect.Colors = new List<Color>
{
ColorHelpers.ToDrawingColor(_settings.MainColor),
ColorHelpers.ToDrawingColor(_settings.SecondaryColor)
};
Task.Run(() => GrowIfHigher());
}
@ -94,7 +98,7 @@ namespace Artemis.Modules.Games.RocketLeague
var differenceStep = difference/amountOfSteps;
var differenceStepRest = difference%amountOfSteps;
_boostAmount = _previousBoost;
_boostRect.Width = (int) Math.Ceiling(((Scale*21)/100.00)*_boostAmount);
_boostRect.Width = (int) Math.Ceiling(((MainModel.ActiveKeyboard.Width*Scale)/100.00)*_boostAmount);
for (var i = 0; i < amountOfSteps; i++)
{
@ -102,10 +106,10 @@ namespace Artemis.Modules.Games.RocketLeague
{
differenceStepRest -= 1;
_boostAmount += 1;
_boostRect.Width = (int) Math.Ceiling(((Scale*21)/100.00)*_boostAmount);
_boostRect.Width = (int) Math.Ceiling(((MainModel.ActiveKeyboard.Width*Scale)/100.00)*_boostAmount);
}
_boostAmount += differenceStep;
_boostRect.Width = (int) Math.Ceiling(((Scale*21)/100.00)*_boostAmount);
_boostRect.Width = (int) Math.Ceiling(((MainModel.ActiveKeyboard.Width*Scale)/100.00)*_boostAmount);
Thread.Sleep(50);
}
@ -115,7 +119,7 @@ namespace Artemis.Modules.Games.RocketLeague
public override Bitmap GenerateBitmap()
{
var bitmap = new Bitmap(Scale*21, Scale*8);
var bitmap = MainModel.ActiveKeyboard.KeyboardBitmap(Scale);
using (var g = Graphics.FromImage(bitmap))
{

14
Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueSettings.cs
View File

@ -16,18 +16,18 @@ namespace Artemis.Modules.Games.RocketLeague
public override sealed void Load()
{
Enabled = Settings.RocketLeague.Default.Enabled;
MainColor = Settings.RocketLeague.Default.MainColor;
SecondaryColor = Settings.RocketLeague.Default.SecondaryColor;
Enabled = RocketLeague.Default.Enabled;
MainColor = RocketLeague.Default.MainColor;
SecondaryColor = RocketLeague.Default.SecondaryColor;
}
public override sealed void Save()
{
Settings.RocketLeague.Default.Enabled = Enabled;
Settings.RocketLeague.Default.MainColor = MainColor;
Settings.RocketLeague.Default.SecondaryColor = SecondaryColor;
RocketLeague.Default.Enabled = Enabled;
RocketLeague.Default.MainColor = MainColor;
RocketLeague.Default.SecondaryColor = SecondaryColor;
Settings.RocketLeague.Default.Save();
RocketLeague.Default.Save();
}
public override sealed void ToDefault()

13
Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplay.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Drawing2D;
using Artemis.Models;
@ -33,10 +32,14 @@ namespace Artemis.Modules.Overlays.VolumeDisplay
{
var volumeRect = new KeyboardRectangle(MainModel.ActiveKeyboard, 0, 0, new List<Color>
{
ColorHelpers.MediaColorToDrawingColor(Settings.MainColor),
ColorHelpers.MediaColorToDrawingColor(Settings.SecondaryColor)
ColorHelpers.ToDrawingColor(Settings.SecondaryColor),
ColorHelpers.ToDrawingColor(Settings.MainColor)
},
LinearGradientMode.Horizontal);
LinearGradientMode.Horizontal)
{
Width = (int) (100.00/(MainModel.ActiveKeyboard.Width*4)*Volume),
ContainedBrush = false
};
volumeRect.Draw(g);
}
}

2
Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayModel.cs
View File

@ -72,7 +72,7 @@ namespace Artemis.Modules.Overlays.VolumeDisplay
public override Bitmap GenerateBitmap()
{
return GenerateBitmap(new Bitmap(21, 6));
return GenerateBitmap(MainModel.ActiveKeyboard.KeyboardBitmap(4));
}
public override Bitmap GenerateBitmap(Bitmap bitmap)

4
Artemis/Artemis/Utilities/ColorHelpers.cs
View File

@ -70,12 +70,12 @@ namespace Artemis.Utilities
return i;
}
public static Color MediaColorToDrawingColor(System.Windows.Media.Color mColor)
public static Color ToDrawingColor(System.Windows.Media.Color mColor)
{
return Color.FromArgb(mColor.A, mColor.R, mColor.G, mColor.B);
}
public static System.Windows.Media.Color DrawingColorToMediaColor(Color dColor)
public static System.Windows.Media.Color ToMediaColor(Color dColor)
{
return System.Windows.Media.Color.FromArgb(dColor.A, dColor.R, dColor.G, dColor.B);
}

10
Artemis/Artemis/Utilities/Keyboard/KeyboardRectangle.cs
View File

@ -32,15 +32,15 @@ namespace Artemis.Utilities.Keyboard
_rotationProgress = 0;
_blinkWorker.DoWork += BlinkWorker_DoWork;
X = x;
Y = y;
Width = keyboard.Width;
Height = keyboard.Height;
Scale = 4;
X = x*Scale;
Y = y*Scale;
Width = keyboard.Width*Scale;
Height = keyboard.Height*Scale;
Visible = true;
Opacity = 255;
ContainedBrush = true;
Scale = 4;
GradientMode = gradientMode;
Rotate = false;
LoopSpeed = 1;