github/Peacock
1
Fork 0
mirror of https://github.com/thepeacockproject/Peacock synced 2024-11-22 22:12:45 +01:00
Code Releases Activity

Merge branch 'master' of https://github.com/thepeacockproject/Peacock

Browse Source
This commit is contained in:
Reece Dunham 2024-08-04 21:01:37 -04:00
commit 434a0bac46
30 changed files with 387 additions and 589 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/cli.ts
View File

@ -59,6 +59,11 @@ program.action(
},
)
program
.command("noop")
.description("generate file structure and exit")
.action(() => process.exit())
program
.command("tools")
.description("open the tools UI")

1
components/contracts/elusiveTargetArcades.ts
View File

@ -17,7 +17,6 @@
*/
export const orderedETAs = [
"27e54c45-d5e8-fe2e-6f6c-f3e3d8239f46",
"797e204a-ef3d-463b-a386-57df0fe29b8f",
"b1fb40d7-c013-4c9f-bb8a-8782e980b11a",
"de9788cc-b9c4-47fc-b5df-86451cd82c43",

1
components/contracts/missionsInLocation.ts
View File

@ -285,7 +285,6 @@ export const missionsInLocations = {
],
LOCATION_NEWZEALAND: ["39cc0603-4348-4dbf-9bd3-733cadf2913c"],
LOCATION_NORTHAMERICA: [
"27e54c45-d5e8-fe2e-6f6c-f3e3d8239f46",
"5081776a-86b6-4935-a83e-631a65ba8ee8",
"cab4293f-e359-419d-aa6f-83d91a158cf5",
],

2
components/officialServerAuth.ts
View File

@ -95,7 +95,7 @@ export class OfficialServerAuth {
}
/**
* Authenticates the client with the official service the first time.
* Authenticates the client with the official service for the first time.
* @param req The initial client request.
*/
async _initiallyAuthenticate(req: Request): Promise<void> {

39
contractdata/ARCADE/AMBERGRIS/AMBERGRIS.json
View File

@ -1,39 +0,0 @@
{
"Data": {
"EnableSaving": false,
"Objectives": [],
"Bricks": [],
"VR": [
{
"Quality": "base",
"Bricks": ["assembly:/_pro/Scenes/Bricks/vr_setup.brick"]
}
],
"GameChangers": [],
"GameChangerReferences": []
},
"Metadata": {
"Id": "27e54c45-d5e8-fe2e-6f6c-f3e3d8239f46",
"IsPublished": true,
"CreationTimestamp": "2024-06-29T07:21:06.758Z",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"TileImage": "images/contracts/arcade/Arcade_Ambergris_Group.jpg",
"Title": "UI_PEACOCK_AMBERGRIS",
"Description": "UI_CONTRACT_LEMON_GROUP_DESC",
"CodeName_Hint": "[PEACOCK] Arcade Ambergris - Group",
"Location": "LOCATION_NORTHAMERICA",
"ScenePath": "assembly:/_pro/scenes/missions/skunk/scene_skunk.entity",
"Type": "arcade",
"Entitlements": ["LOCATION_GOLDEN"],
"GroupDefinition": {
"Type": "arcade",
"Order": [
"039aa9fc-d5b0-5ae6-2eb1-940d7da1a6f1",
"730f3c7f-788a-7c55-422a-00107d48bbbe",
"27977fd9-732a-18b7-d986-a416ffbc19d5"
]
},
"LastUpdate": "2024-06-29T07:21:06.758Z"
},
"UserData": {}
}

67
contractdata/ARCADE/AMBERGRIS/AMBERGRIS1.json
View File

@ -1,67 +0,0 @@
{
"Data": {
"EnableSaving": false,
"Entrances": [
"9034bf0a-6efa-4dec-bb99-5b342804af86",
"e8d12fac-221f-4b1d-9cad-fec2bd161c04",
"e0dcccd6-7e08-48ba-a1f0-aec0f83fedb5",
"896cf183-d974-4d45-a819-2f04466d95e2",
"5877bd62-5609-4211-9fc5-ee7b5ce5984a"
],
"Objectives": [
{
"Id": "7eabd1c9-bf88-4d96-86f1-ea089492414c",
"Primary": true,
"IsHidden": true,
"SuccessEvent": {
"EventName": "Kill",
"EventValues": {
"RepositoryId": "d21efe38-c577-49bf-95f0-e72891f004bb"
}
}
}
],
"Bricks": [
"assembly:/_pro/scenes/missions/skunk/elusive_alabamaslammer.brick"
],
"VR": [
{
"Quality": "base",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/Scenes/missions/skunk/vr_overrides_skunk.brick",
"assembly:/_pro/scenes/missions/skunk/vr_overrides_ps4perf.brick"
]
},
{
"Quality": "better",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/Scenes/missions/skunk/vr_overrides_skunk.brick"
]
}
],
"GameChangers": ["1efef5c0-7381-4e22-ac04-ffbd0822cc96"]
},
"Metadata": {
"Id": "039aa9fc-d5b0-5ae6-2eb1-940d7da1a6f1",
"CodeName_Hint": "Arcade Ambergris AlabamaSlammer",
"Title": "UI_PEACOCK_AMBERGRIS1",
"Description": "UI_CONTRACT_ALABAMASLAMMER_DESC",
"BriefingVideo": "briefing_alabamaslammer",
"DebriefingVideo": "debriefing_alabamaslammer",
"ScenePath": "assembly:/_pro/scenes/missions/skunk/scene_skunk.entity",
"TileImage": "images/contracts/elusive/S2_AlabamaSlammer/Title.jpg",
"Location": "LOCATION_NORTHAMERICA",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"Type": "arcade",
"Entitlements": ["LOCATION_GOLDEN"],
"InGroup": "27e54c45-d5e8-fe2e-6f6c-f3e3d8239f46",
"GroupObjectiveDisplayOrder": [
{ "Id": "1efef5c0-7381-4e22-ac04-ffbd0822cc96", "IsNew": true },
{ "Id": "7eabd1c9-bf88-4d96-86f1-ea089492414c" }
],
"LastUpdate": "2024-06-29T07:21:06.758Z"
},
"UserData": {}
}

