thepeacockproject · suanjiansalt · May 15, 2024 · May 15, 2024 · May 19, 2024 · Jun 5, 2024
diff --git a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS1.json b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS1.json
@@ -125,6 +125,10 @@
         "Id": "b11ff525-a28d-4714-8c72-ce8a2067aedd",
         "Type": "escalation",
         "Entitlements": ["LOCATION_ROCKY"],
-        "InGroup": "50fa5e99-0b51-45d4-9062-cd46dd928461"
+        "InGroup": "50fa5e99-0b51-45d4-9062-cd46dd928461",
+        "GroupObjectiveDisplayOrder": [
+            { "Id": "83ae9dcf-ee05-4cfa-9101-85a434d9ae85" },
+            { "Id": "538ecb95-2931-4303-904e-5b3c98d417e4" }
+        ]
     }
 }
diff --git a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS2.json b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS2.json
@@ -156,20 +156,10 @@
         "Entitlements": ["LOCATION_ROCKY"],
         "InGroup": "50fa5e99-0b51-45d4-9062-cd46dd928461",
         "GroupObjectiveDisplayOrder": [
-            {
-                "Id": "a62f4f63-430c-47d9-b527-1545706bb132",
-                "IsNew": true
-            },
-            {
-                "Id": "83ae9dcf-ee05-4cfa-9101-85a434d9ae85"
-            },
-            {
-                "Id": "538ecb95-2931-4303-904e-5b3c98d417e4"
-            },
-            {
-                "Id": "07b1bc1d-f52b-4004-a760-846c4bc3f172",
-                "IsNew": true
-            }
+            { "Id": "a62f4f63-430c-47d9-b527-1545706bb132", "IsNew": true },
+            { "Id": "07b1bc1d-f52b-4004-a760-846c4bc3f172", "IsNew": true },
+            { "Id": "83ae9dcf-ee05-4cfa-9101-85a434d9ae85" },
+            { "Id": "538ecb95-2931-4303-904e-5b3c98d417e4" }
         ]
     }
 }
diff --git a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS3.json b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS3.json
@@ -219,22 +219,11 @@
         "Entitlements": ["LOCATION_ROCKY"],
         "InGroup": "50fa5e99-0b51-45d4-9062-cd46dd928461",
         "GroupObjectiveDisplayOrder": [
-            {
-                "Id": "d9408a0f-b860-40a6-ac1f-a49c2024dbc2",
-                "IsNew": true
-            },
-            {
-                "Id": "a62f4f63-430c-47d9-b527-1545706bb132"
-            },
-            {
-                "Id": "83ae9dcf-ee05-4cfa-9101-85a434d9ae85"
-            },
-            {
-                "Id": "538ecb95-2931-4303-904e-5b3c98d417e4"
-            },
-            {
-                "Id": "07b1bc1d-f52b-4004-a760-846c4bc3f172"
-            }
+            { "Id": "d9408a0f-b860-40a6-ac1f-a49c2024dbc2", "IsNew": true },
+            { "Id": "a62f4f63-430c-47d9-b527-1545706bb132" },
+            { "Id": "07b1bc1d-f52b-4004-a760-846c4bc3f172" },
+            { "Id": "83ae9dcf-ee05-4cfa-9101-85a434d9ae85" },
+            { "Id": "538ecb95-2931-4303-904e-5b3c98d417e4" }
         ]
     }
 }
diff --git a/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC1.json b/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC1.json
@@ -46,7 +46,11 @@
         "TileImage": "images/contracts/escalation/contractescalation_koats_conspiracy.jpg",
         "CreationTimestamp": "2021-03-28T17:05:57.6139254Z",
         "Entitlements": ["LOCATION_WET"],
-        "InGroup": "07ffa72a-bbac-45ca-8c9f-b9c1b526153a"
+        "InGroup": "07ffa72a-bbac-45ca-8c9f-b9c1b526153a",
+        "GroupObjectiveDisplayOrder": [
+            { "Id": "dd28fb62-c41e-466c-9700-b5231fde8d78" },
+            { "Id": "6a14fb41-e6e2-4a4d-881f-4c2e9d27ed16" }
+        ]
     },
     "UserData": {}
 }
diff --git a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ1.json b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ1.json
@@ -21,7 +21,7 @@
                     "Scope": "session",
                     "States": {
                         "Start": {
-                            "AmbientChanged": { "Transition": "Success" }
+                            "-": { "Transition": "Success" }
                         }
                     }
                 }
