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 files I messed up while merging

Browse Source
This commit is contained in:
SpoinkyNL 2016-04-25 18:22:16 +02:00
parent 38a2dc64e4
commit 9d966b9321
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Artemis/Artemis/ArtemisBootstrapper.cs
View File

@ -1,5 +1,6 @@
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Forms; using System.Windows.Forms;
@ -9,6 +10,7 @@ using Caliburn.Micro;
using Caliburn.Micro.Autofac; using Caliburn.Micro.Autofac;
using Application = System.Windows.Application; using Application = System.Windows.Application;
using MessageBox = System.Windows.Forms.MessageBox; using MessageBox = System.Windows.Forms.MessageBox;
using MouseEventArgs = System.Windows.Input.MouseEventArgs;
namespace Artemis namespace Artemis
{ {
@ -20,17 +22,17 @@ namespace Artemis
Initialize(); Initialize();
MessageBinder.SpecialValues.Add("$scaledmousex", (ctx) => MessageBinder.SpecialValues.Add("$scaledmousex", ctx =>
{ {
var img = ctx.Source as Image; var img = ctx.Source as Image;
var input = ctx.Source as IInputElement; var input = ctx.Source as IInputElement;
var e = ctx.EventArgs as System.Windows.Input.MouseEventArgs; var e = ctx.EventArgs as MouseEventArgs;
// If there is an image control, get the scaled position // If there is an image control, get the scaled position
if (img != null && e != null) if (img != null && e != null)
{ {
Point position = e.GetPosition(img); var position = e.GetPosition(img);
return (int)(img.Source.Width * (position.X / img.ActualWidth)); return (int) (img.Source.Width*(position.X/img.ActualWidth));
} }
// If there is another type of of IInputControl get the non-scaled position - or do some processing to get a scaled position, whatever needs to happen // If there is another type of of IInputControl get the non-scaled position - or do some processing to get a scaled position, whatever needs to happen
@ -40,17 +42,17 @@ namespace Artemis
// Return 0 if no processing could be done // Return 0 if no processing could be done
return 0; return 0;
}); });
MessageBinder.SpecialValues.Add("$scaledmousey", (ctx) => MessageBinder.SpecialValues.Add("$scaledmousey", ctx =>
{ {
var img = ctx.Source as Image; var img = ctx.Source as Image;
var input = ctx.Source as IInputElement; var input = ctx.Source as IInputElement;
var e = ctx.EventArgs as System.Windows.Input.MouseEventArgs; var e = ctx.EventArgs as MouseEventArgs;
// If there is an image control, get the scaled position // If there is an image control, get the scaled position
if (img != null && e != null) if (img != null && e != null)
{ {
Point position = e.GetPosition(img); var position = e.GetPosition(img);
return (int)(img.Source.Width * (position.Y / img.ActualWidth)); return (int) (img.Source.Width*(position.Y/img.ActualWidth));
} }
// If there is another type of of IInputControl get the non-scaled position - or do some processing to get a scaled position, whatever needs to happen // If there is another type of of IInputControl get the non-scaled position - or do some processing to get a scaled position, whatever needs to happen
@ -79,14 +81,13 @@ namespace Artemis
private void CheckDuplicateInstances() private void CheckDuplicateInstances()
{ {
var processes = Process.GetProcesses(); if (Process.GetProcesses().Count(p => p.ProcessName.Contains(Assembly.GetExecutingAssembly()
if (processes.Count(p => p.ProcessName == "Artemis") < 2) .FullName.Split(',')[0]) && !p.Modules[0].FileName.Contains("vshost")) < 2)
return; return;
MessageBox.Show("An instance of Artemis is already running (check your system tray).", MessageBox.Show("An instance of Artemis is already running (check your system tray).",
"Artemis (╯°□°）╯︵ ┻━┻", MessageBoxButtons.OK, MessageBoxIcon.Warning); "Artemis (╯°□°）╯︵ ┻━┻", MessageBoxButtons.OK, MessageBoxIcon.Warning);
Application.Current.Shutdown(); Application.Current.Shutdown();
} }
} }
} }

10
pointers.json
View File

@ -2,17 +2,17 @@
[ [
{ {
"Game":"RocketLeague", "Game":"RocketLeague",
"GameVersion":"1.15", "GameVersion":"1.16",
"GameAddresses":[ "GameAddresses":[
{ {
"Description":"Boost", "Description":"Boost",
"BasePointer":{ "BasePointer":{
"value":22555396 "value":22411984
}, },
"Offsets":[ "Offsets":[
180, 1632,
260, 64,
800, 1636,
1800, 1800,
540 540
] ]