71
contractdata/ARCADE/AMBERGRIS/AMBERGRIS2.json
View File

@ -1,71 +0,0 @@
{
"Data": {
"EnableSaving": false,
"Bricks": [
"assembly:/_pro/scenes/missions/wet/elusive_redsnapper.brick"
],
"DevOnlyBricks": [],
"GameChangers": ["1efef5c0-7381-4e22-ac04-ffbd0822cc96"],
"VR": [
{
"Quality": "base",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/scenes/missions/wet/vr_overrides_rat.brick",
"assembly:/_pro/scenes/missions/Wet/vr_overrides_ps4perf.brick"
]
},
{
"Quality": "better",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/scenes/missions/wet/vr_overrides_rat.brick"
]
}
],
"Entrances": [
"f9c65d0b-e5ce-454e-8f20-08a8083a9b9d",
"4752ebbb-02c0-48b0-8e05-3ec2a920dedd",
"7371c3ea-cfb9-46b8-a699-93ab1cdd07af",
"75827342-5601-4656-ac00-55aff44b48f4",
"3fd57506-80d6-4a63-88ed-206b15686758",
"c235f578-f55b-4c9d-b568-db6cad909c8c",
"f3944deb-0747-4d67-b26a-99af5f979705"
],
"Objectives": [
{
"_comment": "----- Eliminate The Rage -----",
"Id": "9acf0918-a05d-41e8-8721-03293a99d5a1",
"Primary": true,
"IsHidden": true,
"SuccessEvent": {
"EventName": "Kill",
"EventValues": {
"RepositoryId": "2981aaba-0a8d-4895-9456-976fc437bee5"
}
}
}
]
},
"Metadata": {
"Id": "730f3c7f-788a-7c55-422a-00107d48bbbe",
"CodeName_Hint": "Arcade Ambergris RedSnapper",
"Title": "UI_PEACOCK_AMBERGRIS2",
"Description": "UI_CONTRACT_REDSNAPPER_DESC",
"BriefingVideo": "briefing_redsnapper",
"DebriefingVideo": "debriefing_redsnapper",
"ScenePath": "assembly:/_pro/scenes/missions/wet/scene_rat_elusive_redsnapper.entity",
"TileImage": "images/contracts/elusive/S3_Redsnapper/Title.jpg",
"Location": "LOCATION_WET_RAT",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"Type": "arcade",
"Entitlements": ["LOCATION_WET"],
"InGroup": "27e54c45-d5e8-fe2e-6f6c-f3e3d8239f46",
"GroupObjectiveDisplayOrder": [
{ "Id": "1efef5c0-7381-4e22-ac04-ffbd0822cc96" },
{ "Id": "9acf0918-a05d-41e8-8721-03293a99d5a1" }
],
"LastUpdate": "2024-06-29T07:21:06.758Z"
},
"UserData": {}
}

226
contractdata/ARCADE/AMBERGRIS/AMBERGRIS3.json
View File

@ -1,226 +0,0 @@
{
"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": ["1efef5c0-7381-4e22-ac04-ffbd0822cc96"]
},
"Metadata": {
"Id": "27977fd9-732a-18b7-d986-a416ffbc19d5",
"CodeName_Hint": "Arcade Ambergris Penicillin",
"Title": "UI_PEACOCK_AMBERGRIS3",
"Description": "UI_CONTRACT_PENICILLIN_DESC",
"BriefingVideo": "briefing_penicillin",
"DebriefingVideo": "debriefing_penicillin",
"ScenePath": "assembly:/_pro/scenes/missions/theark/scene_penicillin.entity",
"TileImage": "images/contracts/elusive/S3_Penicillin/Title.jpg",
"Location": "LOCATION_NORTHSEA",
"IsPublished": true,
"CreationTimestamp": "2024-06-27T11:54:42.5164222Z",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"Type": "arcade",
"Entitlements": ["LOCATION_GOLDEN"],
"InGroup": "27e54c45-d5e8-fe2e-6f6c-f3e3d8239f46",
"GroupObjectiveDisplayOrder": [
{ "Id": "1efef5c0-7381-4e22-ac04-ffbd0822cc96" },
{ "Id": "c12bb13e-f20d-406f-be39-bcab179ea3d5" },
{ "Id": "f965e220-bfe0-4b2f-8c47-40472dedfbd6" }
],
"LastUpdate": "2024-06-29T07:21:06.758Z"
},
"UserData": {}
}

