fix: remove bakragore icons talkaction (opentibiabr#2828)

s2leandro155 · Sep 26, 2024 · 3d1ed0c · 3d1ed0c
1 parent 43cd976
commit 3d1ed0c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/data/scripts/talkactions/god/icons_functions.lua b/data/scripts/talkactions/god/icons_functions.lua
@@ -78,11 +78,7 @@ function bakragoreIcon.onSay(player, words, param)
 	end
 
 	if param == "remove" then
-		for i = 1, 10 do
-			if player:hasCondition(CONDITION_BAKRAGORE, i) then
-				player:removeCondition(CONDITION_BAKRAGORE, i)
-			end
-		end
+		player:removeIconBakragore()
 		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Removed all Bakragore icons.")
 		return true
 	end

diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp
@@ -6216,6 +6216,20 @@ void Player::sendIconBakragore(const IconBakragore icon) {
 	}
 }
 
+void Player::removeBakragoreIcons() {
+	for (auto icon : magic_enum::enum_values<IconBakragore>()) {
+		if (hasCondition(CONDITION_BAKRAGORE, enumToValue(icon))) {
+			removeCondition(CONDITION_BAKRAGORE, CONDITIONID_DEFAULT, true);
+		}
+	}
+}
+
+void Player::removeBakragoreIcon(const IconBakragore icon) {
+	if (hasCondition(CONDITION_BAKRAGORE, enumToValue(icon))) {
+		removeCondition(CONDITION_BAKRAGORE, CONDITIONID_DEFAULT, true);
+	}
+}
+
 void Player::sendCyclopediaCharacterAchievements(uint16_t secretsUnlocked, std::vector<std::pair<Achievement, uint32_t>> achievementsUnlocked) {
 	if (client) {
 		client->sendCyclopediaCharacterAchievements(secretsUnlocked, achievementsUnlocked);

diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp
@@ -1419,6 +1419,8 @@ class Player final : public Creature, public Cylinder, public Bankable {
 	void sendClosePrivate(uint16_t channelId);
 	void sendIcons();
 	void sendIconBakragore(const IconBakragore icon);
+	void removeBakragoreIcons();
+	void removeBakragoreIcon(const IconBakragore icon);
 	void sendClientCheck() const {
 		if (client) {
 			client->sendClientCheck();