github/Peacock
1
Fork 0
mirror of https://github.com/thepeacockproject/Peacock synced 2025-02-16 16:34:28 +01:00
Code Releases Activity

Fix some bugs of The Jeffrey Consolation (#139)

Browse Source 
* Add constantjeff brick

* Fix missing objectives
This commit is contained in:
moonysolari 2023-02-23 09:29:15 -05:00 committed by GitHub
parent 5597e63401
commit 319815c3b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 239 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/contracts/dataGen.ts
View File

@ -244,10 +244,16 @@ export function mapObjectives(
const gameChangerObjectives: MissionManifestObjective[] = [] const gameChangerObjectives: MissionManifestObjective[] = []
if (gameChangers && gameChangers.length > 0) { if (gameChangers && gameChangers.length > 0) {
const gameChangerData = getConfig<Record<string, GameChanger>>( const gameChangerData: Record<string, GameChanger> = {
"GameChangerProperties", ...getConfig<Record<string, GameChanger>>(
true, "GameChangerProperties",
) true,
),
...getConfig<Record<string, GameChanger>>(
"PeacockGameChangerProperties",
true,
),
}
for (const gamechangerId of gameChangers) { for (const gamechangerId of gameChangers) {
if (isEvergreenSafehouse) break if (isEvergreenSafehouse) break
const gameChangerProps = gameChangerData[gamechangerId] const gameChangerProps = gameChangerData[gamechangerId]

4
contractdata/SAPIENZA/JEFFREY1.json
View File

@ -78,7 +78,9 @@
} }
} }
], ],
"Bricks": [], "Bricks": [
"assembly:/_PRO/Scenes/Missions/CoastalTown/override_constantjeff.brick"
],
"Entrances": [ "Entrances": [
"a28dd5e3-1f1d-408d-9387-945641c32218", "a28dd5e3-1f1d-408d-9387-945641c32218",
"c200b5c6-2c14-4602-b22d-3a67b9fb3e3b", "c200b5c6-2c14-4602-b22d-3a67b9fb3e3b",

69
contractdata/SAPIENZA/JEFFREY2.json
View File

@ -76,74 +76,11 @@
} }
} }
} }
},
{
"_comment": "Liberation Guards",
"Id": "542a7e07-a948-49d2-b4ed-52b8f0f1927f",
"Type": "statemachine",
"Category": "primary",
"ExcludeFromScoring": true,
"IsHidden": false,
"ObjectiveType": "custom",
"HUDTemplate": {
"display": "Eliminate Brother Akram's guards"
},
"Definition": {
"Scope": "session",
"Context": {
"Targets": [
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
},
"States": {
"Start": {
"Kill": {
"Condition": {
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6"
]
},
{
"$eq": [
"$Value.RepositoryId",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
}
]
},
"Transition": "OneDown"
}
},
"OneDown": {
"Kill": {
"Condition": {
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6"
]
},
{
"$eq": [
"$Value.RepositoryId",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
}
]
},
"Transition": "Success"
}
}
}
}
} }
], ],
"Bricks": [], "Bricks": [
"assembly:/_PRO/Scenes/Missions/CoastalTown/override_constantjeff.brick"
],
"Entrances": [ "Entrances": [
"a28dd5e3-1f1d-408d-9387-945641c32218", "a28dd5e3-1f1d-408d-9387-945641c32218",
"c200b5c6-2c14-4602-b22d-3a67b9fb3e3b", "c200b5c6-2c14-4602-b22d-3a67b9fb3e3b",

152
contractdata/SAPIENZA/JEFFREY3.json
View File

@ -76,157 +76,11 @@
} }
} }
} }
},
{
"_comment": "Liberation Guards",
"Id": "542a7e07-a948-49d2-b4ed-52b8f0f1927f",
"Type": "statemachine",
"Category": "primary",
"IsHidden": false,
"ObjectiveType": "custom",
"HUDTemplate": {
"display": "Eliminate Brother Akram's guards with Jeff's folding knife"
},
"Definition": {
"Scope": "session",
"Context": {
"Targets": [
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
},
"States": {
"Start": {
"Kill": {
"Condition": {
"$and": [
{
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6"
]
},
{
"$eq": [
"$Value.RepositoryId",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
}
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"a2c56798-026f-4d0b-9480-de0d2525a119"
]
}
]
},
"Transition": "OneDown"
}
},
"OneDown": {
"Kill": {
"Condition": {
"$and": [
{
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6"
]
},
{
"$eq": [
"$Value.RepositoryId",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
}
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"a2c56798-026f-4d0b-9480-de0d2525a119"
]
}
]
},
"Transition": "Success"
}
}
}
}
},
{
"_comment": "Couple",
"Id": "542a7e07-a948-49d2-b4ed-52b8f0f1927f",
"Type": "statemachine",
"Category": "primary",
"IsHidden": false,
"ObjectiveType": "custom",
"HUDTemplate": {
"display": "Eliminate the Couple at the cafe"
},
"Definition": {
"Scope": "session",
"Context": {
"Targets": [
"2bf8c4ca-c73b-4bad-b338-0cd1b797f305",
"8d5f03f0-f817-4f07-8c37-5faa032cf98c"
]
},
"States": {
"Start": {
"Kill": {
"Condition": {
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"2bf8c4ca-c73b-4bad-b338-0cd1b797f305"
]
},
{
"$eq": [
"$Value.RepositoryId",
"8d5f03f0-f817-4f07-8c37-5faa032cf98c"
]
}
]
},
"Transition": "OneDown"
}
},
"OneDown": {
"Kill": {
"Condition": {
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"2bf8c4ca-c73b-4bad-b338-0cd1b797f305"
]
},
{
"$eq": [
"$Value.RepositoryId",
"8d5f03f0-f817-4f07-8c37-5faa032cf98c"
]
}
]
},
"Transition": "Success"
}
}
}
}
} }
], ],
"Bricks": [], "Bricks": [
"assembly:/_PRO/Scenes/Missions/CoastalTown/override_constantjeff.brick"
],
"Entrances": [ "Entrances": [
"a28dd5e3-1f1d-408d-9387-945641c32218", "a28dd5e3-1f1d-408d-9387-945641c32218",
"c200b5c6-2c14-4602-b22d-3a67b9fb3e3b", "c200b5c6-2c14-4602-b22d-3a67b9fb3e3b",

225
static/PeacockGameChangerProperties.json
View File

@ -4,20 +4,170 @@
"Description": "UI_PEACOCK_SATANTA_GUARDS_PLANNING_DESC", "Description": "UI_PEACOCK_SATANTA_GUARDS_PLANNING_DESC",
"TileImage": "images/contracts/escalation/satanta-guards.png", "TileImage": "images/contracts/escalation/satanta-guards.png",
"Icon": null, "Icon": null,
"ObjectivesCategory": "secondary", "ObjectivesCategory": "primary",
"IsHidden": null, "IsHidden": null,
"Resource": [], "Resource": [],
"Objectives": [] "Objectives": [
{
"_comment": "Liberation Guards",
"Id": "542a7e07-a948-49d2-b4ed-52b8f0f1927f",
"Type": "statemachine",
"Category": "primary",
"IsHidden": false,
"ObjectiveType": "custom",
"HUDTemplate": {
"display": "Eliminate Brother Akram's guards"
},
"Definition": {
"Scope": "session",
"Context": {
"Targets": [
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
},
"States": {
"Start": {
"Kill": {
"Condition": {
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6"
]
},
{
"$eq": [
"$Value.RepositoryId",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
}
]
},
"Transition": "OneDown"
}
},
"OneDown": {
"Kill": {
"Condition": {
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6"
]
},
{
"$eq": [
"$Value.RepositoryId",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
}
]
},
"Transition": "Success"
}
}
}
}
}
]
}, },
"fa65efde-247a-418b-bb92-988adf032773": { "fa65efde-247a-418b-bb92-988adf032773": {
"Name": "UI_PEACOCK_SATANTA_GUARDS_PLANNING", "Name": "UI_PEACOCK_SATANTA_GUARDS_PLANNING",
"Description": "UI_PEACOCK_SATANTA_GUARDS_PLANNING2_DESC", "Description": "UI_PEACOCK_SATANTA_GUARDS_PLANNING2_DESC",
"TileImage": "images/contracts/escalation/satanta-guards.png", "TileImage": "images/contracts/escalation/satanta-guards.png",
"Icon": null, "Icon": null,
"ObjectivesCategory": "secondary", "ObjectivesCategory": "primary",
"IsHidden": null, "IsHidden": null,
"Resource": [], "Resource": [],
"Objectives": [] "Objectives": [
{
"_comment": "Liberation Guards",
"Id": "542a7e07-a948-49d2-b4ed-52b8f0f1927f",
"Type": "statemachine",
"Category": "primary",
"IsHidden": false,
"ObjectiveType": "custom",
"HUDTemplate": {
"display": "Eliminate Brother Akram's guards with Jeff's folding knife"
},
"Definition": {
"Scope": "session",
"Context": {
"Targets": [
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
},
"States": {
"Start": {
"Kill": {
"Condition": {
"$and": [
{
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6"
]
},
{
"$eq": [
"$Value.RepositoryId",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
}
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"a2c56798-026f-4d0b-9480-de0d2525a119"
]
}
]
},
"Transition": "OneDown"
}
},
"OneDown": {
"Kill": {
"Condition": {
"$and": [
{
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"cc72b9c0-b73a-4e34-97ee-329ce22abaa6"
]
},
{
"$eq": [
"$Value.RepositoryId",
"cc3290c0-d1b0-4706-a2a6-0e09ff34a4ad"
]
}
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"a2c56798-026f-4d0b-9480-de0d2525a119"
]
}
]
},
"Transition": "Success"
}
}
}
}
}
]
}, },
"1f23082c-2d1f-4dcf-b45f-0a9eb39ed441": { "1f23082c-2d1f-4dcf-b45f-0a9eb39ed441": {
"Name": "UI_PEACOCK_SATANTA_COUPLE", "Name": "UI_PEACOCK_SATANTA_COUPLE",
@ -27,7 +177,72 @@
"ObjectivesCategory": "secondary", "ObjectivesCategory": "secondary",
"IsHidden": null, "IsHidden": null,
"Resource": [], "Resource": [],
"Objectives": [] "Objectives": [
{
"_comment": "Couple",
"Id": "542a7e07-a948-49d2-b4ed-52b8f0f1927f",
"Type": "statemachine",
"Category": "primary",
"IsHidden": false,
"ObjectiveType": "custom",
"HUDTemplate": {
"display": "Eliminate the Couple at the cafe"
},
"Definition": {
"Scope": "session",
"Context": {
"Targets": [
"2bf8c4ca-c73b-4bad-b338-0cd1b797f305",
"8d5f03f0-f817-4f07-8c37-5faa032cf98c"
]
},
"States": {
"Start": {
"Kill": {
"Condition": {
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"2bf8c4ca-c73b-4bad-b338-0cd1b797f305"
]
},
{
"$eq": [
"$Value.RepositoryId",
"8d5f03f0-f817-4f07-8c37-5faa032cf98c"
]
}
]
},
"Transition": "OneDown"
}
},
"OneDown": {
"Kill": {
"Condition": {
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"2bf8c4ca-c73b-4bad-b338-0cd1b797f305"
]
},
{
"$eq": [
"$Value.RepositoryId",
"8d5f03f0-f817-4f07-8c37-5faa032cf98c"
]
}
]
},
"Transition": "Success"
}
}
}
}
}
]
}, },
"7138fd16-4d15-4cca-816b-958e2f3a8164": { "7138fd16-4d15-4cca-816b-958e2f3a8164": {
"Name": "UI_PEACOCK_YANNINI_WHEREAMI", "Name": "UI_PEACOCK_YANNINI_WHEREAMI",