2
contractdata/ARCADE/COFFEEFRUIT/COFFEEFRUIT.json
View File

@ -19,7 +19,7 @@
"Type": "arcade",
"Release": "3.190.0 Arcade",
"ScenePath": "assembly:/_pro/scenes/missions/theark/scene_penicillin.entity",
"Entitlements": [],
"Entitlements": ["H3_ET_PENICILLIN"],
"GroupDefinition": {
"Type": "arcade",
"Order": [

2
contractdata/ARCADE/COFFEEFRUIT/COFFEEFRUIT1.json
View File

@ -217,7 +217,7 @@
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"Release": "3.190.x Arcade",
"Type": "arcade",
"Entitlements": [],
"Entitlements": ["H3_ET_PENICILLIN"],
"PublicId": "021902239547"
},
"UserData": {}

2
contractdata/ARCADE/COFFEEFRUIT/COFFEEFRUIT2.json
View File

@ -218,7 +218,7 @@
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"Release": "3.190.x Arcade",
"Type": "arcade",
"Entitlements": [],
"Entitlements": ["H3_ET_PENICILLIN"],
"PublicId": "021320190247",
"IsFeatured": false
},

2
contractdata/ARCADE/KASTURI/KASTURI.json
View File

@ -19,7 +19,7 @@
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"TileImage": "images/contracts/arcade/Arcade_Kasturi_Group.jpg",
"Title": "UI_PEACOCK_KASTURI",
"Description": "UI_CONTRACT_LEMON_GROUP_DESC",
"Description": "UI_CONTRACT_NECTARINE_GROUP_DESC",
"CodeName_Hint": "[PEACOCK] Arcade Kasturi - Group",
"Location": "LOCATION_EDGY_FOX",
"ScenePath": "assembly:/_pro/scenes/missions/edgy/mission_fox/scene_fox_tomorrowland.entity",

43
contractdata/ARCADE/_ARCADE_CHALLENGES.json
View File

@ -12,49 +12,6 @@
"Description": "UI_MENU_PAGE_CHALLENGE_CATEGORY_DESCRIPTION_ARCADE",
"OrderIndex": 6,
"Challenges": [
{
"Id": "9a37f599-c7be-3ab1-910a-4dd28fb1c82e",
"Name": "UI_PEACOCK_AMBERGRIS_COMPLETED_NAME",
"ImageName": "images/contracts/arcade/Arcade_Ambergris_Group.jpg",
"Description": "UI_PEACOCK_AMBERGRIS_COMPLETED_DESC",
"Rewards": {
"MasteryXP": 4000
},
"Drops": ["PROP_DEVICE_ICA_RUBBERDUCK_REMOTE_EXPLOSIVE_T"],
"IsPlayable": true,
"IsLocked": false,
"HideProgression": false,
"CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_ARCADE",
"Icon": "arcademode",
"LocationId": "LOCATION_NORTHAMERICA",
"ParentLocationId": "LOCATION_PARENT_NORTHAMERICA",
"Type": "contract",
"DifficultyLevels": [],
"OrderIndex": 10000,
"XpModifier": {},
"RuntimeType": "Hit",
"Definition": {
"Context": {},
"Scope": "session",
"States": {
"Start": {
"ContractEnd": {
"Condition": {
"$eq": [
"$ContractId",
"27977fd9-732a-18b7-d986-a416ffbc19d5"
]
},
"Transition": "Success"
}
}
}
},
"Tags": ["arcade", "hard"],
"InclusionData": {
"ContractIds": ["27e54c45-d5e8-fe2e-6f6c-f3e3d8239f46"]
}
},
{
"Id": "da1c6998-52e5-433b-81e8-879d6da87f91",
"Name": "UI_COFFEEFRUIT_COMPLETION_CHALLENGE_NAME",

49
contractdata/DARTMOOR/_DARTMOOR_CHALLENGES.json
View File

@ -621,6 +621,55 @@
"ContractIds": ["5680108a-19dc-4448-9344-3d0290217162"]
}
},
{
"Id": "fb09e534-93fa-4ec0-bb60-0a493a6ff2a2",
"Name": "UI_CHALLENGE_SMOOTHSNAKE_MYSTERYUNICORN_NAME",
"ImageName": "images/contracts/escalation/ContractEscalation_Ancestral_SmoothSnake_MysteryofUnicorns.jpg",
"Description": "UI_CHALLENGE_SMOOTHSNAKE_MYSTERYUNICORN_DESC",
"Rewards": {
"MasteryXP": 2000
},
"Drops": ["PROP_MELEE_UNICORNHORN"],
"IsPlayable": true,
"IsLocked": false,
"HideProgression": false,
"CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_SIGNATUREKILL",
"Icon": "challenge_category_assassination",
"LocationId": "LOCATION_PARENT_ANCESTRAL",
"ParentLocationId": "LOCATION_PARENT_ANCESTRAL",
"Type": "contract",
"DifficultyLevels": [],
"OrderIndex": 10000,
"XpModifier": {},
"RuntimeType": "Hit",
"Definition": {
"Scope": "hit",
"States": {
"Start": {
"Kill": {
"Condition": {
"$and": [
{
"$eq": ["$Value.IsTarget", true]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"58769c58-3e70-4746-be8e-4c7114f8c2bb"
]
}
]
},
"Transition": "Success"
}
}
}
},
"Tags": ["assassination", "medium"],
"InclusionData": {
"ContractIds": ["5680108a-19dc-4448-9344-3d0290217162"]
}
},
{
"Id": "ff861061-b0d6-437d-a2a1-d7678a45e786",
"Name": "UI_CHALLENGE_SMOOTHSNAKE_HOLYMOLY_NAME",

16
contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL1.json
View File

@ -30,9 +30,19 @@
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
"$or": [
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"70e6a06f-c6e0-4ce4-a0f9-6c61ec0d8fb5"
]
}
]
}
]

