DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-31 17:53:32 +00:00
Code Issues Releases Wiki Activity

Eurotruck fixes

Browse Source
This commit is contained in:
SpoinkyNL 2017-01-24 12:17:22 +01:00
parent ab17119fbb
commit f090246c2b
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Artemis/Artemis/Modules/Abstract/ModuleModel.cs
View File

@ -205,6 +205,10 @@ namespace Artemis.Modules.Abstract
_lastTrace = DateTime.Now; _lastTrace = DateTime.Now;
var dmJson = JsonConvert.SerializeObject(DataModel, Formatting.Indented); var dmJson = JsonConvert.SerializeObject(DataModel, Formatting.Indented);
Logger.Trace("Effect datamodel as JSON: \r\n{0}", dmJson); Logger.Trace("Effect datamodel as JSON: \r\n{0}", dmJson);
if (layers == null)
return;
Logger.Trace("Effect {0} has to render {1} layers", Name, layers.Count); Logger.Trace("Effect {0} has to render {1} layers", Name, layers.Count);
foreach (var renderLayer in layers) foreach (var renderLayer in layers)
Logger.Trace("- Layer name: {0}, layer type: {1}", renderLayer.Name, renderLayer.LayerType); Logger.Trace("- Layer name: {0}, layer type: {1}", renderLayer.Name, renderLayer.LayerType);

9
Artemis/Artemis/Modules/Games/EurotruckSimulator2/EurotruckSimulator2DataModel.cs
View File

@ -17,10 +17,17 @@ namespace Artemis.Modules.Games.EurotruckSimulator2
UserData.RegisterType<IEts2Truck>(); UserData.RegisterType<IEts2Truck>();
} }
public TruckSimulatorGameName GameName { get; set; }
public IEts2Game Game { get; set; } public IEts2Game Game { get; set; }
public IEts2Job Job { get; set; } public IEts2Job Job { get; set; }
public IEts2Navigation Navigation { get; set; } public IEts2Navigation Navigation { get; set; }
public IEts2Trailer Trailer { get; set; } public IEts2Trailer Trailer { get; set; }
public IEts2Truck Truck { get; set; } public IEts2Truck Truck { get; set; }
public enum TruckSimulatorGameName
{
EuroTruckSimulator2,
AmericanTruckSimulator
}
} }
} }

15
Artemis/Artemis/Modules/Games/EurotruckSimulator2/EurotruckSimulator2Model.cs
View File

@ -7,6 +7,8 @@ using Artemis.Modules.Games.EurotruckSimulator2.Data;
using Artemis.Properties; using Artemis.Properties;
using Artemis.Services; using Artemis.Services;
using Artemis.Utilities; using Artemis.Utilities;
using Artemis.Utilities.Memory;
using static Artemis.Modules.Games.EurotruckSimulator2.EurotruckSimulator2DataModel;
namespace Artemis.Modules.Games.EurotruckSimulator2 namespace Artemis.Modules.Games.EurotruckSimulator2
{ {
@ -35,9 +37,18 @@ namespace Artemis.Modules.Games.EurotruckSimulator2
public override void Update() public override void Update()
{ {
var etsProcess = MemoryHelpers.GetProcessIfRunning("eurotrucks2");
var atsProcess = MemoryHelpers.GetProcessIfRunning("amtrucks");
if (etsProcess == null && atsProcess == null)
return;
var dataModel = (EurotruckSimulator2DataModel) DataModel; var dataModel = (EurotruckSimulator2DataModel) DataModel;
var telemetryData = Ets2TelemetryDataReader.Instance.Read(); var telemetryData = Ets2TelemetryDataReader.Instance.Read();
dataModel.GameName = etsProcess != null
? TruckSimulatorGameName.EuroTruckSimulator2
: TruckSimulatorGameName.AmericanTruckSimulator;
dataModel.Game = telemetryData.Game; dataModel.Game = telemetryData.Game;
dataModel.Job = telemetryData.Job; dataModel.Job = telemetryData.Job;
dataModel.Navigation = telemetryData.Navigation; dataModel.Navigation = telemetryData.Navigation;
@ -64,10 +75,10 @@ namespace Artemis.Modules.Games.EurotruckSimulator2
public void FindAtsGameDir() public void FindAtsGameDir()
{ {
// Demo is also supported but resides in a different directory, the full game can also be 64-bits // Demo is also supported but resides in a different directory, the full game can also be 32-bits (I think)
var dir = GeneralHelpers.FindSteamGame(@"\American Truck Simulator\bin\win_x64\amtrucks.exe") ?? var dir = GeneralHelpers.FindSteamGame(@"\American Truck Simulator\bin\win_x64\amtrucks.exe") ??
GeneralHelpers.FindSteamGame(@"\American Truck Simulator\bin\win_x86\amtrucks.exe") ?? GeneralHelpers.FindSteamGame(@"\American Truck Simulator\bin\win_x86\amtrucks.exe") ??
GeneralHelpers.FindSteamGame(@"\American Truck Simulator Demo\bin\win_x86\amtrucks.exe"); GeneralHelpers.FindSteamGame(@"\American Truck Simulator Demo\bin\win_x64\amtrucks.exe");
if (string.IsNullOrEmpty(dir)) if (string.IsNullOrEmpty(dir))
return; return;

1
Artemis/Artemis/ViewModels/Profiles/LayerConditionViewModel.cs
View File

@ -226,6 +226,7 @@ namespace Artemis.ViewModels.Profiles
} }
else if (SelectedDataModelProp.EnumValues != null) else if (SelectedDataModelProp.EnumValues != null)
{ {
Enums.Clear();
Enums.AddRange(SelectedDataModelProp.EnumValues); Enums.AddRange(SelectedDataModelProp.EnumValues);
EnumValueIsVisible = true; EnumValueIsVisible = true;
} }