@@ -44,9 +44,7 @@
                 "Definition": {
                     "Scope": "session",
                     "States": {
-                        "Start": {
-                            "AmbientChanged": { "Transition": "Success" }
-                        },
+                        "Start": { "-": { "Transition": "Success" } },
                         "Success": {
                             "Disguise": { "Transition": "PleaseDoFail" }
                         },
@@ -195,6 +193,12 @@
         "ScenePath": "assembly:/_pro/scenes/missions/Ancestral/scene_bulldog.entity",
         "InGroup": "78628e05-93ce-4f87-8a17-b910d32df51f",
         "TileImage": "images/contracts/escalation/contractescalation_rosebush.jpg",
-        "Entitlements": ["LOCATION_ANCESTRAL"]
+        "Entitlements": ["LOCATION_ANCESTRAL"],
+        "GroupObjectiveDisplayOrder": [
+            { "Id": "1b6a050f-162e-4038-898f-859c5c956a7b" },
+            { "Id": "bca06014-1580-4837-916a-95bc9f64d76a" },
+            { "Id": "6cb73180-4426-4281-a7bb-840f4917640a" },
+            { "Id": "0cf80053-183c-4a6f-8024-bd3e982129f6" }
+        ]
     }
 }
diff --git a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ2.json b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ2.json
@@ -20,9 +20,7 @@
                 "Definition": {
                     "Scope": "session",
                     "States": {
-                        "Start": {
-                            "AmbientChanged": { "Transition": "Success" }
-                        }
+                        "Start": { "-": { "Transition": "Success" } }
                     }
                 }
             },
@@ -44,9 +42,7 @@
                 "Definition": {
                     "Scope": "session",
                     "States": {
-                        "Start": {
-                            "AmbientChanged": { "Transition": "Success" }
-                        },
+                        "Start": { "-": { "Transition": "Success" } },
                         "Success": {
                             "Disguise": { "Transition": "PleaseDoFail" }
                         },
@@ -197,10 +193,10 @@
         "TileImage": "images/contracts/escalation/contractescalation_rosebush.jpg",
         "Entitlements": ["LOCATION_ANCESTRAL"],
         "GroupObjectiveDisplayOrder": [
-            { "Id": "a12ccd08-ee68-4e92-860e-fc63fba72d7f", "IsNew": true },
-            { "Id": "118041f6-34e5-4f33-9d6f-19b70d555189", "IsNew": true },
             { "Id": "a2125ded-5ed2-4bb1-a7e1-fb5c2446d9c8", "IsNew": true },
-            { "Id": "f80cd9dd-0908-4e91-8e78-7345d90f506c", "IsNew": true }
+            { "Id": "f80cd9dd-0908-4e91-8e78-7345d90f506c", "IsNew": true },
+            { "Id": "a12ccd08-ee68-4e92-860e-fc63fba72d7f", "IsNew": true },
+            { "Id": "118041f6-34e5-4f33-9d6f-19b70d555189", "IsNew": true }
         ]
     }
 }
diff --git a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ3.json b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ3.json
@@ -18,9 +18,7 @@
                 "Definition": {
                     "Scope": "session",
                     "States": {
-                        "Start": {
-                            "AmbientChanged": { "Transition": "Success" }
-                        }
+                        "Start": { "-": { "Transition": "Success" } }
                     }
                 }
             },
@@ -286,11 +284,11 @@
         "TileImage": "images/contracts/escalation/contractescalation_rosebush.jpg",
         "Entitlements": ["LOCATION_ANCESTRAL"],
         "GroupObjectiveDisplayOrder": [
-            { "Id": "0706f101-9814-40b1-82e1-2eb2fff82931", "IsNew": true },
             { "Id": "a2125ded-5ed2-4bb1-a7e1-fb5c2446d9c8", "IsNew": true },
             { "Id": "1b6a050f-162e-4038-898f-859c5c956a7b", "IsNew": true },
             { "Id": "f80cd9dd-0908-4e91-8e78-7345d90f506c", "IsNew": true },
-            { "Id": "bca06014-1580-4837-916a-95bc9f64d76a", "IsNew": true }
+            { "Id": "bca06014-1580-4837-916a-95bc9f64d76a", "IsNew": true },
+            { "Id": "0706f101-9814-40b1-82e1-2eb2fff82931", "IsNew": true }
         ]
     }
 }
diff --git a/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM1.json b/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM1.json
@@ -8,7 +8,7 @@
                 "Id": "26009bfe-b1d2-4533-9d8c-a2362b8ff4a5",
                 "BriefingName": "$loc UI_PEACOCK_PIRATESPROBLEM_CALM",
                 "BriefingText": "$loc UI_PEACOCK_PIRATESPROBLEM_CALM_DESC",
