mirror of
https://github.com/GreenComfyTea/MHR-Overlay.git
synced 2026-01-24 04:18:11 -08:00
Weapon Skills: Add Arc Shot: Affinity and Arc Shot: Brace
This commit is contained in:
@@ -93,7 +93,9 @@ this.list = {
|
|||||||
all_extracts_mix = nil,
|
all_extracts_mix = nil,
|
||||||
-- Bow
|
-- Bow
|
||||||
herculean_draw = nil,
|
herculean_draw = nil,
|
||||||
bolt_boost = nil
|
bolt_boost = nil,
|
||||||
|
arc_shot_affinity = nil,
|
||||||
|
arc_shot_brace = nil
|
||||||
};
|
};
|
||||||
|
|
||||||
local weapon_skill_ids = {
|
local weapon_skill_ids = {
|
||||||
@@ -391,6 +393,11 @@ local wire_buff_attack_up_timer_field = bow_type_def:get_field("_WireBuffAttackU
|
|||||||
-- Bolt Boost
|
-- Bolt Boost
|
||||||
local wire_buff_arrow_up_timer_field = bow_type_def:get_field("_WireBuffArrowUpTimer");
|
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 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_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");
|
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);
|
this.update_insect_glaive_skills(player);
|
||||||
|
|
||||||
else
|
else
|
||||||
this.update_bow_skills(player);
|
this.update_bow_skills(player, player_data);
|
||||||
end
|
end
|
||||||
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);
|
buffs.update_generic(this.list, weapon_skills_type_name, extract_key, this.get_weapon_skill_name, 1, extractive_time, duration);
|
||||||
end
|
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);
|
local player_user_data_bow = get_ref_player_user_data_bow_method:call(player);
|
||||||
if player_user_data_bow == nil then
|
if player_user_data_bow == nil then
|
||||||
error_handler.report("weapon_skills.update_extract", "Failed to access Data: player_user_data_bow");
|
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, "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);
|
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
|
end
|
||||||
|
|
||||||
function this.update_bow_skill(player, bow_skill_key, timer_holder, player_user_data_bow, max_time_holder)
|
function this.update_bow_skill(player, bow_skill_key, timer_holder, player_user_data_bow, max_time_holder)
|
||||||
|
|||||||
@@ -277,7 +277,9 @@ this.default_language = {
|
|||||||
all_extracts_mix = "All Extracts Mix",
|
all_extracts_mix = "All Extracts Mix",
|
||||||
-- Bow
|
-- Bow
|
||||||
herculean_draw = "Herculean Draw",
|
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 = {
|
misc_buffs = {
|
||||||
@@ -305,7 +307,7 @@ this.default_language = {
|
|||||||
otomo = "Buddy",
|
otomo = "Buddy",
|
||||||
servant = "Follower",
|
servant = "Follower",
|
||||||
|
|
||||||
lv = "Lv."
|
lv = ""
|
||||||
},
|
},
|
||||||
|
|
||||||
customization_menu = {
|
customization_menu = {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"HP": "HP:",
|
"HP": "HP:",
|
||||||
"buildup": "Buildup:",
|
"buildup": "Buildup:",
|
||||||
"gold": "Gold",
|
"gold": "Gold",
|
||||||
"lv": "Lv.",
|
"lv": "",
|
||||||
"mini": "Mini",
|
"mini": "Mini",
|
||||||
"otomo": "Buddy",
|
"otomo": "Buddy",
|
||||||
"part_anomaly_core": "Anomaly Core",
|
"part_anomaly_core": "Anomaly Core",
|
||||||
@@ -446,7 +446,6 @@
|
|||||||
"skills": {
|
"skills": {
|
||||||
"dragon_conversion_elemental_attack_up": "Dragon Conversion Elem. Atk Up",
|
"dragon_conversion_elemental_attack_up": "Dragon Conversion Elem. Atk Up",
|
||||||
"dragon_conversion_elemental_res_up": "Dragon Conversion Elem. Res 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_blue": "Powder Mantle (Blue)",
|
||||||
"powder_mantle_red": "Powder Mantle (Red)"
|
"powder_mantle_red": "Powder Mantle (Red)"
|
||||||
},
|
},
|
||||||
@@ -472,6 +471,8 @@
|
|||||||
"weapon_skills": {
|
"weapon_skills": {
|
||||||
"all_extracts_mix": "All Extracts Mix",
|
"all_extracts_mix": "All Extracts Mix",
|
||||||
"amped_state": "Amped State",
|
"amped_state": "Amped State",
|
||||||
|
"arc_shot_affinity": "Arc Shot: Affinity",
|
||||||
|
"arc_shot_brace": "Arc Shot: Brace",
|
||||||
"archdemon_mode": "Archdemon Mode",
|
"archdemon_mode": "Archdemon Mode",
|
||||||
"axe_heavy_slam": "Axe: Heavy Slam",
|
"axe_heavy_slam": "Axe: Heavy Slam",
|
||||||
"element_boost": "Element Boost",
|
"element_boost": "Element Boost",
|
||||||
|
|||||||
@@ -609,6 +609,8 @@
|
|||||||
"all_extracts_mix": "All Extracts Mix",
|
"all_extracts_mix": "All Extracts Mix",
|
||||||
"amped_state": "Amped State",
|
"amped_state": "Amped State",
|
||||||
"anchor_rage": "Anchor Rage",
|
"anchor_rage": "Anchor Rage",
|
||||||
|
"arc_shot_affinity": "Arc Shot: Affinity",
|
||||||
|
"arc_shot_brace": "Arc Shot: Brace",
|
||||||
"archdemon_mode": "Archdemon Mode",
|
"archdemon_mode": "Archdemon Mode",
|
||||||
"axe_heavy_slam": "Axe: Heavy Slam",
|
"axe_heavy_slam": "Axe: Heavy Slam",
|
||||||
"bead_of_resonance": "Bead of Resonance",
|
"bead_of_resonance": "Bead of Resonance",
|
||||||
|
|||||||
@@ -610,6 +610,8 @@
|
|||||||
"all_extracts_mix": "All Extracts Mix",
|
"all_extracts_mix": "All Extracts Mix",
|
||||||
"amped_state": "Amped State",
|
"amped_state": "Amped State",
|
||||||
"anchor_rage": "Anchor Rage",
|
"anchor_rage": "Anchor Rage",
|
||||||
|
"arc_shot_affinity": "Arc Shot: Affinity",
|
||||||
|
"arc_shot_brace": "Arc Shot: Brace",
|
||||||
"archdemon_mode": "Archdemon Mode",
|
"archdemon_mode": "Archdemon Mode",
|
||||||
"axe_heavy_slam": "Axe: Heavy Slam",
|
"axe_heavy_slam": "Axe: Heavy Slam",
|
||||||
"bead_of_resonance": "Bead of Resonance",
|
"bead_of_resonance": "Bead of Resonance",
|
||||||
|
|||||||
@@ -606,6 +606,8 @@
|
|||||||
"all_extracts_mix": "All Extracts Mix",
|
"all_extracts_mix": "All Extracts Mix",
|
||||||
"amped_state": "Amped State",
|
"amped_state": "Amped State",
|
||||||
"anchor_rage": "Anchor Rage",
|
"anchor_rage": "Anchor Rage",
|
||||||
|
"arc_shot_affinity": "Arc Shot: Affinity",
|
||||||
|
"arc_shot_brace": "Arc Shot: Brace",
|
||||||
"archdemon_mode": "Archdemon Mode",
|
"archdemon_mode": "Archdemon Mode",
|
||||||
"axe_heavy_slam": "Axe: Heavy Slam",
|
"axe_heavy_slam": "Axe: Heavy Slam",
|
||||||
"bead_of_resonance": "Bead of Resonance",
|
"bead_of_resonance": "Bead of Resonance",
|
||||||
|
|||||||
@@ -610,6 +610,8 @@
|
|||||||
"all_extracts_mix": "All Extracts Mix",
|
"all_extracts_mix": "All Extracts Mix",
|
||||||
"amped_state": "Amped State",
|
"amped_state": "Amped State",
|
||||||
"anchor_rage": "Anchor Rage",
|
"anchor_rage": "Anchor Rage",
|
||||||
|
"arc_shot_affinity": "Arc Shot: Affinity",
|
||||||
|
"arc_shot_brace": "Arc Shot: Brace",
|
||||||
"archdemon_mode": "Archdemon Mode",
|
"archdemon_mode": "Archdemon Mode",
|
||||||
"axe_heavy_slam": "Axe: Heavy Slam",
|
"axe_heavy_slam": "Axe: Heavy Slam",
|
||||||
"bead_of_resonance": "Bead of Resonance",
|
"bead_of_resonance": "Bead of Resonance",
|
||||||
|
|||||||
@@ -610,6 +610,8 @@
|
|||||||
"all_extracts_mix": "All Extracts Mix",
|
"all_extracts_mix": "All Extracts Mix",
|
||||||
"amped_state": "Amped State",
|
"amped_state": "Amped State",
|
||||||
"anchor_rage": "Anchor Rage",
|
"anchor_rage": "Anchor Rage",
|
||||||
|
"arc_shot_affinity": "Arc Shot: Affinity",
|
||||||
|
"arc_shot_brace": "Arc Shot: Brace",
|
||||||
"archdemon_mode": "Archdemon Mode",
|
"archdemon_mode": "Archdemon Mode",
|
||||||
"axe_heavy_slam": "Axe: Heavy Slam",
|
"axe_heavy_slam": "Axe: Heavy Slam",
|
||||||
"bead_of_resonance": "Bead of Resonance",
|
"bead_of_resonance": "Bead of Resonance",
|
||||||
|
|||||||
Reference in New Issue
Block a user