fix parse fuel in ED 2.0

2015-12-27 13:43:01 +03:00
parent e4f8886018
commit 2a99db0ce3
7 changed files with 6578 additions and 26 deletions
--- a/utils/src/test/resources/edce/edce.json
+++ b/utils/src/test/resources/edce/edce.json
@@ -6710,11 +6710,14 @@
    "cockpitBreached": false,
    "oxygenRemaining": 450000,
    "fuel": {
-      "capacity": 16,
-      "lvl": 16
-    },
-    "reserve": {
-      "lvl": 1
+      "main": {
+        "level": 16,
+        "capacity": 16
+      },
+      "reserve": {
+        "level": 1,
+        "capacity": 1
+      }
    },
    "cargo": {
      "capacity": 12,
--- a/utils/src/test/resources/edce/edce6.json
+++ b/utils/src/test/resources/edce/edce6.json
@@ -2448,11 +2448,14 @@
    "cockpitBreached": false,
    "oxygenRemaining": 450000,
    "fuel": {
-      "capacity": 16,
-      "lvl": 12.47372
-    },
-    "reserve": {
-      "lvl": 0.587228
+      "main": {
+        "level": 12.47372,
+        "capacity": 16
+      },
+      "reserve": {
+        "level": 0.587228,
+        "capacity": 1
+      }
    },
    "cargo": {
      "capacity": 0,
--- a/utils/src/test/resources/edce/edce_v201.json
+++ b/utils/src/test/resources/edce/edce_v201.json