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: challengepack ammonia #507

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

feat: challengepack ammonia #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9ac4278
add challenges files
suanjiansalt Aug 13, 2024
f644c70
add locale
suanjiansalt Aug 13, 2024
6579327
Merge branch 'master' into challengepack-ammonia
AnthonyFuller Aug 13, 2024
7b1e592
fix(ammonia/abandoned): allow for starting suits
AnthonyFuller Aug 13, 2024
77db51c
take cheesecake pack way behind from official ones
suanjiansalt Aug 13, 2024
a74eceb
Merge branch 'challengepack-ammonia' of https://github.com/suanjiansa…
suanjiansalt Aug 13, 2024
c80b9bb
chore: update locale
AnthonyFuller Aug 13, 2024
451d1a6
add location into descriptions
suanjiansalt Aug 13, 2024
ceb2c7b
fix xp rewards
suanjiansalt Aug 13, 2024
b382c75
change wrapper challenge locations
suanjiansalt Aug 13, 2024
55c0eb3
oops, not intended for cheesecake
suanjiansalt Aug 14, 2024
d3a47ef
Merge branch 'master' into challengepack-ammonia
suanjiansalt Aug 18, 2024
3ea1e8a
fix more orders
suanjiansalt Aug 26, 2024
ad21aad
Merge branch 'master' into challengepack-ammonia
suanjiansalt Aug 26, 2024
3243cab
image paths
suanjiansalt Aug 27, 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
28 changes: 19 additions & 9 deletions components/candle/challengeService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,32 +208,42 @@ export abstract class ChallengeRegistry {
},
],
[
"cheesecake-pack",
"argentum-pack",
{
Name: "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_CHEESECAKE",
Name: "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_ARGENTUM",
Description: "",
GameVersions: ["h3"],
Image: "images/challenges/categories/packcheesecake/tile.jpg",
Image: "images/challenges/categories/packargentum/tile.jpg",
Icon: "challenge_category_feats",
},
],
[
"argentum-pack",
"argon-pack",
{
Name: "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_ARGENTUM",
Name: "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_ARGON",
Description: "",
GameVersions: ["h3"],
Image: "images/challenges/categories/packargentum/tile.jpg",
Image: "images/challenges/categories/packargon/tile.jpg",
Icon: "challenge_category_feats",
},
],
[
"argon-pack",
"cheesecake-pack",
{
Name: "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_ARGON",
Name: "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_CHEESECAKE",
Description: "",
GameVersions: ["h3"],
Image: "images/challenges/categories/packargon/tile.jpg",
Image: "images/challenges/categories/packcheesecake/tile.jpg",
Icon: "challenge_category_feats",
},
],
[
"ammonia-pack",
{
Name: "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_AMMONIA",
Description: "",
GameVersions: ["h3"],
Image: "images/challenges/categories/packammonia/tile.jpg",
Icon: "challenge_category_feats",
},
],
Expand Down
2 changes: 1 addition & 1 deletion contractdata/AMBROSE/_AMBROSE_CHALLENGES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3181,7 +3181,7 @@
"Icon": "challenge_category_feats",
"CategoryId": "cheesecake-pack",
"Description": "",
"OrderIndex": 6.1,
"OrderIndex": 6.991,
"Challenges": [
{
"Id": "0e08ee97-8f70-c82e-f04a-9d2cd60ae5b5",
Expand Down
158 changes: 158 additions & 0 deletions contractdata/BERLIN/_BERLIN_CHALLENGES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4305,6 +4305,164 @@
}
}
]
},
{
"Name": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_AMMONIA",
"Image": "images/challenges/categories/packammonia/tile.jpg",
"Icon": "challenge_category_feats",
"CategoryId": "ammonia-pack",
"Description": "",
"OrderIndex": 6.992,
"Challenges": [
{
"Id": "4989d836-569a-4997-9755-95bd2e831d2a",
"Name": "UI_PEACOCK_CHALLENGEPACK_AMMONIA_WRAPPER_NAME",
"ImageName": "images/challenges/Categories/PackAmmonia/tile.jpg",
"Description": "UI_PEACOCK_CHALLENGEPACK_AMMONIA_WRAPPER_DESC",
"Rewards": {
"MasteryXP": 4000
},
"Drops": ["PROP_DEVICE_ICA_RUBBERDUCK_REMOTE_EXPLOSIVE_T"],
"IsPlayable": false,
"IsLocked": false,
"HideProgression": false,
"CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_AMMONIA",
"Icon": "challenge_category_feats",
"LocationId": "",
"ParentLocationId": "",
"Type": "global",
"DifficultyLevels": [],
"OrderIndex": 100000,
"XpModifier": {},
"RuntimeType": "Hit",
"Definition": {
"Scope": "profile",
"Constants": {
"RequiredChallenges": [
"09eb54ac-6037-4f3f-9c9d-a2ae00a0273c",
"0a43e29e-07da-495c-ba41-1904851526fd",
"744b8c17-ac05-48a8-8eab-84af4aa0f5f0",
"31fd53b9-8acc-46b8-95be-53a6474cff88"
]
},
"Context": {
"CompletedChallenges": []
},
"ContextListeners": {
"CompletedChallenges": {
"comparand": "$.RequiredChallenges",
"type": "challengetree"
}
},
"States": {
"Start": {
"ChallengeCompleted": [
{
"Condition": {
"$any": {
"?": {
"$eq": [
"$.#",
"$Value.ChallengeId"
]
},
"in": "$.RequiredChallenges"
}
},
"$pushunique": [
"CompletedChallenges",
"$Value.ChallengeId"
]
},
{
"Condition": {
"$eq": [
"($.CompletedChallenges).Count",
"($.RequiredChallenges).Count"
]
},
"Transition": "Success"
}
]
}
}
},
"Tags": ["ammonia-pack", "story", "hard"],
"InclusionData": {
"ContractIds": [
"ebcd14b2-0786-4ceb-a2a4-e771f60d0125",
"c414a084-a7b9-43ce-b6ca-590620acd87e"
],
"ContractTypes": null,
"Locations": ["LOCATION_MUMBAI", "LOCATION_WET"],
"GameModes": null
}
},
{
"Id": "31fd53b9-8acc-46b8-95be-53a6474cff88",
"Name": "UI_PEACOCK_CHALLENGEPACK_AMMONIA_FLYINGSWAN_NAME",
"ImageName": "images/challenges/categories/packammonia/ammonia_flyingswan.jpg",
"Description": "UI_PEACOCK_CHALLENGEPACK_AMMONIA_FLYINGSWAN_DESC",
"Rewards": {
"MasteryXP": 4000
},
"Drops": [],
"IsPlayable": true,
"IsLocked": false,
"HideProgression": false,
"CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_AMMONIA",
"Icon": "challenge_category_feats",
"LocationId": "LOCATION_PARENT_EDGY",
"ParentLocationId": "LOCATION_PARENT_EDGY",
"Type": "contract",
"DifficultyLevels": [],
"OrderIndex": 100004,
"XpModifier": {},
"RuntimeType": "Hit",
"Definition": {
"Scope": "session",
"Context": {},
"States": {
"Start": {
"Kill": {
"Condition": {
"$and": [
{
"$eq": [
"$Value.RepositoryId",
"922deccd-7fb4-45d9-ae3d-2cf11915c403"
]
},
{
"$eq": [
"$Value.KillMethodStrict",
"accident_push"
]
}
]
},
"Transition": "CheckExit"
}
},
"CheckExit": {
"exit_gate": {
"Condition": {
"$eq": [
"$Value.RepositoryId",
"33c581f6-45ee-4a83-8209-d131ba6a755d"
]
},
"Transition": "Success"
}
}
}
},
"Tags": ["ammonia-pack", "story", "live", "medium"],
"InclusionData": {
"ContractIds": ["ebcd14b2-0786-4ceb-a2a4-e771f60d0125"]
}
}
]
}
]
}
Loading