Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/DavidVTurley/Fuel-App-ACC
Browse files Browse the repository at this point in the history
  • Loading branch information
@DavidVTurley
DavidVTurley committed Mar 27, 2021
2 parents 68002cb + 9ff9b34 commit d6305ce
Show file tree
Hide file tree
Showing 7 changed files with 345 additions and 28 deletions.
12 changes: 9 additions & 3 deletions Fuel calculator/Fuel calculator.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,19 @@
<Resource Include="Logo.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="Xml\Cars.xml" />
<Resource Include="Xml\Cars.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
</ItemGroup>
<ItemGroup>
<Resource Include="Xml\Tracks.xml" />
<AdditionalFiles Include="Xml\Tracks.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</AdditionalFiles>
</ItemGroup>
<ItemGroup>
<Resource Include="Xml\CarTrackCombo.xml" />
<AdditionalFiles Include="Xml\CarTrackCombo.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</AdditionalFiles>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xml deserializer\Xml deserializer\Xml deserializer.csproj">
Expand Down
28 changes: 18 additions & 10 deletions Fuel calculator/Xml/CarTrackCombo.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<Car_Track_Combo>
<Car>
[XmlElement("Name")] public Int32 Name;
[XmlElement("Max_fuel")] public Int32 MaxFuel;
</Car>
<track>
<Name></Name>
</track>
</Car_Track_Combo>
<?xml version="1.0" encoding="utf-8"?>

<SavedCombinations>
<CarTrackCombo>
<Car>
<Id>0</Id>
<Name>Bmw</Name>
<FuelPerLap></FuelPerLap>
<MaxFuel></MaxFuel>
</Car>
<Track>
<Id>0</Id>
<Name>Silverstone</Name>
</Track>

