Skip to content

Commit

Permalink
feat: new challenge pack: Butcher's Delight (#411)
Browse files Browse the repository at this point in the history 
* add pack and change drops

* run prettier

* introduce florida suit with gloves to elusive target miami challenge

* add cq challenge and minor fixes

* add entrance

* change wrapper image

* minor fixes

* from constant to smith

* locale changes

* add no spotted to italy challenge

* took its condition apart and now hook challenge will popup in mission

* Update cheesecake locale

---------

Co-authored-by: AnthonyFuller <anthony@hitmods.com>
  • Loading branch information
@suanjiansalt @AnthonyFuller
suanjiansalt and AnthonyFuller committed Apr 6, 2024
1 parent d1eefe3 commit b3d54c6
Show file tree
Hide file tree
Showing 10 changed files with 829 additions and 13 deletions.
10 changes: 10 additions & 0 deletions components/candle/challengeService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,16 @@ export abstract class ChallengeRegistry {
Icon: "challenge_category_feats",
},
],
[
"cheesecake-pack",
{
Name: "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_CHEESECAKE",
Description: "",
GameVersions: ["h3"],
Image: "images/challenges/categories/packcheesecake/tile.jpg",
Icon: "challenge_category_feats",
},
],
])

registerChallenge(
Expand Down
136 changes: 136 additions & 0 deletions contractdata/AMBROSE/_AMBROSE_CHALLENGES.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3090,6 +3090,142 @@
"Tags": ["argon-pack", "story", "live", "medium"]
}
]
},
{
"Name": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_CHEESECAKE",
"Image": "images/challenges/categories/packcheesecake/tile.jpg",
"Icon": "challenge_category_feats",
"CategoryId": "cheesecake-pack",
"Description": "",
"OrderIndex": 10000,
"Challenges": [
{
"Id": "b5386255-0e7e-2bd7-6c28-c1096d4902c5",
"Name": "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_NAME",
"ImageName": "images/challenges/categories/packcheesecake/cheesecake_ambrosehook.jpg",
"Description": "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_AMBROSEHOOK_DESC",
"Rewards": {
"MasteryXP": 4000
},
"Drops": ["PROP_MELEE_BUTCHERS_MEATHOOK"],
"IsPlayable": true,
"IsLocked": false,
"HideProgression": false,
"CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_CHEESECAKE",
"Icon": "challenge_category_feats",
"LocationId": "LOCATION_PARENT_ROCKY",
"ParentLocationId": "LOCATION_PARENT_ROCKY",
"Type": "parentlocation",
"DifficultyLevels": [],
"OrderIndex": 100004,
"XpModifier": {},
"RuntimeType": "Hit",
"Definition": {
"Scope": "session",
"States": {
"Start": {
"Kill": [
{
"Condition": {
"$and": [
{
"$eq": [
"$Value.RepositoryId",
"1312f620-bf61-4b7f-8f5c-ea4e07763a98"
]
},
{
"$eq": [
"$Value.KillMethodStrict",
"accident_burn"
]
}
]
},
"Transition": "SmithDown"
},
{
"Condition": {
"$and": [
{
"$eq": [
"$Value.RepositoryId",
"9454339d-8f29-4ae6-97f4-96523a48bf08"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"58a036dc-79d4-4d64-8bf5-3faafa3cfead"
]
}
]
},
"Transition": "MateDown"
}
]
},
"SmithDown": {
"Kill": {
"Condition": {
"$and": [
{
"$eq": [
"$Value.RepositoryId",
"9454339d-8f29-4ae6-97f4-96523a48bf08"
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"58a036dc-79d4-4d64-8bf5-3faafa3cfead"
]
}
]
},
"Transition": "CheckShower"
}
},
"MateDown": {
"Kill": {
"Condition": {
"$and": [
{
"$eq": [
"$Value.RepositoryId",
"1312f620-bf61-4b7f-8f5c-ea4e07763a98"
]
},
{
"$eq": [
"$Value.KillMethodStrict",
"accident_burn"
]
}
]
},
"Transition": "CheckShower"
}
},
"CheckShower": {
"setpieces": {
"Condition": {
"$eq": [
"$Value.RepositoryId",
"168b0d90-2b0b-44ec-98fb-bc728cfbc12b"
]
},
"Transition": "Success"
}
}
}
},
"Tags": ["cheesecake-pack", "story", "live", "medium"],
"InclusionData": {
"ContractIds": ["b2aac100-dfc7-4f85-b9cd-528114436f6c"]
}
}
]
}
]
}
2 changes: 1 addition & 1 deletion contractdata/ARCADE/_ARCADE_CHALLENGES.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@
"Rewards": {
"MasteryXP": 4000
},
"Drops": ["TOKEN_OUTFIT_HERO_BUTCHER_SUIT"],
"Drops": ["TOKEN_OUTFIT_HERO_PURPLESPECIAL_SUIT"],
"IsPlayable": false,
"IsLocked": false,
"HideProgression": false,
Expand Down
79 changes: 79 additions & 0 deletions contractdata/CHONGQING/_CHONGQING_CHALLENGES.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4392,6 +4392,85 @@
"Tags": ["argentum-pack", "story", "live", "easy"]
}
]
},
{
"Name": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_CHEESECAKE",
"Image": "images/challenges/categories/packcheesecake/tile.jpg",
"Icon": "challenge_category_feats",
"CategoryId": "cheesecake-pack",
"Description": "",
"OrderIndex": 10000,
"Challenges": [
{
"Id": "eff06c02-2410-4226-1abc-076a2e71ee97",
"Name": "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_CHONGQINGMARINATE_NAME",
"ImageName": "images/challenges/categories/packcheesecake/cheesecake_chongqingmarinate.jpg",
"Description": "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_CHONGQINGMARINATE_DESC",
"Rewards": {
"MasteryXP": 2000
},
"Drops": [],
"IsPlayable": true,
"IsLocked": false,
"HideProgression": false,
"CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_CHEESECAKE",
"Icon": "challenge_category_feats",
"LocationId": "LOCATION_PARENT_WET",
"ParentLocationId": "LOCATION_PARENT_WET",
"Type": "parentlocation",
"DifficultyLevels": [],
"OrderIndex": 100003,
"XpModifier": {},
"RuntimeType": "Hit",
"Definition": {
"Scope": "session",
"Context": { "PoisonedTargets": [] },
"States": {
"Start": {
"Kill": {
"Condition": {
"$and": [
{
"$eq": ["$Value.IsTarget", true]
},
{
"$eq": [
"$Value.KillClass",
"poison"
]
}
]
},
"Actions": {
"$pushunique": [
"PoisonedTargets",
"$Value.RepositoryId"
]
},
"Transition": "CheckDumpInOcean"
}
},
"CheckDumpInOcean": {
"DumpInOcean": {
"Condition": {
"$inarray": {
"in": "$.PoisonedTargets",
"?": {
"$eq": [
"$.#",
"$Value.RepositoryId"
]
}
}
},
"Transition": "Success"
}
}
}
},
"Tags": ["cheesecake-pack", "story", "live", "medium"]
}
]
}
]
}
110 changes: 110 additions & 0 deletions contractdata/DUBAI/_DUBAI_CHALLENGES.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4207,6 +4207,116 @@
}
}
]
},
{
"Name": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_CHEESECAKE",
"Image": "images/challenges/categories/packcheesecake/tile.jpg",
"Icon": "challenge_category_feats",
"CategoryId": "cheesecake-pack",
"Description": "",
"OrderIndex": 10000,
"Challenges": [
{
"Id": "c098a7cf-8c49-02ce-475e-20beaed99712",
"Name": "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_NAME",
"ImageName": "images/challenges/categories/packcheesecake/cheesecake_dubaipanpacify.jpg",
"Description": "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_DUBAIPANPACIFY_DESC",
"Rewards": {
"MasteryXP": 4000
},
"Drops": [],
"IsPlayable": true,
"IsLocked": false,
"HideProgression": false,
"CategoryName": "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_CHEESECAKE",
"Icon": "challenge_category_feats",
"LocationId": "LOCATION_PARENT_GOLDEN",
"ParentLocationId": "LOCATION_PARENT_GOLDEN",
"Type": "parentlocation",
"DifficultyLevels": [],
"OrderIndex": 100005,
"XpModifier": {},
"RuntimeType": "Hit",
"Definition": {
"Scope": "session",
"Constants": {
"Goal": 2
},
"Context": {
"PacifiedTargets": 0
},
"States": {
"Start": {
"setpieces": {
"Condition": {
"$eq": [
"$Value.RepositoryId",
"fbfa76d6-9f9b-40dd-869a-2b3fc2361ce5"
]
},
"Transition": "MeetingRoomLocked"
}
},
"MeetingRoomLocked": {
"Pacify": {
"Condition": {
"$and": [
{
"$or": [
{
"$eq": [
"$Value.RepositoryId",
"bd0689d6-07b4-4757-b8ee-cac19f1c9e16"
]
},
{
"$eq": [
"$Value.RepositoryId",
"9571d196-8d67-4d94-8dad-6e2d970d7a91"
]
}
]
},
{
"$eq": [
"$Value.KillItemRepositoryId",
"bce6ce09-6ead-4d72-8438-2c7780770e70"
]
}
]
},
"Actions": {
"$inc": "PacifiedTargets"
},
"Transition": "CheckCount"
}
},
"CheckCount": {
"-": [
{
"Condition": {
"$eq": [
"$.PacifiedTargets",
"$.Goal"
]
},
"Transition": "AwaitingContractEnd"
},
{
"Transition": "MeetingRoomLocked"
}
]
},
"AwaitingContractEnd": {
"ContractEnd": {
"Transition": "Success"
}
}
}
},
"Tags": ["cheesecake-pack", "story", "live", "medium"]
}
]
}
]
}
Loading

0 comments on commit b3d54c6

Please sign in to comment.