32
contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL2.json
View File

@ -30,9 +30,19 @@
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
"$or": [
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"70e6a06f-c6e0-4ce4-a0f9-6c61ec0d8fb5"
]
}
]
}
]
@ -122,9 +132,19 @@
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
"$or": [
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"70e6a06f-c6e0-4ce4-a0f9-6c61ec0d8fb5"
]
}
]
}
]

64
contractdata/HAVEN/ESCALATION/SLEAZEBALL/SLEAZEBALL3.json
View File

@ -30,9 +30,19 @@
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
"$or": [
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"70e6a06f-c6e0-4ce4-a0f9-6c61ec0d8fb5"
]
}
]
}
]
@ -122,9 +132,19 @@
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
"$or": [
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"70e6a06f-c6e0-4ce4-a0f9-6c61ec0d8fb5"
]
}
]
}
]
@ -214,9 +234,19 @@
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
"$or": [
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"70e6a06f-c6e0-4ce4-a0f9-6c61ec0d8fb5"
]
}
]
}
]
@ -306,9 +336,19 @@
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
"$or": [
{
"$eq": [
"$Value.KillItemRepositoryId",
"9c649932-7329-4cc3-a8cb-a32cae5dd7ca"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"70e6a06f-c6e0-4ce4-a0f9-6c61ec0d8fb5"
]
}
]
}
]

2
contractdata/SAPIENZA/_H2_SAPIENZA_CHALLENGES.json
View File

@ -6523,7 +6523,7 @@
"Condition": {
"$eq": [
"$Value.RepositoryId",
"249659f3-8989-4ffc-b727-4902e954605f"
"8fd339e1-ea06-4aee-bd65-0c89b34e4e7e"
]
},
"Transition": "Disguise_on"

2
contractdata/SAPIENZA/_LEGACY_SAPIENZA_CHALLENGES.json
View File

@ -8015,7 +8015,7 @@
"Condition": {
"$eq": [
"$Value.RepositoryId",
"249659f3-8989-4ffc-b727-4902e954605f"
"8fd339e1-ea06-4aee-bd65-0c89b34e4e7e"
]
},
"Transition": "Disguise_on"

98
contractdata/SAPIENZA/_SAPIENZA_CHALLENGES.json
View File

