From 944149e47047804e23dcddc9696af94560656895 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Sat, 21 Jun 2025 01:29:06 +0800 Subject: [PATCH 1/2] initial update --- components/contracts/elusiveTargetArcades.ts | 1 + components/contracts/missionsInLocation.ts | 1 + contractdata/ARCADE/MEDLAR/MEDLAR.json | 45 +++ contractdata/ARCADE/MEDLAR/MEDLAR1.json | 239 +++++++++++++++ contractdata/ARCADE/MEDLAR/MEDLAR2.json | 305 +++++++++++++++++++ contractdata/ARCADE/MEDLAR/MEDLAR3.json | 303 ++++++++++++++++++ contractdata/ARCADE/_ARCADE_CHALLENGES.json | 143 ++++++--- resources/locale.json | 132 +++++++- static/EscalationCodenames.json | 6 + static/PeacockGameChangerProperties.json | 113 ++++++- 10 files changed, 1228 insertions(+), 60 deletions(-) create mode 100644 contractdata/ARCADE/MEDLAR/MEDLAR.json create mode 100644 contractdata/ARCADE/MEDLAR/MEDLAR1.json create mode 100644 contractdata/ARCADE/MEDLAR/MEDLAR2.json create mode 100644 contractdata/ARCADE/MEDLAR/MEDLAR3.json diff --git a/components/contracts/elusiveTargetArcades.ts b/components/contracts/elusiveTargetArcades.ts index 92f654804..73b0547a6 100644 --- a/components/contracts/elusiveTargetArcades.ts +++ b/components/contracts/elusiveTargetArcades.ts @@ -17,6 +17,7 @@ */ export const orderedETAs = [ + "831a29a1-bf78-4527-95e8-d2f2437aff97", "797e204a-ef3d-463b-a386-57df0fe29b8f", "80582fdb-c77e-4d6a-b33f-1f14f34b72c4", "e9168f42-882e-4c7e-8353-33d2bd8bb864", diff --git a/components/contracts/missionsInLocation.ts b/components/contracts/missionsInLocation.ts index 2a2eda1b7..0452532d2 100644 --- a/components/contracts/missionsInLocation.ts +++ b/components/contracts/missionsInLocation.ts @@ -595,6 +595,7 @@ export const missionsInLocation = { "cab4293f-e359-419d-aa6f-83d91a158cf5", ], LOCATION_NORTHSEA: [ + "831a29a1-bf78-4527-95e8-d2f2437aff97", "b9f55fc3-c53f-4661-a4b6-9956303422aa", "6de90688-ad4c-457e-ae25-c4bbc8f55196", "07bc9bbf-7cba-4cdf-92bb-3ab57f09b1cc", diff --git a/contractdata/ARCADE/MEDLAR/MEDLAR.json b/contractdata/ARCADE/MEDLAR/MEDLAR.json new file mode 100644 index 000000000..a310a8b77 --- /dev/null +++ b/contractdata/ARCADE/MEDLAR/MEDLAR.json @@ -0,0 +1,45 @@ +{ + "Data": { + "EnableSaving": false, + "Objectives": [], + "Bricks": [], + "VR": [ + { + "Quality": "base", + "Bricks": [ + "assembly:/_pro/Scenes/Bricks/vr_setup.brick" + ] + } + ], + "GameChangers": [ + "6d79894f-132d-4977-b186-4d0a2382c912" + ], + "GameChangerReferences": [] + }, + "Metadata": { + "Id": "831a29a1-bf78-4527-95e8-d2f2437aff97", + "IsPublished": true, + "CreationTimestamp": "2021-01-12T12:24:16.194497Z", + "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", + "TileImage": "images/contracts/arcade/Arcade_Medlar_Group.jpg", + "Title": "UI_PEACOCK_MEDLAR_GROUP_TITLE", + "Description": "UI_CONTRACT_NECTARINE_GROUP_DESC", + "CodeName_Hint": "[PEACOCK] Arcade Medlar - Group", + "Location": "LOCATION_NORTHSEA", + "ScenePath": "assembly:/_pro/scenes/missions/theark/scene_penicillin.entity", + "Type": "arcade", + "Entitlements": [ + "LOCATION_GOLDEN" + ], + "GroupDefinition": { + "Type": "arcade", + "Order": [ + "c597c869-213b-4c65-a0f4-0e0d20608b59", + "9a05aab3-22b7-4a97-87ab-a81efd458713", + "82d02d36-9510-4309-b961-4748c2c77778" + ] + }, + "LastUpdate": "2023-02-24T10:14:36.1236307Z" + }, + "UserData": {} +} diff --git a/contractdata/ARCADE/MEDLAR/MEDLAR1.json b/contractdata/ARCADE/MEDLAR/MEDLAR1.json new file mode 100644 index 000000000..e7a48ca1b --- /dev/null +++ b/contractdata/ARCADE/MEDLAR/MEDLAR1.json @@ -0,0 +1,239 @@ +{ + "Data": { + "EnableSaving": false, + "Objectives": [ + { + "Id": "c12bb13e-f20d-406f-be39-bcab179ea3d5", + "Primary": true, + "IsHidden": true, + "BriefingName": "$loc UI_CONTRACT_PENICILLIN_OBJECTIVE_QUINN_NAME", + "BriefingText": "$loc UI_CONTRACT_PENICILLIN_OBJECTIVE_QUINN_DESC", + "HUDTemplate": { + "display": "$loc UI_CONTRACT_PENICILLIN_OBJECTIVE_QUINN_NAME", + "iconType": 17 + }, + "SuccessEvent": { + "EventName": "Kill", + "EventValues": { + "RepositoryId": "531a270c-67a1-41a1-8dfd-c84a4e8ee127" + } + } + }, + { + "_comment": "----- [HIDDEN] Pen Escaped -----", + "Id": "a50652e6-eccb-4491-97ea-d03ca15b11a0", + "Primary": true, + "ObjectiveType": "custom", + "ForceShowOnLoadingScreen": false, + "ExcludeFromScoring": true, + "OnActive": { + "IfInProgress": { + "Visible": false + }, + "IfCompleted": { + "Visible": false + }, + "IfFailed": { + "Visible": false + } + }, + "Image": "images/challenges/elusive_target/et_penicillin_started.jpg", + "BriefingName": "$loc UI_CONTRACT_PENICILLIN_OBJECTIVE_PEN_FAIL", + "BriefingText": "$loc UI_CONTRACT_PENICILLIN_OBJECTIVE_PEN_FAIL", + "HUDTemplate": { + "display": "$loc UI_CONTRACT_PENICILLIN_OBJECTIVE_QUINN_NAME", + "iconType": 17 + }, + "Type": "statemachine", + "Definition": { + "display": { + "iconType": 17 + }, + "Scope": "session", + "States": { + "Start": { + "Pen_Escaped": { + "Transition": "Failure" + }, + "Pen_Done": { + "Transition": "Success" + } + } + } + } + }, + { + "_comment": "----- Do Not Eliminate Tim Quinn [Optional] -----", + "Id": "f965e220-bfe0-4b2f-8c47-40472dedfbd6", + "Category": "secondary", + "ForceShowOnLoadingScreen": true, + "IsHidden": false, + "ObjectiveType": "custom", + "Image": "images/contracts/elusive/s3_penicillin/objective2.jpg", + "BriefingName": "$loc UI_CONTRACT_PENICILLIN_OBJECTIVE_QUINN_NAME", + "HUDTemplate": { + "display": "$loc UI_CONTRACT_PENICILLIN_OBJECTIVE_QUINN_NAME", + "iconType": 17 + }, + "BriefingText": "$loc UI_CONTRACT_PENICILLIN_OBJECTIVE_QUINN_DESC", + "Type": "statemachine", + "ExcludeFromScoring": false, + "Definition": { + "States": { + "Start": { + "ContractEnd": { + "Transition": "Success" + }, + "Kill": [ + { + "Condition": { + "$and": [ + { + "$eq": [ + "$Value.RepositoryId", + "4addab15-2ea0-4868-aaed-f544fe05e62b" + ] + } + ] + }, + "Transition": "Failure" + } + ] + } + } + } + }, + { + "Id": "03834afc-9aae-4a2a-803d-e60363ca1c3c", + "Type": "statemachine", + "Category": "condition", + "ExcludeFromScoring": true, + "OnActive": { + "IfInProgress": { + "Visible": false + }, + "IfCompleted": { + "Visible": true + }, + "IfFailed": { + "Visible": false + } + }, + "Definition": { + "Scope": "session", + "Context": {}, + "States": { + "Start": { + "TargetEscapeStarted": { + "Transition": "Failure" + } + } + } + } + }, + { + "Activation": { + "$eq": [ + "$03834afc-9aae-4a2a-803d-e60363ca1c3c", + "Failed" + ] + }, + "HUDTemplate": { + "display": "$loc EGAME_TEXT_SL_TARGET_ESCAPING" + }, + "Id": "f92b9623-6cb5-44cb-b9a2-bf483a3bfe1d", + "Scope": "session", + "Type": "statemachine", + "Category": "secondary", + "ExcludeFromScoring": true, + "OnActive": { + "IfInProgress": { + "Visible": true + }, + "IfFailed": { + "Visible": false + }, + "IfCompleted": { + "Visible": false + } + }, + "Definition": { + "ContextListeners": { + "Timeout": { + "type": "custom", + "HUDTemplate": { + "display": { + "$loc": { + "key": "UI_CONTRACT_HAWK_TIMER_TIMED_OUT", + "iconType": 17, + "data": [] + } + } + } + } + }, + "Context": { + "Timeout": 1 + }, + "States": { + "Start": { + "BeginTimer": { + "Transition": "TimerRunning" + } + }, + "TimerRunning": { + "$timer": { + "Condition": { + "$after": 70 + }, + "Actions": { + "$dec": "Timeout" + }, + "Transition": "Failure" + }, + "EndTimer": { + "Transition": "Failure" + } + } + } + } + } + ], + "Bricks": [], + "GameChangers": [ + "6d79894f-132d-4977-b186-4d0a2382c912" + ] + }, + "Metadata": { + "Id": "c597c869-213b-4c65-a0f4-0e0d20608b59", + "CodeName_Hint": "Arcade Medlar Penicillin", + "Type": "arcade", + "Title": "UI_PEACOCK_MEDLAR_LEVEL1_TITLE", + "Description": "UI_CONTRACT_PENICILLIN_DESC", + "BriefingVideo": "briefing_penicillin", + "ScenePath": "assembly:/_pro/scenes/missions/theark/scene_penicillin.entity", + "TileImage": "images/contracts/elusive/S3_Penicillin/Title.jpg", + "Location": "LOCATION_NORTHSEA", + "IsPublished": true, + "LastUpdate": "2015-03-10T12:00:00.441Z", + "CreationTimestamp": "2024-06-27T11:54:42.5164222Z", + "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", + "Entitlements": [ + "LOCATION_GOLDEN" + ], + "InGroup": "831a29a1-bf78-4527-95e8-d2f2437aff97", + "GroupObjectiveDisplayOrder": [ + { + "Id": "6d79894f-132d-4977-b186-4d0a2382c912", + "IsNew": true + }, + { + "Id": "c12bb13e-f20d-406f-be39-bcab179ea3d5" + }, + { + "Id": "f965e220-bfe0-4b2f-8c47-40472dedfbd6" + } + ] + }, + "UserData": {} +} diff --git a/contractdata/ARCADE/MEDLAR/MEDLAR2.json b/contractdata/ARCADE/MEDLAR/MEDLAR2.json new file mode 100644 index 000000000..c6e84e41b --- /dev/null +++ b/contractdata/ARCADE/MEDLAR/MEDLAR2.json @@ -0,0 +1,305 @@ +{ + "Data": { + "Bricks": [ + "assembly:/_pro/scenes/missions/wet/mission_lambic.brick", + "assembly:/_pro/scenes/missions/wet/scenario_lambic.brick" + ], + "DevOnlyBricks": [ + "assembly:/_pro/scenes/missions/wet/dev_lambic.brick" + ], + "GameChangers": [ + "6d79894f-132d-4977-b186-4d0a2382c912" + ], + "Entrances": [ + "bd3df5ac-b7b8-45dd-99ed-681428786384" + ], + "EnableSaving": false, + "Objectives": [ + { + "_comment": "----- Eliminate Max Valliant (no instinct) -----", + "Id": "15c53180-29ec-40e7-98f9-887d3999ceef", + "Category": "primary", + "IsHidden": true, + "ExcludeFromScoring": true, + "ObjectiveType": "custom", + "BriefingName": "$loc UI_CONTRACT_LAMBIC_ACTOR_LAMBIC_NAME", + "BriefingText": "$loc UI_CONTRACT_LAMBIC_OBJ_LAMBIC_NAME", + "LongBriefingText": "$loc UI_CONTRACT_LAMBIC_ACTOR_LAMBIC_DESC", + "Image": "Images/Actors/elusive_Lambic_face.jpg", + "HUDTemplate": { + "display": "$loc UI_CONTRACT_LAMBIC_OBJ_LAMBIC_NAME" + }, + "DisplayAsKillObjective": true, + "OnInactive": { + "IfCompleted": { + "State": "Completed", + "Visible": false + }, + "IfInProgress": { + "Visible": false + } + }, + "OnActive": { + "IfCompleted": { + "Visible": false + } + }, + "Type": "statemachine", + "Definition": { + "Scope": "Hit", + "Context": { + "Targets": [ + "9c2190fa-0095-4fa9-9f27-394e09c96bc5" + ] + }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$inarray": { + "in": "$.Targets", + "?": { + "$eq": [ + "$.#", + "$Value.RepositoryId" + ] + } + } + }, + "Transition": "Success" + } + ], + "Lambic_EnableSecondaryTargetsObjective": { + "Transition": "Success" + } + } + } + } + }, + { + "_comment": "----- Eliminate Max Valliant (instinct) -----", + "Id": "a38f56a6-e877-42e4-864f-ea1153818c26", + "Category": "primary", + "Activation": { + "$eq": [ + "$15c53180-29ec-40e7-98f9-887d3999ceef", + "Completed" + ] + }, + "OnInactive": { + "IfCompleted": { + "State": "Completed", + "Visible": true + } + }, + "OnActive": { + "IfCompleted": { + "Visible": true + } + }, + "SuccessEvent": { + "EventName": "Kill", + "EventValues": { + "RepositoryId": "9c2190fa-0095-4fa9-9f27-394e09c96bc5" + } + } + }, + { + "_comment": "----- Eliminate secondary targets (hidden) -----", + "Id": "acd7b21f-a088-4980-a49d-4a7c7e70cdf5", + "Type": "statemachine", + "Category": "primary", + "IsHidden": true, + "ExcludeFromScoring": true, + "OnInactive": { + "IfCompleted": { + "State": "Completed", + "Visible": false + } + }, + "OnActive": { + "IfInProgress": { + "Visible": false + }, + "IfCompleted": { + "Visible": false + }, + "IfFailed": { + "Visible": false + } + }, + "Definition": { + "Scope": "session", + "Context": { + "Targets": [], + "TargetCount": 0 + }, + "States": { + "Start": { + "AddTarget": [ + { + "Actions": { + "$pushunique": [ + "Targets", + "$Value.RepositoryId" + ], + "$inc": "TargetCount" + } + } + ], + "Kill": [ + { + "Condition": { + "$inarray": { + "in": "$.Targets", + "?": { + "$eq": [ + "$.#", + "$Value.RepositoryId" + ] + } + } + }, + "Actions": { + "$dec": "TargetCount" + } + }, + { + "Condition": { + "$eq": [ + "$.TargetCount", + 0 + ] + }, + "Transition": "Success" + } + ], + "Lambic_EnableSecondaryTargetsObjective": { + "Transition": "Success" + } + } + } + } + }, + { + "_comment": "----- Eliminate secondary targets -----", + "Id": "0158e00e-88e7-4e95-bbf6-bca90f673a23", + "Category": "primary", + "Image": "Images/Contracts/Elusive/S3_Lambic/Secondary_Target.jpg", + "BriefingName": "$loc UI_CONTRACT_LAMBIC_OBJ_SECONDARY_NAME", + "BriefingText": "$loc UI_CONTRACT_LAMBIC_OBJ_SECONDARY_DESC", + "LongBriefingText": "$loc UI_CONTRACT_LAMBIC_OBJ_SECONDARY_LONG", + "HUDTemplate": { + "display": "$loc UI_CONTRACT_LAMBIC_OBJ_SECONDARY_HUD", + "iconType": 0 + }, + "ObjectiveType": "custom", + "Type": "statemachine", + "Scope": "hit", + "Activation": { + "$eq": [ + "$acd7b21f-a088-4980-a49d-4a7c7e70cdf5", + "Completed" + ] + }, + "OnInactive": { + "IfCompleted": { + "State": "Completed", + "Visible": true + } + }, + "Definition": { + "Context": { + "Targets": [], + "TargetCount": 0 + }, + "ContextListeners": { + "TargetCount": { + "type": "objective-counter", + "header": "UI_CONTRACT_LAMBIC_OBJ_SECONDARY_COUNTER" + } + }, + "States": { + "Start": { + "AddTarget": [ + { + "Actions": { + "$pushunique": [ + "Targets", + "$Value.RepositoryId" + ], + "$inc": "TargetCount" + } + } + ], + "Kill": [ + { + "Condition": { + "$inarray": { + "in": "$.Targets", + "?": { + "$eq": [ + "$.#", + "$Value.RepositoryId" + ] + } + } + }, + "Actions": { + "$dec": "TargetCount" + } + }, + { + "Condition": { + "$eq": [ + "$.TargetCount", + 0 + ] + }, + "Transition": "Success" + } + ] + } + } + } + } + ] + }, + "Metadata": { + "Id": "9a05aab3-22b7-4a97-87ab-a81efd458713", + "CodeName_Hint": "Arcade Medlar Lambic", + "Type": "arcade", + "Title": "UI_PEACOCK_MEDLAR_LEVEL2_TITLE", + "Description": "UI_CONTRACT_LAMBIC_DESC", + "BriefingVideo": "briefing_lambic", + "DebriefingVideo": "debriefing_lambic", + "ScenePath": "assembly:/_pro/scenes/missions/wet/scene_wet_lambic.entity", + "TileImage": "Images/Contracts/Elusive/S3_Lambic/Title.jpg", + "Location": "LOCATION_WET_RAT", + "IsPublished": true, + "LastUpdate": "2015-03-10T12:00:00.441Z", + "CreationTimestamp": "2024-12-12T10:56:54.2760006Z", + "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", + "Entitlements": [ + "LOCATION_GOLDEN" + ], + "PublicId": "030924302847", + "InGroup": "831a29a1-bf78-4527-95e8-d2f2437aff97", + "GroupObjectiveDisplayOrder": [ + { + "Id": "6d79894f-132d-4977-b186-4d0a2382c912" + }, + { + "Id": "15c53180-29ec-40e7-98f9-887d3999ceef" + }, + { + "Id": "a38f56a6-e877-42e4-864f-ea1153818c26" + }, + { + "Id": "0158e00e-88e7-4e95-bbf6-bca90f673a23" + } + ] + }, + "UserData": {} +} diff --git a/contractdata/ARCADE/MEDLAR/MEDLAR3.json b/contractdata/ARCADE/MEDLAR/MEDLAR3.json new file mode 100644 index 000000000..ed8899e88 --- /dev/null +++ b/contractdata/ARCADE/MEDLAR/MEDLAR3.json @@ -0,0 +1,303 @@ +{ + "Data": { + "EnableSaving": false, + "Bricks": [ + "assembly:/_PRO/Scenes/Missions/Paris/scenario_frenchmartini.brick" + ], + "DevOnlyBricks": [ + "assembly:/_PRO/scenes/missions/paris/dev_frenchmartini.brick" + ], + "VR": [ + { + "Quality": "ps4_vr1", + "Bricks": [ + "assembly:/_pro/Scenes/Bricks/vr_setup.brick", + "assembly:/_pro/scenes/missions/paris/vr_overrides_peacock_ps4_vr1.brick", + "assembly:/_pro/scenes/missions/paris/vr_agility_overrides_peacock_ps4_vr1.brick", + "assembly:/_pro/scenes/missions/paris/vr_overrides_low_performance.brick", + "assembly:/_pro/scenes/missions/paris/vr_overrides_not_peacock_ps4_vr1.brick" + ] + }, + { + "Quality": "base", + "Bricks": [ + "assembly:/_pro/Scenes/Bricks/vr_setup.brick", + "assembly:/_pro/scenes/missions/paris/vr_overrides_peacock.brick", + "assembly:/_pro/scenes/missions/paris/vr_agility_overrides_peacock.brick", + "assembly:/_pro/scenes/missions/paris/vr_overrides_low_performance.brick", + "assembly:/_pro/scenes/missions/paris/vr_overrides_not_peacock.brick" + ] + }, + { + "Quality": "better", + "Bricks": [ + "assembly:/_pro/Scenes/Bricks/vr_setup.brick", + "assembly:/_pro/scenes/missions/paris/vr_overrides_peacock.brick", + "assembly:/_pro/scenes/missions/paris/vr_agility_overrides_peacock.brick", + "assembly:/_pro/scenes/missions/paris/vr_overrides_not_peacock.brick" + ] + } + ], + "GameChangers": [ + "f42433c0-9574-49fa-bfb4-ddb9e55b1474", + "6d79894f-132d-4977-b186-4d0a2382c912" + ], + "Entrances": [ + "74062d4a-3386-44b8-83e0-1d0348e5976f", + "67aec874-287f-4c82-9e01-3dbd7683faac", + "3bdb62b5-15ef-4eb6-94b1-7f2e0cdf1d31", + "4c548094-0903-4ea2-8c20-8bf1461b6674" + ], + "Objectives": [ + { + "_comment": "----- Eliminate target -----", + "Id": "24a12651-1247-4db7-b896-280a45c9f731", + "Category": "primary", + "IsHidden": true, + "SuccessEvent": { + "EventName": "Kill", + "EventValues": { + "RepositoryId": "54f583de-f261-4473-956c-dc278e5162e2" + } + } + }, + { + "_comment": "----- Enable optional target -----", + "Id": "6d234a73-2ae4-445d-be8a-e9c92b177e5b", + "Category": "condition", + "ExcludeFromScoring": true, + "Type": "statemachine", + "Definition": { + "Context": {}, + "States": { + "Start": { + "EnableOptionalTarget": { + "Transition": "Success" + } + } + } + } + }, + { + "_comment": "----- Eliminate optional target -----", + "Id": "8bff61ab-42e0-4c94-b74f-2303548ad028", + "Category": "secondary", + "ExcludeFromScoring": true, + "IsHidden": true, + "Activation": { + "$eq": [ + "$6d234a73-2ae4-445d-be8a-e9c92b177e5b", + "Completed" + ] + }, + "SuccessEvent": { + "EventName": "Kill", + "EventValues": { + "RepositoryId": "8ea03ee0-7eac-4efa-8206-af4531cc00ee" + } + } + }, + { + "Id": "db93108b-137f-42f6-af1e-81cf1a1959fe", + "Category": "condition", + "ExcludeFromScoring": true, + "Type": "statemachine", + "OnActive": { + "IfInProgress": { + "Visible": false + }, + "IfCompleted": { + "Visible": true + }, + "IfFailed": { + "Visible": false + } + }, + "Definition": { + "Scope": "session", + "Context": {}, + "States": { + "Start": { + "47Poisoned": { + "Transition": "Failure" + } + } + } + } + }, + { + "Id": "2919d130-5d1a-4e89-8e2e-dfac16b4907f", + "Category": "secondary", + "ExcludeFromScoring": true, + "Type": "statemachine", + "Activation": { + "$eq": [ + "$db93108b-137f-42f6-af1e-81cf1a1959fe", + "Failed" + ] + }, + "OnActive": { + "IfInProgress": { + "Visible": true + }, + "IfFailed": { + "Visible": false + }, + "IfCompleted": { + "Visible": false + } + }, + "HUDTemplate": { + "display": "$loc UI_ET_FRENCHMARTINI_OPPORTUNITY_STEP_ANTIDOTE" + }, + "Definition": { + "ContextListeners": { + "Timeout": { + "type": "custom", + "HUDTemplate": { + "display": { + "$loc": { + "key": "UI_CONTRACT_HAWK_TIMER_TIMED_OUT", + "data": [] + } + } + } + } + }, + "Context": { + "Timeout": 1 + }, + "States": { + "Start": { + "BeginTimer": { + "Transition": "TimerRunning" + } + }, + "TimerRunning": { + "$timer": { + "Condition": { + "$after": 70 + }, + "Actions": { + "$dec": "Timeout" + }, + "Transition": "Failure" + }, + "EndTimer": { + "Transition": "Failure" + } + } + } + } + }, + { + "Id": "01821807-ff15-4ee3-94ec-d6633cb645ca", + "Category": "condition", + "ExcludeFromScoring": true, + "Type": "statemachine", + "OnActive": { + "IfInProgress": { + "Visible": false + }, + "IfCompleted": { + "Visible": false + }, + "IfFailed": { + "Visible": false + } + }, + "Definition": { + "Scope": "session", + "Context": {}, + "States": { + "Start": { + "TargetEscapeStarted": { + "Transition": "Failure" + } + } + } + } + }, + { + "Id": "2f964b33-50ad-45f3-8ca6-ac2b0d0d7d4d", + "Category": "primary", + "ExcludeFromScoring": true, + "BriefingText": "$loc UI_CONTRACT_FRENCHMARTINI_OBJ_TARGETESCAPING_TEXT", + "HUDTemplate": { + "display": "$loc UI_CONTRACT_FRENCHMARTINI_OBJ_TARGETESCAPING_HUD" + }, + "OnInactive": { + "IfCompleted": { + "State": "Completed" + } + }, + "OnActive": { + "IfCompleted": { + "Visible": false + } + }, + "Activation": { + "$eq": [ + "$01821807-ff15-4ee3-94ec-d6633cb645ca", + "Failed" + ] + }, + "Type": "statemachine", + "Definition": { + "Context": {}, + "States": { + "Start": { + "TargetEscapeCompleted": { + "Transition": "Failure" + }, + "Kill": { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "54f583de-f261-4473-956c-dc278e5162e2" + ] + }, + "Transition": "Success" + } + } + } + } + } + ] + }, + "Metadata": { + "Id": "82d02d36-9510-4309-b961-4748c2c77778", + "CodeName_Hint": "Arcade Medlar FrenchMartini", + "Type": "arcade", + "Title": "UI_PEACOCK_MEDLAR_LEVEL3_TITLE", + "Description": "UI_CONTRACT_FRENCHMARTINI_DESC", + "BriefingVideo": "briefing_frenchmartini", + "DebriefingVideo": "debriefing_frenchmartini", + "ScenePath": "assembly:/_PRO/Scenes/Missions/Paris/_scene_frenchmartini.entity", + "TileImage": "images/contracts/elusive/s3_frenchmartini/Title.jpg", + "Location": "LOCATION_PARIS", + "IsPublished": true, + "LastUpdate": "2015-03-10T12:00:00.441Z", + "CreationTimestamp": "2025-06-06T22:46:19.3168883Z", + "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", + "Entitlements": [ + "LOCATION_GOLDEN" + ], + "PublicId": "002100552847", + "InGroup": "831a29a1-bf78-4527-95e8-d2f2437aff97", + "GroupObjectiveDisplayOrder": [ + { + "Id": "6d79894f-132d-4977-b186-4d0a2382c912" + }, + { + "Id": "f42433c0-9574-49fa-bfb4-ddb9e55b1474" + }, + { + "Id": "24a12651-1247-4db7-b896-280a45c9f731" + }, + { + "Id": "8bff61ab-42e0-4c94-b74f-2303548ad028" + } + ] + } +} diff --git a/contractdata/ARCADE/_ARCADE_CHALLENGES.json b/contractdata/ARCADE/_ARCADE_CHALLENGES.json index d75f74116..bf448e082 100644 --- a/contractdata/ARCADE/_ARCADE_CHALLENGES.json +++ b/contractdata/ARCADE/_ARCADE_CHALLENGES.json @@ -12,6 +12,106 @@ "Description": "UI_MENU_PAGE_CHALLENGE_CATEGORY_DESCRIPTION_ARCADE", "OrderIndex": 6, "Challenges": [ + { + "Id": "b78af358-765b-4fb0-bac0-87fd038ea86f", + "Name": "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME", + "ImageName": "images/contracts/arcade/Arcade_Medlar_Group.jpg", + "Description": "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC", + "Rewards": { + "MasteryXP": 4000 + }, + "Drops": [ + "TOKEN_OUTFIT_LAMBIC_KICKBOXER_REWARD_PURPLE" + ], + "IsPlayable": false, + "IsLocked": false, + "HideProgression": false, + "CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_ARCADE", + "Icon": "arcademode", + "LocationId": "LOCATION_PARIS", + "ParentLocationId": "LOCATION_PARENT_PARIS", + "Type": "contract", + "DifficultyLevels": [], + "OrderIndex": 10000, + "XpModifier": {}, + "RuntimeType": "Hit", + "Definition": { + "Context": {}, + "Scope": "session", + "States": { + "Start": { + "ContractEnd": { + "Condition": { + "$eq": [ + "$ContractId", + "82d02d36-9510-4309-b961-4748c2c77778" + ] + }, + "Transition": "Success" + } + } + } + }, + "Tags": [ + "arcade", + "hard" + ], + "InclusionData": { + "ContractIds": [ + "831a29a1-bf78-4527-95e8-d2f2437aff97" + ] + } + }, + { + "Id": "02f9c806-1f2e-4f55-8a49-8b4a7e93a521", + "Name": "UI_PEACOCK_KASTURI_COMPLETED_NAME", + "ImageName": "images/contracts/arcade/Arcade_Kasturi_Group.jpg", + "Description": "UI_PEACOCK_KASTURI_COMPLETED_DESC", + "Rewards": { + "MasteryXP": 4000 + }, + "Drops": [ + "TOKEN_OUTFIT_HERO_PURPLESPECIAL_SUIT" + ], + "IsPlayable": false, + "IsLocked": false, + "HideProgression": false, + "CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_ARCADE", + "Icon": "arcademode", + "LocationId": "LOCATION_EGDY_FOX", + "ParentLocationId": "LOCATION_PARENT_EDGY", + "Type": "contract", + "DifficultyLevels": [], + "OrderIndex": 10000, + "XpModifier": {}, + "RuntimeType": "Hit", + "Definition": { + "Context": {}, + "Scope": "session", + "States": { + "Start": { + "ContractEnd": { + "Condition": { + "$eq": [ + "$ContractId", + "78131b0a-2320-4008-adf1-2d81f018abe7" + ] + }, + "Transition": "Success" + } + } + } + }, + "Tags": [ + "arcade", + "hard" + ], + "InclusionData": { + "ContractIds": [ + "797e204a-ef3d-463b-a386-57df0fe29b8f" + ] + } + }, { "Id": "1d73703c-c25b-4213-85f8-f988ab47200e", "Name": "UI_BLACKCURRANT_COMPLETION_CHALLENGE_NAME", @@ -872,49 +972,6 @@ "ContractIds": ["e4b29c19-13b4-471b-b188-cd9c0a788cd0"] } }, - { - "Id": "02f9c806-1f2e-4f55-8a49-8b4a7e93a521", - "Name": "UI_PEACOCK_KASTURI_COMPLETED_NAME", - "ImageName": "images/contracts/arcade/Arcade_Kasturi_Group.jpg", - "Description": "UI_PEACOCK_KASTURI_COMPLETED_DESC", - "Rewards": { - "MasteryXP": 4000 - }, - "Drops": ["TOKEN_OUTFIT_HERO_PURPLESPECIAL_SUIT"], - "IsPlayable": false, - "IsLocked": false, - "HideProgression": false, - "CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_ARCADE", - "Icon": "arcademode", - "LocationId": "LOCATION_EGDY_FOX", - "ParentLocationId": "LOCATION_PARENT_EDGY", - "Type": "contract", - "DifficultyLevels": [], - "OrderIndex": 10000, - "XpModifier": {}, - "RuntimeType": "Hit", - "Definition": { - "Context": {}, - "Scope": "session", - "States": { - "Start": { - "ContractEnd": { - "Condition": { - "$eq": [ - "$ContractId", - "78131b0a-2320-4008-adf1-2d81f018abe7" - ] - }, - "Transition": "Success" - } - } - } - }, - "Tags": ["arcade", "hard"], - "InclusionData": { - "ContractIds": ["797e204a-ef3d-463b-a386-57df0fe29b8f"] - } - }, { "Id": "70fc6583-e596-4210-a53e-4ed42d6c3435", "Name": "UI_LIME_COMPLETION_CHALLENGE_NAME", diff --git a/resources/locale.json b/resources/locale.json index bb6999e40..87ac5ba2a 100644 --- a/resources/locale.json +++ b/resources/locale.json @@ -272,7 +272,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "Head Attack Only", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "All targets must be eliminated by using headshots or throwing lethal melee weapons.", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "The Avatars", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "The Avatars - Level 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "The Avatars - Level 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "The Avatars - Level 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "Pacify Before Elimination", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "You need to pacify the target before you can eliminate them.", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "Pacify the target before you can eliminate them", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "Eliminate The Avatars", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • Eliminate all Elusive Targets that are part of The Avatars.
    • " }, "french": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -548,7 +557,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "Attaque à la tête uniquement", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "Toutes les cibles doivent être éliminées avec des tirs à la tête ou des lancers d'objets de corps à corps mortels.", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "Tout comme prévu", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "Un voyage au paradis" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "Un voyage au paradis", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "The Avatars", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "The Avatars - Level 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "The Avatars - Level 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "The Avatars - Level 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "Pacify Before Elimination", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "You need to pacify the target before you can eliminate them.", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "Pacify the target before you can eliminate them", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "Eliminate The Avatars", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • Eliminate all Elusive Targets that are part of The Avatars.
    • " }, "italian": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -823,7 +841,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "Head Attack Only", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "All targets must be eliminated by using headshots or throwing lethal melee weapons.", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "The Avatars", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "The Avatars - Level 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "The Avatars - Level 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "The Avatars - Level 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "Pacify Before Elimination", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "You need to pacify the target before you can eliminate them.", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "Pacify the target before you can eliminate them", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "Eliminate The Avatars", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • Eliminate all Elusive Targets that are part of The Avatars.
    • " }, "german": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -1104,7 +1131,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "Head Attack Only", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "All targets must be eliminated by using headshots or throwing lethal melee weapons.", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "The Avatars", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "The Avatars - Level 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "The Avatars - Level 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "The Avatars - Level 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "Pacify Before Elimination", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "You need to pacify the target before you can eliminate them.", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "Pacify the target before you can eliminate them", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "Eliminate The Avatars", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • Eliminate all Elusive Targets that are part of The Avatars.
    • " }, "spanish": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -1380,7 +1416,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "Head Attack Only", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "All targets must be eliminated by using headshots or throwing lethal melee weapons.", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "The Avatars", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "The Avatars - Level 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "The Avatars - Level 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "The Avatars - Level 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "Pacify Before Elimination", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "You need to pacify the target before you can eliminate them.", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "Pacify the target before you can eliminate them", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "Eliminate The Avatars", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • Eliminate all Elusive Targets that are part of The Avatars.
    • " }, "russian": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -1655,7 +1700,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "Head Attack Only", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "All targets must be eliminated by using headshots or throwing lethal melee weapons.", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "The Avatars", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "The Avatars - Level 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "The Avatars - Level 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "The Avatars - Level 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "Pacify Before Elimination", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "You need to pacify the target before you can eliminate them.", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "Pacify the target before you can eliminate them", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "Eliminate The Avatars", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • Eliminate all Elusive Targets that are part of The Avatars.
    • " }, "chineseSimplified": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -1930,7 +1984,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "仅限头部攻击", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "必须使用爆头或投掷致命近战武器消灭所有目标。", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "化身", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "化身 - 第1关", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "化身 - 第2关", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "化身 - 第3关", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "制伏后消灭", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "在消灭目标之前，你需要先将其制伏。", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "制伏后再消灭目标", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "消灭“化身”", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • 消灭组成“化身”的全部行踪不定的目标。
    • " }, "chineseTraditional": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -2205,7 +2268,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "僅頭部攻擊", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "所有目標都必須透過爆頭或投擲致命的近戰武器的方式來消滅。", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "頭像", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "頭像－－關卡 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "頭像－－關卡 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "頭像－－關卡 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "先擊暈後消滅", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "你需要先擊暈目標，才能消滅他們。", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "在消滅目標之前先擊暈他們", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "消滅頭像", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • 消滅組成頭像的所有隱密目標。
    • " }, "japanese": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -2480,7 +2552,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "Head Attack Only", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "All targets must be eliminated by using headshots or throwing lethal melee weapons.", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "The Avatars", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "The Avatars - Level 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "The Avatars - Level 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "The Avatars - Level 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "Pacify Before Elimination", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "You need to pacify the target before you can eliminate them.", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "Pacify the target before you can eliminate them", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "Eliminate The Avatars", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • Eliminate all Elusive Targets that are part of The Avatars.
    • " }, "spanishMexican": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -2756,7 +2837,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "Head Attack Only", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "All targets must be eliminated by using headshots or throwing lethal melee weapons.", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "The Avatars", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "The Avatars - Level 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "The Avatars - Level 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "The Avatars - Level 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "Pacify Before Elimination", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "You need to pacify the target before you can eliminate them.", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "Pacify the target before you can eliminate them", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "Eliminate The Avatars", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • Eliminate all Elusive Targets that are part of The Avatars.
    • " }, "portugueseBrazil": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -2990,7 +3080,16 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "Head Attack Only", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "All targets must be eliminated by using headshots or throwing lethal melee weapons.", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "The Avatars", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "The Avatars - Level 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "The Avatars - Level 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "The Avatars - Level 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "Pacify Before Elimination", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "You need to pacify the target before you can eliminate them.", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "Pacify the target before you can eliminate them", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "Eliminate The Avatars", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • Eliminate all Elusive Targets that are part of The Avatars.
    • " }, "polish": { "UI_PEACOCK_STRINGS_PRESENT": "yes", @@ -3263,6 +3362,15 @@ "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "Head Attack Only", "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "All targets must be eliminated by using headshots or throwing lethal melee weapons.", "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_09_TITLE": "All According to Plan", - "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise" + "UI_MENU_PAGE_STORY_CUTSCENE_SEASON2_STORY_BLOCK_10_TITLE": "A Trip to Paradise", + "UI_PEACOCK_MEDLAR_GROUP_TITLE": "The Avatars", + "UI_PEACOCK_MEDLAR_LEVEL1_TITLE": "The Avatars - Level 1", + "UI_PEACOCK_MEDLAR_LEVEL2_TITLE": "The Avatars - Level 2", + "UI_PEACOCK_MEDLAR_LEVEL3_TITLE": "The Avatars - Level 3", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME": "Pacify Before Elimination", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC": "You need to pacify the target before you can eliminate them.", + "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD": "Pacify the target before you can eliminate them", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_NAME": "Eliminate The Avatars", + "UI_PEACOCK_MEDLAR_COMPLETED_CHALLENGE_DESC": "
  • Eliminate all Elusive Targets that are part of The Avatars.
    • " } } diff --git a/static/EscalationCodenames.json b/static/EscalationCodenames.json index d84953dd7..8d359ec92 100644 --- a/static/EscalationCodenames.json +++ b/static/EscalationCodenames.json @@ -751,6 +751,12 @@ } ], "Elusive Target Arcade": [ + { + "codename": "Medlar", + "name": "🦚 The Avatars", + "id": "831a29a1-bf78-4527-95e8-d2f2437aff97", + "isPeacock": true + }, { "codename": "Kasturi", "name": "🦚 The Personages", diff --git a/static/PeacockGameChangerProperties.json b/static/PeacockGameChangerProperties.json index e0ca3b999..4dc500cc5 100644 --- a/static/PeacockGameChangerProperties.json +++ b/static/PeacockGameChangerProperties.json @@ -50,7 +50,10 @@ "Success": { "SecuritySystemRecorder": { "Condition": { - "$eq": ["$Value.event", "spotted"] + "$eq": [ + "$Value.event", + "spotted" + ] }, "Transition": "Failure" } @@ -96,7 +99,10 @@ "Success": { "Kill": { "Condition": { - "$eq": ["$Value.IsTarget", true] + "$eq": [ + "$Value.IsTarget", + true + ] }, "Actions": { "$dec": "AmountToKill" @@ -108,7 +114,10 @@ "-": [ { "Condition": { - "$eq": ["$.AmountToKill", 0] + "$eq": [ + "$.AmountToKill", + 0 + ] }, "Transition": "Success" }, @@ -126,7 +135,10 @@ }, "Kill": { "Condition": { - "$eq": ["$Value.IsTarget", true] + "$eq": [ + "$Value.IsTarget", + true + ] }, "Actions": { "$dec": "AmountToKill" @@ -239,7 +251,10 @@ "Condition": { "$and": [ { - "$eq": ["$Value.IsTarget", true] + "$eq": [ + "$Value.IsTarget", + true + ] }, { "$not": { @@ -270,5 +285,93 @@ ], "ShowBasedOnObjectives": null, "IsPrestigeObjective": null + }, + "6d79894f-132d-4977-b186-4d0a2382c912": { + "Name": "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_NAME", + "Description": "UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC", + "Icon": "images/challenges/default_challenge_icon.png", + "IsHidden": null, + "TileImage": "images/contracts/gamechangers/gamechanger_global_nopacifications.jpg", + "Resource": [], + "Objectives": [ + { + "Id": "0b4e7a06-c544-987a-e0bd-8f6ad23406a4", + "Category": "secondary", + "AllowEtRestartOnSuccess": true, + "BriefingText": "$loc UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_DESC", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_GAMECHANGERS_GLOBAL_PACIFYBEFOREELIMINATION_HUD", + "iconType": 17 + }, + "Type": "statemachine", + "Definition": { + "Scope": "session", + "Constants": { + "EligibleTargets": [ + "531a270c-67a1-41a1-8dfd-c84a4e8ee127", + "9c2190fa-0095-4fa9-9f27-394e09c96bc5", + "54f583de-f261-4473-956c-dc278e5162e2" + ] + }, + "Context": { + "isPacified": false + }, + "States": { + "Start": { + "-": { + "Transition": "Success" + } + }, + "Success": { + "Kill": { + "Condition": { + "$and": [ + { + "$inarray": { + "?": { + "$eq": [ + "$.#", + "$Value.RepositoryId" + ] + }, + "in": "$.EligibleTargets" + } + }, + { + "$eq": [ + "$.isPacified", + false + ] + } + ] + }, + "Transition": "Failure" + }, + "Pacify": { + "Condition": { + "$inarray": { + "?": { + "$eq": [ + "$.#", + "$Value.RepositoryId" + ] + }, + "in": "$.EligibleTargets" + } + }, + "Actions": { + "$set": [ + "isPacified", + true + ] + } + } + } + } + } + } + ], + "ShowBasedOnObjectives": null, + "IsPrestigeObjective": null } } From b71a65a6664d8754712f7746d43ba98e80b4d70f Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Sat, 21 Jun 2025 01:37:08 +0800 Subject: [PATCH 2/2] chore: run prettier --- contractdata/ARCADE/MEDLAR/MEDLAR.json | 12 ++----- contractdata/ARCADE/MEDLAR/MEDLAR1.json | 13 ++------ contractdata/ARCADE/MEDLAR/MEDLAR2.json | 26 ++++----------- contractdata/ARCADE/MEDLAR/MEDLAR3.json | 14 ++------- contractdata/ARCADE/_ARCADE_CHALLENGES.json | 26 ++++----------- static/PeacockGameChangerProperties.json | 35 +++++---------------- 6 files changed, 28 insertions(+), 98 deletions(-) diff --git a/contractdata/ARCADE/MEDLAR/MEDLAR.json b/contractdata/ARCADE/MEDLAR/MEDLAR.json index a310a8b77..03c295f02 100644 --- a/contractdata/ARCADE/MEDLAR/MEDLAR.json +++ b/contractdata/ARCADE/MEDLAR/MEDLAR.json @@ -6,14 +6,10 @@ "VR": [ { "Quality": "base", - "Bricks": [ - "assembly:/_pro/Scenes/Bricks/vr_setup.brick" - ] + "Bricks": ["assembly:/_pro/Scenes/Bricks/vr_setup.brick"] } ], - "GameChangers": [ - "6d79894f-132d-4977-b186-4d0a2382c912" - ], + "GameChangers": ["6d79894f-132d-4977-b186-4d0a2382c912"], "GameChangerReferences": [] }, "Metadata": { @@ -28,9 +24,7 @@ "Location": "LOCATION_NORTHSEA", "ScenePath": "assembly:/_pro/scenes/missions/theark/scene_penicillin.entity", "Type": "arcade", - "Entitlements": [ - "LOCATION_GOLDEN" - ], + "Entitlements": ["LOCATION_GOLDEN"], "GroupDefinition": { "Type": "arcade", "Order": [ diff --git a/contractdata/ARCADE/MEDLAR/MEDLAR1.json b/contractdata/ARCADE/MEDLAR/MEDLAR1.json index e7a48ca1b..83a100df7 100644 --- a/contractdata/ARCADE/MEDLAR/MEDLAR1.json +++ b/contractdata/ARCADE/MEDLAR/MEDLAR1.json @@ -133,10 +133,7 @@ }, { "Activation": { - "$eq": [ - "$03834afc-9aae-4a2a-803d-e60363ca1c3c", - "Failed" - ] + "$eq": ["$03834afc-9aae-4a2a-803d-e60363ca1c3c", "Failed"] }, "HUDTemplate": { "display": "$loc EGAME_TEXT_SL_TARGET_ESCAPING" @@ -200,9 +197,7 @@ } ], "Bricks": [], - "GameChangers": [ - "6d79894f-132d-4977-b186-4d0a2382c912" - ] + "GameChangers": ["6d79894f-132d-4977-b186-4d0a2382c912"] }, "Metadata": { "Id": "c597c869-213b-4c65-a0f4-0e0d20608b59", @@ -218,9 +213,7 @@ "LastUpdate": "2015-03-10T12:00:00.441Z", "CreationTimestamp": "2024-06-27T11:54:42.5164222Z", "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", - "Entitlements": [ - "LOCATION_GOLDEN" - ], + "Entitlements": ["LOCATION_GOLDEN"], "InGroup": "831a29a1-bf78-4527-95e8-d2f2437aff97", "GroupObjectiveDisplayOrder": [ { diff --git a/contractdata/ARCADE/MEDLAR/MEDLAR2.json b/contractdata/ARCADE/MEDLAR/MEDLAR2.json index c6e84e41b..94eb6266e 100644 --- a/contractdata/ARCADE/MEDLAR/MEDLAR2.json +++ b/contractdata/ARCADE/MEDLAR/MEDLAR2.json @@ -7,12 +7,8 @@ "DevOnlyBricks": [ "assembly:/_pro/scenes/missions/wet/dev_lambic.brick" ], - "GameChangers": [ - "6d79894f-132d-4977-b186-4d0a2382c912" - ], - "Entrances": [ - "bd3df5ac-b7b8-45dd-99ed-681428786384" - ], + "GameChangers": ["6d79894f-132d-4977-b186-4d0a2382c912"], + "Entrances": ["bd3df5ac-b7b8-45dd-99ed-681428786384"], "EnableSaving": false, "Objectives": [ { @@ -48,9 +44,7 @@ "Definition": { "Scope": "Hit", "Context": { - "Targets": [ - "9c2190fa-0095-4fa9-9f27-394e09c96bc5" - ] + "Targets": ["9c2190fa-0095-4fa9-9f27-394e09c96bc5"] }, "States": { "Start": { @@ -167,10 +161,7 @@ }, { "Condition": { - "$eq": [ - "$.TargetCount", - 0 - ] + "$eq": ["$.TargetCount", 0] }, "Transition": "Success" } @@ -252,10 +243,7 @@ }, { "Condition": { - "$eq": [ - "$.TargetCount", - 0 - ] + "$eq": ["$.TargetCount", 0] }, "Transition": "Success" } @@ -281,9 +269,7 @@ "LastUpdate": "2015-03-10T12:00:00.441Z", "CreationTimestamp": "2024-12-12T10:56:54.2760006Z", "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", - "Entitlements": [ - "LOCATION_GOLDEN" - ], + "Entitlements": ["LOCATION_GOLDEN"], "PublicId": "030924302847", "InGroup": "831a29a1-bf78-4527-95e8-d2f2437aff97", "GroupObjectiveDisplayOrder": [ diff --git a/contractdata/ARCADE/MEDLAR/MEDLAR3.json b/contractdata/ARCADE/MEDLAR/MEDLAR3.json index ed8899e88..2fbbddaa6 100644 --- a/contractdata/ARCADE/MEDLAR/MEDLAR3.json +++ b/contractdata/ARCADE/MEDLAR/MEDLAR3.json @@ -131,10 +131,7 @@ "ExcludeFromScoring": true, "Type": "statemachine", "Activation": { - "$eq": [ - "$db93108b-137f-42f6-af1e-81cf1a1959fe", - "Failed" - ] + "$eq": ["$db93108b-137f-42f6-af1e-81cf1a1959fe", "Failed"] }, "OnActive": { "IfInProgress": { @@ -237,10 +234,7 @@ } }, "Activation": { - "$eq": [ - "$01821807-ff15-4ee3-94ec-d6633cb645ca", - "Failed" - ] + "$eq": ["$01821807-ff15-4ee3-94ec-d6633cb645ca", "Failed"] }, "Type": "statemachine", "Definition": { @@ -280,9 +274,7 @@ "LastUpdate": "2015-03-10T12:00:00.441Z", "CreationTimestamp": "2025-06-06T22:46:19.3168883Z", "CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e", - "Entitlements": [ - "LOCATION_GOLDEN" - ], + "Entitlements": ["LOCATION_GOLDEN"], "PublicId": "002100552847", "InGroup": "831a29a1-bf78-4527-95e8-d2f2437aff97", "GroupObjectiveDisplayOrder": [ diff --git a/contractdata/ARCADE/_ARCADE_CHALLENGES.json b/contractdata/ARCADE/_ARCADE_CHALLENGES.json index bf448e082..061d1b6cb 100644 --- a/contractdata/ARCADE/_ARCADE_CHALLENGES.json +++ b/contractdata/ARCADE/_ARCADE_CHALLENGES.json @@ -20,9 +20,7 @@ "Rewards": { "MasteryXP": 4000 }, - "Drops": [ - "TOKEN_OUTFIT_LAMBIC_KICKBOXER_REWARD_PURPLE" - ], + "Drops": ["TOKEN_OUTFIT_LAMBIC_KICKBOXER_REWARD_PURPLE"], "IsPlayable": false, "IsLocked": false, "HideProgression": false, @@ -52,14 +50,9 @@ } } }, - "Tags": [ - "arcade", - "hard" - ], + "Tags": ["arcade", "hard"], "InclusionData": { - "ContractIds": [ - "831a29a1-bf78-4527-95e8-d2f2437aff97" - ] + "ContractIds": ["831a29a1-bf78-4527-95e8-d2f2437aff97"] } }, { @@ -70,9 +63,7 @@ "Rewards": { "MasteryXP": 4000 }, - "Drops": [ - "TOKEN_OUTFIT_HERO_PURPLESPECIAL_SUIT" - ], + "Drops": ["TOKEN_OUTFIT_HERO_PURPLESPECIAL_SUIT"], "IsPlayable": false, "IsLocked": false, "HideProgression": false, @@ -102,14 +93,9 @@ } } }, - "Tags": [ - "arcade", - "hard" - ], + "Tags": ["arcade", "hard"], "InclusionData": { - "ContractIds": [ - "797e204a-ef3d-463b-a386-57df0fe29b8f" - ] + "ContractIds": ["797e204a-ef3d-463b-a386-57df0fe29b8f"] } }, { diff --git a/static/PeacockGameChangerProperties.json b/static/PeacockGameChangerProperties.json index 4dc500cc5..21f6190ac 100644 --- a/static/PeacockGameChangerProperties.json +++ b/static/PeacockGameChangerProperties.json @@ -50,10 +50,7 @@ "Success": { "SecuritySystemRecorder": { "Condition": { - "$eq": [ - "$Value.event", - "spotted" - ] + "$eq": ["$Value.event", "spotted"] }, "Transition": "Failure" } @@ -99,10 +96,7 @@ "Success": { "Kill": { "Condition": { - "$eq": [ - "$Value.IsTarget", - true - ] + "$eq": ["$Value.IsTarget", true] }, "Actions": { "$dec": "AmountToKill" @@ -114,10 +108,7 @@ "-": [ { "Condition": { - "$eq": [ - "$.AmountToKill", - 0 - ] + "$eq": ["$.AmountToKill", 0] }, "Transition": "Success" }, @@ -135,10 +126,7 @@ }, "Kill": { "Condition": { - "$eq": [ - "$Value.IsTarget", - true - ] + "$eq": ["$Value.IsTarget", true] }, "Actions": { "$dec": "AmountToKill" @@ -251,10 +239,7 @@ "Condition": { "$and": [ { - "$eq": [ - "$Value.IsTarget", - true - ] + "$eq": ["$Value.IsTarget", true] }, { "$not": { @@ -338,10 +323,7 @@ } }, { - "$eq": [ - "$.isPacified", - false - ] + "$eq": ["$.isPacified", false] } ] }, @@ -360,10 +342,7 @@ } }, "Actions": { - "$set": [ - "isPacified", - true - ] + "$set": ["isPacified", true] } } }