Add peacockContent option to control presence of peacock-exclusive content.

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<string, unknown>
@@ -319,10 +321,18 @@ export abstract class ChallengeRegistry {
 
         const set = locationMap.get(groupId)!
 
+        const peacockContent = <PeacockContentMode>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)

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 (<PeacockContentMode>getFlag("peacockContent") === "DISABLED") {
+        const toDelete = new Set<string>()
+
+        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(<MILLocationsRec>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
     }

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",

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,
                 ),
             ],

components/types/types.ts

@@ -1067,6 +1067,11 @@ export interface MissionManifest {
     Metadata: MissionManifestMetadata
     readonly UserData?: Record<string, never> | 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

contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS.json

@@ -43,5 +43,8 @@
         "Entitlements": ["LOCATION_ROCKY"],
         "Season": 0,
         "OriginalSeason": 3
+    },
+    "Peacock": {
+        "type": "peacock"
     }
 }

contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS1.json

@@ -143,5 +143,8 @@
         "Type": "escalation",
         "Entitlements": ["LOCATION_ROCKY"],
         "InGroup": "50fa5e99-0b51-45d4-9062-cd46dd928461"
+    },
+    "Peacock": {
+        "type": "peacock"
     }
 }

contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS2.json

@@ -188,5 +188,8 @@
                 "IsNew": true
             }
         ]
+    },
+    "Peacock": {
+        "type": "peacock"
     }
 }

contractdata/AMBROSE/ESCALATION/PONTUS/PONTUS3.json

@@ -253,5 +253,8 @@
                 "Id": "07b1bc1d-f52b-4004-a760-846c4bc3f172"
             }
         ]
+    },
+    "Peacock": {
+        "type": "peacock"
     }
 }

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"]
                     }

contractdata/ARCADE/KASTURI/KASTURI.json

@@ -35,5 +35,8 @@
         },
         "LastUpdate": "2023-02-24T10:14:36.1236307Z"
     },
-    "UserData": {}
+    "UserData": {},
+    "Peacock": {
+        "type": "peacock"
+    }
 }

contractdata/ARCADE/KASTURI/KASTURI1.json

@@ -56,5 +56,8 @@
             { "Id": "611cbf7d-7871-4a02-843a-06d523563519" }
         ]
     },
-    "UserData": {}
+    "UserData": {},
+    "Peacock": {
+        "type": "peacock"
+    }
 }

contractdata/ARCADE/KASTURI/KASTURI2.json

@@ -57,5 +57,8 @@
             { "Id": "c2b3f8e3-0eaf-41b3-8b8c-3cf012a1d0bc" }
         ]
     },
-    "UserData": {}
+    "UserData": {},
+    "Peacock": {
+        "type": "peacock"
+    }
 }

contractdata/ARCADE/KASTURI/KASTURI3.json

@@ -63,5 +63,8 @@
             { "Id": "3b6a356b-550f-4097-98c2-59b250136443" }
         ]
     },
-    "UserData": {}
+    "UserData": {},
+    "Peacock": {
+        "type": "peacock"
+    }
 }

contractdata/ARCADE/_ARCADE_CHALLENGES.json

@@ -996,7 +996,7 @@
                             }
                         }
                     },
-                    "Tags": ["arcade", "hard"],
+                    "Tags": ["arcade", "hard", "peacock"],
                     "InclusionData": {
                         "ContractIds": ["797e204a-ef3d-463b-a386-57df0fe29b8f"]
                     }

contractdata/BERLIN/ESCALATION/CASPER/CASPER.json

@@ -46,5 +46,8 @@
         "Season": 0,
         "OriginalSeason": 3
     },
-    "UserData": {}
+    "UserData": {},
+    "Peacock": {
+        "type": "peacock"
+    }
 }

contractdata/BERLIN/ESCALATION/CASPER/CASPER1.json

@@ -178,5 +178,8 @@
         "Season": 0,
         "OriginalSeason": 3
     },
-    "UserData": {}
+    "UserData": {},
+    "Peacock": {
+        "type": "peacock"
+    }
 }

contractdata/BERLIN/ESCALATION/CASPER/CASPER2.json

@@ -181,5 +181,8 @@
         "Season": 0,
         "OriginalSeason": 3
     },
-    "UserData": {}
+    "UserData": {},
+    "Peacock": {
+        "type": "peacock"
+    }
 }

contractdata/BERLIN/ESCALATION/CASPER/CASPER3.json

@@ -244,5 +244,8 @@
         "Season": 0,
         "OriginalSeason": 3
     },
-    "UserData": {}
+    "UserData": {},
+    "Peacock": {
+        "type": "peacock"
+    }
 }

contractdata/BERLIN/ESCALATION/MENDIE/MENDIE.json

@@ -37,5 +37,8 @@
         },
         "Season": 0,
         "OriginalSeason": 3
+    },
+    "Peacock": {
+        "type": "peacock"
     }
 }

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"
     }
 }

contractdata/BERLIN/ESCALATION/MENDIE/MENDIE2.json

@@ -245,5 +245,8 @@
         ],
         "TileImage": "images/contracts/escalation/contractescalation_shangrila.jpg",
         "Entitlements": ["LOCATION_EDGY"]
+    },
+    "Peacock": {
+        "type": "peacock"
     }
 }

contractdata/BERLIN/ESCALATION/MENDIE/MENDIE3.json

@@ -342,5 +342,8 @@
         ],
         "TileImage": "images/contracts/escalation/contractescalation_shangrila.jpg",
         "Entitlements": ["LOCATION_EDGY"]
+    },
+    "Peacock": {
+        "type": "peacock"
     }
 }

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"]
                     }

contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC.json

@@ -40,5 +40,8 @@
         },
         "Season": 0,
         "OriginalSeason": 3
+    },
+    "Peacock": {
+        "type": "peacock"
     }
 }

contractdata/CHONGQING/ESCALATION/KOATSC/KOATSC1.json

@@ -65,5 +65,8 @@
         "Entitlements": ["LOCATION_WET"],
         "InGroup": "07ffa72a-bbac-45ca-8c9f-b9c1b526153a"
     },
-    "UserData": {}
+    "UserData": {},
+    "Peacock": {
+        "type": "peacock"
+    }
 }