Skip to content

Commit 85fb01c

Browse files
RDILRDIL
authored
feat: escalation artemis (#452)
<!-- Thanks for contributing to Peacock! Here's a bit of a template to help make sure everything relevant is covered. --> ## Scope Another escalation in tribute of the Murder of Crows. <!-- List any relevant changes you have made here. Be sure to link any issues fixed, or that are relevant to these changes. --> ## Objectives Briefing ### Level 1 ![image](https://github.com/user-attachments/assets/17a83590-6cfd-4284-a02f-9ac524a4199f) - Eliminate Kashmirian in any method - [Optional] Get the Khatavanga (in Vanya's train station) ### Level 2 ![image](https://github.com/user-attachments/assets/2021df98-ef3a-4909-84dc-9a1b5e2fa270) - New: Eliminate the vomiting film protagonist in any method - New: Eliminate Neha, the Maelstrom's ex - New complication: No agility before you get the Khatavanga ### Level 3 ![image](https://github.com/user-attachments/assets/3f7b5307-2d62-4430-b2c4-cfdb9e671d53) - New complication: Change kill method to Crow Elite Thug disguise - New complication: You can only exfiltrate by the hideout exit ## Checklist <!-- Just a few reminders to make sure everything is perfect. You can place an "X" in the boxes to tick them off. If you have not completed one of the steps below, you can create the pull request as a draft, and then check off the items as you go. When you have completed the checklist, press the "Ready for review" button. --> - [x] I have run Prettier to reformat any changed files - [x] I have verified my changes work -------- #### General - [x] I've run Prettier to format any changed files - [x] I've verified that my changes work, and included a test plan -------- #### Escalations - [x] Any new escalations added follow the [escalation guidelines](https://github.com/thepeacockproject/Peacock/blob/master/docs/ESCALATION_GUIDELINES.md) -------- #### Testing - [x] I have added or considered adding unit/integration tests that cover any code changes
2 parents 155a4ae + 54b3a39 commit 85fb01c

10 files changed

Lines changed: 1013 additions & 0 deletions

File tree