-                "Image": "images/objectives/contracts/pirates_problem_ventilation.jpg",
+                "Image": "images/contracts/escalation/contractescalation_pirates_problem_ventilation.jpg",
                 "ObjectiveType": "custom",
                 "HUDTemplate": {
                     "display": "$loc UI_PEACOCK_PIRATESPROBLEM_CALM"
@@ -43,7 +43,7 @@
                 "Id": "843fa79f-6127-4911-b1c0-5edff6133b6f",
                 "BriefingName": "$loc UI_PEACOCK_PIRATESPROBLEM_ALARM",
                 "BriefingText": "$loc UI_PEACOCK_PIRATESPROBLEM_ALARM_DESC",
-                "Image": "images/objectives/contracts/pirates_problem_alarm.jpg",
+                "Image": "images/contracts/escalation/contractescalation_pirates_problem_alarm.jpg",
                 "ObjectiveType": "custom",
                 "HUDTemplate": {
                     "display": "$loc UI_PEACOCK_PIRATESPROBLEM_ALARM"
@@ -89,7 +89,7 @@
         "GroupObjectiveDisplayOrder": [
             { "Id": "26009bfe-b1d2-4533-9d8c-a2362b8ff4a5" },
             { "Id": "843fa79f-6127-4911-b1c0-5edff6133b6f" },
-            { "Id": "8618ebaa-f42b-42ce-be20-00d2b0a04897" }
+            { "Id": "f41f18fe-0fe5-416a-a793-50727e594655" }
         ]
     },
     "UserData": {}

diff --git a/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM2.json b/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM2.json
@@ -47,7 +47,7 @@
                 "Id": "4f9a1d25-7854-4918-b581-602adb8acdc1",
                 "BriefingName": "$loc UI_PEACOCK_PIRATESPROBLEM_PIRATES",
                 "BriefingText": "$loc UI_PEACOCK_PIRATESPROBLEM_PIRATES_DESC",
-                "Image": "images/objectives/contracts/pirates_problem_list.jpg",
+                "Image": "images/contracts/escalation/contractescalation_pirates_problem_list.jpg",
                 "ObjectiveType": "custom",
                 "HUDTemplate": {
                     "display": "$loc UI_PEACOCK_PIRATESPROBLEM_PIRATES"

diff --git a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL1.json b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL1.json
@@ -114,7 +114,9 @@
         "InGroup": "35f1f534-ae2d-42be-8472-dd55e96625ea",
         "TileImage": "images/contracts/escalation/contractescalation_longbush.jpg",
         "GroupObjectiveDisplayOrder": [
-            { "Id": "26009bfe-b1d2-4533-9d8c-a2362b8ff4a5" }
+            { "Id": "26009bfe-b1d2-4533-9d8c-a2362b8ff4a5" },
+            { "Id": "1f1f3c9e-1490-4fcc-aee6-5fde7c6c48ca" },
+            { "Id": "f41f18fe-0fe5-416a-a793-50727e594655" }
         ]
     },
     "UserData": {}

diff --git a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL2.json b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL2.json
@@ -207,7 +207,9 @@
         "TileImage": "images/contracts/escalation/contractescalation_longbush.jpg",
         "GroupObjectiveDisplayOrder": [
             { "Id": "74c86d8a-3a1d-4c76-a7a4-fa9805b0bae8", "IsNew": true },
-            { "Id": "26009bfe-b1d2-4533-9d8c-a2362b8ff4a5" }
+            { "Id": "26009bfe-b1d2-4533-9d8c-a2362b8ff4a5" },
+            { "Id": "1f1f3c9e-1490-4fcc-aee6-5fde7c6c48ca" },
+            { "Id": "f41f18fe-0fe5-416a-a793-50727e594655" }
         ]
     },
     "UserData": {}

diff --git a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL3.json b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL3.json
@@ -393,7 +393,9 @@
             { "Id": "3ca3dd52-c4f8-44da-9f9c-e046d88271c8", "IsNew": true },
             { "Id": "fff4788e-2975-4ec3-9d74-f64470f0910d", "IsNew": true },
             { "Id": "74c86d8a-3a1d-4c76-a7a4-fa9805b0bae8" },
-            { "Id": "26009bfe-b1d2-4533-9d8c-a2362b8ff4a5" }
+            { "Id": "26009bfe-b1d2-4533-9d8c-a2362b8ff4a5" },
+            { "Id": "1f1f3c9e-1490-4fcc-aee6-5fde7c6c48ca" },
+            { "Id": "f41f18fe-0fe5-416a-a793-50727e594655" }
         ]
     },
     "UserData": {}

