Rename consumables to item_buffs

reframework/autorun/MHR_Overlay.lua

@@ -45,7 +45,7 @@ local utils = require("MHR_Overlay.Misc.utils");
 local player_info = require("MHR_Overlay.Misc.player_info");
 
 local buffs = require("MHR_Overlay.Buffs.buffs");
-local consumables = require("MHR_Overlay.Buffs.consumables");
+local item_buffs = require("MHR_Overlay.Buffs.item_buffs");
 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");
@@ -129,7 +129,7 @@ buff_UI_entity.init_dependencies();
 player_info.init_dependencies();
 
 buffs.init_dependencies();
-consumables.init_dependencies();
+item_buffs.init_dependencies();
 melody_effects.init_dependencies();
 endemic_life_buffs.init_dependencies();
 skills.init_dependencies();
@@ -208,7 +208,7 @@ buff_UI_entity.init_module();
 player_info.init_module();
 
 buffs.init_module();
-consumables.init_module();
+item_buffs.init_module();
 melody_effects.init_module();
 endemic_life_buffs.init_module();
 skills.init_module();

reframework/autorun/MHR_Overlay/Buffs/buffs.lua

@@ -4,7 +4,7 @@ local buff_UI_entity;
 local config;
 local singletons;
 local players;
-local consumables;
+local item_buffs;
 local melody_effects;
 local utils;
 local language;
@@ -59,27 +59,28 @@ local package = package;
 	[x] DONE! Weapon buffs
 	[x] DONE! Horn music
 	[x] DONE! abnormal_statuses: Immunity
-	[x] DONE! consumables: Stinkmink
+	[x] DONE! item_buffs: Stinkmink
 	[x] DONE! rampage skills: Chameleos Soul
-	[x] WONT IMPLEMENT! skills: Furious Buildup
 	[x] DONE! skills: powder mantle
-	[x] WONT IMPLEMENT! skills: frostcraft
-	[x] COULDNT FIND! skills: defiance -- 
 	[x] DONE! skills: embolden
 	[x] DONE! skills: strife
 	[x] DONE! skills: berserk
 	[x] DONE! skills: dragon conversion
 	[x] DONE! abnormal_statuses: Pre-Sleep
+	[x] DONE! skills: charge master
+	[x] DONE! endemic_life_buffs: Red, Yellow Lampsquid
+	[x] DONE! weapon skills - Arc Shot: Affinity, Arc Shot: Brace
+	[x] DONE! Demon Ammo, Armor Ammo
 	More otomo skills
-	skills: Part breaker, charge master
-	Demon Ammo, Armor Ammo
-	weapon skills - Arc Shot: Affinity, Arc Shot: Brace
-	endemic_life_buffs: Red, Yellow Lampsquid
 	Add duration detection to skills
 	Add duration detection to otomo moves
 	Add duration detection to dango skills
 	Add duration detection to rampage skills
 	Add duration detection to endemic life buffs
+
+	[x] WONT IMPLEMENT! skills: Furious Buildup
+	[x] WONT IMPLEMENT! skills: frostcraft
+	[x] COULDNT FIND! skills: defiance
 ]]
 
 local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager");
@@ -153,6 +154,8 @@ function this.init_names()
 	misc_buffs.init_names();
 end
 
+local tere = {};
+
 function this.update()
 	if not config.current_config.buff_UI.enabled then
 		return;
@@ -191,7 +194,7 @@ function this.update()
 
 	local is_player_lobby_base = master_player:get_type_definition() == player_lobby_base_type_def;
 
-	consumables.update(master_player_data);
+	item_buffs.update(master_player_data);
 	otomo_moves.update(master_player_data);
 	rampage_skills.update(master_player_data);
 
@@ -206,13 +209,17 @@ function this.update()
 
 	-- xy = "";
 
