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

Removal of mamushi shim, noel contract creation

Browse Source
This commit is contained in:
AnthonyFuller 2023-10-26 12:43:26 +01:00
parent b65f35664f
commit 036b8565b4
13 changed files with 112 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/candle/challengeHelpers.ts
View File

@ -202,11 +202,7 @@ function isChallengeInContract(
// 1. The current sub-location, e.g. "LOCATION_COASTALTOWN_NIGHT". This is the most common.
// 2. The parent location (yup, that can happen), e.g. "LOCATION_PARENT_HOKKAIDO" in Discover Hokkaido.
challenge.LocationId === locationId ||
challenge.LocationId === challenge.ParentLocationId ||
// Special case: winter festival has its own locationId, but for Hokkaido-wide challenges,
// the locationId is "LOCATION_HOKKAIDO", not "LOCATION_PARENT_HOKKAIDO".
(challenge.LocationId === "LOCATION_HOKKAIDO" &&
locationId === "LOCATION_HOKKAIDO_SHIM_MAMUSHI")
challenge.LocationId === challenge.ParentLocationId
return (
isForContract ||

2
components/menuData.ts
View File

@ -274,7 +274,6 @@ menuDataRouter.get("/Hub", (req: RequestWithJwt, res) => {
for (const child in locations.children) {
if (
child === "LOCATION_ICA_FACILITY_ARRIVAL" ||
child === "LOCATION_HOKKAIDO_SHIM_MAMUSHI" ||
child.includes("SNUG_")
) {
continue
@ -1859,7 +1858,6 @@ menuDataRouter.get("/PlayerProfile", (req: RequestWithJwt, res) => {
// Ewww...
if (
subLocationKey === "LOCATION_ICA_FACILITY_ARRIVAL" ||
subLocationKey === "LOCATION_HOKKAIDO_SHIM_MAMUSHI" ||
subLocationKey.includes("SNUG_")
) {
continue

2
components/menus/planning.ts
View File

@ -371,7 +371,7 @@ export async function planningView(
const limitedLoadoutUnlockLevelMap = {
LOCATION_MIAMI: 2,
LOCATION_HOKKAIDO: 20,
LOCATION_HOKKAIDO_SHIM_MAMUSHI: 20,
LOCATION_HOKKAIDO_MAMUSHI: 20,
}
if (

2
contractdata/HOKKAIDO/HOKKAIDOSNOWFESTIVAL.json
View File

@ -44,7 +44,7 @@
"Description": "UI_CONTRACT_MAMUSHI_TARGET_BRIEFING",
"BriefingVideo": "briefing_mamushi",
"DebriefingVideo": "debriefing_mamushi",
"Location": "LOCATION_HOKKAIDO_SHIM_MAMUSHI",
"Location": "LOCATION_HOKKAIDO_MAMUSHI",
"ScenePath": "assembly:/_PRO/Scenes/Missions/Hokkaido/scene_mamushi.entity",
"Type": "flashback",
"Release": "2.13.x",

14
contractdata/HOKKAIDO/SNOWFESTIVALCREATION.json
View File

@ -18,19 +18,19 @@
"IsLocked": false,
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"IsPublished": true,
"TileImage": "images/locations/location_hokkaido_mamushi/tile.jpg",
"Location": "LOCATION_HOKKAIDO_SHIM_MAMUSHI",
"TileImage": "images/contracts/snowcrane/tile.jpg",
"Location": "LOCATION_HOKKAIDO_MAMUSHI",
"Title": "UI_CONTRACT_CREATE_CONTRACT_TITLE",
"ScenePath": "assembly:/_PRO/Scenes/Missions/Hokkaido/scene_mamushi.entity",
"Description": "UI_CONTRACT_CREATE_CONTRACT_DESC",
"Id": "6300427e-33bd-41b2-ab72-f1707ad38798",
"CreationTimestamp": "2021-12-17T22:30:00.800Z",
"Id": "8d5e9e5d-4608-442a-a992-1bd424659dd4",
"CreationTimestamp": "2014-10-28T09:41:25.473Z",
"CodeName_Hint": "Create contract Hokkaido Mamushi",
"Type": "creation",
"Release": "2.0.x",
"Release": "",
"Entitlements": ["H1_LEGACY_STANDARD"],
"LastUpdate": "2021-12-17T22:30:00.80000Z",
"PublicId": "010667556247"
"LastUpdate": "2023-10-11T11:17:17.1956512Z",
"PublicId": "037557339347"
},
"UserData": {}
}

2
contractdata/PARIS/ESCALATION/XMAS/XMAS.json
View File

@ -4,7 +4,7 @@
"Id": "07bbf22b-d6ae-4883-bec2-122eeeb7b665",
"Title": "UI_PEACOCK_SOUTHERN_COMFORT",
"Type": "escalation",
"Location": "LOCATION_PARIS",
"Location": "LOCATION_PARIS_NOEL",
"ScenePath": "assembly:/_PRO/Scenes/Missions/Paris/_scene_paris.entity",
"TileImage": "images/contracts/featured/RedMenace.jpg",
"GroupDefinition": {

2
contractdata/PARIS/ESCALATION/XMAS/XMAS1.json
View File

@ -190,7 +190,7 @@
"Type": "escalation",
"Id": "d415f893-563a-443a-860e-33cf90c4547b",
"ScenePath": "assembly:/_PRO/Scenes/Missions/Paris/_scene_paris.entity",
"Location": "LOCATION_PARIS",
"Location": "LOCATION_PARIS_NOEL",
"InGroup": "07bbf22b-d6ae-4883-bec2-122eeeb7b665",
"TileImage": "images/contracts/featured/RedMenace.jpg",
"Entitlements": ["H1_LEGACY_STANDARD"]

2
contractdata/PARIS/ESCALATION/XMAS/XMAS2.json
View File

@ -227,7 +227,7 @@
{ "IsNew": true, "Id": "c4b808ea-607c-484a-a6a1-9ba8bfb038ec" },
{ "Id": "e3368651-38e4-4e0c-91a0-95d76078b09f" }
],
"Location": "LOCATION_PARIS",
"Location": "LOCATION_PARIS_NOEL",
"InGroup": "07bbf22b-d6ae-4883-bec2-122eeeb7b665",
"TileImage": "images/contracts/featured/RedMenace.jpg",
"Entitlements": ["H1_LEGACY_STANDARD"]

2
contractdata/PARIS/ESCALATION/XMAS/XMAS3.json
View File

@ -257,7 +257,7 @@
{ "Id": "c4b808ea-607c-484a-a6a1-9ba8bfb038ec" },
{ "Id": "e3368651-38e4-4e0c-91a0-95d76078b09f" }
],
"Location": "LOCATION_PARIS",
"Location": "LOCATION_PARIS_NOEL",
"InGroup": "07bbf22b-d6ae-4883-bec2-122eeeb7b665",
"TileImage": "images/contracts/featured/RedMenace.jpg",
"Entitlements": ["H1_LEGACY_STANDARD"]

2
contractdata/PARIS/HOLIDAYHOARDERS.json
View File

@ -62,7 +62,7 @@
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"IsPublished": true,
"TileImage": "images/contracts/parisnoel/tile.jpg",
"Location": "LOCATION_PARIS",
"Location": "LOCATION_PARIS_NOEL",
"MissionData": {
"Context": "PALAIS DE WALEWSKA",
"MissionType": "Assasination"

39
contractdata/PARIS/NOELCONTRACTCREATION.json Normal file
View File

@ -0,0 +1,39 @@
{
"Data": {
"Objectives": [],
"Bricks": [
"assembly:/_PRO/Scenes/Missions/Paris/Location_parisnoel.brick"
],
"GameChangers": [
"61a618c2-1cfc-46fa-846b-467de76042d6",
"b48bb7f9-b630-48cb-a816-720ed7959319",
"1f8f0b8b-1f65-4d6c-a2f4-fc8adffa394a",
"9673f602-3b2a-4bd3-94b3-b3b311b7bc7e",
"a77cf01e-ab02-4b1c-a4bd-a37fb8be1114",
"008d2eb9-c1c8-44e0-a636-ccca63629f3c",
"1efef5c0-7381-4e22-ac04-ffbd0822cc96",
"f96e94b7-1c0e-49c9-9332-07346a955fd2",
"95690829-7da4-4225-a087-08918cccf120"
]
},
"Metadata": {
"IsLocked": false,
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"IsPublished": true,
"TileImage": "images/contracts/parisnoel/tile.jpg",
"Location": "LOCATION_PARIS_NOEL",
"Title": "UI_CONTRACT_CREATE_CONTRACT_TITLE",
"ScenePath": "assembly:/_PRO/Scenes/Missions/Paris/_scene_paris.entity",
"Description": "UI_CONTRACT_CREATE_CONTRACT_DESC",
"Id": "ff129b85-92fc-4664-8058-39a8deebbac6",
"CreationTimestamp": "2014-10-28T09:41:25.473Z",
"RequiredUnlockable": "ACCESS_HIT_PEACOCK",
"CodeName_Hint": "Create contract paris",
"Type": "creation",
"Release": "1.0.x",
"Entitlements": ["H1_LEGACY_STANDARD"],
"LastUpdate": "2023-10-11T11:17:17.2195931Z",
"PublicId": "036567239247"
},
"UserData": {}
}

3
resources/locale.json
View File

@ -141,9 +141,6 @@
"UI_PEACOCK_GRAPEBUSH_OBJ2_DESC": "Eliminate Montel Beneventi in an explosion or with a cannon.",
"UI_PEACOCK_GRAPEBUSH_OBJ3": "[Optional] Eliminate Hira Amala",
"UI_PEACOCK_GRAPEBUSH_OBJ3_DESC": "If you're up for it, eliminate Hira Amala.",
"UI_LOCATION_HOKKAIDO_SHIM_MAMUSHI_CITY": "Hokkaido",
"UI_LOCATION_HOKKAIDO_SHIM_MAMUSHI_COUNTRY": "Japan",
"UI_LOCATION_HOKKAIDO_SHIM_MAMUSHI_TITLE": "Hokkaido Snow Festival",
"UI_PEACOCK_SOUTHERN_COMFORT": "The Christmas Calamity",
"UI_PEACOCK_SOUTHERN_COMFORT1": "The Christmas Calamity - Level 1",
"UI_PEACOCK_SOUTHERN_COMFORT2": "The Christmas Calamity - Level 2",

86
static/LocationsData.json
View File

@ -47,7 +47,6 @@
"Qualities": {},
"Properties": {
"Quality": "",
"v0Id": "525820b6ccd48060e0f35ff1",
"Icon": "images/locations/LOCATION_PARIS/tile.jpg",
"DlcImage": "images/livetile/dlc/tile_hitman3.jpg",
"DlcName": "GAME_STORE_METADATA_S3_GAME_TITLE",
@ -1017,7 +1016,6 @@
"Properties": {
"ParentLocation": "LOCATION_PARENT_PARIS",
"Quality": "",
"v0Id": "525820b6ccd48060e0f35ff1",
"Icon": "images/locations/LOCATION_PARIS/tile.jpg",
"DlcImage": "images/livetile/dlc/tile_hitman3.jpg",
"DlcName": "GAME_STORE_METADATA_S3_GAME_TITLE",
@ -1036,6 +1034,39 @@
"Rarity": null,
"DisplayNameLocKey": "UI_LOCATION_PARIS_NAME"
},
"LOCATION_PARIS_NOEL": {
"Properties": {
"ParentLocation": "LOCATION_PARENT_PARIS",
"Quality": "",
"Icon": "images/locations/LOCATION_PARIS_NOEL/tile.jpg",
"DlcImage": "images/livetile/dlc/tile_hitman3.jpg",
"DlcName": "GAME_STORE_METADATA_S3_GAME_TITLE",
"Background": "images/locations/LOCATION_PARIS_NOEL/background.jpg",
"GameChangers": [],
"Order": 0,
"ProgressionKey": "LOCATION_PARIS",
"CreateContractId": "ff129b85-92fc-4664-8058-39a8deebbac6",
"RequiredResources": [
"[assembly:/_PRO/Scenes/Missions/Paris/_scene_paris.entity].entitytemplate"
],
"Entitlements": ["H1_LEGACY_STANDARD"]
},
"Rarity": null,
"DisplayNameLocKey": "UI_LOCATION_PARIS_NOEL_NAME",
"Id": "LOCATION_PARIS_NOEL",
"Type": "location",
"Subtype": "sublocation",
"GameAsset": null,
"ImageId": "",
"RMTPrice": -1,
"GamePrice": -1,
"IsPurchasable": false,
"IsPublished": true,
"IsDroppable": false,
"Capabilities": [],
"Qualities": {},
"Guid": "6aedebec-74d0-4ab9-a056-f5f454e6b8ae"
},
"LOCATION_COASTALTOWN": {
"Id": "LOCATION_COASTALTOWN",
"Type": "location",
@ -1472,8 +1503,30 @@
"Rarity": null,
"DisplayNameLocKey": "UI_LOCATION_HOKKAIDO_FLU_NAME"
},
"LOCATION_HOKKAIDO_SHIM_MAMUSHI": {
"Id": "LOCATION_HOKKAIDO_SHIM_MAMUSHI",
"LOCATION_HOKKAIDO_MAMUSHI": {
"Properties": {
"ParentLocation": "LOCATION_PARENT_HOKKAIDO",
"Icon": "images/locations/LOCATION_HOKKAIDO_MAMUSHI/tile.jpg",
"LockedIcon": "images/locations/LOCATION_HOKKAIDO_MAMUSHI/tile_unreleased.jpg",
"DlcImage": "images/livetile/dlc/tile_hitman3.jpg",
"DlcName": "GAME_STORE_METADATA_S3_GAME_TITLE",
"IsLocked": false,
"UpcomingContent": false,
"UpcomingKey": "UI_MENU_LIVETILE_CONTENT_UPCOMING_HEADLINE",
"Background": "images/locations/LOCATION_HOKKAIDO_MAMUSHI/background.jpg",
"Order": 0,
"LimitedLoadout": true,
"NormalLoadoutUnlock": "LOADOUT_UNLOCK_HOKKAIDO",
"ProgressionKey": "LOCATION_HOKKAIDO",
"CreateContractId": "8d5e9e5d-4608-442a-a992-1bd424659dd4",
"RequiredResources": [
"[assembly:/_PRO/Scenes/Missions/Hokkaido/_Scene_Mission_SnowCrane.entity].entitytemplate"
],
"Entitlements": ["H1_LEGACY_STANDARD"]
},
"Rarity": null,
"DisplayNameLocKey": "UI_LOCATION_HOKKAIDO_MAMUSHI_NAME",
"Id": "LOCATION_HOKKAIDO_MAMUSHI",
"Type": "location",
"Subtype": "sublocation",
"GameAsset": null,
@ -1485,30 +1538,7 @@
"IsDroppable": false,
"Capabilities": [],
"Qualities": {},
"Properties": {
"ParentLocation": "LOCATION_PARENT_HOKKAIDO",
"Icon": "images/contracts/mamushi/tile.jpg",
"LockedIcon": "images/locations/LOCATION_HOKKAIDO/tile_unreleased.jpg",
"DlcImage": "images/livetile/dlc/tile_hitman3.jpg",
"DlcName": "GAME_STORE_METADATA_S3_GAME_TITLE",
"IsLocked": false,
"UpcomingContent": false,
"UpcomingKey": "UI_MENU_LIVETILE_CONTENT_UPCOMING_HEADLINE",
"Background": "images/locations/LOCATION_HOKKAIDO/background.jpg",
"Order": 70,
"Season": 1,
"LimitedLoadout": true,
"NormalLoadoutUnlock": "LOADOUT_UNLOCK_HOKKAIDO",
"ProgressionKey": "LOCATION_HOKKAIDO",
"CreateContractId": "6300427e-33bd-41b2-ab72-f1707ad38798",
"RequiredResources": [
"assembly:/_PRO/Scenes/Missions/Hokkaido/scene_mamushi.entity"
],
"Entitlements": ["H1_LEGACY_STANDARD"]
},
"Guid": "489bfe18-4156-4f08-8084-99eaab52e3a2",
"Rarity": null,
"DisplayNameLocKey": "UI_CONTRACT_MAMUSHI_TITLE"
"Guid": "d8f52f08-73e2-447d-a5d2-b83e33add8bb"
},
"LOCATION_NEWZEALAND": {
"Id": "LOCATION_NEWZEALAND",