diff --git a/reframework/autorun/MHR_Overlay/Buffs/skills.lua b/reframework/autorun/MHR_Overlay/Buffs/skills.lua index 30a5b8d..2d601c7 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/skills.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/skills.lua @@ -74,14 +74,161 @@ this.list = { }; local skill_data_list = { + -- 1 Pl_EquipSkill_000 Attack Boost + -- 2 Pl_EquipSkill_001 Agitator + -- 3 Pl_EquipSkill_002 Peak Performance peak_performance = { id = 3, level = 0, is_equipped = false }, + -- 4 Pl_EquipSkill_003 Resentment resentment = { id = 4, level = 0, is_equipped = false }, + -- 5 Pl_EquipSkill_004 Resuscitate resuscitate = { id = 5, level = 0, is_equipped = false }, + -- 6 Pl_EquipSkill_005 Critical Eye + -- 7 Pl_EquipSkill_006 Critical Boost + -- 8 Pl_EquipSkill_007 Weakness Exploit + -- 9 Pl_EquipSkill_008 Latent Power + -- 10 Pl_EquipSkill_009 Maximum Might maximum_might = { id = 10, level = 0, is_equipped = false }, + -- 11 Pl_EquipSkill_010 Critical Element + -- 12 Pl_EquipSkill_011 Master's Touch + -- 13 Pl_EquipSkill_012 Fire Attack + -- 14 Pl_EquipSkill_013 Water Attack + -- 15 Pl_EquipSkill_014 Ice Attack + -- 16 Pl_EquipSkill_015 Thunder Attack + -- 17 Pl_EquipSkill_016 Dragon Attack + -- 18 Pl_EquipSkill_017 Poison Attack + -- 19 Pl_EquipSkill_018 Paralysis Attack + -- 20 Pl_EquipSkill_019 Sleep Attack + -- 21 Pl_EquipSkill_020 Blast Attack + -- 22 Pl_EquipSkill_021 Handicraft + -- 23 Pl_EquipSkill_022 Razor Sharp + -- 24 Pl_EquipSkill_023 Spare Shot + -- 25 Pl_EquipSkill_024 Protective Polish + -- 26 Pl_EquipSkill_025 Mind's Eye + -- 27 Pl_EquipSkill_026 Ballistics + -- 28 Pl_EquipSkill_027 Bludgeoner + -- 29 Pl_EquipSkill_028 Bow Charge Plus + -- 30 Pl_EquipSkill_029 Focus + -- 31 Pl_EquipSkill_030 Power Prolonger + -- 32 Pl_EquipSkill_031 Marathon Runner + -- 33 Pl_EquipSkill_032 Constitution + -- 34 Pl_EquipSkill_033 Stamina Surge + -- 35 Pl_EquipSkill_034 Guard + -- 36 Pl_EquipSkill_035 Guard Up + -- 37 Pl_EquipSkill_036 Offensive Guard + -- 38 Pl_EquipSkill_037 Critical Draw + -- 39 Pl_EquipSkill_038 Punishing Draw + -- 40 Pl_EquipSkill_039 Quick Sheathe + -- 41 Pl_EquipSkill_040 Slugger + -- 42 Pl_EquipSkill_041 Stamina Thief + -- 43 Pl_EquipSkill_042 Affinity Sliding + -- 44 Pl_EquipSkill_043 Horn Maestro + -- 45 Pl_EquipSkill_044 Artillery + -- 46 Pl_EquipSkill_045 Load Shells + -- 47 Pl_EquipSkill_046 Special Ammo Boost + -- 48 Pl_EquipSkill_047 Normal/Rapid Up + -- 49 Pl_EquipSkill_048 Pierce Up + -- 50 Pl_EquipSkill_049 Spread Up + -- 51 Pl_EquipSkill_050 Ammo Up + -- 52 Pl_EquipSkill_051 Reload Speed + -- 53 Pl_EquipSkill_052 Recoil Down + -- 54 Pl_EquipSkill_053 Steadiness + -- 55 Pl_EquipSkill_054 Rapid Fire Up + -- 56 Pl_EquipSkill_055 Defense Boost + -- 57 Pl_EquipSkill_056 Divine Blessing + -- 58 Pl_EquipSkill_057 Recovery Up + -- 59 Pl_EquipSkill_058 Recovery Speed + -- 60 Pl_EquipSkill_059 Speed Eating + -- 61 Pl_EquipSkill_060 Earplugs + -- 62 Pl_EquipSkill_061 Windproof + -- 63 Pl_EquipSkill_062 Tremor Resistance + -- 64 Pl_EquipSkill_063 Bubbly Dance + -- 65 Pl_EquipSkill_064 Evade Window + -- 66 Pl_EquipSkill_065 Evade Extender + -- 67 Pl_EquipSkill_066 Fire Resistance + -- 68 Pl_EquipSkill_067 Water Resistance + -- 69 Pl_EquipSkill_068 Ice Resistance + -- 70 Pl_EquipSkill_069 Thunder Resistance + -- 71 Pl_EquipSkill_070 Dragon Resistance + -- 72 Pl_EquipSkill_071 Blight Resistance + -- 73 Pl_EquipSkill_072 Poison Resistance + -- 74 Pl_EquipSkill_073 Paralysis Resistance + -- 75 Pl_EquipSkill_074 Sleep Resistance + -- 76 Pl_EquipSkill_075 Stun Resistance + -- 77 Pl_EquipSkill_076 Muck Resistance + -- 78 Pl_EquipSkill_077 Blast Resistance + -- 79 Pl_EquipSkill_078 Botanist + -- 80 Pl_EquipSkill_079 Geologist + -- 81 Pl_EquipSkill_080 Partbreaker + -- 82 Pl_EquipSkill_081 Capture Master + -- 83 Pl_EquipSkill_082 Carving Master + -- 84 Pl_EquipSkill_083 Good Luck + -- 85 Pl_EquipSkill_084 Speed Sharpening + -- 86 Pl_EquipSkill_085 Bombardier + -- 87 Pl_EquipSkill_086 Mushroomancer + -- 88 Pl_EquipSkill_087 Item Prolonger + -- 89 Pl_EquipSkill_088 Wide-Range + -- 90 Pl_EquipSkill_089 Free Meal + -- 91 Pl_EquipSkill_090 Heroics heroics = { id = 91, level = 0, is_equipped = false }, + -- 92 Pl_EquipSkill_091 Fortify + -- 93 Pl_EquipSkill_092 Flinch Free + -- 94 Pl_EquipSkill_093 Jump Master + -- 95 Pl_EquipSkill_094 Carving Pro + -- 96 Pl_EquipSkill_095 Hunger Resistance + -- 97 Pl_EquipSkill_096 Leap of Faith + -- 98 Pl_EquipSkill_097 Diversion + -- 99 Pl_EquipSkill_098 Master Mounter + -- 100 Pl_EquipSkill_099 Chameleos Blessing + -- 101 Pl_EquipSkill_100 Kushala Blessing + -- 102 Pl_EquipSkill_101 Teostra Blessing + -- 103 Pl_EquipSkill_102 Dragonheart dragonheart = { id = 103, level = 0, is_equipped = false }, + -- 104 Pl_EquipSkill_103 Wirebug Whisperer + -- 105 Pl_EquipSkill_104 Wall Runner + -- 106 Pl_EquipSkill_105 Counterstrike + -- 107 Pl_EquipSkill_106 Rapid Morph + -- 108 Pl_EquipSkill_107 Hellfire Cloak + -- 109 Pl_EquipSkill_108 Wind Alignment + -- 110 Pl_EquipSkill_109 Thunder Alignment + -- 111 Pl_EquipSkill_110 Stormsoul + -- 112 Pl_EquipSkill_200 Blood Rite + -- 113 Pl_EquipSkill_201 Dereliction + dereliction = { id = 113, level = 0, is_equipped = false }, + -- 114 Pl_EquipSkill_202 Furious + -- 115 Pl_EquipSkill_203 Mail of Hellfire + -- 116 Pl_EquipSkill_204 Coalescence + -- 117 Pl_EquipSkill_205 Bloodlust bloodlust = { id = 117, level = 0, is_equipped = false }, - dereliction = { id = 113, level = 0, is_equipped = false } + -- 118 Pl_EquipSkill_206 Defiance + -- 119 Pl_EquipSkill_207 Sneak Attack + -- 120 Pl_EquipSkill_208 Adrenaline Rush + -- 122 Pl_EquipSkill_209 Redirection + -- 123 Pl_EquipSkill_210 Spiribird's Call + -- 124 Pl_EquipSkill_211 Charge Master + -- 125 Pl_EquipSkill_212 Foray + -- 126 Pl_EquipSkill_213 Tune-Up + -- 127 Pl_EquipSkill_214 Grinder (S) + -- 128 Pl_EquipSkill_215 Bladescale Hone + -- 129 Pl_EquipSkill_216 Wall Runner (Boost) + -- 133 Pl_EquipSkill_217 Quick Breath + -- 130 Pl_EquipSkill_218 Element Exploit + -- 131 Pl_EquipSkill_219 Burst + -- 132 Pl_EquipSkill_220 Guts + -- 134 Pl_EquipSkill_221 Status Trigger + -- 135 Pl_EquipSkill_222 Intrepid Heart + -- 136 Pl_EquipSkill_223 Buildup Boost + -- 121 Pl_EquipSkill_224 Embolden + -- 138 Pl_EquipSkill_225 Wind Mantle + -- 139 Pl_EquipSkill_226 Powder Mantle + -- 137 Pl_EquipSkill_227 Berserk + -- 145 Pl_EquipSkill_228 Strife + -- 140 Pl_EquipSkill_229 Frostcraft + -- 141 Pl_EquipSkill_230 Dragon Conversion + -- 142 Pl_EquipSkill_231 Heaven-Sent + -- 143 Pl_EquipSkill_232 Frenzied Bloodlust + -- 144 Pl_EquipSkill_233 Blood Awakening + -- 146 Pl_EquipSkill_234 Shock Absorber + -- 147 Pl_EquipSkill_235 Inspiration } local burst_breakpoint = 5; @@ -153,6 +300,8 @@ local equip_skill_231_wire_num_timer_field = player_data_type_def:get_field("_Eq local equip_skill_231_wp_off_timer_field = player_data_type_def:get_field("_EquipSkill231_WpOffTimer"); -- Resentment local r_vital_field = player_data_type_def:get_field("_r_Vital"); +-- Status Trigger +local equip_skill_222_timer_field = player_data_type_def:get_field("_EquipSkill222_Timer"); @@ -234,8 +383,6 @@ function this.update(player, player_data) -- end -- end - xy = player_data._BeastRoarOtomoTimer; - this.update_equipped_skill_data(player); this.update_dereliction(player_data); @@ -266,6 +413,7 @@ function this.update(player, player_data) this.update_generic_timer("hellfire_cloak", player_data, onibi_powerup_timer_field); this.update_generic_timer("agitator", player_data, challenge_timer_field, true); this.update_generic_timer("furious", player_data, furious_skill_stamina_buff_second_timer_field); + this.update_generic_timer("status_trigger", player_data, equip_skill_222_timer_field); this.update_generic_boolean_value_method("heaven_sent", player, is_active_equip_skill_230_method); this.update_generic_boolean_value_method("heroics", player, is_predicament_power_up_method); diff --git a/reframework/autorun/MHR_Overlay/Misc/language.lua b/reframework/autorun/MHR_Overlay/Misc/language.lua index 89505af..04bb58a 100644 --- a/reframework/autorun/MHR_Overlay/Misc/language.lua +++ b/reframework/autorun/MHR_Overlay/Misc/language.lua @@ -263,32 +263,155 @@ this.default_language = { }, skills = { - burst = "Burst", - kushala_daora_soul = "Kushala Daora Soul", - intrepid_heart = "Intrepid Heart", - dereliction = "Dereliction", - latent_power = "Latent Power", - protective_polish = "Protective Polish", - wind_mantle = "Wind Mantle", - heaven_sent = "Heaven-Sent", - grinder_s = "Grinder (S)", - counterstrike = "Counterstrike", - affinity_sliding = "Affinity Sliding", - coalescence = "Coalescence", - adrenaline_rush = "Adrenaline Rush", - wall_runner = "Wall Runner", - offensive_guard = "Offensive Guard", - hellfire_cloak = "Hellfire Cloak", + -- attack_boost = "Attack Boost", agitator = "Agitator", - furious = "Furious", - heroics = "Heroics", - resuscitate = "Resuscitate", - maximum_might = "Maximum Might", - bloodlust = "Bloodlust", - frenzied_bloodlust = "Frenzied Bloodlust", peak_performance = "Peak Performance", + resentment = "Resentment", + resuscitate = "Resuscitate", + -- critical_eye = "Critical Eye", + -- critical_boost = "Critical Boost", + -- weakness_exploit = "Weakness Exploit", + latent_power = "Latent Power", + maximum_might = "Maximum Might", + -- critical_element = "Critical Element", + -- masters_touch = "Master's Touch", + -- fire_attack = "Fire Attack", + -- water_attack = "Water Attack", + -- ice_attack = "Ice Attack", + -- thunder_attack = "Thunder Attack", + -- dragon_attack = "Dragon Attack", + -- poison_attack = "Poison Attack", + -- paralysis_attack = "Paralysis Attack", + -- sleep_attack = "Sleep Attack", + -- blast_attack = "Blast Attack", + -- handicraft = "Handicraft", + -- razor_sharp = "Razor Sharp", + -- spare_shot = "Spare Shot", + protective_polish = "Protective Polish", + -- minds_eye = "Mind's Eye", + -- ballistics = "Ballistics", + -- bludgeoner = "Bludgeoner", + -- bow_charge_plus = "Bow Charge Plus", + -- focus = "Focus", + -- power_prolonger = "Power Prolonger", + -- marathon_runner = "Marathon Runner", + -- constitution= "Constitution", + -- stamina_surge = "Stamina Surge", + -- guard = "Guard", + -- guard_up = "Guard Up", + offensive_guard = "Offensive Guard", + -- critical_draw = "Critical Draw", + -- punishing_draw = "Punishing Draw", + -- quick_sheathe = "Quick Sheathe", + -- slugger = "Slugger", + -- stamina_thief = "Stamina Thief", + affinity_sliding = "Affinity Sliding", + -- horn_maestro = "Horn Maestro", + -- artillery = "Artillery", + -- load_shells = "Load Shells", + -- special_ammo_boost = "Special Ammo Boost", + -- normal_rapid_up = "Normal/Rapid Up", + -- pierce_up = "Pierce Up", + -- spread_up = "Spread Up", + -- ammo_up = "Ammo Up", + -- reload_speed = "Reload Speed", + -- recoil_down = "Recoil Down", + -- steadiness = "Steadiness", + -- rapid_fire_up = "Rapid Fire Up", + -- defense_boost = "Defense Boost", + -- divine_blessing = "Divine Blessing", + -- recovery_up = "Recovery Up", + -- recovery_speed = "Recovery Speed", + -- speed_eating = "Speed Eating", + -- earplugs = "Earplugs", + -- windproof = "Windproof", + -- tremor_resistance = "Tremor Resistance", + -- bubbly_dance = "Bubbly Dance", + -- evade_window = "Evade Window", + -- evade_extender = "Evade Extender", + -- fire_resistance = "Fire Resistance", + -- water_resistance = "Water Resistance", + -- ice_resistance = "Ice Resistance", + -- thunder_resistance = "Thunder Resistance", + -- Dragon_resistance = "Dragon Resistance", + -- blight_resistance = "Blight Resistance", + -- poison_resistance = "Poison Resistance", + -- paralysis_resistance = "Paralysis Resistance", + -- sleep_resistance = "Sleep Resistance", + -- stun_resistance = "Stun Resistance", + -- muck_resistance = "Muck Resistance", + -- blast_resistance = "Blast Resistance", + -- botanist = "Botanist", + -- geologist = "Geologist", + -- partbreaker = "Partbreaker", + -- capture_master = "Capture Master", + -- carving_master = "Carving Master", + -- good_luck = "Good Luck", + -- speed_sharpening = "Speed Sharpening", + -- bombardier = "Bombardier", + -- mushroomancer = "Mushroomancer", + -- item_prolonger = "Item Prolonger", + -- wide_range = "Wide-Range", + -- free_meal = "Free Meal", + heroics = "Heroics", + -- fortify = "Fortify", + -- flinch_free = "Flinch Free", + -- jump_master = "Jump Master", + -- carving_pro = "Carving Pro", + -- hunger_resistance = "Hunger Resistance", + -- leap_of_faith = "Leap of Faith", + -- diversion = "Diversion", + -- master_mounter = "Master Mounter", + -- chameleos_blessing = "Chameleos Blessing", + -- kushala_blessing = "Kushala Blessing", + -- teostra_blessing = "Teostra Blessing", dragonheart = "Dragonheart", - resentment = "Resentment" + -- wirebug_whisperer = "Wirebug Whisperer", + wall_runner = "Wall Runner", + counterstrike = "Counterstrike", + -- rapid_morph = "Rapid Morph", + hellfire_cloak = "Hellfire Cloak", + -- wind_alignment = "Wind Alignment", + -- thunder_alignment = "Thunder Alignment", + -- stormsoul = "Stormsoul", + -- blood_rite = "Blood Rite", + dereliction = "Dereliction", + furious = "Furious", + -- mail_of_hellfire = "Mail of Hellfire", + coalescence = "Coalescence", + bloodlust = "Bloodlust", + -- defiance = "Defiance", + -- sneak_attack = "Sneak Attack", + adrenaline_rush = "Adrenaline Rush", + -- redirection = "Redirection", + -- spiribirds_call = "Spiribird's Call", + -- charge_master = "Charge Master", + -- foray = "Foray", + -- tune_up = "Tune-Up", + grinder_s = "Grinder (S)", + -- bladescale_hone = "Bladescale Hone", + -- wall_runner_boost = "Wall Runner (Boost)", + -- quick_breath = "Quick Breath", + -- element_exploit = "Element Exploit", + burst = "Burst", + -- guts = "Guts", + status_trigger = "Status Trigger", + intrepid_heart = "Intrepid Heart", + -- buildup_boost = "Buildup Boost", + -- embolden = "Embolden", + wind_mantle = "Wind Mantle", + -- powder_mantle = "Powder Mantle", + -- berserk = "Berserk", + -- strife = "Strife", + -- frostcraft = "Frostcraft", + -- dragon_conversion = "Dragon Conversion", + heaven_sent = "Heaven-Sent", + frenzied_bloodlust = "Frenzied Bloodlust", + -- blood_awakening = "Blood Awakening", + -- shock_absorber = "Shock Absorber", + -- inspiration = "Inspiration", + + kushala_daora_soul = "Kushala Daora Soul", }, dangos = { @@ -341,7 +464,9 @@ this.default_language = { }, otomo_moves = { - rousing_roar = "Rousing Roar" + rousing_roar = "Rousing Roar", + power_drum = "Power Drum", + go_fight_win = "Go, Fight, Win" }, UI = { diff --git a/reframework/data/MHR Overlay/languages/en-us.json b/reframework/data/MHR Overlay/languages/en-us.json index d69b4e4..71a9054 100644 --- a/reframework/data/MHR Overlay/languages/en-us.json +++ b/reframework/data/MHR Overlay/languages/en-us.json @@ -452,6 +452,8 @@ "wind_pressure_negated": "Wind Pressure Negated" }, "otomo_moves": { + "go_fight_win": "Go, Fight, Win", + "power_drum": "Power Drum", "rousing_roar": "Rousing Roar" }, "parts": { @@ -548,6 +550,7 @@ "protective_polish": "Protective Polish", "resentment": "Resentment", "resuscitate": "Resuscitate", + "status_trigger": "Status Trigger", "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 8cb62ca..f5382c0 100644 --- a/reframework/data/MHR Overlay/languages/ja-jp.json +++ b/reframework/data/MHR Overlay/languages/ja-jp.json @@ -453,6 +453,8 @@ "wind_pressure_negated": "Wind Pressure Negated" }, "otomo_moves": { + "go_fight_win": "Go, Fight, Win", + "power_drum": "Power Drum", "rousing_roar": "Rousing Roar" }, "parts": { @@ -549,6 +551,7 @@ "protective_polish": "Protective Polish", "resentment": "Resentment", "resuscitate": "Resuscitate", + "status_trigger": "Status Trigger", "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 9d71cf3..9f50cd6 100644 --- a/reframework/data/MHR Overlay/languages/ko-kr.json +++ b/reframework/data/MHR Overlay/languages/ko-kr.json @@ -454,6 +454,8 @@ "wind_pressure_negated": "Wind Pressure Negated" }, "otomo_moves": { + "go_fight_win": "Go, Fight, Win", + "power_drum": "Power Drum", "rousing_roar": "Rousing Roar" }, "parts": { @@ -550,6 +552,7 @@ "protective_polish": "Protective Polish", "resentment": "Resentment", "resuscitate": "Resuscitate", + "status_trigger": "Status Trigger", "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 c9d6917..eee7b9b 100644 --- a/reframework/data/MHR Overlay/languages/ru-ru.json +++ b/reframework/data/MHR Overlay/languages/ru-ru.json @@ -454,6 +454,8 @@ "wind_pressure_negated": "Wind Pressure Negated" }, "otomo_moves": { + "go_fight_win": "Go, Fight, Win", + "power_drum": "Power Drum", "rousing_roar": "Rousing Roar" }, "parts": { @@ -550,6 +552,7 @@ "protective_polish": "Protective Polish", "resentment": "Resentment", "resuscitate": "Resuscitate", + "status_trigger": "Status Trigger", "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 1318b04..a457e1a 100644 --- a/reframework/data/MHR Overlay/languages/zh-cn.json +++ b/reframework/data/MHR Overlay/languages/zh-cn.json @@ -454,6 +454,8 @@ "wind_pressure_negated": "Wind Pressure Negated" }, "otomo_moves": { + "go_fight_win": "Go, Fight, Win", + "power_drum": "Power Drum", "rousing_roar": "Rousing Roar" }, "parts": { @@ -550,6 +552,7 @@ "protective_polish": "Protective Polish", "resentment": "Resentment", "resuscitate": "Resuscitate", + "status_trigger": "Status Trigger", "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 eee7a1b..2968988 100644 --- a/reframework/data/MHR Overlay/languages/zh-tw.json +++ b/reframework/data/MHR Overlay/languages/zh-tw.json @@ -454,6 +454,8 @@ "wind_pressure_negated": "Wind Pressure Negated" }, "otomo_moves": { + "go_fight_win": "Go, Fight, Win", + "power_drum": "Power Drum", "rousing_roar": "Rousing Roar" }, "parts": { @@ -550,6 +552,7 @@ "protective_polish": "Protective Polish", "resentment": "Resentment", "resuscitate": "Resuscitate", + "status_trigger": "Status Trigger", "wall_runner": "Wall Runner", "wind_mantle": "Wind Mantle" },