‎components/contracts/missionsInLocation.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ export const missionsInLocation = {
294294
"d336d894-024a-4cd4-9867-dee7de70ee79",
295295
],
296296
LOCATION_MUMBAI: [
297+
"b4c961a0-42da-b4cc-b92a-763977de914c",
297298
"667f48a3-7f6b-486e-8f6b-2f782a5c4857",
298299
"9badee3e-0014-46b1-9ef6-edf8858ba038",
299300
"b6a6330a-301a-4e8e-a26f-0f3e0ea809b5",
@@ -491,6 +492,7 @@ export const missionsInLocation = {
491492
"d336d894-024a-4cd4-9867-dee7de70ee79",
492493
],
493494
LOCATION_MUMBAI: [
495+
"b4c961a0-42da-b4cc-b92a-763977de914c",
494496
"667f48a3-7f6b-486e-8f6b-2f782a5c4857",
495497
"9badee3e-0014-46b1-9ef6-edf8858ba038",
496498
"b6a6330a-301a-4e8e-a26f-0f3e0ea809b5",

‎contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"Data": {
3+
"Objectives": [],
4+
"GameChangers": [],
5+
"Bricks": [],
6+
"EnableSaving": false,
7+
"VR": [
8+
{
9+
"Quality": "base",
10+
"Bricks": [
11+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
12+
"assembly:/_pro/scenes/missions/mumbai/vr_overrides_mongoose.brick",
13+
"assembly:/_pro/scenes/missions/mumbai/vr_overrides_low_performance.brick"
14+
]
15+
},
16+
{
17+
"Quality": "better",
18+
"Bricks": [
19+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
20+
"assembly:/_pro/scenes/missions/mumbai/vr_overrides_mongoose.brick"
21+
]
22+
}
23+
]
24+
},
25+
"Metadata": {
26+
"Title": "UI_PEACOCK_ARTEMIS",
27+
"Description": "UI_PEACOCK_ESCALATION_MUMBAI_DESC",
28+
"Entitlements": ["LOCATION_MUMBAI"],
29+
"ScenePath": "assembly:/_PRO/Scenes/Missions/Mumbai/scene_mongoose.entity",
30+
"Location": "LOCATION_MUMBAI",
31+
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
32+
"Type": "escalation",
33+
"Id": "b4c961a0-42da-b4cc-b92a-763977de914c",
34+
"TileImage": "images/contracts/escalation/ContractEscalation_Artemis.jpg",
35+
"GroupDefinition": {
36+
"Type": "escalation",
37+
"Order": [
38+
"e47b7659-23f7-d6b9-ae27-d0f0e8943dbd",
39+
"c9de4783-0950-67e7-1f53-411fda868445",
40+
"6260472f-19d1-4293-904c-5c26b1f8ea4e"
41+
]
42+
},
43+
"CreationTimestamp": "2024-04-08T12:29:31.554Z",
44+
"Season": 0,
45+
"OriginalSeason": 2
46+
},
47+
"UserData": {}
48+
}

‎contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS1.json‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
{
2+
"Data": {
3+
"Entrances": [
4+
"a95703cb-091b-4d05-a2ee-3a70ade13590",
5+
"f4659b56-65c3-4f4f-8f20-11d09af2f2d2",
6+
"8b1c3ba0-9c91-4b3e-96f9-7d3c8632b7c2",
7+
"51145d77-882e-4be0-a471-73704497aa8b",
8+
"86a3857f-dad7-45ac-818b-d933e5c8dfd9",
9+
"774b7dec-ce57-4318-9dbd-f6d7fa39ef1d",
10+
"37af536b-3f36-49ed-986a-9d55f4481ed4",
11+
"5e6a6e2c-ee2c-40a7-9de5-d7fb8fbd8dcd",
12+
"f1bb66b5-b446-4a00-a951-af7310e28566",
13+
"724b24ef-e87f-4060-b7ed-5c315fb0f29f",
14+
"cc3ebf7d-0fcf-40bc-9b55-1e2426e66edd",
15+
"0e33bbeb-2c77-419a-be0c-ce9c3627d543"
16+
],
17+
"EnableSaving": false,
18+
"Objectives": [
19+
{
20+
"Type": "statemachine",
21+
"Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a",
22+
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_OBJ1_NAME",
23+
"HUDTemplate": {
24+
"display": "$loc UI_PEACOCK_ARTEMIS_OBJ1_NAME"
25+
},
26+
"Category": "primary",
27+
"Definition": {
28+
"Scope": "hit",
29+
"Context": {
30+
"Targets": ["80051c02-e026-40fe-970a-7b7aaa62302c"]
31+
},
32+
"States": {
33+
"Start": {
34+
"Kill": [
35+
{
36+
"Condition": {
37+
"$eq": [
38+
"$Value.RepositoryId",
39+
"80051c02-e026-40fe-970a-7b7aaa62302c"
40+
]
41+
},
42+
"Transition": "Success"
43+
}
44+
]
45+
}
46+
}
47+
}
48+
},
49+
{
50+
"Type": "statemachine",
51+
"Id": "00deb548-dae5-312b-a86e-400965b98e57",
52+
"Image": "images/contracts/escalation/contractescalation_artemis_khatavanga.jpg",
53+
"BriefingName": "$loc UI_PEACOCK_ARTEMIS_OBJ_KHATAVANGA_NAME",
54+
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_OBJ_KHATAVANGA_NAME",
55+
"HUDTemplate": {
56+
"display": "$loc UI_PEACOCK_ARTEMIS_OBJ_KHATAVANGA_NAME",
57+
"iconType": 17
58+
},
59+
"ObjectiveType": "setpiece",
60+
"Category": "secondary",
61+
"ForceShowOnLoadingScreen": true,
62+
"Definition": {
63+
"Scope": "hit",
64+
"Context": {
65+
"Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"]
66+
},
67+
"States": {
68+
"Start": {
69+
"ItemPickedUp": [
70+
{
71+
"Condition": {
72+
"$eq": [
73+
"$Value.RepositoryId",
74+
"40e96ed0-7668-4d65-b88a-f44bfff5f537"
75+
]
76+
},
77+
"Transition": "Success"
78+
}
79+
]
80+
}
81+
}
82+
}
83+
}
84+
],
85+
"GameChangers": [],
86+
"Bricks": [],
87+
"VR": [
88+
{
89+
"Quality": "base",
90+
"Bricks": [
91+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
92+
"assembly:/_pro/scenes/missions/mumbai/vr_overrides_mongoose.brick",
93+
"assembly:/_pro/scenes/missions/mumbai/vr_overrides_low_performance.brick"
94+
]
95+
},
96+
{
97+
"Quality": "better",
98+
"Bricks": [
99+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
100+
"assembly:/_pro/scenes/missions/mumbai/vr_overrides_mongoose.brick"
101+
]
102+
}
103+
]
104+
},
105+
"Metadata": {
106+
"Title": "UI_PEACOCK_ARTEMIS1",
107+
"Description": "",
108+
"Entitlements": ["LOCATION_MUMBAI"],
109+
"ScenePath": "assembly:/_PRO/Scenes/Missions/Mumbai/scene_mongoose.entity",
110+
"Location": "LOCATION_MUMBAI",
111+
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
112+
"Type": "escalation",
113+
"Id": "e47b7659-23f7-d6b9-ae27-d0f0e8943dbd",
114+
"TileImage": "images/contracts/escalation/ContractEscalation_Artemis.jpg",
115+
"GroupObjectiveDisplayOrder": [
116+
{ "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" },
117+
{ "Id": "00deb548-dae5-312b-a86e-400965b98e57" }
118+
],
119+
"InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c",
120+
"CreationTimestamp": "2024-04-08T12:29:31.554Z"
121+
},
122+
"UserData": {}
123+
}

