From ce6f7d3b24af1e60c2df8e4ba6244a4666c03553 Mon Sep 17 00:00:00 2001
From: Richard Griffiths <cwolfs@gmail.com>
Date: Thu, 10 Aug 2023 16:21:34 +0200
Subject: [PATCH] Back ported Blackout position fixes to Master

---
 .../Blackout/story2_badlandsparched.jsonc     | 57 +++++++++++++++----
 .../Blackout/story7_lowlandsspring.jsonc      | 20 +++----
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/contractTypeBuilds/Blackout/story2_badlandsparched.jsonc b/contractTypeBuilds/Blackout/story2_badlandsparched.jsonc
index 3b04fd54..39ce282b 100644
--- a/contractTypeBuilds/Blackout/story2_badlandsparched.jsonc
+++ b/contractTypeBuilds/Blackout/story2_badlandsparched.jsonc
@@ -27,9 +27,9 @@
         "Position": {
           "Type": "World",
           "Value": {
-            "x": -852.0,
-            "y": 270.496,
-            "z": 644.323
+            "x": -840.0,
+            "y": 0.0,
+            "z": 623.538
           }
         },
         "Rotation": {
@@ -46,6 +46,23 @@
             "y": 0.0,
             "z": 0.0
           },
+          "5df48a48-1840-49b0-84e9-126847053afa": {
+            "x": 20.785,
+            "y": 0.0,
+            "z": -12.0
+          },
+          "a55fc76c-c955-4b61-bb64-2608c9beb9f5": {
+            "x": -20.785,
+            "y": 0.0,
+            "z": -12.0
+          },
+          "0f10a383-7325-4726-b2c4-a0ef416e4b27": {
+            "x": 0.0,
+            "y": 0.0,
+            "z": -24.0
+          }
+        },
+        "SpawnPointRotations": {
           "5df48a48-1840-49b0-84e9-126847053afa": {
             "x": 0.0,
             "y": 0.0,
@@ -62,7 +79,6 @@
             "z": 0.0
           }
         },
-        "SpawnPointRotations": {},
         "MountOn": {}
       }
     },
@@ -555,16 +571,16 @@
         "Position": {
           "Type": "World",
           "Value": {
-            "x": -312.0,
-            "y": 118.916,
-            "z": -457.261
+            "x": -384.0,
+            "y": 120.07,
+            "z": -540.4
           }
         },
         "Rotation": {
           "Type": "World",
           "Value": {
             "x": 0.0,
-            "y": 90.0,
+            "y": 30.0,
             "z": 0.0
           }
         },
@@ -575,11 +591,28 @@
             "z": 0.0
           },
           "14c58a13-96a6-4f91-a1e5-47b5d02b81d1": {
-            "x": 0.0,
+            "x": -41.569,
             "y": 0.0,
             "z": 0.0
           },
           "92ea4a9a-0ea5-4445-b8ba-89a167e478de": {
+            "x": 41.569,
+            "y": 0.0,
+            "z": 0.0
+          },
+          "0cf6442f-d67d-41e3-a658-c5e9f564cf9e": {
+            "x": 0.0,
+            "y": 0.0,
+            "z": -24.0
+          }
+        },
+        "SpawnPointRotations": {
+          "6cd3107e-0f9d-4809-ab8c-fb30faf4cd80": {
+            "x": 0.0,
+            "y": 0.0,
+            "z": 0.0
+          },
+          "14c58a13-96a6-4f91-a1e5-47b5d02b81d1": {
             "x": 0.0,
             "y": 0.0,
             "z": 0.0
@@ -588,9 +621,13 @@
             "x": 0.0,
             "y": 0.0,
             "z": 0.0
+          },
+          "92ea4a9a-0ea5-4445-b8ba-89a167e478de": {
+            "x": 0.0,
+            "y": 0.0,
+            "z": 0.0
           }
         },
-        "SpawnPointRotations": {},
         "MountOn": {}
       }
     },
diff --git a/contractTypeBuilds/Blackout/story7_lowlandsspring.jsonc b/contractTypeBuilds/Blackout/story7_lowlandsspring.jsonc
index 38c5fb9b..12e4424d 100644
--- a/contractTypeBuilds/Blackout/story7_lowlandsspring.jsonc
+++ b/contractTypeBuilds/Blackout/story7_lowlandsspring.jsonc
@@ -103,9 +103,9 @@
             "z": -16.971
           },
           "fc68ef8d-829a-4663-9340-6b1a1b7a7e0c": {
-            "x": 29.572,
+            "x": 29.394,
             "y": 0.0,
-            "z": -29.346
+            "z": -29.394
           }
         },
         "SpawnPointRotations": {
@@ -568,9 +568,9 @@
         "Position": {
           "Type": "World",
           "Value": {
-            "x": -648.0,
-            "y": 310.706,
-            "z": -249.415
+            "x": -588.0,
+            "y": 312.157,
+            "z": -270.2
           }
         },
         "Rotation": {
@@ -590,17 +590,17 @@
           "14c58a13-96a6-4f91-a1e5-47b5d02b81d1": {
             "x": 0.0,
             "y": 0.0,
-            "z": 0.0
+            "z": -24.0
           },
           "92ea4a9a-0ea5-4445-b8ba-89a167e478de": {
-            "x": 0.0,
+            "x": 20.785,
             "y": 0.0,
-            "z": 0.0
+            "z": -12.0
           },
           "0cf6442f-d67d-41e3-a658-c5e9f564cf9e": {
-            "x": 0.0,
+            "x": 20.785,
             "y": 0.0,
-            "z": 0.0
+            "z": 12.0
           }
         },
         "SpawnPointRotations": {