Fixed player id issues, refactored monster update function, implemented blast, poison and wyvern riding damage

reframework/autorun/MHR_Overlay/Damage_Meter/ailments.lua

@@ -0,0 +1,101 @@
+local ailments = {};
+local player;
+
+--0 Paralyze
+--1 Sleep
+--2 Stun
+--3 Flash
+--4 Poison
+--5 Blast
+--6 Stamina
+--7 MarionetteStart
+--8 Water
+--9 Fire
+--10 Ice
+--11 Thunder
+--12 FallTrap
+--13 ShockTrap
+--14 Capture
+--15 Koyashi
+--16 SteelFang
+
+ailments.poison_id = 4;
+ailments.blast_id = 5;
+
+function ailments.apply_ailment_buildup(monster, attacker_id, ailment_type, ailment_buildup)
+	if monster == nil or player == nil or (ailment_type ~= ailments.poison_id and ailment_type ~= ailments.blast_id) then
+		return;
+	end
+
+	-- get the buildup accumulator for this type
+	if monster.ailment[ailment_type].buildup == nil then
+		monster.ailment[ailment_type].buildup = {};
+	end
+	
+	-- accumulate this buildup for this attacker
+	monster.ailment[ailment_type].buildup[attacker_id] = (monster.ailment[ailment_type].buildup[attacker_id] or 0) + ailment_buildup;
+end
+
+-- Code by coavins
+function ailments.calculate_ailment_contribution(monster, ailment_type)
+	-- get total
+	local total = 0;
+	for attacker_id, player_buildup in pairs(monster.ailment[ailment_type].buildup) do
+		total = total + player_buildup;
+	end
+
+	for attacker_id, player_buildup in pairs(monster.ailment[ailment_type].buildup) do
+		-- update ratio for this attacker
+		monster.ailment[ailment_type].share[attacker_id] = player_buildup / total;
+		-- clear accumulated buildup for this attacker
+		-- they have to start over to earn a share of next ailment trigger
+		monster.ailment[ailment_type].buildup[attacker_id] = 0;
+	end
+end
+
+-- Code by coavins
+function ailments.apply_ailment_damage(monster, ailment_type, ailment_damage)
+	-- we only track poison and blast for now
+	if ailment_type == nil or ailment_damage == nil then
+		return;
+	end
+
+	local damage_source_type = "";
+	if ailment_type == ailments.poison_id then
+		damage_source_type = "poison";
+	elseif ailment_type == ailments.blast_id then
+		damage_source_type = "blast";
+	else
+		return;
+	end
+
+	local damage = ailment_damage;
+
+
+	-- split up damage according to ratio of buildup on boss for this type
+	for attacker_id, percentage in pairs(monster.ailment[ailment_type].share) do
+		local damage_portion = damage * percentage;
+		
+		local damage_object = {};
+		damage_object.total_damage = damage_portion;
+		damage_object.physical_damage = 0;
+		damage_object.elemental_damage = 0;
+		damage_object.ailment_damage = damage_portion;
+		
+		local attacking_player = player.get_player(attacker_id);
+		
+		if attacking_player ~= nil then
+			player.update_damage(attacking_player, damage_source_type, true, damage_object);
+		end
+
+		player.update_damage(player.total, damage_source_type, true, damage_object);
+	end
+
+	
+end
+
+function ailments.init_module()
+	player = require("MHR_Overlay.Damage_Meter.player");
+end
+
+return ailments;

reframework/autorun/MHR_Overlay/Damage_Meter/damage_hook.lua

@@ -1,6 +1,9 @@
 local damage_hook = {};
 local quest_status;
 local player;
+local small_monster;
+local large_monster;
+local ailments;
 
 local enemy_character_base_type_def = sdk.find_type_definition("snow.enemy.EnemyCharacterBase");
 local enemy_character_base_after_calc_damage_damage_side = enemy_character_base_type_def:get_method("afterCalcDamage_DamageSide");
