Merge branch 'main' of https://github.com/jprzimba/crystalserver

Author: jprzimba

data/libs/systems/features.lua

@@ -3,6 +3,7 @@ Features = {
 	ChainSystem = "chainSystem",
 	EmoteSpells = "emoteSpells",
 	SpellNameInsteadOfWords = "spellNameInsteadOfWords",
+	MutePlayer = "mutePlayer",
 }
 
 local function validateFeature(feature)

data/scripts/talkactions/god/mute.lua

@@ -0,0 +1,62 @@
+local mute = TalkAction("/mute")
+
+function mute.onSay(player, words, param)
+	-- create log
+	logCommand(player, words, param)
+
+	if param == "" then
+		player:sendCancelMessage("You must specify a player. Usage: /mute playerName.")
+		return true
+	end
+
+	local split = param:split(",")
+	local targetName = split[1]:trim()
+	local target = Player(targetName)
+
+	if not target then
+		player:sendCancelMessage("A player with that name is not online.")
+		return true
+	end
+
+	if target:getGroup():getId() >= GROUP_TYPE_GAMEMASTER then
+		player:sendCancelMessage("You cannot mute this character.")
+		return true
+	end
+
+	target:setFeature(Features.MutePlayer, true)
+	player:popupFYI(target:getName() .. " has been muted.")
+	return true
+end
+
+mute:separator(" ")
+mute:groupType("god")
+mute:register()
+
+---------------- // ----------------
+local unmute = TalkAction("/unmute")
+
+function unmute.onSay(player, words, param)
+	-- create log
+	logCommand(player, words, param)
+
+	if param == "" then
+		player:sendCancelMessage("You must specify a player. Usage: /unmute playerName.")
+		return true
+	end
+
+	local targetName = param:trim()
+	local target = Player(targetName)
+
+	if not target then
+		player:sendCancelMessage("A player with that name is not online.")
+		return true
+	end
+
+	target:setFeature(Features.MutePlayer, false)
+	player:popupFYI(target:getName() .. " has been unmuted.")
+	return true
+end
+
+unmute:separator(" ")
+unmute:groupType("god")
+unmute:register()

markdowns/CHANGELOG.md

@@ -10,6 +10,7 @@
 - Added new flags: `CanMoveFromFar`, `HasFullLight`, `AllowIdle`, `CanWearAllMounts`, and `NotGainUnjustified`. ([Tryller](https://github.com/jprzimba))
 - Added Vibrancy imbuement. ([pennaor](https://github.com/pennaor))
 - Added Soul Pit arena/animus mastery/soul core. ([FelipePaluco](https://github.com/FelipePaluco))
+- Added a new command `/mute`, which will mute a player until unmuted by `/unmute`. ([Tryller](https://github.com/jprzimba))
 - Cyclopedia House Auction system. ([murilo09](https://github.com/murilo09))
 - Updated name change functionality to save old player names in a database table called `player_oldnames`. ([Tryller](https://github.com/jprzimba))
 

src/creatures/players/player.cpp

@@ -5278,6 +5278,20 @@ bool Player::checkSpellNameInsteadOfWords() const {
 	return false;
 }
 
+bool Player::checkMute() const {
+	auto featureKV = kv()->scoped("features")->get("mutePlayer");
+	if (featureKV.has_value()) {
+		auto value = featureKV->get<bool>();
+		if (value) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	return false;
+}
+
 QuickLootFilter_t Player::getQuickLootFilter() const {
 	return quickLootFilter;
 }

src/creatures/players/player.hpp

@@ -1244,6 +1244,7 @@ class Player final : public Creature, public Cylinder, public Bankable {
 	bool checkChainSystem() const;
 	bool checkEmoteSpells() const;
 	bool checkSpellNameInsteadOfWords() const;
+	bool checkMute() const;
 
 	QuickLootFilter_t getQuickLootFilter() const;
 

src/game/game.cpp

@@ -6234,6 +6234,13 @@ void Game::playerSay(uint32_t playerId, uint16_t channelId, SpeakClasses type, c
 		return;
 	}
 
+	if (player->checkMute()) {
+		std::ostringstream ss;
+		ss << "- You have been forbidden to speak.";
+		player->sendTextMessage(MESSAGE_FAILURE, ss.str());
+		return;
+	}
+
 	uint32_t muteTime = player->isMuted();
 	if (muteTime > 0) {
 		std::ostringstream ss;