Skip to content

feat: escalation ares #423

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

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

feat: escalation ares #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
2fa4e5e
add mission files
suanjiansalt Apr 7, 2024
7dca61f
update missionsinlocation
suanjiansalt Apr 7, 2024
51cce97
run prettier
suanjiansalt Apr 7, 2024
4b4b075
add challenges
suanjiansalt Apr 7, 2024
c21bf97
update locale
suanjiansalt Apr 7, 2024
0830988
sc translation
suanjiansalt Apr 8, 2024
85df395
Merge branch 'master' into escalation-anthurium
suanjiansalt Apr 8, 2024
beaf2f9
fix locale.json
suanjiansalt Apr 8, 2024
7c6c106
Update locale.json
suanjiansalt May 2, 2024
3901e44
Merge branch 'thepeacockproject:master' into escalation-anthurium
suanjiansalt May 2, 2024
0ec8580
disable savings
suanjiansalt May 2, 2024
0fdaf6c
Update locale.json
suanjiansalt May 3, 2024
c1fbb90
Merge branch 'master' into escalation-anthurium
suanjiansalt May 3, 2024
134d4b6
change codename to greek god Ares
suanjiansalt May 4, 2024
59627ff
fix challenge paths
suanjiansalt May 5, 2024
936435b
add gamechanger
suanjiansalt May 18, 2024
aedea62
add locale
suanjiansalt May 19, 2024
f20f34e
Merge branch 'master' into escalation-anthurium
suanjiansalt May 19, 2024
75ea0db
refine gamechanger
suanjiansalt May 20, 2024
4eda8df
change reward challenge
suanjiansalt Jun 11, 2024
c4e37c3
change requirements
suanjiansalt Jul 13, 2024
f7685f3
return reward challenge
suanjiansalt Jul 13, 2024
56f4eca
polish for lvl3
suanjiansalt Aug 7, 2024
9b40d3b
change to definitive name
suanjiansalt Aug 7, 2024
b6f0534
Merge branch 'thepeacockproject:master' into escalation-anthurium
suanjiansalt Dec 2, 2024
ebe7494
final fix
suanjiansalt Dec 2, 2024
c1e45c8
rather than hide bodies
suanjiansalt Dec 17, 2024
fed685d
display gamechanger
suanjiansalt Dec 17, 2024
af1147f
do not spotted gc
suanjiansalt Dec 26, 2024
1aedfa2
standardize
suanjiansalt Feb 3, 2025
337513b
multilanguage
suanjiansalt Feb 3, 2025
920f7b5
Merge branch 'master' into escalation-anthurium
suanjiansalt Oct 5, 2025
d32d742
run prettier
suanjiansalt Oct 5, 2025
1596eae
add VR options and change entitlement for 3.230.1
suanjiansalt Oct 5, 2025
3b1f9ae
remove unrelated files
suanjiansalt Oct 5, 2025
d91bd46
remove unrelated changes
suanjiansalt Oct 5, 2025
b546aaa
I hate spaces
suanjiansalt Oct 5, 2025
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
2 changes: 2 additions & 0 deletions components/contracts/missionsInLocation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ export const missionsInLocation = {
],
LOCATION_BANGKOK_ZIKA: [],
LOCATION_COLORADO: [
"a35a7469-e74c-d1b1-a377-6b0016add67d",
"e6f4d3a4-9a33-4bd9-b761-da297069cf8c",
"c5d88e8c-437b-476b-afe2-d94aa4293502",
"4186dd23-1cfc-4ba0-9863-9f19f7cba249",
Expand Down Expand Up @@ -454,6 +455,7 @@ export const missionsInLocation = {
],
LOCATION_BANGKOK_ZIKA: [],
LOCATION_COLORADO: [
"a35a7469-e74c-d1b1-a377-6b0016add67d",
"e6f4d3a4-9a33-4bd9-b761-da297069cf8c",
"c5d88e8c-437b-476b-afe2-d94aa4293502",
"4186dd23-1cfc-4ba0-9863-9f19f7cba249",
Expand Down
53 changes: 53 additions & 0 deletions contractdata/COLORADO/ESCALATION/ARES/ARES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"Data": {
"EnableSaving": false,
"Objectives": [],
"Bricks": [],
"GameChangers": [],
"GameChangerReferences": [],
"Stashpoints": [],
"VR": [
{
"Quality": "base",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick",
"assembly:/_PRO/scenes/missions/colorado_2/vr_overrides_low_performance.brick"
]
},
{
"Quality": "better",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick"
]
}
]
},
"Metadata": {
"Id": "a35a7469-e74c-d1b1-a377-6b0016add67d",
"IsPublished": true,
"CreationTimestamp": "2024-04-06T13:38:42.057Z",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"TileImage": "images/contracts/escalation/ContractEscalation_Ares.jpg",
"Title": "UI_PEACOCK_ARES",
"Description": "UI_PEACOCK_ESCALATION_COLORADO_DESC",
"Location": "LOCATION_COLORADO",
"ScenePath": "assembly:/_pro/scenes/missions/Colorado_2/_scene_bull.entity",
"Type": "escalation",
"RequiredUnlockable": "ACCESS_HIT_BULL",
"GroupDefinition": {
"Type": "escalation",
"Order": [
"b1fe399f-8617-f4da-b425-e1c397d12c48",
"fe0ae510-c920-2090-dd06-cd53e249a401",
"b2810b7f-ae8d-8c8b-c03c-f81618822d96"
]
},
"Entitlements": ["LOCATION_COLORADO"],
"LastUpdate": "2024-04-06T13:38:42.057Z",
"Season": 0,
"OriginalSeason": 1
},
"UserData": {}
}
99 changes: 99 additions & 0 deletions contractdata/COLORADO/ESCALATION/ARES/ARES1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
{
"Data": {
"Objectives": [
{
"Type": "statemachine",
"Id": "4966895f-f640-4967-abf5-2ab90c9f4a50",
"BriefingText": "$loc UI_PEACOCK_ARES_OBJ1",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_ARES_OBJ1"
},
"Category": "primary",
"Definition": {
"Scope": "Hit",
"Context": {
"Targets": ["7d80843a-66d4-4d46-a914-08f96773e2fd"]
},
"States": {
"Start": {
"Kill": [
{
"Condition": {
"$and": [
{
"$eq": [
"$Value.RepositoryId",
"7d80843a-66d4-4d46-a914-08f96773e2fd"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"ee25fc91-e42e-4044-99b4-b3c4206d250d"
]
}
]
},
"Transition": "Success"
},
{
"Condition": {
"$eq": [
"$Value.RepositoryId",
"7d80843a-66d4-4d46-a914-08f96773e2fd"
]
},
"Transition": "Failure"
}
]
}
}
},
"TargetConditions": [
{
"Type": "weapon",
"RepositoryId": "ee25fc91-e42e-4044-99b4-b3c4206d250d",
"HardCondition": true,
"KillMethod": ""
}
]
}
],
"GameChangers": [],
"Bricks": [],
"VR": [
{
"Quality": "base",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick",
"assembly:/_PRO/scenes/missions/colorado_2/vr_overrides_low_performance.brick"
]
},
{
"Quality": "better",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick"
]
}
],
"EnableSaving": false
},
"Metadata": {
"Title": "UI_PEACOCK_ARES1",
"Description": "",
"Entitlements": ["LOCATION_COLORADO"],
"ScenePath": "assembly:/_PRO/Scenes/Missions/Colorado_2/_scene_bull.entity",
"Location": "LOCATION_COLORADO",
"Type": "escalation",
"Id": "b1fe399f-8617-f4da-b425-e1c397d12c48",
"TileImage": "images/contracts/escsalation/ContractEscalation_Ares.jpg",
"GroupObjectiveDisplayOrder": [
{ "Id": "4966895f-f640-4967-abf5-2ab90c9f4a50" }
],
"InGroup": "a35a7469-e74c-d1b1-a377-6b0016add67d",
"CreationTimestamp": "2024-04-06T13:38:42.057Z"
},
"UserData": {}
}
158 changes: 158 additions & 0 deletions contractdata/COLORADO/ESCALATION/ARES/ARES2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
{
"Data": {
"Objectives": [
{
"Type": "statemachine",
"Id": "4966895f-f640-4967-abf5-2ab90c9f4a50",
"BriefingText": "$loc UI_PEACOCK_ARES_OBJ1",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_ARES_OBJ1"
},
"Category": "primary",
"Definition": {
"Scope": "Hit",
"Context": {
"Targets": ["7d80843a-66d4-4d46-a914-08f96773e2fd"]
},
"States": {
"Start": {
"Kill": [
{
"Condition": {
"$and": [
{
"$eq": [
"$Value.RepositoryId",
"7d80843a-66d4-4d46-a914-08f96773e2fd"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"ee25fc91-e42e-4044-99b4-b3c4206d250d"
]
}
]
},
"Transition": "Success"
},
{
"Condition": {
"$eq": [
"$Value.RepositoryId",
"7d80843a-66d4-4d46-a914-08f96773e2fd"
]
},
"Transition": "Failure"
}
]
}
}
},
"TargetConditions": [
{
"Type": "weapon",
"RepositoryId": "ee25fc91-e42e-4044-99b4-b3c4206d250d",
"HardCondition": true,
"KillMethod": ""
}
]
},
{
"Type": "statemachine",
"Id": "f7efa670-a305-4d6c-84ee-8060653c37f2",
"BriefingText": "$loc UI_PEACOCK_ARES_OBJ2",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_ARES_OBJ2"
},
"Category": "primary",
"Definition": {
"Scope": "Hit",
"Context": {
"Targets": ["bd17a855-0bf7-48a1-abab-ddb5c08fcdfc"]
},
"States": {
"Start": {
"Kill": [
{
"Condition": {
"$and": [
{
"$eq": [
"$Value.RepositoryId",
"bd17a855-0bf7-48a1-abab-ddb5c08fcdfc"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"a8a0c154-c36f-413e-8f29-b83a1b7a22f0"
]
}
]
},
"Transition": "Success"
},
{
"Condition": {
"$eq": [
"$Value.RepositoryId",
"bd17a855-0bf7-48a1-abab-ddb5c08fcdfc"
]
},
"Transition": "Failure"
}
]
}
}
},
"TargetConditions": [
{
"Type": "weapon",
"RepositoryId": "a8a0c154-c36f-413e-8f29-b83a1b7a22f0",
"HardCondition": true,
"KillMethod": "accident_explosion"
}
]
}
],
"GameChangers": [],
"Bricks": [],
"VR": [
{
"Quality": "base",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick",
"assembly:/_PRO/scenes/missions/colorado_2/vr_overrides_low_performance.brick"
]
},
{
"Quality": "better",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_PRO/Scenes/missions/colorado_2/vr_overrides_bull.brick"
]
}
],
"EnableSaving": false
},
"Metadata": {
"Title": "UI_PEACOCK_ARES2",
"Description": "",
"Entitlements": ["LOCATION_COLORADO"],
"ScenePath": "assembly:/_PRO/Scenes/Missions/Colorado_2/_scene_bull.entity",
"Location": "LOCATION_COLORADO",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"Type": "escalation",
"Id": "fe0ae510-c920-2090-dd06-cd53e249a401",
"TileImage": "images/contracts/escsalation/ContractEscalation_Ares.jpg",
"GroupObjectiveDisplayOrder": [
{ "Id": "f7efa670-a305-4d6c-84ee-8060653c37f2", "IsNew": true },
{ "Id": "4966895f-f640-4967-abf5-2ab90c9f4a50" }
],
"InGroup": "a35a7469-e74c-d1b1-a377-6b0016add67d",
"CreationTimestamp": "2024-04-06T13:38:42.057Z"
},
"UserData": {}
}
Loading