‎contractdata/MUMBAI/ESCALATION/ARTEMIS/ARTEMIS2.json‎

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
{
2+
"Data": {
3+
"Entrances": [
4+
"a95703cb-091b-4d05-a2ee-3a70ade13590",
5+
"f4659b56-65c3-4f4f-8f20-11d09af2f2d2",
6+
"8b1c3ba0-9c91-4b3e-96f9-7d3c8632b7c2",
7+
"51145d77-882e-4be0-a471-73704497aa8b",
8+
"86a3857f-dad7-45ac-818b-d933e5c8dfd9",
9+
"774b7dec-ce57-4318-9dbd-f6d7fa39ef1d",
10+
"37af536b-3f36-49ed-986a-9d55f4481ed4",
11+
"5e6a6e2c-ee2c-40a7-9de5-d7fb8fbd8dcd",
12+
"f1bb66b5-b446-4a00-a951-af7310e28566",
13+
"724b24ef-e87f-4060-b7ed-5c315fb0f29f",
14+
"cc3ebf7d-0fcf-40bc-9b55-1e2426e66edd",
15+
"0e33bbeb-2c77-419a-be0c-ce9c3627d543"
16+
],
17+
"EnableSaving": false,
18+
"Objectives": [
19+
{
20+
"Type": "statemachine",
21+
"Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a",
22+
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_OBJ1_NAME",
23+
"HUDTemplate": {
24+
"display": "$loc UI_PEACOCK_ARTEMIS_OBJ1_NAME"
25+
},
26+
"Category": "primary",
27+
"Definition": {
28+
"Scope": "hit",
29+
"Context": {
30+
"Targets": ["80051c02-e026-40fe-970a-7b7aaa62302c"]
31+
},
32+
"States": {
33+
"Start": {
34+
"Kill": [
35+
{
36+
"Condition": {
37+
"$eq": [
38+
"$Value.RepositoryId",
39+
"80051c02-e026-40fe-970a-7b7aaa62302c"
40+
]
41+
},
42+
"Transition": "Success"
43+
}
44+
]
45+
}
46+
}
47+
}
48+
},
49+
{
50+
"Type": "statemachine",
51+
"Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611",
52+
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_OBJ2_NAME",
53+
"HUDTemplate": {
54+
"display": "$loc UI_PEACOCK_ARTEMIS_OBJ2_NAME"
55+
},
56+
"Category": "primary",
57+
"Definition": {
58+
"Scope": "hit",
59+
"Context": {
60+
"Targets": ["332280ad-3b31-4913-99f1-794a4a46b98b"]
61+
},
62+
"States": {
63+
"Start": {
64+
"Kill": [
65+
{
66+
"Condition": {
67+
"$eq": [
68+
"$Value.RepositoryId",
69+
"332280ad-3b31-4913-99f1-794a4a46b98b"
70+
]
71+
},
72+
"Transition": "Success"
73+
}
74+
]
75+
}
76+
}
77+
}
78+
},
79+
{
80+
"Type": "statemachine",
81+
"Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f",
82+
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_OBJ3_NAME",
83+
"HUDTemplate": {
84+
"display": "$loc UI_PEACOCK_ARTEMIS_OBJ3_NAME"
85+
},
86+
"Category": "primary",
87+
"Definition": {
88+
"Scope": "hit",
89+
"Context": {
90+
"Targets": ["72aa012a-d74d-493f-8b84-397b95efd385"]
91+
},
92+
"States": {
93+
"Start": {
94+
"Kill": [
95+
{
96+
"Condition": {
97+
"$eq": [
98+
"$Value.RepositoryId",
99+
"72aa012a-d74d-493f-8b84-397b95efd385"
100+
]
101+
},
102+
"Transition": "Success"
103+
}
104+
]
105+
}
106+
}
107+
}
108+
},
109+
{
110+
"Type": "statemachine",
111+
"Id": "00deb548-dae5-312b-a86e-400965b98e57",
112+
"Image": "images/contracts/escalation/contractescalation_artemis_khatavanga.jpg",
113+
"BriefingName": "$loc UI_PEACOCK_ARTEMIS_OBJ_KHATAVANGA_NAME",
114+
"BriefingText": "$loc UI_PEACOCK_ARTEMIS_OBJ_KHATAVANGA_NAME",
115+
"HUDTemplate": {
116+
"display": "$loc UI_PEACOCK_ARTEMIS_OBJ_KHATAVANGA_NAME",
117+
"iconType": 17
118+
},
119+
"ObjectiveType": "setpiece",
120+
"Category": "secondary",
121+
"ForceShowOnLoadingScreen": true,
122+
"Definition": {
123+
"Scope": "hit",
124+
"Context": {
125+
"Targets": ["40e96ed0-7668-4d65-b88a-f44bfff5f537"]
126+
},
127+
"States": {
128+
"Start": {
129+
"ItemPickedUp": [
130+
{
131+
"Condition": {
132+
"$eq": [
133+
"$Value.RepositoryId",
134+
"40e96ed0-7668-4d65-b88a-f44bfff5f537"
135+
]
136+
},
137+
"Transition": "Success"
138+
}
139+
]
140+
}
141+
}
142+
}
143+
}
144+
],
145+
"GameChangers": ["484d5cf9-0f31-50e0-0192-d057633e9305"],
146+
"Bricks": [],
147+
"VR": [
148+
{
149+
"Quality": "base",
150+
"Bricks": [
151+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
152+
"assembly:/_pro/scenes/missions/mumbai/vr_overrides_mongoose.brick",
153+
"assembly:/_pro/scenes/missions/mumbai/vr_overrides_low_performance.brick"
154+
]
155+
},
156+
{
157+
"Quality": "better",
158+
"Bricks": [
159+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
160+
"assembly:/_pro/scenes/missions/mumbai/vr_overrides_mongoose.brick"
161+
]
162+
}
163+
]
164+
},
165+
"Metadata": {
166+
"Title": "UI_PEACOCK_ARTEMIS2",
167+
"Description": "",
168+
"Entitlements": ["LOCATION_MUMBAI"],
169+
"ScenePath": "assembly:/_PRO/Scenes/Missions/Mumbai/scene_mongoose.entity",
170+
"Location": "LOCATION_MUMBAI",
171+
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
172+
"Type": "escalation",
173+
"Id": "c9de4783-0950-67e7-1f53-411fda868445",
174+
"TileImage": "images/contracts/escalation/contractescalation_artemis.jpg",
175+
"GroupObjectiveDisplayOrder": [
176+
{ "Id": "733ebb42-f27a-4c2e-3e93-49a3966e3611", "IsNew": true },
177+
{ "Id": "a516ae6b-ccb5-53f9-9220-4916a7522e4f", "IsNew": true },
178+
{ "Id": "484d5cf9-0f31-50e0-0192-d057633e9305", "IsNew": true },
179+
{ "Id": "c51603b3-e08a-36cb-f00e-63e02b9e5e0a" },
180+
{ "Id": "00deb548-dae5-312b-a86e-400965b98e57" }
181+
],
182+
"InGroup": "b4c961a0-42da-b4cc-b92a-763977de914c",
183+
"CreationTimestamp": "2024-04-08T12:29:31.554Z"
184+
},
185+
"UserData": {}
186+
}

0 commit comments

Comments
 (0)