From bff0daf09687098755d42d9524c3607480796b33 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Mon, 29 Apr 2024 21:46:46 +0800 Subject: [PATCH] fix: adjust escalation yulania difficulty (#439) --- .../ESCALATION/YULANIA/YULANIA2.json | 72 +++++++++++++++++++ .../ESCALATION/YULANIA/YULANIA3.json | 71 ++++++++++++++++++ resources/locale.json | 16 ++++- 3 files changed, 157 insertions(+), 2 deletions(-) diff --git a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json index d380e4af..f447cea4 100644 --- a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json +++ b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA2.json @@ -272,6 +272,74 @@ } } } + }, + { + "_comment": "----- target 5: far bodyguard C -----", + "Id": "2599eb20-d012-f7fe-65c5-c42b0a2df6d8", + "Category": "primary", + "Type": "statemachine", + "ObjectiveType": "kill", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_YULANIA_TAR4" + }, + "TargetConditions": [ + { + "Type": "disguise", + "RepositoryId": "08022e2c-4954-4b63-b632-3ac50d018292", + "HardCondition": true + }, + { + "Type": "killmethod", + "HardCondition": true, + "KillMethod": "sniperrifle" + } + ], + "Definition": { + "Scope": "Hit", + "Context": { + "Targets": ["3b1bffed-bbcf-446e-8824-5855f9df7714"] + }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$and": [ + { + "$eq": [ + "$Value.RepositoryId", + "3b1bffed-bbcf-446e-8824-5855f9df7714" + ] + }, + { + "$eq": [ + "$Value.OutfitIsHitmanSuit", + true + ] + }, + { + "$eq": [ + "$Value.KillMethodBroad", + "sniperrifle" + ] + } + ] + }, + "Transition": "Success" + }, + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "3b1bffed-bbcf-446e-8824-5855f9df7714" + ] + }, + "Transition": "Failure" + } + ] + } + } + } } ], "Entrances": ["40e5cc64-9aba-4f1a-9d37-a2e558e118b6"], @@ -327,6 +395,10 @@ "Id": "d8578edf-8e56-8afc-4f8e-88bc9b7d659a", "IsNew": true }, + { + "Id": "2599eb20-d012-f7fe-65c5-c42b0a2df6d8", + "IsNew": true + }, { "Id": "5746a594-6f00-0b80-3e02-7397624515d4" }, diff --git a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json index 3ce771e4..79100520 100644 --- a/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json +++ b/contractdata/HAWKESBAY/ESCALATION/YULANIA/YULANIA3.json @@ -272,6 +272,74 @@ } } } + }, + { + "_comment": "----- target 5: far bodyguard C -----", + "Id": "2599eb20-d012-f7fe-65c5-c42b0a2df6d8", + "Category": "primary", + "Type": "statemachine", + "ObjectiveType": "kill", + "HUDTemplate": { + "display": "$loc UI_PEACOCK_YULANIA_TAR4" + }, + "TargetConditions": [ + { + "Type": "disguise", + "RepositoryId": "08022e2c-4954-4b63-b632-3ac50d018292", + "HardCondition": true + }, + { + "Type": "killmethod", + "HardCondition": true, + "KillMethod": "sniperrifle" + } + ], + "Definition": { + "Scope": "Hit", + "Context": { + "Targets": ["3b1bffed-bbcf-446e-8824-5855f9df7714"] + }, + "States": { + "Start": { + "Kill": [ + { + "Condition": { + "$and": [ + { + "$eq": [ + "$Value.RepositoryId", + "3b1bffed-bbcf-446e-8824-5855f9df7714" + ] + }, + { + "$eq": [ + "$Value.OutfitIsHitmanSuit", + true + ] + }, + { + "$eq": [ + "$Value.KillMethodBroad", + "sniperrifle" + ] + } + ] + }, + "Transition": "Success" + }, + { + "Condition": { + "$eq": [ + "$Value.RepositoryId", + "3b1bffed-bbcf-446e-8824-5855f9df7714" + ] + }, + "Transition": "Failure" + } + ] + } + } + } } ], "Entrances": ["40e5cc64-9aba-4f1a-9d37-a2e558e118b6"], @@ -329,6 +397,9 @@ { "Id": "d8578edf-8e56-8afc-4f8e-88bc9b7d659a" }, + { + "Id": "2599eb20-d012-f7fe-65c5-c42b0a2df6d8" + }, { "Id": "5746a594-6f00-0b80-3e02-7397624515d4" }, diff --git a/resources/locale.json b/resources/locale.json index 34eff123..88cb6bdf 100644 --- a/resources/locale.json +++ b/resources/locale.json @@ -251,6 +251,7 @@ "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit", + "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope", @@ -522,6 +523,7 @@ "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit", + "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope", @@ -792,6 +794,7 @@ "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit", + "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope", @@ -1068,6 +1071,7 @@ "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit", + "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope", @@ -1339,6 +1343,7 @@ "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit", + "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope", @@ -1609,6 +1614,7 @@ "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit", + "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope", @@ -1879,14 +1885,15 @@ "UI_PEACOCK_YULANIA_TAR1": "穿着战术潜水服，用狙击步枪消灭德怀特·奈", "UI_PEACOCK_YULANIA_TAR2": "穿着战术潜水服，用狙击步枪消灭朱利安·洛特里", "UI_PEACOCK_YULANIA_TAR3": "穿着战术潜水服，用狙击步枪消灭佩里·弗尔明", + "UI_PEACOCK_YULANIA_TAR4": "穿着战术潜水服，用狙击步枪消灭贾维斯·科雷", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "不得藏匿尸体", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "尸体不能被藏匿。一旦藏匿尸体，则任务立即失败。", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "单一视野", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_DESC": "你的默认狙击步枪已更改为耶格尔7隐蔽者。", "UI_MENU_PAGE_PROFILE_CHALLENGES_CATEGORY_PACK_CHEESECAKE": "屠夫乐事", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_WRAPPER_NAME": "美食的诱惑", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_WRAPPER_DESC": "完成全部屠夫乐事挑战。
  • 磨练菜刀技能
  • 骨头滋味如何？
  • 留待腌制
  • 火淬肉钩
  • 晚餐就绪！
    • ", - "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_SAPIENZACLEAVERKILL_NAME": "磨练菜刀技能", + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_WRAPPER_DESC": "完成全部屠夫乐事挑战。
  • 磨刀霍霍
  • 骨头滋味如何？
  • 留待腌制
  • 火淬肉钩
  • 晚餐就绪！
    • ", + "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_SAPIENZACLEAVERKILL_NAME": "磨刀霍霍", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_SAPIENZACLEAVERKILL_DESC": "
  • 在萨比恩撒伪装成厨房助手用切肉刀消灭一个目标。
  • 别被发现。
    • ", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_SANTAFORTUNABONEPACIFY_NAME": "骨头滋味如何？", "UI_PEACOCK_CHALLENGEPACK_CHEESECAKE_SANTAFORTUNABONEPACIFY_DESC": "
  • 在圣福耳图那用肉骨头制伏布莱尔·雷丁顿。
  • 完成任务。
    • ", @@ -2149,6 +2156,7 @@ "UI_PEACOCK_YULANIA_TAR1": "穿著戰術潛水衣使用狙擊步槍消滅德懷特·奈伊", "UI_PEACOCK_YULANIA_TAR2": "穿著戰術潛水衣使用狙擊步槍消滅朱利安·朗特里", "UI_PEACOCK_YULANIA_TAR3": "穿著戰術潛水服用狙擊步槍消滅佩里·菲爾明", + "UI_PEACOCK_YULANIA_TAR4": "穿著戰術潛水服用狙擊步槍消滅加韋斯·科里", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "不要隱藏屍體", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "屍體不得隱藏。 一旦隱藏屍體，任務就會失敗。", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "單一範圍", @@ -2419,6 +2427,7 @@ "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit", + "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope", @@ -2690,6 +2699,7 @@ "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit", + "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope", @@ -2919,6 +2929,7 @@ "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit", + "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope", @@ -3187,6 +3198,7 @@ "UI_PEACOCK_YULANIA_TAR1": "Eliminate Dwight Nye with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR2": "Eliminate Julian Rowntree with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_YULANIA_TAR3": "Eliminate Perry Firmin with Sniper Rifle in Tactical Wetsuit", + "UI_PEACOCK_YULANIA_TAR4": "Eliminate Jarvis Corey with Sniper Rifle in Tactical Wetsuit", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_NAME": "Do not hide the bodies", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_NOBODIESHIDDEN_DESC": "Bodies must not be hidden. Once you hide a body, you will fail the mission.", "UI_PEACOCK_GAMECHANGERS_NEWZEALAND_CHANGEWEAPON_NAME": "Single Scope",