diff --git a/...HAWKESBAY/ESCALATION/YULANIA/YULANIA.json → ...HAWKESBAY/ESCALATION/ASTERIA/ASTERIA.json b/...HAWKESBAY/ESCALATION/YULANIA/YULANIA.json → ...HAWKESBAY/ESCALATION/ASTERIA/ASTERIA.json
@@ -20,9 +20,9 @@
         "IsPublished": true,
         "CreationTimestamp": "2024-03-13T15:32:25.692Z",
         "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
-        "Title": "UI_PEACOCK_YULANIA",
+        "Title": "UI_PEACOCK_ASTERIA",
         "Description": "UI_PEACOCK_ESCALATION_HAWKESBAY_DESC",
-        "TileImage": "images/contracts/escalation/contractescalation_yulania.jpg",
+        "TileImage": "images/contracts/escalation/contractescalation_asteria.jpg",
         "Type": "escalation",
         "Location": "LOCATION_NEWZEALAND",
         "ScenePath": "assembly:/_pro/scenes/missions/sheep/scene_sheep.entity",

diff --git a/...AWKESBAY/ESCALATION/YULANIA/YULANIA1.json → ...AWKESBAY/ESCALATION/ASTERIA/ASTERIA1.json b/...AWKESBAY/ESCALATION/YULANIA/YULANIA1.json → ...AWKESBAY/ESCALATION/ASTERIA/ASTERIA1.json
@@ -8,10 +8,10 @@
                 "ObjectiveType": "custom",
                 "ForceShowOnLoadingScreen": true,
                 "Image": "images/actors/sheep_gather_intel.jpg",
-                "BriefingName": "$loc UI_PEACOCK_YULANIA_STARTTHEGAME_NAME",
-                "BriefingText": "$loc UI_PEACOCK_YULANIA_STARTTHEGAME_DESC",
+                "BriefingName": "$loc UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME",
+                "BriefingText": "$loc UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC",
                 "HUDTemplate": {
-                    "display": "$loc UI_PEACOCK_YULANIA_STARTTHEGAME_NAME",
+                    "display": "$loc UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME",
                     "iconType": 17
                 },
                 "OnActive": {
@@ -58,7 +58,7 @@
                 "Type": "statemachine",
                 "ObjectiveType": "kill",
                 "HUDTemplate": {
-                    "display": "$loc UI_PEACOCK_YULANIA_CAPTAIN"
+                    "display": "$loc UI_PEACOCK_ASTERIA_CAPTAIN"
                 },
                 "TargetConditions": [
                     {
@@ -147,7 +147,7 @@
         "EnableSaving": false
     },
     "Metadata": {
-        "Title": "UI_PEACOCK_YULANIA1",
+        "Title": "UI_PEACOCK_ASTERIA1",
         "Description": "",
         "Entitlements": ["H2_LEGACY_STANDARD"],
         "ScenePath": "assembly:/_pro/scenes/missions/sheep/scene_sheep.entity",
@@ -157,21 +157,13 @@
         "Type": "escalation",
         "Id": "7915a9b1-6035-d5e1-445a-0b5e3c0e3f12",
         "PublicId": "165627655427",
-        "TileImage": "images/contracts/escalation/contractescalation_yulania.jpg",
+        "TileImage": "images/contracts/escalation/contractescalation_asteria.jpg",
         "InGroup": "e1e86206-d3f0-a819-e477-3d80e55e8a40",
         "GroupObjectiveDisplayOrder": [
-            {
-                "Id": "121573e4-975a-0756-a8e0-f3055e219590"
-            },
-            {
-                "Id": "5746a594-6f00-0b80-3e02-7397624515d4"
-            },
-            {
-                "Id": "5e2a1492-a099-c696-529e-1e56171e352d"
-            },
-            {
-                "Id": "3db72bb5-63d6-47fe-9332-d7ea3c195e06"
-            }
+            { "Id": "121573e4-975a-0756-a8e0-f3055e219590" },
+            { "Id": "5746a594-6f00-0b80-3e02-7397624515d4" },
+            { "Id": "5e2a1492-a099-c696-529e-1e56171e352d" },
+            { "Id": "3db72bb5-63d6-47fe-9332-d7ea3c195e06" }
         ],
         "CreationTimestamp": "2024-03-13T15:32:25.692Z"
     },