-	-- local fields =  sdk.find_type_definition("snow.player.PlayerData"):get_fields();
+	-- local fields = master_player_data:get_type_definition():get_fields();
+
 	-- for i = 1, 999 do
 	-- 	if fields[i] ~= nil then
 	-- 		local value = fields[i]:get_data(master_player_data);
 	-- 		if value ~= nil then
 	-- 			pcall(function()
-	-- 				if not utils.number.is_equal(value, 0) then
+	-- 				if tere[fields[i]] == nil then
+	-- 					tere[fields[i]] = value;
+
+	-- 				elseif not utils.number.is_equal(value, tere[fields[i]]) then
 	-- 					xy = string.format("%s%s: %s\n", xy, fields[i]:get_name(), tostring(value));
 	-- 				end
 	-- 			end);
@@ -364,7 +371,7 @@ function this.init_dependencies()
 	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");
-	consumables = require("MHR_Overlay.Buffs.consumables");
+	item_buffs = require("MHR_Overlay.Buffs.item_buffs");
 	melody_effects = require("MHR_Overlay.Buffs.melody_effects");
 	utils = require("MHR_Overlay.Misc.utils");
 	language = require("MHR_Overlay.Misc.language");

reframework/autorun/MHR_Overlay/Buffs/item_buffs.lua

@@ -56,7 +56,7 @@ this.list = {
 	gourmet_fish = nil,
 };
 
