From a8060c8c58ca87ae703bfcd78b673bc0244a5a63 Mon Sep 17 00:00:00 2001 From: GreenComfyTea Date: Tue, 5 Sep 2023 15:03:53 +0300 Subject: [PATCH] Rename "Dangos" to "Dango Skills" --- reframework/autorun/MHR_Overlay.lua | 6 +-- .../autorun/MHR_Overlay/Buffs/buffs.lua | 6 +-- .../Buffs/{dangos.lua => dango_skills.lua} | 50 +++++++++---------- .../autorun/MHR_Overlay/Misc/language.lua | 2 +- .../autorun/MHR_Overlay/Misc/player_info.lua | 6 +-- .../MHR_Overlay/UI/Modules/buff_UI.lua | 10 ++-- .../MHR_Overlay/UI/Modules/stats_UI.lua | 4 +- .../data/MHR Overlay/languages/en-us.json | 2 +- .../data/MHR Overlay/languages/ja-jp.json | 3 ++ .../data/MHR Overlay/languages/ko-kr.json | 3 ++ .../data/MHR Overlay/languages/ru-ru.json | 3 ++ .../data/MHR Overlay/languages/zh-cn.json | 3 ++ .../data/MHR Overlay/languages/zh-tw.json | 3 ++ 13 files changed, 58 insertions(+), 43 deletions(-) rename reframework/autorun/MHR_Overlay/Buffs/{dangos.lua => dango_skills.lua} (83%) diff --git a/reframework/autorun/MHR_Overlay.lua b/reframework/autorun/MHR_Overlay.lua index 0aa6567..eb592e4 100644 --- a/reframework/autorun/MHR_Overlay.lua +++ b/reframework/autorun/MHR_Overlay.lua @@ -49,7 +49,7 @@ local consumables = require("MHR_Overlay.Buffs.consumables"); local melody_effects = require("MHR_Overlay.Buffs.melody_effects"); local endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs"); local skills = require("MHR_Overlay.Buffs.skills"); -local dangos = require("MHR_Overlay.Buffs.dangos"); +local dango_skills = require("MHR_Overlay.Buffs.dango_skills"); local abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses"); local otomo_moves = require("MHR_Overlay.Buffs.otomo_moves"); local weapon_skills = require("MHR_Overlay.Buffs.weapon_skills"); @@ -132,7 +132,7 @@ consumables.init_dependencies(); melody_effects.init_dependencies(); endemic_life_buffs.init_dependencies(); skills.init_dependencies(); -dangos.init_dependencies(); +dango_skills.init_dependencies(); abnormal_statuses.init_dependencies(); otomo_moves.init_dependencies(); weapon_skills.init_dependencies(); @@ -210,7 +210,7 @@ consumables.init_module(); melody_effects.init_module(); endemic_life_buffs.init_module(); skills.init_module(); -dangos.init_module(); +dango_skills.init_module(); abnormal_statuses.init_module(); otomo_moves.init_module(); weapon_skills.init_module(); diff --git a/reframework/autorun/MHR_Overlay/Buffs/buffs.lua b/reframework/autorun/MHR_Overlay/Buffs/buffs.lua index ae902b3..e9aa294 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/buffs.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/buffs.lua @@ -13,7 +13,7 @@ local quest_status; local error_handler; local endemic_life_buffs; local skills; -local dangos; +local dango_skills; local abnormal_statuses; local otomo_moves; local weapon_skills; @@ -176,7 +176,7 @@ function this.update() if not is_player_lobby_base then skills.update(master_player, master_player_data, weapon_type); - dangos.update(master_player, master_player_data); + dango_skills.update(master_player, master_player_data); endemic_life_buffs.update(master_player, master_player_data); abnormal_statuses.update(master_player, master_player_data); weapon_skills.update(master_player, master_player_data, weapon_type); @@ -351,7 +351,7 @@ function this.init_dependencies() error_handler = require("MHR_Overlay.Misc.error_handler"); endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs"); skills = require("MHR_Overlay.Buffs.skills"); - dangos = require("MHR_Overlay.Buffs.dangos"); + dango_skills = require("MHR_Overlay.Buffs.dango_skills"); abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses"); otomo_moves = require("MHR_Overlay.Buffs.otomo_moves"); weapon_skills = require("MHR_Overlay.Buffs.weapon_skills"); diff --git a/reframework/autorun/MHR_Overlay/Buffs/dangos.lua b/reframework/autorun/MHR_Overlay/Buffs/dango_skills.lua similarity index 83% rename from reframework/autorun/MHR_Overlay/Buffs/dangos.lua rename to reframework/autorun/MHR_Overlay/Buffs/dango_skills.lua index 6366fb7..70b3513 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/dangos.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/dango_skills.lua @@ -116,7 +116,7 @@ local dango_ids = { this.is_dango_adrenaline_active = false; -local dangos_type_name = "dangos"; +local dango_skills_type_name = "dango_skills"; local dango_bulker_attack_up = 15; local previous_super_recovery_dango_timer = 0; @@ -177,7 +177,7 @@ local get_value_method = system_array_type_def:get_method("GetValue(System.Int32 function this.update(player, player_data) local item_parameter = get_ref_item_parameter_method:call(singletons.player_manager); if item_parameter == nil then - error_handler.report("dangos.update", "Failed to access Data: item_parameter"); + error_handler.report("dango_skills.update", "Failed to access Data: item_parameter"); return; end @@ -189,16 +189,16 @@ function this.update(player, player_data) this.update_dango_flyer(player); this.update_super_recovery_dango(player); - buffs.update_generic_buff(this.list, dangos_type_name, "dango_defender", this.get_dango_name, + buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_defender", this.get_dango_name, player_data, is_enable_kitchen_skill_048_reduce_method, nil, nil, nil, nil, true); - buffs.update_generic_buff(this.list, dangos_type_name, "dango_booster", this.get_dango_name, + buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_booster", this.get_dango_name, nil, nil, player_data, kitchen_skill_027_timer_field); - buffs.update_generic_buff(this.list, dangos_type_name, "dango_glutton", this.get_dango_name, + buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_glutton", this.get_dango_name, nil, nil, player_data, kitchen_skill_045_timer_field); - buffs.update_generic_buff(this.list, dangos_type_name, "dango_connector", this.get_dango_name, + buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_connector", this.get_dango_name, nil, nil, player_data, kitchen_skill_054_timer_field); end @@ -208,7 +208,7 @@ function this.update_dango_adrenaline() return; end - buffs.update_generic(this.list, dangos_type_name, "dango_adrenaline", this.get_dango_name); + buffs.update_generic(this.list, dango_skills_type_name, "dango_adrenaline", this.get_dango_name); end function this.update_dango_bulker(player_data) @@ -223,7 +223,7 @@ function this.update_dango_bulker(player_data) return; end - buffs.update_generic_buff(this.list, dangos_type_name, "dango_bulker", this.get_dango_name, nil, nil, player_data, atk_up_buff_second_timer_field); + buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_bulker", this.get_dango_name, nil, nil, player_data, atk_up_buff_second_timer_field); end function this.update_dango_insurance() @@ -295,7 +295,7 @@ function this.update_dango_insurance() return; end - buffs.update_generic(this.list, dangos_type_name, "dango_insurance", this.get_dango_name, 1); + buffs.update_generic(this.list, dango_skills_type_name, "dango_insurance", this.get_dango_name, 1); end function this.update_dango_insurance_defense_up(player_data) @@ -303,7 +303,7 @@ function this.update_dango_insurance_defense_up(player_data) local insurance_def_up_lv3 = kitchen_skill_insurance_def_up_lv3_field:get_data(player_data); if insurance_def_up_lv3 == nil then - error_handler.report("dangos.update_dango_insurance_defense_up", "Failed to access Data: insurance_def_up_lv3"); + error_handler.report("dango_skills.update_dango_insurance_defense_up", "Failed to access Data: insurance_def_up_lv3"); return; end @@ -311,7 +311,7 @@ function this.update_dango_insurance_defense_up(player_data) local insurance_def_up_lv4 = kitchen_skill_insurance_def_up_lv4_field:get_data(player_data); if insurance_def_up_lv4 == nil then - error_handler.report("dangos.update_dango_insurance_defense_up", "Failed to access Data: insurance_def_up_lv4"); + error_handler.report("dango_skills.update_dango_insurance_defense_up", "Failed to access Data: insurance_def_up_lv4"); return; end @@ -323,7 +323,7 @@ function this.update_dango_insurance_defense_up(player_data) level = 4; end - buffs.update_generic(this.list, dangos_type_name, "dango_insurance_defense_up", this.get_dango_name, level); + buffs.update_generic(this.list, dango_skills_type_name, "dango_insurance_defense_up", this.get_dango_name, level); end function this.update_dango_flyer(player) @@ -331,7 +331,7 @@ function this.update_dango_flyer(player) local is_kitchen_skill_wire_stop_regene = get_is_kitchen_skill_wire_stop_regene_method:call(player); if is_kitchen_skill_wire_stop_regene == nil then - error_handler.report("dangos.update_dango_flyer", "Failed to access Data: is_kitchen_skill_wire_stop_regene"); + error_handler.report("dango_skills.update_dango_flyer", "Failed to access Data: is_kitchen_skill_wire_stop_regene"); return; end @@ -339,7 +339,7 @@ function this.update_dango_flyer(player) local is_kitchen_skill_wire_stop_heal_spd = get_is_kitchen_skill_wire_stop_heal_spd_method:call(player); if is_kitchen_skill_wire_stop_heal_spd == nil then - error_handler.report("dangos.update_dango_flyer", "Failed to access Data: is_kitchen_skill_wire_stop_heal_spd"); + error_handler.report("dango_skills.update_dango_flyer", "Failed to access Data: is_kitchen_skill_wire_stop_heal_spd"); return; end @@ -351,11 +351,11 @@ function this.update_dango_flyer(player) level = 3; end - buffs.update_generic(this.list, dangos_type_name, "dango_flyer", this.get_dango_name, level); + buffs.update_generic(this.list, dango_skills_type_name, "dango_flyer", this.get_dango_name, level); end function this.update_dango_hunter(player_data) - local dango_hunter_buff = buffs.update_generic_buff(this.list, dangos_type_name, "dango_hunter", this.get_dango_name, + local dango_hunter_buff = buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_hunter", this.get_dango_name, nil, nil, player_data, kitchen_skill_051_atk_up_timer_field); if dango_hunter_buff then @@ -366,7 +366,7 @@ end function this.update_super_recovery_dango(player) local kitchen_skill_surume_regene_timer = get_kitchen_skill_surume_regene_timer_method:call(player); if kitchen_skill_surume_regene_timer == nil then - error_handler.report("dangos.update_super_recovery_dango", "Failed to access Data: kitchen_skill_surume_regene_timer"); + error_handler.report("dango_skills.update_super_recovery_dango", "Failed to access Data: kitchen_skill_surume_regene_timer"); return; end @@ -378,27 +378,27 @@ function this.update_super_recovery_dango(player) previous_super_recovery_dango_timer = kitchen_skill_surume_regene_timer; - buffs.update_generic(this.list, dangos_type_name, "super_recovery_dango", this.get_dango_name); + buffs.update_generic(this.list, dango_skills_type_name, "super_recovery_dango", this.get_dango_name); end function this.get_dango_name(dango_key) if dango_ids[dango_key] == nil then - local dango_name = language.current_language.dangos[dango_key]; - if dango_name == nil then + local dango_skill_name = language.current_language.dango_skills[dango_key]; + if dango_skill_name == nil then return dango_key; end - return dango_name; + return dango_skill_name; end - local dango_name = get_name_method:call(nil, dango_ids[dango_key]); - if dango_name == nil then - error_handler.report("dangos.get_dango_name", string.format("Failed to access Data: %s_name", dango_key)); + local dango_skill_name = get_name_method:call(nil, dango_ids[dango_key]); + if dango_skill_name == nil then + error_handler.report("dango_skills.get_dango_name", string.format("Failed to access Data: %s_name", dango_key)); return dango_key; end - return dango_name; + return dango_skill_name; end function this.init_dependencies() diff --git a/reframework/autorun/MHR_Overlay/Misc/language.lua b/reframework/autorun/MHR_Overlay/Misc/language.lua index c8bffbe..aa357be 100644 --- a/reframework/autorun/MHR_Overlay/Misc/language.lua +++ b/reframework/autorun/MHR_Overlay/Misc/language.lua @@ -217,7 +217,7 @@ this.default_language = { frenzy_overcome = "Frenzy Overcome" }, - dangos = { + dango_skills = { dango_insurance_defense_up = "Dango Insurance Defense Up" }, diff --git a/reframework/autorun/MHR_Overlay/Misc/player_info.lua b/reframework/autorun/MHR_Overlay/Misc/player_info.lua index e8c9a14..717b83e 100644 --- a/reframework/autorun/MHR_Overlay/Misc/player_info.lua +++ b/reframework/autorun/MHR_Overlay/Misc/player_info.lua @@ -8,7 +8,7 @@ local utils; local error_handler; local quest_status; local time; -local dangos; +local dango_skills; local sdk = sdk; local tostring = tostring; @@ -295,7 +295,7 @@ function this.update_dango_adrenaline(quest_player_base) return; end - dangos.is_dango_adrenaline_active = is_kitchen_skill_predicament_powerup; + dango_skills.is_dango_adrenaline_active = is_kitchen_skill_predicament_powerup; end function this.init_dependencies() @@ -312,7 +312,7 @@ function this.init_dependencies() error_handler = require("MHR_Overlay.Misc.error_handler"); quest_status = require("MHR_Overlay.Game_Handler.quest_status"); time = require("MHR_Overlay.Game_Handler.time"); - dangos = require("MHR_Overlay.Buffs.dangos"); + dango_skills = require("MHR_Overlay.Buffs.dango_skills"); end function this.init_module() diff --git a/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua b/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua index 3b097b1..433deaf 100644 --- a/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua +++ b/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua @@ -10,7 +10,7 @@ local screen; local utils; local error_handler; local skills; -local dangos; +local dango_skills; local abnormal_statuses; local otomo_moves; local weapon_skills; @@ -97,12 +97,12 @@ function this.update() ::continue4:: end - for key, dango_buff in pairs(dangos.list) do - if not dango_buff.is_active then + for key, dango_skill in pairs(dango_skills.list) do + if not dango_skill.is_active then goto continue5; end - table.insert(_displayed_buffs, dango_buff); + table.insert(_displayed_buffs, dango_skill); ::continue5:: end @@ -227,7 +227,7 @@ function this.init_dependencies() error_handler = require("MHR_Overlay.Misc.error_handler"); endemic_life_buff = require("MHR_Overlay.Buffs.endemic_life_buffs"); skills = require("MHR_Overlay.Buffs.skills"); - dangos = require("MHR_Overlay.Buffs.dangos"); + dango_skills = require("MHR_Overlay.Buffs.dango_skills"); abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses"); otomo_moves = require("MHR_Overlay.Buffs.otomo_moves"); weapon_skills = require("MHR_Overlay.Buffs.weapon_skills"); diff --git a/reframework/autorun/MHR_Overlay/UI/Modules/stats_UI.lua b/reframework/autorun/MHR_Overlay/UI/Modules/stats_UI.lua index 5dba800..d964215 100644 --- a/reframework/autorun/MHR_Overlay/UI/Modules/stats_UI.lua +++ b/reframework/autorun/MHR_Overlay/UI/Modules/stats_UI.lua @@ -10,7 +10,7 @@ local screen; local utils; local error_handler; local skills; -local dangos; +local dango_skills; local abnormal_statuses; local drawing; local player_info; @@ -308,7 +308,7 @@ function this.init_dependencies() error_handler = require("MHR_Overlay.Misc.error_handler"); endemic_life_buff = require("MHR_Overlay.Buffs.endemic_life_buffs"); skills = require("MHR_Overlay.Buffs.skills"); - dangos = require("MHR_Overlay.Buffs.dangos"); + dango_skills = require("MHR_Overlay.Buffs.dango_skills"); abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses"); drawing = require("MHR_Overlay.UI.drawing"); player_info = require("MHR_Overlay.Misc.player_info"); diff --git a/reframework/data/MHR Overlay/languages/en-us.json b/reframework/data/MHR Overlay/languages/en-us.json index 3f324e3..7ad9b02 100644 --- a/reframework/data/MHR Overlay/languages/en-us.json +++ b/reframework/data/MHR Overlay/languages/en-us.json @@ -363,7 +363,7 @@ "y": "Y", "z": "Z" }, - "dangos": { + "dango_skills": { "dango_insurance_defense_up": "Dango Insurance Defense Up" }, "font_name": "", diff --git a/reframework/data/MHR Overlay/languages/ja-jp.json b/reframework/data/MHR Overlay/languages/ja-jp.json index 752a86d..08a5b63 100644 --- a/reframework/data/MHR Overlay/languages/ja-jp.json +++ b/reframework/data/MHR Overlay/languages/ja-jp.json @@ -377,6 +377,9 @@ "y": "Y", "z": "Z" }, + "dango_skills": { + "dango_insurance_defense_up": "Dango Insurance Defense Up" + }, "dangos": { "dango_adrenaline": "Dango Adrenaline", "dango_bombardier": "Dango Bombardier", diff --git a/reframework/data/MHR Overlay/languages/ko-kr.json b/reframework/data/MHR Overlay/languages/ko-kr.json index 3a1a893..35d5355 100644 --- a/reframework/data/MHR Overlay/languages/ko-kr.json +++ b/reframework/data/MHR Overlay/languages/ko-kr.json @@ -378,6 +378,9 @@ "y": "Y", "z": "Z" }, + "dango_skills": { + "dango_insurance_defense_up": "Dango Insurance Defense Up" + }, "dangos": { "dango_adrenaline": "Dango Adrenaline", "dango_bombardier": "Dango Bombardier", diff --git a/reframework/data/MHR Overlay/languages/ru-ru.json b/reframework/data/MHR Overlay/languages/ru-ru.json index a2c59c6..2fcba10 100644 --- a/reframework/data/MHR Overlay/languages/ru-ru.json +++ b/reframework/data/MHR Overlay/languages/ru-ru.json @@ -378,6 +378,9 @@ "y": "Y", "z": "Z" }, + "dango_skills": { + "dango_insurance_defense_up": "Dango Insurance Defense Up" + }, "dangos": { "dango_adrenaline": "Dango Adrenaline", "dango_bombardier": "Dango Bombardier", diff --git a/reframework/data/MHR Overlay/languages/zh-cn.json b/reframework/data/MHR Overlay/languages/zh-cn.json index d23811f..ccc42dc 100644 --- a/reframework/data/MHR Overlay/languages/zh-cn.json +++ b/reframework/data/MHR Overlay/languages/zh-cn.json @@ -378,6 +378,9 @@ "y": "Y轴", "z": "Z轴" }, + "dango_skills": { + "dango_insurance_defense_up": "Dango Insurance Defense Up" + }, "dangos": { "dango_adrenaline": "Dango Adrenaline", "dango_bombardier": "Dango Bombardier", diff --git a/reframework/data/MHR Overlay/languages/zh-tw.json b/reframework/data/MHR Overlay/languages/zh-tw.json index a16e8b5..037f2f6 100644 --- a/reframework/data/MHR Overlay/languages/zh-tw.json +++ b/reframework/data/MHR Overlay/languages/zh-tw.json @@ -378,6 +378,9 @@ "y": "Y軸", "z": "Z軸" }, + "dango_skills": { + "dango_insurance_defense_up": "Dango Insurance Defense Up" + }, "dangos": { "dango_adrenaline": "Dango Adrenaline", "dango_bombardier": "Dango Bombardier",