@ -1785,6 +1785,102 @@
"ContractIds": ["00000000-0000-0000-0000-000000000600"]
}
},
{
"Id": "63dbcd69-6a3b-44b7-82bf-30039fe0926c",
"Name": "UI_CHALLENGES_OCTOPUS_SPORTS_NAME",
"ImageName": "images/challenges/sapienza/octopus_SportsClub.jpg",
"Description": "UI_CHALLENGES_OCTOPUS_SPORTS_DESC",
"Rewards": {
"MasteryXP": 4000
},
"Drops": ["PROP_EXPLOSIVE_ICA_IMPACT"],
"IsPlayable": true,
"IsLocked": false,
"HideProgression": false,
"CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_SIGNATUREKILL",
"Icon": "challenge_category_assassination",
"LocationId": "LOCATION_PARENT_COASTALTOWN",
"ParentLocationId": "LOCATION_PARENT_COASTALTOWN",
"Type": "contract",
"DifficultyLevels": [],
"OrderIndex": 10000,
"XpModifier": {},
"RuntimeType": "Hit",
"Definition": {
"Constants": {
"Goal": 2
},
"Context": {
"Count": 0
},
"ContextListeners": {
"Count": {
"type": "challengecounter",
"count": "$.Count",
"total": "$.Goal"
}
},
"Scope": "session",
"States": {
"Start": {
"Kill": [
{
"Condition": {
"$and": [
{
"$eq": [
"$Value.RepositoryId",
"0dfaea51-3c36-4722-9eff-f1e7ef139878"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"8b7c3ec6-c072-4a21-a323-0f8751028052"
]
}
]
},
"Actions": {
"$inc": "Count"
}
},
{
"Condition": {
"$and": [
{
"$eq": [
"$Value.RepositoryId",
"94ab740b-b30f-4086-9aea-5c9c0de28456"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"c95c55aa-34e5-42bd-bf27-32be3978b269"
]
}
]
},
"Actions": {
"$inc": "Count"
}
},
{
"Condition": {
"$eq": ["$.Count", "$.Goal"]
},
"Transition": "Success"
}
]
}
}
},
"Tags": ["story", "hard", "assassination"],
"InclusionData": {
"ContractIds": ["00000000-0000-0000-0000-000000000600"]
}
},
{
"Id": "7021c868-63cd-4ef1-80db-4255433072e6",
"Name": "UI_CHALLENGES_OCTOPUS_SIGN_FRANCESCA_DROWN_NAME",
@ -6783,7 +6879,7 @@
"Condition": {
"$eq": [
"$Value.RepositoryId",
"249659f3-8989-4ffc-b727-4902e954605f"
"8fd339e1-ea06-4aee-bd65-0c89b34e4e7e"
]
},
"Transition": "Disguise_on"

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "@peacockproject/monorepo",
"version": "7.3.1",
"version": "7.3.2",
"private": true,
"license": "AGPL-3.0",
"scripts": {
@ -34,7 +34,7 @@
"send": "patch:send@npm:0.18.0#.yarn/patches/send-npm-0.18.0-faadf6353f.patch"
},
"dependencies": {
"@peacockproject/statemachine-parser": "^6.0.0",
"@peacockproject/statemachine-parser": "^6.1.0",
"@yarnpkg/fslib": "^3.1.0",
"@yarnpkg/libzip": "^3.1.0",
"axios": "^1.7.2",

4
packaging/ciAssemble.sh
View File

@ -28,6 +28,9 @@ else
OUT_DIR=Peacock-v"$VERSION"-linux
fi
# generate options.ini
node chunk0.js noop
mkdir "$OUT_DIR"
cp packaging/HOW_TO_USE.html "$OUT_DIR"
cp PeacockPatcher.exe "$OUT_DIR"
@ -52,5 +55,6 @@ mkdir "$OUT_DIR"/webui/dist
cp webui/dist/*.html "$OUT_DIR"/webui/dist
cp -r webui/dist/assets "$OUT_DIR"/webui/dist/assets
cp webui/dist/THIRDPARTYNOTICES.txt "$OUT_DIR"/webui/dist/THIRDPARTYNOTICES.txt
cp options.ini "$OUT_DIR"
ls "$OUT_DIR"
zip -9 -r "$OUT_DIR".zip "$OUT_DIR"

2
packaging/typedefs/package.json
View File

@ -21,7 +21,7 @@
"reversion": "node ../versionTypedefsPackageJson.mjs"
},
"dependencies": {
"@peacockproject/statemachine-parser": "^6.0.0",
"@peacockproject/statemachine-parser": "^6.1.0",
"@types/express": "^4.17.20",
"@types/node": "*",
"axios": "^1.6.8",

BIN
resources/dynamic_resources_h2.rpkg
View File

Binary file not shown.

BIN
resources/dynamic_resources_h3.rpkg
View File

Binary file not shown.

102
resources/locale.json
View File

@ -269,12 +269,8 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.</li><li>Activate the shower.</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>Rearrange the meeting and lockdown the meeting room in Dubai.</li><li>Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.</li><li>Complete the mission.</li>",
"UI_PEACOCK_AMBERGRIS": "The Bloodlusts",
"UI_PEACOCK_AMBERGRIS1": "The Bloodlusts - Level 1",
"UI_PEACOCK_AMBERGRIS2": "The Bloodlusts - Level 2",
"UI_PEACOCK_AMBERGRIS3": "The Bloodlusts - Level 3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "Eliminate The Bloodlusts",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>Eliminate all Elusive Targets that are part of The Bloodlusts.</li>"
"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."
},
"french": {
"UI_DRP_001": "UI_DRP_001",
@ -547,12 +543,8 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.</li><li>Activate the shower.</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>Rearrange the meeting and lockdown the meeting room in Dubai.</li><li>Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.</li><li>Complete the mission.</li>",
"UI_PEACOCK_AMBERGRIS": "The Bloodlusts",
"UI_PEACOCK_AMBERGRIS1": "The Bloodlusts - Level 1",
"UI_PEACOCK_AMBERGRIS2": "The Bloodlusts - Level 2",
"UI_PEACOCK_AMBERGRIS3": "The Bloodlusts - Level 3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "Eliminate The Bloodlusts",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>Eliminate all Elusive Targets that are part of The Bloodlusts.</li>"
"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."
},
"italian": {
"UI_DRP_001": "UI_DRP_001",
@ -824,12 +816,8 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.</li><li>Activate the shower.</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>Rearrange the meeting and lockdown the meeting room in Dubai.</li><li>Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.</li><li>Complete the mission.</li>",
"UI_PEACOCK_AMBERGRIS": "The Bloodlusts",
"UI_PEACOCK_AMBERGRIS1": "The Bloodlusts - Level 1",
"UI_PEACOCK_AMBERGRIS2": "The Bloodlusts - Level 2",
"UI_PEACOCK_AMBERGRIS3": "The Bloodlusts - Level 3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "Eliminate The Bloodlusts",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>Eliminate all Elusive Targets that are part of The Bloodlusts.</li>"
"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."
},
"german": {
"UI_DRP_001": "",
@ -1107,12 +1095,8 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.</li><li>Activate the shower.</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>Rearrange the meeting and lockdown the meeting room in Dubai.</li><li>Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.</li><li>Complete the mission.</li>",
"UI_PEACOCK_AMBERGRIS": "The Bloodlusts",
"UI_PEACOCK_AMBERGRIS1": "The Bloodlusts - Level 1",
"UI_PEACOCK_AMBERGRIS2": "The Bloodlusts - Level 2",
"UI_PEACOCK_AMBERGRIS3": "The Bloodlusts - Level 3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "Eliminate The Bloodlusts",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>Eliminate all Elusive Targets that are part of The Bloodlusts.</li>"
"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."
},
"spanish": {
"UI_DRP_001": "UI_DRP_001",
@ -1385,12 +1369,8 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.</li><li>Activate the shower.</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>Rearrange the meeting and lockdown the meeting room in Dubai.</li><li>Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.</li><li>Complete the mission.</li>",
"UI_PEACOCK_AMBERGRIS": "The Bloodlusts",
"UI_PEACOCK_AMBERGRIS1": "The Bloodlusts - Level 1",
"UI_PEACOCK_AMBERGRIS2": "The Bloodlusts - Level 2",
"UI_PEACOCK_AMBERGRIS3": "The Bloodlusts - Level 3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "Eliminate The Bloodlusts",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>Eliminate all Elusive Targets that are part of The Bloodlusts.</li>"
"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."
},
"russian": {
"UI_DRP_001": "UI_DRP_001",
@ -1662,12 +1642,8 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>Уничтожить Карлтона Смита через сожжение, и устранить его сокамерника с помощью Крюка на Острове Эмброуз.</li><li>Включить душ.</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Кушать подано!",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>Перенести встречу и вызвать тревогу в комнате для встреч, в Дубаях.</li><li>Нейтрализовать Карла Инграма и Маркуса Стейвесанта с помощью Сковороды.</li><li>Выполнить задание.</li>",
"UI_PEACOCK_AMBERGRIS": "The Bloodlusts",
"UI_PEACOCK_AMBERGRIS1": "The Bloodlusts - Level 1",
"UI_PEACOCK_AMBERGRIS2": "The Bloodlusts - Level 2",
"UI_PEACOCK_AMBERGRIS3": "The Bloodlusts - Level 3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "Eliminate The Bloodlusts",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>Eliminate all Elusive Targets that are part of The Bloodlusts.</li>"
"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."
},
"chineseSimplified": {
"UI_DRP_001": "UI_DRP_001",
@ -1939,12 +1915,8 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>在安布罗斯岛烧死卡尔顿·史密斯，并用钩子消灭他的狱友。</li><li>激活淋浴设备。</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "晚餐就绪！",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>在迪拜重新安排会议并封锁会议室。</li><li>用平底锅制伏卡尔·英格拉姆和马库斯·斯图维森特。</li><li>完成任务。</li>",
"UI_PEACOCK_AMBERGRIS": "嗜血者",
"UI_PEACOCK_AMBERGRIS1": "嗜血者 - 第1关",
"UI_PEACOCK_AMBERGRIS2": "嗜血者 - 第2关",
"UI_PEACOCK_AMBERGRIS3": "嗜血者 - 第3关",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "消灭“嗜血者”",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>消灭组成“嗜血者”的全部行踪不定的目标。</li>"
"UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "仅限头部攻击",
"UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "必须使用爆头或投掷致命近战武器消灭所有目标。"
},
"chineseTraditional": {
"UI_DRP_001": "UI_DRP_001",
@ -2207,21 +2179,17 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_WRAPPER_NAME": "美食誘惑",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_WRAPPER_DESC": "完成屠夫之樂的所有挑戰。<li>磨練切肉技能</li><li>骨頭味道如何？</li><li>離開醃料</li><li>淬火鉤</li><li>晚餐準備好了！</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_SAPIENZACLEAVERKILL_NAME": "磨練切肉技能",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_SAPIENZACLEAVERKILL_DESC": "<li>在羅馬大學使用偽裝成廚房助理的切肉刀消滅目標。</li><li>不要被發現。</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_SAPIENZACLEAVERKILL_DESC": "<li>在羅馬大學使用偽裝成廚房助理的切肉刀來消滅目標。</li><li>不要被發現。</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_SANTAFORTUNABONEPACIFY_NAME": "骨頭味道如何？",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_SANTAFORTUNABONEPACIFY_DESC": "<li>在聖福爾圖納用肉骨擊暈布萊爾·雷丁頓。</li><li>完成任務。</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_CHONGQINGMARINATE_NAME": "離開醃料",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_CHONGQINGMARINATE_DESC": "<li>在重慶裝扮成餃子師傅用毒藥消滅一個目標。</li><li>將目標的身體浸入水中。</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_CHONGQINGMARINATE_DESC": "<li>在重慶裝扮成餃子師傅用毒藥來消滅一個目標。</li><li>將目標的身體浸入水中。</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME": "淬火鉤",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>在安布羅斯島透過燒死卡爾頓·史密斯來消滅他，並用鉤子消滅他的獄友。</li><li>啟動淋浴。</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "晚餐準備好了！",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>重新安排會議並封鎖杜拜的會議室。</li><li>用煎鍋擊暈卡爾·英格拉姆和馬庫斯·史岱文森。</li><li>完成任務。</li>",
"UI_PEACOCK_AMBERGRIS": "血腥狂人",
"UI_PEACOCK_AMBERGRIS1": "血腥狂人——關卡1",
"UI_PEACOCK_AMBERGRIS2": "血腥狂人——關卡2",
"UI_PEACOCK_AMBERGRIS3": "血腥狂人——關卡3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "消滅血腥狂人",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>消滅組成血腥狂人的所有隱密目標。</li>"
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>重新安排會議並封鎖杜拜的會議室。</li><li>用煎鍋擊暈卡爾·英格倫和馬克斯·史岱文森。</li><li>完成任務。</li>",
"UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME": "僅頭部攻擊",
"UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC": "所有目標都必須透過爆頭或投擲致命的近戰武器的方式來消滅。"
},
"japanese": {
"UI_DRP_001": "UI_DRP_001",
@ -2493,12 +2461,8 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.</li><li>Activate the shower.</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>Rearrange the meeting and lockdown the meeting room in Dubai.</li><li>Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.</li><li>Complete the mission.</li>",
"UI_PEACOCK_AMBERGRIS": "The Bloodlusts",
"UI_PEACOCK_AMBERGRIS1": "The Bloodlusts - Level 1",
"UI_PEACOCK_AMBERGRIS2": "The Bloodlusts - Level 2",
"UI_PEACOCK_AMBERGRIS3": "The Bloodlusts - Level 3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "Eliminate The Bloodlusts",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>Eliminate all Elusive Targets that are part of The Bloodlusts.</li>"
"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."
},
"spanishMexican": {
"UI_DRP_001": "UI_DRP_001",
@ -2771,12 +2735,8 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.</li><li>Activate the shower.</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>Rearrange the meeting and lockdown the meeting room in Dubai.</li><li>Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.</li><li>Complete the mission.</li>",
"UI_PEACOCK_AMBERGRIS": "The Bloodlusts",
"UI_PEACOCK_AMBERGRIS1": "The Bloodlusts - Level 1",
"UI_PEACOCK_AMBERGRIS2": "The Bloodlusts - Level 2",
"UI_PEACOCK_AMBERGRIS3": "The Bloodlusts - Level 3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "Eliminate The Bloodlusts",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>Eliminate all Elusive Targets that are part of The Bloodlusts.</li>"
"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."
},
"portugueseBrazil": {
"UI_DRP_001": "UI_DRP_001",
@ -3007,12 +2967,8 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.</li><li>Activate the shower.</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>Rearrange the meeting and lockdown the meeting room in Dubai.</li><li>Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.</li><li>Complete the mission.</li>",
"UI_PEACOCK_AMBERGRIS": "The Bloodlusts",
"UI_PEACOCK_AMBERGRIS1": "The Bloodlusts - Level 1",
"UI_PEACOCK_AMBERGRIS2": "The Bloodlusts - Level 2",
"UI_PEACOCK_AMBERGRIS3": "The Bloodlusts - Level 3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "Eliminate The Bloodlusts",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>Eliminate all Elusive Targets that are part of The Bloodlusts.</li>"
"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."
},
"polish": {
"UI_DRP_001": "UI_DRP_001",
@ -3282,11 +3238,7 @@
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC": "<li>Eliminate Carlton Smith by burning him, and eliminate his cell mate with the Hook in Ambrose Island.</li><li>Activate the shower.</li>",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME": "Dinner's Ready!",
"UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC": "<li>Rearrange the meeting and lockdown the meeting room in Dubai.</li><li>Pacify Carl Ingram and Marcus Stuyvesant with a Frying Pan.</li><li>Complete the mission.</li>",
"UI_PEACOCK_AMBERGRIS": "The Bloodlusts",
"UI_PEACOCK_AMBERGRIS1": "The Bloodlusts - Level 1",
"UI_PEACOCK_AMBERGRIS2": "The Bloodlusts - Level 2",
"UI_PEACOCK_AMBERGRIS3": "The Bloodlusts - Level 3",
"UI_PEACOCK_AMBERGRIS_COMPLETED_NAME": "Eliminate The Bloodlusts",
"UI_PEACOCK_AMBERGRIS_COMPLETED_DESC": "<li>Eliminate all Elusive Targets that are part of The Bloodlusts.</li>"
"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."
}
}

56
static/EiderDashboard.json
View File

@ -338,35 +338,47 @@
"image": "$res images/livetile/tile_gamemode_evergreen.jpg"
},
"actions": {
"accept": [
{
"set-menu-context": {
"value": {
"onpageopened": {
"set-selected": {
"target": "PLANNING_BUTTON_PLAY"
},
"trigger-input": {
"action": "accept"
"accept": {
"$if $ispackageowned locationGolden": {
"$then": [
{
"set-menu-context": {
"value": {
"onpageopened": {
"set-selected": {
"target": "PLANNING_BUTTON_PLAY"
},
"trigger-input": {
"action": "accept"
}
}
}
}
},
{
"link": {
"page": "planning",
"args": {
"url": "planning",
"args": {
"contractid": "f8ec92c2-4fa2-471e-ae08-545480c746ee",
"resetescalation": false
},
"contractid": "f8ec92c2-4fa2-471e-ae08-545480c746ee"
}
}
}
}
},
{
"link": {
"page": "planning",
"args": {
"url": "planning",
],
"$else": {
"link": {
"page": "gamemode_evergreen",
"args": {
"contractid": "f8ec92c2-4fa2-471e-ae08-545480c746ee",
"resetescalation": false
},
"contractid": "f8ec92c2-4fa2-471e-ae08-545480c746ee"
"locationId": "LOCATION_PARENT_SNUG"
}
}
}
}
],
},
"select": {
"replace-children": {
"target": "headline_container",

6
static/EscalationCodenames.json
View File

@ -751,12 +751,6 @@
}
],
"Elusive Target Arcade": [
{
"codename": "Ambergris",
"name": "🦚 The Bloodlusts",
"id": "27e54c45-d5e8-fe2e-6f6c-f3e3d8239f46",
"isPeacock": true
},
{
"codename": "Kasturi",
"name": "🦚 The Personages",

64
static/PeacockGameChangerProperties.json
View File

@ -206,5 +206,69 @@
}
}
]
},
"98223196-71ea-60c3-962c-b856ee8cc2e7": {
"Name": "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME",
"Description": "UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC",
"Icon": null,
"IsHidden": null,
"TileImage": "images/contractconditions/condition_contrac_headshots_only.jpg",
"ObjectivesCategory": "primary",
"Resource": [],
"Objectives": [
{
"Id": "0b4e7a06-c544-987a-e0bd-8f6ad23406a4",
"Category": "secondary",
"AllowEtRestartOnSuccess": true,
"BriefingText": "$loc UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_DESC",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_GAMECHANGERS_GLOBAL_HEADKILLONLY_NAME",
"iconType": 17
},
"Type": "statemachine",
"Definition": {
"Scope": "session",
"States": {
"Start": {
"-": {
"Transition": "Success"
}
},
"Success": {
"Kill": {
"Condition": {
"$and": [
{
"$eq": ["$Value.IsTarget", true]
},
{
"$not": {
"$or": [
{
"$eq": [
"$Value.KillMethodBroad",
"throw"
]
},
{
"$eq": [
"$Value.IsHeadshot",
true
]
}
]
}
}
]
},
"Transition": "Failure"
}
}
}
}
}
],
"ShowBasedOnObjectives": null,
"IsPrestigeObjective": null
}
}

12
yarn.lock
View File

@ -490,7 +490,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@peacockproject/core@workspace:packaging/typedefs"
dependencies:
"@peacockproject/statemachine-parser": "npm:^6.0.0"
"@peacockproject/statemachine-parser": "npm:^6.1.0"
"@types/express": "npm:^4.17.20"
"@types/node": "npm:*"
axios: "npm:^1.6.8"
@ -519,7 +519,7 @@ __metadata:
"@eslint/eslintrc": "npm:^3.1.0"
"@eslint/js": "npm:^9.4.0"
"@peacockproject/eslint-plugin": "workspace:*"
"@peacockproject/statemachine-parser": "npm:^6.0.0"
"@peacockproject/statemachine-parser": "npm:^6.1.0"
"@rdil/parallel-prettier": "npm:^3.0.0"
"@types/express": "npm:^4.17.20"
"@types/jsonwebtoken": "npm:^9.0.6"
@ -575,10 +575,10 @@ __metadata:
languageName: unknown
linkType: soft
"@peacockproject/statemachine-parser@npm:^6.0.0":
version: 6.0.0
resolution: "@peacockproject/statemachine-parser@npm:6.0.0"
checksum: 10/22296be28e04a017f8da912f9deebbcf1928ba724c0e63aedff9e4b9b1ed7ec384fd71796a2ab7a84fa44a4826f5b1554cfd726f8f17f331007476010eaba2a8
"@peacockproject/statemachine-parser@npm:^6.1.0":
version: 6.1.0
resolution: "@peacockproject/statemachine-parser@npm:6.1.0"
checksum: 10/13b29894cc5e26e54752c6a1881e9e3c95b39888f528c497f2b39e6960c7f254b519dcb1d316d2698003d5590b4dd1a6370f1cf8bef226112913cf701adbcffa
languageName: node
linkType: hard