From 084dd9667e9050f93b7846f1c53b42804b1247ce Mon Sep 17 00:00:00 2001 From: GreenComfyTea Date: Thu, 10 Aug 2023 16:52:47 +0300 Subject: [PATCH] Abnormal Statuses: Implemented --- reframework/autorun/MHR_Overlay.lua | 3 + .../MHR_Overlay/Buffs/abnormal_statuses.lua | 308 ++++++++++++++++++ .../autorun/MHR_Overlay/Buffs/buffs.lua | 12 +- .../MHR_Overlay/Damage_Meter/damage_hook.lua | 2 +- .../autorun/MHR_Overlay/Misc/language.lua | 31 +- .../MHR_Overlay/Monsters/ailment_hook.lua | 1 - .../MHR_Overlay/UI/Modules/buff_UI.lua | 13 + .../data/MHR Overlay/languages/en-us.json | 23 +- .../data/MHR Overlay/languages/ja-jp.json | 23 +- .../data/MHR Overlay/languages/ko-kr.json | 23 +- .../data/MHR Overlay/languages/ru-ru.json | 23 +- .../data/MHR Overlay/languages/zh-cn.json | 23 +- .../data/MHR Overlay/languages/zh-tw.json | 23 +- 13 files changed, 496 insertions(+), 12 deletions(-) create mode 100644 reframework/autorun/MHR_Overlay/Buffs/abnormal_statuses.lua diff --git a/reframework/autorun/MHR_Overlay.lua b/reframework/autorun/MHR_Overlay.lua index 405cecd..1c41ed2 100644 --- a/reframework/autorun/MHR_Overlay.lua +++ b/reframework/autorun/MHR_Overlay.lua @@ -48,6 +48,7 @@ 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 abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses"); local players = require("MHR_Overlay.Damage_Meter.players"); local non_players = require("MHR_Overlay.Damage_Meter.non_players"); @@ -124,6 +125,7 @@ melody_effects.init_dependencies(); endemic_life_buffs.init_dependencies(); skills.init_dependencies(); dangos.init_dependencies(); +abnormal_statuses.init_dependencies(); damage_hook.init_dependencies(); players.init_dependencies(); @@ -195,6 +197,7 @@ melody_effects.init_module(); endemic_life_buffs.init_module(); skills.init_module(); dangos.init_module(); +abnormal_statuses.init_module(); damage_hook.init_module(); players.init_module(); diff --git a/reframework/autorun/MHR_Overlay/Buffs/abnormal_statuses.lua b/reframework/autorun/MHR_Overlay/Buffs/abnormal_statuses.lua new file mode 100644 index 0000000..b691257 --- /dev/null +++ b/reframework/autorun/MHR_Overlay/Buffs/abnormal_statuses.lua @@ -0,0 +1,308 @@ +local this = {}; + +local buffs; +local buff_UI_entity; +local config; +local singletons; +local players; +local utils; +local language; +local error_handler; + +local sdk = sdk; +local tostring = tostring; +local pairs = pairs; +local ipairs = ipairs; +local tonumber = tonumber; +local require = require; +local pcall = pcall; +local table = table; +local string = string; +local Vector3f = Vector3f; +local d2d = d2d; +local math = math; +local json = json; +local log = log; +local fs = fs; +local next = next; +local type = type; +local setmetatable = setmetatable; +local getmetatable = getmetatable; +local assert = assert; +local select = select; +local coroutine = coroutine; +local utf8 = utf8; +local re = re; +local imgui = imgui; +local draw = draw; +local Vector2f = Vector2f; +local reframework = reframework; +local os = os; +local ValueType = ValueType; +local package = package; + +this.list = { + --poison = nil, + --stun = nil, + --sleep = nil, + --paralyze = nil, + --quake = nil, + --ear = nil, + --defense_down = nil, + --resistance_down = nil, + --stink = nil, + --onibomb = nil, + --bomb = nil, + --beto = nil, + --fire = nil, +}; + +local frenzy_infected_duration = 121; + +local player_quest_base_type_def = sdk.find_type_definition("snow.player.PlayerQuestBase"); + +-- Fireblight +local fire_duration_timer = player_quest_base_type_def:get_field("_FireLDurationTimer"); +-- Waterblight +local water_duration_timer = player_quest_base_type_def:get_field("_WaterLDurationTimer"); +-- Iceblight +local ice_duration_timer = player_quest_base_type_def:get_field("_IceLDurationTimer"); +-- Thunderblight +local thunder_duration_timer = player_quest_base_type_def:get_field("_ThunderLDurationTimer"); +-- Dragonblight +local dragon_duration_timer = player_quest_base_type_def:get_field("_DragonLDurationTimer"); +-- blastblight +local bomb_duration_timer = player_quest_base_type_def:get_field("_BombDurationTimer"); +-- Bubbleblight +local bubble_damage_timer = player_quest_base_type_def:get_field("_BubbleDamageTimer"); +-- Hellfireblight +local oni_bomb_duration_timer = player_quest_base_type_def:get_field("_OniBombDurationTimer"); +-- Bloodblight +local mystery_debuff_timer = player_quest_base_type_def:get_field("_MysteryDebuffTimer"); +-- Frostblight +local get_is_frozen_damage_method = player_quest_base_type_def:get_method("get_IsFrozenDamage"); + +-- Poison +local poison_duration_timer = player_quest_base_type_def:get_field("_PoisonDurationTimer"); +-- Stun +local stun_duration_timer = player_quest_base_type_def:get_field("_StunDurationTimer"); +-- Sleep +local sleep_duration_timer = player_quest_base_type_def:get_field("_SleepDurationTimer"); +-- Paralysis +local paralyze_duration_timer = player_quest_base_type_def:get_field("_ParalyzeDurationTimer"); + +-- Defense Down +local defense_down_duration_timer = player_quest_base_type_def:get_field("_DefenceDownDurationTimer"); +-- Resistance Down +local resistance_down_duration_timer = player_quest_base_type_def:get_field("_ResistanceDownDurationTimer"); + +-- Tremor +local quake_duration_timer = player_quest_base_type_def:get_field("_QuakeDurationTimer"); +-- Roar +local ear_duration_timer = player_quest_base_type_def:get_field("_EarDurationTimer"); +-- Webbed +local beto_duration_timer = player_quest_base_type_def:get_field("_BetoDurationTimer"); +-- Stench +local stink_duration_timer = player_quest_base_type_def:get_field("_StinkDurationTimer"); +-- Leeched +local blooding_enemy_timer = player_quest_base_type_def:get_field("_BloodingEnemyTimer"); +-- Bleeding +local bleeding_debuff_timer = player_quest_base_type_def:get_field("_BleedingDebuffTimer"); +-- Engulfed +local get_is_vacuum_damage_method = player_quest_base_type_def:get_method("get__IsVacuumDamage"); +-- Muck +local get_is_mud_damage_method = player_quest_base_type_def:get_method("get__IsMudDamage"); +local get_is_gold_mud_damage_method = player_quest_base_type_def:get_method("get__IsGoldMudDamage"); + +-- Frenzy Infected +local virus_accumulator_field = player_quest_base_type_def:get_field("_VirusAccumulator"); +local virus_timer_field = player_quest_base_type_def:get_field("_VirusTimer"); +-- Frenzy +local virus_onset_timer_field = player_quest_base_type_def:get_field("_VirusOnsetTimer"); + + + + +local player_data_type_def = sdk.find_type_definition("snow.player.PlayerData"); + +-- Frenzy Overcome +local virus_overcome_buff_timer_field = player_data_type_def:get_field("_VirusOvercomeBuffTimer"); + + +local system_array_type_def = sdk.find_type_definition("System.Array"); +local length_method = system_array_type_def:get_method("get_Length"); +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("consumables.update", "Failed to access Data: item_parameter"); + -- return; + --end + + -- Missing: + -- Whirlwind + + this.update_muck(player); + this.update_frenzy_infection(player); + + this.update_generic_timer("fireblight", player, fire_duration_timer); + this.update_generic_timer("waterblight", player, water_duration_timer); + this.update_generic_timer("iceblight", player, ice_duration_timer); + this.update_generic_timer("thunderblight", player, thunder_duration_timer); + this.update_generic_timer("dragonblight", player, dragon_duration_timer); + + this.update_generic_timer("blastblight", player, bomb_duration_timer); + this.update_generic_timer("bubbleblight", player, bubble_damage_timer); + this.update_generic_timer("hellfireblight", player, oni_bomb_duration_timer); + this.update_generic_timer("bloodblight", player, mystery_debuff_timer); + + this.update_generic_timer("poison", player, poison_duration_timer); + this.update_generic_timer("stun", player, stun_duration_timer); + this.update_generic_timer("paralysis", player, paralyze_duration_timer); + this.update_generic_timer("sleep", player, sleep_duration_timer); + + this.update_generic_timer("defense_down", player, defense_down_duration_timer); + this.update_generic_timer("resistance_down", player, resistance_down_duration_timer); + + this.update_generic_timer("tremor", player, quake_duration_timer); + this.update_generic_timer("roar", player, ear_duration_timer); + this.update_generic_timer("webbed", player, beto_duration_timer); + this.update_generic_timer("stench", player, stink_duration_timer); + this.update_generic_timer("leeched", player, blooding_enemy_timer, true); + -- whirlwind? + this.update_generic_timer("bleeding", player, bleeding_debuff_timer); + this.update_generic_timer("frenzy", player, virus_onset_timer_field); + this.update_generic_timer("frenzy_overcome", player_data, virus_overcome_buff_timer_field); + + this.update_generic_boolean_value_method("engulfed", player, get_is_vacuum_damage_method); + this.update_generic_boolean_value_method("frostblight", player, get_is_frozen_damage_method); +end + +function this.update_generic_timer(debuff_key, timer_owner, timer_field, is_infinite) + if is_infinite == nil then is_infinite = false; end + + local timer = timer_field:get_data(timer_owner); + if timer == nil then + error_handler.report("abnormal_statuses.update_generic_timer", string.format("Failed to access Data: %s_timer", debuff_key)); + return; + end + + if timer == 0 then + this.list[debuff_key] = nil; + return; + end + + if is_infinite then + timer = nil; + else + timer = timer / 60; + end + + this.update_generic(debuff_key, timer); +end + +function this.update_generic_boolean_value_method(debuff_key, value_owner, value_method) + local value = value_method:call(value_owner); + if value == nil then + error_handler.report("abnormal_statuses.update_generic_boolean_value_method", string.format("Failed to access Data: %s_value", debuff_key)); + return; + end + + if not value then + this.list[debuff_key] = nil; + return; + end + + this.update_generic(debuff_key, nil); +end + +function this.update_muck(player) + local is_mud_damage = get_is_mud_damage_method:call(player); + if is_mud_damage == nil then + error_handler.report("abnormal_statuses.update_generic_boolean_value_method", "Failed to access Data: is_mud_damage"); + return; + end + + local is_gold_mud_damage = get_is_gold_mud_damage_method:call(player); + if is_gold_mud_damage == nil then + error_handler.report("abnormal_statuses.update_generic_boolean_value_method", "Failed to access Data: is_gold_mud_damage"); + return; + end + + if not is_mud_damage and not is_gold_mud_damage then + this.list.muck = nil; + return; + end + + this.update_generic("muck", nil); +end + +function this.update_frenzy_infection(player) + local virus_accumulator_value = virus_accumulator_field:get_data(player); + if virus_accumulator_value == nil then + error_handler.report("abnormal_statuses.update_frenzy_infection", "Failed to access Data: virus_accumulator_value"); + return; + end + + local virus_timer = virus_timer_field:get_data(player); + if virus_timer == nil then + error_handler.report("abnormal_statuses.update_frenzy_infection", "Failed to access Data: virus_timer"); + return; + end + + if virus_accumulator_value == 0 and virus_timer == 0 then + this.list.frenzy_infection = nil; + return; + end + + local timer = frenzy_infected_duration - (virus_accumulator_value + virus_timer / 60); + + this.update_generic("frenzy_infection", timer, frenzy_infected_duration); +end + +function this.update_generic(debuff_key, timer, duration) + duration = duration or timer; + + local debuff = this.list[debuff_key]; + if debuff == nil then + local name = language.current_language.ailments[debuff_key]; + if name == nil then + name = debuff_key; + end + + debuff = buffs.new(buffs.types.debuff, debuff_key, name, 1, duration); + this.list[debuff_key] = debuff; + + elseif timer ~= nil then + buffs.update_timer(debuff, timer); + end +end + +function this.init_names() + for debuff_key, debuff in pairs(this.list) do + local name = language.current_language.ailments[debuff_key]; + + if name == nil then + name = debuff_key; + end + + debuff.name = name; + end +end + +function this.init_dependencies() + buffs = require("MHR_Overlay.Buffs.buffs"); + config = require("MHR_Overlay.Misc.config"); + utils = require("MHR_Overlay.Misc.utils"); + buff_UI_entity = require("MHR_Overlay.UI.UI_Entities.buff_UI_entity"); + singletons = require("MHR_Overlay.Game_Handler.singletons"); + players = require("MHR_Overlay.Damage_Meter.players"); + language = require("MHR_Overlay.Misc.language"); + error_handler = require("MHR_Overlay.Misc.error_handler"); +end + +function this.init_module() +end + +return this; \ No newline at end of file diff --git a/reframework/autorun/MHR_Overlay/Buffs/buffs.lua b/reframework/autorun/MHR_Overlay/Buffs/buffs.lua index 7db5345..8879735 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/buffs.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/buffs.lua @@ -14,6 +14,7 @@ local error_handler; local endemic_life_buffs; local skills; local dangos; +local abnormal_statuses; local sdk = sdk; local tostring = tostring; @@ -52,6 +53,7 @@ this.types = { melody_effect = 1, dango = 2, skill = 4, + debuff = 8 }; local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager"); @@ -124,6 +126,7 @@ function this.init_names() endemic_life_buffs.init_names(); skills.init_names(); dangos.init_names(); + abnormal_statuses.init_names(); end function this.update() @@ -148,6 +151,8 @@ function this.update() return; end + abnormal_statuses.update(master_player); + local master_player_data = get_player_data_method:call(master_player); if master_player_data ~= nil then consumables.update(master_player_data); @@ -186,6 +191,10 @@ function this.update_timer(buff, timer) timer = 0; end + if timer > buff.duration then + buff.duration = timer; + end + local minutes_left = math.floor(timer / 60); buff.timer = timer; @@ -217,10 +226,11 @@ function this.init_dependencies() endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs"); skills = require("MHR_Overlay.Buffs.skills"); dangos = require("MHR_Overlay.Buffs.dangos"); + abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses"); end function this.init_module() - time.new_timer(this.update, 0.5); + time.new_timer(this.update, 1/60); end return this; \ No newline at end of file diff --git a/reframework/autorun/MHR_Overlay/Damage_Meter/damage_hook.lua b/reframework/autorun/MHR_Overlay/Damage_Meter/damage_hook.lua index d61051a..60ad519 100644 --- a/reframework/autorun/MHR_Overlay/Damage_Meter/damage_hook.lua +++ b/reframework/autorun/MHR_Overlay/Damage_Meter/damage_hook.lua @@ -332,7 +332,7 @@ function this.on_stock_direct_marionette_finish_shoot_hit_parts_damage(enemy, da end wall_hit_damage_queue = {}; - + players.update_damage(players.total, damage_source_type, false, small_monster_damage_object); players.update_damage(player, damage_source_type, false, small_monster_damage_object); diff --git a/reframework/autorun/MHR_Overlay/Misc/language.lua b/reframework/autorun/MHR_Overlay/Misc/language.lua index 8a3ed4a..46a1cf6 100644 --- a/reframework/autorun/MHR_Overlay/Misc/language.lua +++ b/reframework/autorun/MHR_Overlay/Misc/language.lua @@ -175,8 +175,9 @@ this.default_language = { blast = "Blast", exhaust = "Exhaust", ride = "Wyvern Riding", - waterblight = "Waterblight", + fireblight = "Fireblight", + waterblight = "Waterblight", iceblight = "Iceblight", thunderblight = "Thunderblight", @@ -187,7 +188,29 @@ this.default_language = { steel_fang = "Steel Fang", quick_sand = "Quick Sand", fall_otomo_trap = "Fall Buddy Trap", - shock_otomo_trap = "Shock Buddy Trap" + shock_otomo_trap = "Shock Buddy Trap", + + dragonblight = "Dragonblight", + blastblight = "Blastblight", + bubbleblight = "Bubbleblight", + hellfireblight = "Hellfireblight", + bloodblight = "Bloodblight", + frostblight = "Frostblight", + + defense_down = "Defense Down", + resistance_down = "Resistance Down", + + tremor = "Tremor", + roar = "Roar", + webbed = "Webbed", + stench = "Stench", + leeched = "Leeched", + bleeding = "Bleeding", + engulfed = "Engulfed", + muck = "Muck", + frenzy = "Frenzy", + frenzy_infection = "Frenzy Infection", + frenzy_overcome = "Frenzy Overcome" }, consumables = { @@ -253,7 +276,9 @@ this.default_language = { offensive_guard = "Offensive Guard", hellfire_cloak = "Hellfire Cloak", agitator = "Agitator", - furious = "Furious" + furious = "Furious", + heroics = "Heroics", + resuscitate = "Resuscitate" }, dangos = { diff --git a/reframework/autorun/MHR_Overlay/Monsters/ailment_hook.lua b/reframework/autorun/MHR_Overlay/Monsters/ailment_hook.lua index c7530ec..8224a66 100644 --- a/reframework/autorun/MHR_Overlay/Monsters/ailment_hook.lua +++ b/reframework/autorun/MHR_Overlay/Monsters/ailment_hook.lua @@ -120,7 +120,6 @@ function this.blast_proc(blast_param) local blast_damage = blast_damage_method:call(blast_param); local blast_adjust_rate = blast_adjust_rate_method:call(blast_param); - ailments.apply_ailment_damage(monster, ailments.blast_id, blast_damage * blast_adjust_rate); ailments.clear_ailment_contribution(monster, ailments.blast_id); end diff --git a/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua b/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua index 0761ab2..2055cc1 100644 --- a/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua +++ b/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua @@ -11,6 +11,7 @@ local utils; local error_handler; local skills; local dangos; +local abnormal_statuses; local sdk = sdk; local tostring = tostring; @@ -102,6 +103,17 @@ function this.draw() ::continue5:: end + for key, abnormal_status in pairs(abnormal_statuses.list) do + if not abnormal_status.is_active then + goto continue5; + end + + table.insert(displayed_buffs, abnormal_status); + + ::continue5:: + end + + -- sort if cached_config.sorting.type == "Name" then if cached_config.sorting.reversed_order then @@ -175,6 +187,7 @@ function this.init_dependencies() endemic_life_buff = require("MHR_Overlay.Buffs.endemic_life_buffs"); skills = require("MHR_Overlay.Buffs.skills"); dangos = require("MHR_Overlay.Buffs.dangos"); + abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses"); end function this.init_module() diff --git a/reframework/data/MHR Overlay/languages/en-us.json b/reframework/data/MHR Overlay/languages/en-us.json index 23ce5b0..9e1fbf6 100644 --- a/reframework/data/MHR Overlay/languages/en-us.json +++ b/reframework/data/MHR Overlay/languages/en-us.json @@ -18,25 +18,44 @@ }, "ailments": { "blast": "Blast", + "blastblight": "Blastblight", + "bleeding": "Bleeding", + "bloodblight": "Bloodblight", + "bubbleblight": "Bubbleblight", + "defense_down": "Defense Down", + "dragonblight": "Dragonblight", "dung_bomb": "Dung Bomb", + "engulfed": "Engulfed", "exhaust": "Exhaust", "fall_otomo_trap": "Fall Buddy Trap", "fall_trap": "Fall Trap", "fireblight": "Fireblight", "flash": "Flash", + "frenzy": "Frenzy", + "frenzy_infection": "Frenzy Infection", + "frenzy_overcome": "Frenzy Overcome", + "frostblight": "Frostblight", + "hellfireblight": "Hellfireblight", "iceblight": "Iceblight", + "leeched": "Leeched", + "muck": "Muck", "paralysis": "Paralysis", "poison": "Poison", "quick_sand": "Quick Sand", + "resistance_down": "Resistance Down", "ride": "Wyvern Riding", + "roar": "Roar", "shock_otomo_trap": "Shock Buddy Trap", "shock_trap": "Shock Trap", "sleep": "Sleep", "steel_fang": "Steel Fang", + "stench": "Stench", "stun": "Stun", "thunderblight": "Thunderblight", "tranq_bomb": "Tranq Bomb", - "waterblight": "Waterblight" + "tremor": "Tremor", + "waterblight": "Waterblight", + "webbed": "Webbed" }, "consumables": { "adamant_seed": "Adamant Seed", @@ -455,11 +474,13 @@ "grinder_s": "Grinder (S)", "heaven_sent": "Heaven-Sent", "hellfire_cloak": "Hellfire Cloak", + "heroics": "Heroics", "intrepid_heart": "Intrepid Heart", "kushala_daora_soul": "Kushala Daora Soul", "latent_power": "Latent Power", "offensive_guard": "Offensive Guard", "protective_polish": "Protective Polish", + "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 5f8e82a..cb85c63 100644 --- a/reframework/data/MHR Overlay/languages/ja-jp.json +++ b/reframework/data/MHR Overlay/languages/ja-jp.json @@ -18,25 +18,44 @@ }, "ailments": { "blast": "爆破", + "blastblight": "Blastblight", + "bleeding": "Bleeding", + "bloodblight": "Bloodblight", + "bubbleblight": "Bubbleblight", + "defense_down": "Defense Down", + "dragonblight": "Dragonblight", "dung_bomb": "悪臭", + "engulfed": "Engulfed", "exhaust": "疲労", "fall_otomo_trap": "オトモ落とし穴", "fall_trap": "落とし穴", "fireblight": "火属性やられ", "flash": "目くらまし", + "frenzy": "Frenzy", + "frenzy_infection": "Frenzy Infection", + "frenzy_overcome": "Frenzy Overcome", + "frostblight": "Frostblight", + "hellfireblight": "Hellfireblight", "iceblight": "氷属性やられ", + "leeched": "Leeched", + "muck": "Muck", "paralysis": "麻痺", "poison": "毒", "quick_sand": "流砂", + "resistance_down": "Resistance Down", "ride": "操竜", + "roar": "Roar", "shock_otomo_trap": "オトモしびれ罠", "shock_trap": "しびれ罠", "sleep": "睡眠", "steel_fang": "ガルク噛み付き", + "stench": "Stench", "stun": "スタン", "thunderblight": "雷属性やられ", "tranq_bomb": "捕獲用麻酔玉", - "waterblight": "水属性やられ" + "tremor": "Tremor", + "waterblight": "水属性やられ", + "webbed": "Webbed" }, "consumables": { "adamant_seed": "Adamant Seed", @@ -455,11 +474,13 @@ "grinder_s": "Grinder (S)", "heaven_sent": "Heaven-Sent", "hellfire_cloak": "Hellfire Cloak", + "heroics": "Heroics", "intrepid_heart": "Intrepid Heart", "kushala_daora_soul": "Kushala Daora Soul", "latent_power": "Latent Power", "offensive_guard": "Offensive Guard", "protective_polish": "Protective Polish", + "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 948c6c1..3abc817 100644 --- a/reframework/data/MHR Overlay/languages/ko-kr.json +++ b/reframework/data/MHR Overlay/languages/ko-kr.json @@ -18,25 +18,44 @@ }, "ailments": { "blast": "폭파", + "blastblight": "Blastblight", + "bleeding": "Bleeding", + "bloodblight": "Bloodblight", + "bubbleblight": "Bubbleblight", + "defense_down": "Defense Down", + "dragonblight": "Dragonblight", "dung_bomb": "거름탄", + "engulfed": "Engulfed", "exhaust": "탈진", "fall_otomo_trap": "동반자 구멍 함정", "fall_trap": "구멍 함정", "fireblight": "불바위구리", "flash": "섬광", + "frenzy": "Frenzy", + "frenzy_infection": "Frenzy Infection", + "frenzy_overcome": "Frenzy Overcome", + "frostblight": "Frostblight", + "hellfireblight": "Hellfireblight", "iceblight": "진흙구리", + "leeched": "Leeched", + "muck": "Muck", "paralysis": "마비", "poison": "독", "quick_sand": "유사(모래함정)", + "resistance_down": "Resistance Down", "ride": "용조종", + "roar": "Roar", "shock_otomo_trap": "동반자 마비덫", "shock_trap": "마비덫", "sleep": "수면", "steel_fang": "강철아", + "stench": "Stench", "stun": "기절", "thunderblight": "번개털구리", "tranq_bomb": "포획용마취옥", - "waterblight": "진흙구리" + "tremor": "Tremor", + "waterblight": "진흙구리", + "webbed": "Webbed" }, "consumables": { "adamant_seed": "Adamant Seed", @@ -456,11 +475,13 @@ "grinder_s": "Grinder (S)", "heaven_sent": "Heaven-Sent", "hellfire_cloak": "Hellfire Cloak", + "heroics": "Heroics", "intrepid_heart": "Intrepid Heart", "kushala_daora_soul": "Kushala Daora Soul", "latent_power": "Latent Power", "offensive_guard": "Offensive Guard", "protective_polish": "Protective Polish", + "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 dbb4b94..e26dc5c 100644 --- a/reframework/data/MHR Overlay/languages/ru-ru.json +++ b/reframework/data/MHR Overlay/languages/ru-ru.json @@ -18,25 +18,44 @@ }, "ailments": { "blast": "Взрыв", + "blastblight": "Blastblight", + "bleeding": "Bleeding", + "bloodblight": "Bloodblight", + "bubbleblight": "Bubbleblight", + "defense_down": "Defense Down", + "dragonblight": "Dragonblight", "dung_bomb": "Навозная бомба", + "engulfed": "Engulfed", "exhaust": "Усталость", "fall_otomo_trap": "Волчья яма спутника", "fall_trap": "Волчья яма", "fireblight": "Огненная порча", "flash": "Оглушение", + "frenzy": "Frenzy", + "frenzy_infection": "Frenzy Infection", + "frenzy_overcome": "Frenzy Overcome", + "frostblight": "Frostblight", + "hellfireblight": "Hellfireblight", "iceblight": "Ледяная порча", + "leeched": "Leeched", + "muck": "Muck", "paralysis": "Паралич", "poison": "Отравление", "quick_sand": "Зыбучий песок", + "resistance_down": "Resistance Down", "ride": "Езда на виверне", + "roar": "Roar", "shock_otomo_trap": "Шоковая ловушка спутника", "shock_trap": "Шоковая ловушка", "sleep": "Сон", "steel_fang": "Стальной клык", + "stench": "Stench", "stun": "Оглушение", "thunderblight": "Грозовая порча", "tranq_bomb": "Снотворная порча", - "waterblight": "Водяная порча" + "tremor": "Tremor", + "waterblight": "Водяная порча", + "webbed": "Webbed" }, "consumables": { "adamant_seed": "Adamant Seed", @@ -456,11 +475,13 @@ "grinder_s": "Grinder (S)", "heaven_sent": "Heaven-Sent", "hellfire_cloak": "Hellfire Cloak", + "heroics": "Heroics", "intrepid_heart": "Intrepid Heart", "kushala_daora_soul": "Kushala Daora Soul", "latent_power": "Latent Power", "offensive_guard": "Offensive Guard", "protective_polish": "Protective Polish", + "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 cfa2148..b5a1b9e 100644 --- a/reframework/data/MHR Overlay/languages/zh-cn.json +++ b/reframework/data/MHR Overlay/languages/zh-cn.json @@ -18,25 +18,44 @@ }, "ailments": { "blast": "爆破", + "blastblight": "Blastblight", + "bleeding": "Bleeding", + "bloodblight": "Bloodblight", + "bubbleblight": "Bubbleblight", + "defense_down": "Defense Down", + "dragonblight": "Dragonblight", "dung_bomb": "异臭球", + "engulfed": "Engulfed", "exhaust": "减气", "fall_otomo_trap": "随从落穴陷阱", "fall_trap": "落穴陷阱", "fireblight": "火异常状态", "flash": "闪光", + "frenzy": "Frenzy", + "frenzy_infection": "Frenzy Infection", + "frenzy_overcome": "Frenzy Overcome", + "frostblight": "Frostblight", + "hellfireblight": "Hellfireblight", "iceblight": "冰异常状态", + "leeched": "Leeched", + "muck": "Muck", "paralysis": "麻痹", "poison": "中毒", "quick_sand": "流沙", + "resistance_down": "Resistance Down", "ride": "御龙", + "roar": "Roar", "shock_otomo_trap": "随从麻痹陷阱", "shock_trap": "麻痹陷阱", "sleep": "睡眠", "steel_fang": "双刃锁镰", + "stench": "Stench", "stun": "昏厥", "thunderblight": "雷异常状态", "tranq_bomb": "捕获用麻醉球", - "waterblight": "水异常状态" + "tremor": "Tremor", + "waterblight": "水异常状态", + "webbed": "Webbed" }, "consumables": { "adamant_seed": "Adamant Seed", @@ -456,11 +475,13 @@ "grinder_s": "Grinder (S)", "heaven_sent": "Heaven-Sent", "hellfire_cloak": "Hellfire Cloak", + "heroics": "Heroics", "intrepid_heart": "Intrepid Heart", "kushala_daora_soul": "Kushala Daora Soul", "latent_power": "Latent Power", "offensive_guard": "Offensive Guard", "protective_polish": "Protective Polish", + "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 0c0b26f..01280d7 100644 --- a/reframework/data/MHR Overlay/languages/zh-tw.json +++ b/reframework/data/MHR Overlay/languages/zh-tw.json @@ -18,25 +18,44 @@ }, "ailments": { "blast": "爆破", + "blastblight": "Blastblight", + "bleeding": "Bleeding", + "bloodblight": "Bloodblight", + "bubbleblight": "Bubbleblight", + "defense_down": "Defense Down", + "dragonblight": "Dragonblight", "dung_bomb": "異臭", + "engulfed": "Engulfed", "exhaust": "疲勞", "fall_otomo_trap": "隨從地洞陷阱", "fall_trap": "地洞陷阱", "fireblight": "火屬性異常", "flash": "失明", + "frenzy": "Frenzy", + "frenzy_infection": "Frenzy Infection", + "frenzy_overcome": "Frenzy Overcome", + "frostblight": "Frostblight", + "hellfireblight": "Hellfireblight", "iceblight": "冰屬性異常", + "leeched": "Leeched", + "muck": "Muck", "paralysis": "麻痺", "poison": "毒", "quick_sand": "流沙", + "resistance_down": "Resistance Down", "ride": "操龍", + "roar": "Roar", "shock_otomo_trap": "隨從麻痺陷阱", "shock_trap": "麻痺陷阱", "sleep": "睡眠", "steel_fang": "獵犬鋼牙", + "stench": "Stench", "stun": "暈眩", "thunderblight": "雷屬性異常", "tranq_bomb": "麻醉", - "waterblight": "水屬性異常" + "tremor": "Tremor", + "waterblight": "水屬性異常", + "webbed": "Webbed" }, "consumables": { "adamant_seed": "Adamant Seed", @@ -456,11 +475,13 @@ "grinder_s": "Grinder (S)", "heaven_sent": "Heaven-Sent", "hellfire_cloak": "Hellfire Cloak", + "heroics": "Heroics", "intrepid_heart": "Intrepid Heart", "kushala_daora_soul": "Kushala Daora Soul", "latent_power": "Latent Power", "offensive_guard": "Offensive Guard", "protective_polish": "Protective Polish", + "resuscitate": "Resuscitate", "wall_runner": "Wall Runner", "wind_mantle": "Wind Mantle" },