Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update (parts of) some contracts to match newest IOI version #295

Merged
merged 3 commits into from
Aug 5, 2023
Merged

Update (parts of) some contracts to match newest IOI version #295

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db15964
Add SMF contract support (#293)
atampy25 Jun 14, 2023
54c2c30
Update (parts of) some contracts to match newest IOI version
grappigegovert Jul 2, 2023
0574aec
Merge branch 'v7' into contracts-refresh
AnthonyFuller Aug 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions components/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,44 @@ export class Controller {
lastServerSideData.contracts,
)) {
this.contracts.set(contractId, contractData)

if (contractData.SMF.destinations?.addToDestinations) {
if (contractData.SMF.destinations.peacockIntegration) {
if (contractData.SMF.destinations.placeBefore) {
controller.missionsInLocations[
contractData.Metadata.Location
].splice(
controller.missionsInLocations[
contractData.Metadata.Location
].indexOf(
contractData.SMF.destinations
.placeBefore,
),
0,
contractData.Metadata.Id,
)
} else if (
contractData.SMF.destinations.placeAfter
) {
controller.missionsInLocations[
contractData.Metadata.Location
].splice(
controller.missionsInLocations[
contractData.Metadata.Location
].indexOf(
contractData.SMF.destinations
.placeAfter,
) + 1,
0,
contractData.Metadata.Id,
)
} else {
controller.missionsInLocations[
contractData.Metadata.Location
].push(contractData.Metadata.Id)
}
}
}
}
}

Expand Down
9 changes: 9 additions & 0 deletions components/types/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,15 @@ export interface MissionManifest {
noGear?: boolean
noCarriedWeapon?: boolean
}
SMF?: {
destinations: {
addToDestinations: boolean
peacockIntegration?: boolean
narrativeContext?: "Mission" | "Campaign"
placeBefore?: string
placeAfter?: string
}
}
}

