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

RL stuff, this resolves #20

Browse Source
This commit is contained in:
SpoinkyNL 2016-02-21 12:11:51 +01:00
parent 944d9ef0b7
commit 705d2043d8
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,21 @@ namespace Artemis.Modules.Games.RocketLeague
MemoryHelpers.GetPointers(); MemoryHelpers.GetPointers();
_pointer = JsonConvert.DeserializeObject<GamePointersCollectionModel>(Offsets.Default.RocketLeague); _pointer = JsonConvert.DeserializeObject<GamePointersCollectionModel>(Offsets.Default.RocketLeague);
//var test =
// JsonConvert.SerializeObject(new List<GamePointersCollectionModel>
// {
// new GamePointersCollectionModel
// {
// Game = "RocketLeague",
// GameVersion = "1.12",
// GameAddresses = new List<GamePointer> {new GamePointer
// {
// Description = "Boost",
// BasePointer = new IntPtr(0x01581AF4),
// Offsets = new []{0xB4, 0x104, 0x320, 0x708, 0x21C}
// }}
// }
// });
var tempProcess = MemoryHelpers.GetProcessIfRunning(ProcessName); var tempProcess = MemoryHelpers.GetProcessIfRunning(ProcessName);
_memory = new Memory(tempProcess); _memory = new Memory(tempProcess);
} }
@ -120,6 +135,8 @@ namespace Artemis.Modules.Games.RocketLeague
public override Bitmap GenerateBitmap() public override Bitmap GenerateBitmap()
{ {
var bitmap = MainModel.ActiveKeyboard.KeyboardBitmap(Scale); var bitmap = MainModel.ActiveKeyboard.KeyboardBitmap(Scale);
if (_boostRect == null)
return null;
using (var g = Graphics.FromImage(bitmap)) using (var g = Graphics.FromImage(bitmap))
{ {

13
Artemis/Artemis/Utilities/Memory/MemoryHelpers.cs
View File

@ -52,12 +52,12 @@ namespace Artemis.Utilities.Memory
try try
{ {
var jsonClient = new WebClient(); var jsonClient = new WebClient();
var json = jsonClient // Random number to get around cache issues
.DownloadString("https://raw.githubusercontent.com/SpoinkyNL/Artemis/master/pointers.json"); var rand = new Random(DateTime.Now.Millisecond);
var json = jsonClient.DownloadString("https://raw.githubusercontent.com/SpoinkyNL/Artemis/master/pointers.json?random=" + rand.Next());
// Get a list of pointers // Get a list of pointers
var pointers = JsonConvert.DeserializeObject<List<GamePointersCollectionModel>>(json); var pointers = JsonConvert.DeserializeObject<List<GamePointersCollectionModel>>(json);
// Assign each pointer to the settings file // Assign each pointer to the settings file
var rlPointers = JsonConvert.SerializeObject(pointers.FirstOrDefault(p => p.Game == "RocketLeague")); var rlPointers = JsonConvert.SerializeObject(pointers.FirstOrDefault(p => p.Game == "RocketLeague"));
if (rlPointers != null) if (rlPointers != null)
@ -65,13 +65,6 @@ namespace Artemis.Utilities.Memory
Offsets.Default.RocketLeague = rlPointers; Offsets.Default.RocketLeague = rlPointers;
Offsets.Default.Save(); Offsets.Default.Save();
} }
var witcherPointers = JsonConvert.SerializeObject(pointers.FirstOrDefault(p => p.Game == "Witcher3"));
if (witcherPointers != null)
{
Offsets.Default.Witcher3 = witcherPointers;
Offsets.Default.Save();
}
} }
catch (Exception) catch (Exception)
{ {