@@ -11,11 +14,13 @@ local check_die_method = enemy_character_base_type_def:get_method("checkDie");
 local enemy_calc_damage_info_type_def =  sdk.find_type_definition("snow.hit.EnemyCalcDamageInfo.AfterCalcInfo_DamageSide");
 local get_attacker_id_method = enemy_calc_damage_info_type_def:get_method("get_AttackerID");
 local get_damage_attacker_type_method = enemy_calc_damage_info_type_def:get_method("get_DamageAttackerType");
+local is_marionette_attack_method = enemy_calc_damage_info_type_def:get_method("get_IsMarionetteAttack");
 
 local get_total_damage_method = enemy_calc_damage_info_type_def:get_method("get_TotalDamage");
 local get_physical_damage_method = enemy_calc_damage_info_type_def:get_method("get_PhysicalDamage");
 local get_elemental_damage_method = enemy_calc_damage_info_type_def:get_method("get_ElementDamage");
 local get_condition_damage_method = enemy_calc_damage_info_type_def:get_method("get_ConditionDamage");
+local get_condition_type_method = enemy_calc_damage_info_type_def:get_method("get_ConditionDamageType");
 
 sdk.hook(enemy_character_base_after_calc_damage_damage_side, function(args)
 	pcall(damage_hook.update_damage, args);
@@ -47,21 +52,31 @@ function damage_hook.update_damage(args)
 	local enemy_calc_damage_info = sdk.to_managed_object(args[3]); -- snow.hit.EnemyCalcDamageInfo.AfterCalcInfo_DamageSide
 	local attacker_id = get_attacker_id_method:call(enemy_calc_damage_info);
 	local attacker_type = get_damage_attacker_type_method:call(enemy_calc_damage_info);
-
-	if attacker_id >= 100 then
-		return;
-	end
-
+	local is_marionette_attack = is_marionette_attack_method:call(enemy_calc_damage_info)
+	
 	-- 4 is virtual player in singleplayer that 'owns' 2nd otomo
 	if not quest_status.is_online and attacker_id == 4 then
 		attacker_id = player.myself.player_id;
 	end
 
+	if is_marionette_attack then
+		large_monster.update_all_riders();
+		for enemy, monster in pairs(large_monster.list) do
+			if monster.unique_id == attacker_id then
+				attacker_id = monster.rider_id;
+				break;
+			end
+		end
+	end
+
 	local damage_object = {}
 	damage_object.total_damage = get_total_damage_method:call(enemy_calc_damage_info);
 	damage_object.physical_damage = get_physical_damage_method:call(enemy_calc_damage_info);
 	damage_object.elemental_damage = get_elemental_damage_method:call(enemy_calc_damage_info);
-	damage_object.ailment_damage = get_condition_damage_method:call(enemy_calc_damage_info);
+	damage_object.ailment_damage = 0;
+
+	local condition_damage = get_condition_damage_method:call(enemy_calc_damage_info);
+	local condition_type   = tonumber(get_condition_type_method:call(enemy_calc_damage_info));
 
 	-- -1 - bombs
 	--  0 - player
@@ -95,9 +110,28 @@ function damage_hook.update_damage(args)
 
 	local attacking_player = player.get_player(attacker_id);
 	if attacking_player == nil then
-		return;
+		--return;
 	end
 
+	local monster;
+	if is_large_monster then
+		monster = large_monster.get_monster(enemy);
+	else
+		monster = small_monster.get_monster(enemy);
+	end
+
+	--xy =
+	--	"type:             " .. tostring(damage_source_type) .. "\n" .. 
+	--	"total damage:     " .. tostring(damage_object.total_damage) .. "\n" ..
+	--	"physical damage:  " .. tostring(damage_object.physical_damage) .. "\n" ..
+	--	"elemental damage: " .. tostring(damage_object.elemental_damage) .. "\n" ..
+	--	"condition damage: " .. tostring(condition_damage) .. "\n" ..
+	--	"condition type:   " .. tostring(condition_type) .. "\n" ..
+	--	"is mario attack:  " .. tostring(is_marionette_attack) .. "\n" ..
+	--	"attacker id:      " .. tostring(attacker_id) .. "\n";
+
+	ailments.apply_ailment_buildup(monster, attacker_id, condition_type, condition_damage);
+
 	player.update_damage(player.total, damage_source_type, is_large_monster, damage_object);
 	player.update_damage(attacking_player, damage_source_type, is_large_monster, damage_object);
 end
@@ -105,6 +139,9 @@ end
 function damage_hook.init_module()
 	quest_status = require("MHR_Overlay.Game_Handler.quest_status");
 	player = require("MHR_Overlay.Damage_Meter.player");
+	small_monster = require("MHR_Overlay.Monsters.small_monster");
+	large_monster = require("MHR_Overlay.Monsters.large_monster");
+	ailments = require("MHR_Overlay.Damage_Meter.ailments");
 end
 
 return damage_hook;

reframework/autorun/MHR_Overlay/Damage_Meter/player.lua

@@ -61,6 +61,18 @@ function player.new(player_id, player_name, player_hunter_rank)
 	new_player.small_monsters.monster.elemental_damage = 0;
 	new_player.small_monsters.monster.ailment_damage = 0;
 
+	new_player.small_monsters.poison = {};
+	new_player.small_monsters.poison.total_damage = 0;
+	new_player.small_monsters.poison.physical_damage = 0;
+	new_player.small_monsters.poison.elemental_damage = 0;
+	new_player.small_monsters.poison.ailment_damage = 0;
+
+	new_player.small_monsters.blast = {};
+	new_player.small_monsters.blast.total_damage = 0;
+	new_player.small_monsters.blast.physical_damage = 0;
+	new_player.small_monsters.blast.elemental_damage = 0;
+	new_player.small_monsters.blast.ailment_damage = 0;
+
 	new_player.large_monsters = {};
 
 	new_player.large_monsters.total_damage = 0;
@@ -98,6 +110,18 @@ function player.new(player_id, player_name, player_hunter_rank)
 	new_player.large_monsters.monster.elemental_damage = 0;
 	new_player.large_monsters.monster.ailment_damage = 0;
 
+	new_player.large_monsters.poison = {};
+	new_player.large_monsters.poison.total_damage = 0;
+	new_player.large_monsters.poison.physical_damage = 0;
+	new_player.large_monsters.poison.elemental_damage = 0;
+	new_player.large_monsters.poison.ailment_damage = 0;
+
+	new_player.large_monsters.blast = {};
+	new_player.large_monsters.blast.total_damage = 0;
+	new_player.large_monsters.blast.physical_damage = 0;
+	new_player.large_monsters.blast.elemental_damage = 0;
+	new_player.large_monsters.blast.ailment_damage = 0;
+
 	new_player.display = {};
 	new_player.display.total_damage = 0;
 	new_player.display.physical_damage = 0;
@@ -146,8 +170,12 @@ function player.update_damage(_player, damage_source_type, is_large_monster, dam
 		player.merge_damage(player_monster_type.otomo, damage_object);
 	elseif damage_source_type == "monster" then
 		player.merge_damage(player_monster_type.monster, damage_object);
+	elseif damage_source_type == "poison" then
+		player.merge_damage(player_monster_type.poison, damage_object);
+	elseif damage_source_type == "blast" then
+		player.merge_damage(player_monster_type.blast, damage_object);
 	else
-		player.merge_damage(_player, damage_object);
+		player.merge_damage(player_monster_type, damage_object);
 	end
 
 	player.update_display(_player);
@@ -187,6 +215,14 @@ function player.update_display(_player)
 		if config.current_config.damage_meter_UI.tracked_damage_types.monster_damage then
 			player.merge_damage(_player.display, _player.small_monsters.monster);
 		end
+
+		if config.current_config.damage_meter_UI.tracked_damage_types.poison_damage then
+			player.merge_damage(_player.display, _player.small_monsters.poison);
+		end
+
+		if config.current_config.damage_meter_UI.tracked_damage_types.blast_damage then
+			player.merge_damage(_player.display, _player.small_monsters.blast);
+		end
 	end
 
 	if config.current_config.damage_meter_UI.tracked_monster_types.large_monsters then
@@ -213,6 +249,14 @@ function player.update_display(_player)
 		if config.current_config.damage_meter_UI.tracked_damage_types.monster_damage then
 			player.merge_damage(_player.display, _player.large_monsters.monster);
 		end
+
+		if config.current_config.damage_meter_UI.tracked_damage_types.poison_damage then
+			player.merge_damage(_player.display, _player.large_monsters.poison);
+		end
+
+		if config.current_config.damage_meter_UI.tracked_damage_types.blast_damage then
+			player.merge_damage(_player.display, _player.large_monsters.blast);
+		end
 	end
 end
 
@@ -273,8 +317,6 @@ end
 
 local lobby_manager_type_def = sdk.find_type_definition("snow.LobbyManager");
 local my_hunter_info_field = lobby_manager_type_def:get_field("_myHunterInfo");
-local myself_index_field = lobby_manager_type_def:get_field("_myselfIndex");
-local myself_quest_index_field = lobby_manager_type_def:get_field("_myselfQuestIndex");
 
 local quest_hunter_info_field = lobby_manager_type_def:get_field("_questHunterInfo");
 local hunter_info_field = lobby_manager_type_def:get_field("_hunterInfo");
@@ -291,6 +333,9 @@ local get_item_method = hunter_info_type_def:get_method("get_Item");
 local progress_manager_type_def = sdk.find_type_definition("snow.progress.ProgressManager");
 local get_hunter_rank_method = progress_manager_type_def:get_method("get_HunterRank");
 
+local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager");
+local get_master_player_id_method = player_manager_type_def:get_method("getMasterPlayerID");
+
 function player.update_player_list_in_village()
 	if singletons.lobby_manager == nil then
 		return;
@@ -318,12 +363,12 @@ function player.update_player_list_in_village()
 		customization_menu.status = "No myself hunter rank";
 		myself_hunter_rank = 0;
 	end
-		
-	local myself_id = myself_index_field:get_data(singletons.lobby_manager);
+
+	local myself_id = get_master_player_id_method:call(singletons.player_manager);
 	if myself_id == nil then
 		customization_menu.status = "No myself player id";
 	elseif player.myself == nil or myself_id ~= player.myself.id then
-		player.myself = player.new(myself_id, myself_player_name, myself_hunter_rank);
+			player.myself = player.new(myself_id, myself_player_name, myself_hunter_rank);
 		player.list[myself_id] = player.myself;
 	end
 
@@ -399,14 +444,13 @@ function player.update_player_list_on_quest()
 		myself_hunter_rank = 0;
 	end
 
-	local myself_id = myself_quest_index_field:get_data(singletons.lobby_manager);
+	local myself_id = get_master_player_id_method:call(singletons.player_manager);
 	if myself_id == nil then
-		customization_menu.status = "No myself player quest id";
+		customization_menu.status = "No myself player id";
 	elseif player.myself == nil or myself_id ~= player.myself.id then
 			player.myself = player.new(myself_id, myself_player_name, myself_hunter_rank);
 		player.list[myself_id] = player.myself;
 	end
-
 	
 	-- other players
 	local player_info_list = quest_hunter_info_field:get_data(singletons.lobby_manager);
@@ -427,7 +471,6 @@ function player.update_player_list_on_quest()
 			goto continue
 		end
 
-
 		local player_id = member_index_field:get_data(player_info);
 		
 		if player_id == nil then