Make Monk's Storm, Earth, and Fire adds have their names in the charts

Tercioo · Mar 26, 2021 · 476e616 · 476e616
1 parent 94887b9
commit 476e616
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/classes/container_actors.lua b/classes/container_actors.lua
@@ -506,6 +506,7 @@
 
 		if (container_pets [serial]) then --> � um pet reconhecido
 			--[[statistics]]-- _detalhes.statistics.container_pet_calls = _detalhes.statistics.container_pet_calls + 1
+
 			local nome_dele, dono_nome, dono_serial, dono_flag = _detalhes.tabela_pets:PegaDono (serial, nome, flag)
 			if (nome_dele and dono_nome) then
 				nome = nome_dele

diff --git a/classes/container_pets.lua b/classes/container_pets.lua
@@ -52,7 +52,7 @@ function container_pets:PegaDono (pet_serial, pet_nome, pet_flags)
 			pet_nome = pet_nome .. " <".. ownerName ..">"
 		end
 
-		return pet_nome, busca[1], busca[2], busca[3] --> [1] dono nome [2] dono serial [3] dono flag
+		return busca[6] or pet_nome, busca[1], busca[2], busca[3] --> [1] dono nome [2] dono serial [3] dono flag
 	end
 
 	--> buscar pelo pet na raide
@@ -101,7 +101,7 @@ function container_pets:PegaDono (pet_serial, pet_nome, pet_flags)
 	end
 
 	if (dono_nome) then
-		self.pets [pet_serial] = {dono_nome, dono_serial, dono_flags, _detalhes._tempo, true} --> adicionada a flag emulada
+		self.pets [pet_serial] = {dono_nome, dono_serial, dono_flags, _detalhes._tempo, true, pet_nome, pet_serial} --> adicionada a flag emulada
 
 		if (not pet_nome:find ("<")) then
 			pet_nome = pet_nome .. " <".. dono_nome ..">"

diff --git a/core/parser.lua b/core/parser.lua
@@ -727,7 +727,7 @@
 
 		if (not jogador_alvo) then
 			local instanceName, _, _, _, _, _, _, instanceId = GetInstanceInfo()
-			Details:Msg("Report 0x885488", alvo_name, instanceName, instanceId, damage_cache[alvo_serial] and "true")
+			Details:Msg("D! Report 0x885488", alvo_name, instanceName, instanceId, damage_cache[alvo_serial] and "true")
 			return
 		end
 
@@ -1581,9 +1581,22 @@
 			return
 		end
 
+--print(token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, spellid, spellName)
+--Player-3209-083BBABE Kastfall 1297 Creature-0-4229-1642-17-69792-00005E1CC4 Earth Spirit 8465 0 138121 Storm, Earth, and Fire
+--Player-3209-083BBABE Kastfall 1297 Creature-0-4229-1642-17-69791-00005E1CC4 Fire Spirit 8465 0 138123 Storm, Earth, and Fire
+
 		if (not who_name) then
 			who_name = "[*] " .. spellName
 		end
+
+		local npcId = _tonumber(_select (6, _strsplit ("-", alvo_serial)) or 0)
+
+		--rename monk's "Storm, Earth, and Fire" adds
+		if (npcId == 69792) then 
+			alvo_name = "Earth Spirit"
+		elseif (npcId == 69791) then
+			alvo_name = "Fire Spirit"
+		end
 
 		--> pet summon another pet
 		local sou_pet = container_pets [who_serial]