-local consumable_ids = {
+local item_ids = {
 	demondrug = 68157917,
 	mega_demondrug = 68157918,
 	armorskin = 68157922,
@@ -67,10 +67,12 @@ local consumable_ids = {
 	hardshell_powder = 68157925,
 	immunizer = 68157911,
 	--dash_juice = 68157913,
-	gourmet_fish = 68157909
+	gourmet_fish = 68157909,
+	demon_ammo = 68157595,
+	armor_ammo = 68157596
 }
 
-local consumables_type_name = "consumables";
+local item_buffs_type_name = "item_buffs";
 
 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");
@@ -108,6 +110,10 @@ local def_up_item_second_timer_field = player_data_type_def:get_field("_DefUpIte
 local vitalizer_timer_field = player_data_type_def:get_field("_VitalizerTimer");
 -- Gourmet Fish
 local fish_regene_enable_field = player_data_type_def:get_field("_FishRegeneEnableTimer");
+-- Demon Ammo
+local kijin_bullet_timer_field = player_data_type_def:get_field("_KijinBulletTimer");
+-- Armor Ammo
+local kouka_bullet_timer_field = player_data_type_def:get_field("_KoukaBulletTimer");
 
 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.ContentsIdSystem.ItemId)");
@@ -115,32 +121,38 @@ local get_name_method = data_shortcut_type_def:get_method("getName(snow.data.Con
 function this.update(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");
+		error_handler.report("item_buffs.update", "Failed to access Data: item_parameter");
 		return;
 	end
 
-	local cached_language = language.current_language
+	local cached_language = language.current_language;
 
 	this.update_demondrug(player_data, item_parameter);
 	this.update_armorskin(player_data, item_parameter);
 	
-	buffs.update_generic_buff(this.list, consumables_type_name, "demon_powder", this.get_consumable_name,
+	buffs.update_generic_buff(this.list, item_buffs_type_name, "demon_powder", this.get_item_name,
 		player_data, atk_up_item_second_field, player_data, atk_up_item_second_timer_field, item_parameter, demondrug_powder_timer_field);
 	
-	buffs.update_generic_buff(this.list, consumables_type_name, "hardshell_powder", this.get_consumable_name,
+	buffs.update_generic_buff(this.list, item_buffs_type_name, "hardshell_powder", this.get_item_name,
 		player_data, def_up_item_second_field, player_data, def_up_item_second_timer_field, item_parameter, armorskin_powder_timer_field);
 	
-	buffs.update_generic_buff(this.list, consumables_type_name, "immunizer", this.get_consumable_name,
+	buffs.update_generic_buff(this.list, item_buffs_type_name, "immunizer", this.get_item_name,
 		nil, nil, player_data, vitalizer_timer_field, item_parameter, vitalizer_timer_const_field);
 
-	buffs.update_generic_buff(this.list, consumables_type_name, "gourmet_fish", this.get_consumable_name,
+	buffs.update_generic_buff(this.list, item_buffs_type_name, "gourmet_fish", this.get_item_name,
-		nil, nil, player_data, fish_regene_enable_field, nil, nil);
+		nil, nil, player_data, fish_regene_enable_field);
+
+	buffs.update_generic_buff(this.list, item_buffs_type_name, "demon_ammo", this.get_item_name,
+		nil, nil, player_data, kijin_bullet_timer_field);
+
+	buffs.update_generic_buff(this.list, item_buffs_type_name, "armor_ammo", this.get_item_name,
+		nil, nil, player_data, kouka_bullet_timer_field);
 end
 
 function this.update_demondrug(player_data, item_parameter)
 	local demondrug_value = atk_up_alive_field:get_data(player_data);
 	if demondrug_value == nil then
-		error_handler.report("consumables.update_demondrug", "Failed to access Data: demondrug_value");
+		error_handler.report("item_buffs.update_demondrug", "Failed to access Data: demondrug_value");
 		return;
 	end
 
@@ -152,33 +164,33 @@ function this.update_demondrug(player_data, item_parameter)
 
 	local demondrug_const_value = demondrug_atk_up_field:get_data(item_parameter);
 	if demondrug_const_value == nil then
-		error_handler.report("consumables.update_demondrug", "Failed to access Data: demondrug_const_value");
+		error_handler.report("item_buffs.update_demondrug", "Failed to access Data: demondrug_const_value");
 		return;
 	end
 
 	local mega_demondrug_const_value = great_demondrug_atk_up_field:get_data(item_parameter);
 	if mega_demondrug_const_value == nil then
-		error_handler.report("consumables.update_demondrug", "Failed to access Data: mega_demondrug_const_value");
+		error_handler.report("item_buffs.update_demondrug", "Failed to access Data: mega_demondrug_const_value");
 		return;
 	end
 
-	local consumable_key;
+	local item_key;
 	if demondrug_value == demondrug_const_value then
-		consumable_key = "demondrug";
+		item_key = "demondrug";
 		this.list.mega_demondrug = nil;
 	
 	elseif demondrug_value == mega_demondrug_const_value then
-		consumable_key = "mega_demondrug";
+		item_key = "mega_demondrug";
 		this.list.demondrug = nil;
 	end
 
-	buffs.update_generic(this.list, consumables_type_name, consumable_key, this.get_consumable_name);
+	buffs.update_generic(this.list, item_buffs_type_name, item_key, this.get_item_name);
 end
 
 function this.update_armorskin(player_data, item_parameter)
 	local armorskin_value = def_up_alive_field:get_data(player_data);
 	if armorskin_value == nil then
-		error_handler.report("consumables.update_armorskin", "Failed to access Data: armorskin_value");
+		error_handler.report("item_buffs.update_armorskin", "Failed to access Data: armorskin_value");
 		return;
 	end
 
@@ -190,37 +202,37 @@ function this.update_armorskin(player_data, item_parameter)
 
 	local armorskin_const_value = armorskin_def_up_field:get_data(item_parameter);
 	if armorskin_const_value == nil then
-		error_handler.report("consumables.update_armorskin", "Failed to access Data: armorskin_const_value");
+		error_handler.report("item_buffs.update_armorskin", "Failed to access Data: armorskin_const_value");
 		return;
 	end
 
 	local mega_armorskin_const_value = great_armorskin_def_up_field:get_data(item_parameter);
 	if mega_armorskin_const_value == nil then
-		error_handler.report("consumables.update_armorskin", "Failed to access Data: mega_armorskin_const_value");
+		error_handler.report("item_buffs.update_armorskin", "Failed to access Data: mega_armorskin_const_value");
 		return;
 	end
 
-	local consumable_key;
+	local item_key;
 	if armorskin_value == armorskin_const_value then
-		consumable_key = "armorskin";
+		item_key = "armorskin";
 		this.list.mega_armorskin = nil;
 	
 	elseif armorskin_value == mega_armorskin_const_value then
-		consumable_key = "mega_armorskin";
+		item_key = "mega_armorskin";
 		this.list.armorskin = nil;
 	end
 
-	buffs.update_generic(this.list, consumables_type_name, consumable_key, this.get_consumable_name);
+	buffs.update_generic(this.list, item_buffs_type_name, item_key, this.get_item_name);
 end
 
-function this.get_consumable_name(consumable_key)
+function this.get_item_name(item_key)
-	local consumable_name = get_name_method:call(nil, consumable_ids[consumable_key]);
+	local item_name = get_name_method:call(nil, item_ids[item_key]);
-	if consumable_name == nil then
+	if item_name == nil then
-		error_handler.report("consumables.get_consumable_name", string.format("Failed to access Data: %s_name", consumable_key));
+		error_handler.report("item_buffs.get_item_name", string.format("Failed to access Data: %s_name", item_key));
-		return consumable_key;
+		return item_key;
 	end
 
-	return consumable_name;
+	return item_name;
 end
 
 function this.init_dependencies()

reframework/autorun/MHR_Overlay/Buffs/misc_buffs.lua

@@ -9,7 +9,7 @@ local utils;
 local language;
 local error_handler;
 local endemic_life_buffs;
-local consumables;
+local item_buffs;
 
 local sdk = sdk;
 local tostring = tostring;
@@ -116,7 +116,7 @@ function this.init_dependencies()
 	language = require("MHR_Overlay.Misc.language");
 	error_handler = require("MHR_Overlay.Misc.error_handler");
 	endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs");
-	consumables = require("MHR_Overlay.Buffs.consumables");
+	item_buffs = require("MHR_Overlay.Buffs.item_buffs");
 end
 
 function this.init_module()

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

@@ -3,7 +3,7 @@ local this = {};
 local buff_UI_entity;
 local config;
 local buffs;
-local consumables;
+local item_buffs;
 local melody_effects;
 local endemic_life_buff;
 local screen;
@@ -56,13 +56,13 @@ function this.update()
 
 	local _displayed_buffs = {};
 
-	for key, consumable in pairs(consumables.list) do
+	for key, item_buff in pairs(item_buffs.list) do
 		
-		if not consumable.is_active then
+		if not item_buff.is_active then
 			goto continue;
 		end
 
-		table.insert(_displayed_buffs, consumable);
+		table.insert(_displayed_buffs, item_buff);
 
 		::continue::
 	end
@@ -224,7 +224,7 @@ end
 function this.init_dependencies()
 	config = require("MHR_Overlay.Misc.config");
 	buff_UI_entity = require("MHR_Overlay.UI.UI_Entities.buff_UI_entity");
-	consumables = require("MHR_Overlay.Buffs.consumables");
+	item_buffs = require("MHR_Overlay.Buffs.item_buffs");
 	melody_effects = require("MHR_Overlay.Buffs.melody_effects");
 	buffs = require("MHR_Overlay.Buffs.buffs");
 	--singletons = require("MHR_Overlay.Game_Handler.singletons");

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

@@ -3,7 +3,7 @@ local this = {};
 local buff_UI_entity;
 local config;
 local buffs;
-local consumables;
+local item_buffs;
 local melody_effects;
 local endemic_life_buff;
 local screen;
@@ -293,7 +293,7 @@ end
 function this.init_dependencies()
 	config = require("MHR_Overlay.Misc.config");
 	buff_UI_entity = require("MHR_Overlay.UI.UI_Entities.buff_UI_entity");
-	consumables = require("MHR_Overlay.Buffs.consumables");
+	item_buffs = require("MHR_Overlay.Buffs.item_buffs");
 	melody_effects = require("MHR_Overlay.Buffs.melody_effects");
 	buffs = require("MHR_Overlay.Buffs.buffs");
 	--singletons = require("MHR_Overlay.Game_Handler.singletons");