diff --git a/components/candle/challengeService.ts b/components/candle/challengeService.ts index 500f7ed9e..9e4916b2d 100644 --- a/components/candle/challengeService.ts +++ b/components/candle/challengeService.ts @@ -27,6 +27,7 @@ import type { GameVersion, MissionManifest, PeacockLocationsData, + PeacockContentMode, RegistryChallenge, Unlockable, UserProfile, @@ -71,6 +72,7 @@ import { getUserEscalationProgress } from "../contracts/escalations/escalationSe import { getUnlockableById } from "../inventory" import { enqueueEvent } from "../eventHandler" import { randomUUID } from "crypto" +import { getFlag } from "../flags" type ChallengeDefinitionLike = { Context?: Record @@ -319,10 +321,18 @@ export abstract class ChallengeRegistry { const set = locationMap.get(groupId)! + const peacockContent = getFlag("peacockContent") + for (const challenge of challenges) { challenge.inGroup = groupId challenge.inLocation = location challenge.Type ??= "contract" + + if (challenge.Tags.includes("peacock")) { + if (peacockContent === "NOXP") challenge.Rewards.MasteryXP = 0 + else if (peacockContent === "DISABLED") continue + } + this.challenges[gameVersion].set(challenge.Id, challenge) set.add(challenge.Id) this.checkHeuristics(challenge, gameVersion) diff --git a/components/controller.ts b/components/controller.ts index 9b71e013e..a6fb5abe7 100644 --- a/components/controller.ts +++ b/components/controller.ts @@ -32,8 +32,10 @@ import type { GenSingleMissionFunc, GenSingleVideoFunc, Hit, + MILLocations, MissionManifest, PeacockLocationsData, + PeacockContentMode, PlayNextGetCampaignsHookReturn, RegistryChallenge, RequestWithJwt, @@ -305,6 +307,51 @@ function registerInternals(contracts: MissionManifest[]): void { }) } + if (getFlag("peacockContent") === "DISABLED") { + const toDelete = new Set() + + type MILLocationsRec = MILLocations & { + [key: string]: MILLocations | string[] + } + + function deleteContracts(contracts: MILLocationsRec) { + for (const [key, list] of Object.entries(contracts)) { + if (typeof list === "string") { + if (toDelete.has(list)) delete contracts[key] + } else if (Array.isArray(list)) { + contracts[key] = list.filter((id) => !toDelete.has(id)) + } else { + deleteContracts(list) + } + } + } + + contracts = contracts.filter((contract) => { + if (contract.Peacock?.type === "peacock") { + // We need to delete the contracts from hardcoded missionsInLocation + // in order to avoid issues with missing contracts in registry. + toDelete.add(contract.Metadata.Id) + + if (contract.Metadata.Type === "arcade") { + orderedETAs.splice( + orderedETAs.indexOf(contract.Metadata.Id), + 1, + ) + } + + return false + } + + return true + }) + + if (toDelete.size) { + deleteContracts(missionsInLocation.h1) + deleteContracts(missionsInLocation.h2) + deleteContracts(missionsInLocation.h3) + } + } + for (const contract of contracts) { internalContracts[contract.Metadata.Id] = contract } diff --git a/components/flags.ts b/components/flags.ts index dbf76495b..75cc6441e 100644 --- a/components/flags.ts +++ b/components/flags.ts @@ -80,6 +80,15 @@ export const defaultFlags: Flags = { possibleValues: ["vanilla", "sane"], default: "vanilla", }, + peacockContent: { + category: "Gameplay", + title: "peacockContent", + desc: "Enables peacock-exclusive content. Some otherwise unobtainable content is tied to peacock escalations and challengegs. NOXP will keep the content but will not award XP bonus upon completion. ENABLED/DISABLED will enable and disable the content respectively.", + possibleValues: ["ENABLED", "NOXP", "DISABLED"], + default: "ENABLED", + requiresGameRestart: true, + requiresPeacockRestart: true, + }, legacyElusivesEnableSaving: { category: "Services", title: "legacyElusivesEnableSaving", diff --git a/components/menus/hub.ts b/components/menus/hub.ts index 8a59e1efa..78c54261e 100644 --- a/components/menus/hub.ts +++ b/components/menus/hub.ts @@ -109,18 +109,23 @@ export function getHubData(gameVersion: GameVersion, userId: string) { ] of controller.challengeService.challengePacks.entries()) { if (!pack.GameVersions.includes(gameVersion)) continue + const packCompletion = + controller.challengeService.countTotalNCompletedChallenges( + controller.challengeService.getChallengesForGroup( + id, + gameVersion, + ), + userId, + gameVersion, + ) + + if (packCompletion.ChallengesCount === 0) continue + career[id] = { Children: [ generateCareerEntryChild( locations.parents["LOCATION_PARENT_ICA_FACILITY"], - controller.challengeService.countTotalNCompletedChallenges( - controller.challengeService.getChallengesForGroup( - id, - gameVersion, - ), - userId, - gameVersion, - ), + packCompletion, id, ), ], diff --git a/components/types/types.ts b/components/types/types.ts index 9e5b06299..79ac426d7 100644 --- a/components/types/types.ts +++ b/components/types/types.ts @@ -1067,6 +1067,11 @@ export interface MissionManifest { Metadata: MissionManifestMetadata readonly UserData?: Record | never[] Peacock?: { + /** + * Indicates the contract type for filtering purposes. + * SHOULD be set to `peacock` for Peacock-exclusive content (processed by `peacockContent` flag). + */ + type?: "peacock" noAgencyPickupsActive?: boolean noGear?: boolean noCarriedWeapon?: boolean @@ -1317,6 +1322,7 @@ export interface CompiledChallengeRuntimeData { export type LoadoutSavingMechanism = "PROFILES" | "LEGACY" export type ImageLoadingStrategy = "SAVEASREQUESTED" | "ONLINE" | "OFFLINE" +export type PeacockContentMode = "ENABLED" | "NOXP" | "DISABLED" export type Flag = { category?: string diff --git a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS.json b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS.json index 34a09156b..335de8401 100644 --- a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS.json +++ b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS.json @@ -43,5 +43,8 @@ "Entitlements": ["LOCATION_ROCKY"], "Season": 0, "OriginalSeason": 3 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS1.json b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS1.json index f5aad6572..9ea6c9213 100644 --- a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS1.json +++ b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS1.json @@ -143,5 +143,8 @@ "Type": "escalation", "Entitlements": ["LOCATION_ROCKY"], "InGroup": "50fa5e99-0b51-45d4-9062-cd46dd928461" + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS2.json b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS2.json index a8dc390c6..05f6d69a6 100644 --- a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS2.json +++ b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS2.json @@ -188,5 +188,8 @@ "IsNew": true } ] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS3.json b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS3.json index eb0305828..195a2d06e 100644 --- a/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS3.json +++ b/contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS3.json @@ -253,5 +253,8 @@ "Id": "07b1bc1d-f52b-4004-a760-846c4bc3f172" } ] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/AMBROSE/_AMBROSE_CHALLENGES.json b/contractdata/AMBROSE/_AMBROSE_CHALLENGES.json index 1d19ecf08..3d80abf26 100644 --- a/contractdata/AMBROSE/_AMBROSE_CHALLENGES.json +++ b/contractdata/AMBROSE/_AMBROSE_CHALLENGES.json @@ -2269,7 +2269,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["50fa5e99-0b51-45d4-9062-cd46dd928461"] } @@ -3349,7 +3349,7 @@ } } }, - "Tags": ["cheesecake-pack", "story", "hard"], + "Tags": ["cheesecake-pack", "story", "hard", "peacock"], "InclusionData": { "ContractIds": [ "179563a4-727a-4072-b354-c9fff4e8bff0", @@ -3487,7 +3487,13 @@ } } }, - "Tags": ["cheesecake-pack", "story", "live", "medium"], + "Tags": [ + "cheesecake-pack", + "story", + "live", + "medium", + "peacock" + ], "InclusionData": { "ContractIds": ["b2aac100-dfc7-4f85-b9cd-528114436f6c"] } diff --git a/contractdata/ARCADE/KASTURI/KASTURI.json b/contractdata/ARCADE/KASTURI/KASTURI.json index 0544eb087..4e3f8270f 100644 --- a/contractdata/ARCADE/KASTURI/KASTURI.json +++ b/contractdata/ARCADE/KASTURI/KASTURI.json @@ -35,5 +35,8 @@ }, "LastUpdate": "2023-02-24T10:14:36.1236307Z" }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/ARCADE/KASTURI/KASTURI1.json b/contractdata/ARCADE/KASTURI/KASTURI1.json index 21f1f1491..396da40b6 100644 --- a/contractdata/ARCADE/KASTURI/KASTURI1.json +++ b/contractdata/ARCADE/KASTURI/KASTURI1.json @@ -56,5 +56,8 @@ { "Id": "611cbf7d-7871-4a02-843a-06d523563519" } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/ARCADE/KASTURI/KASTURI2.json b/contractdata/ARCADE/KASTURI/KASTURI2.json index 8b4db5da6..be099be86 100644 --- a/contractdata/ARCADE/KASTURI/KASTURI2.json +++ b/contractdata/ARCADE/KASTURI/KASTURI2.json @@ -57,5 +57,8 @@ { "Id": "c2b3f8e3-0eaf-41b3-8b8c-3cf012a1d0bc" } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/ARCADE/KASTURI/KASTURI3.json b/contractdata/ARCADE/KASTURI/KASTURI3.json index 8d9b2eeae..1ca47aef7 100644 --- a/contractdata/ARCADE/KASTURI/KASTURI3.json +++ b/contractdata/ARCADE/KASTURI/KASTURI3.json @@ -63,5 +63,8 @@ { "Id": "3b6a356b-550f-4097-98c2-59b250136443" } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/ARCADE/_ARCADE_CHALLENGES.json b/contractdata/ARCADE/_ARCADE_CHALLENGES.json index c1c3fc366..c108fefe2 100644 --- a/contractdata/ARCADE/_ARCADE_CHALLENGES.json +++ b/contractdata/ARCADE/_ARCADE_CHALLENGES.json @@ -996,7 +996,7 @@ } } }, - "Tags": ["arcade", "hard"], + "Tags": ["arcade", "hard", "peacock"], "InclusionData": { "ContractIds": ["797e204a-ef3d-463b-a386-57df0fe29b8f"] } diff --git a/contractdata/BERLIN/ESCALATION/CASPER/CASPER.json b/contractdata/BERLIN/ESCALATION/CASPER/CASPER.json index b494a5d75..2e398ceb7 100644 --- a/contractdata/BERLIN/ESCALATION/CASPER/CASPER.json +++ b/contractdata/BERLIN/ESCALATION/CASPER/CASPER.json @@ -46,5 +46,8 @@ "Season": 0, "OriginalSeason": 3 }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/BERLIN/ESCALATION/CASPER/CASPER1.json b/contractdata/BERLIN/ESCALATION/CASPER/CASPER1.json index 0c008951e..b800d8c61 100644 --- a/contractdata/BERLIN/ESCALATION/CASPER/CASPER1.json +++ b/contractdata/BERLIN/ESCALATION/CASPER/CASPER1.json @@ -178,5 +178,8 @@ "Season": 0, "OriginalSeason": 3 }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/BERLIN/ESCALATION/CASPER/CASPER2.json b/contractdata/BERLIN/ESCALATION/CASPER/CASPER2.json index 42e5b3aef..69ec0490d 100644 --- a/contractdata/BERLIN/ESCALATION/CASPER/CASPER2.json +++ b/contractdata/BERLIN/ESCALATION/CASPER/CASPER2.json @@ -181,5 +181,8 @@ "Season": 0, "OriginalSeason": 3 }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/BERLIN/ESCALATION/CASPER/CASPER3.json b/contractdata/BERLIN/ESCALATION/CASPER/CASPER3.json index 7f9cf5951..9f1cb7215 100644 --- a/contractdata/BERLIN/ESCALATION/CASPER/CASPER3.json +++ b/contractdata/BERLIN/ESCALATION/CASPER/CASPER3.json @@ -244,5 +244,8 @@ "Season": 0, "OriginalSeason": 3 }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE.json b/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE.json index df98796f8..2a26da6b6 100644 --- a/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE.json +++ b/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE.json @@ -37,5 +37,8 @@ }, "Season": 0, "OriginalSeason": 3 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE1.json b/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE1.json index bafe91ea3..b78aac44b 100644 --- a/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE1.json +++ b/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE1.json @@ -114,5 +114,8 @@ "InGroup": "ccdc7043-62af-44e8-a5fc-38b008c2044e", "TileImage": "images/contracts/escalation/contractescalation_shangrila.jpg", "Entitlements": ["LOCATION_EDGY"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE2.json b/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE2.json index 2eececf94..aa024ae46 100644 --- a/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE2.json +++ b/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE2.json @@ -245,5 +245,8 @@ ], "TileImage": "images/contracts/escalation/contractescalation_shangrila.jpg", "Entitlements": ["LOCATION_EDGY"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE3.json b/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE3.json index 7115ffdd0..d80771953 100644 --- a/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE3.json +++ b/contractdata/BERLIN/ESCALATION/MENDIE/MENDIE3.json @@ -342,5 +342,8 @@ ], "TileImage": "images/contracts/escalation/contractescalation_shangrila.jpg", "Entitlements": ["LOCATION_EDGY"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/BERLIN/_BERLIN_CHALLENGES.json b/contractdata/BERLIN/_BERLIN_CHALLENGES.json index a93b86276..83c5a448c 100644 --- a/contractdata/BERLIN/_BERLIN_CHALLENGES.json +++ b/contractdata/BERLIN/_BERLIN_CHALLENGES.json @@ -2735,7 +2735,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["ccdc7043-62af-44e8-a5fc-38b008c2044e"] } @@ -2778,7 +2778,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["5bc6a2a3-d80a-4cb3-9ebc-a93d9238950d"] } diff --git a/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC.json b/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC.json index fce4472f8..df23afd95 100644 --- a/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC.json +++ b/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC.json @@ -40,5 +40,8 @@ }, "Season": 0, "OriginalSeason": 3 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC1.json b/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC1.json index 2b2fd2d81..215037b94 100644 --- a/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC1.json +++ b/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC1.json @@ -65,5 +65,8 @@ "Entitlements": ["LOCATION_WET"], "InGroup": "07ffa72a-bbac-45ca-8c9f-b9c1b526153a" }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC2.json b/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC2.json index f404d41c2..efd2f7aa7 100644 --- a/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC2.json +++ b/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC2.json @@ -109,5 +109,8 @@ } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC3.json b/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC3.json index 3d502a9be..2d48bf1b3 100644 --- a/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC3.json +++ b/contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC3.json @@ -392,5 +392,8 @@ } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/CHONGQING/_CHONGQING_CHALLENGES.json b/contractdata/CHONGQING/_CHONGQING_CHALLENGES.json index f7bbe0032..cb8fb567c 100644 --- a/contractdata/CHONGQING/_CHONGQING_CHALLENGES.json +++ b/contractdata/CHONGQING/_CHONGQING_CHALLENGES.json @@ -3369,7 +3369,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["07ffa72a-bbac-45ca-8c9f-b9c1b526153a"] } @@ -4566,7 +4566,7 @@ } } }, - "Tags": ["cheesecake-pack", "story", "hard"], + "Tags": ["cheesecake-pack", "story", "hard", "peacock"], "InclusionData": { "ContractIds": [ "179563a4-727a-4072-b354-c9fff4e8bff0", @@ -4656,7 +4656,13 @@ } } }, - "Tags": ["cheesecake-pack", "story", "live", "medium"] + "Tags": [ + "cheesecake-pack", + "story", + "live", + "medium", + "peacock" + ] } ] } diff --git a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ.json b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ.json index 3517ad238..2a9aefa94 100644 --- a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ.json +++ b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ.json @@ -37,5 +37,8 @@ }, "Season": 0, "OriginalSeason": 3 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ1.json b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ1.json index 0e0be540a..04f12ef3b 100644 --- a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ1.json +++ b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ1.json @@ -229,5 +229,8 @@ "InGroup": "78628e05-93ce-4f87-8a17-b910d32df51f", "TileImage": "images/contracts/escalation/contractescalation_rosebush.jpg", "Entitlements": ["LOCATION_ANCESTRAL"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ2.json b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ2.json index ede1e845f..1532e69bf 100644 --- a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ2.json +++ b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ2.json @@ -247,5 +247,8 @@ "IsNew": true } ] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ3.json b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ3.json index 0ec8bcc8a..b22fb8af3 100644 --- a/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ3.json +++ b/contractdata/DARTMOOR/ESCALATION/DEZ/DEZ3.json @@ -332,5 +332,8 @@ "IsNew": true } ] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/DARTMOOR/_DARTMOOR_CHALLENGES.json b/contractdata/DARTMOOR/_DARTMOOR_CHALLENGES.json index 8f4125c88..b43e531fc 100644 --- a/contractdata/DARTMOOR/_DARTMOOR_CHALLENGES.json +++ b/contractdata/DARTMOOR/_DARTMOOR_CHALLENGES.json @@ -4784,7 +4784,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["78628e05-93ce-4f87-8a17-b910d32df51f"] } diff --git a/contractdata/DUBAI/_DUBAI_CHALLENGES.json b/contractdata/DUBAI/_DUBAI_CHALLENGES.json index 418d2b3c3..b236bc7b7 100644 --- a/contractdata/DUBAI/_DUBAI_CHALLENGES.json +++ b/contractdata/DUBAI/_DUBAI_CHALLENGES.json @@ -4413,7 +4413,7 @@ } } }, - "Tags": ["cheesecake-pack", "story", "hard"], + "Tags": ["cheesecake-pack", "story", "hard", "peacock"], "InclusionData": { "ContractIds": [ "179563a4-727a-4072-b354-c9fff4e8bff0", @@ -4528,7 +4528,13 @@ } } }, - "Tags": ["cheesecake-pack", "story", "live", "medium"] + "Tags": [ + "cheesecake-pack", + "story", + "live", + "medium", + "peacock" + ] } ] } diff --git a/contractdata/GLOBAL/_CHEESECAKE_CHALLENGES.json b/contractdata/GLOBAL/_CHEESECAKE_CHALLENGES.json index a1081c3e1..0f434d834 100644 --- a/contractdata/GLOBAL/_CHEESECAKE_CHALLENGES.json +++ b/contractdata/GLOBAL/_CHEESECAKE_CHALLENGES.json @@ -86,7 +86,7 @@ } } }, - "Tags": ["cheesecake-pack", "story", "hard"], + "Tags": ["cheesecake-pack", "story", "hard", "peacock"], "InclusionData": { "ContractIds": [ "179563a4-727a-4072-b354-c9fff4e8bff0", diff --git a/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM.json b/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM.json index 5ad48a012..31f36ea0d 100644 --- a/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM.json +++ b/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM.json @@ -39,5 +39,8 @@ }, "Season": 0, "OriginalSeason": 2 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM1.json b/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM1.json index 7d02595e3..4bac63518 100644 --- a/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM1.json +++ b/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM1.json @@ -125,5 +125,8 @@ } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM2.json b/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM2.json index 166d0bf40..933452aa8 100644 --- a/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM2.json +++ b/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM2.json @@ -126,5 +126,8 @@ } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM3.json b/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM3.json index 0e0de887c..f26ee1dfe 100644 --- a/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM3.json +++ b/contractdata/HAVEN/ESCALATION/PIRATESPROBLEM/PIRATESPROBLEM3.json @@ -121,5 +121,8 @@ } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL.json b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL.json index 6749606d6..77e1bc21a 100644 --- a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL.json +++ b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL.json @@ -38,5 +38,8 @@ }, "Season": 0, "OriginalSeason": 2 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL1.json b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL1.json index 37b598b12..82429e161 100644 --- a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL1.json +++ b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL1.json @@ -146,5 +146,8 @@ } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL2.json b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL2.json index be8f7cf69..e0bea6d38 100644 --- a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL2.json +++ b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL2.json @@ -252,5 +252,8 @@ } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL3.json b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL3.json index 2b600c8e9..9061c8ccd 100644 --- a/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL3.json +++ b/contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL3.json @@ -463,5 +463,8 @@ } ] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HAVEN/_H2_HAVEN_CHALLENGES.json b/contractdata/HAVEN/_H2_HAVEN_CHALLENGES.json index d1ab9561e..ac6dc86e7 100644 --- a/contractdata/HAVEN/_H2_HAVEN_CHALLENGES.json +++ b/contractdata/HAVEN/_H2_HAVEN_CHALLENGES.json @@ -3326,7 +3326,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["f19f7ac8-39ec-498b-aa23-44c8e75d8693"] } @@ -3369,7 +3369,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["35f1f534-ae2d-42be-8472-dd55e96625ea"] } diff --git a/contractdata/HAVEN/_HAVEN_CHALLENGES.json b/contractdata/HAVEN/_HAVEN_CHALLENGES.json index 78829a12d..ef027c856 100644 --- a/contractdata/HAVEN/_HAVEN_CHALLENGES.json +++ b/contractdata/HAVEN/_HAVEN_CHALLENGES.json @@ -3554,7 +3554,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["f19f7ac8-39ec-498b-aa23-44c8e75d8693"] } @@ -3597,7 +3597,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["35f1f534-ae2d-42be-8472-dd55e96625ea"] } diff --git a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA.json b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA.json index a4da5a455..ea3432676 100644 --- a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA.json +++ b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA.json @@ -38,5 +38,8 @@ "Season": 0, "OriginalSeason": 2 }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA1.json b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA1.json index 2383b2a0d..39da7be54 100644 --- a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA1.json +++ b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA1.json @@ -184,5 +184,8 @@ ], "CreationTimestamp": "2024-03-13T15:32:25.692Z" }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json index e9e25cc91..bd124a7ef 100644 --- a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json +++ b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json @@ -420,5 +420,8 @@ ], "CreationTimestamp": "2024-03-13T15:32:25.692Z" }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json index b00ee5e66..0aa1e168e 100644 --- a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json +++ b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json @@ -421,5 +421,8 @@ ], "CreationTimestamp": "2024-03-13T15:32:25.692Z" }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HAWKESBAY/_H2_HAWKESBAY_CHALLENGES.json b/contractdata/HAWKESBAY/_H2_HAWKESBAY_CHALLENGES.json index 6105f867d..bd21c8c74 100644 --- a/contractdata/HAWKESBAY/_H2_HAWKESBAY_CHALLENGES.json +++ b/contractdata/HAWKESBAY/_H2_HAWKESBAY_CHALLENGES.json @@ -1016,7 +1016,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["e1e86206-d3f0-a819-e477-3d80e55e8a40"] } diff --git a/contractdata/HAWKESBAY/_HAWKESBAY_CHALLENGES.json b/contractdata/HAWKESBAY/_HAWKESBAY_CHALLENGES.json index 2375fd8a3..a2f9d866b 100644 --- a/contractdata/HAWKESBAY/_HAWKESBAY_CHALLENGES.json +++ b/contractdata/HAWKESBAY/_HAWKESBAY_CHALLENGES.json @@ -2116,7 +2116,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["e1e86206-d3f0-a819-e477-3d80e55e8a40"] } diff --git a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS.json b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS.json index 19ffe4837..dbe983597 100644 --- a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS.json +++ b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS.json @@ -40,5 +40,8 @@ }, "Season": 0, "OriginalSeason": 1 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS1.json b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS1.json index 4cd682b3c..ebcdae77a 100644 --- a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS1.json +++ b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS1.json @@ -78,5 +78,8 @@ "LastUpdate": "2021-03-30T13:03:21.7628627Z", "PublicId": "010022251847" }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS2.json b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS2.json index b803e1722..b7b320ad0 100644 --- a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS2.json +++ b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS2.json @@ -129,5 +129,8 @@ "LastUpdate": "2021-03-30T13:03:21.7628627Z", "PublicId": "010022251847" }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS3.json b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS3.json index dddd0f879..3f9daed52 100644 --- a/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS3.json +++ b/contractdata/HOKKAIDO/ESCALATION/CMCHAOS/CMCHAOS3.json @@ -178,5 +178,8 @@ "LastUpdate": "2021-03-30T13:03:21.7628627Z", "PublicId": "010022251847" }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/HOKKAIDO/_H2_HOKKAIDO_CHALLENGES.json b/contractdata/HOKKAIDO/_H2_HOKKAIDO_CHALLENGES.json index 045ccbea1..868f83605 100644 --- a/contractdata/HOKKAIDO/_H2_HOKKAIDO_CHALLENGES.json +++ b/contractdata/HOKKAIDO/_H2_HOKKAIDO_CHALLENGES.json @@ -4488,7 +4488,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["115425b1-e797-47bf-b517-410dc7507397"] } diff --git a/contractdata/HOKKAIDO/_HOKKAIDO_CHALLENGES.json b/contractdata/HOKKAIDO/_HOKKAIDO_CHALLENGES.json index cc36402b6..ec265d71a 100644 --- a/contractdata/HOKKAIDO/_HOKKAIDO_CHALLENGES.json +++ b/contractdata/HOKKAIDO/_HOKKAIDO_CHALLENGES.json @@ -5234,7 +5234,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["115425b1-e797-47bf-b517-410dc7507397"] } diff --git a/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE.json b/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE.json index 9fcd16cd7..2ebf590be 100644 --- a/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE.json +++ b/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE.json @@ -37,5 +37,8 @@ }, "Season": 0, "OriginalSeason": 3 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE1.json b/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE1.json index d8ceac6a5..bcfa8fb60 100644 --- a/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE1.json +++ b/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE1.json @@ -116,5 +116,8 @@ "ScenePath": "assembly:/_pro/scenes/missions/elegant/scene_llama.entity", "Entitlements": ["LOCATION_ELEGANT"], "Location": "LOCATION_ELEGANT_LLAMA" + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE2.json b/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE2.json index ac8e270ce..7eeba0e8d 100644 --- a/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE2.json +++ b/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE2.json @@ -185,5 +185,8 @@ "Id": "8d606509-7d54-4dac-8142-a4349fd6279d" } ] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE3.json b/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE3.json index 13e062713..5378ed9af 100644 --- a/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE3.json +++ b/contractdata/MENDOZA/ESCALATION/ARGENTINE/ARGENTINE3.json @@ -281,5 +281,8 @@ "Id": "8d606509-7d54-4dac-8142-a4349fd6279d" } ] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI.json b/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI.json index 0b73bd8ea..3d12f0305 100644 --- a/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI.json +++ b/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI.json @@ -39,5 +39,8 @@ }, "Season": 0, "OriginalSeason": 3 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI1.json b/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI1.json index 3cd40f6b3..af070ef30 100644 --- a/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI1.json +++ b/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI1.json @@ -209,6 +209,7 @@ }, "UserData": {}, "Peacock": { + "type": "peacock", "noAgencyPickupsActive": true } } diff --git a/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI2.json b/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI2.json index 4f283ff13..f988ab672 100644 --- a/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI2.json +++ b/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI2.json @@ -253,6 +253,7 @@ }, "UserData": {}, "Peacock": { + "type": "peacock", "noAgencyPickupsActive": true } } diff --git a/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI3.json b/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI3.json index 2b3aee396..2ed5228ff 100644 --- a/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI3.json +++ b/contractdata/MENDOZA/ESCALATION/YANNINI/YANNINI3.json @@ -565,6 +565,7 @@ }, "UserData": {}, "Peacock": { + "type": "peacock", "noAgencyPickupsActive": true } } diff --git a/contractdata/MENDOZA/_MENDOZA_CHALLENGES.json b/contractdata/MENDOZA/_MENDOZA_CHALLENGES.json index e287def25..9746ff99d 100644 --- a/contractdata/MENDOZA/_MENDOZA_CHALLENGES.json +++ b/contractdata/MENDOZA/_MENDOZA_CHALLENGES.json @@ -4280,7 +4280,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["edbacf4b-e402-4548-b723-cd4351571537"] } @@ -4323,7 +4323,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["1e4423b7-d4ff-448f-a8a8-4bb600cab7e3"] } diff --git a/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP.json b/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP.json index b944d7e0f..af116c1fd 100644 --- a/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP.json +++ b/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP.json @@ -40,5 +40,8 @@ }, "Season": 0, "OriginalSeason": 2 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP1.json b/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP1.json index 31c582d71..7fdd20a3e 100644 --- a/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP1.json +++ b/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP1.json @@ -163,5 +163,8 @@ "CreationTimestamp": "2021-06-01T14:13:31.3409682Z", "Entitlements": ["LOCATION_MUMBAI"] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP2.json b/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP2.json index 4b9c757ca..a29ef62e1 100644 --- a/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP2.json +++ b/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP2.json @@ -247,5 +247,8 @@ "CreationTimestamp": "2021-06-01T14:21:34.2848229Z", "Entitlements": ["LOCATION_MUMBAI"] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP3.json b/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP3.json index b4057e6e7..2677483ac 100644 --- a/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP3.json +++ b/contractdata/MUMBAI/ESCALATION/KHAKIASP/KHAKIASP3.json @@ -391,5 +391,8 @@ "CreationTimestamp": "2021-06-01T14:31:51.2376853Z", "Entitlements": ["LOCATION_MUMBAI"] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json b/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json index 7db5ddf5b..db4dce314 100644 --- a/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json +++ b/contractdata/MUMBAI/_H2_MUMBAI_CHALLENGES.json @@ -4395,7 +4395,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["667f48a3-7f6b-486e-8f6b-2f782a5c4857"] } diff --git a/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json b/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json index 42e85299c..c7df1cd08 100644 --- a/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json +++ b/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json @@ -4631,7 +4631,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["667f48a3-7f6b-486e-8f6b-2f782a5c4857"] } diff --git a/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH.json b/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH.json index 19501d1ff..b1cb18e60 100644 --- a/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH.json +++ b/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH.json @@ -37,5 +37,8 @@ "Entitlements": ["H2_LEGACY_EXPANSION"], "Season": 0, "OriginalSeason": 2 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH1.json b/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH1.json index 9fe6487a6..9d43d7e27 100644 --- a/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH1.json +++ b/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH1.json @@ -185,5 +185,8 @@ } ], "Entitlements": ["H2_LEGACY_EXPANSION"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH2.json b/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH2.json index cbb1ec45c..cc64e7333 100644 --- a/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH2.json +++ b/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH2.json @@ -350,5 +350,8 @@ } ], "Entitlements": ["H2_LEGACY_EXPANSION"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH3.json b/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH3.json index c80495837..2e91a96f2 100644 --- a/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH3.json +++ b/contractdata/NEWYORK/ESCALATION/HEDGEBUSH/HEDGEBUSH3.json @@ -444,5 +444,8 @@ } ], "Entitlements": ["H2_LEGACY_EXPANSION"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/NEWYORK/_H2_NEWYORK_CHALLENGES.json b/contractdata/NEWYORK/_H2_NEWYORK_CHALLENGES.json index d348dcc0a..c8cff6249 100644 --- a/contractdata/NEWYORK/_H2_NEWYORK_CHALLENGES.json +++ b/contractdata/NEWYORK/_H2_NEWYORK_CHALLENGES.json @@ -2370,7 +2370,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["9a461f89-86c5-44e4-998e-f2f66b496aa7"] } diff --git a/contractdata/NEWYORK/_NEWYORK_CHALLENGES.json b/contractdata/NEWYORK/_NEWYORK_CHALLENGES.json index 1ff2ffe1b..80ed2ca37 100644 --- a/contractdata/NEWYORK/_NEWYORK_CHALLENGES.json +++ b/contractdata/NEWYORK/_NEWYORK_CHALLENGES.json @@ -2506,7 +2506,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["9a461f89-86c5-44e4-998e-f2f66b496aa7"] } diff --git a/contractdata/PARIS/ESCALATION/XMAS/XMAS.json b/contractdata/PARIS/ESCALATION/XMAS/XMAS.json index 85349d8c0..2843df3ea 100644 --- a/contractdata/PARIS/ESCALATION/XMAS/XMAS.json +++ b/contractdata/PARIS/ESCALATION/XMAS/XMAS.json @@ -41,5 +41,8 @@ "Entitlements": ["LOCATION_PARIS"], "Season": 0, "OriginalSeason": 1 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/PARIS/ESCALATION/XMAS/XMAS1.json b/contractdata/PARIS/ESCALATION/XMAS/XMAS1.json index 9a0e08652..a8dde6a51 100644 --- a/contractdata/PARIS/ESCALATION/XMAS/XMAS1.json +++ b/contractdata/PARIS/ESCALATION/XMAS/XMAS1.json @@ -254,5 +254,8 @@ "InGroup": "07bbf22b-d6ae-4883-bec2-122eeeb7b665", "TileImage": "images/contracts/escalation/contractescalation_southern_comfort.jpg", "Entitlements": ["LOCATION_PARIS"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/PARIS/ESCALATION/XMAS/XMAS2.json b/contractdata/PARIS/ESCALATION/XMAS/XMAS2.json index 5f0065a34..171b4fe7a 100644 --- a/contractdata/PARIS/ESCALATION/XMAS/XMAS2.json +++ b/contractdata/PARIS/ESCALATION/XMAS/XMAS2.json @@ -345,5 +345,8 @@ "InGroup": "07bbf22b-d6ae-4883-bec2-122eeeb7b665", "TileImage": "images/contracts/escalation/contractescalation_southern_comfort.jpg", "Entitlements": ["LOCATION_PARIS"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/PARIS/ESCALATION/XMAS/XMAS3.json b/contractdata/PARIS/ESCALATION/XMAS/XMAS3.json index 2c1cdf0f7..4cc083613 100644 --- a/contractdata/PARIS/ESCALATION/XMAS/XMAS3.json +++ b/contractdata/PARIS/ESCALATION/XMAS/XMAS3.json @@ -381,5 +381,8 @@ "InGroup": "07bbf22b-d6ae-4883-bec2-122eeeb7b665", "TileImage": "images/contracts/escalation/contractescalation_southern_comfort.jpg", "Entitlements": ["LOCATION_PARIS"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/PARIS/_H2_PARIS_CHALLENGES.json b/contractdata/PARIS/_H2_PARIS_CHALLENGES.json index 7167e758e..a34d6ebe7 100644 --- a/contractdata/PARIS/_H2_PARIS_CHALLENGES.json +++ b/contractdata/PARIS/_H2_PARIS_CHALLENGES.json @@ -4131,7 +4131,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["07bbf22b-d6ae-4883-bec2-122eeeb7b665"] } diff --git a/contractdata/PARIS/_PARIS_CHALLENGES.json b/contractdata/PARIS/_PARIS_CHALLENGES.json index 565162149..9606e832c 100644 --- a/contractdata/PARIS/_PARIS_CHALLENGES.json +++ b/contractdata/PARIS/_PARIS_CHALLENGES.json @@ -5351,7 +5351,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["07bbf22b-d6ae-4883-bec2-122eeeb7b665"] } diff --git a/contractdata/SANTAFORTUNA/_SANTAFORTUNA_CHALLENGES.json b/contractdata/SANTAFORTUNA/_SANTAFORTUNA_CHALLENGES.json index 0bb1ee185..44b431163 100644 --- a/contractdata/SANTAFORTUNA/_SANTAFORTUNA_CHALLENGES.json +++ b/contractdata/SANTAFORTUNA/_SANTAFORTUNA_CHALLENGES.json @@ -6263,7 +6263,7 @@ } } }, - "Tags": ["cheesecake-pack", "story", "hard"], + "Tags": ["cheesecake-pack", "story", "hard", "peacock"], "InclusionData": { "ContractIds": [ "179563a4-727a-4072-b354-c9fff4e8bff0", @@ -6334,7 +6334,13 @@ } } }, - "Tags": ["cheesecake-pack", "story", "live", "medium"], + "Tags": [ + "cheesecake-pack", + "story", + "live", + "medium", + "peacock" + ], "InclusionData": { "ContractIds": ["179563a4-727a-4072-b354-c9fff4e8bff0"] } diff --git a/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH.json b/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH.json index df5dd3e8a..038916015 100644 --- a/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH.json +++ b/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH.json @@ -37,5 +37,8 @@ "Entitlements": ["LOCATION_COASTALTOWN"], "Season": 0, "OriginalSeason": 1 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH1.json b/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH1.json index eceece78a..56bd25e17 100644 --- a/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH1.json +++ b/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH1.json @@ -117,5 +117,8 @@ } ], "Entitlements": ["LOCATION_COASTALTOWN"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH2.json b/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH2.json index 279a9489d..8c545a701 100644 --- a/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH2.json +++ b/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH2.json @@ -224,5 +224,8 @@ } ], "Entitlements": ["LOCATION_COASTALTOWN"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH3.json b/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH3.json index 6f7bb59b7..23d7977ce 100644 --- a/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH3.json +++ b/contractdata/SAPIENZA/ESCALATION/BLUEBERRYBUSH/BLUEBERRYBUSH3.json @@ -295,5 +295,8 @@ } ], "Entitlements": ["LOCATION_COASTALTOWN"] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY.json b/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY.json index 8eecd249f..a55a36eed 100644 --- a/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY.json +++ b/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY.json @@ -38,5 +38,8 @@ "Entitlements": ["H1_LEGACY_EXPANSION"], "Season": 0, "OriginalSeason": 1 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY1.json b/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY1.json index 31ea1f2ce..5932400d2 100644 --- a/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY1.json +++ b/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY1.json @@ -129,5 +129,8 @@ "Entitlements": ["H1_LEGACY_EXPANSION"], "PublicId": "076086134215", "InGroup": "0cceeecb-c8fe-42a4-aee4-d7b575f56a1b" + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY2.json b/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY2.json index 2a19f3a1a..b9ad02643 100644 --- a/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY2.json +++ b/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY2.json @@ -196,5 +196,8 @@ "Id": "6c64e36d-68b7-4ec3-9ac2-04d7bef865a7" } ] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY3.json b/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY3.json index 4856cd12d..773f0f127 100644 --- a/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY3.json +++ b/contractdata/SAPIENZA/ESCALATION/JEFFREY/JEFFREY3.json @@ -294,5 +294,8 @@ "Id": "6c64e36d-68b7-4ec3-9ac2-04d7bef865a7" } ] + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO.json b/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO.json index 0d157470d..9b36801da 100644 --- a/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO.json +++ b/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO.json @@ -37,5 +37,8 @@ "Entitlements": ["LOCATION_COASTALTOWN"], "Season": 0, "OriginalSeason": 1 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO1.json b/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO1.json index b219f5f3c..c78f2d47f 100644 --- a/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO1.json +++ b/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO1.json @@ -130,5 +130,8 @@ ], "Entitlements": ["LOCATION_COASTALTOWN"] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO2.json b/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO2.json index d63d75d9b..dfa09af46 100644 --- a/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO2.json +++ b/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO2.json @@ -192,5 +192,8 @@ ], "Entitlements": ["LOCATION_COASTALTOWN"] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO3.json b/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO3.json index f721c383d..9df5cdea3 100644 --- a/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO3.json +++ b/contractdata/SAPIENZA/ESCALATION/ROCCO/ROCCO3.json @@ -200,5 +200,8 @@ ], "Entitlements": ["LOCATION_COASTALTOWN"] }, - "UserData": {} + "UserData": {}, + "Peacock": { + "type": "peacock" + } } diff --git a/contractdata/SAPIENZA/_H2_SAPIENZA_CHALLENGES.json b/contractdata/SAPIENZA/_H2_SAPIENZA_CHALLENGES.json index a1efdd28b..94a483a06 100644 --- a/contractdata/SAPIENZA/_H2_SAPIENZA_CHALLENGES.json +++ b/contractdata/SAPIENZA/_H2_SAPIENZA_CHALLENGES.json @@ -7570,7 +7570,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["74415eca-d01e-4070-9bc9-5ef9b4e8f7d2"] } @@ -7785,7 +7785,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["0cceeecb-c8fe-42a4-aee4-d7b575f56a1b"] } @@ -8000,7 +8000,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["9e0188e8-bdad-476c-b4ce-2faa5d2be56c"] } diff --git a/contractdata/SAPIENZA/_SAPIENZA_CHALLENGES.json b/contractdata/SAPIENZA/_SAPIENZA_CHALLENGES.json index 46365eb3a..22a419593 100644 --- a/contractdata/SAPIENZA/_SAPIENZA_CHALLENGES.json +++ b/contractdata/SAPIENZA/_SAPIENZA_CHALLENGES.json @@ -8108,7 +8108,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["74415eca-d01e-4070-9bc9-5ef9b4e8f7d2"] } @@ -8323,7 +8323,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["0cceeecb-c8fe-42a4-aee4-d7b575f56a1b"] } @@ -8538,7 +8538,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["9e0188e8-bdad-476c-b4ce-2faa5d2be56c"] } @@ -12145,7 +12145,7 @@ } } }, - "Tags": ["cheesecake-pack", "story", "hard"], + "Tags": ["cheesecake-pack", "story", "hard", "peacock"], "InclusionData": { "ContractIds": [ "179563a4-727a-4072-b354-c9fff4e8bff0", @@ -12238,7 +12238,13 @@ } } }, - "Tags": ["cheesecake-pack", "story", "live", "medium"] + "Tags": [ + "cheesecake-pack", + "story", + "live", + "medium", + "peacock" + ] } ] } diff --git a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU.json b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU.json index a9389caf9..2a715d9c3 100644 --- a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU.json +++ b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU.json @@ -37,5 +37,8 @@ }, "Season": 0, "OriginalSeason": 2 + }, + "Peacock": { + "type": "peacock" } } diff --git a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU1.json b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU1.json index ab2d0e775..942499854 100644 --- a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU1.json +++ b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU1.json @@ -165,6 +165,7 @@ "ScenePath": "assembly:/_pro/scenes/missions/skunk/scene_skunk.entity" }, "Peacock": { + "type": "peacock", "noAgencyPickupsActive": true } } diff --git a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU2.json b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU2.json index 895459b4e..3415059e3 100644 --- a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU2.json +++ b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU2.json @@ -262,6 +262,7 @@ ] }, "Peacock": { + "type": "peacock", "noAgencyPickupsActive": true } } diff --git a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU3.json b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU3.json index 22718e69f..e1fc38ed4 100644 --- a/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU3.json +++ b/contractdata/WHITTLETON/ESCALATION/DAMMCHICU/DAMMCHICU3.json @@ -399,6 +399,7 @@ ] }, "Peacock": { + "type": "peacock", "noAgencyPickupsActive": true } } diff --git a/contractdata/WHITTLETON/_H2_WHITTLETON_CHALLENGES.json b/contractdata/WHITTLETON/_H2_WHITTLETON_CHALLENGES.json index 859f31b21..df2ba5f9a 100644 --- a/contractdata/WHITTLETON/_H2_WHITTLETON_CHALLENGES.json +++ b/contractdata/WHITTLETON/_H2_WHITTLETON_CHALLENGES.json @@ -4196,7 +4196,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["218302a3-f682-46f9-9ffd-bb3e82487b7c"] } diff --git a/contractdata/WHITTLETON/_WHITTLETON_CHALLENGES.json b/contractdata/WHITTLETON/_WHITTLETON_CHALLENGES.json index 41db8e10e..9a24600cd 100644 --- a/contractdata/WHITTLETON/_WHITTLETON_CHALLENGES.json +++ b/contractdata/WHITTLETON/_WHITTLETON_CHALLENGES.json @@ -4864,7 +4864,7 @@ } } }, - "Tags": ["feats", "hard"], + "Tags": ["feats", "hard", "peacock"], "InclusionData": { "ContractIds": ["218302a3-f682-46f9-9ffd-bb3e82487b7c"] } diff --git a/docs/ESCALATION_GUIDELINES.md b/docs/ESCALATION_GUIDELINES.md index cdf0ec1a4..c7609a427 100644 --- a/docs/ESCALATION_GUIDELINES.md +++ b/docs/ESCALATION_GUIDELINES.md @@ -21,3 +21,7 @@ The guidelines: - If no conditions are included for a target, use the game to localise it (`UI_CONTRACT_GENERAL_OBJ_KILL`). - If conditions are included, include them in the HUD string and **LOCALISE IT**! - For `(Long)BriefingText`, try to use proper grammar (i.e. ending with a full stop). +- **Always** add peacock tagging. This will ensure that escalations respect the `peacockContent` setting. + - New challenges associated with the escalation **should** have a `peacock` tag. + - **All** contract files associated with the escalation **should** have a `Peacock.type` field set to `"peacock"`. + I.e. `"Peacock": { "type": "peacock" }`