From 2227ca7b5d231bfb520f6e94f6fc7d56a4ff1464 Mon Sep 17 00:00:00 2001
From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com>
Date: Wed, 15 May 2024 16:35:22 +0800
Subject: [PATCH 1/3] update files
---
.../AMBROSE/ESCALATION/PONTUS/PONTUS1.json | 6 +-
.../AMBROSE/ESCALATION/PONTUS/PONTUS2.json | 18 +-
.../AMBROSE/ESCALATION/PONTUS/PONTUS3.json | 21 +-
.../CHONGQING/ESCALATION/KOATSC/KOATSC1.json | 6 +-
.../DARTMOOR/ESCALATION/DEZ/DEZ1.json | 14 +-
.../DARTMOOR/ESCALATION/DEZ/DEZ2.json | 14 +-
.../DARTMOOR/ESCALATION/DEZ/DEZ3.json | 8 +-
.../PIRATESPROBLEM/PIRATESPROBLEM1.json | 6 +-
.../PIRATESPROBLEM/PIRATESPROBLEM2.json | 2 +-
.../ESCALATION/SLEAZEBALL/SLEAZEBALL1.json | 4 +-
.../ESCALATION/SLEAZEBALL/SLEAZEBALL2.json | 4 +-
.../ESCALATION/SLEAZEBALL/SLEAZEBALL3.json | 4 +-
.../YULANIA.json => ASTERIA/ASTERIA.json} | 4 +-
.../YULANIA1.json => ASTERIA/ASTERIA1.json} | 28 +-
.../YULANIA2.json => ASTERIA/ASTERIA2.json} | 46 +--
.../YULANIA3.json => ASTERIA/ASTERIA3.json} | 47 +---
.../HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS2.json | 9 +-
.../HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS3.json | 16 +-
.../ESCALATION/ARGENTINE/ARGENTINE1.json | 7 +-
.../MENDOZA/ESCALATION/YANNINI/YANNINI2.json | 6 +-
.../MUMBAI/ESCALATION/KHAKIASP/KHAKIASP2.json | 2 +-
.../ESCALATION/HEDGEBUSH/HEDGEBUSH2.json | 2 +-
contractdata/PARIS/ESCALATION/XMAS/XMAS1.json | 8 +-
contractdata/PARIS/ESCALATION/XMAS/XMAS2.json | 3 +-
contractdata/PARIS/ESCALATION/XMAS/XMAS3.json | 3 +-
.../BLUEBERRYBUSH/BLUEBERRYBUSH3.json | 2 +-
.../SAPIENZA/ESCALATION/ROCCO/ROCCO3.json | 2 +-
.../ESCALATION/DAMMCHICU/DAMMCHICU1.json | 6 +-
.../ESCALATION/DAMMCHICU/DAMMCHICU2.json | 4 +-
.../ESCALATION/DAMMCHICU/DAMMCHICU3.json | 4 +-
resources/locale.json | 264 +++++++++---------
31 files changed, 268 insertions(+), 302 deletions(-)
rename contractdata/HAWKESBAY/ESCALATION/{YULANIA/YULANIA.json => ASTERIA/ASTERIA.json} (95%)
rename contractdata/HAWKESBAY/ESCALATION/{YULANIA/YULANIA1.json => ASTERIA/ASTERIA1.json} (90%)
rename contractdata/HAWKESBAY/ESCALATION/{YULANIA/YULANIA2.json => ASTERIA/ASTERIA2.json} (93%)
rename contractdata/HAWKESBAY/ESCALATION/{YULANIA/YULANIA3.json => ASTERIA/ASTERIA3.json} (93%)
diff --git a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS1.json b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS1.json
index d3d39d639..08a31d3b1 100644
--- 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
index a9ca3aa0b..945e87e58 100644
--- 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
index 46e2b2999..613f5a1fb 100644
--- 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
index 4a4591ce7..eda99cb4b 100644
--- 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
index 671127963..5cfe6f6fd 100644
--- 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
index 736925f4a..2ea3e2e84 100644
--- 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
index afbf13a2e..37d9a8438 100644
--- 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
index e15e673d7..5089ff637 100644
--- 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
index 31aadbbcf..bd2ea445b 100644
--- 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
index 8679de1bd..dd703711d 100644
--- 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
index 79cacce46..f2f41e042 100644
--- 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
index 4d98145ac..d38b8eb24 100644
--- 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/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA.json b/contractdata/HAWKESBAY/ESCALATION/ASTERIA/ASTERIA.json
similarity index 95%
rename from contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA.json
rename to contractdata/HAWKESBAY/ESCALATION/ASTERIA/ASTERIA.json
index faf494466..43999b592 100644
--- a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA.json
+++ b/contractdata/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/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA1.json b/contractdata/HAWKESBAY/ESCALATION/ASTERIA/ASTERIA1.json
similarity index 90%
rename from contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA1.json
rename to contractdata/HAWKESBAY/ESCALATION/ASTERIA/ASTERIA1.json
index a3919ac5d..3dde6356d 100644
--- a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA1.json
+++ b/contractdata/HAWKESBAY/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"
},
diff --git a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json b/contractdata/HAWKESBAY/ESCALATION/ASTERIA/ASTERIA2.json
similarity index 93%
rename from contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json
rename to contractdata/HAWKESBAY/ESCALATION/ASTERIA/ASTERIA2.json
index f447cea41..a2afdb978 100644
--- a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json
+++ b/contractdata/HAWKESBAY/ESCALATION/ASTERIA/ASTERIA2.json
@@ -8,7 +8,7 @@
"Type": "statemachine",
"ObjectiveType": "kill",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_YULANIA_CAPTAIN"
+ "display": "$loc UI_PEACOCK_ASTERIA_CAPTAIN"
},
"TargetConditions": [
{
@@ -76,7 +76,7 @@
"Type": "statemachine",
"ObjectiveType": "kill",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_YULANIA_TAR1"
+ "display": "$loc UI_PEACOCK_ASTERIA_TAR1"
},
"TargetConditions": [
{
@@ -144,7 +144,7 @@
"Type": "statemachine",
"ObjectiveType": "kill",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_YULANIA_TAR2"
+ "display": "$loc UI_PEACOCK_ASTERIA_TAR2"
},
"TargetConditions": [
{
@@ -212,7 +212,7 @@
"Type": "statemachine",
"ObjectiveType": "kill",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_YULANIA_TAR3"
+ "display": "$loc UI_PEACOCK_ASTERIA_TAR3"
},
"TargetConditions": [
{
@@ -280,7 +280,7 @@
"Type": "statemachine",
"ObjectiveType": "kill",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_YULANIA_TAR4"
+ "display": "$loc UI_PEACOCK_ASTERIA_TAR4"
},
"TargetConditions": [
{
@@ -370,7 +370,7 @@
"EnableSaving": false
},
"Metadata": {
- "Title": "UI_PEACOCK_YULANIA2",
+ "Title": "UI_PEACOCK_ASTERIA2",
"Description": "",
"Entitlements": ["H2_LEGACY_STANDARD"],
"ScenePath": "assembly:/_pro/scenes/missions/sheep/scene_sheep.entity",
@@ -380,34 +380,16 @@
"Type": "escalation",
"Id": "934a904e-1b17-4e84-c0e0-4f90799a031b",
"PublicId": "165627655427",
- "TileImage": "images/contracts/escalation/contractescalation_yulania.jpg",
+ "TileImage": "images/contracts/escalation/contractescalation_asteria.jpg",
"InGroup": "e1e86206-d3f0-a819-e477-3d80e55e8a40",
"GroupObjectiveDisplayOrder": [
- {
- "Id": "663b1363-0335-25d5-f02f-91a52c1a125d",
- "IsNew": true
- },
- {
- "Id": "4e050a96-a53e-0997-c1b8-1633009d631a",
- "IsNew": true
- },
- {
- "Id": "d8578edf-8e56-8afc-4f8e-88bc9b7d659a",
- "IsNew": true
- },
- {
- "Id": "2599eb20-d012-f7fe-65c5-c42b0a2df6d8",
- "IsNew": true
- },
- {
- "Id": "5746a594-6f00-0b80-3e02-7397624515d4"
- },
- {
- "Id": "5e2a1492-a099-c696-529e-1e56171e352d"
- },
- {
- "Id": "3db72bb5-63d6-47fe-9332-d7ea3c195e06"
- }
+ { "Id": "663b1363-0335-25d5-f02f-91a52c1a125d", "IsNew": true },
+ { "Id": "4e050a96-a53e-0997-c1b8-1633009d631a", "IsNew": true },
+ { "Id": "d8578edf-8e56-8afc-4f8e-88bc9b7d659a", "IsNew": true },
+ { "Id": "2599eb20-d012-f7fe-65c5-c42b0a2df6d8", "IsNew": true },
+ { "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"
},
diff --git a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json b/contractdata/HAWKESBAY/ESCALATION/ASTERIA/ASTERIA3.json
similarity index 93%
rename from contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json
rename to contractdata/HAWKESBAY/ESCALATION/ASTERIA/ASTERIA3.json
index 79100520a..5156c35da 100644
--- a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json
+++ b/contractdata/HAWKESBAY/ESCALATION/ASTERIA/ASTERIA3.json
@@ -8,7 +8,7 @@
"Type": "statemachine",
"ObjectiveType": "kill",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_YULANIA_CAPTAIN"
+ "display": "$loc UI_PEACOCK_ASTERIA_CAPTAIN"
},
"TargetConditions": [
{
@@ -76,7 +76,7 @@
"Type": "statemachine",
"ObjectiveType": "kill",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_YULANIA_TAR1"
+ "display": "$loc UI_PEACOCK_ASTERIA_TAR1"
},
"TargetConditions": [
{
@@ -144,7 +144,7 @@
"Type": "statemachine",
"ObjectiveType": "kill",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_YULANIA_TAR2"
+ "display": "$loc UI_PEACOCK_ASTERIA_TAR2"
},
"TargetConditions": [
{
@@ -212,7 +212,7 @@
"Type": "statemachine",
"ObjectiveType": "kill",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_YULANIA_TAR3"
+ "display": "$loc UI_PEACOCK_ASTERIA_TAR3"
},
"TargetConditions": [
{
@@ -280,7 +280,7 @@
"Type": "statemachine",
"ObjectiveType": "kill",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_YULANIA_TAR4"
+ "display": "$loc UI_PEACOCK_ASTERIA_TAR4"
},
"TargetConditions": [
{
@@ -371,7 +371,7 @@
"EnableSaving": false
},
"Metadata": {
- "Title": "UI_PEACOCK_YULANIA3",
+ "Title": "UI_PEACOCK_ASTERIA3",
"Description": "",
"Entitlements": ["H2_LEGACY_STANDARD"],
"ScenePath": "assembly:/_pro/scenes/missions/sheep/scene_sheep.entity",
@@ -381,34 +381,17 @@
"Type": "escalation",
"Id": "21232f29-296f-555a-b642-c99bf068506e",
"PublicId": "165627655427",
- "TileImage": "images/contracts/escalation/contractescalation_yulania.jpg",
+ "TileImage": "images/contracts/escalation/contractescalation_asteria.jpg",
"InGroup": "e1e86206-d3f0-a819-e477-3d80e55e8a40",
"GroupObjectiveDisplayOrder": [
- {
- "Id": "c3fcd3d7-6192-e400-7dfb-4f0b6227b04c",
- "IsNew": true
- },
- {
- "Id": "663b1363-0335-25d5-f02f-91a52c1a125d"
- },
- {
- "Id": "4e050a96-a53e-0997-c1b8-1633009d631a"
- },
- {
- "Id": "d8578edf-8e56-8afc-4f8e-88bc9b7d659a"
- },
- {
- "Id": "2599eb20-d012-f7fe-65c5-c42b0a2df6d8"
- },
- {
- "Id": "5746a594-6f00-0b80-3e02-7397624515d4"
- },
- {
- "Id": "5e2a1492-a099-c696-529e-1e56171e352d"
- },
- {
- "Id": "3db72bb5-63d6-47fe-9332-d7ea3c195e06"
- }
+ { "Id": "c3fcd3d7-6192-e400-7dfb-4f0b6227b04c", "IsNew": true },
+ { "Id": "663b1363-0335-25d5-f02f-91a52c1a125d" },
+ { "Id": "4e050a96-a53e-0997-c1b8-1633009d631a" },
+ { "Id": "d8578edf-8e56-8afc-4f8e-88bc9b7d659a" },
+ { "Id": "2599eb20-d012-f7fe-65c5-c42b0a2df6d8" },
+ { "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"
},
diff --git a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS2.json b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS2.json
index 3689c8c65..f5b8f8618 100644
--- a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS2.json
+++ b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS2.json
@@ -6,11 +6,12 @@
"Id": "c7bc9353-cccb-4753-ac26-8a5bc0080422",
"Category": "primary",
"ObjectiveType": "custom",
- "Image": "images/objectives/contracts/currymaker_chaos_sauna.jpg",
+ "Image": "images/contracts/escalation/contractescalation_currymaker_chaos_sauna.jpg",
"BriefingName": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SAUNA",
"BriefingText": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SAUNA",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SAUNA"
+ "display": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SAUNA",
+ "iconType": 17
},
"Type": "statemachine",
"Definition": {
@@ -94,9 +95,9 @@
"InGroup": "115425b1-e797-47bf-b517-410dc7507397",
"GroupObjectiveDisplayOrder": [
{ "Id": "f9ceb566-e1aa-489a-88d5-3a4567f123c0", "IsNew": true },
+ { "Id": "c7bc9353-cccb-4753-ac26-8a5bc0080422", "IsNew": true },
{ "Id": "dbc52be2-38ba-4bdf-be97-ec2799c821ab" },
- { "Id": "ad69a093-7021-4371-bec5-577963be4d3f" },
- { "Id": "c7bc9353-cccb-4753-ac26-8a5bc0080422", "IsNew": true }
+ { "Id": "ad69a093-7021-4371-bec5-577963be4d3f" }
],
"Entitlements": ["H1_LEGACY_STANDARD"],
"LastUpdate": "2021-03-30T13:03:21.7628627Z",
diff --git a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS3.json b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS3.json
index 876f34d33..ad0d9ce85 100644
--- a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS3.json
+++ b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS3.json
@@ -6,11 +6,12 @@
"Id": "8cbbc13c-f685-485d-9412-885b225bca75",
"Category": "primary",
"ObjectiveType": "custom",
- "Image": "images/objectives/contracts/currymaker_chaos_spa.jpg",
+ "Image": "images/contracts/escalation/contractescalation_currymaker_chaos_spa.jpg",
"BriefingName": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SPA",
"BriefingText": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SPA",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SPA"
+ "display": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SPA",
+ "iconType": 17
},
"Type": "statemachine",
"Definition": {
@@ -36,11 +37,12 @@
"Id": "c7bc9353-cccb-4753-ac26-8a5bc0080422",
"Category": "primary",
"ObjectiveType": "custom",
- "Image": "images/objectives/contracts/currymaker_chaos_sauna.jpg",
+ "Image": "images/contracts/escalation/contractescalation_currymaker_chaos_sauna.jpg",
"BriefingName": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SAUNA",
"BriefingText": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SAUNA",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SAUNA"
+ "display": "$loc UI_PEACOCK_CURRYMAKER_CHAOS_SAUNA",
+ "iconType": 17
},
"Type": "statemachine",
"Definition": {
@@ -137,11 +139,11 @@
"InGroup": "115425b1-e797-47bf-b517-410dc7507397",
"GroupObjectiveDisplayOrder": [
{ "Id": "284d6fa3-98a6-4051-b036-30c02a1c4fe2", "IsNew": true },
+ { "Id": "8cbbc13c-f685-485d-9412-885b225bca75", "IsNew": true },
{ "Id": "f9ceb566-e1aa-489a-88d5-3a4567f123c0" },
+ { "Id": "c7bc9353-cccb-4753-ac26-8a5bc0080422" },
{ "Id": "dbc52be2-38ba-4bdf-be97-ec2799c821ab" },
- { "Id": "ad69a093-7021-4371-bec5-577963be4d3f" },
- { "Id": "8cbbc13c-f685-485d-9412-885b225bca75", "IsNew": true },
- { "Id": "c7bc9353-cccb-4753-ac26-8a5bc0080422" }
+ { "Id": "ad69a093-7021-4371-bec5-577963be4d3f" }
],
"Entitlements": ["H1_LEGACY_STANDARD"],
"LastUpdate": "2021-03-30T13:03:21.7628627Z",
diff --git a/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE1.json b/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE1.json
index 119e57067..7d4edce40 100644
--- a/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE1.json
+++ b/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE1.json
@@ -98,6 +98,11 @@
"PublicID": 123435430528,
"ScenePath": "assembly:/_pro/scenes/missions/elegant/scene_llama.entity",
"Entitlements": ["LOCATION_ELEGANT"],
- "Location": "LOCATION_ELEGANT_LLAMA"
+ "Location": "LOCATION_ELEGANT_LLAMA",
+ "GroupObjectiveDisplayOrder": [
+ { "Id": "fe4be56b-82e6-444a-ae9e-408e92b65380" },
+ { "Id": "122428ab-7075-4842-b54c-757c221723ef" },
+ { "Id": "8d606509-7d54-4dac-8142-a4349fd6279d" }
+ ]
}
}
diff --git a/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI2.json b/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI2.json
index 8bbe90d4c..bf7a591e3 100644
--- a/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI2.json
+++ b/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI2.json
@@ -202,13 +202,13 @@
"TileImage": "images/contracts/escalation/contractescalation_yannini_yearning.jpg",
"Entitlements": ["LOCATION_ELEGANT"],
"GroupObjectiveDisplayOrder": [
+ { "Id": "8d389836-3729-4751-8eea-b563271a698b", "IsNew": true },
+ { "Id": "9f409781-0a06-4748-b08d-784e78c6d481", "IsNew": true },
+ { "Id": "6a628ec5-a1d7-4a7e-9b25-b66e740ea6a6", "IsNew": true },
{ "Id": "1aa463cd-6a86-4b94-8ce4-0d66516cdf2c" },
{ "Id": "2c6caddc-0ec2-43bb-9b35-63106123e2f2" },
{ "Id": "f56d3e6f-ab06-472d-8fb4-2927b741c3ed" },
{ "Id": "a80f4f03-5951-4140-9452-8e8525ff4717" },
- { "Id": "8d389836-3729-4751-8eea-b563271a698b", "IsNew": true },
- { "Id": "9f409781-0a06-4748-b08d-784e78c6d481", "IsNew": true },
- { "Id": "6a628ec5-a1d7-4a7e-9b25-b66e740ea6a6", "IsNew": true },
{ "Id": "61d70ece-aa00-4840-9479-c9f6cd5e9e95" },
{ "Id": "7138fd16-4d15-4cca-816b-958e2f3a8164" }
]
diff --git a/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP2.json b/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP2.json
index aab1afdaa..f0102bf14 100644
--- a/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP2.json
+++ b/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP2.json
@@ -210,9 +210,9 @@
"TileImage": "images/contracts/escalation/contractescalation_khakiasp_documentation.jpg",
"GroupObjectiveDisplayOrder": [
{ "Id": "1052a8bf-55b9-4e06-aa2b-1bd0c69b6386", "IsNew": true },
+ { "Id": "5a842427-f14c-457e-8c19-f281afc721db", "IsNew": true },
{ "Id": "9e51ac13-88e1-45cd-9244-006d44ff715d" },
{ "Id": "38402d75-5dba-4f9a-b22d-96876514e37d" },
- { "Id": "5a842427-f14c-457e-8c19-f281afc721db", "IsNew": true },
{ "Id": "634a5886-8979-470c-b6d7-0aac1da231c3" }
],
"CreationTimestamp": "2021-06-01T14:21:34.2848229Z",
diff --git a/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH2.json b/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH2.json
index 8d3f47210..6db8a59b5 100644
--- a/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH2.json
+++ b/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH2.json
@@ -305,8 +305,8 @@
"GroupObjectiveDisplayOrder": [
{ "IsNew": true, "Id": "c0ce83d5-bdc1-4f2e-bac4-397bfc7504e5" },
{ "IsNew": true, "Id": "8b432578-16eb-4d1d-804d-275d6e2d84eb" },
- { "Id": "0ac94c6b-05a0-444f-b999-ba378564c0c1" },
{ "IsNew": true, "Id": "ec6d7d32-b436-4f8b-8bd2-f5115354a1c7" },
+ { "Id": "0ac94c6b-05a0-444f-b999-ba378564c0c1" },
{ "Id": "047b7d52-c73d-4e6b-9247-8591c6eb1a37" }
],
"Entitlements": ["H2_LEGACY_EXPANSION"]
diff --git a/contractdata/PARIS/ESCALATION/XMAS/XMAS1.json b/contractdata/PARIS/ESCALATION/XMAS/XMAS1.json
index 952a3da79..8c9710b80 100644
--- a/contractdata/PARIS/ESCALATION/XMAS/XMAS1.json
+++ b/contractdata/PARIS/ESCALATION/XMAS/XMAS1.json
@@ -9,7 +9,8 @@
"ObjectiveType": "custom",
"Image": "images/contracts/escalation/contractescalation_southern_comfort_5targets.jpg",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_SOUTHERN_COMFORT_XMASGIFT_TITLE"
+ "display": "$loc UI_PEACOCK_SOUTHERN_COMFORT_XMASGIFT_TITLE",
+ "iconType": 16
},
"Category": "primary",
"Definition": {
@@ -228,6 +229,9 @@
"Location": "LOCATION_PARIS_NOEL",
"InGroup": "07bbf22b-d6ae-4883-bec2-122eeeb7b665",
"TileImage": "images/contracts/escalation/contractescalation_southern_comfort.jpg",
- "Entitlements": ["H1_LEGACY_STANDARD"]
+ "Entitlements": ["H1_LEGACY_STANDARD"],
+ "GroupObjectiveDisplayOrder": [
+ { "Id": "e3368651-38e4-4e0c-91a0-95d76078b09f" }
+ ]
}
}
diff --git a/contractdata/PARIS/ESCALATION/XMAS/XMAS2.json b/contractdata/PARIS/ESCALATION/XMAS/XMAS2.json
index 2cd8fb677..6f34c7cac 100644
--- a/contractdata/PARIS/ESCALATION/XMAS/XMAS2.json
+++ b/contractdata/PARIS/ESCALATION/XMAS/XMAS2.json
@@ -91,7 +91,8 @@
"ObjectiveType": "custom",
"Image": "images/contracts/escalation/contractescalation_southern_comfort_5targets.jpg",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_SOUTHERN_COMFORT_XMASGIFT_TITLE"
+ "display": "$loc UI_PEACOCK_SOUTHERN_COMFORT_XMASGIFT_TITLE",
+ "iconType": 16
},
"Category": "primary",
"Definition": {
diff --git a/contractdata/PARIS/ESCALATION/XMAS/XMAS3.json b/contractdata/PARIS/ESCALATION/XMAS/XMAS3.json
index 1a183045b..63cce8f27 100644
--- a/contractdata/PARIS/ESCALATION/XMAS/XMAS3.json
+++ b/contractdata/PARIS/ESCALATION/XMAS/XMAS3.json
@@ -91,7 +91,8 @@
"ObjectiveType": "custom",
"Image": "images/contracts/escalation/contractescalation_southern_comfort_5targets.jpg",
"HUDTemplate": {
- "display": "$loc UI_PEACOCK_SOUTHERN_COMFORT_XMASGIFT_TITLE"
+ "display": "$loc UI_PEACOCK_SOUTHERN_COMFORT_XMASGIFT_TITLE",
+ "iconType": 16
},
"Category": "primary",
"Definition": {
diff --git a/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH3.json b/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH3.json
index 48b9857e4..710418a29 100644
--- a/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH3.json
+++ b/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH3.json
@@ -254,9 +254,9 @@
"GroupObjectiveDisplayOrder": [
{ "IsNew": true, "Id": "f48adfa1-6a75-48e9-b06c-cb4404349835" },
{ "IsNew": true, "Id": "7e8cd02d-b6c9-48be-a363-b1d1c3b55dd1" },
+ { "IsNew": true, "Id": "834a20cc-7cfc-4ec3-8858-c3a213e3de56" },
{ "Id": "28275372-d543-49ba-a799-97b9ca4b4cdf" },
{ "Id": "3846c991-edda-4b66-8d0f-d2a702b20fcf" },
- { "IsNew": true, "Id": "834a20cc-7cfc-4ec3-8858-c3a213e3de56" },
{ "Id": "98610b95-8908-4110-b9b8-c5d9696e7fbe" },
{ "Id": "f8feee12-0353-44ef-8b80-dfe0a0e11061" }
],
diff --git a/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO3.json b/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO3.json
index f115e85b6..7c08ef7be 100644
--- a/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO3.json
+++ b/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO3.json
@@ -165,9 +165,9 @@
"Location": "LOCATION_COASTALTOWN",
"Type": "escalation",
"GroupObjectiveDisplayOrder": [
+ { "IsNew": true, "Id": "421c9667-5055-4439-92a3-fa75c49c3050" },
{ "Id": "423f12e8-5489-40b2-8759-037a458c851d" },
{ "Id": "1319032f-5b50-4488-a790-b3b25c4a50f1" },
- { "IsNew": true, "Id": "421c9667-5055-4439-92a3-fa75c49c3050" },
{ "Id": "3db72bb5-63d6-47fe-9332-d7ea3c195e06" }
],
"Entitlements": ["H1_LEGACY_STANDARD"]
diff --git a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU1.json b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU1.json
index fc30cb073..a1e95efb8 100644
--- a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU1.json
+++ b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU1.json
@@ -145,7 +145,11 @@
"Entitlements": ["H2_LEGACY_STANDARD"],
"TileImage": "images/contracts/escalation/contractescalation_thornbush.jpg",
"Location": "LOCATION_NORTHAMERICA",
- "ScenePath": "assembly:/_pro/scenes/missions/skunk/scene_skunk.entity"
+ "ScenePath": "assembly:/_pro/scenes/missions/skunk/scene_skunk.entity",
+ "GroupObjectiveDisplayOrder": [
+ { "Id": "5a49ee9f-97e7-4e3b-90e6-0baa6d01b094" },
+ { "Id": "77daefbe-1b3c-40ab-b0eb-502dfe10231e" }
+ ]
},
"Peacock": { "noAgencyPickupsActive": true }
}
diff --git a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU2.json b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU2.json
index c7d558eb9..a1c4571d3 100644
--- a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU2.json
+++ b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU2.json
@@ -224,8 +224,8 @@
"ScenePath": "assembly:/_pro/scenes/missions/skunk/scene_skunk.entity",
"GroupObjectiveDisplayOrder": [
{ "Id": "77daefbe-1b3c-40ab-b0eb-502dfe10231e", "IsNew": true },
- { "Id": "5a49ee9f-97e7-4e3b-90e6-0baa6d01b094" },
- { "Id": "bb3b562d-b08b-41e5-ac57-801dc80532b0", "IsNew": true }
+ { "Id": "bb3b562d-b08b-41e5-ac57-801dc80532b0", "IsNew": true },
+ { "Id": "5a49ee9f-97e7-4e3b-90e6-0baa6d01b094" }
]
},
"Peacock": { "noAgencyPickupsActive": true }
diff --git a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU3.json b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU3.json
index 1a4455b4d..e20d4ab6d 100644
--- a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU3.json
+++ b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU3.json
@@ -357,8 +357,8 @@
{ "Id": "431fda16-1b98-49e2-9dbc-7977317e7dc8", "IsNew": true },
{ "Id": "905a76b2-07f6-4be9-b420-4b19124eaf9c", "IsNew": true },
{ "Id": "77daefbe-1b3c-40ab-b0eb-502dfe10231e" },
- { "Id": "5a49ee9f-97e7-4e3b-90e6-0baa6d01b094" },
- { "Id": "bb3b562d-b08b-41e5-ac57-801dc80532b0" }
+ { "Id": "bb3b562d-b08b-41e5-ac57-801dc80532b0" },
+ { "Id": "5a49ee9f-97e7-4e3b-90e6-0baa6d01b094" }
]
},
"Peacock": { "noAgencyPickupsActive": true }
diff --git a/resources/locale.json b/resources/locale.json
index 115c0dd61..025c07e22 100644
--- a/resources/locale.json
+++ b/resources/locale.json
@@ -241,17 +241,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "Eliminate The Personages",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "Eliminate all Elusive Targets that are part of The Personages.",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "Peacock Escalation in Hawke's Bay",
- "UI_PEACOCK_YULANIA": "The Selena Snarl",
- "UI_PEACOCK_YULANIA1": "The Selena Snarl - Level 1",
- "UI_PEACOCK_YULANIA2": "The Selena Snarl - Level 2",
- "UI_PEACOCK_YULANIA3": "The Selena Snarl - Level 3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "Extract the intel",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
- "UI_PEACOCK_YULANIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA": "The Selena Snarl",
+ "UI_PEACOCK_ASTERIA1": "The Selena Snarl - Level 1",
+ "UI_PEACOCK_ASTERIA2": "The Selena Snarl - Level 2",
+ "UI_PEACOCK_ASTERIA3": "The Selena Snarl - Level 3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "Extract the intel",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",
@@ -513,17 +513,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "Eliminate The Personages",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "Eliminate all Elusive Targets that are part of The Personages.",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "Peacock Escalation in Hawke's Bay",
- "UI_PEACOCK_YULANIA": "The Selena Snarl",
- "UI_PEACOCK_YULANIA1": "The Selena Snarl - Level 1",
- "UI_PEACOCK_YULANIA2": "The Selena Snarl - Level 2",
- "UI_PEACOCK_YULANIA3": "The Selena Snarl - Level 3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "Extract the intel",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
- "UI_PEACOCK_YULANIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA": "The Selena Snarl",
+ "UI_PEACOCK_ASTERIA1": "The Selena Snarl - Level 1",
+ "UI_PEACOCK_ASTERIA2": "The Selena Snarl - Level 2",
+ "UI_PEACOCK_ASTERIA3": "The Selena Snarl - Level 3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "Extract the intel",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",
@@ -784,17 +784,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "Eliminate The Personages",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "Eliminate all Elusive Targets that are part of The Personages.",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "Peacock Escalation in Hawke's Bay",
- "UI_PEACOCK_YULANIA": "The Selena Snarl",
- "UI_PEACOCK_YULANIA1": "The Selena Snarl - Level 1",
- "UI_PEACOCK_YULANIA2": "The Selena Snarl - Level 2",
- "UI_PEACOCK_YULANIA3": "The Selena Snarl - Level 3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "Extract the intel",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
- "UI_PEACOCK_YULANIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA": "The Selena Snarl",
+ "UI_PEACOCK_ASTERIA1": "The Selena Snarl - Level 1",
+ "UI_PEACOCK_ASTERIA2": "The Selena Snarl - Level 2",
+ "UI_PEACOCK_ASTERIA3": "The Selena Snarl - Level 3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "Extract the intel",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",
@@ -1061,17 +1061,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "Eliminate The Personages",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "Eliminate all Elusive Targets that are part of The Personages.",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "Peacock Escalation in Hawke's Bay",
- "UI_PEACOCK_YULANIA": "The Selena Snarl",
- "UI_PEACOCK_YULANIA1": "The Selena Snarl - Level 1",
- "UI_PEACOCK_YULANIA2": "The Selena Snarl - Level 2",
- "UI_PEACOCK_YULANIA3": "The Selena Snarl - Level 3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "Extract the intel",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
- "UI_PEACOCK_YULANIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA": "The Selena Snarl",
+ "UI_PEACOCK_ASTERIA1": "The Selena Snarl - Level 1",
+ "UI_PEACOCK_ASTERIA2": "The Selena Snarl - Level 2",
+ "UI_PEACOCK_ASTERIA3": "The Selena Snarl - Level 3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "Extract the intel",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",
@@ -1333,17 +1333,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "Eliminate The Personages",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "Eliminate all Elusive Targets that are part of The Personages.",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "Peacock Escalation in Hawke's Bay",
- "UI_PEACOCK_YULANIA": "The Selena Snarl",
- "UI_PEACOCK_YULANIA1": "The Selena Snarl - Level 1",
- "UI_PEACOCK_YULANIA2": "The Selena Snarl - Level 2",
- "UI_PEACOCK_YULANIA3": "The Selena Snarl - Level 3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "Extract the intel",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
- "UI_PEACOCK_YULANIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA": "The Selena Snarl",
+ "UI_PEACOCK_ASTERIA1": "The Selena Snarl - Level 1",
+ "UI_PEACOCK_ASTERIA2": "The Selena Snarl - Level 2",
+ "UI_PEACOCK_ASTERIA3": "The Selena Snarl - Level 3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "Extract the intel",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",
@@ -1604,17 +1604,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "Eliminate The Personages",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "Eliminate all Elusive Targets that are part of The Personages.",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "Peacock Escalation in Hawke's Bay",
- "UI_PEACOCK_YULANIA": "The Selena Snarl",
- "UI_PEACOCK_YULANIA1": "The Selena Snarl - Level 1",
- "UI_PEACOCK_YULANIA2": "The Selena Snarl - Level 2",
- "UI_PEACOCK_YULANIA3": "The Selena Snarl - Level 3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "Extract the intel",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
- "UI_PEACOCK_YULANIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA": "The Selena Snarl",
+ "UI_PEACOCK_ASTERIA1": "The Selena Snarl - Level 1",
+ "UI_PEACOCK_ASTERIA2": "The Selena Snarl - Level 2",
+ "UI_PEACOCK_ASTERIA3": "The Selena Snarl - Level 3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "Extract the intel",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",
@@ -1875,17 +1875,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "消灭“知名人士”",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "消灭组成“知名人士”的全部行踪不定的目标。",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "在霍克斯湾的Peacock升级契约",
- "UI_PEACOCK_YULANIA": "赛琳娜咆哮",
- "UI_PEACOCK_YULANIA1": "赛琳娜咆哮 - 第1关",
- "UI_PEACOCK_YULANIA2": "赛琳娜咆哮 - 第2关",
- "UI_PEACOCK_YULANIA3": "赛琳娜咆哮 - 第3关",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "提取情报",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "提取情报以开始游戏。",
- "UI_PEACOCK_YULANIA_CAPTAIN": "穿着战术潜水服，用狙击步枪消灭杰拉德·曼恩",
- "UI_PEACOCK_YULANIA_TAR1": "穿着战术潜水服，用狙击步枪消灭德怀特·奈",
- "UI_PEACOCK_YULANIA_TAR2": "穿着战术潜水服，用狙击步枪消灭朱利安·洛特里",
- "UI_PEACOCK_YULANIA_TAR3": "穿着战术潜水服，用狙击步枪消灭佩里·弗尔明",
- "UI_PEACOCK_YULANIA_TAR4": "穿着战术潜水服，用狙击步枪消灭贾维斯·科雷",
+ "UI_PEACOCK_ASTERIA": "赛琳娜咆哮",
+ "UI_PEACOCK_ASTERIA1": "赛琳娜咆哮 - 第1关",
+ "UI_PEACOCK_ASTERIA2": "赛琳娜咆哮 - 第2关",
+ "UI_PEACOCK_ASTERIA3": "赛琳娜咆哮 - 第3关",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "提取情报",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "提取情报以开始游戏。",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "穿着战术潜水服，用狙击步枪消灭杰拉德·曼恩",
+ "UI_PEACOCK_ASTERIA_TAR1": "穿着战术潜水服，用狙击步枪消灭德怀特·奈",
+ "UI_PEACOCK_ASTERIA_TAR2": "穿着战术潜水服，用狙击步枪消灭朱利安·洛特里",
+ "UI_PEACOCK_ASTERIA_TAR3": "穿着战术潜水服，用狙击步枪消灭佩里·弗尔明",
+ "UI_PEACOCK_ASTERIA_TAR4": "穿着战术潜水服，用狙击步枪消灭贾维斯·科雷",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "不得藏匿尸体",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "尸体不能被藏匿。一旦藏匿尸体，则任务立即失败。",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "单一视野",
@@ -2146,17 +2146,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "消滅人物",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "消滅組成人物的所有隱密目標。",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "在霍克斯灣達Peacock晉級。",
- "UI_PEACOCK_YULANIA": "賽利內亞努號",
- "UI_PEACOCK_YULANIA1": "賽利內亞努號——關卡1",
- "UI_PEACOCK_YULANIA2": "賽利內亞努號——關卡2",
- "UI_PEACOCK_YULANIA3": "賽利內亞努號——關卡3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "提取情報",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "提取情報以開始遊戲。",
- "UI_PEACOCK_YULANIA_CAPTAIN": "穿著戰術潛水服用狙擊步槍消滅傑拉德·曼",
- "UI_PEACOCK_YULANIA_TAR1": "穿著戰術潛水衣使用狙擊步槍消滅德懷特·奈伊",
- "UI_PEACOCK_YULANIA_TAR2": "穿著戰術潛水衣使用狙擊步槍消滅朱利安·朗特里",
- "UI_PEACOCK_YULANIA_TAR3": "穿著戰術潛水服用狙擊步槍消滅佩里·菲爾明",
- "UI_PEACOCK_YULANIA_TAR4": "穿著戰術潛水服用狙擊步槍消滅加韋斯·科里",
+ "UI_PEACOCK_ASTERIA": "賽利內亞努號",
+ "UI_PEACOCK_ASTERIA1": "賽利內亞努號——關卡1",
+ "UI_PEACOCK_ASTERIA2": "賽利內亞努號——關卡2",
+ "UI_PEACOCK_ASTERIA3": "賽利內亞努號——關卡3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "提取情報",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "提取情報以開始遊戲。",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "穿著戰術潛水服用狙擊步槍消滅傑拉德·曼",
+ "UI_PEACOCK_ASTERIA_TAR1": "穿著戰術潛水衣使用狙擊步槍消滅德懷特·奈伊",
+ "UI_PEACOCK_ASTERIA_TAR2": "穿著戰術潛水衣使用狙擊步槍消滅朱利安·朗特里",
+ "UI_PEACOCK_ASTERIA_TAR3": "穿著戰術潛水服用狙擊步槍消滅佩里·菲爾明",
+ "UI_PEACOCK_ASTERIA_TAR4": "穿著戰術潛水服用狙擊步槍消滅加韋斯·科里",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "不要隱藏屍體",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "屍體不得隱藏。 一旦隱藏屍體，任務就會失敗。",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "單一範圍",
@@ -2417,17 +2417,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "Eliminate The Personages",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "Eliminate all Elusive Targets that are part of The Personages.",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "Peacock Escalation in Hawke's Bay",
- "UI_PEACOCK_YULANIA": "The Selena Snarl",
- "UI_PEACOCK_YULANIA1": "The Selena Snarl - Level 1",
- "UI_PEACOCK_YULANIA2": "The Selena Snarl - Level 2",
- "UI_PEACOCK_YULANIA3": "The Selena Snarl - Level 3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "Extract the intel",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
- "UI_PEACOCK_YULANIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA": "The Selena Snarl",
+ "UI_PEACOCK_ASTERIA1": "The Selena Snarl - Level 1",
+ "UI_PEACOCK_ASTERIA2": "The Selena Snarl - Level 2",
+ "UI_PEACOCK_ASTERIA3": "The Selena Snarl - Level 3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "Extract the intel",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",
@@ -2689,17 +2689,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "Eliminate The Personages",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "Eliminate all Elusive Targets that are part of The Personages.",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "Peacock Escalation in Hawke's Bay",
- "UI_PEACOCK_YULANIA": "The Selena Snarl",
- "UI_PEACOCK_YULANIA1": "The Selena Snarl - Level 1",
- "UI_PEACOCK_YULANIA2": "The Selena Snarl - Level 2",
- "UI_PEACOCK_YULANIA3": "The Selena Snarl - Level 3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "Extract the intel",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
- "UI_PEACOCK_YULANIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA": "The Selena Snarl",
+ "UI_PEACOCK_ASTERIA1": "The Selena Snarl - Level 1",
+ "UI_PEACOCK_ASTERIA2": "The Selena Snarl - Level 2",
+ "UI_PEACOCK_ASTERIA3": "The Selena Snarl - Level 3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "Extract the intel",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",
@@ -2919,17 +2919,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "Eliminate The Personages",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "Eliminate all Elusive Targets that are part of The Personages.",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "Peacock Escalation in Hawke's Bay",
- "UI_PEACOCK_YULANIA": "The Selena Snarl",
- "UI_PEACOCK_YULANIA1": "The Selena Snarl - Level 1",
- "UI_PEACOCK_YULANIA2": "The Selena Snarl - Level 2",
- "UI_PEACOCK_YULANIA3": "The Selena Snarl - Level 3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "Extract the intel",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
- "UI_PEACOCK_YULANIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA": "The Selena Snarl",
+ "UI_PEACOCK_ASTERIA1": "The Selena Snarl - Level 1",
+ "UI_PEACOCK_ASTERIA2": "The Selena Snarl - Level 2",
+ "UI_PEACOCK_ASTERIA3": "The Selena Snarl - Level 3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "Extract the intel",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",
@@ -3188,17 +3188,17 @@
"UI_PEACOCK_KASTURI_COMPLETED_NAME": "Zlikwiduj Osobistości",
"UI_PEACOCK_KASTURI_COMPLETED_DESC": "Wyeliminuj wszystkie nieuchwytne cele, które są częścią Osobistości.",
"UI_PEACOCK_ESCALATION_HAWKESBAY_DESC": "Peacock Escalation in Hawke's Bay",
- "UI_PEACOCK_YULANIA": "The Selena Snarl",
- "UI_PEACOCK_YULANIA1": "The Selena Snarl - Level 1",
- "UI_PEACOCK_YULANIA2": "The Selena Snarl - Level 2",
- "UI_PEACOCK_YULANIA3": "The Selena Snarl - Level 3",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_NAME": "Extract the intel",
- "UI_PEACOCK_YULANIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
- "UI_PEACOCK_YULANIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
- "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA": "The Selena Snarl",
+ "UI_PEACOCK_ASTERIA1": "The Selena Snarl - Level 1",
+ "UI_PEACOCK_ASTERIA2": "The Selena Snarl - Level 2",
+ "UI_PEACOCK_ASTERIA3": "The Selena Snarl - Level 3",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_NAME": "Extract the intel",
+ "UI_PEACOCK_ASTERIA_STARTTHEGAME_DESC": "Extract the intel to start the game.",
+ "UI_PEACOCK_ASTERIA_CAPTAIN": "Eliminate Gerard Mann with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit",
+ "UI_PEACOCK_ASTERIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.",
"UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",
From 4673e22388ee2cabf76ae24e5a0442ea35dee9d9 Mon Sep 17 00:00:00 2001
From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com>
Date: Sun, 19 May 2024 23:02:45 +0800
Subject: [PATCH 2/3] fix ecsalationcodename
---
static/EscalationCodenames.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/static/EscalationCodenames.json b/static/EscalationCodenames.json
index 4eafe1bc2..d0b5dfa96 100644
--- a/static/EscalationCodenames.json
+++ b/static/EscalationCodenames.json
@@ -337,7 +337,7 @@
],
"Hawkes Bay": [
{
- "codename": "Yulania",
+ "codename": "Asteria",
"name": "🦚 The Selena Snarl",
"id": "e1e86206-d3f0-a819-e477-3d80e55e8a40",
"isPeacock": true
From db9d06b31490e5b7aef2e494d52247eb7f1d6886 Mon Sep 17 00:00:00 2001
From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com>
Date: Wed, 5 Jun 2024 22:59:47 +0800
Subject: [PATCH 3/3] change asteria body-hiding image
---
static/PeacockGameChangerProperties.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/static/PeacockGameChangerProperties.json b/static/PeacockGameChangerProperties.json
index d5acbbd66..075369b1d 100644
--- a/static/PeacockGameChangerProperties.json
+++ b/static/PeacockGameChangerProperties.json
@@ -144,7 +144,7 @@
"Description": "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC",
"Icon": null,
"IsHidden": null,
- "TileImage": "images/contracts/gamechangers/gamechanger_newzealand_nobodieshidden.jpg",
+ "TileImage": "images/contractconditions/condition_contrac_hide_all_bodies.jpg",
"Resource": [],
"Objectives": [
{