romanmir/MHR-Overlay
1
0
Fork 0
mirror of https://github.com/GreenComfyTea/MHR-Overlay.git synced 2026-01-24 04:18:11 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename "Dangos" to "Dango Skills"

Browse Source
This commit is contained in:
GreenComfyTea
2023-09-05 15:03:53 +03:00
parent 49cac58bec
commit a8060c8c58
13 changed files with 58 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
reframework/autorun/MHR_Overlay.lua
View File

@@ -49,7 +49,7 @@ local consumables = require("MHR_Overlay.Buffs.consumables");
local melody_effects = require("MHR_Overlay.Buffs.melody_effects"); local melody_effects = require("MHR_Overlay.Buffs.melody_effects");
local endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs"); local endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs");
local skills = require("MHR_Overlay.Buffs.skills"); 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 abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses");
local otomo_moves = require("MHR_Overlay.Buffs.otomo_moves"); local otomo_moves = require("MHR_Overlay.Buffs.otomo_moves");
local weapon_skills = require("MHR_Overlay.Buffs.weapon_skills"); local weapon_skills = require("MHR_Overlay.Buffs.weapon_skills");
@@ -132,7 +132,7 @@ consumables.init_dependencies();
melody_effects.init_dependencies(); melody_effects.init_dependencies();
endemic_life_buffs.init_dependencies(); endemic_life_buffs.init_dependencies();
skills.init_dependencies(); skills.init_dependencies();
dangos.init_dependencies(); dango_skills.init_dependencies();
abnormal_statuses.init_dependencies(); abnormal_statuses.init_dependencies();
otomo_moves.init_dependencies(); otomo_moves.init_dependencies();
weapon_skills.init_dependencies(); weapon_skills.init_dependencies();
@@ -210,7 +210,7 @@ consumables.init_module();
melody_effects.init_module(); melody_effects.init_module();
endemic_life_buffs.init_module(); endemic_life_buffs.init_module();
skills.init_module(); skills.init_module();
dangos.init_module(); dango_skills.init_module();
abnormal_statuses.init_module(); abnormal_statuses.init_module();
otomo_moves.init_module(); otomo_moves.init_module();
weapon_skills.init_module(); weapon_skills.init_module();

6
reframework/autorun/MHR_Overlay/Buffs/buffs.lua
View File

@@ -13,7 +13,7 @@ local quest_status;
local error_handler; local error_handler;
local endemic_life_buffs; local endemic_life_buffs;
local skills; local skills;
local dangos; local dango_skills;
local abnormal_statuses; local abnormal_statuses;
local otomo_moves; local otomo_moves;
local weapon_skills; local weapon_skills;
@@ -176,7 +176,7 @@ function this.update()
if not is_player_lobby_base then if not is_player_lobby_base then
skills.update(master_player, master_player_data, weapon_type); 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); endemic_life_buffs.update(master_player, master_player_data);
abnormal_statuses.update(master_player, master_player_data); abnormal_statuses.update(master_player, master_player_data);
weapon_skills.update(master_player, master_player_data, weapon_type); 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"); error_handler = require("MHR_Overlay.Misc.error_handler");
endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs"); endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs");
skills = require("MHR_Overlay.Buffs.skills"); 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"); abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses");
otomo_moves = require("MHR_Overlay.Buffs.otomo_moves"); otomo_moves = require("MHR_Overlay.Buffs.otomo_moves");
weapon_skills = require("MHR_Overlay.Buffs.weapon_skills"); weapon_skills = require("MHR_Overlay.Buffs.weapon_skills");

50
reframework/autorun/MHR_Overlay/Buffs/dangos.lua → reframework/autorun/MHR_Overlay/Buffs/dango_skills.lua
View File

