Rename "Dangos" to "Dango Skills"

reframework/autorun/MHR_Overlay.lua

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

reframework/autorun/MHR_Overlay/Buffs/buffs.lua

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

reframework/autorun/MHR_Overlay/Buffs/dango_skills.lua

@@ -45,6 +45,7 @@ this.list = {
 	dango_adrenaline = nil,
 	dango_booster = nil,
 	dango_bulker = nil,
+	dango_insurance = nil,
 	dango_insurance_defense_up = nil,
 	dango_glutton = nil,
 	dango_flyer = nil,
@@ -115,12 +116,13 @@ local dango_ids = {
 
 this.is_dango_adrenaline_active = false;
 
-local dangos_type_name = "dangos";
+local dango_skills_type_name = "dango_skills";
 local dango_bulker_attack_up = 15;
 local previous_super_recovery_dango_timer = 0;
 
 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_player_skill_method = player_manager_type_def:get_method("get_PlayerSkill");
 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();
@@ -146,7 +148,6 @@ local kitchen_skill_051_atk_up_timer_field = player_data_type_def:get_field("_Ki
 local kitchen_skill_054_timer_field = player_data_type_def:get_field("_KitchenSkill054_Timer");
 
 
-
 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");
@@ -158,61 +159,46 @@ local get_kitchen_skill_surume_regene_timer_method = player_base_type_def:get_me
 
 local player_quest_base_type_def = sdk.find_type_definition("snow.player.PlayerQuestBase");
 
+local player_skill_list_type_def = sdk.find_type_definition("snow.player.PlayerSkillList");
+local has_kitchen_skill_method = player_skill_list_type_def:get_method("hasKitchenSkill");
+
 local data_shortcut_type_def = sdk.find_type_definition("snow.data.DataShortcut");
 local get_name_method = data_shortcut_type_def:get_method("getName(snow.data.DataDef.PlKitchenSkillId)");
 
+local quest_manager_type_def = sdk.find_type_definition("snow.QuestManager");
+local flag_cat_skill_insurance_field = quest_manager_type_def:get_field("_FlagCatSkillInsurance");
+local is_cat_skill_insurance_method = quest_manager_type_def:get_method("isCatSkillInsurance");
+
+
+local system_array_type_def = sdk.find_type_definition("System.Array");
+local get_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("dangos.update", "Failed to access Data: item_parameter");
+		error_handler.report("dango_skills.update", "Failed to access Data: item_parameter");
 		return;
 	end
 
-	-- local tbl = {
-	-- 	"startKitchenSkillShortHypnosis",
-	-- 	"startKitchenSkillReduseUseStamina",
-	-- };
-
-	-- local str = "";
-	-- for _, method in ipairs(tbl) do
-	-- 	local value = player_data:call(method);
-	-- 	str = string.format("%s%s: %s\n", str, method, tostring(value));
-	-- end
-
-	-- local value = player:call("getKitchenSkillRevival", 0);
-	-- str = string.format("%s%s: %s\n", str, "getKitchenSkillRevival 0", tostring(value));
-
-	-- value = player:call("getKitchenSkillRevival", 1);
-	-- str = string.format("%s%s: %s\n", str, "getKitchenSkillRevival 1", tostring(value));
-
-	-- value = player:call("getKitchenSkillRevival", 2);
-	-- str = string.format("%s%s: %s\n", str, "getKitchenSkillRevival 2", tostring(value));
-
-	-- value = player:call("getKitchenSkillRevival", 3);
-	-- str = string.format("%s%s: %s\n", str, "getKitchenSkillRevival 3", tostring(value));
-
-	-- value = player:call("getKitchenSkillRevival", 4);
-	-- str = string.format("%s%s: %s\n", str, "getKitchenSkillRevival 4", tostring(value));
-
-	-- xy = str;
-
 	this.update_dango_adrenaline();
 	this.update_dango_bulker(player_data);
 	this.update_dango_hunter(player_data);
+	this.update_dango_insurance();
 	this.update_dango_insurance_defense_up(player_data);
 	this.update_dango_flyer(player);
 	this.update_super_recovery_dango(player);
 
-	buffs.update_generic_buff(this.list, dangos_type_name, "dango_defender", this.get_dango_name,
+	buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_defender", this.get_dango_name,
 		player_data, is_enable_kitchen_skill_048_reduce_method, nil, nil, nil, nil, true);
 
-	buffs.update_generic_buff(this.list, dangos_type_name, "dango_booster", this.get_dango_name,
+	buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_booster", this.get_dango_name,
 		nil, nil, player_data, kitchen_skill_027_timer_field);
 
-	buffs.update_generic_buff(this.list, dangos_type_name, "dango_glutton", this.get_dango_name,
+	buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_glutton", this.get_dango_name,
 		nil, nil, player_data, kitchen_skill_045_timer_field);
 
-	buffs.update_generic_buff(this.list, dangos_type_name, "dango_connector", this.get_dango_name,
+	buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_connector", this.get_dango_name,
 		nil, nil, player_data, kitchen_skill_054_timer_field);
 end
 
@@ -222,7 +208,7 @@ function this.update_dango_adrenaline()
 		return;
 	end
 
-	buffs.update_generic(this.list, dangos_type_name, "dango_adrenaline", this.get_dango_name);
+	buffs.update_generic(this.list, dango_skills_type_name, "dango_adrenaline", this.get_dango_name);
 end
 
 function this.update_dango_bulker(player_data)
@@ -237,7 +223,79 @@ function this.update_dango_bulker(player_data)
 		return;
 	end
 
-	buffs.update_generic_buff(this.list, dangos_type_name, "dango_bulker", this.get_dango_name, nil, nil, player_data, atk_up_buff_second_timer_field);
+	buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_bulker", this.get_dango_name, nil, nil, player_data, atk_up_buff_second_timer_field);
+end
+
+function this.update_dango_insurance()
+	if singletons.player_manager == nil then
+		error_handler.report("consumables.update_dango_insurance", "Failed to access Data: player_manager");
+		return;
+	end
+
+	if singletons.quest_manager == nil then
+		error_handler.report("consumables.update_dango_insurance", "Failed to access Data: quest_manager");
+		return;
+	end
+
+	local player_skill_list_array = get_player_skill_method:call(singletons.player_manager);
+	if player_skill_list_array == nil then
+		error_handler.report("consumables.update_dango_insurance", "Failed to access Data: player_skill_list_array");
+		return;
+	end
+
+	local player_skill_list_array_length = get_length_method:call(player_skill_list_array);
+	if player_skill_list_array_length == nil then
+		error_handler.report("consumables.update_dango_insurance", "Failed to access Data: player_skill_array_list_length");
+		return;
+	end
+
+	local length = player_skill_list_array_length - 1;
+
+	local has_insurance_skill = false;
+
+	for player_id = 0, length do
+		if players.list[player_id] == nil then
+			goto continue;
+		end
+
+		local player_skill_list = get_value_method:call(player_skill_list_array, player_id);
+		if player_skill_list_array_length == nil then
+			error_handler.report("consumables.update_dango_insurance", "Failed to access Data: player_skill_list No. " .. tostring(player_id));
+			goto continue;
+		end
+
+		local kitchen_skill = has_kitchen_skill_method:call(player_skill_list, dango_ids.dango_insurance);
+		if kitchen_skill == nil then
+			error_handler.report("consumables.update_dango_insurance", "Failed to access Data: kitchen_skill No. " .. tostring(player_id));
+			goto continue;
+		end
+
+		if kitchen_skill then
+			has_insurance_skill = true;
+			break;
+		end
+
+		::continue::
+	end
+
+	local flag_cat_skill_insurance = flag_cat_skill_insurance_field:get_data(singletons.quest_manager);
+	if flag_cat_skill_insurance == nil then
+		error_handler.report("consumables.update_dango_insurance", "Failed to access Data: flag_cat_skill_insurance");
+		return;
+	end
+
+	local is_cat_skill_insurance = is_cat_skill_insurance_method:call(singletons.quest_manager, flag_cat_skill_insurance);
+	if is_cat_skill_insurance == nil then
+		error_handler.report("consumables.update_dango_insurance", "Failed to access Data: is_cat_skill_insurance");
+		return;
+	end
+
+	if not has_insurance_skill or is_cat_skill_insurance then
+		this.list.dango_insurance = nil;
+		return;
+	end
+
+	buffs.update_generic(this.list, dango_skills_type_name, "dango_insurance", this.get_dango_name, 1);
 end
 
 function this.update_dango_insurance_defense_up(player_data)
@@ -245,27 +303,27 @@ function this.update_dango_insurance_defense_up(player_data)
 
 	local insurance_def_up_lv3 = kitchen_skill_insurance_def_up_lv3_field:get_data(player_data);
 	if insurance_def_up_lv3 == nil then
-		error_handler.report("dangos.update_dango_insurance", "Failed to access Data: insurance_def_up_lv3");
+		error_handler.report("dango_skills.update_dango_insurance_defense_up", "Failed to access Data: insurance_def_up_lv3");
 		return;
 	end
 
 	if not insurance_def_up_lv3 then
-
 		local insurance_def_up_lv4 = kitchen_skill_insurance_def_up_lv4_field:get_data(player_data);
+
 		if insurance_def_up_lv4 == nil then
-			error_handler.report("dangos.update_dango_insurance", "Failed to access Data: insurance_def_up_lv4");
+			error_handler.report("dango_skills.update_dango_insurance_defense_up", "Failed to access Data: insurance_def_up_lv4");
 			return;
 		end
 
 		if not insurance_def_up_lv4 then
-			this.list.insurance_defense_up = nil;
+			this.list.dango_insurance_defense_up = nil;
 			return;
 		end
 
 		level = 4;
 	end
 
-	buffs.update_generic(this.list, dangos_type_name, "dango_insurance_defense_up", this.get_dango_name, level);	
+	buffs.update_generic(this.list, dango_skills_type_name, "dango_insurance_defense_up", this.get_dango_name, level);	
 end
 
 function this.update_dango_flyer(player)
@@ -273,7 +331,7 @@ function this.update_dango_flyer(player)
 
 	local is_kitchen_skill_wire_stop_regene = get_is_kitchen_skill_wire_stop_regene_method:call(player);
 	if is_kitchen_skill_wire_stop_regene == nil then
-		error_handler.report("dangos.update_dango_flyer", "Failed to access Data: is_kitchen_skill_wire_stop_regene");
+		error_handler.report("dango_skills.update_dango_flyer", "Failed to access Data: is_kitchen_skill_wire_stop_regene");
 		return;
 	end
 
@@ -281,7 +339,7 @@ function this.update_dango_flyer(player)
 
 		local is_kitchen_skill_wire_stop_heal_spd = get_is_kitchen_skill_wire_stop_heal_spd_method:call(player);
 		if is_kitchen_skill_wire_stop_heal_spd == nil then
-			error_handler.report("dangos.update_dango_flyer", "Failed to access Data: is_kitchen_skill_wire_stop_heal_spd");
+			error_handler.report("dango_skills.update_dango_flyer", "Failed to access Data: is_kitchen_skill_wire_stop_heal_spd");
 			return;
 		end
 
@@ -293,11 +351,11 @@ function this.update_dango_flyer(player)
 		level = 3;
 	end
 
-	buffs.update_generic(this.list, dangos_type_name, "dango_flyer", this.get_dango_name, level);	
+	buffs.update_generic(this.list, dango_skills_type_name, "dango_flyer", this.get_dango_name, level);	
 end
 
 function this.update_dango_hunter(player_data)
-	local dango_hunter_buff = buffs.update_generic_buff(this.list, dangos_type_name, "dango_hunter", this.get_dango_name,
+	local dango_hunter_buff = buffs.update_generic_buff(this.list, dango_skills_type_name, "dango_hunter", this.get_dango_name,
 		nil, nil, player_data, kitchen_skill_051_atk_up_timer_field);
 
 	if dango_hunter_buff then
@@ -308,7 +366,7 @@ end
 function this.update_super_recovery_dango(player)
 	local kitchen_skill_surume_regene_timer = get_kitchen_skill_surume_regene_timer_method:call(player);
 	if kitchen_skill_surume_regene_timer == nil then
-		error_handler.report("dangos.update_super_recovery_dango", "Failed to access Data: kitchen_skill_surume_regene_timer");
+		error_handler.report("dango_skills.update_super_recovery_dango", "Failed to access Data: kitchen_skill_surume_regene_timer");
 		return;
 	end
 
@@ -320,27 +378,27 @@ function this.update_super_recovery_dango(player)
 
 	previous_super_recovery_dango_timer = kitchen_skill_surume_regene_timer;
 
-	buffs.update_generic(this.list, dangos_type_name, "super_recovery_dango", this.get_dango_name);	
+	buffs.update_generic(this.list, dango_skills_type_name, "super_recovery_dango", this.get_dango_name);	
 end
 
 function this.get_dango_name(dango_key)
 	if dango_ids[dango_key] == nil then
 		
-		local dango_name = language.current_language.dangos[dango_key];
-		if dango_name == nil then
+		local dango_skill_name = language.current_language.dango_skills[dango_key];
+		if dango_skill_name == nil then
 			return dango_key;
 		end
 
-		return dango_name;
+		return dango_skill_name;
 	end
 
-	local dango_name = get_name_method:call(nil, dango_ids[dango_key]);
-	if dango_name == nil then
-		error_handler.report("dangos.get_dango_name", string.format("Failed to access Data: %s_name", dango_key));
+	local dango_skill_name = get_name_method:call(nil, dango_ids[dango_key]);
+	if dango_skill_name == nil then
+		error_handler.report("dango_skills.get_dango_name", string.format("Failed to access Data: %s_name", dango_key));
 		return dango_key;
 	end
 
-	return dango_name;
+	return dango_skill_name;
 end
 
 function this.init_dependencies()

reframework/autorun/MHR_Overlay/Misc/language.lua

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

reframework/autorun/MHR_Overlay/Misc/player_info.lua

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

reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua

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

reframework/autorun/MHR_Overlay/UI/Modules/stats_UI.lua

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

reframework/data/MHR Overlay/languages/en-us.json

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

reframework/data/MHR Overlay/languages/ja-jp.json

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

reframework/data/MHR Overlay/languages/ko-kr.json

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

reframework/data/MHR Overlay/languages/ru-ru.json

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

reframework/data/MHR Overlay/languages/zh-cn.json

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

reframework/data/MHR Overlay/languages/zh-tw.json

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