/**
Expand Down
5 changes: 3 additions & 2 deletions contractdata/BERLIN/APEXPREDATOR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,8 @@
"633398ac-c4b4-4441-852d-ae6460172025",
"eb024a5e-9580-49dc-a519-bb92c886f3b1",
"1305c2e4-6394-4cfa-b873-22adbd0c9702",
"8b29da09-461f-44d7-9042-d4fde829b9f2"
"8b29da09-461f-44d7-9042-d4fde829b9f2",
"f83376a4-6e56-4f2a-8122-151b272108fd"
],
"RemainingTargetsCount": 10
},
Expand Down Expand Up @@ -852,7 +853,7 @@
"RequiredUnlockable": "ACCESS_HIT_FOX",
"Drops": ["ACCESS_HIT_RAT"],
"Entitlements": ["LOCATION_EDGY"],
"LastUpdate": "2021-11-09T14:55:15.1199003Z",
"LastUpdate": "2023-05-11T10:33:11.8095527Z",
"PublicId": "029662477847"
},
"UserData": {}
Expand Down
8 changes: 4 additions & 4 deletions contractdata/BERLIN/ESCALATION/EGGHUNT/EGGHUNT3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,13 @@
"_comment": "--- Eliminate the white rabbit ---",
"Id": "70e22684-2228-4a36-bfad-db5ae73874e8",
"Category": "primary",
"ObjectiveType": "customkill",
"ObjectiveType": "custom",
"BriefingName": "$loc UI_CONTRACT_GRASSSNAKE_OBJ7_NAME",
"BriefingText": "$loc UI_CONTRACT_GRASSSNAKE_OBJ7_DESC",
"Image": "images/contracts/escalation/ContractEscalation_Edgy_Grasssnake_KillTheWhiteRabbit.jpg",
"TargetConditions": [],
"HUDTemplate": {
"display": "$loc UI_CONTRACT_GRASSSNAKE_OBJ7_NAME"
},
"BriefingText": "$loc UI_CONTRACT_GRASSSNAKE_OBJ7_NAME",
"Type": "statemachine",
"Definition": {
"Scope": "Hit",
Expand Down Expand Up @@ -208,7 +207,7 @@
"Id": "f5ebd915-3fc8-4cb7-95fd-f666f98e8b45",
"IsPublished": true,
"IsSeasonal": true,
"CreationTimestamp": "2021-03-30T13:03:20.1314172Z",
"CreationTimestamp": "2018-10-17T14:35:18.194497Z",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"TileImage": "images/contracts/escalation/ContractEscalation_Edgy_Grasssnake.jpg",
"Title": "UI_CONTRACT_GRASSSNAKE_LEVEL_3_NAME",
Expand All @@ -230,6 +229,7 @@
{ "Id": "3db72bb5-63d6-47fe-9332-d7ea3c195e06" }
],
"Entitlements": ["LOCATION_EDGY"],
"LastUpdate": "2023-05-11T10:33:15.3725349Z",
"PublicId": "029488085647"
},
"UserData": {}
Expand Down
17 changes: 11 additions & 6 deletions contractdata/DUBAI/ESCALATION/SINBAD/SINBAD1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"Data": {
"EnableExits": {
"$eq": ["$05067c03-847b-4df5-9429-6dca7ce4ecd7", "Completed"]
},
"Bricks": [
"assembly:/_pro/scenes/missions/golden/mission_gecko/gamechanger_gecko_sheepssorrel_ovrall.brick",
"assembly:/_pro/scenes/missions/golden/mission_gecko/gamechanger_gecko_sheepssorrel.brick"
Expand All @@ -25,7 +22,10 @@
}
],
"DevOnlyBricks": [],
"GameChangers": ["07b1bc1d-f52b-4004-a760-846c4bc3f172"],
"GameChangers": [
"63055f1a-bcd2-4e0f-8caf-b446f01d02f3",
"3db72bb5-63d6-47fe-9332-d7ea3c195e06"
],
"Entrances": ["fb1a7128-8a90-40fe-94d1-bff2e35ef0f5"],
"MandatoryLoadout": [
{
Expand All @@ -45,7 +45,7 @@
"Category": "primary",
"ObjectiveType": "custom",
"Image": "images/contracts/Escalation/ContractEscalation_Golden_SheepsSorrel_BoxTarget.jpg",
"BriefingName": "$loc UI_CONTRACT_SHEEPSSORREL_LEVEL_1_NAME",
"BriefingName": "$loc UI_CONTRACT_SHEEPSSORREL_BOXHITGUN",
"BriefingText": "$loc UI_CONTRACT_SHEEPSSORREL_BOXHIT",
"HUDTemplate": {
"display": "$loc UI_CONTRACT_SHEEPSSORREL_BOXHIT",
Expand Down Expand Up @@ -109,8 +109,13 @@
"Type": "escalation",
"Release": "3.1.0 Escalation",
"TileImage": "images/contracts/escalation/contractescalation_golden_sheepssorrel.jpg",
"GroupObjectiveDisplayOrder": [
{ "IsNew": true, "Id": "f6297ee1-53f4-4ef8-94d3-d40670914b5c" },
{ "IsNew": true, "Id": "63055f1a-bcd2-4e0f-8caf-b446f01d02f3" },
{ "IsNew": true, "Id": "3db72bb5-63d6-47fe-9332-d7ea3c195e06" }
],
"Entitlements": ["LOCATION_GOLDEN"],
"LastUpdate": "2021-04-15T12:40:22.5659824Z",
"LastUpdate": "2023-05-11T10:33:16.593546Z",
"PublicId": "027139002947"
},
"UserData": {}
Expand Down
15 changes: 9 additions & 6 deletions contractdata/DUBAI/ESCALATION/SINBAD/SINBAD2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
}
],
"DevOnlyBricks": [],
"GameChangers": [
"63055f1a-bcd2-4e0f-8caf-b446f01d02f3",
"3db72bb5-63d6-47fe-9332-d7ea3c195e06"
],
"Entrances": ["fb1a7128-8a90-40fe-94d1-bff2e35ef0f5"],
"MandatoryLoadout": [
{
Expand All @@ -32,20 +36,16 @@
}
}
],
"GameChangers": ["07b1bc1d-f52b-4004-a760-846c4bc3f172"],
"GameChangerReferences": [],
"EnableSaving": false,
"EnableExits": {
"$eq": ["$f6297ee1-53f4-4ef8-94d3-d40670914b5b", "Completed"]
},
"Objectives": [
{
"_comment": "--- Hit five boxes ---",
"Id": "f6297ee1-53f4-4ef8-94d3-d40670914b5b",
"Category": "primary",
"ObjectiveType": "custom",
"Image": "images/contracts/Escalation/ContractEscalation_Golden_SheepsSorrel_BoxTarget.jpg",
"BriefingName": "$loc UI_CONTRACT_SHEEPSSORREL_LEVEL_2_NAME",
"BriefingName": "$loc UI_CONTRACT_SHEEPSSORREL_BOXHITGUN",
"BriefingText": "$loc UI_CONTRACT_SHEEPSSORREL_BOXHIT",
"HUDTemplate": {
"display": "$loc UI_CONTRACT_SHEEPSSORREL_BOXHIT",
Expand Down Expand Up @@ -109,8 +109,11 @@
"TileImage": "images/contracts/escalation/contractescalation_golden_sheepssorrel.jpg",
"Type": "escalation",
"Release": "3.1.0 Escalation",
"GroupObjectiveDisplayOrder": [
{ "IsNew": true, "Id": "f6297ee1-53f4-4ef8-94d3-d40670914b5c" }
],
"Entitlements": ["LOCATION_GOLDEN"],
"LastUpdate": "2021-04-15T12:40:22.5840854Z",
"LastUpdate": "2023-05-11T10:33:16.6062903Z",
"PublicId": "027307737847"
},
"UserData": {}
Expand Down
16 changes: 10 additions & 6 deletions contractdata/DUBAI/ESCALATION/SINBAD/SINBAD3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
}
],
"DevOnlyBricks": [],
"GameChangers": ["07b1bc1d-f52b-4004-a760-846c4bc3f172"],
"GameChangers": [
"3db72bb5-63d6-47fe-9332-d7ea3c195e06",
"63055f1a-bcd2-4e0f-8caf-b446f01d02f3"
],
"Entrances": ["fb1a7128-8a90-40fe-94d1-bff2e35ef0f5"],
"MandatoryLoadout": [
{
Expand All @@ -35,17 +38,14 @@
],
"GameChangerReferences": [],
"EnableSaving": false,
"EnableExits": {
"$eq": ["$05067c03-847b-4df5-9429-6dca7ce4ecd7", "Completed"]
},
"Objectives": [
{
"_comment": "--- Hit five boxes ---",
"Id": "05067c03-847b-4df5-9429-6dca7ce4ecd7",
"Category": "primary",
"ObjectiveType": "custom",
"Image": "images/contracts/Escalation/ContractEscalation_Golden_SheepsSorrel_BoxTarget.jpg",
"BriefingName": "$loc UI_CONTRACT_SHEEPSSORREL_LEVEL_3_NAME",
"BriefingName": "$loc UI_CONTRACT_SHEEPSSORREL_BOXHITGUN",
"BriefingText": "$loc UI_CONTRACT_SHEEPSSORREL_BOXHITGUN",
"HUDTemplate": {
"display": "$loc UI_CONTRACT_SHEEPSSORREL_BOXHITGUN",
Expand Down Expand Up @@ -172,8 +172,12 @@
"Type": "escalation",
"Release": "3.1.0 Escalation",
"TileImage": "images/contracts/escalation/contractescalation_golden_sheepssorrel.jpg",
"GroupObjectiveDisplayOrder": [
{ "Id": "05067c03-847b-4df5-9429-6dca7ce4ecd7" },
{ "IsNew": true, "Id": "9e3c1a92-9cd1-49f3-939d-ec6f411dcae4" }
],
"Entitlements": ["LOCATION_GOLDEN"],
"LastUpdate": "2021-04-15T12:40:22.6015597Z",
"LastUpdate": "2023-05-11T10:33:16.6191648Z",
"PublicId": "027453599047"
},
"UserData": {}
Expand Down
15 changes: 12 additions & 3 deletions contractdata/FACILITY/ESCALATION/WOLFSBANE/WOLFSBANE1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,19 @@
}
],
"Bricks": [],
"VR": [
{
"Quality": "base",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/scenes/missions/thefacility/vr_overrides_polarbear_graduation.brick"
]
}
],
"GameChangers": [],
"MandatoryLoadout": [
{
"Id": "FIREARMS_HERO_PISTOL_TACTICAL_001_SU_SKIN01",
"Id": "FIREARMS_HERO_PISTOL_TACTICAL_ICA_19",
"Properties": {
"LoadoutSlot": "concealedweapon",
"RepositoryId": "73875794-5a86-410e-84a4-1b5b2f7e5a54"
Expand Down Expand Up @@ -132,7 +141,7 @@
"Metadata": {
"Id": "d4883292-d0b8-4a5c-8711-f5a3a1ae58f6",
"IsPublished": true,
"CreationTimestamp": "2016-01-13T13:46:45.21Z",
"CreationTimestamp": "2016-01-13T13:46:45.2091948Z",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"Title": "UI_CONTRACT_WOLFSBANE_LEVEL_1_TITLE",
"Description": "UI_CONTRACT_WOLFSBANE_LEVEL_1_DESC",
Expand All @@ -144,7 +153,7 @@
"GroupObjectiveDisplayOrder": [
{ "Id": "e80fa6be-9418-401e-8905-9b6987e6e429" }
],
"LastUpdate": "2020-11-09T13:35:53.2263015Z",
"LastUpdate": "2023-05-11T10:33:17.1657079Z",
"PublicId": "001146805847",
"Entitlements": ["H1_LEGACY_STANDARD"]
},
Expand Down
18 changes: 14 additions & 4 deletions contractdata/FACILITY/ESCALATION/WOLFSBANE/WOLFSBANE2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"BriefingName": "$loc UI_GAMECHANGERS_MODULE_005_SAFE_TITLE",
"BriefingText": "$loc UI_CONTRACT_WOLFSBANE_OBJ_2",
"HUDTemplate": {
"display": "$loc UI_CONTRACT_WOLFSBANE_OBJ_2"
"display": "$loc UI_CONTRACT_WOLFSBANE_OBJ_2",
"iconType": 17
},
"Type": "statemachine",
"Definition": {
Expand All @@ -108,10 +109,19 @@
}
],
"Bricks": [],
"VR": [
{
"Quality": "base",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/scenes/missions/thefacility/vr_overrides_polarbear_graduation.brick"
]
}
],
"GameChangers": ["be8583cb-ccc6-4a84-b960-dc3a98d8a3c5"],
"MandatoryLoadout": [
{
"Id": "FIREARMS_HERO_PISTOL_TACTICAL_001_SU_SKIN01",
"Id": "FIREARMS_HERO_PISTOL_TACTICAL_ICA_19",
"Properties": {
"LoadoutSlot": "concealedweapon",
"RepositoryId": "73875794-5a86-410e-84a4-1b5b2f7e5a54"
Expand Down Expand Up @@ -165,7 +175,7 @@
"Metadata": {
"Id": "a562b31c-7b80-4cbb-88e1-6980ed6824ea",
"IsPublished": true,
"CreationTimestamp": "2016-01-14T08:57:54.91Z",
"CreationTimestamp": "2016-01-14T08:57:54.9090813Z",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"Title": "UI_CONTRACT_WOLFSBANE_LEVEL_2_TITLE",
"Description": "UI_CONTRACT_WOLFSBANE_LEVEL_2_DESC",
Expand All @@ -179,7 +189,7 @@
{ "IsNew": true, "Id": "be8583cb-ccc6-4a84-b960-dc3a98d8a3c5" },
{ "Id": "e80fa6be-9418-401e-8905-9b6987e6e429" }
],
"LastUpdate": "2020-11-09T13:35:53.2888043Z",
"LastUpdate": "2023-05-11T10:33:17.1797882Z",
"PublicId": "001869991447",
"Entitlements": ["H1_LEGACY_STANDARD"]
},
Expand Down
15 changes: 12 additions & 3 deletions contractdata/FACILITY/ESCALATION/WOLFSBANE/WOLFSBANE3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,19 @@
}
],
"Bricks": [],
"VR": [
{
"Quality": "base",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/scenes/missions/thefacility/vr_overrides_polarbear_graduation.brick"
]
}
],
"GameChangers": ["be8583cb-ccc6-4a84-b960-dc3a98d8a3c5"],
"MandatoryLoadout": [
{
"Id": "FIREARMS_HERO_PISTOL_TACTICAL_001_SU_SKIN01",
"Id": "FIREARMS_HERO_PISTOL_TACTICAL_ICA_19",
"Properties": {
"LoadoutSlot": "concealedweapon",
"RepositoryId": "73875794-5a86-410e-84a4-1b5b2f7e5a54"
Expand Down Expand Up @@ -226,7 +235,7 @@
"Metadata": {
"Id": "d318f06b-d8a7-49b8-ac4a-69982fe90b39",
"IsPublished": true,
"CreationTimestamp": "2016-01-14T08:57:54.91Z",
"CreationTimestamp": "2016-01-14T08:57:54.9090813Z",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"Title": "UI_CONTRACT_WOLFSBANE_LEVEL_3_TITLE",
"Description": "UI_CONTRACT_WOLFSBANE_LEVEL_3_DESC",
Expand All @@ -241,7 +250,7 @@
{ "Id": "be8583cb-ccc6-4a84-b960-dc3a98d8a3c5" },
{ "Id": "e80fa6be-9418-401e-8905-9b6987e6e429" }
],
"LastUpdate": "2020-11-09T13:35:53.351299Z",
"LastUpdate": "2023-05-11T10:33:17.1928189Z",
"PublicId": "001617673247",
"Entitlements": ["H1_LEGACY_STANDARD"]
},
Expand Down
Loading