@@ -116,7 +116,7 @@ local dango_ids = {
this.is_dango_adrenaline_active = false; 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 dango_bulker_attack_up = 15;
local previous_super_recovery_dango_timer = 0; 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) function this.update(player, player_data)
local item_parameter = get_ref_item_parameter_method:call(singletons.player_manager); local item_parameter = get_ref_item_parameter_method:call(singletons.player_manager);
if item_parameter == nil then 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; return;
end end
@@ -189,16 +189,16 @@ function this.update(player, player_data)
this.update_dango_flyer(player); this.update_dango_flyer(player);
this.update_super_recovery_dango(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); 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); 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); 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); nil, nil, player_data, kitchen_skill_054_timer_field);
end end
@@ -208,7 +208,7 @@ function this.update_dango_adrenaline()
return; return;
end 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 end
function this.update_dango_bulker(player_data) function this.update_dango_bulker(player_data)
@@ -223,7 +223,7 @@ function this.update_dango_bulker(player_data)
return; return;
end 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 end
function this.update_dango_insurance() function this.update_dango_insurance()
@@ -295,7 +295,7 @@ function this.update_dango_insurance()
return; return;
end 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 end
function this.update_dango_insurance_defense_up(player_data) 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); local insurance_def_up_lv3 = kitchen_skill_insurance_def_up_lv3_field:get_data(player_data);
if insurance_def_up_lv3 == nil then 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; return;
end 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); local insurance_def_up_lv4 = kitchen_skill_insurance_def_up_lv4_field:get_data(player_data);
if insurance_def_up_lv4 == nil then 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; return;
end end
@@ -323,7 +323,7 @@ function this.update_dango_insurance_defense_up(player_data)
level = 4; level = 4;
end 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 end
function this.update_dango_flyer(player) 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); 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 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; return;
end 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); 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 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; return;
end end
@@ -351,11 +351,11 @@ function this.update_dango_flyer(player)
level = 3; level = 3;
end 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 end
function this.update_dango_hunter(player_data) 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); nil, nil, player_data, kitchen_skill_051_atk_up_timer_field);
if dango_hunter_buff then if dango_hunter_buff then
@@ -366,7 +366,7 @@ end
function this.update_super_recovery_dango(player) function this.update_super_recovery_dango(player)
local kitchen_skill_surume_regene_timer = get_kitchen_skill_surume_regene_timer_method:call(player); local kitchen_skill_surume_regene_timer = get_kitchen_skill_surume_regene_timer_method:call(player);
if kitchen_skill_surume_regene_timer == nil then 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; return;
end end
@@ -378,27 +378,27 @@ function this.update_super_recovery_dango(player)
previous_super_recovery_dango_timer = kitchen_skill_surume_regene_timer; 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 end
function this.get_dango_name(dango_key) function this.get_dango_name(dango_key)
if dango_ids[dango_key] == nil then if dango_ids[dango_key] == nil then
local dango_name = language.current_language.dangos[dango_key]; local dango_skill_name = language.current_language.dango_skills[dango_key];
if dango_name == nil then if dango_skill_name == nil then
return dango_key; return dango_key;
end end
return dango_name; return dango_skill_name;
end end
local dango_name = get_name_method:call(nil, dango_ids[dango_key]); local dango_skill_name = get_name_method:call(nil, dango_ids[dango_key]);
if dango_name == nil then if dango_skill_name == nil then
error_handler.report("dangos.get_dango_name", string.format("Failed to access Data: %s_name", dango_key)); error_handler.report("dango_skills.get_dango_name", string.format("Failed to access Data: %s_name", dango_key));
return dango_key; return dango_key;
end end
return dango_name; return dango_skill_name;
end end
function this.init_dependencies() function this.init_dependencies()

2
reframework/autorun/MHR_Overlay/Misc/language.lua
View File

@@ -217,7 +217,7 @@ this.default_language = {
frenzy_overcome = "Frenzy Overcome" frenzy_overcome = "Frenzy Overcome"
}, },
dangos = { dango_skills = {
dango_insurance_defense_up = "Dango Insurance Defense Up" dango_insurance_defense_up = "Dango Insurance Defense Up"
}, },

6
reframework/autorun/MHR_Overlay/Misc/player_info.lua
View File

@@ -8,7 +8,7 @@ local utils;
local error_handler; local error_handler;
local quest_status; local quest_status;
local time; local time;
local dangos; local dango_skills;
local sdk = sdk; local sdk = sdk;
local tostring = tostring; local tostring = tostring;
@@ -295,7 +295,7 @@ function this.update_dango_adrenaline(quest_player_base)
return; return;
end end
dangos.is_dango_adrenaline_active = is_kitchen_skill_predicament_powerup; dango_skills.is_dango_adrenaline_active = is_kitchen_skill_predicament_powerup;
end end
function this.init_dependencies() function this.init_dependencies()
@@ -312,7 +312,7 @@ function this.init_dependencies()
error_handler = require("MHR_Overlay.Misc.error_handler"); error_handler = require("MHR_Overlay.Misc.error_handler");
quest_status = require("MHR_Overlay.Game_Handler.quest_status"); quest_status = require("MHR_Overlay.Game_Handler.quest_status");
time = require("MHR_Overlay.Game_Handler.time"); time = require("MHR_Overlay.Game_Handler.time");
dangos = require("MHR_Overlay.Buffs.dangos"); dango_skills = require("MHR_Overlay.Buffs.dango_skills");
end end
function this.init_module() function this.init_module()

10
reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua
View File

