From 1fcb9aea5a5eb529ac3058546cc21a13f1b8fd77 Mon Sep 17 00:00:00 2001 From: GreenComfyTea Date: Sun, 20 Aug 2023 13:26:09 +0300 Subject: [PATCH] Dangos: Add Dango Adrenaline, Fix Dango Defender --- .../autorun/MHR_Overlay/Buffs/dangos.lua | 257 ++++++++++++++++-- .../autorun/MHR_Overlay/Misc/language.lua | 56 +++- .../autorun/MHR_Overlay/Misc/player_info.lua | 33 ++- .../data/MHR Overlay/languages/en-us.json | 50 +++- .../data/MHR Overlay/languages/ja-jp.json | 50 +++- .../data/MHR Overlay/languages/ko-kr.json | 50 +++- .../data/MHR Overlay/languages/ru-ru.json | 50 +++- .../data/MHR Overlay/languages/zh-cn.json | 50 +++- .../data/MHR Overlay/languages/zh-tw.json | 50 +++- 9 files changed, 602 insertions(+), 44 deletions(-) diff --git a/reframework/autorun/MHR_Overlay/Buffs/dangos.lua b/reframework/autorun/MHR_Overlay/Buffs/dangos.lua index e58174d..6cb3fe2 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/dangos.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/dangos.lua @@ -43,61 +43,258 @@ local package = package; this.list = { dango_defender = nil, + dango_adrenaline = nil }; +this.is_dango_adrenaline_active = false; +local dango_defender_minimal_value = 200; + local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager"); local get_player_data_method = player_manager_type_def:get_method("get_PlayerData"); local get_ref_item_parameter_method = player_manager_type_def:get_method("get_RefItemParameter"); local player_user_data_item_parameter_type_def = get_ref_item_parameter_method:get_return_type(); -local demondrug_atk_up_field = player_user_data_item_parameter_type_def:get_field("_DemondrugAtkUp"); -local great_demondrug_atk_up_field = player_user_data_item_parameter_type_def:get_field("_GreatDemondrugAtkUp"); -local armorskin_def_up_field = player_user_data_item_parameter_type_def:get_field("_ArmorSkinDefUp"); -local great_armorskin_def_up_field = player_user_data_item_parameter_type_def:get_field("_GreatArmorSkinDefUp"); -local might_seed_timer_field = player_user_data_item_parameter_type_def:get_field("_MightSeedTimer"); -local adamant_seed_timer_field = player_user_data_item_parameter_type_def:get_field("_AdamantSeedTimer"); -local demondrug_powder_timer_field = player_user_data_item_parameter_type_def:get_field("_DemondrugPowderTimer"); -local armorskin_powder_timer_field = player_user_data_item_parameter_type_def:get_field("_ArmorSkinPowderTimer"); -local vitalizer_timer_const_field = player_user_data_item_parameter_type_def:get_field("_VitalizerTimer"); -local stamina_up_buff_second_field = player_user_data_item_parameter_type_def:get_field("_StaminaUpBuffSecond"); local player_data_type_def = sdk.find_type_definition("snow.player.PlayerData"); -- Dango Defender local kitchen_skill_048_field = player_data_type_def:get_field("_KitchenSkill048_Damage"); -function this.update(player_data) +local player_base_type_def = sdk.find_type_definition("snow.player.PlayerBase"); +-- Dango Adrenaline +local is_kitchen_skill_predicament_powerup_method = player_base_type_def:get_method("isKitchenSkillPredicamentPowerUp"); + +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"); return; end - --this.update_dango_defender(player_data, item_parameter); + this.update_generic_number_value_field("dango_defender", player_data, kitchen_skill_048_field, nil, true, dango_defender_minimal_value); + this.update_dango_adrenaline(); end --- Not working?? -function this.update_dango_defender(player_data, item_parameter) - local dango_defender_value = kitchen_skill_048_field:get_data(player_data); - if dango_defender_value == nil then - error_handler.report("dangos.update_dango_defender", "Failed to access Data: dango_defender_value"); + +function this.update_generic_timer(dango_key, timer_owner, timer_field, is_infinite) + if is_infinite == nil then is_infinite = false; end + + local timer = nil; + if timer_field ~= nil then + timer = timer_field:get_data(timer_owner); + if timer == nil then + error_handler.report("dangos.update_generic_timer", string.format("Failed to access Data: %s_timer", dango_key)); + return; + end + + if utils.number.is_equal(timer, 0) then + this.list[dango_key] = nil; + return; + end + + if is_infinite then + timer = nil; + else + timer = timer / 60; + end + end + + this.update_generic(dango_key, 1, timer); +end + +function this.update_generic_number_value_field(dango_key, timer_owner, value_field, timer_field, is_infinite, minimal_value) + if minimal_value == nil then minimal_value = 1; end + if is_infinite == nil then is_infinite = false; end + + local level = 1; + + if value_field ~= nil then + local value = value_field:get_data(timer_owner); + + if value == nil then + error_handler.report("dangos.update_generic_number_value_field", string.format("Failed to access Data: %s_value", dango_key)); + return; + end + + if value < minimal_value then + this.list[dango_key] = nil; + return; + end + end + + local timer = nil; + if timer_field ~= nil then + timer = timer_field:get_data(timer_owner); + if timer == nil then + error_handler.report("dangos.update_generic_number_value_field", string.format("Failed to access Data: %s_timer", dango_key)); + return; + end + + if value_field == nil and utils.number.is_equal(timer, 0) then + this.list[dango_key] = nil; + return; + end + + if is_infinite then + timer = nil; + else + timer = timer / 60; + end + end + + this.update_generic(dango_key, level, timer); +end + +function this.update_generic_boolean_value_field(dango_key, timer_owner, value_field, timer_field, is_infinite, minimal_value) + if minimal_value == nil then minimal_value = true; end + if is_infinite == nil then is_infinite = false; end + + if value_field ~= nil then + local value = value_field:get_data(timer_owner); + + if value == nil then + error_handler.report("dangos.update_generic_boolean_value_field", string.format("Failed to access Data: %s_value", dango_key)); + return; + end + + if value < minimal_value then + this.list[dango_key] = nil; + return; + end + end + + local timer = nil; + if timer_field ~= nil then + timer = timer_field:get_data(timer_owner); + if timer == nil then + error_handler.report("dangos.update_generic_boolean_value_field", string.format("Failed to access Data: %s_timer", dango_key)); + return; + end + + if value_field == nil and utils.number.is_equal(timer, 0) then + this.list[dango_key] = nil; + return; + end + + if is_infinite then + timer = nil; + else + timer = timer / 60; + end + end + + this.update_generic(dango_key, 1, timer); +end + +function this.update_generic_number_value_method(dango_key, timer_owner, value_method, timer_field, is_infinite, minimal_value) + if minimal_value == nil then minimal_value = 1; end + if is_infinite == nil then is_infinite = false; end + + local level = 1; + + if value_method ~= nil then + local value = value_method:call(timer_owner); + + if value == nil then + error_handler.report("dangos.update_generic_number_value_method", string.format("Failed to access Data: %s_value", dango_key)); + return; + end + + if value < minimal_value then + this.list[dango_key] = nil; + return; + end + end + + local timer = nil; + if timer_field ~= nil then + timer = timer_field:get_data(timer_owner); + if timer == nil then + error_handler.report("dangos.update_generic_number_value_method", string.format("Failed to access Data: %s_timer", dango_key)); + return; + end + + if value_method == nil and utils.number.is_equal(timer, 0) then + this.list[dango_key] = nil; + return; + end + + if is_infinite then + timer = nil; + else + timer = timer / 60; + end + end + + this.update_generic(dango_key, level, timer); +end + +function this.update_generic_boolean_value_method(dango_key, timer_owner, value_method, timer_field, is_infinite, minimal_value) + if minimal_value == nil then minimal_value = true; end + if is_infinite == nil then is_infinite = false; end + + if value_method ~= nil then + local value = value_method:call(timer_owner); + if value == nil then + error_handler.report("dangos.update_generic_boolean_value_method", string.format("Failed to access Data: %s_value", dango_key)); + return; + end + + if value ~= minimal_value then + this.list[dango_key] = nil; + return; + end + end + + local timer = nil; + if timer_field ~= nil then + timer = timer_field:get_data(timer_owner); + if timer == nil then + error_handler.report("dangos.update_generic_boolean_value_method", string.format("Failed to access Data: %s_timer", dango_key)); + return; + end + + if value_method == nil and utils.number.is_equal(timer, 0) then + this.list[dango_key] = nil; + return; + end + + if is_infinite then + timer = nil; + else + timer = timer / 60; + end + end + + this.update_generic(dango_key, 1, timer); +end + +function this.update_generic(dango_key, level, timer, duration) + duration = duration or timer; + + local dango = this.list[dango_key]; + if dango == nil then + local name = language.current_language.dangos[dango_key]; + + dango = buffs.new(buffs.types.dango, dango_key, name, level, duration); + this.list[dango_key] = dango; + else + dango.level = level; + + if timer ~= nil then + buffs.update_timer(dango, timer); + end + end +end + +function this.update_dango_adrenaline() + if not this.is_dango_adrenaline_active then + this.list.dango_adrenaline = nil; return; end - if dango_defender_value < 200 then - this.list.dango_defender = nil; - return; - end - - local buff = this.list.dango_defender; - if buff ~= nil then - return; - end - - local name = language.current_language.dangos.dango_defender_hi; - - this.list.dango_defender = buffs.new(buffs.types.dango, "dango_defender", name, 1); + this.update_generic("dango_adrenaline", 1); end function this.init_names() diff --git a/reframework/autorun/MHR_Overlay/Misc/language.lua b/reframework/autorun/MHR_Overlay/Misc/language.lua index f163a43..89505af 100644 --- a/reframework/autorun/MHR_Overlay/Misc/language.lua +++ b/reframework/autorun/MHR_Overlay/Misc/language.lua @@ -285,11 +285,63 @@ this.default_language = { resuscitate = "Resuscitate", maximum_might = "Maximum Might", bloodlust = "Bloodlust", - frenzied_bloodlust = "Frenzied Bloodlust" + frenzied_bloodlust = "Frenzied Bloodlust", + peak_performance = "Peak Performance", + dragonheart = "Dragonheart", + resentment = "Resentment" }, dangos = { - dango_defender_hi = "Dango Defender (Hi)" + dango_hurler = "Dango Hurler", + dango_specialist = "Dango Specialist", + dango_deflector = "Dango Deflector", + dango_bulker = "Dango Bulker", + dango_booster = "Dango Booster", + dango_slugger = "Dango Slugger", + dango_bombardier = "Dango Bombardier", + dango_temper = "Dango Temper", + dango_connector = "Dango Connector", + + dango_insurance = "Dango Insurance", + dango_defender_hi = "Dango Defender (Hi)", + dango_medic = "Dango Medic", + dango_medic_hi = "Dango Medic (Hi)", + dango_reviver = "Dango Reviver", + dango_immunizer = "Dango Immunizer", + dango_fire_res = "Dango Fire Res", + dango_water_res = "Dango Water Res", + dango_thunder_res = "Dango Thunder Res ", + dango_ice_res = "Dango Ice Res", + dango_dragon_res = "Dango Dragon Res", + dango_fire_res_hi = "Dango Fire Res (Hi)", + dango_water_res_hi = "Dango Water Res (Hi)", + dango_thunder_res_hi = "Dango Thunder Res (Hi)", + dango_ice_res_hi = "Dango Ice Res (Hi)", + dango_dragon_res_hi = "Dango Dragon Res (Hi)", + dango_moxie = "Dango Moxie", + dango_adrenaline = "Dango Adrenaline", + dango_defender = "Dango Defender", + dango_guard = "Dango Guard", + dango_driver = "Dango Driver", + + dango_polisher = "Dango Polisher", + dango_pyro = "Dango Pyro", + dango_feet = "Dango Feet", + dango_marksman = "Dango Marksman", + dango_wall_runner = "Dango Wall Runner", + dango_fighter = "Dango Fighter", + dango_glutton = "Dango Glutton", + dango_weakener = "Dango Weakener", + dango_rider = "Dango Rider", + dango_hunter = "Dango Hunter", + dango_shifter = "Dango Shifter", + super_recovery_dango = "Super Recovery Dango", + dango_flyer = "Dango Flyer" + + }, + + otomo_moves = { + rousing_roar = "Rousing Roar" }, UI = { diff --git a/reframework/autorun/MHR_Overlay/Misc/player_info.lua b/reframework/autorun/MHR_Overlay/Misc/player_info.lua index cd6bd1d..51f6b9a 100644 --- a/reframework/autorun/MHR_Overlay/Misc/player_info.lua +++ b/reframework/autorun/MHR_Overlay/Misc/player_info.lua @@ -8,6 +8,7 @@ local utils; local error_handler; local quest_status; local time; +local dangos; local sdk = sdk; local tostring = tostring; @@ -102,6 +103,10 @@ local player_quest_base_type_def = sdk.find_type_definition("snow.player.PlayerQ local player_quest_base_update_method = player_quest_base_type_def:get_method("update"); local is_master_player_method = player_quest_base_type_def:get_method("isMasterPlayer"); +local player_base_type_def = sdk.find_type_definition("snow.player.PlayerBase"); +-- Dango Adrenaline +local is_kitchen_skill_predicament_powerup_method = player_base_type_def:get_method("isKitchenSkillPredicamentPowerUp"); + local master_player_ref = nil; local master_player_data_ref = nil; @@ -255,17 +260,22 @@ function this.update_resistances(player_data) end end -function this.update_health(quest_player_base) - if quest_player_base ~= master_player_ref then - return; - end - +function this.on_pre_player_update(quest_player_base) if not should_health_update then return; end + + if quest_player_base ~= master_player_ref then + return; + end + + this.update_health(quest_player_base); + this.update_dango_adrenaline(quest_player_base); should_health_update = false; +end +function this.update_health(quest_player_base) local vital = get_vital_method:call(master_player_data_ref); if vital == nil then error_handler.report("player_info.update_health", "Failed to access Data: vital"); @@ -275,6 +285,16 @@ function this.update_health(quest_player_base) this.list.health = vital; end +function this.update_dango_adrenaline(quest_player_base) + local is_kitchen_skill_predicament_powerup = is_kitchen_skill_predicament_powerup_method:call(master_player_ref); + if is_kitchen_skill_predicament_powerup == nil then + error_handler.report("player_info.update_dango_adrenaline", "Failed to access Data: is_kitchen_skill_predicament_powerup"); + return; + end + + dangos.is_dango_adrenaline_active = is_kitchen_skill_predicament_powerup; +end + function this.init_dependencies() singletons = require("MHR_Overlay.Game_Handler.singletons"); customization_menu = require("MHR_Overlay.UI.customization_menu"); @@ -289,12 +309,13 @@ 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"); end function this.init_module() sdk.hook(player_quest_base_update_method, function(args) local quest_player_base = sdk.to_managed_object(args[2]); - this.update_health(quest_player_base); + this.on_pre_player_update(quest_player_base); end, function(retval) return retval; end); diff --git a/reframework/data/MHR Overlay/languages/en-us.json b/reframework/data/MHR Overlay/languages/en-us.json index 7bdd3b8..d69b4e4 100644 --- a/reframework/data/MHR Overlay/languages/en-us.json +++ b/reframework/data/MHR Overlay/languages/en-us.json @@ -376,7 +376,49 @@ "z": "Z" }, "dangos": { - "dango_defender_hi": "Dango Defender (Hi)" + "dango_adrenaline": "Dango Adrenaline", + "dango_bombardier": "Dango Bombardier", + "dango_booster": "Dango Booster", + "dango_bulker": "Dango Bulker", + "dango_connector": "Dango Connector", + "dango_defender": "Dango Defender", + "dango_defender_hi": "Dango Defender (Hi)", + "dango_deflector": "Dango Deflector", + "dango_dragon_res": "Dango Dragon Res", + "dango_dragon_res_hi": "Dango Dragon Res (Hi)", + "dango_driver": "Dango Driver", + "dango_feet": "Dango Feet", + "dango_fighter": "Dango Fighter", + "dango_fire_res": "Dango Fire Res", + "dango_fire_res_hi": "Dango Fire Res (Hi)", + "dango_flyer": "Dango Flyer", + "dango_glutton": "Dango Glutton", + "dango_guard": "Dango Guard", + "dango_hunter": "Dango Hunter", + "dango_hurler": "Dango Hurler", + "dango_ice_res": "Dango Ice Res", + "dango_ice_res_hi": "Dango Ice Res (Hi)", + "dango_immunizer": "Dango Immunizer", + "dango_insurance": "Dango Insurance", + "dango_marksman": "Dango Marksman", + "dango_medic": "Dango Medic", + "dango_medic_hi": "Dango Medic (Hi)", + "dango_moxie": "Dango Moxie", + "dango_polisher": "Dango Polisher", + "dango_pyro": "Dango Pyro", + "dango_reviver": "Dango Reviver", + "dango_rider": "Dango Rider", + "dango_shifter": "Dango Shifter", + "dango_slugger": "Dango Slugger", + "dango_specialist": "Dango Specialist", + "dango_temper": "Dango Temper", + "dango_thunder_res": "Dango Thunder Res ", + "dango_thunder_res_hi": "Dango Thunder Res (Hi)", + "dango_wall_runner": "Dango Wall Runner", + "dango_water_res": "Dango Water Res", + "dango_water_res_hi": "Dango Water Res (Hi)", + "dango_weakener": "Dango Weakener", + "super_recovery_dango": "Super Recovery Dango" }, "font_name": "", "melody_effects": { @@ -409,6 +451,9 @@ "tremors_negated": "Tremors Negated", "wind_pressure_negated": "Wind Pressure Negated" }, + "otomo_moves": { + "rousing_roar": "Rousing Roar" + }, "parts": { "abdomen": "Abdomen", "amatsu_unknown": "?", @@ -487,6 +532,7 @@ "coalescence": "Coalescence", "counterstrike": "Counterstrike", "dereliction": "Dereliction", + "dragonheart": "Dragonheart", "frenzied_bloodlust": "Frenzied Bloodlust", "furious": "Furious", "grinder_s": "Grinder (S)", @@ -498,7 +544,9 @@ "latent_power": "Latent Power", "maximum_might": "Maximum Might", "offensive_guard": "Offensive Guard", + "peak_performance": "Peak Performance", "protective_polish": "Protective Polish", + "resentment": "Resentment", "resuscitate": "Resuscitate", "wall_runner": "Wall Runner", "wind_mantle": "Wind Mantle" diff --git a/reframework/data/MHR Overlay/languages/ja-jp.json b/reframework/data/MHR Overlay/languages/ja-jp.json index 35cc33a..8cb62ca 100644 --- a/reframework/data/MHR Overlay/languages/ja-jp.json +++ b/reframework/data/MHR Overlay/languages/ja-jp.json @@ -377,7 +377,49 @@ "z": "Z" }, "dangos": { - "dango_defender_hi": "Dango Defender (Hi)" + "dango_adrenaline": "Dango Adrenaline", + "dango_bombardier": "Dango Bombardier", + "dango_booster": "Dango Booster", + "dango_bulker": "Dango Bulker", + "dango_connector": "Dango Connector", + "dango_defender": "Dango Defender", + "dango_defender_hi": "Dango Defender (Hi)", + "dango_deflector": "Dango Deflector", + "dango_dragon_res": "Dango Dragon Res", + "dango_dragon_res_hi": "Dango Dragon Res (Hi)", + "dango_driver": "Dango Driver", + "dango_feet": "Dango Feet", + "dango_fighter": "Dango Fighter", + "dango_fire_res": "Dango Fire Res", + "dango_fire_res_hi": "Dango Fire Res (Hi)", + "dango_flyer": "Dango Flyer", + "dango_glutton": "Dango Glutton", + "dango_guard": "Dango Guard", + "dango_hunter": "Dango Hunter", + "dango_hurler": "Dango Hurler", + "dango_ice_res": "Dango Ice Res", + "dango_ice_res_hi": "Dango Ice Res (Hi)", + "dango_immunizer": "Dango Immunizer", + "dango_insurance": "Dango Insurance", + "dango_marksman": "Dango Marksman", + "dango_medic": "Dango Medic", + "dango_medic_hi": "Dango Medic (Hi)", + "dango_moxie": "Dango Moxie", + "dango_polisher": "Dango Polisher", + "dango_pyro": "Dango Pyro", + "dango_reviver": "Dango Reviver", + "dango_rider": "Dango Rider", + "dango_shifter": "Dango Shifter", + "dango_slugger": "Dango Slugger", + "dango_specialist": "Dango Specialist", + "dango_temper": "Dango Temper", + "dango_thunder_res": "Dango Thunder Res ", + "dango_thunder_res_hi": "Dango Thunder Res (Hi)", + "dango_wall_runner": "Dango Wall Runner", + "dango_water_res": "Dango Water Res", + "dango_water_res_hi": "Dango Water Res (Hi)", + "dango_weakener": "Dango Weakener", + "super_recovery_dango": "Super Recovery Dango" }, "font_name": "NotoSansJP-Bold.otf", "melody_effects": { @@ -410,6 +452,9 @@ "tremors_negated": "Tremors Negated", "wind_pressure_negated": "Wind Pressure Negated" }, + "otomo_moves": { + "rousing_roar": "Rousing Roar" + }, "parts": { "abdomen": "腹部", "amatsu_unknown": "?", @@ -488,6 +533,7 @@ "coalescence": "Coalescence", "counterstrike": "Counterstrike", "dereliction": "Dereliction", + "dragonheart": "Dragonheart", "frenzied_bloodlust": "Frenzied Bloodlust", "furious": "Furious", "grinder_s": "Grinder (S)", @@ -499,7 +545,9 @@ "latent_power": "Latent Power", "maximum_might": "Maximum Might", "offensive_guard": "Offensive Guard", + "peak_performance": "Peak Performance", "protective_polish": "Protective Polish", + "resentment": "Resentment", "resuscitate": "Resuscitate", "wall_runner": "Wall Runner", "wind_mantle": "Wind Mantle" diff --git a/reframework/data/MHR Overlay/languages/ko-kr.json b/reframework/data/MHR Overlay/languages/ko-kr.json index 54420bb..9d71cf3 100644 --- a/reframework/data/MHR Overlay/languages/ko-kr.json +++ b/reframework/data/MHR Overlay/languages/ko-kr.json @@ -378,7 +378,49 @@ "z": "Z" }, "dangos": { - "dango_defender_hi": "Dango Defender (Hi)" + "dango_adrenaline": "Dango Adrenaline", + "dango_bombardier": "Dango Bombardier", + "dango_booster": "Dango Booster", + "dango_bulker": "Dango Bulker", + "dango_connector": "Dango Connector", + "dango_defender": "Dango Defender", + "dango_defender_hi": "Dango Defender (Hi)", + "dango_deflector": "Dango Deflector", + "dango_dragon_res": "Dango Dragon Res", + "dango_dragon_res_hi": "Dango Dragon Res (Hi)", + "dango_driver": "Dango Driver", + "dango_feet": "Dango Feet", + "dango_fighter": "Dango Fighter", + "dango_fire_res": "Dango Fire Res", + "dango_fire_res_hi": "Dango Fire Res (Hi)", + "dango_flyer": "Dango Flyer", + "dango_glutton": "Dango Glutton", + "dango_guard": "Dango Guard", + "dango_hunter": "Dango Hunter", + "dango_hurler": "Dango Hurler", + "dango_ice_res": "Dango Ice Res", + "dango_ice_res_hi": "Dango Ice Res (Hi)", + "dango_immunizer": "Dango Immunizer", + "dango_insurance": "Dango Insurance", + "dango_marksman": "Dango Marksman", + "dango_medic": "Dango Medic", + "dango_medic_hi": "Dango Medic (Hi)", + "dango_moxie": "Dango Moxie", + "dango_polisher": "Dango Polisher", + "dango_pyro": "Dango Pyro", + "dango_reviver": "Dango Reviver", + "dango_rider": "Dango Rider", + "dango_shifter": "Dango Shifter", + "dango_slugger": "Dango Slugger", + "dango_specialist": "Dango Specialist", + "dango_temper": "Dango Temper", + "dango_thunder_res": "Dango Thunder Res ", + "dango_thunder_res_hi": "Dango Thunder Res (Hi)", + "dango_wall_runner": "Dango Wall Runner", + "dango_water_res": "Dango Water Res", + "dango_water_res_hi": "Dango Water Res (Hi)", + "dango_weakener": "Dango Weakener", + "super_recovery_dango": "Super Recovery Dango" }, "font_name": "NotoSansKR-Bold.otf", "melody_effects": { @@ -411,6 +453,9 @@ "tremors_negated": "Tremors Negated", "wind_pressure_negated": "Wind Pressure Negated" }, + "otomo_moves": { + "rousing_roar": "Rousing Roar" + }, "parts": { "abdomen": "배", "amatsu_unknown": "?", @@ -489,6 +534,7 @@ "coalescence": "Coalescence", "counterstrike": "Counterstrike", "dereliction": "Dereliction", + "dragonheart": "Dragonheart", "frenzied_bloodlust": "Frenzied Bloodlust", "furious": "Furious", "grinder_s": "Grinder (S)", @@ -500,7 +546,9 @@ "latent_power": "Latent Power", "maximum_might": "Maximum Might", "offensive_guard": "Offensive Guard", + "peak_performance": "Peak Performance", "protective_polish": "Protective Polish", + "resentment": "Resentment", "resuscitate": "Resuscitate", "wall_runner": "Wall Runner", "wind_mantle": "Wind Mantle" diff --git a/reframework/data/MHR Overlay/languages/ru-ru.json b/reframework/data/MHR Overlay/languages/ru-ru.json index c3f1ab0..c9d6917 100644 --- a/reframework/data/MHR Overlay/languages/ru-ru.json +++ b/reframework/data/MHR Overlay/languages/ru-ru.json @@ -378,7 +378,49 @@ "z": "Z" }, "dangos": { - "dango_defender_hi": "Dango Defender (Hi)" + "dango_adrenaline": "Dango Adrenaline", + "dango_bombardier": "Dango Bombardier", + "dango_booster": "Dango Booster", + "dango_bulker": "Dango Bulker", + "dango_connector": "Dango Connector", + "dango_defender": "Dango Defender", + "dango_defender_hi": "Dango Defender (Hi)", + "dango_deflector": "Dango Deflector", + "dango_dragon_res": "Dango Dragon Res", + "dango_dragon_res_hi": "Dango Dragon Res (Hi)", + "dango_driver": "Dango Driver", + "dango_feet": "Dango Feet", + "dango_fighter": "Dango Fighter", + "dango_fire_res": "Dango Fire Res", + "dango_fire_res_hi": "Dango Fire Res (Hi)", + "dango_flyer": "Dango Flyer", + "dango_glutton": "Dango Glutton", + "dango_guard": "Dango Guard", + "dango_hunter": "Dango Hunter", + "dango_hurler": "Dango Hurler", + "dango_ice_res": "Dango Ice Res", + "dango_ice_res_hi": "Dango Ice Res (Hi)", + "dango_immunizer": "Dango Immunizer", + "dango_insurance": "Dango Insurance", + "dango_marksman": "Dango Marksman", + "dango_medic": "Dango Medic", + "dango_medic_hi": "Dango Medic (Hi)", + "dango_moxie": "Dango Moxie", + "dango_polisher": "Dango Polisher", + "dango_pyro": "Dango Pyro", + "dango_reviver": "Dango Reviver", + "dango_rider": "Dango Rider", + "dango_shifter": "Dango Shifter", + "dango_slugger": "Dango Slugger", + "dango_specialist": "Dango Specialist", + "dango_temper": "Dango Temper", + "dango_thunder_res": "Dango Thunder Res ", + "dango_thunder_res_hi": "Dango Thunder Res (Hi)", + "dango_wall_runner": "Dango Wall Runner", + "dango_water_res": "Dango Water Res", + "dango_water_res_hi": "Dango Water Res (Hi)", + "dango_weakener": "Dango Weakener", + "super_recovery_dango": "Super Recovery Dango" }, "font_name": "NotoSansKR-Bold.otf", "melody_effects": { @@ -411,6 +453,9 @@ "tremors_negated": "Tremors Negated", "wind_pressure_negated": "Wind Pressure Negated" }, + "otomo_moves": { + "rousing_roar": "Rousing Roar" + }, "parts": { "abdomen": "Брюхо", "amatsu_unknown": "?", @@ -489,6 +534,7 @@ "coalescence": "Coalescence", "counterstrike": "Counterstrike", "dereliction": "Dereliction", + "dragonheart": "Dragonheart", "frenzied_bloodlust": "Frenzied Bloodlust", "furious": "Furious", "grinder_s": "Grinder (S)", @@ -500,7 +546,9 @@ "latent_power": "Latent Power", "maximum_might": "Maximum Might", "offensive_guard": "Offensive Guard", + "peak_performance": "Peak Performance", "protective_polish": "Protective Polish", + "resentment": "Resentment", "resuscitate": "Resuscitate", "wall_runner": "Wall Runner", "wind_mantle": "Wind Mantle" diff --git a/reframework/data/MHR Overlay/languages/zh-cn.json b/reframework/data/MHR Overlay/languages/zh-cn.json index 1420d05..1318b04 100644 --- a/reframework/data/MHR Overlay/languages/zh-cn.json +++ b/reframework/data/MHR Overlay/languages/zh-cn.json @@ -378,7 +378,49 @@ "z": "Z轴" }, "dangos": { - "dango_defender_hi": "Dango Defender (Hi)" + "dango_adrenaline": "Dango Adrenaline", + "dango_bombardier": "Dango Bombardier", + "dango_booster": "Dango Booster", + "dango_bulker": "Dango Bulker", + "dango_connector": "Dango Connector", + "dango_defender": "Dango Defender", + "dango_defender_hi": "Dango Defender (Hi)", + "dango_deflector": "Dango Deflector", + "dango_dragon_res": "Dango Dragon Res", + "dango_dragon_res_hi": "Dango Dragon Res (Hi)", + "dango_driver": "Dango Driver", + "dango_feet": "Dango Feet", + "dango_fighter": "Dango Fighter", + "dango_fire_res": "Dango Fire Res", + "dango_fire_res_hi": "Dango Fire Res (Hi)", + "dango_flyer": "Dango Flyer", + "dango_glutton": "Dango Glutton", + "dango_guard": "Dango Guard", + "dango_hunter": "Dango Hunter", + "dango_hurler": "Dango Hurler", + "dango_ice_res": "Dango Ice Res", + "dango_ice_res_hi": "Dango Ice Res (Hi)", + "dango_immunizer": "Dango Immunizer", + "dango_insurance": "Dango Insurance", + "dango_marksman": "Dango Marksman", + "dango_medic": "Dango Medic", + "dango_medic_hi": "Dango Medic (Hi)", + "dango_moxie": "Dango Moxie", + "dango_polisher": "Dango Polisher", + "dango_pyro": "Dango Pyro", + "dango_reviver": "Dango Reviver", + "dango_rider": "Dango Rider", + "dango_shifter": "Dango Shifter", + "dango_slugger": "Dango Slugger", + "dango_specialist": "Dango Specialist", + "dango_temper": "Dango Temper", + "dango_thunder_res": "Dango Thunder Res ", + "dango_thunder_res_hi": "Dango Thunder Res (Hi)", + "dango_wall_runner": "Dango Wall Runner", + "dango_water_res": "Dango Water Res", + "dango_water_res_hi": "Dango Water Res (Hi)", + "dango_weakener": "Dango Weakener", + "super_recovery_dango": "Super Recovery Dango" }, "font_name": "NotoSansSC-Bold.otf", "melody_effects": { @@ -411,6 +453,9 @@ "tremors_negated": "Tremors Negated", "wind_pressure_negated": "Wind Pressure Negated" }, + "otomo_moves": { + "rousing_roar": "Rousing Roar" + }, "parts": { "abdomen": "腹部", "amatsu_unknown": "?", @@ -489,6 +534,7 @@ "coalescence": "Coalescence", "counterstrike": "Counterstrike", "dereliction": "Dereliction", + "dragonheart": "Dragonheart", "frenzied_bloodlust": "Frenzied Bloodlust", "furious": "Furious", "grinder_s": "Grinder (S)", @@ -500,7 +546,9 @@ "latent_power": "Latent Power", "maximum_might": "Maximum Might", "offensive_guard": "Offensive Guard", + "peak_performance": "Peak Performance", "protective_polish": "Protective Polish", + "resentment": "Resentment", "resuscitate": "Resuscitate", "wall_runner": "Wall Runner", "wind_mantle": "Wind Mantle" diff --git a/reframework/data/MHR Overlay/languages/zh-tw.json b/reframework/data/MHR Overlay/languages/zh-tw.json index a9d29fe..eee7a1b 100644 --- a/reframework/data/MHR Overlay/languages/zh-tw.json +++ b/reframework/data/MHR Overlay/languages/zh-tw.json @@ -378,7 +378,49 @@ "z": "Z軸" }, "dangos": { - "dango_defender_hi": "Dango Defender (Hi)" + "dango_adrenaline": "Dango Adrenaline", + "dango_bombardier": "Dango Bombardier", + "dango_booster": "Dango Booster", + "dango_bulker": "Dango Bulker", + "dango_connector": "Dango Connector", + "dango_defender": "Dango Defender", + "dango_defender_hi": "Dango Defender (Hi)", + "dango_deflector": "Dango Deflector", + "dango_dragon_res": "Dango Dragon Res", + "dango_dragon_res_hi": "Dango Dragon Res (Hi)", + "dango_driver": "Dango Driver", + "dango_feet": "Dango Feet", + "dango_fighter": "Dango Fighter", + "dango_fire_res": "Dango Fire Res", + "dango_fire_res_hi": "Dango Fire Res (Hi)", + "dango_flyer": "Dango Flyer", + "dango_glutton": "Dango Glutton", + "dango_guard": "Dango Guard", + "dango_hunter": "Dango Hunter", + "dango_hurler": "Dango Hurler", + "dango_ice_res": "Dango Ice Res", + "dango_ice_res_hi": "Dango Ice Res (Hi)", + "dango_immunizer": "Dango Immunizer", + "dango_insurance": "Dango Insurance", + "dango_marksman": "Dango Marksman", + "dango_medic": "Dango Medic", + "dango_medic_hi": "Dango Medic (Hi)", + "dango_moxie": "Dango Moxie", + "dango_polisher": "Dango Polisher", + "dango_pyro": "Dango Pyro", + "dango_reviver": "Dango Reviver", + "dango_rider": "Dango Rider", + "dango_shifter": "Dango Shifter", + "dango_slugger": "Dango Slugger", + "dango_specialist": "Dango Specialist", + "dango_temper": "Dango Temper", + "dango_thunder_res": "Dango Thunder Res ", + "dango_thunder_res_hi": "Dango Thunder Res (Hi)", + "dango_wall_runner": "Dango Wall Runner", + "dango_water_res": "Dango Water Res", + "dango_water_res_hi": "Dango Water Res (Hi)", + "dango_weakener": "Dango Weakener", + "super_recovery_dango": "Super Recovery Dango" }, "font_name": "NotoSansTC-Bold.otf", "melody_effects": { @@ -411,6 +453,9 @@ "tremors_negated": "Tremors Negated", "wind_pressure_negated": "Wind Pressure Negated" }, + "otomo_moves": { + "rousing_roar": "Rousing Roar" + }, "parts": { "abdomen": "腹部", "amatsu_unknown": "?", @@ -489,6 +534,7 @@ "coalescence": "Coalescence", "counterstrike": "Counterstrike", "dereliction": "Dereliction", + "dragonheart": "Dragonheart", "frenzied_bloodlust": "Frenzied Bloodlust", "furious": "Furious", "grinder_s": "Grinder (S)", @@ -500,7 +546,9 @@ "latent_power": "Latent Power", "maximum_might": "Maximum Might", "offensive_guard": "Offensive Guard", + "peak_performance": "Peak Performance", "protective_polish": "Protective Polish", + "resentment": "Resentment", "resuscitate": "Resuscitate", "wall_runner": "Wall Runner", "wind_mantle": "Wind Mantle"