From 728a38e7bc9d5f7a561132e31b712a943537fa9d Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Sat, 4 May 2024 20:28:35 +0800 Subject: [PATCH 01/12] add mission files --- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json | 35 +++ .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json | 105 +++++++ .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json | 182 ++++++++++++ .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json | 270 ++++++++++++++++++ resources/locale.json | 192 ++++++++++++- static/EscalationCodenames.json | 6 + static/PeacockGameChangerProperties.json | 88 ++++++ 7 files changed, 866 insertions(+), 12 deletions(-) create mode 100644 contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json create mode 100644 contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json create mode 100644 contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json create mode 100644 contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json new file mode 100644 index 000000000..1340d82b6 --- /dev/null +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json @@ -0,0 +1,35 @@ +{ + "Data": { + "Objectives": [], + "GameChangers": [], + "Bricks": [], + "EnableSaving": false + }, + "Metadata": { + "Title": "UI_PEACOCK_ARTEMIS", + "Description": "UI_PEACOCK_ESCALATION_MUMBAI_DESC", + "Entitlements": ["H2_LEGACY_STANDARD"], + "ScenePath": "assembly:/_PRO/Scenes/Missions/Mumbai/scene_mongoose.entity", + "Location": "LOCATION_MUMBAI", + "IsPublished": true, + "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", + "GameVersion": "8.15.0.0", + "ServerVersion": "8.15.0.0", + "Type": "escalation", + "Id": "b4c961a0-42da-b4cc-b92a-763977de914c", + "PublicId": "166149848423", + "TileImage": "images/contracts/escalation/contractescalation_artemis.jpg", + "GroupDefinition": { + "Type": "escalation", + "Order": [ + "e47b7659-23f7-d6b9-ae27-d0f0e8943dbd", + "c9de4783-0950-67e7-1f53-411fda868445", + "6260472f-19d1-4292-904c-5c26b1f8ea4e" + ] + }, + "CreationTimestamp": "2024-04-08T12:29:31.554Z", + "Season": 0, + "OriginalSeason": 2 + }, + "UserData": {} +} diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json new file mode 100644 index 000000000..91634927c --- /dev/null +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json @@ -0,0 +1,105 @@ +{ + "Data": { + "EnableExits": { + "$eq": ["Completed", "$c51603b3-e08a-36cb-f00e-63e02b9e5e0a"] + }, + "EnableSaving": false, + "Objectives": [ + { + "Type": "statemachine", + "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_ARTEMIS_TAR1_NAME" + }, + "Category": "primary", + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["80051c02-e026-40fe-970a-7b7aaa62302c"] + }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "80051c02-e026-40fe-970a-7b7aaa62302c" + ] + }, + "Transition": "Success" + } + ] + } + } + } + }, + { + "Type": "statemachine", + "Id": "00deb548-dae5-312b-a86e-400965b98e57", + "Image": "images/contracts/escalation/contractescalation_artemis_khatavanga.jpg", + "BriefingName": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", + "BriefingText": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME" + }, + "ObjectiveType": "custom", + "Category": "primary", + "ForceShowOnLoadingScreen": true, + "ExcludeFromScoring": false, + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"] + }, + "States": { + "Start": { + "ItemPickedUp": [ + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "40e96ed0-7668-4d65-b88a-f44bfff5f537" + ] + }, + "Transition": "Success" + } + ] + } + } + } + } + ], + "GameChangers": ["36bd0cd1-ec01-b9e3-dcd8-08242823cafe"], + "Bricks": [] + }, + "Metadata": { + "Title": "UI_PEACOCK_ARTEMIS1", + "Description": "", + "Entitlements": ["H2_LEGACY_STANDARD"], + "ScenePath": "assembly:/_PRO/Scenes/Missions/Mumbai/scene_mongoose.entity", + "Location": "LOCATION_MUMBAI", + "IsPublished": true, + "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", + "GameVersion": "8.15.0.0", + "ServerVersion": "8.15.0.0", + "Type": "escalation", + "Id": "e47b7659-23f7-d6b9-ae27-d0f0e8943dbd", + "PublicId": "166149848423", + "TileImage": "images/contracts/escalation/contractescalation_artemis.jpg", + "GroupObjectiveDisplayOrder": [ + { + "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" + }, + { + "Id": "00deb548-dae5-312b-a86e-400965b98e57" + }, + { + "Id": "36bd0cd1-ec01-b9e3-dcd8-08242823cafe" + } + ], + "InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c", + "CreationTimestamp": "2024-04-08T12:29:31.554Z" + }, + "UserData": {} +} diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json new file mode 100644 index 000000000..763901489 --- /dev/null +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json @@ -0,0 +1,182 @@ +{ + "Data": { + "EnableExits": { + "$eq": [ + "Completed", + "$c51603b3-e08a-36cb-f00e-63e02b9e5e0a", + "$733ebb42-f27a-4c2e-3e93-49a3966e3611", + "$a516ae6b-ccb5-53f9-9220-4916a7522e4f" + ] + }, + "EnableSaving": false, + "Objectives": [ + { + "Type": "statemachine", + "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_ARTEMIS_TAR1_NAME" + }, + "Category": "primary", + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["80051c02-e026-40fe-970a-7b7aaa62302c"] + }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "80051c02-e026-40fe-970a-7b7aaa62302c" + ] + }, + "Transition": "Success" + } + ] + } + } + } + }, + { + "Type": "statemachine", + "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_ARTEMIS_TAR2_NAME" + }, + "Category": "primary", + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["332280ad-3b31-4913-99f1-794a4a46b98b"] + }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "332280ad-3b31-4913-99f1-794a4a46b98b" + ] + }, + "Transition": "Success" + } + ] + } + } + } + }, + { + "Type": "statemachine", + "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_ARTEMIS_TAR3_NAME" + }, + "Category": "primary", + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["72aa012a-d74d-493f-8b84-397b95efd385"] + }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "72aa012a-d74d-493f-8b84-397b95efd385" + ] + }, + "Transition": "Success" + } + ] + } + } + } + }, + { + "Type": "statemachine", + "Id": "00deb548-dae5-312b-a86e-400965b98e57", + "Image": "images/contracts/escalation/contractescalation_artemis_khatavanga.jpg", + "BriefingName": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", + "BriefingText": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME" + }, + "ObjectiveType": "custom", + "Category": "primary", + "ForceShowOnLoadingScreen": true, + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"] + }, + "States": { + "Start": { + "ItemPickedUp": [ + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "40e96ed0-7668-4d65-b88a-f44bfff5f537" + ] + }, + "Transition": "Success" + } + ] + } + } + } + } + ], + "GameChangers": [ + "36bd0cd1-ec01-b9e3-dcd8-08242823cafe", + "484d5cf9-0f31-50e0-0192-d057633e9305" + ], + "Bricks": [] + }, + "Metadata": { + "Title": "UI_PEACOCK_ARTEMIS2", + "Description": "", + "Entitlements": ["H2_LEGACY_STANDARD"], + "ScenePath": "assembly:/_PRO/Scenes/Missions/Mumbai/scene_mongoose.entity", + "Location": "LOCATION_MUMBAI", + "IsPublished": true, + "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", + "GameVersion": "8.15.0.0", + "ServerVersion": "8.15.0.0", + "Type": "escalation", + "Id": "c9de4783-0950-67e7-1f53-411fda868445", + "PublicId": "166149848423", + "TileImage": "images/contracts/escalation/contractescalation_artemis.jpg", + "GroupObjectiveDisplayOrder": [ + { + "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611", + "IsNew": true + }, + { + "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f", + "IsNew": true + }, + { + "Id": "484d5cf9-0f31-50e0-0192-d057633e9305", + "IsNew": true + }, + { + "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" + }, + { + "Id": "00deb548-dae5-312b-a86e-400965b98e57" + }, + { + "Id": "36bd0cd1-ec01-b9e3-dcd8-08242823cafe" + } + ], + "InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c", + "CreationTimestamp": "2024-04-08T12:29:31.554Z" + }, + "UserData": {} +} diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json new file mode 100644 index 000000000..59889996c --- /dev/null +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json @@ -0,0 +1,270 @@ +{ + "Data": { + "EnableExits": { + "$eq": [ + "Completed", + "$c51603b3-e08a-36cb-f00e-63e02b9e5e0a", + "$733ebb42-f27a-4c2e-3e93-49a3966e3611", + "$a516ae6b-ccb5-53f9-9220-4916a7522e4f" + ] + }, + "EnableSaving": false, + "Objectives": [ + { + "Type": "statemachine", + "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME" + }, + "Category": "primary", + "TargetConditions": [ + { + "Type": "disguise", + "RepositoryId": "e9e143e1-f5a6-40a5-af56-947cbf32e20a", + "HardCondition": true, + "ObjectiveId": "", + "KillMethod": "" + } + ], + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["80051c02-e026-40fe-970a-7b7aaa62302c"] + }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$and": [ + { + "$eq": [ + "$Value.RepositoryId", + "80051c02-e026-40fe-970a-7b7aaa62302c" + ] + }, + { + "$eq": [ + "$Value.OutfitRepositoryId", + "e9e143e1-f5a6-40a5-af56-947cbf32e20a" + ] + } + ] + }, + "Transition": "Success" + }, + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "80051c02-e026-40fe-970a-7b7aaa62302c" + ] + }, + "Transition": "Failure" + } + ] + } + } + } + }, + { + "Type": "statemachine", + "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME" + }, + "Category": "primary", + "TargetConditions": [ + { + "Type": "disguise", + "RepositoryId": "e9e143e1-f5a6-40a5-af56-947cbf32e20a", + "HardCondition": true, + "ObjectiveId": "", + "KillMethod": "" + } + ], + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["332280ad-3b31-4913-99f1-794a4a46b98b"] + }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$and": [ + { + "$eq": [ + "$Value.RepositoryId", + "332280ad-3b31-4913-99f1-794a4a46b98b" + ] + }, + + { + "$eq": [ + "$Value.OutfitRepositoryId", + "e9e143e1-f5a6-40a5-af56-947cbf32e20a" + ] + } + ] + }, + "Transition": "Success" + }, + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "332280ad-3b31-4913-99f1-794a4a46b98b" + ] + }, + "Transition": "Failure" + } + ] + } + } + } + }, + { + "Type": "statemachine", + "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME" + }, + "Category": "primary", + "TargetConditions": [ + { + "Type": "disguise", + "RepositoryId": "e9e143e1-f5a6-40a5-af56-947cbf32e20a", + "HardCondition": true, + "ObjectiveId": "", + "KillMethod": "" + } + ], + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["72aa012a-d74d-493f-8b84-397b95efd385"] + }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$and": [ + { + "$eq": [ + "$Value.RepositoryId", + "72aa012a-d74d-493f-8b84-397b95efd385" + ] + }, + + { + "$eq": [ + "$Value.OutfitRepositoryId", + "e9e143e1-f5a6-40a5-af56-947cbf32e20a" + ] + } + ] + }, + "Transition": "Success" + }, + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "72aa012a-d74d-493f-8b84-397b95efd385" + ] + }, + "Transition": "Success" + } + ] + } + } + } + }, + { + "Type": "statemachine", + "Id": "00deb548-dae5-312b-a86e-400965b98e57", + "Image": "images/contracts/escalation/contractescalation_artemis_khatavanga.jpg", + "BriefingName": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", + "BriefingText": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME" + }, + "ObjectiveType": "custom", + "Category": "primary", + "ForceShowOnLoadingScreen": true, + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"] + }, + "States": { + "Start": { + "ItemPickedUp": [ + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "40e96ed0-7668-4d65-b88a-f44bfff5f537" + ] + }, + "Transition": "Success" + } + ] + } + } + } + } + ], + "GameChangers": [ + "36bd0cd1-ec01-b9e3-dcd8-08242823cafe", + "484d5cf9-0f31-50e0-0192-d057633e9305", + "0cf5e693-35ec-457e-a004-da4672b90376" + ], + "Bricks": [] + }, + "Metadata": { + "Title": "UI_PEACOCK_ARTEMIS3", + "Description": "", + "Entitlements": ["H2_LEGACY_STANDARD"], + "ScenePath": "assembly:/_PRO/Scenes/Missions/Mumbai/scene_mongoose.entity", + "Location": "LOCATION_MUMBAI", + "IsPublished": true, + "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", + "GameVersion": "8.15.0.0", + "ServerVersion": "8.15.0.0", + "Type": "escalation", + "Id": "6260472f-19d1-4292-904c-5c26b1f8ea4e", + "PublicId": "166149848423", + "TileImage": "images/contracts/escalation/contractescalation_artemis.jpg", + "GroupObjectiveDisplayOrder": [ + { + "Id": "0cf5e693-35ec-457e-a004-da4672b90376", + "IsNew": true + }, + { + "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611" + }, + { + "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f" + }, + { + "Id": "484d5cf9-0f31-50e0-0192-d057633e9305" + }, + { + "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" + }, + { + "Id": "00deb548-dae5-312b-a86e-400965b98e57" + }, + { + "Id": "36bd0cd1-ec01-b9e3-dcd8-08242823cafe" + } + ], + "InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c", + "CreationTimestamp": "2024-04-08T12:29:31.554Z" + }, + "UserData": {} +} diff --git a/resources/locale.json b/resources/locale.json index 115c0dd61..ca61be8f0 100644 --- a/resources/locale.json +++ b/resources/locale.json @@ -268,7 +268,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "Fire-Tempered Hook", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.
  • Activate the shower.
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • ", + "UI_PEACOCK_ARTEMIS": "The Raptor Revenge", + "UI_PEACOCK_ARTEMIS1": "The Raptor Revenge - Level 1", + "UI_PEACOCK_ARTEMIS2": "The Raptor Revenge - Level 2", + "UI_PEACOCK_ARTEMIS3": "The Raptor Revenge - Level 3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "Eliminate The Kashmirian", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "Eliminate The Kashmirian as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "Eliminate Gilford Bootyswang", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "Eliminate Gilford Bootyswang as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." }, "french": { "UI_DRP_001": "UI_DRP_001", @@ -540,7 +554,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "Fire-Tempered Hook", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.
  • Activate the shower.
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • ", + "UI_PEACOCK_ARTEMIS": "The Raptor Revenge", + "UI_PEACOCK_ARTEMIS1": "The Raptor Revenge - Level 1", + "UI_PEACOCK_ARTEMIS2": "The Raptor Revenge - Level 2", + "UI_PEACOCK_ARTEMIS3": "The Raptor Revenge - Level 3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "Eliminate The Kashmirian", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "Eliminate The Kashmirian as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "Eliminate Gilford Bootyswang", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "Eliminate Gilford Bootyswang as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." }, "italian": { "UI_DRP_001": "UI_DRP_001", @@ -811,7 +839,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "Fire-Tempered Hook", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.
  • Activate the shower.
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • ", + "UI_PEACOCK_ARTEMIS": "The Raptor Revenge", + "UI_PEACOCK_ARTEMIS1": "The Raptor Revenge - Level 1", + "UI_PEACOCK_ARTEMIS2": "The Raptor Revenge - Level 2", + "UI_PEACOCK_ARTEMIS3": "The Raptor Revenge - Level 3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "Eliminate The Kashmirian", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "Eliminate The Kashmirian as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "Eliminate Gilford Bootyswang", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "Eliminate Gilford Bootyswang as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." }, "german": { "UI_DRP_001": "", @@ -1088,7 +1130,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "Fire-Tempered Hook", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.
  • Activate the shower.
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • ", + "UI_PEACOCK_ARTEMIS": "The Raptor Revenge", + "UI_PEACOCK_ARTEMIS1": "The Raptor Revenge - Level 1", + "UI_PEACOCK_ARTEMIS2": "The Raptor Revenge - Level 2", + "UI_PEACOCK_ARTEMIS3": "The Raptor Revenge - Level 3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "Eliminate The Kashmirian", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "Eliminate The Kashmirian as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "Eliminate Gilford Bootyswang", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "Eliminate Gilford Bootyswang as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." }, "spanish": { "UI_DRP_001": "UI_DRP_001", @@ -1360,7 +1416,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "Fire-Tempered Hook", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.
  • Activate the shower.
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • ", + "UI_PEACOCK_ARTEMIS": "The Raptor Revenge", + "UI_PEACOCK_ARTEMIS1": "The Raptor Revenge - Level 1", + "UI_PEACOCK_ARTEMIS2": "The Raptor Revenge - Level 2", + "UI_PEACOCK_ARTEMIS3": "The Raptor Revenge - Level 3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "Eliminate The Kashmirian", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "Eliminate The Kashmirian as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "Eliminate Gilford Bootyswang", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "Eliminate Gilford Bootyswang as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." }, "russian": { "UI_DRP_001": "UI_DRP_001", @@ -1631,7 +1701,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "Fire-Tempered Hook", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.
  • Activate the shower.
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • ", + "UI_PEACOCK_ARTEMIS": "The Raptor Revenge", + "UI_PEACOCK_ARTEMIS1": "The Raptor Revenge - Level 1", + "UI_PEACOCK_ARTEMIS2": "The Raptor Revenge - Level 2", + "UI_PEACOCK_ARTEMIS3": "The Raptor Revenge - Level 3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "Eliminate The Kashmirian", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "Eliminate The Kashmirian as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "Eliminate Gilford Bootyswang", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "Eliminate Gilford Bootyswang as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." }, "chineseSimplified": { "UI_DRP_001": "UI_DRP_001", @@ -1902,7 +1986,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "火淬肉钩", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • 在安布罗斯岛烧死卡尔顿·史密斯，并用钩子消灭他的狱友。
  • 激活淋浴设备。
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "晚餐就绪！", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • 在迪拜重新安排会议并封锁会议室。
  • 用平底锅制伏卡尔·英格拉姆和马库斯·斯图维森特。
  • 完成任务。
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • 在迪拜重新安排会议并封锁会议室。
  • 用平底锅制伏卡尔·英格拉姆和马库斯·斯图维森特。
  • 完成任务。
    • ", + "UI_PEACOCK_ARTEMIS": "猛禽的复仇", + "UI_PEACOCK_ARTEMIS1": "猛禽的复仇 - 第1关", + "UI_PEACOCK_ARTEMIS2": "猛禽的复仇 - 第2关", + "UI_PEACOCK_ARTEMIS3": "猛禽的复仇 - 第3关", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "消灭克什米尔人", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "伪装成乌鸦帮精英暴徒消灭克什米尔人", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "消灭吉尔福德·布蒂斯旺", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "伪装成乌鸦帮精英暴徒消灭吉尔福德·布蒂斯旺", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "消灭尼哈", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "伪装成乌鸦帮精英暴徒消灭尼哈", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[可选]获取骷髅杖", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "保护游客", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "不得制伏或消灭罗什尼·阿曼迪普，否则任务将会失败。", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "如果您在获得骷髅杖前跳跃、悬挂、攀登或攀爬，任务将失败。" }, "chineseTraditional": { "UI_DRP_001": "UI_DRP_001", @@ -2173,7 +2271,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "淬火鉤", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • 在安布羅斯島透過燒死卡爾頓·史密斯來消滅他，並用鉤子消滅他的獄友。
  • 啟動淋浴。
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "晚餐準備好了！", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • 重新安排會議並封鎖杜拜的會議室。
  • 用煎鍋安撫卡爾·英格拉姆和馬庫斯·史岱文森。
  • 完成任務。
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • 重新安排會議並封鎖杜拜的會議室。
  • 用煎鍋安撫卡爾·英格拉姆和馬庫斯·史岱文森。
  • 完成任務。
    • ", + "UI_PEACOCK_ARTEMIS": "攫禽雪恥", + "UI_PEACOCK_ARTEMIS1": "攫禽雪恥——關卡1", + "UI_PEACOCK_ARTEMIS2": "攫禽雪恥——關卡2", + "UI_PEACOCK_ARTEMIS3": "攫禽雪恥——關卡3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "消滅克什米爾人", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "作為烏鴉幫菁英流氓消滅克什米爾人", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "消滅吉爾福德·布蒂斯旺", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "作為烏鴉幫菁英流氓消滅吉爾福德·布蒂斯旺", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "消滅尼哈", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "作為烏鴉幫菁英流氓消滅尼哈", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[可選]得到骷髏杖", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "保護觀光客", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "不要制服或消滅 Roshni Amandeep，否則任務將會失敗。", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "如果您在獲得骷髏杖之前跳躍、懸掛、攀登或攀爬，您將失敗任務。" }, "japanese": { "UI_DRP_001": "UI_DRP_001", @@ -2444,7 +2556,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "Fire-Tempered Hook", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.
  • Activate the shower.
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • ", + "UI_PEACOCK_ARTEMIS": "The Raptor Revenge", + "UI_PEACOCK_ARTEMIS1": "The Raptor Revenge - Level 1", + "UI_PEACOCK_ARTEMIS2": "The Raptor Revenge - Level 2", + "UI_PEACOCK_ARTEMIS3": "The Raptor Revenge - Level 3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "Eliminate The Kashmirian", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "Eliminate The Kashmirian as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "Eliminate Gilford Bootyswang", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "Eliminate Gilford Bootyswang as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." }, "spanishMexican": { "UI_DRP_001": "UI_DRP_001", @@ -2716,7 +2842,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "Fire-Tempered Hook", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.
  • Activate the shower.
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • ", + "UI_PEACOCK_ARTEMIS": "The Raptor Revenge", + "UI_PEACOCK_ARTEMIS1": "The Raptor Revenge - Level 1", + "UI_PEACOCK_ARTEMIS2": "The Raptor Revenge - Level 2", + "UI_PEACOCK_ARTEMIS3": "The Raptor Revenge - Level 3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "Eliminate The Kashmirian", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "Eliminate The Kashmirian as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "Eliminate Gilford Bootyswang", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "Eliminate Gilford Bootyswang as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." }, "portugueseBrazil": { "UI_DRP_001": "UI_DRP_001", @@ -2946,7 +3086,21 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "Fire-Tempered Hook", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.
  • Activate the shower.
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • ", + "UI_PEACOCK_ARTEMIS": "The Raptor Revenge", + "UI_PEACOCK_ARTEMIS1": "The Raptor Revenge - Level 1", + "UI_PEACOCK_ARTEMIS2": "The Raptor Revenge - Level 2", + "UI_PEACOCK_ARTEMIS3": "The Raptor Revenge - Level 3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "Eliminate The Kashmirian", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "Eliminate The Kashmirian as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "Eliminate Gilford Bootyswang", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "Eliminate Gilford Bootyswang as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." }, "polish": { "UI_DRP_001": "UI_DRP_001", @@ -3215,6 +3369,20 @@ "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "Fire-Tempered Hook", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "
  • Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.
  • Activate the shower.
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • " + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • Rearrange the meeting and lockdown the meeting room in Dubai.
  • Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.
  • Complete the mission.
    • ", + "UI_PEACOCK_ARTEMIS": "The Raptor Revenge", + "UI_PEACOCK_ARTEMIS1": "The Raptor Revenge - Level 1", + "UI_PEACOCK_ARTEMIS2": "The Raptor Revenge - Level 2", + "UI_PEACOCK_ARTEMIS3": "The Raptor Revenge - Level 3", + "UI_PEACOCK_ARTEMIS_TAR1_NAME": "Eliminate The Kashmirian", + "UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME": "Eliminate The Kashmirian as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR2_NAME": "Eliminate Gilford Bootyswang", + "UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME": "Eliminate Gilford Bootyswang as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", + "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", + "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." } } diff --git a/static/EscalationCodenames.json b/static/EscalationCodenames.json index 4eafe1bc2..bf442b37f 100644 --- a/static/EscalationCodenames.json +++ b/static/EscalationCodenames.json @@ -439,6 +439,12 @@ } ], "Mumbai": [ + { + "codename": "Artemis", + "name": "🦚 The ", + "id": "b4c961a0-42da-b4cc-b92a-763977de914c", + "isPeacock": true + }, { "codename": "Khakiasp Documentation", "name": "🦚 The Khakiasp Documentation", diff --git a/static/PeacockGameChangerProperties.json b/static/PeacockGameChangerProperties.json index d5acbbd66..8ac85f4b8 100644 --- a/static/PeacockGameChangerProperties.json +++ b/static/PeacockGameChangerProperties.json @@ -206,5 +206,93 @@ } } ] + }, + "36bd0cd1-ec01-b9e3-dcd8-08242823cafe": { + "Name": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME", + "Description": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC", + "TileImage": "images/actors/actor_6c5d4bd8-d237-4558-bf46-292f649966d4_10_0_0.jpg", + "Icon": "images/challenges/default_challenge_icon.png", + "ObjectivesCategory": "primary", + "IsHidden": null, + "Resource": [], + "Objectives": [ + { + "ObjectiveType": "condition", + "Type": "statemachine", + "Id": "8de0d570-98f9-4243-857d-240417db6edb", + "ForceShowOnLoadingScreen": true, + "ExcludeFromScoring": true, + "Category": "primary", + "Definition": { + "Scope": "session", + "Context": { + "Allies": ["1f5e40b5-775f-4a4b-8c91-0f9fe59b2001"] + }, + "States": { + "Start": { + "exit_gate": { "Transition": "Success" }, + "Pacify": { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "1f5e40b5-775f-4a4b-8c91-0f9fe59b2001" + ] + }, + "Transition": "Failure" + }, + "Kill": { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "1f5e40b5-775f-4a4b-8c91-0f9fe59b2001" + ] + }, + "Transition": "Failure" + } + } + } + } + } + ] + }, + "484d5cf9-0f31-50e0-0192-d057633e9305": { + "Name": "UI_GAMECHANGERS_GLOBAL_NO_AGILITY_NAME", + "Description": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC", + "TileImage": "images/contractconditions/condition_contrac_no_agility.jpg", + "Icon": "images/challenges/default_challenge_icon.png", + "ObjectivesCategory": "primary", + "IsHidden": null, + "Resource": [], + "Objectives": [ + { + "ObjectiveType": "condition", + "Id": "9651d858-4081-f6f3-c642-690632173f46", + "Category": "primary", + "Type": "statemachine", + "BriefingText": "$loc UI_GAMECHANGERS_GLOBAL_NO_AGILITY_NAME", + "ExcludeFromScoring": true, + "Definition": { + "Scope": "session", + "Context": { + "Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"] + }, + "States": { + "Start": { + "Agility_Start": { "Transition": "Failure" }, + "ItemPickedUp": { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "40e96ed0-7668-4d65-b88a-f44bfff5f537" + ] + }, + "Transition": "Success" + }, + "exit_gate": { "Transition": "Success" } + } + } + } + } + ] } } From 03a773b6a3a24479dd4871a0dbaff64514533933 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Sat, 4 May 2024 21:32:57 +0800 Subject: [PATCH 02/12] fix quality --- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json | 7 ++- resources/locale.json | 48 ++++++++++++++----- static/PeacockGameChangerProperties.json | 32 +++++++++++++ 3 files changed, 74 insertions(+), 13 deletions(-) diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json index 59889996c..fa1e0777c 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json @@ -221,7 +221,8 @@ "GameChangers": [ "36bd0cd1-ec01-b9e3-dcd8-08242823cafe", "484d5cf9-0f31-50e0-0192-d057633e9305", - "0cf5e693-35ec-457e-a004-da4672b90376" + "0cf5e693-35ec-457e-a004-da4672b90376", + "297f1367-a233-8304-7ef8-50ed1298619f" ], "Bricks": [] }, @@ -240,6 +241,10 @@ "PublicId": "166149848423", "TileImage": "images/contracts/escalation/contractescalation_artemis.jpg", "GroupObjectiveDisplayOrder": [ + { + "Id": "297f1367-a233-8304-7ef8-50ed1298619f", + "IsNew": true + }, { "Id": "0cf5e693-35ec-457e-a004-da4672b90376", "IsNew": true diff --git a/resources/locale.json b/resources/locale.json index ca61be8f0..472f8ee57 100644 --- a/resources/locale.json +++ b/resources/locale.json @@ -282,7 +282,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." }, "french": { "UI_DRP_001": "UI_DRP_001", @@ -568,7 +570,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." }, "italian": { "UI_DRP_001": "UI_DRP_001", @@ -853,7 +857,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." }, "german": { "UI_DRP_001": "", @@ -1144,7 +1150,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." }, "spanish": { "UI_DRP_001": "UI_DRP_001", @@ -1430,7 +1438,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." }, "russian": { "UI_DRP_001": "UI_DRP_001", @@ -1715,7 +1725,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." }, "chineseSimplified": { "UI_DRP_001": "UI_DRP_001", @@ -2000,7 +2012,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[可选]获取骷髅杖", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "保护游客", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "不得制伏或消灭罗什尼·阿曼迪普，否则任务将会失败。", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "如果您在获得骷髅杖前跳跃、悬挂、攀登或攀爬，任务将失败。" + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "如果您在获得骷髅杖前跳跃、悬挂、攀登或攀爬，任务将失败。", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "乌鸦的离去", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "仅帮派藏身处出口可用。" }, "chineseTraditional": { "UI_DRP_001": "UI_DRP_001", @@ -2285,7 +2299,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[可選]得到骷髏杖", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "保護觀光客", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "不要制服或消滅 Roshni Amandeep，否則任務將會失敗。", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "如果您在獲得骷髏杖之前跳躍、懸掛、攀登或攀爬，您將失敗任務。" + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "如果您在獲得骷髏杖之前跳躍、懸掛、攀登或攀爬，您將失敗任務。", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "烏鴉的離去", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "只有幫派藏身處的出口可用。" }, "japanese": { "UI_DRP_001": "UI_DRP_001", @@ -2570,7 +2586,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." }, "spanishMexican": { "UI_DRP_001": "UI_DRP_001", @@ -2856,7 +2874,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." }, "portugueseBrazil": { "UI_DRP_001": "UI_DRP_001", @@ -3100,7 +3120,9 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." }, "polish": { "UI_DRP_001": "UI_DRP_001", @@ -3383,6 +3405,8 @@ "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission." + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." } } diff --git a/static/PeacockGameChangerProperties.json b/static/PeacockGameChangerProperties.json index 8ac85f4b8..3c65c38f9 100644 --- a/static/PeacockGameChangerProperties.json +++ b/static/PeacockGameChangerProperties.json @@ -294,5 +294,37 @@ } } ] + }, + "297f1367-a233-8304-7ef8-50ed1298619f": { + "Name": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_EXIT_NAME", + "Description": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_EXIT_DESC", + "Icon": "images/challenges/default_challenge_icon.png", + "IsHidden": null, + "TileImage": "images/challenges/Mumbai/Hideout_Exit.jpg", + "Resource": [], + "Objectives": [ + { + "Id": "3c59ca7b-04ed-3d78-3fb6-54810d1651c4", + "Category": "condition", + "Exits": ["1aa8a4a5-1c8f-4145-a87b-16b13817f6e5"], + "OnActive": { + "IfCompleted": { + "Visible": false + } + }, + "BriefingText": "", + "Type": "statemachine", + "Definition": { + "Scope": "session", + "States": { + "Start": { + "-": { + "Transition": "Success" + } + } + } + } + } + ] } } From 7ba26b754ff82e1cd02f5aa4893ae24f299ca061 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Sat, 4 May 2024 21:48:24 +0800 Subject: [PATCH 03/12] remove vanya servant entrance --- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json | 14 ++++++++++++++ .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json | 14 ++++++++++++++ .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json | 14 ++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json index 91634927c..eec6ce87e 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json @@ -3,6 +3,20 @@ "EnableExits": { "$eq": ["Completed", "$c51603b3-e08a-36cb-f00e-63e02b9e5e0a"] }, + "Entrances": [ + "a95703cb-091b-4d05-a2ee-3a70ade13590", + "f4659b56-65c3-4f4f-8f20-11d09af2f2d2", + "8b1c3ba0-9c91-4b3e-96f9-7d3c8632b7c2", + "51145d77-882e-4be0-a471-73704497aa8b", + "86a3857f-dad7-45ac-818b-d933e5c8dfd9", + "774b7dec-ce57-4318-9dbd-f6d7fa39ef1d", + "37af536b-3f36-49ed-986a-9d55f4481ed4", + "5e6a6e2c-ee2c-40a7-9de5-d7fb8fbd8dcd", + "f1bb66b5-b446-4a00-a951-af7310e28566", + "724b24ef-e87f-4060-b7ed-5c315fb0f29f", + "cc3ebf7d-0fcf-40bc-9b55-1e2426e66edd", + "0e33bbeb-2c77-419a-be0c-ce9c3627d543" + ], "EnableSaving": false, "Objectives": [ { diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json index 763901489..05bb4e55d 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json @@ -8,6 +8,20 @@ "$a516ae6b-ccb5-53f9-9220-4916a7522e4f" ] }, + "Entrances": [ + "a95703cb-091b-4d05-a2ee-3a70ade13590", + "f4659b56-65c3-4f4f-8f20-11d09af2f2d2", + "8b1c3ba0-9c91-4b3e-96f9-7d3c8632b7c2", + "51145d77-882e-4be0-a471-73704497aa8b", + "86a3857f-dad7-45ac-818b-d933e5c8dfd9", + "774b7dec-ce57-4318-9dbd-f6d7fa39ef1d", + "37af536b-3f36-49ed-986a-9d55f4481ed4", + "5e6a6e2c-ee2c-40a7-9de5-d7fb8fbd8dcd", + "f1bb66b5-b446-4a00-a951-af7310e28566", + "724b24ef-e87f-4060-b7ed-5c315fb0f29f", + "cc3ebf7d-0fcf-40bc-9b55-1e2426e66edd", + "0e33bbeb-2c77-419a-be0c-ce9c3627d543" + ], "EnableSaving": false, "Objectives": [ { diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json index fa1e0777c..98259c0af 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json @@ -8,6 +8,20 @@ "$a516ae6b-ccb5-53f9-9220-4916a7522e4f" ] }, + "Entrances": [ + "a95703cb-091b-4d05-a2ee-3a70ade13590", + "f4659b56-65c3-4f4f-8f20-11d09af2f2d2", + "8b1c3ba0-9c91-4b3e-96f9-7d3c8632b7c2", + "51145d77-882e-4be0-a471-73704497aa8b", + "86a3857f-dad7-45ac-818b-d933e5c8dfd9", + "774b7dec-ce57-4318-9dbd-f6d7fa39ef1d", + "37af536b-3f36-49ed-986a-9d55f4481ed4", + "5e6a6e2c-ee2c-40a7-9de5-d7fb8fbd8dcd", + "f1bb66b5-b446-4a00-a951-af7310e28566", + "724b24ef-e87f-4060-b7ed-5c315fb0f29f", + "cc3ebf7d-0fcf-40bc-9b55-1e2426e66edd", + "0e33bbeb-2c77-419a-be0c-ce9c3627d543" + ], "EnableSaving": false, "Objectives": [ { From 577c10ebe50cf4d16b35288cf4c73b6f35b115f8 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Sat, 4 May 2024 22:19:52 +0800 Subject: [PATCH 04/12] validation and challenges --- components/contracts/missionsInLocation.ts | 1 + .../MUMBAI/_H2_MUMBAI_CHALLENGES.json | 43 +++++++++++++++++++ contractdata/MUMBAI/_MUMBAI_CHALLENGES.json | 43 +++++++++++++++++++ static/EscalationCodenames.json | 2 +- 4 files changed, 88 insertions(+), 1 deletion(-) diff --git a/components/contracts/missionsInLocation.ts b/components/contracts/missionsInLocation.ts index cce922eae..41d2a6cea 100644 --- a/components/contracts/missionsInLocation.ts +++ b/components/contracts/missionsInLocation.ts @@ -164,6 +164,7 @@ export const missionsInLocations = { "d336d894-024a-4cd4-9867-dee7de70ee79", ], LOCATION_MUMBAI: [ + "b4c961a0-42da-b4cc-b92a-763977de914c", "667f48a3-7f6b-486e-8f6b-2f782a5c4857", "9badee3e-0014-46b1-9ef6-edf8858ba038", "b6a6330a-301a-4e8e-a26f-0f3e0ea809b5", diff --git a/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json b/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json index 7db5ddf5b..51eb2289b 100644 --- a/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json +++ b/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json @@ -4399,6 +4399,49 @@ "InclusionData": { "ContractIds": ["667f48a3-7f6b-486e-8f6b-2f782a5c4857"] } + }, + { + "Id": "5cecb675-9e34-349f-0fea-8b43f4a17e28", + "Name": "UI_PEACOCK_ARTEMIS", + "ImageName": "images/contracts/escalation/contractescalation_artemis.jpg", + "Description": "UI_CHALLENGES_ESCLATION_COMPLETE_DESC", + "Rewards": { + "MasteryXP": 4000 + }, + "Drops": [], + "IsPlayable": true, + "IsLocked": false, + "HideProgression": false, + "CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_COMMUNITY", + "Icon": "challenge_category_feats", + "LocationId": "LOCATION_MUMBAI", + "ParentLocationId": "LOCATION_PARENT_MUMBAI", + "Type": "contract", + "DifficultyLevels": [], + "OrderIndex": 10000, + "XpModifier": {}, + "RuntimeType": "Hit", + "Definition": { + "Context": {}, + "Scope": "session", + "States": { + "Start": { + "ContractEnd": { + "Condition": { + "$eq": [ + "$ContractId", + "6260472f-19d1-4292-904c-5c26b1f8ea4e" + ] + }, + "Transition": "Success" + } + } + } + }, + "Tags": ["feats", "hard"], + "InclusionData": { + "ContractIds": ["b4c961a0-42da-b4cc-b92a-763977de914c"] + } } ] }, diff --git a/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json b/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json index 42e85299c..908813a5b 100644 --- a/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json +++ b/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json @@ -4635,6 +4635,49 @@ "InclusionData": { "ContractIds": ["667f48a3-7f6b-486e-8f6b-2f782a5c4857"] } + }, + { + "Id": "5cecb675-9e34-349f-0fea-8b43f4a17e28", + "Name": "UI_PEACOCK_ARTEMIS", + "ImageName": "images/contracts/escalation/contractescalation_artemis.jpg", + "Description": "UI_CHALLENGES_ESCLATION_COMPLETE_DESC", + "Rewards": { + "MasteryXP": 4000 + }, + "Drops": [], + "IsPlayable": true, + "IsLocked": false, + "HideProgression": false, + "CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_COMMUNITY", + "Icon": "challenge_category_feats", + "LocationId": "LOCATION_MUMBAI", + "ParentLocationId": "LOCATION_PARENT_MUMBAI", + "Type": "contract", + "DifficultyLevels": [], + "OrderIndex": 10000, + "XpModifier": {}, + "RuntimeType": "Hit", + "Definition": { + "Context": {}, + "Scope": "session", + "States": { + "Start": { + "ContractEnd": { + "Condition": { + "$eq": [ + "$ContractId", + "6260472f-19d1-4292-904c-5c26b1f8ea4e" + ] + }, + "Transition": "Success" + } + } + } + }, + "Tags": ["feats", "hard"], + "InclusionData": { + "ContractIds": ["b4c961a0-42da-b4cc-b92a-763977de914c"] + } } ] }, diff --git a/static/EscalationCodenames.json b/static/EscalationCodenames.json index bf442b37f..1df08388f 100644 --- a/static/EscalationCodenames.json +++ b/static/EscalationCodenames.json @@ -441,7 +441,7 @@ "Mumbai": [ { "codename": "Artemis", - "name": "🦚 The ", + "name": "🦚 The Raptor Revenge", "id": "b4c961a0-42da-b4cc-b92a-763977de914c", "isPeacock": true }, From 0502eda038b2f0ca0a2226631347ebb9cb2a91ad Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Sat, 4 May 2024 22:24:40 +0800 Subject: [PATCH 05/12] add fail tips --- static/PeacockGameChangerProperties.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/PeacockGameChangerProperties.json b/static/PeacockGameChangerProperties.json index 3c65c38f9..f7c21f4cc 100644 --- a/static/PeacockGameChangerProperties.json +++ b/static/PeacockGameChangerProperties.json @@ -220,8 +220,9 @@ "ObjectiveType": "condition", "Type": "statemachine", "Id": "8de0d570-98f9-4243-857d-240417db6edb", + "BriefingText": "$loc UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME", "ForceShowOnLoadingScreen": true, - "ExcludeFromScoring": true, + "ExcludeFromScoring": false, "Category": "primary", "Definition": { "Scope": "session", From fc0f9e04dd59fe5c5ddb2f3ebf5f64a15841c91d Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Mon, 5 Aug 2024 10:56:23 +0800 Subject: [PATCH 06/12] make it smoother --- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json | 5 +- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json | 8 +-- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json | 4 -- resources/locale.json | 26 +-------- static/PeacockGameChangerProperties.json | 55 +------------------ 5 files changed, 6 insertions(+), 92 deletions(-) diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json index eec6ce87e..d5a81747d 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json @@ -84,7 +84,7 @@ } } ], - "GameChangers": ["36bd0cd1-ec01-b9e3-dcd8-08242823cafe"], + "GameChangers": [], "Bricks": [] }, "Metadata": { @@ -107,9 +107,6 @@ }, { "Id": "00deb548-dae5-312b-a86e-400965b98e57" - }, - { - "Id": "36bd0cd1-ec01-b9e3-dcd8-08242823cafe" } ], "InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c", diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json index 05bb4e55d..aa9591646 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json @@ -146,10 +146,7 @@ } } ], - "GameChangers": [ - "36bd0cd1-ec01-b9e3-dcd8-08242823cafe", - "484d5cf9-0f31-50e0-0192-d057633e9305" - ], + "GameChangers": ["484d5cf9-0f31-50e0-0192-d057633e9305"], "Bricks": [] }, "Metadata": { @@ -184,9 +181,6 @@ }, { "Id": "00deb548-dae5-312b-a86e-400965b98e57" - }, - { - "Id": "36bd0cd1-ec01-b9e3-dcd8-08242823cafe" } ], "InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c", diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json index 98259c0af..f046c7763 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json @@ -233,7 +233,6 @@ } ], "GameChangers": [ - "36bd0cd1-ec01-b9e3-dcd8-08242823cafe", "484d5cf9-0f31-50e0-0192-d057633e9305", "0cf5e693-35ec-457e-a004-da4672b90376", "297f1367-a233-8304-7ef8-50ed1298619f" @@ -277,9 +276,6 @@ }, { "Id": "00deb548-dae5-312b-a86e-400965b98e57" - }, - { - "Id": "36bd0cd1-ec01-b9e3-dcd8-08242823cafe" } ], "InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c", diff --git a/resources/locale.json b/resources/locale.json index 472f8ee57..3482984b0 100644 --- a/resources/locale.json +++ b/resources/locale.json @@ -280,8 +280,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." @@ -568,8 +566,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." @@ -855,8 +851,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." @@ -1148,8 +1142,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." @@ -1436,8 +1428,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." @@ -1723,8 +1713,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." @@ -2010,9 +1998,7 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "消灭尼哈", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "伪装成乌鸦帮精英暴徒消灭尼哈", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[可选]获取骷髅杖", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "保护游客", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "不得制伏或消灭罗什尼·阿曼迪普，否则任务将会失败。", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "如果您在获得骷髅杖前跳跃、悬挂、攀登或攀爬，任务将失败。", + "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "如果你在获得骷髅杖前跳跃、悬挂、攀登或攀爬，任务将失败。", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "乌鸦的离去", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "仅帮派藏身处出口可用。" }, @@ -2297,8 +2283,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "消滅尼哈", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "作為烏鴉幫菁英流氓消滅尼哈", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[可選]得到骷髏杖", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "保護觀光客", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "不要制服或消滅 Roshni Amandeep，否則任務將會失敗。", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "如果您在獲得骷髏杖之前跳躍、懸掛、攀登或攀爬，您將失敗任務。", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "烏鴉的離去", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "只有幫派藏身處的出口可用。" @@ -2584,8 +2568,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." @@ -2872,8 +2854,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." @@ -3118,8 +3098,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." @@ -3403,8 +3381,6 @@ "UI_PEACOCK_ARTEMIS_TAR3_NAME": "Eliminate Neha", "UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME": "Eliminate Neha as a Crows Gang Elite Thug", "UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME": "[Optional] Retrive the Khatavanga", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME": "Protect the Tourist", - "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC": "Do not pacify or eliminate Roshni Amandeep, or the mission will fail.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "If you vault, hang, scale or climb down before you get the Khatavanga, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "Departure of the Crow", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "Only the gang hideout exit is available." diff --git a/static/PeacockGameChangerProperties.json b/static/PeacockGameChangerProperties.json index f7c21f4cc..fe2d19937 100644 --- a/static/PeacockGameChangerProperties.json +++ b/static/PeacockGameChangerProperties.json @@ -207,55 +207,6 @@ } ] }, - "36bd0cd1-ec01-b9e3-dcd8-08242823cafe": { - "Name": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME", - "Description": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_DESC", - "TileImage": "images/actors/actor_6c5d4bd8-d237-4558-bf46-292f649966d4_10_0_0.jpg", - "Icon": "images/challenges/default_challenge_icon.png", - "ObjectivesCategory": "primary", - "IsHidden": null, - "Resource": [], - "Objectives": [ - { - "ObjectiveType": "condition", - "Type": "statemachine", - "Id": "8de0d570-98f9-4243-857d-240417db6edb", - "BriefingText": "$loc UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_SECUREVIP_NAME", - "ForceShowOnLoadingScreen": true, - "ExcludeFromScoring": false, - "Category": "primary", - "Definition": { - "Scope": "session", - "Context": { - "Allies": ["1f5e40b5-775f-4a4b-8c91-0f9fe59b2001"] - }, - "States": { - "Start": { - "exit_gate": { "Transition": "Success" }, - "Pacify": { - "Condition": { - "$eq": [ - "$Value.RepositoryId", - "1f5e40b5-775f-4a4b-8c91-0f9fe59b2001" - ] - }, - "Transition": "Failure" - }, - "Kill": { - "Condition": { - "$eq": [ - "$Value.RepositoryId", - "1f5e40b5-775f-4a4b-8c91-0f9fe59b2001" - ] - }, - "Transition": "Failure" - } - } - } - } - } - ] - }, "484d5cf9-0f31-50e0-0192-d057633e9305": { "Name": "UI_GAMECHANGERS_GLOBAL_NO_AGILITY_NAME", "Description": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC", @@ -297,8 +248,8 @@ ] }, "297f1367-a233-8304-7ef8-50ed1298619f": { - "Name": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_EXIT_NAME", - "Description": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_EXIT_DESC", + "Name": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME", + "Description": "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC", "Icon": "images/challenges/default_challenge_icon.png", "IsHidden": null, "TileImage": "images/challenges/Mumbai/Hideout_Exit.jpg", @@ -313,7 +264,7 @@ "Visible": false } }, - "BriefingText": "", + "BriefingText": "$loc UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC", "Type": "statemachine", "Definition": { "Scope": "session", From b315e103778058419f3f3527107a96556a552f45 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:41:50 +0800 Subject: [PATCH 07/12] remove duplicated line --- resources/locale.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/locale.json b/resources/locale.json index dd6ec5132..0f6c6255e 100644 --- a/resources/locale.json +++ b/resources/locale.json @@ -2300,7 +2300,6 @@ "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC": "如果您在獲得骷髏杖之前跳躍、懸掛、攀登或攀爬，您將失敗任務。", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_NAME": "烏鴉的離去", "UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_HIDEOUT_EXIT_DESC": "只有幫派藏身處的出口可用。", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "
  • 重新安排會議並封鎖杜拜的會議室。
  • 用煎鍋擊暈卡爾·英格倫和馬克斯·史岱文森。
  • 完成任務。
    • ", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "僅頭部攻擊", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "所有目標都必須透過爆頭或投擲致命的近戰武器的方式來消滅。" }, From a86a468e3948f6934c852f2cf6e047865117bcfa Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:44:33 +0800 Subject: [PATCH 08/12] run prettier --- static/PeacockGameChangerProperties.json | 72 ++++++++++++------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/static/PeacockGameChangerProperties.json b/static/PeacockGameChangerProperties.json index 3a1599b94..e53e422ee 100644 --- a/static/PeacockGameChangerProperties.json +++ b/static/PeacockGameChangerProperties.json @@ -297,42 +297,42 @@ "display": "$loc UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME", "iconType": 17 }, - "Definition": { - "Scope": "session", - "States": { - "Start": { - "-": { - "Transition": "Success" - } - }, - "Success": { - "Kill": { - "Condition": { - "$and": [ - { - "$eq": ["$Value.IsTarget", true] - }, - { - "$not": { - "$or": [ - { - "$eq": [ - "$Value.KillMethodBroad", - "throw" - ] - }, - { - "$eq": [ - "$Value.IsHeadshot", - true - ] - } - ] - } - } - ] - }, - "Transition": "Failure" + "Definition": { + "Scope": "session", + "States": { + "Start": { + "-": { + "Transition": "Success" + } + }, + "Success": { + "Kill": { + "Condition": { + "$and": [ + { + "$eq": ["$Value.IsTarget", true] + }, + { + "$not": { + "$or": [ + { + "$eq": [ + "$Value.KillMethodBroad", + "throw" + ] + }, + { + "$eq": [ + "$Value.IsHeadshot", + true + ] + } + ] + } + } + ] + }, + "Transition": "Failure" } } } From bc7036fd602adbe7a10cfa3d7160307cd205ebd6 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:37:57 +0800 Subject: [PATCH 09/12] definitive polish --- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json | 25 ++++------ .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json | 47 ++++++------------- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json | 24 ++++------ static/PeacockGameChangerProperties.json | 2 +- 4 files changed, 34 insertions(+), 64 deletions(-) diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json index d5a81747d..330c2b3e0 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json @@ -1,8 +1,5 @@ { "Data": { - "EnableExits": { - "$eq": ["Completed", "$c51603b3-e08a-36cb-f00e-63e02b9e5e0a"] - }, "Entrances": [ "a95703cb-091b-4d05-a2ee-3a70ade13590", "f4659b56-65c3-4f4f-8f20-11d09af2f2d2", @@ -27,7 +24,7 @@ }, "Category": "primary", "Definition": { - "Scope": "session", + "Scope": "hit", "Context": { "Targets": ["80051c02-e026-40fe-970a-7b7aaa62302c"] }, @@ -55,14 +52,15 @@ "BriefingName": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", "BriefingText": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", "HUDTemplate": { - "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME" + "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", + "iconType": 17 }, - "ObjectiveType": "custom", - "Category": "primary", + "ObjectiveType": "setpiece", + "Category": "secondary", "ForceShowOnLoadingScreen": true, "ExcludeFromScoring": false, "Definition": { - "Scope": "session", + "Scope": "hit", "Context": { "Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"] }, @@ -78,7 +76,8 @@ }, "Transition": "Success" } - ] + ], + "exit_gate": { "Transition": "Success" } } } } @@ -102,12 +101,8 @@ "PublicId": "166149848423", "TileImage": "images/contracts/escalation/contractescalation_artemis.jpg", "GroupObjectiveDisplayOrder": [ - { - "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" - }, - { - "Id": "00deb548-dae5-312b-a86e-400965b98e57" - } + { "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" }, + { "Id": "00deb548-dae5-312b-a86e-400965b98e57" } ], "InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c", "CreationTimestamp": "2024-04-08T12:29:31.554Z" diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json index aa9591646..9091bcfc1 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json @@ -1,13 +1,5 @@ { "Data": { - "EnableExits": { - "$eq": [ - "Completed", - "$c51603b3-e08a-36cb-f00e-63e02b9e5e0a", - "$733ebb42-f27a-4c2e-3e93-49a3966e3611", - "$a516ae6b-ccb5-53f9-9220-4916a7522e4f" - ] - }, "Entrances": [ "a95703cb-091b-4d05-a2ee-3a70ade13590", "f4659b56-65c3-4f4f-8f20-11d09af2f2d2", @@ -32,7 +24,7 @@ }, "Category": "primary", "Definition": { - "Scope": "session", + "Scope": "hit", "Context": { "Targets": ["80051c02-e026-40fe-970a-7b7aaa62302c"] }, @@ -61,7 +53,7 @@ }, "Category": "primary", "Definition": { - "Scope": "session", + "Scope": "hit", "Context": { "Targets": ["332280ad-3b31-4913-99f1-794a4a46b98b"] }, @@ -90,7 +82,7 @@ }, "Category": "primary", "Definition": { - "Scope": "session", + "Scope": "hit", "Context": { "Targets": ["72aa012a-d74d-493f-8b84-397b95efd385"] }, @@ -120,11 +112,12 @@ "HUDTemplate": { "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME" }, - "ObjectiveType": "custom", - "Category": "primary", + "ObjectiveType": "setpiece", + "Category": "secondary", "ForceShowOnLoadingScreen": true, + "ExcludeFromScoring": true, "Definition": { - "Scope": "session", + "Scope": "hit", "Context": { "Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"] }, @@ -140,7 +133,8 @@ }, "Transition": "Success" } - ] + ], + "exit_gate": { "Transition": "Success" } } } } @@ -164,24 +158,11 @@ "PublicId": "166149848423", "TileImage": "images/contracts/escalation/contractescalation_artemis.jpg", "GroupObjectiveDisplayOrder": [ - { - "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611", - "IsNew": true - }, - { - "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f", - "IsNew": true - }, - { - "Id": "484d5cf9-0f31-50e0-0192-d057633e9305", - "IsNew": true - }, - { - "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" - }, - { - "Id": "00deb548-dae5-312b-a86e-400965b98e57" - } + { "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611", "IsNew": true }, + { "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f", "IsNew": true }, + { "Id": "484d5cf9-0f31-50e0-0192-d057633e9305", "IsNew": true }, + { "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" }, + { "Id": "00deb548-dae5-312b-a86e-400965b98e57" } ], "InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c", "CreationTimestamp": "2024-04-08T12:29:31.554Z" diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json index f046c7763..d551eba07 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json @@ -1,13 +1,5 @@ { "Data": { - "EnableExits": { - "$eq": [ - "Completed", - "$c51603b3-e08a-36cb-f00e-63e02b9e5e0a", - "$733ebb42-f27a-4c2e-3e93-49a3966e3611", - "$a516ae6b-ccb5-53f9-9220-4916a7522e4f" - ] - }, "Entrances": [ "a95703cb-091b-4d05-a2ee-3a70ade13590", "f4659b56-65c3-4f4f-8f20-11d09af2f2d2", @@ -41,7 +33,7 @@ } ], "Definition": { - "Scope": "session", + "Scope": "hit", "Context": { "Targets": ["80051c02-e026-40fe-970a-7b7aaa62302c"] }, @@ -98,7 +90,7 @@ } ], "Definition": { - "Scope": "session", + "Scope": "hit", "Context": { "Targets": ["332280ad-3b31-4913-99f1-794a4a46b98b"] }, @@ -156,7 +148,7 @@ } ], "Definition": { - "Scope": "session", + "Scope": "hit", "Context": { "Targets": ["72aa012a-d74d-493f-8b84-397b95efd385"] }, @@ -206,11 +198,12 @@ "HUDTemplate": { "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME" }, - "ObjectiveType": "custom", - "Category": "primary", + "ObjectiveType": "setpiece", + "Category": "secondary", "ForceShowOnLoadingScreen": true, + "ExcludeFromScoring": true, "Definition": { - "Scope": "session", + "Scope": "hit", "Context": { "Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"] }, @@ -226,7 +219,8 @@ }, "Transition": "Success" } - ] + ], + "exit_gate": { "Transition": "Success" } } } } diff --git a/static/PeacockGameChangerProperties.json b/static/PeacockGameChangerProperties.json index e53e422ee..a489012ef 100644 --- a/static/PeacockGameChangerProperties.json +++ b/static/PeacockGameChangerProperties.json @@ -221,7 +221,7 @@ "Id": "9651d858-4081-f6f3-c642-690632173f46", "Category": "primary", "Type": "statemachine", - "BriefingText": "$loc UI_GAMECHANGERS_GLOBAL_NO_AGILITY_NAME", + "BriefingText": "$loc UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC", "ExcludeFromScoring": true, "Definition": { "Scope": "session", From 605009e384ae7a9d972e7b5f418bbc053ddecb19 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:02:51 +0800 Subject: [PATCH 10/12] update --- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json | 2 +- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json | 1 - .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json | 7 ++- .../MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json | 39 +++++--------- static/PeacockGameChangerProperties.json | 54 +++++++++++++++++-- 5 files changed, 68 insertions(+), 35 deletions(-) diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json index 1340d82b6..1da9ab196 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json @@ -24,7 +24,7 @@ "Order": [ "e47b7659-23f7-d6b9-ae27-d0f0e8943dbd", "c9de4783-0950-67e7-1f53-411fda868445", - "6260472f-19d1-4292-904c-5c26b1f8ea4e" + "6260472f-19d1-4293-904c-5c26b1f8ea4e" ] }, "CreationTimestamp": "2024-04-08T12:29:31.554Z", diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json index 330c2b3e0..5c241c95e 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json @@ -58,7 +58,6 @@ "ObjectiveType": "setpiece", "Category": "secondary", "ForceShowOnLoadingScreen": true, - "ExcludeFromScoring": false, "Definition": { "Scope": "hit", "Context": { diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json index 9091bcfc1..f6465db62 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json @@ -19,6 +19,7 @@ { "Type": "statemachine", "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a", + "BriefingText": "$loc UI_PEACOCK_ARTEMIS_TAR1_NAME", "HUDTemplate": { "display": "$loc UI_PEACOCK_ARTEMIS_TAR1_NAME" }, @@ -48,6 +49,7 @@ { "Type": "statemachine", "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611", + "BriefingText": "$loc UI_PEACOCK_ARTEMIS_TAR2_NAME", "HUDTemplate": { "display": "$loc UI_PEACOCK_ARTEMIS_TAR2_NAME" }, @@ -77,6 +79,7 @@ { "Type": "statemachine", "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f", + "BriefingText": "$loc UI_PEACOCK_ARTEMIS_TAR3_NAME", "HUDTemplate": { "display": "$loc UI_PEACOCK_ARTEMIS_TAR3_NAME" }, @@ -110,12 +113,12 @@ "BriefingName": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", "BriefingText": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", "HUDTemplate": { - "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME" + "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", + "iconType": 17 }, "ObjectiveType": "setpiece", "Category": "secondary", "ForceShowOnLoadingScreen": true, - "ExcludeFromScoring": true, "Definition": { "Scope": "hit", "Context": { diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json index d551eba07..c21ae060f 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json @@ -19,6 +19,7 @@ { "Type": "statemachine", "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a", + "BriefingText": "$loc UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME", "HUDTemplate": { "display": "$loc UI_PEACOCK_ARTEMIS_TAR1_CONDITION_NAME" }, @@ -76,6 +77,7 @@ { "Type": "statemachine", "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611", + "BriefingText": "$loc UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME", "HUDTemplate": { "display": "$loc UI_PEACOCK_ARTEMIS_TAR2_CONDITION_NAME" }, @@ -134,6 +136,7 @@ { "Type": "statemachine", "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f", + "BriefingText": "$loc UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME", "HUDTemplate": { "display": "$loc UI_PEACOCK_ARTEMIS_TAR3_CONDITION_NAME" }, @@ -196,12 +199,12 @@ "BriefingName": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", "BriefingText": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", "HUDTemplate": { - "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME" + "display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME", + "iconType": 17 }, "ObjectiveType": "setpiece", "Category": "secondary", "ForceShowOnLoadingScreen": true, - "ExcludeFromScoring": true, "Definition": { "Scope": "hit", "Context": { @@ -244,33 +247,17 @@ "GameVersion": "8.15.0.0", "ServerVersion": "8.15.0.0", "Type": "escalation", - "Id": "6260472f-19d1-4292-904c-5c26b1f8ea4e", + "Id": "6260472f-19d1-4293-904c-5c26b1f8ea4e", "PublicId": "166149848423", "TileImage": "images/contracts/escalation/contractescalation_artemis.jpg", "GroupObjectiveDisplayOrder": [ - { - "Id": "297f1367-a233-8304-7ef8-50ed1298619f", - "IsNew": true - }, - { - "Id": "0cf5e693-35ec-457e-a004-da4672b90376", - "IsNew": true - }, - { - "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611" - }, - { - "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f" - }, - { - "Id": "484d5cf9-0f31-50e0-0192-d057633e9305" - }, - { - "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" - }, - { - "Id": "00deb548-dae5-312b-a86e-400965b98e57" - } + { "Id": "297f1367-a233-8304-7ef8-50ed1298619f", "IsNew": true }, + { "Id": "0cf5e693-35ec-457e-a004-da4672b90376", "IsNew": true }, + { "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611" }, + { "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f" }, + { "Id": "484d5cf9-0f31-50e0-0192-d057633e9305" }, + { "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" }, + { "Id": "00deb548-dae5-312b-a86e-400965b98e57" } ], "InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c", "CreationTimestamp": "2024-04-08T12:29:31.554Z" diff --git a/static/PeacockGameChangerProperties.json b/static/PeacockGameChangerProperties.json index a489012ef..b349458d0 100644 --- a/static/PeacockGameChangerProperties.json +++ b/static/PeacockGameChangerProperties.json @@ -217,9 +217,9 @@ "Resource": [], "Objectives": [ { - "ObjectiveType": "condition", "Id": "9651d858-4081-f6f3-c642-690632173f46", "Category": "primary", + "ObjectiveType": "custom", "Type": "statemachine", "BriefingText": "$loc UI_PEACOCK_GAMECHANGERS_MUMBAI_ARTEMIS_AGILITY_DESC", "ExcludeFromScoring": true, @@ -230,7 +230,47 @@ }, "States": { "Start": { - "Agility_Start": { "Transition": "Failure" }, + "-": { "Transition": "Success" } + }, + "Success": { + "ObjectiveCompleted": { + "Condition": { + "$eq": [ + "$Value.Id", + "$c849a74b-0980-484b-b8e0-fb259b0678cc" + ] + }, + "Transition": "Failure" + } + } + } + } + }, + { + "_comment": "--- check 3 kills and agility ---", + "Id": "c849a74b-0980-484b-b8e0-fb259b0678cc", + "Category": "condition", + "ObjectiveType": "custom", + "ExcludeFromScoring": true, + "Type": "statemachine", + "Definition": { + "Context": { "TargetsKilled": 0 }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$eq": ["$Value.IsTarget", true] + }, + "Actions": { "$inc": "TargetKilled" } + }, + { + "Condition": { + "$eq": ["$.TargetsKill", 3] + }, + "Transition": "Failure" + } + ], "ItemPickedUp": { "Condition": { "$eq": [ @@ -238,9 +278,12 @@ "40e96ed0-7668-4d65-b88a-f44bfff5f537" ] }, - "Transition": "Success" + "Transition": "Failure" }, - "exit_gate": { "Transition": "Success" } + "Agility_Start": { "Transition": "Success" } + }, + "Failure": { + "ContractEnd": { "Transition": "Success" } } } } @@ -257,7 +300,8 @@ "Objectives": [ { "Id": "3c59ca7b-04ed-3d78-3fb6-54810d1651c4", - "Category": "condition", + "Category": "primary", + "ObjectiveType": "custom", "Exits": ["1aa8a4a5-1c8f-4145-a87b-16b13817f6e5"], "OnActive": { "IfCompleted": { From df49cecd4452119f19c7a012153405cdd407591c Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:06:53 +0800 Subject: [PATCH 11/12] update challenge id --- contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json | 2 +- contractdata/MUMBAI/_MUMBAI_CHALLENGES.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json b/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json index 51eb2289b..cea7726d7 100644 --- a/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json +++ b/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json @@ -4430,7 +4430,7 @@ "Condition": { "$eq": [ "$ContractId", - "6260472f-19d1-4292-904c-5c26b1f8ea4e" + "6260472f-19d1-4293-904c-5c26b1f8ea4e" ] }, "Transition": "Success" diff --git a/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json b/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json index 908813a5b..989e8f204 100644 --- a/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json +++ b/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json @@ -4666,7 +4666,7 @@ "Condition": { "$eq": [ "$ContractId", - "6260472f-19d1-4292-904c-5c26b1f8ea4e" + "6260472f-19d1-4293-904c-5c26b1f8ea4e" ] }, "Transition": "Success" From 0db0969779ac681e6f44dbe572e1a5dfedeb42ad Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Thu, 8 Aug 2024 11:52:59 +0800 Subject: [PATCH 12/12] remove change khatavanga objective to true when contractend --- contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json | 3 +-- contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json | 3 +-- contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json index 5c241c95e..e6cb6513d 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json @@ -75,8 +75,7 @@ }, "Transition": "Success" } - ], - "exit_gate": { "Transition": "Success" } + ] } } } diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json index f6465db62..c7bad189f 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json @@ -136,8 +136,7 @@ }, "Transition": "Success" } - ], - "exit_gate": { "Transition": "Success" } + ] } } } diff --git a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json index c21ae060f..0d1765e35 100644 --- a/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json +++ b/contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS3.json @@ -222,8 +222,7 @@ }, "Transition": "Success" } - ], - "exit_gate": { "Transition": "Success" } + ] } } }