Merge branch 'main' into feature/tournament-coins-custom

elsongabriel · Nov 28, 2023 · d3d81e7 · d3d81e7
2 parents 5fe37ed + f4bb861
commit d3d81e7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/data/XML/mounts.xml b/data/XML/mounts.xml
@@ -218,7 +218,7 @@
 	<mount id="216" clientid="1677" name="Darkfire Devourer" speed="10" premium="no" type="store" />
 	<mount id="217" clientid="1682" name="Spirit of Purity" speed="10" premium="no" type="store" />
 	<mount id="218" clientid="1632" name="Foxmouse" speed="10" premium="no" type="store" />
-	<mount id="219" clientid="1685" name="Doom Skull" speed="10" premium="no" type="store" />
+	<!--<mount id="219" clientid="1685" name="Doom Skull" speed="10" premium="no" type="store" />
 	<mount id="220" clientid="1686" name="Magma Skull" speed="10" premium="no" type="store" />
-	<mount id="221" clientid="1687" name="Corpsefire Skull" speed="10" premium="no" type="store" />
+	<mount id="221" clientid="1687" name="Corpsefire Skull" speed="10" premium="no" type="store"-->
 </mounts>
diff --git a/data/modules/scripts/gamestore/gamestore.lua b/data/modules/scripts/gamestore/gamestore.lua
@@ -1274,16 +1274,16 @@ GameStore.Categories = {
 				description = "{character}\n{speedboost}\n\n<i>If the Coralripper moves its fins, it generates enough air pressure that it can even float over land. Its numerous eyes allow it to quickly detect dangers even in confusing situations and eliminate them with one powerful bite. If you watch your fingers, you are going to be good friends.</i>",
 				type = GameStore.OfferTypes.OFFER_TYPE_MOUNT,
 			},
-			{
+			--[[{
 				icons = { "Corpsefire_Skull.png" },
 				name = "Corpsefire Skull",
 				price = 750,
-				id = 220,
+				id = 221,
 				description = "{character}\n{speedboost}\n\n<i>Skulls are the infernal heralds of untamed power. Bodies are obsolete when sinister forces animate your being. Embrace their presence and command the devastating might that awaits on the back of an eerie Corpsefire Skull!</i>",
 				type = GameStore.OfferTypes.OFFER_TYPE_MOUNT,
 				state = GameStore.States.STATE_NEW,
 				home = true,
-			},
+			},]]
 			{
 				icons = { "Cranium_Spider.png" },
 				name = "Cranium Spider",
@@ -1348,7 +1348,7 @@ GameStore.Categories = {
 				description = "{character}\n{speedboost}\n\n<i>Its roaring is piercing marrow and bone and can be heard over ten miles away. The Desert King is the undisputed ruler of its territory and no one messes with this animal. Show no fear and prove yourself worthy of its trust and you will get yourself a valuable companion for your adventures.</i>",
 				type = GameStore.OfferTypes.OFFER_TYPE_MOUNT,
 			},
-			{
+			--[[{
 				icons = { "Doom_Skull.png" },
 				name = "Doom Skull",
 				price = 750,
@@ -1357,7 +1357,7 @@ GameStore.Categories = {
 				type = GameStore.OfferTypes.OFFER_TYPE_MOUNT,
 				state = GameStore.States.STATE_NEW,
 				home = true,
-			},
+			},]]
 			{
 				icons = { "Doombringer.png" },
 				name = "Doombringer",
@@ -1734,7 +1734,7 @@ GameStore.Categories = {
 				description = "{character}\n{speedboost}\n\n<i>The Magic Carpet is the perfect mount for those who are too busy to take care of an animal mount or simply like to travel on a beautiful, magic hand-woven carpet.</i>",
 				type = GameStore.OfferTypes.OFFER_TYPE_MOUNT,
 			},
-			{
+			--[[{
 				icons = { "Magma_Skull.png" },
 				name = "Magma Skull",
 				price = 750,
@@ -1743,7 +1743,7 @@ GameStore.Categories = {
 				type = GameStore.OfferTypes.OFFER_TYPE_MOUNT,
 				state = GameStore.States.STATE_NEW,
 				home = true,
-			},
+			},]]
 			{
 				icons = { "Marsh_Toad.png" },
 				name = "Marsh Toad",

diff --git a/data/modules/scripts/gamestore/init.lua b/data/modules/scripts/gamestore/init.lua
@@ -2138,7 +2138,12 @@ function sendHomePage(playerId)
 			msg:addString(offer.icons[1])
 		elseif type == GameStore.ConverType.SHOW_MOUNT then
 			local mount = Mount(offer.id)
-			msg:addU16(mount:getClientId())
+			if mount then
+				msg:addU16(mount:getClientId())
+			else
+				logger.debug("[sendHomePage] mount with id {} not exist, ignoring to avoid a debug on the client", offer.id)
+				msg:addU16(0)
+			end
 		elseif type == GameStore.ConverType.SHOW_ITEM then
 			msg:addU16(offer.itemtype)
 		elseif type == GameStore.ConverType.SHOW_OUTFIT then

diff --git a/src/creatures/appearance/mounts/mounts.cpp b/src/creatures/appearance/mounts/mounts.cpp
@@ -31,7 +31,7 @@ bool Mounts::loadFromXml() {
 	for (auto mountNode : doc.child("mounts").children()) {
 		uint16_t lookType = pugi::cast<uint16_t>(mountNode.attribute("clientid").value());
 		if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && lookType != 0 && !g_game().isLookTypeRegistered(lookType)) {
-			g_logger().warn("{} - An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", __FUNCTION__, lookType);
+			g_logger().warn("{} - An unregistered creature mount with id '{}' was blocked to prevent client crash.", __FUNCTION__, lookType);
 			continue;
 		}
 

diff --git a/src/lua/functions/lua_functions_loader.cpp b/src/lua/functions/lua_functions_loader.cpp
@@ -373,7 +373,8 @@ std::string LuaFunctionsLoader::getFormatedLoggerMessage(lua_State* L) {
 	try {
 		return fmt::vformat(format, args);
 	} catch (const fmt::format_error &e) {
-		g_logger().error("[{}] format error: {}", __FUNCTION__, e.what());
+		g_logger().debug("[{}] format error: {}", __FUNCTION__, e.what());
+		reportErrorFunc(fmt::format("Format error, {}", e.what()));
 	}
 
 	return {};