Skip to content

Commit a4f5eed

Browse files
suanjiansaltsuanjiansalt
authored
Merge branch 'master' into escalation-artemis
2 parents c101a9f + 155a4ae commit a4f5eed

13 files changed

Lines changed: 964 additions & 5 deletions

‎components/candle/challengeService.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,16 @@ export abstract class ChallengeRegistry {
223223
Icon: "versus",
224224
},
225225
],
226+
[
227+
"ammonia-pack",
228+
{
229+
Name: "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_AMMONIA",
230+
Description: "",
231+
GameVersions: ["h3"],
232+
Image: "images/challenges/categories/packammonia/tile.jpg",
233+
Icon: "challenge_category_feats",
234+
},
235+
],
226236
[
227237
"argentum-pack",
228238
{

‎contractdata/AMBROSE/_AMBROSE_CHALLENGES.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3273,7 +3273,7 @@
32733273
"Icon": "challenge_category_feats",
32743274
"CategoryId": "cheesecake-pack",
32753275
"Description": "",
3276-
"OrderIndex": 6.1,
3276+
"OrderIndex": 6.991,
32773277
"Challenges": [
32783278
{
32793279
"Id": "0e08ee97-8f70-c82e-f04a-9d2cd60ae5b5",

‎contractdata/BERLIN/_BERLIN_CHALLENGES.json‎

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4348,6 +4348,164 @@
43484348
}
43494349
}
43504350
]
4351+
},
4352+
{
4353+
"Name": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_AMMONIA",
4354+
"Image": "images/challenges/categories/packammonia/tile.jpg",
4355+
"Icon": "challenge_category_feats",
4356+
"CategoryId": "ammonia-pack",
4357+
"Description": "",
4358+
"OrderIndex": 6.992,
4359+
"Challenges": [
4360+
{
4361+
"Id": "4989d836-569a-4997-9755-95bd2e831d2a",
4362+
"Name": "UI_PEACOCK_CHALLENGEPACK_AMMONIA_WRAPPER_NAME",
4363+
"ImageName": "images/challenges/Categories/PackAmmonia/tile.jpg",
4364+
"Description": "UI_PEACOCK_CHALLENGEPACK_AMMONIA_WRAPPER_DESC",
4365+
"Rewards": {
4366+
"MasteryXP": 4000
4367+
},
4368+
"Drops": ["PROP_DEVICE_ICA_RUBBERDUCK_REMOTE_EXPLOSIVE_T"],
4369+
"IsPlayable": false,
4370+
"IsLocked": false,
4371+
"HideProgression": false,
4372+
"CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_AMMONIA",
4373+
"Icon": "challenge_category_feats",
4374+
"LocationId": "",
4375+
"ParentLocationId": "",
4376+
"Type": "global",
4377+
"DifficultyLevels": [],
4378+
"OrderIndex": 100000,
4379+
"XpModifier": {},
4380+
"RuntimeType": "Hit",
4381+
"Definition": {
4382+
"Scope": "profile",
4383+
"Constants": {
4384+
"RequiredChallenges": [
4385+
"09eb54ac-6037-4f3f-9c9d-a2ae00a0273c",
4386+
"0a43e29e-07da-495c-ba41-1904851526fd",
4387+
"744b8c17-ac05-48a8-8eab-84af4aa0f5f0",
4388+
"31fd53b9-8acc-46b8-95be-53a6474cff88"
4389+
]
4390+
},
4391+
"Context": {
4392+
"CompletedChallenges": []
4393+
},
4394+
"ContextListeners": {
4395+
"CompletedChallenges": {
4396+
"comparand": "$.RequiredChallenges",
4397+
"type": "challengetree"
4398+
}
4399+
},
4400+
"States": {
4401+
"Start": {
4402+
"ChallengeCompleted": [
4403+
{
4404+
"Condition": {
4405+
"$any": {
4406+
"?": {
4407+
"$eq": [
4408+
"$.#",
4409+
"$Value.ChallengeId"
4410+
]
4411+
},
4412+
"in": "$.RequiredChallenges"
4413+
}
4414+
},
4415+
"$pushunique": [
4416+
"CompletedChallenges",
4417+
"$Value.ChallengeId"
4418+
]
4419+
},
4420+
{
4421+
"Condition": {
4422+
"$eq": [
4423+
"($.CompletedChallenges).Count",
4424+
"($.RequiredChallenges).Count"
4425+
]
4426+
},
4427+
"Transition": "Success"
4428+
}
4429+
]
4430+
}
4431+
}
4432+
},
4433+
"Tags": ["ammonia-pack", "story", "hard"],
4434+
"InclusionData": {
4435+
"ContractIds": [
4436+
"ebcd14b2-0786-4ceb-a2a4-e771f60d0125",
4437+
"c414a084-a7b9-43ce-b6ca-590620acd87e"
4438+
],
4439+
"ContractTypes": null,
4440+
"Locations": ["LOCATION_MUMBAI", "LOCATION_WET"],
4441+
"GameModes": null
4442+
}
4443+
},
4444+
{
4445+
"Id": "31fd53b9-8acc-46b8-95be-53a6474cff88",
4446+
"Name": "UI_PEACOCK_CHALLENGEPACK_AMMONIA_BERLINFLYINGSWAN_NAME",
4447+
"ImageName": "images/challenges/categories/packammonia/ammonia_berlinflyingswan.jpg",
4448+
"Description": "UI_PEACOCK_CHALLENGEPACK_AMMONIA_BERLINFLYINGSWAN_DESC",
4449+
"Rewards": {
4450+
"MasteryXP": 4000
4451+
},
4452+
"Drops": [],
4453+
"IsPlayable": true,
4454+
"IsLocked": false,
4455+
"HideProgression": false,
4456+
"CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_AMMONIA",
4457+
"Icon": "challenge_category_feats",
4458+
"LocationId": "LOCATION_PARENT_EDGY",
4459+
"ParentLocationId": "LOCATION_PARENT_EDGY",
4460+
"Type": "contract",
4461+
"DifficultyLevels": [],
4462+
"OrderIndex": 100004,
4463+
"XpModifier": {},
4464+
"RuntimeType": "Hit",
4465+
"Definition": {
4466+
"Scope": "session",
4467+
"Context": {},
4468+
"States": {
4469+
"Start": {
4470+
"Kill": {
4471+
"Condition": {
4472+
"$and": [
4473+
{
4474+
"$eq": [
4475+
"$Value.RepositoryId",
4476+
"922deccd-7fb4-45d9-ae3d-2cf11915c403"
4477+
]
4478+
},
4479+
{
4480+
"$eq": [
4481+
"$Value.KillMethodStrict",
4482+
"accident_push"
4483+
]
4484+
}
4485+
]
4486+
},
4487+
"Transition": "CheckExit"
4488+
}
4489+
},
4490+
"CheckExit": {
4491+
"exit_gate": {
4492+
"Condition": {
4493+
"$eq": [
4494+
"$Value.RepositoryId",
4495+
"33c581f6-45ee-4a83-8209-d131ba6a755d"
4496+
]
4497+
},
4498+
"Transition": "Success"
4499+
}
4500+
}
4501+
}
4502+
},
4503+
"Tags": ["ammonia-pack", "story", "live", "medium"],
4504+
"InclusionData": {
4505+
"ContractIds": ["ebcd14b2-0786-4ceb-a2a4-e771f60d0125"]
4506+
}
4507+
}
4508+
]
43514509
}
43524510
]
43534511
}

0 commit comments

Comments
 (0)