Skip to content

feat(escalation): nian #557

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 7 commits into
base: master
Choose a base branch
from
Open

feat(escalation): nian #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
021eb69
work of frame
suanjiansalt Jan 29, 2025
94b1a8a
update
suanjiansalt Feb 1, 2025
3d2aac2
Merge remote-tracking branch 'upstream/master' into escalation-nian
suanjiansalt Feb 1, 2025
a414b81
makeup contents
suanjiansalt Feb 2, 2025
49c857e
fix minor codes
suanjiansalt Feb 2, 2025
1a328b7
cn translation
suanjiansalt Feb 2, 2025
68f3a50
no sick or blind
suanjiansalt Feb 4, 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
1 change: 1 addition & 0 deletions components/contracts/missionsInLocation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@ export const missionsInLocation = {
"5bb29a6b-7384-4641-944c-3540fa5cd8aa",
],
LOCATION_WET_RAT: [
"5d0668b9-665f-48a7-a72c-6f5614b350a2",
"07ffa72a-bbac-45ca-8c9f-b9c1b526153a",
"5121acde-313d-4517-ae70-6a54ca5d775a",
"494d97a6-9e31-45e0-9dae-f3793c731336",
Expand Down
54 changes: 54 additions & 0 deletions contractdata/CHONGQING/ESCALATION/NIAN/NIAN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"Data": {
"EnableSaving": false,
"Objectives": [],
"Bricks": [],
"VR": [
{
"Quality": "base",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/scenes/missions/wet/vr_overrides_rat.brick",
"assembly:/_pro/scenes/missions/Wet/vr_overrides_ps4perf.brick"
]
},
{
"Quality": "better",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/scenes/missions/wet/vr_overrides_rat.brick"
]
}
],
"GameChangers": [],
"GameChangerReferences": []
},
"Metadata": {
"Id": "5d0668b9-665f-48a7-a72c-6f5614b350a2",
"IsPublished": true,
"CreationTimestamp": "2021-01-12T12:24:16.194497Z",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"TileImage": "images/contracts/escalation/ContractEscalation_Wet_Nian.jpg",
"Title": "UI_PEACOCK_NIAN",
"Description": "UI_PEACOCK_ESCALATION_CHONGQING_DESC",
"CodeName_Hint": "Nian - Group",
"Location": "LOCATION_WET_RAT",
"RequiredUnlockable": "ACCESS_HIT_RAT",
"ScenePath": "assembly:/_pro/scenes/missions/wet/scene_rat_basic.entity",
"Type": "escalation",
"GroupDefinition": {
"Type": "escalation",
"Order": [
"466c0886-0ec6-4867-9077-5fdd2d1e40f0",
"4730bae6-39db-470f-b3b8-094efe982746",
"67359030-6871-4c71-85a6-c04b45419265"
]
},
"Entitlements": ["LOCATION_WET"],
"LastUpdate": "2023-03-30T11:20:23.763366Z",
"PublicId": "030245785347",
"Season": 0,
"OriginalSeason": 3
},
"UserData": {}
}
160 changes: 160 additions & 0 deletions contractdata/CHONGQING/ESCALATION/NIAN/NIAN1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
{
"Data": {
"EnableSaving": false,
"Objectives": [
{
"_comment": "serve dishes",
"Id": "6dcbf0c6-7d39-4265-9b2b-ecc115fb85d0",
"Type": "statemachine",
"ObjectiveType": "custom",
"Category": "Primary",
"Image": "images/contracts/escalation/contractescalation_wet_nian_obj_familymeal.jpg",
"BriefingName": "$loc UI_PEACOCK_NIAN_OBJ_FAMILYMEAL_NAME",
"BriefingText": "$loc UI_PEACOCK_NIAN_OBJ_FAMILYMEAL_DESC",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_NIAN_OBJ_FAMILYMEAL_DESC",
"iconType": 17
},
"ForceShowOnLoadingScreen": true,
"ShowInHud": true,
"Definition": {
"Scope": "hit",
"Context": {},
"States": {
"Start": {
"setpieces": {
"Condition": {
"$eq": [
"$Value.RepositoryId",
"bf6c5c71-86b8-4abb-aed9-63dbbf320c52"
]
},
"Transition": "MealMake"
}
},
"MealMake": {
"setpieces": {
"Condition": {
"$eq": [
"$Value.RepositoryId",
"3a2722a3-0458-4db7-aa4b-0440728e4db6"
]
},
"Transition": "Success"
}
}
}
}
},
{
"_comment": "visit neighbors",
"Id": "acecde5b-7fd9-4103-978a-5a89c1e251ef",
"Type": "statemachine",
"ObjectiveType": "custom",
"Category": "Primary",
"Image": "images/stashpoints/wet_agencypickup_apartment.jpg",
"BriefingName": "$loc UI_PEACOCK_NIAN_OBJ_VISITNEIGHBOR_NAME",
"BriefingText": "$loc UI_PEACOCK_NIAN_OBJ_VISITNEIGHBOR_DESC",
"HUDTemplate": {
"display": "$loc UI_PEACOCK_NIAN_OBJ_VISITNEIGHBOR_HUD"
},
"IsHidden": true,
"ForceShowOnLoadingScreen": true,
"ShowInHud": true,
"Definition": {
"Scope": "hit",
"Context": {
"Targets": [
"fc776f90-eda8-4aaf-83d9-bb069c3827ab",
"18324739-f01e-47f4-8c8b-c7f880805491"
],
"TargetsKilled": []
},
"States": {
"Start": {
"Kill": [
{
"Condition": {
"$any": {
"in": "$.Targets",
"?": {
"$eq": [
"$.#",
"$Value.RepositoryId"
]
}
}
},
"Actions": {
"$pushunique": [
"TargetsKilled",
"$Value.RepositoryId"
]
}
},
{
"Condition": {
"$eq": [
"($.Targets).Count",
"($.TargetsKilled).Count"
]
},
"Transition": "Success"
}
]
}
}
}
}
],
"Bricks": [],
"VR": [
{
"Quality": "base",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/scenes/missions/wet/vr_overrides_rat.brick",
"assembly:/_pro/scenes/missions/Wet/vr_overrides_ps4perf.brick"
]
},
{
"Quality": "better",
"Bricks": [
"assembly:/_pro/Scenes/Bricks/vr_setup.brick",
"assembly:/_pro/scenes/missions/wet/vr_overrides_rat.brick"
]
}
],
"GameChangers": [],
"GameChangerReferences": []
},
"Metadata": {
"Id": "466c0886-0ec6-4867-9077-5fdd2d1e40f0",
"IsPublished": true,
"CreationTimestamp": "2021-01-12T12:24:16.194497Z",
"CreatorUserId": "fadb923c-e6bb-4283-a537-eb4d1150262e",
"TileImage": "images/contracts/escalation/ContractEscalation_Wet_Nian.jpg",
"Title": "UI_PEACOCK_NIAN1",
"Description": "UI_PEACOCK_ESCALATION_CHONGQING_DESC",
"CodeName_Hint": "Nian Level 1",
"Location": "LOCATION_WET_RAT",
"RequiredUnlockable": "ACCESS_HIT_RAT",
"ScenePath": "assembly:/_pro/scenes/missions/wet/scene_rat_basic.entity",
"Type": "escalation",
"GroupObjectiveDisplayOrder": [
{
"Id": "6dcbf0c6-7d39-4265-9b2b-ecc115fb85d0"
},
{
"Id": "acecde5b-7fd9-4103-978a-5a89c1e251ef"
}
],
"InGroup": "5d0668b9-665f-48a7-a72c-6f5614b350a2",
"Entitlements": ["LOCATION_WET"],
"LastUpdate": "2023-03-30T11:20:23.763366Z",
"PublicId": "030245785347",
"Season": 0,
"OriginalSeason": 3
},
"UserData": {}
}
Loading