Added Refuel Amount. Closes #51

Jonas · Jonas · commit d079bac5580f · 2019-10-30T12:46:55.000+01:00
This really close 52 but i closed it in the last commit. So know 51 for the last commit.
diff --git a/README.md b/README.md
@@ -301,6 +301,8 @@ New stuff is marked with the <ins>inserted</ins> Tag.
 │    │    ├── Navigation Distance
 │    │    ├── Navigation Time
 │    │    └── Speed Limit
+│    ├── <strong>Refuel</strong>:
+│    │    ├── <ins>Amount</ins>  (see changelog update 10.4 for some notes to that)
 │    ├── <strong>SpecialEvents</strong>:
 │    │    ├── On Job
 │    │    ├── Job Cancelled (1.14/1.01/1.35) (may not work atm?)
diff --git a/changelog.md b/changelog.md
@@ -5,7 +5,12 @@
 - Update `Readme.md`
 - Change `update.md` to `changelog.md`
 - Add `refuel end` event and change `refuel` to `refuel start`
-- ADd `refuel payed` event. Instead to fire when you stop refuel like `refuel end` it will fired when you start the engine. Also this is the event for the later coming `refuel amount` value.
+- Add `refuel payed` event. Instead to fire when you stop refuel like `refuel end` it will fired when you start the engine. Also this is the event for the later coming `refuel amount` value.
+- Add `refuel amount`. After the `refuel payed` event this value contains the amount of fuel that was refueled between the `refuel start` and `refuel payed` event.
+  - This value could be a bit different to the in-game value, but most of the time it should be really similar. **NOTE:** if you pay in game, but didn't start the engine and start again to refuel the value in-game is the whole refuel amount and this value will only be the new refuel amount
+  - I tried to calculate the exact value. But there could be a really small difference to that value (maybe up to `+-0.1`, maybe in some special cases more. If you think it is completely wrong create an issue)
+- **Shared Memory Changes**:
+  - > Zone 4 end is modified (floats) -> `gameplas_f.refuelAmount` added, so `job_f.cargoDamage` moved 4 bytes
 
 ## Rev 10 Update 3 (Game Version 1.36, small Shared Memory changes)
 
diff --git a/scs-client/C#/SCSSdkClient/Object/SCSTelemetry.GamePlayEvents.cs b/scs-client/C#/SCSSdkClient/Object/SCSTelemetry.GamePlayEvents.cs
@@ -7,13 +7,17 @@ public partial class SCSTelemetry {
         ///     first implementation is that the values will be set, but never deleted
         ///     another change listener for bool values that will be changed will say if there are new values
         /// </summary>
+        /// <note>
+        ///     Refuel event is currently not provided by the sdk. It is provided through the fuel value.
+        /// </note>
         public class GamePlayEvents {
             public Transport FerryEvent;
             public Fined FinedEvent;
             public Cancelled JobCancelled;
             public Delivered JobDelivered;
             public Tollgate TollgateEvent;
             public Transport TrainEvent;
+            public Refuel RefuelEvent;
 
 
             public GamePlayEvents() {
@@ -23,6 +27,7 @@ public GamePlayEvents() {
                 TollgateEvent = new Tollgate();
                 TrainEvent = new Transport();
                 FerryEvent = new Transport();
+                RefuelEvent = new Refuel();
             }
 
 
@@ -58,6 +63,10 @@ public class Transport {
                 public string TargetId;
                 public string TargetName;
             }
+
+            public class Refuel {
+                public float Amount;
+            }
         }
     }
 }
diff --git a/scs-client/C#/SCSSdkClient/SCSSdkConvert.cs b/scs-client/C#/SCSSdkClient/SCSSdkConvert.cs
@@ -167,6 +167,8 @@ public SCSTelemetry Convert(byte[] structureDataBytes) {
             retData.GamePlay.JobDelivered.CargoDamage = GetFloat();
             retData.GamePlay.JobDelivered.DistanceKm = GetFloat();
 
+            retData.GamePlay.RefuelEvent.Amount = GetFloat();
+
             retData.JobValues.CargoValues.CargoDamage = GetFloat();
 
             NextOffsetArea();
diff --git a/scs-telemetry/inc/scs-telemetry-common.hpp b/scs-telemetry/inc/scs-telemetry-common.hpp
@@ -306,12 +306,13 @@ typedef struct scsTelemetryMap_s
 	struct {
 		float jobDeliveredCargoDamage;
 		float jobDeliveredDistanceKm;
+        float refuelAmount;
 	}gameplay_f;
 
 	struct {
 		float cargoDamage;
 	}job_f;
-	char buffer_f[32];
+	char buffer_f[28];
 	//----- END OF FOURTH ZONE AT OFFSET 1499 -----//
 
 	//----- START OF FIFTH ZONE AT OFFSET 1500 -----//
diff --git a/scs-telemetry/src/scs_telemetry.cpp b/scs-telemetry/src/scs_telemetry.cpp
@@ -374,7 +374,8 @@ static auto fuel_ticker2 = 0;
 static auto last_fuel_value = 0;
 static auto current_fuel_value = 0;
 static auto refuel = false;
-
+static auto fuel_tmp = 0.0f;
+static auto start_fuel = 0.0f;
 
 // Function: telemetry_frame_start
 // Register telemetry values
@@ -413,11 +414,17 @@ SCSAPI_VOID telemetry_frame_start(const scs_event_t UNUSED(event), const void* c
 
         // check fuel value
         current_fuel_value = telem_ptr->truck_f.fuel;
+        if(!refuel) {
+            start_fuel = fuel_tmp;
+            fuel_tmp = telem_ptr->truck_f.fuel;
+        }
         if (current_fuel_value > last_fuel_value && last_fuel_value >0) {
             fuel_ticker2 = 0;
             telem_ptr->special_b.refuel = true;
-            refuel = true;
-            clear_refuel_payed_ticker = 0;
+            if(!refuel) {                
+                refuel = true;
+                clear_refuel_payed_ticker = 0;               
+            }
         }
         else if (current_fuel_value < last_fuel_value) {
             fuel_ticker2 = 0;
@@ -427,6 +434,7 @@ SCSAPI_VOID telemetry_frame_start(const scs_event_t UNUSED(event), const void* c
         // refuel is true, but engine is know active? than refuel is finished and payed, fire event       
         if(refuel && telem_ptr->truck_b.engineEnabled) {
             refuel = false;
+            telem_ptr->gameplay_f.refuelAmount = telem_ptr->truck_f.fuel - start_fuel;
             telem_ptr->special_b.refuelPayed = true;
         }
 
