From a55a2b5381151727b4e837fc45adfcbb4e965ccc Mon Sep 17 00:00:00 2001
From: Eduardo Dantas <eduardo.dantas@hotmail.com.br>
Date: Fri, 9 Aug 2024 14:17:45 -0300
Subject: [PATCH] fix: final conflicts

---
 data/scripts/talkactions/god/test.lua | 44 ---------------------------
 src/enums/player_icons.hpp            | 10 +++---
 2 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/data/scripts/talkactions/god/test.lua b/data/scripts/talkactions/god/test.lua
index ac6ca921483..25b2fd49da2 100644
--- a/data/scripts/talkactions/god/test.lua
+++ b/data/scripts/talkactions/god/test.lua
@@ -36,47 +36,3 @@ end
 testLog:separator(" ")
 testLog:groupType("god")
 testLog:register()
-
-local testIcons = TalkAction("/testicons")
-
-local function convertIconsToBitValue(iconList)
-	local bitObj = NewBit(0)
-	for icon in string.gmatch(iconList, "%d+") do
-		icon = tonumber(icon)
-		if icon then
-			local flag = bit.lshift(1, icon - 1)
-			bitObj:updateFlag(flag)
-		end
-	end
-	return bitObj:getNumber()
-end
-
---[[Usage:
-/testicons 1
-/testicons 2
-/testicons 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-]]
-function testIcons.onSay(player, words, param)
-	if param == "" then
-		player:sendCancelMessage("Icon required.")
-		logger.error("[testIcons.onSay] - Icon required")
-		return true
-	end
-
-	function Player:sendIconsTest()
-		local msg = NetworkMessage()
-		msg:addByte(0xA2)
-		local icons = convertIconsToBitValue(param)
-		msg:addU32(icons)
-		msg:addByte(tonumber(param))
-		msg:sendToPlayer(self)
-	end
-
-	player:sendIconsTest()
-	return true
-end
-
-testIcons:separator(" ")
-testIcons:setDescription("[Usage]: /seticons {icon1}, {icon2}, {icon3}, ...")
-testIcons:groupType("god")
-testIcons:register()
diff --git a/src/enums/player_icons.hpp b/src/enums/player_icons.hpp
index c289144bd7b..7878d9e5037 100644
--- a/src/enums/player_icons.hpp
+++ b/src/enums/player_icons.hpp
@@ -35,11 +35,11 @@ enum class PlayerIcon : uint8_t {
 	GreaterHex = 18,
 	Rooted = 19,
 	Feared = 20,
-	Goshnar1 = 21,
-	Goshnar2 = 22,
-	Goshnar3 = 23,
-	Goshnar4 = 24,
-	Goshnar5 = 25,
+	GoshnarTaint1 = 21,
+	GoshnarTaint2 = 22,
+	GoshnarTaint3 = 23,
+	GoshnarTaint4 = 24,
+	GoshnarTaint5 = 25,
 	NewManaShield = 26,
 	Agony = 27,