feat: features OTCR natively in canary

config.lua.dist

@@ -588,3 +588,17 @@ metricsPrometheusAddress = "0.0.0.0:9464"
 --- OStream
 metricsEnableOstream = false
 metricsOstreamInterval = 1000
+
+-- OTC Features
+-- NOTE: Features added in this list will be forced to be used on the client
+-- These features can be found in "modules/gamelib/const.lua"
+OTCRFeatures = {
+    enableFeature = { 
+        101, -- g_game.enableFeature(GameItemShader)
+        102, -- g_game.enableFeature(GameCreatureAttachedEffect)
+        103, -- g_game.enableFeature(GameCreatureShader)
+        118  -- g_game.enableFeature(GameWingsAurasEffectsShader)
+    },
+    disableFeature = {
+    }
+}

data/XML/attachedeffects.xml

@@ -0,0 +1,15 @@
+<attachedeffects>
+	<!-- aura -->
+	<aura id="8" name="8 aura" />  
+	<!-- shader -->
+	<shader id="1" name="Outfit - Rainbow" />
+	<shader id="2" name="Outfit - Ghost" />
+	<shader id="3" name="Outfit - Jelly" />
+	<shader id="4" name="Outfit - Fragmented" />
+	<shader id="5" name="Outfit - Outline" />
+	<!-- effect -->
+	<effect id="7" name="7 effect" />
+	<!-- wing -->
+	<wing id="2" name="2 wings" />
+	<wing id="11" name="11 wings" /> 
+</attachedeffects>

data/scripts/talkactions/gm/delete_test_otcr.lua