<FuelPerLap>1.2</FuelPerLap>
</CarTrackCombo>
</SavedCombinations>
189 changes: 188 additions & 1 deletion Fuel calculator/Xml/Cars.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1,188 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8" ?>
<Cars>
<Car>
<Id>0</Id>
<Name>AMR V12 Vantage GT3</Name>
<MaxFuel>132</MaxFuel>
</Car>
<Car>
<Id>1</Id>
<Name>AMR V8 Vantage GT3</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>2</Id>
<Name>Audi R8 LMS</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>3</Id>
<Name>Audi R8 LMS Evo</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>4</Id>
<Name>Bentley Continental GT3 2015</Name>
<MaxFuel>132</MaxFuel>
</Car>
<Car>
<Id>5</Id>
<Name>Bentley Continental GT3 2018</Name>
<MaxFuel>132</MaxFuel>
</Car>
<Car>
<Id>6</Id>
<Name>BMW M6 GT3</Name>
<MaxFuel>125</MaxFuel>
</Car>
<Car>
<Id>7</Id>
<Name>Emil Frey Jaguar G3</Name>
<MaxFuel>119</MaxFuel>
</Car>
<Car>
<Id>8</Id>
<Name>Ferrari 488 GT3</Name>
<MaxFuel>110</MaxFuel>
</Car>
<Car>
<Id>9</Id>
<Name>Ferrari 488 GT3 Evo</Name>
<MaxFuel>110</MaxFuel>
</Car>
<Car>
<Id>10</Id>
<Name>Honda NSX GT3</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>11</Id>
<Name>Honda NSX GT3 Evo</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>12</Id>
<Name>Lamborghini Hurcan GT3</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>13</Id>
<Name>Lamborghini Huracan GT3 Evo</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>14</Id>
<Name>Lamborghini Huracan ST</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>15</Id>
<Name>Lexus RC GT3</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>16</Id>
<Name>McLarren 650S GT3</Name>
<MaxFuel>125</MaxFuel>
</Car>
<Car>
<Id>17</Id>
<Name>McLarren 720S GT3</Name>
<MaxFuel>125</MaxFuel>
</Car>
<Car>
<Id>18</Id>
<Name>Mercedes AMG GT3</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>19</Id>
<Name>Mercedes AMG GT3 2020</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>20</Id>
<Name>Nissan GT-R Nismo GT3 2015</Name>
<MaxFuel>132</MaxFuel>
</Car>
<Car>
<Id>21</Id>
<Name>Nissan GT-R Nismo GT3 2018</Name>
<MaxFuel>132</MaxFuel>
</Car>
<Car>
<Id>22</Id>
<Name>Porsche 991 GT3-R</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>23</Id>
<Name>Porsche 991 II GT3 R</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>24</Id>
<Name>Porsche 991 GT3 Cup</Name>
<MaxFuel>100</MaxFuel>
</Car>
<Car>
<Id>25</Id>
<Name>Reiter Engineering R-EX GT3</Name>
<MaxFuel>130</MaxFuel>
</Car>
<Car>
<Id>26</Id>
<Name>Alpine A110 GT4</Name>
<MaxFuel>95</MaxFuel>
</Car>
<Car>
<Id>27</Id>
<Name>Aston Martin Vantage GT4</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>28</Id>
<Name>Audi R8 LMS GT4</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>29</Id>
<Name>BMW M4 GT4</Name>
<MaxFuel>127</MaxFuel>
</Car>
<Car>
<Id>30</Id>
<Name>Chevrolet Camaro GT4R</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>31</Id>
<Name>Ginetta G55 GT4</Name>
<MaxFuel>107</MaxFuel>
</Car>
<Car>
<Id>32</Id>
<Name>KTM X-Bow GT4</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>33</Id>
<Name>Maserati MC GT4</Name>
<MaxFuel>110</MaxFuel>
</Car>
<Car>
<Id>34</Id>
<Name>Mclaren 570S GT4</Name>
<MaxFuel>110</MaxFuel>
</Car>
<Car>
<Id>35</Id>
<Name>Mercedes AMG GT4</Name>
<MaxFuel>120</MaxFuel>
</Car>
<Car>
<Id>36</Id>
<Name>Porsche 718 Cayman GT4 Clubsport</Name>
<MaxFuel>115</MaxFuel>
</Car>
</Cars>
22 changes: 19 additions & 3 deletions Fuel calculator/Xml/Objects/Car.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System;
using System.CodeDom;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
Expand All @@ -8,9 +10,23 @@
namespace Fuel_calculator.Xml.Objects
{
[XmlRoot("Car")]
class Car
public class Car
{
[XmlElement("Name")] public Int32 Name;
[XmlElement("Max_fuel")] public Int32 MaxFuel;
[XmlElement("Id")] public Int32 Id;
[XmlElement("Name")] public String Name;
[XmlElement("MaxFuel")] public Int32 MaxFuel;
}

[XmlRoot("Cars")]
public class Cars
{
[XmlElement("Car")] public List<Car> Name;


public static Cars LoadCarsFromXml()
{
return Xml_deserializer.Xml.Deserialize<Cars>(Directory.GetCurrentDirectory() + "\\Xml\\Cars.xml");
}
}

}
16 changes: 14 additions & 2 deletions Fuel calculator/Xml/Objects/Track.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
Expand All @@ -8,8 +9,19 @@
namespace Fuel_calculator.Xml.Objects
{
[XmlRoot("Track")]
class Track
public class Track
{
[XmlElement("Name")] public Int32 Name;
[XmlElement("Name")] public String Name;
}

public class Tracks
{
[XmlElement("Track")] public List<Track> Track;


public static Tracks LoadTracksFromXml()
{
return Xml_deserializer.Xml.Deserialize<Tracks>(Directory.GetCurrentDirectory() + "\\Xml\\Tracks.xml");
}
}
}
26 changes: 18 additions & 8 deletions Fuel calculator/Xml/Objects/TrackCarCombo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Windows.Documents;
using System.Xml.Serialization;

namespace Fuel_calculator.Xml.Objects
{
public class TrackCarCombo
[XmlRoot("Car_Track_Combo")]
public class CarTrackCombo
{
[XmlRoot("Car_Track_Combo")]
class CarTrackCombo
{
[XmlElement("Track")] public Track Track;
[XmlElement("Car")] public Car Car;
[XmlElement("Track")] public Track Track;
[XmlElement("Car")] public Car Car;
}

[XmlRoot("SavedCombinations")]
public class SavedCombinations
{
[XmlElement("CarTrackCombo")] public List<CarTrackCombo> CarTrackCombo;
[XmlElement("FuelPerLap")] public Single FuelPerLap;


[XmlElement("Avarage_Lap_Time")] public Car AverageLapTime;
[XmlElement("Fuel_Per_Lap")] public Car FuelPerLap;
public static SavedCombinations LoadCarTrackComboFromXml()
{
return Xml_deserializer.Xml.Deserialize<SavedCombinations>(Directory.GetCurrentDirectory() + "\\Xml\\CarTrackCombo.xml");
}
}
}
Loading

0 comments on commit d6305ce

Please sign in to comment.