Skip to content

Commit 2385935

Browse files
RDILRDIL
authored
feat: escalation ares (#709)
<!-- Thanks for contributing to Peacock! Here's a bit of a template to help make sure everything relevant is covered. --> ## Scope An escalation featuring explosion in Colorado, and completing whose last level will reward Breachcharge Mk2. That PR #423 is gone because I rename the branch. So I need to make this one. ## Test Plan the escalation runs ## Checklist <!-- Once you create the PR, the checklist will be added below this comment automatically (based on what files you've changed). It's just a few reminders to make sure everything is perfect. You can place an "X" in the boxes to tick them off. When you have completed the checklist, press the "Ready for review" button. --> -------- #### 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 - [ ] I have added or considered adding unit/integration tests that cover any code changes
2 parents 85fb01c + 3b847de commit 2385935

9 files changed

Lines changed: 1234 additions & 12 deletions

File tree

‎components/contracts/missionsInLocation.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ export const missionsInLocation = {
258258
],
259259
LOCATION_BANGKOK_ZIKA: [],
260260
LOCATION_COLORADO: [
261+
"a35a7469-e74c-d1b1-a377-6b0016add67d",
261262
"e6f4d3a4-9a33-4bd9-b761-da297069cf8c",
262263
"c5d88e8c-437b-476b-afe2-d94aa4293502",
263264
"4186dd23-1cfc-4ba0-9863-9f19f7cba249",
@@ -455,6 +456,7 @@ export const missionsInLocation = {
455456
],
456457
LOCATION_BANGKOK_ZIKA: [],
457458
LOCATION_COLORADO: [
459+
"a35a7469-e74c-d1b1-a377-6b0016add67d",
458460
"e6f4d3a4-9a33-4bd9-b761-da297069cf8c",
459461
"c5d88e8c-437b-476b-afe2-d94aa4293502",
460462
"4186dd23-1cfc-4ba0-9863-9f19f7cba249",

‎contractdata/COLORADO/ESCALATION/ARES/ARES.json‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"Data": {
3+
"EnableSaving": false,
4+
"Objectives": [],
5+
"Bricks": [],
6+
"GameChangers": [],
7+
"GameChangerReferences": [],
8+
"Stashpoints": [],
9+
"VR": [
10+
{
11+
"Quality": "base",
12+
"Bricks": [
13+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
14+
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick",
15+
"assembly:/_PRO/scenes/missions/colorado_2/vr_overrides_low_performance.brick"
16+
]
17+
},
18+
{
19+
"Quality": "better",
20+
"Bricks": [
21+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
22+
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick"
23+
]
24+
}
25+
]
26+
},
27+
"Metadata": {
28+
"Id": "a35a7469-e74c-d1b1-a377-6b0016add67d",
29+
"IsPublished": true,
30+
"CreationTimestamp": "2024-04-06T13:38:42.057Z",
31+
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
32+
"TileImage": "images/contracts/escalation/ContractEscalation_Ares.jpg",
33+
"Title": "UI_PEACOCK_ARES",
34+
"Description": "UI_PEACOCK_ESCALATION_COLORADO_DESC",
35+
"Location": "LOCATION_COLORADO",
36+
"ScenePath": "assembly:/_pro/scenes/missions/Colorado_2/_scene_bull.entity",
37+
"Type": "escalation",
38+
"RequiredUnlockable": "ACCESS_HIT_BULL",
39+
"GroupDefinition": {
40+
"Type": "escalation",
41+
"Order": [
42+
"b1fe399f-8617-f4da-b425-e1c397d12c48",
43+
"fe0ae510-c920-2090-dd06-cd53e249a401",
44+
"b2810b7f-ae8d-8c8b-c03c-f81618822d96"
45+
]
46+
},
47+
"Entitlements": ["LOCATION_COLORADO"],
48+
"LastUpdate": "2024-04-06T13:38:42.057Z",
49+
"Season": 0,
50+
"OriginalSeason": 1
51+
},
52+
"UserData": {}
53+
}

‎contractdata/COLORADO/ESCALATION/ARES/ARES1.json‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
{
2+
"Data": {
3+
"Objectives": [
4+
{
5+
"Type": "statemachine",
6+
"Id": "4966895f-f640-4967-abf5-2ab90c9f4a50",
7+
"BriefingText": "$loc UI_PEACOCK_ARES_OBJ1",
8+
"HUDTemplate": {
9+
"display": "$loc UI_PEACOCK_ARES_OBJ1"
10+
},
11+
"Category": "primary",
12+
"Definition": {
13+
"Scope": "Hit",
14+
"Context": {
15+
"Targets": ["7d80843a-66d4-4d46-a914-08f96773e2fd"]
16+
},
17+
"States": {
18+
"Start": {
19+
"Kill": [
20+
{
21+
"Condition": {
22+
"$and": [
23+
{
24+
"$eq": [
25+
"$Value.RepositoryId",
26+
"7d80843a-66d4-4d46-a914-08f96773e2fd"
27+
]
28+
},
29+
{
30+
"$eq": [
31+
"$Value.KillItemRepositoryId",
32+
"ee25fc91-e42e-4044-99b4-b3c4206d250d"
33+
]
34+
}
35+
]
36+
},
37+
"Transition": "Success"
38+
},
39+
{
40+
"Condition": {
41+
"$eq": [
42+
"$Value.RepositoryId",
43+
"7d80843a-66d4-4d46-a914-08f96773e2fd"
44+
]
45+
},
46+
"Transition": "Failure"
47+
}
48+
]
49+
}
50+
}
51+
},
52+
"TargetConditions": [
53+
{
54+
"Type": "weapon",
55+
"RepositoryId": "ee25fc91-e42e-4044-99b4-b3c4206d250d",
56+
"HardCondition": true,
57+
"KillMethod": ""
58+
}
59+
]
60+
}
61+
],
62+
"GameChangers": [],
63+
"Bricks": [],
64+
"VR": [
65+
{
66+
"Quality": "base",
67+
"Bricks": [
68+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
69+
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick",
70+
"assembly:/_PRO/scenes/missions/colorado_2/vr_overrides_low_performance.brick"
71+
]
72+
},
73+
{
74+
"Quality": "better",
75+
"Bricks": [
76+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
77+
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick"
78+
]
79+
}
80+
],
81+
"EnableSaving": false
82+
},
83+
"Metadata": {
84+
"Title": "UI_PEACOCK_ARES1",
85+
"Description": "",
86+
"Entitlements": ["LOCATION_COLORADO"],
87+
"ScenePath": "assembly:/_PRO/Scenes/Missions/Colorado_2/_scene_bull.entity",
88+
"Location": "LOCATION_COLORADO",
89+
"Type": "escalation",
90+
"Id": "b1fe399f-8617-f4da-b425-e1c397d12c48",
91+
"TileImage": "images/contracts/escsalation/ContractEscalation_Ares.jpg",
92+
"GroupObjectiveDisplayOrder": [
93+
{ "Id": "4966895f-f640-4967-abf5-2ab90c9f4a50" }
94+
],
95+
"InGroup": "a35a7469-e74c-d1b1-a377-6b0016add67d",
96+
"CreationTimestamp": "2024-04-06T13:38:42.057Z"
97+
},
98+
"UserData": {}
99+
}

‎contractdata/COLORADO/ESCALATION/ARES/ARES2.json‎

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
{
2+
"Data": {
3+
"Objectives": [
4+
{
5+
"Type": "statemachine",
6+
"Id": "4966895f-f640-4967-abf5-2ab90c9f4a50",
7+
"BriefingText": "$loc UI_PEACOCK_ARES_OBJ1",
8+
"HUDTemplate": {
9+
"display": "$loc UI_PEACOCK_ARES_OBJ1"
10+
},
11+
"Category": "primary",
12+
"Definition": {
13+
"Scope": "Hit",
14+
"Context": {
15+
"Targets": ["7d80843a-66d4-4d46-a914-08f96773e2fd"]
16+
},
17+
"States": {
18+
"Start": {
19+
"Kill": [
20+
{
21+
"Condition": {
22+
"$and": [
23+
{
24+
"$eq": [
25+
"$Value.RepositoryId",
26+
"7d80843a-66d4-4d46-a914-08f96773e2fd"
27+
]
28+
},
29+
{
30+
"$eq": [
31+
"$Value.KillItemRepositoryId",
32+
"ee25fc91-e42e-4044-99b4-b3c4206d250d"
33+
]
34+
}
35+
]
36+
},
37+
"Transition": "Success"
38+
},
39+
{
40+
"Condition": {
41+
"$eq": [
42+
"$Value.RepositoryId",
43+
"7d80843a-66d4-4d46-a914-08f96773e2fd"
44+
]
45+
},
46+
"Transition": "Failure"
47+
}
48+
]
49+
}
50+
}
51+
},
52+
"TargetConditions": [
53+
{
54+
"Type": "weapon",
55+
"RepositoryId": "ee25fc91-e42e-4044-99b4-b3c4206d250d",
56+
"HardCondition": true,
57+
"KillMethod": ""
58+
}
59+
]
60+
},
61+
{
62+
"Type": "statemachine",
63+
"Id": "f7efa670-a305-4d6c-84ee-8060653c37f2",
64+
"BriefingText": "$loc UI_PEACOCK_ARES_OBJ2",
65+
"HUDTemplate": {
66+
"display": "$loc UI_PEACOCK_ARES_OBJ2"
67+
},
68+
"Category": "primary",
69+
"Definition": {
70+
"Scope": "Hit",
71+
"Context": {
72+
"Targets": ["bd17a855-0bf7-48a1-abab-ddb5c08fcdfc"]
73+
},
74+
"States": {
75+
"Start": {
76+
"Kill": [
77+
{
78+
"Condition": {
79+
"$and": [
80+
{
81+
"$eq": [
82+
"$Value.RepositoryId",
83+
"bd17a855-0bf7-48a1-abab-ddb5c08fcdfc"
84+
]
85+
},
86+
{
87+
"$eq": [
88+
"$Value.KillItemRepositoryId",
89+
"a8a0c154-c36f-413e-8f29-b83a1b7a22f0"
90+
]
91+
}
92+
]
93+
},
94+
"Transition": "Success"
95+
},
96+
{
97+
"Condition": {
98+
"$eq": [
99+
"$Value.RepositoryId",
100+
"bd17a855-0bf7-48a1-abab-ddb5c08fcdfc"
101+
]
102+
},
103+
"Transition": "Failure"
104+
}
105+
]
106+
}
107+
}
108+
},
109+
"TargetConditions": [
110+
{
111+
"Type": "weapon",
112+
"RepositoryId": "a8a0c154-c36f-413e-8f29-b83a1b7a22f0",
113+
"HardCondition": true,
114+
"KillMethod": "accident_explosion"
115+
}
116+
]
117+
}
118+
],
119+
"GameChangers": [],
120+
"Bricks": [],
121+
"VR": [
122+
{
123+
"Quality": "base",
124+
"Bricks": [
125+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
126+
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick",
127+
"assembly:/_PRO/scenes/missions/colorado_2/vr_overrides_low_performance.brick"
128+
]
129+
},
130+
{
131+
"Quality": "better",
132+
"Bricks": [
133+
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
134+
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick"
135+
]
136+
}
137+
],
138+
"EnableSaving": false
139+
},
140+
"Metadata": {
141+
"Title": "UI_PEACOCK_ARES2",
142+
"Description": "",
143+
"Entitlements": ["LOCATION_COLORADO"],
144+
"ScenePath": "assembly:/_PRO/Scenes/Missions/Colorado_2/_scene_bull.entity",
145+
"Location": "LOCATION_COLORADO",
146+
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
147+
"Type": "escalation",
148+
"Id": "fe0ae510-c920-2090-dd06-cd53e249a401",
149+
"TileImage": "images/contracts/escsalation/ContractEscalation_Ares.jpg",
150+
"GroupObjectiveDisplayOrder": [
151+
{ "Id": "f7efa670-a305-4d6c-84ee-8060653c37f2", "IsNew": true },
152+
{ "Id": "4966895f-f640-4967-abf5-2ab90c9f4a50" }
153+
],
154+
"InGroup": "a35a7469-e74c-d1b1-a377-6b0016add67d",
155+
"CreationTimestamp": "2024-04-06T13:38:42.057Z"
156+
},
157+
"UserData": {}
158+
}

0 commit comments

Comments
 (0)