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

feat: escalation artemis #452

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

feat: escalation artemis #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
728a38e
add mission files
suanjiansalt May 4, 2024
03a773b
fix quality
suanjiansalt May 4, 2024
7ba26b7
remove vanya servant entrance
suanjiansalt May 4, 2024
577c10e
validation and challenges
suanjiansalt May 4, 2024
0502eda
add fail tips
suanjiansalt May 4, 2024
fc0f9e0
make it smoother
suanjiansalt Aug 5, 2024
c50ef20
Merge branch 'master' into escalation-artemis
suanjiansalt Aug 5, 2024
b315e10
remove duplicated line
suanjiansalt Aug 5, 2024
a86a468
run prettier
suanjiansalt Aug 5, 2024
bc7036f
definitive polish
suanjiansalt Aug 7, 2024
605009e
update
suanjiansalt Aug 7, 2024
df49cec
update challenge id
suanjiansalt Aug 7, 2024
0db0969
remove change khatavanga objective to true when contractend
suanjiansalt Aug 8, 2024
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
1 change: 1 addition & 0 deletions components/contracts/missionsInLocation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ export const missionsInLocations = {
"d336d894-024a-4cd4-9867-dee7de70ee79",
],
LOCATION_MUMBAI: [
"b4c961a0-42da-b4cc-b92a-763977de914c",
"667f48a3-7f6b-486e-8f6b-2f782a5c4857",
"9badee3e-0014-46b1-9ef6-edf8858ba038",
"b6a6330a-301a-4e8e-a26f-0f3e0ea809b5",
Expand Down
35 changes: 35 additions & 0 deletions contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"Data": {
"Objectives": [],
"GameChangers": [],
"Bricks": [],
"EnableSaving": false
},
"Metadata": {
"Title": "UI_PEACOCK_ARTEMIS",
"Description": "UI_PEACOCK_ESCALATION_MUMBAI_DESC",
"Entitlements": ["H2_LEGACY_STANDARD"],
"ScenePath": "assembly:/_PRO/Scenes/Missions/Mumbai/scene_mongoose.entity",
"Location": "LOCATION_MUMBAI",
"IsPublished": true,
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"GameVersion": "8.15.0.0",
"ServerVersion": "8.15.0.0",
"Type": "escalation",
"Id": "b4c961a0-42da-b4cc-b92a-763977de914c",
"PublicId": "166149848423",
"TileImage": "images/contracts/escalation/contractescalation_artemis.jpg",
"GroupDefinition": {
"Type": "escalation",
"Order": [
"e47b7659-23f7-d6b9-ae27-d0f0e8943dbd",
"c9de4783-0950-67e7-1f53-411fda868445",
"6260472f-19d1-4293-904c-5c26b1f8ea4e"
]
},
"CreationTimestamp": "2024-04-08T12:29:31.554Z",
"Season": 0,
"OriginalSeason": 2
},
"UserData": {}
}
109 changes: 109 additions & 0 deletions contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
"Data": {
"Entrances": [
"a95703cb-091b-4d05-a2ee-3a70ade13590",
"f4659b56-65c3-4f4f-8f20-11d09af2f2d2",
"8b1c3ba0-9c91-4b3e-96f9-7d3c8632b7c2",
"51145d77-882e-4be0-a471-73704497aa8b",
"86a3857f-dad7-45ac-818b-d933e5c8dfd9",
"774b7dec-ce57-4318-9dbd-f6d7fa39ef1d",
"37af536b-3f36-49ed-986a-9d55f4481ed4",
"5e6a6e2c-ee2c-40a7-9de5-d7fb8fbd8dcd",
"f1bb66b5-b446-4a00-a951-af7310e28566",
"724b24ef-e87f-4060-b7ed-5c315fb0f29f",
"cc3ebf7d-0fcf-40bc-9b55-1e2426e66edd",
"0e33bbeb-2c77-419a-be0c-ce9c3627d543"
],
"EnableSaving": false,
"Objectives": [
{
"Type": "statemachine",
"Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_ARTEMIS_TAR1_NAME"
},
"Category": "primary",
"Definition": {
"Scope": "hit",
"Context": {
"Targets": ["80051c02-e026-40fe-970a-7b7aaa62302c"]
},
"States": {
"Start": {
"Kill": [
{
"Condition": {
"$eq": [
"$Value.RepositoryId",
"80051c02-e026-40fe-970a-7b7aaa62302c"
]
},
"Transition": "Success"
}
]
}
}
}
},
{
"Type": "statemachine",
"Id": "00deb548-dae5-312b-a86e-400965b98e57",
"Image": "images/contracts/escalation/contractescalation_artemis_khatavanga.jpg",
"BriefingName": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME",
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME",
"iconType": 17
},
"ObjectiveType": "setpiece",
"Category": "secondary",
"ForceShowOnLoadingScreen": true,
"Definition": {
"Scope": "hit",
"Context": {
"Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"]
},
"States": {
"Start": {
"ItemPickedUp": [
{
"Condition": {
"$eq": [
"$Value.RepositoryId",
"40e96ed0-7668-4d65-b88a-f44bfff5f537"
]
},
"Transition": "Success"
}
]
}
}
}
}
],
"GameChangers": [],
"Bricks": []
},
"Metadata": {
"Title": "UI_PEACOCK_ARTEMIS1",
"Description": "",
"Entitlements": ["H2_LEGACY_STANDARD"],
"ScenePath": "assembly:/_PRO/Scenes/Missions/Mumbai/scene_mongoose.entity",
"Location": "LOCATION_MUMBAI",
"IsPublished": true,
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"GameVersion": "8.15.0.0",
"ServerVersion": "8.15.0.0",
"Type": "escalation",
"Id": "e47b7659-23f7-d6b9-ae27-d0f0e8943dbd",
"PublicId": "166149848423",
"TileImage": "images/contracts/escalation/contractescalation_artemis.jpg",
"GroupObjectiveDisplayOrder": [
{ "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" },
{ "Id": "00deb548-dae5-312b-a86e-400965b98e57" }
],
"InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c",
"CreationTimestamp": "2024-04-08T12:29:31.554Z"
},
"UserData": {}
}
173 changes: 173 additions & 0 deletions contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
{
"Data": {
"Entrances": [
"a95703cb-091b-4d05-a2ee-3a70ade13590",
"f4659b56-65c3-4f4f-8f20-11d09af2f2d2",
"8b1c3ba0-9c91-4b3e-96f9-7d3c8632b7c2",
"51145d77-882e-4be0-a471-73704497aa8b",
"86a3857f-dad7-45ac-818b-d933e5c8dfd9",
"774b7dec-ce57-4318-9dbd-f6d7fa39ef1d",
"37af536b-3f36-49ed-986a-9d55f4481ed4",
"5e6a6e2c-ee2c-40a7-9de5-d7fb8fbd8dcd",
"f1bb66b5-b446-4a00-a951-af7310e28566",
"724b24ef-e87f-4060-b7ed-5c315fb0f29f",
"cc3ebf7d-0fcf-40bc-9b55-1e2426e66edd",
"0e33bbeb-2c77-419a-be0c-ce9c3627d543"
],
"EnableSaving": false,
"Objectives": [
{
"Type": "statemachine",
"Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a",
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_TAR1_NAME",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_ARTEMIS_TAR1_NAME"
},
"Category": "primary",
"Definition": {
"Scope": "hit",
"Context": {
"Targets": ["80051c02-e026-40fe-970a-7b7aaa62302c"]
},
"States": {
"Start": {
"Kill": [
{
"Condition": {
"$eq": [
"$Value.RepositoryId",
"80051c02-e026-40fe-970a-7b7aaa62302c"
]
},
"Transition": "Success"
}
]
}
}
}
},
{
"Type": "statemachine",
"Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611",
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_TAR2_NAME",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_ARTEMIS_TAR2_NAME"
},
"Category": "primary",
"Definition": {
"Scope": "hit",
"Context": {
"Targets": ["332280ad-3b31-4913-99f1-794a4a46b98b"]
},
"States": {
"Start": {
"Kill": [
{
"Condition": {
"$eq": [
"$Value.RepositoryId",
"332280ad-3b31-4913-99f1-794a4a46b98b"
]
},
"Transition": "Success"
}
]
}
}
}
},
{
"Type": "statemachine",
"Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f",
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_TAR3_NAME",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_ARTEMIS_TAR3_NAME"
},
"Category": "primary",
"Definition": {
"Scope": "hit",
"Context": {
"Targets": ["72aa012a-d74d-493f-8b84-397b95efd385"]
},
"States": {
"Start": {
"Kill": [
{
"Condition": {
"$eq": [
"$Value.RepositoryId",
"72aa012a-d74d-493f-8b84-397b95efd385"
]
},
"Transition": "Success"
}
]
}
}
}
},
{
"Type": "statemachine",
"Id": "00deb548-dae5-312b-a86e-400965b98e57",
"Image": "images/contracts/escalation/contractescalation_artemis_khatavanga.jpg",
"BriefingName": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME",
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_ARTEMIS_KHATAVANGA_NAME",
"iconType": 17
},
"ObjectiveType": "setpiece",
"Category": "secondary",
"ForceShowOnLoadingScreen": true,
"Definition": {
"Scope": "hit",
"Context": {
"Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"]
},
"States": {
"Start": {
"ItemPickedUp": [
{
"Condition": {
"$eq": [
"$Value.RepositoryId",
"40e96ed0-7668-4d65-b88a-f44bfff5f537"
]
},
"Transition": "Success"
}
]
}
}
}
}
],
"GameChangers": ["484d5cf9-0f31-50e0-0192-d057633e9305"],
"Bricks": []
},
"Metadata": {
"Title": "UI_PEACOCK_ARTEMIS2",
"Description": "",
"Entitlements": ["H2_LEGACY_STANDARD"],
"ScenePath": "assembly:/_PRO/Scenes/Missions/Mumbai/scene_mongoose.entity",
"Location": "LOCATION_MUMBAI",
"IsPublished": true,
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"GameVersion": "8.15.0.0",
"ServerVersion": "8.15.0.0",
"Type": "escalation",
"Id": "c9de4783-0950-67e7-1f53-411fda868445",
"PublicId": "166149848423",
"TileImage": "images/contracts/escalation/contractescalation_artemis.jpg",
"GroupObjectiveDisplayOrder": [
{ "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611", "IsNew": true },
{ "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f", "IsNew": true },
{ "Id": "484d5cf9-0f31-50e0-0192-d057633e9305", "IsNew": true },
{ "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" },
{ "Id": "00deb548-dae5-312b-a86e-400965b98e57" }
],
"InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c",
"CreationTimestamp": "2024-04-08T12:29:31.554Z"
},
"UserData": {}
}
Loading