@@ -10,7 +10,7 @@ local screen;
local utils; local utils;
local error_handler; local error_handler;
local skills; local skills;
local dangos; local dango_skills;
local abnormal_statuses; local abnormal_statuses;
local otomo_moves; local otomo_moves;
local weapon_skills; local weapon_skills;
@@ -97,12 +97,12 @@ function this.update()
::continue4:: ::continue4::
end end
for key, dango_buff in pairs(dangos.list) do for key, dango_skill in pairs(dango_skills.list) do
if not dango_buff.is_active then if not dango_skill.is_active then
goto continue5; goto continue5;
end end
table.insert(_displayed_buffs, dango_buff); table.insert(_displayed_buffs, dango_skill);
::continue5:: ::continue5::
end end
@@ -227,7 +227,7 @@ function this.init_dependencies()
error_handler = require("MHR_Overlay.Misc.error_handler"); error_handler = require("MHR_Overlay.Misc.error_handler");
endemic_life_buff = require("MHR_Overlay.Buffs.endemic_life_buffs"); endemic_life_buff = require("MHR_Overlay.Buffs.endemic_life_buffs");
skills = require("MHR_Overlay.Buffs.skills"); 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"); abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses");
otomo_moves = require("MHR_Overlay.Buffs.otomo_moves"); otomo_moves = require("MHR_Overlay.Buffs.otomo_moves");
weapon_skills = require("MHR_Overlay.Buffs.weapon_skills"); weapon_skills = require("MHR_Overlay.Buffs.weapon_skills");

4
reframework/autorun/MHR_Overlay/UI/Modules/stats_UI.lua
View File

@@ -10,7 +10,7 @@ local screen;
local utils; local utils;
local error_handler; local error_handler;
local skills; local skills;
local dangos; local dango_skills;
local abnormal_statuses; local abnormal_statuses;
local drawing; local drawing;
local player_info; local player_info;
@@ -308,7 +308,7 @@ function this.init_dependencies()
error_handler = require("MHR_Overlay.Misc.error_handler"); error_handler = require("MHR_Overlay.Misc.error_handler");
endemic_life_buff = require("MHR_Overlay.Buffs.endemic_life_buffs"); endemic_life_buff = require("MHR_Overlay.Buffs.endemic_life_buffs");
skills = require("MHR_Overlay.Buffs.skills"); 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"); abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses");
drawing = require("MHR_Overlay.UI.drawing"); drawing = require("MHR_Overlay.UI.drawing");
player_info = require("MHR_Overlay.Misc.player_info"); player_info = require("MHR_Overlay.Misc.player_info");

2
reframework/data/MHR Overlay/languages/en-us.json
View File

@@ -363,7 +363,7 @@
"y": "Y", "y": "Y",
"z": "Z" "z": "Z"
}, },
"dangos": { "dango_skills": {
"dango_insurance_defense_up": "Dango Insurance Defense Up" "dango_insurance_defense_up": "Dango Insurance Defense Up"
}, },
"font_name": "", "font_name": "",

3
reframework/data/MHR Overlay/languages/ja-jp.json
View File

@@ -377,6 +377,9 @@
"y": "Y", "y": "Y",
"z": "Z" "z": "Z"
}, },
"dango_skills": {
"dango_insurance_defense_up": "Dango Insurance Defense Up"
},
"dangos": { "dangos": {
"dango_adrenaline": "Dango Adrenaline", "dango_adrenaline": "Dango Adrenaline",
"dango_bombardier": "Dango Bombardier", "dango_bombardier": "Dango Bombardier",

3
reframework/data/MHR Overlay/languages/ko-kr.json
View File

@@ -378,6 +378,9 @@
"y": "Y", "y": "Y",
"z": "Z" "z": "Z"
}, },
"dango_skills": {
"dango_insurance_defense_up": "Dango Insurance Defense Up"
},
"dangos": { "dangos": {
"dango_adrenaline": "Dango Adrenaline", "dango_adrenaline": "Dango Adrenaline",
"dango_bombardier": "Dango Bombardier", "dango_bombardier": "Dango Bombardier",

3
reframework/data/MHR Overlay/languages/ru-ru.json
View File

@@ -378,6 +378,9 @@
"y": "Y", "y": "Y",
"z": "Z" "z": "Z"
}, },
"dango_skills": {
"dango_insurance_defense_up": "Dango Insurance Defense Up"
},
"dangos": { "dangos": {
"dango_adrenaline": "Dango Adrenaline", "dango_adrenaline": "Dango Adrenaline",
"dango_bombardier": "Dango Bombardier", "dango_bombardier": "Dango Bombardier",

3
reframework/data/MHR Overlay/languages/zh-cn.json
View File

@@ -378,6 +378,9 @@
"y": "Y轴", "y": "Y轴",
"z": "Z轴" "z": "Z轴"
}, },
"dango_skills": {
"dango_insurance_defense_up": "Dango Insurance Defense Up"
},
"dangos": { "dangos": {
"dango_adrenaline": "Dango Adrenaline", "dango_adrenaline": "Dango Adrenaline",
"dango_bombardier": "Dango Bombardier", "dango_bombardier": "Dango Bombardier",

3
reframework/data/MHR Overlay/languages/zh-tw.json
View File

@@ -378,6 +378,9 @@
"y": "Y軸", "y": "Y軸",
"z": "Z軸" "z": "Z軸"
}, },
"dango_skills": {
"dango_insurance_defense_up": "Dango Insurance Defense Up"
},
"dangos": { "dangos": {
"dango_adrenaline": "Dango Adrenaline", "dango_adrenaline": "Dango Adrenaline",
"dango_bombardier": "Dango Bombardier", "dango_bombardier": "Dango Bombardier",