@@ -0,0 +1,223 @@
+local talkAction = TalkAction("!testOTCR")
+
+local options = {
+	Creature = {
+		{
+			name = "set attach Effect 7",
+			action = function(player)
+				player:attachEffectById(7)
+			end,
+		},
+		{
+			name = "get all attach Effect",
+			action = function(player)
+				local effects = player:getAttachedEffects()
+				if #effects > 0 then
+					local effectsString = "your AE are: " .. table.concat(effects, ", ")
+					player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, effectsString)
+				else
+					player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "you do not have any AE.")
+				end
+			end,
+		},
+		{
+			name = "detach Effect 7",
+			action = function(player)
+				player:detachEffectById(7)
+			end,
+		},
+		{
+			name = "set Shader player",
+			action = function(player)
+				player:setShader("Outfit - Rainbow")
+			end,
+		},
+		{
+			name = "no shader player",
+			action = function(player)
+				player:setShader("")
+			end,
+		},
+		{
+			name = "get Shader player",
+			action = function(player)
+				player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, player:getShader())
+			end,
+		},
+	},
+	Map = {
+		{
+			name = "set Shader Map",
+			action = function(player)
+				player:setMapShader("Map - Party")
+			end,
+		},
+		{
+			name = "no shader Map",
+			action = function(player)
+				player:setMapShader("")
+			end,
+		},
+		{
+			name = "get Shader Map",
+			action = function(player)
+				player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, player:getMapShader())
+			end,
+		},
+	},
+	Items = { {
+		name = "Shader",
+		action = function(player)
+			local item = player:addItem(ITEM_BAG, 1, false, CONST_SLOT_BACKPACK)
+			item:setShader("Map - Party")
+			player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "item have shader : " .. item:getShader())
+		end,
+	} },
+	game_outfit = {
+		{
+			name = "Add permanent aura 8 to first player",
+			action = function(player)
+				local spectators = Game.getSpectators(player:getPosition(), false, false)
+				if #spectators > 0 then
+					for _, spectator in ipairs(spectators) do
+						if spectator:isPlayer() and spectator:getId() ~= player:getId() then
+							spectator:addCustomOutfit("aura", 8)
+							player:say(spectator:getName() .. " add aura 8", TALKTYPE_SAY)
+							break
+						end
+					end
+				end
+			end,
+		},
+		{
+			name = "remove permanent aura 8 to first player",
+			action = function(player)
+				local spectators = Game.getSpectators(player:getPosition(), false, false)
+				if #spectators > 0 then
+					for _, spectator in ipairs(spectators) do
+						if spectator:isPlayer() and spectator:getId() ~= player:getId() then
+							spectator:removeCustomOutfit("aura", 8)
+							player:say(spectator:getName() .. " remove aura 8", TALKTYPE_SAY)
+							break
+						end
+					end
+				end
+			end,
+		},
+		{
+			name = "pdump auras",
+			action = function(player)
+				local effects = Game.getAllAttachedeffects("aura")
+				if #effects > 0 then
+					local ids = {}
+					for _, effect in ipairs(effects) do
+						table.insert(ids, effect.id)
+					end
+					player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "aura registered on the server: " .. table.concat(ids, ", "))
+				else
+					player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "the server did not charge aura check .xml")
+				end
+			end,
+		},
+		{
+			name = "pdump wing",
+			action = function(player)
+				local effects = Game.getAllAttachedeffects("wing")
+				if #effects > 0 then
+					local ids = {}
+					for _, effect in ipairs(effects) do
+						table.insert(ids, effect.id)
+					end
+					player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "wing registered on the server: " .. table.concat(ids, ", "))
+				else
+					player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "the server did not charge wing check .xml")
+				end
+			end,
+		},
+		{
+			name = "pdump effect",
+			action = function(player)
+				local effects = Game.getAllAttachedeffects("effect")
+				if #effects > 0 then
+					local ids = {}
+					for _, effect in ipairs(effects) do
+						table.insert(ids, effect.id)
+					end
+					player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "effect registered on the server: " .. table.concat(ids, ", "))
+				else
+					player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "the server did not charge effect check .xml")
+				end
+			end,
+		},
+		{
+			name = "pdump shader",
+			action = function(player)
+				local effects = Game.getAllAttachedeffects("shader")
+				if #effects > 0 then
+					local ids = {}
+					for _, effect in ipairs(effects) do
+						table.insert(ids, effect.name)
+					end
+					player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "shader registered on the server: " .. table.concat(ids, ", "))
+				else
+					player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "the server did not charge shader check .xml")
+				end
+			end,
+		},
+	},
+}
+
+function talkAction.onSay(player, words, param, type)
+	local modalWindow = ModalWindow({
+		title = "Fast Test",
+		message = "Choose one of the following options:",
+	})
+
+	for category, subOptions in pairs(options) do
+		modalWindow:addChoice(category, function(player, button, choice)
+			local subModalWindow = ModalWindow({
+				title = "Select a Sub-Option",
+				message = "Choose one of the following sub-options for " .. category .. ":",
+			})
+
+			for _, subOption in ipairs(subOptions) do
+				subModalWindow:addChoice(subOption.name, function(plyr, btn, ch)
+					if button.name == "OK" then
+						subOption.action(plyr)
+					end
+				end)
+			end
+
+			subModalWindow:addButton("OK")
+			subModalWindow:addButton("Cancel", function(plyr)
+				subModalWindow:clear()
+			end)
+			subModalWindow:sendToPlayer(player)
+		end)
+	end
+
+	modalWindow:addButton("OK")
+	modalWindow:addButton("Cancel", function(player)
+		modalWindow:clear()
+	end)
+	modalWindow:sendToPlayer(player)
+	return false
+end
+
+talkAction:groupType("gamemaster")
+talkAction:separator(" ")
+talkAction:register()
+
+local playerLoginTestOTCR = CreatureEvent("simpletest")
+
+function playerLoginTestOTCR.onLogin(player)
+	if not player then
+		return false
+	end
+	if player:getClient().os >= 10 and player:getClient().os < 20 then
+		player:say("say !testOTCR", TALKTYPE_SAY)
+	end
+	return true
+end
+
+playerLoginTestOTCR:register()

src/config/configmanager.cpp

