diff --git a/reframework/autorun/MHR_Overlay/Buffs/weapon_skills.lua b/reframework/autorun/MHR_Overlay/Buffs/weapon_skills.lua index 76cf490..389087c 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/weapon_skills.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/weapon_skills.lua @@ -93,7 +93,9 @@ this.list = { all_extracts_mix = nil, -- Bow herculean_draw = nil, - bolt_boost = nil + bolt_boost = nil, + arc_shot_affinity = nil, + arc_shot_brace = nil }; local weapon_skill_ids = { @@ -391,6 +393,11 @@ local wire_buff_attack_up_timer_field = bow_type_def:get_field("_WireBuffAttackU -- Bolt Boost local wire_buff_arrow_up_timer_field = bow_type_def:get_field("_WireBuffArrowUpTimer"); +-- Arc Shot: Affinity +local crit_chance_bow_timer_field = player_data_type_def:get_field("_CritChanceUpBowTimer"); +-- Arc Shot: Brace +local super_armor_item_timer_field = player_data_type_def:get_field("_SuperArmorItemTimer"); + local player_user_data_bow_type_def = get_ref_player_user_data_bow_method:get_return_type(); local get_wire_buff_attack_up_time_method = player_user_data_bow_type_def:get_method("get_WireBuffAttackUpTime"); local get_arrow_up_time_method = player_user_data_bow_type_def:get_method("get_ArrowUpBufTime"); @@ -458,7 +465,7 @@ function this.update(player, player_data, weapon_type) this.update_insect_glaive_skills(player); else - this.update_bow_skills(player); + this.update_bow_skills(player, player_data); end end @@ -1155,7 +1162,7 @@ function this.update_extract(player, extract_key, time_holder, max_time_holder) buffs.update_generic(this.list, weapon_skills_type_name, extract_key, this.get_weapon_skill_name, 1, extractive_time, duration); end -function this.update_bow_skills(player) +function this.update_bow_skills(player, player_data) local player_user_data_bow = get_ref_player_user_data_bow_method:call(player); if player_user_data_bow == nil then error_handler.report("weapon_skills.update_extract", "Failed to access Data: player_user_data_bow"); @@ -1164,6 +1171,14 @@ function this.update_bow_skills(player) this.update_bow_skill(player, "herculean_draw", wire_buff_attack_up_timer_field, player_user_data_bow, get_wire_buff_attack_up_time_method); this.update_bow_skill(player, "bolt_boost", wire_buff_arrow_up_timer_field, player_user_data_bow, get_arrow_up_time_method); + + buffs.update_generic_buff(this.list, weapon_skills_type_name, "arc_shot_affinity", this.get_weapon_skill_name, + nil, nil, player_data, crit_chance_bow_timer_field); + + buffs.update_generic_buff(this.list, weapon_skills_type_name, "arc_shot_brace", this.get_weapon_skill_name, + nil, nil, player_data, super_armor_item_timer_field); + + end function this.update_bow_skill(player, bow_skill_key, timer_holder, player_user_data_bow, max_time_holder) diff --git a/reframework/autorun/MHR_Overlay/Misc/language.lua b/reframework/autorun/MHR_Overlay/Misc/language.lua index 4073989..c547457 100644 --- a/reframework/autorun/MHR_Overlay/Misc/language.lua +++ b/reframework/autorun/MHR_Overlay/Misc/language.lua @@ -277,7 +277,9 @@ this.default_language = { all_extracts_mix = "All Extracts Mix", -- Bow herculean_draw = "Herculean Draw", - --bolt_boost = "Bolt Boost" + --bolt_boost = "Bolt Boost", + arc_shot_affinity = "Arc Shot: Affinity", + arc_shot_brace = "Arc Shot: Brace", }, misc_buffs = { @@ -305,7 +307,7 @@ this.default_language = { otomo = "Buddy", servant = "Follower", - lv = "Lv." + lv = "" }, customization_menu = { diff --git a/reframework/data/MHR Overlay/languages/en-us.json b/reframework/data/MHR Overlay/languages/en-us.json index d794bab..ed6908f 100644 --- a/reframework/data/MHR Overlay/languages/en-us.json +++ b/reframework/data/MHR Overlay/languages/en-us.json @@ -3,7 +3,7 @@ "HP": "HP:", "buildup": "Buildup:", "gold": "Gold", - "lv": "Lv.", + "lv": "", "mini": "Mini", "otomo": "Buddy", "part_anomaly_core": "Anomaly Core", @@ -446,7 +446,6 @@ "skills": { "dragon_conversion_elemental_attack_up": "Dragon Conversion Elem. Atk Up", "dragon_conversion_elemental_res_up": "Dragon Conversion Elem. Res Up", - "kushala_daora_soul": "Kushala Daora Soul", "powder_mantle_blue": "Powder Mantle (Blue)", "powder_mantle_red": "Powder Mantle (Red)" }, @@ -472,6 +471,8 @@ "weapon_skills": { "all_extracts_mix": "All Extracts Mix", "amped_state": "Amped State", + "arc_shot_affinity": "Arc Shot: Affinity", + "arc_shot_brace": "Arc Shot: Brace", "archdemon_mode": "Archdemon Mode", "axe_heavy_slam": "Axe: Heavy Slam", "element_boost": "Element Boost", diff --git a/reframework/data/MHR Overlay/languages/ja-jp.json b/reframework/data/MHR Overlay/languages/ja-jp.json index df4a4a9..2774d7d 100644 --- a/reframework/data/MHR Overlay/languages/ja-jp.json +++ b/reframework/data/MHR Overlay/languages/ja-jp.json @@ -609,6 +609,8 @@ "all_extracts_mix": "All Extracts Mix", "amped_state": "Amped State", "anchor_rage": "Anchor Rage", + "arc_shot_affinity": "Arc Shot: Affinity", + "arc_shot_brace": "Arc Shot: Brace", "archdemon_mode": "Archdemon Mode", "axe_heavy_slam": "Axe: Heavy Slam", "bead_of_resonance": "Bead of Resonance", diff --git a/reframework/data/MHR Overlay/languages/ko-kr.json b/reframework/data/MHR Overlay/languages/ko-kr.json index 191d341..2802756 100644 --- a/reframework/data/MHR Overlay/languages/ko-kr.json +++ b/reframework/data/MHR Overlay/languages/ko-kr.json @@ -610,6 +610,8 @@ "all_extracts_mix": "All Extracts Mix", "amped_state": "Amped State", "anchor_rage": "Anchor Rage", + "arc_shot_affinity": "Arc Shot: Affinity", + "arc_shot_brace": "Arc Shot: Brace", "archdemon_mode": "Archdemon Mode", "axe_heavy_slam": "Axe: Heavy Slam", "bead_of_resonance": "Bead of Resonance", diff --git a/reframework/data/MHR Overlay/languages/ru-ru.json b/reframework/data/MHR Overlay/languages/ru-ru.json index e6d03c2..0cb912f 100644 --- a/reframework/data/MHR Overlay/languages/ru-ru.json +++ b/reframework/data/MHR Overlay/languages/ru-ru.json @@ -606,6 +606,8 @@ "all_extracts_mix": "All Extracts Mix", "amped_state": "Amped State", "anchor_rage": "Anchor Rage", + "arc_shot_affinity": "Arc Shot: Affinity", + "arc_shot_brace": "Arc Shot: Brace", "archdemon_mode": "Archdemon Mode", "axe_heavy_slam": "Axe: Heavy Slam", "bead_of_resonance": "Bead of Resonance", diff --git a/reframework/data/MHR Overlay/languages/zh-cn.json b/reframework/data/MHR Overlay/languages/zh-cn.json index 4ea0d1c..02a90e5 100644 --- a/reframework/data/MHR Overlay/languages/zh-cn.json +++ b/reframework/data/MHR Overlay/languages/zh-cn.json @@ -610,6 +610,8 @@ "all_extracts_mix": "All Extracts Mix", "amped_state": "Amped State", "anchor_rage": "Anchor Rage", + "arc_shot_affinity": "Arc Shot: Affinity", + "arc_shot_brace": "Arc Shot: Brace", "archdemon_mode": "Archdemon Mode", "axe_heavy_slam": "Axe: Heavy Slam", "bead_of_resonance": "Bead of Resonance", diff --git a/reframework/data/MHR Overlay/languages/zh-tw.json b/reframework/data/MHR Overlay/languages/zh-tw.json index d88a2a6..2801b2a 100644 --- a/reframework/data/MHR Overlay/languages/zh-tw.json +++ b/reframework/data/MHR Overlay/languages/zh-tw.json @@ -610,6 +610,8 @@ "all_extracts_mix": "All Extracts Mix", "amped_state": "Amped State", "anchor_rage": "Anchor Rage", + "arc_shot_affinity": "Arc Shot: Affinity", + "arc_shot_brace": "Arc Shot: Brace", "archdemon_mode": "Archdemon Mode", "axe_heavy_slam": "Axe: Heavy Slam", "bead_of_resonance": "Bead of Resonance",