Add Weapon Skills (Great Sword, Switch Axe, Long Sword)

reframework/autorun/MHR_Overlay/Buffs/buffs.lua

@@ -16,6 +16,7 @@ local skills;
 local dangos;
 local abnormal_statuses;
 local otomo_moves;
+local weapon_skills;
 
 local sdk = sdk;
 local tostring = tostring;
@@ -49,14 +50,6 @@ local os = os;
 local ValueType = ValueType;
 local package = package;
 
-this.types = {
-	consumable = 0,
-	melody_effect = 1,
-	dango = 2,
-	skill = 4,
-	debuff = 8
-};
-
 local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager");
 local get_player_method = player_manager_type_def:get_method("getPlayer");
 local find_master_player_method = player_manager_type_def:get_method("findMasterPlayer");
@@ -66,6 +59,9 @@ local get_player_data_method = player_base_type_def:get_method("get_PlayerData")
 
 local player_lobby_base_type_def = sdk.find_type_definition("snow.player.PlayerLobbyBase");
 
+local player_base_type_def = sdk.find_type_definition("snow.player.PlayerBase");
+local player_weapon_type_field = player_base_type_def:get_field("_playerWeaponType");
+
 function this.new(type, key, name, level, duration)
 	local is_infinite = false;
 
@@ -149,33 +145,47 @@ function this.update()
 		return;
 	end
 
-	local is_player_lobby_base = master_player:get_type_definition() == player_lobby_base_type_def;
+	melody_effects.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);
-		otomo_moves.update(master_player_data);
-
-		if not is_player_lobby_base then
-			skills.update(master_player, master_player_data);
-			dangos.update(master_player, master_player_data);
-			endemic_life_buffs.update(master_player, master_player_data);
-			abnormal_statuses.update(master_player, master_player_data);
-		end
-	else
+	if master_player_data == nil then
 		error_handler.report("buffs.update", "Failed to access Data: master_player_data");
+		return;
 	end
 
-	melody_effects.update(master_player);
+	local weapon_type = player_weapon_type_field:get_data(master_player);
+	if weapon_type == nil then
+		error_handler.report("skills.update", "Failed to access Data: weapon_type");
+		return;
+	end
+
+	local is_player_lobby_base = master_player:get_type_definition() == player_lobby_base_type_def;
+
+	consumables.update(master_player_data);
+	otomo_moves.update(master_player_data);
+
+	if not is_player_lobby_base then
+		skills.update(master_player, master_player_data, weapon_type);
+		dangos.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);
+	end
 end
 
-function this.update_timer(buff, timer)
+function this.update_timer(buff, timer, duration)
+	if timer == nil then
+		return;
+	end
+
 	if timer < 0 then
 		timer = 0;
 	end
 
-	if timer > buff.duration then
-		buff.duration = timer;
+	duration = duration or timer;
+
+	if duration > buff.duration then
+		buff.duration = duration;
 	end
 
 	local minutes_left = math.floor(timer / 60);
@@ -189,11 +199,118 @@ function this.update_timer(buff, timer)
 	end
 end
 
+function this.update_generic_buff(buff_list, buff_type, buff_key,
+	value_owner, value_holder,
+	timer_owner, timer_holder,
+	duration_owner, duration_holder,
+	is_infinite, minimal_value, level_breakpoints)
+
+	if timer_owner == nil then timer_owner = value_owner; end
+	if duration_owner == nil then duration_owner = value_owner; end
+	if minimal_value == nil then minimal_value = 1; end
+
+	local level = 1;
+
+	if value_holder ~= nil then
+		local value;
+		if utils.type.is_REField(value_holder) then
+			value = value_holder:get_data(value_owner);
+		else
+			value = value_holder:call(value_owner);
+		end
+		
+		if value == nil then
+			error_handler.report("buffs.update_generic_number", string.format("Failed to access Data: %s_value", buff_key));
+			return;
+		end
+
+		if utils.type.is_boolean(value) then
+			if not value then
+				buff_list[buff_key] = nil;
+				return;
+			end
+		else
+			if value < minimal_value then
+				buff_list[buff_key] = nil;
+				return;
+			end
+
+			if level_breakpoints ~= nil then
+				local level_breakpoints_count = #level_breakpoints;
+				for index, breakpoint in ipairs(level_breakpoints) do
+					if value >= breakpoint then
+						level = 2 + level_breakpoints_count - index;
+						break;
+					end
+				end
+			end
+		end
+	end
+
+	local timer = nil;
+	if timer_holder ~= nil then
+		if utils.type.is_REField(timer_holder) then
+			timer = timer_holder:get_data(timer_owner);
+		else
+			timer = timer_holder:call(timer_owner);
+		end
+
+		if timer == nil then
+			error_handler.report("buffs.update_generic_number", string.format("Failed to access Data: %s_timer", buff_key));
+			return;
+		end
+
+		if value_holder == nil and utils.number.is_equal(timer, 0) then
+			buff_list[buff_key] = nil;
+			return;
+		end
+
+		if is_infinite then
+			timer = nil;
+		else
+			timer = timer / 60;
+		end
+	end
+
+	local duration = nil;
+	if duration_holder ~= nil then
+		if utils.type.is_REField(duration_holder) then
+			duration = duration_holder:get_data(duration_owner);
+		else
+			duration = duration_holder:call(duration_owner);
+		end
+
+		if duration == nil then
+			error_handler.report("buffs.update_generic_number", string.format("Failed to access Data: %s_duration", buff_key));
+			return;
+		end
+	end
+
+	return this.update_generic(buff_list, buff_type, buff_key, level, timer, duration);
+end
+
+function this.update_generic(buff_list, buff_type, buff_key, level, timer, duration)
+	duration = duration or timer;
+	level = level or 1;
+
+	local buff = buff_list[buff_key];
+	if buff == nil then
+		local name = language.current_language[buff_type][buff_key];
+		
+		buff = this.new(buff_type, buff_key, name, level, duration);
+		buff_list[buff_key] = buff;
+	else
+		buff.level = level;
+		this.update_timer(buff, timer, duration);
+	end
+
+	return buff;
+end
+
 function this.draw(buff, buff_UI, position_on_screen, opacity_scale)
 	buff_UI_entity.draw(buff, buff_UI, position_on_screen, opacity_scale);
 end
 
-
 function this.init_dependencies()
 	config = require("MHR_Overlay.Misc.config");
 	buff_UI_entity = require("MHR_Overlay.UI.UI_Entities.buff_UI_entity");
@@ -211,6 +328,7 @@ function this.init_dependencies()
 	dangos = require("MHR_Overlay.Buffs.dangos");
 	abnormal_statuses = require("MHR_Overlay.Buffs.abnormal_statuses");
 	otomo_moves = require("MHR_Overlay.Buffs.otomo_moves");
+	weapon_skills = require("MHR_Overlay.Buffs.weapon_skills");
 end
 
 function this.init_module()