From 61f03629bbb25d6ad375a4c8e28d3cf8b9123768 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 17 Jun 2016 09:12:31 +0200
Subject: [PATCH] adapt 12t delivery truck to work with most recent vecto
 version

---
 .../12t Delivery Truck.vecto                  | 41 ++-----------------
 .../12t Delivery Truck.veng                   | 21 ++++------
 .../12t Delivery Truck.vgbx                   | 26 +++++++-----
 .../12t Delivery Truck.vveh                   | 21 +++++-----
 4 files changed, 38 insertions(+), 71 deletions(-)

diff --git a/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vecto b/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vecto
index 144ce492de..72969c4dc9 100644
--- a/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vecto	
+++ b/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vecto	
@@ -1,8 +1,8 @@
 {
   "Header": {
-    "CreatedBy": "John.Norris@ricardo-aea.com, Rasa.Narkeviciute@ricardo-aea.com, Scott.Hanchett@ricardo-aea.com, Dana.Nurse@ricardo-aea.com, pascal.revereault@ricardo.com, james.baxter@ricardo.com (51e9f02e-c88f-4c25-9798-3f807530e154)",
-    "Date": "20/07/2015 12:19:33",
-    "AppVersion": "2.0.4-beta",
+    "CreatedBy": " ()",
+    "Date": "17.06.2016 08:12:45",
+    "AppVersion": "2.2",
     "FileVersion": 2
   },
   "Body": {
@@ -18,40 +18,7 @@
     "AuxiliaryAssembly": "CLASSIC",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
-    "Aux": [
-      {
-        "ID": "FAN",
-        "Type": "Fan",
-        "Path": "<NOFILE>",
-        "Technology": ""
-      },
-      {
-        "ID": "STP",
-        "Type": "Steering pump",
-        "Path": "<NOFILE>",
-        "Technology": ""
-      },
-      {
-        "ID": "AC",
-        "Type": "HVAC",
-        "Path": "<NOFILE>",
-        "Technology": ""
-      },
-      {
-        "ID": "ES",
-        "Type": "Electric System",
-        "Path": "<NOFILE>",
-        "Technology": "",
-        "TechList": []
-      },
-      {
-        "ID": "PS",
-        "Type": "Pneumatic System",
-        "Path": "<NOFILE>",
-        "Technology": ""
-      }
-    ],
-    "VACC": "Coach.vacc",
+    "VACC": "Truck.vacc",
     "EngineOnlyMode": false,
     "StartStop": {
       "Enabled": true,
diff --git a/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.veng b/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.veng
index 13a0297726..9e3015efdd 100644
--- a/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.veng	
+++ b/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Terry Burns (cdfbee63-58c9-44d5-a649-9903ea7eb6b5)",
-    "Date": "13/01/2015 08:55:15",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 2
+    "CreatedBy": " ()",
+    "Date": "17.06.2016 07:48:12",
+    "AppVersion": "2.2",
+    "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,15 +11,10 @@
     "Displacement": 7700.0,
     "IdlingSpeed": 600.0,
     "Inertia": 3.789,
-    "FullLoadCurves": [
-      {
-        "Path": "12t Delivery Truck.vfld",
-        "Gears": "0 - 99"
-      }
-    ],
+    "FullLoadCurve": "12t Delivery Truck.vfld",
     "FuelMap": "12t Delivery Truck.vmap",
-    "WHTC-Urban": 215.0,
-    "WHTC-Rural": 202.0,
-    "WHTC-Motorway": 204.0
+    "WHTC-Urban": 0.0,
+    "WHTC-Rural": 0.0,
+    "WHTC-Motorway": 0.0
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vgbx b/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vgbx
index 9f1323dd1e..19b10889a8 100644
--- a/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vgbx	
+++ b/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vgbx	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Terry Burns (cdfbee63-58c9-44d5-a649-9903ea7eb6b5)",
-    "Date": "13/01/2015 08:55:19",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 4
+    "CreatedBy": " ()",
+    "Date": "17.06.2016 08:12:24",
+    "AppVersion": "2.2",
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -19,37 +19,43 @@
         "Ratio": 6.75,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 3.6,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 2.13,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.39,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.0,
         "LossMap": "Direct Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 0.78,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       }
     ],
     "TqReserve": 20.0,
diff --git a/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vveh b/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vveh
index 9dbf2131c6..f7d8fe842b 100644
--- a/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vveh	
+++ b/Generic Vehicles/Engineering Mode/12t Delivery Truck/12t Delivery Truck.vveh	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Terry Burns (cdfbee63-58c9-44d5-a649-9903ea7eb6b5)",
-    "Date": "13/01/2015 08:55:12",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 5
+    "CreatedBy": " ()",
+    "Date": "17.06.2016 07:50:47",
+    "AppVersion": "2.2",
+    "FileVersion": 7
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -12,11 +12,10 @@
     "CurbWeightExtra": 0.0,
     "Loading": 0.0,
     "MassMax": 11.9,
-    "Cd": 0.6,
-    "CrossSecArea": 8.8,
+    "CdA": 5.28,
     "rdyn": 406.9297,
     "Rim": "15° DC Rims",
-    "CdCorrMode": "CdOfV",
+    "CdCorrMode": "Off",
     "CdCorrFile": "12t Delivery Truck.vcdv",
     "Retarder": {
       "Type": "None",
@@ -28,16 +27,16 @@
       "Axles": [
         {
           "Inertia": 6.0,
-          "Wheels": "245/70 R 19.5",
-          "AxleWeightShare": 0.0,
+          "Wheels": "245/70 R19.5",
+          "AxleWeightShare": 0.4,
           "TwinTyres": false,
           "RRCISO": 0.008343465,
           "FzISO": 20800.0
         },
         {
           "Inertia": 6.0,
-          "Wheels": "245/70 R 19.5",
-          "AxleWeightShare": 0.0,
+          "Wheels": "245/70 R19.5",
+          "AxleWeightShare": 0.6,
           "TwinTyres": true,
           "RRCISO": 0.00943769,
           "FzISO": 20800.0
-- 
GitLab