@@ -363,6 +363,8 @@ bool ConfigManager::load() {
 	loadStringConfig(L, WORLD_TYPE, "worldType", "pvp");
 	loadStringConfig(L, LOGLEVEL, "logLevel", "info");
 
+	loadLuaOTCFeatures(L);
+
 	loaded = true;
 	lua_close(L);
 	return true;
@@ -464,3 +466,43 @@ float ConfigManager::getFloat(const ConfigKey_t &key, const std::source_location
 	g_logger().warn("[{}] accessing invalid or wrong type index: {}[{}]. Called line: {}:{}, in {}", __FUNCTION__, magic_enum::enum_name(key), fmt::underlying(key), location.line(), location.column(), location.function_name());
 	return 0.0f;
 }
+
+void ConfigManager::loadLuaOTCFeatures(lua_State* L) {
+	lua_getglobal(L, "OTCRFeatures");
+	if (!lua_istable(L, -1)) {
+		return;
+	}
+
+	lua_pushstring(L, "enableFeature");
+	lua_gettable(L, -2);
+	if (lua_istable(L, -1)) {
+		lua_pushnil(L);
+		while (lua_next(L, -2) != 0) {
+			const auto feature = static_cast<uint8_t>(lua_tointeger(L, -1));
+			enabledFeaturesOTC.push_back(feature);
+			lua_pop(L, 1);
+		}
+	}
+	lua_pop(L, 1);
+
+	lua_pushstring(L, "disableFeature");
+	lua_gettable(L, -2);
+	if (lua_istable(L, -1)) {
+		lua_pushnil(L);
+		while (lua_next(L, -2) != 0) {
+			const auto feature = static_cast<uint8_t>(lua_tointeger(L, -1));
+			disabledFeaturesOTC.push_back(feature);
+			lua_pop(L, 1);
+		}
+	}
+	lua_pop(L, 1);
+
+	lua_pop(L, 1);
+}
+OTCFeatures ConfigManager::getEnabledFeaturesOTC() const {
+	return enabledFeaturesOTC;
+}
+
+OTCFeatures ConfigManager::getDisabledFeaturesOTC() const {
+	return disabledFeaturesOTC;
+}

src/config/configmanager.hpp

@@ -12,6 +12,7 @@
 #include "config_enums.hpp"
 
 using ConfigValue = std::variant<std::string, int32_t, bool, float>;
+using OTCFeatures = std::vector<uint8_t>;
 
 class ConfigManager {
 public:
@@ -40,6 +41,8 @@ class ConfigManager {
 	[[nodiscard]] int32_t getNumber(const ConfigKey_t &key, const std::source_location &location = std::source_location::current()) const;
 	[[nodiscard]] bool getBoolean(const ConfigKey_t &key, const std::source_location &location = std::source_location::current()) const;
 	[[nodiscard]] float getFloat(const ConfigKey_t &key, const std::source_location &location = std::source_location::current()) const;
+	OTCFeatures getEnabledFeaturesOTC() const;
+	OTCFeatures getDisabledFeaturesOTC() const;
 
 private:
 	phmap::flat_hash_map<ConfigKey_t, ConfigValue> configs;
@@ -50,6 +53,9 @@ class ConfigManager {
 
 	std::string configFileLua = { "config.lua" };
 	bool loaded = false;
+	OTCFeatures enabledFeaturesOTC = {};
+	OTCFeatures disabledFeaturesOTC = {};
+	void loadLuaOTCFeatures(lua_State* L);
 };
 
 constexpr auto g_configManager = ConfigManager::getInstance;

src/creatures/CMakeLists.txt

@@ -1,6 +1,7 @@
 target_sources(${PROJECT_NAME}_lib PRIVATE
     appearance/mounts/mounts.cpp
     appearance/outfit/outfit.cpp
+    appearance/attachedeffects/attachedeffects.cpp
     combat/combat.cpp
     combat/condition.cpp
     combat/spells.cpp