Fix npc voice interval, walkInterval, baseSpeed and shop storage (#196)

Adjusted the interval that npcs send messages in the default chat, adjusted the speed that npcs walk (baseSpeed), adjusted the interval of steps of npcs to 2 seconds and fixed a small bug in the npc shop that prevented items from appearing in the trade in certain scenarios. Set server version to new release
opentibiabr · Feb 8, 2022 · 6388163 · 6388163
1 parent 0397d0c
commit 6388163
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/data/npclua/canary.lua b/data/npclua/canary.lua
@@ -22,7 +22,7 @@ npcConfig.outfit = {
 }
 
 npcConfig.voices = {
-	interval = 5000,
+	interval = 15000,
 	chance = 20,
 	{ text = "Welcome to the Canary Server!" }
 }

diff --git a/src/creatures/npcs/npcs.h b/src/creatures/npcs/npcs.h
@@ -38,8 +38,8 @@ class NpcType
 
 		uint32_t yellChance = 0;
 		uint32_t yellSpeedTicks = 0;
-		uint32_t baseSpeed = 200;
-		uint32_t walkInterval = 1500;
+		uint32_t baseSpeed = 100;
+		uint32_t walkInterval = 2000;
 
 		int32_t creatureAppearEvent = -1;
 		int32_t creatureDisappearEvent = -1;

diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
@@ -6707,7 +6707,7 @@ void ProtocolGame::AddShopItem(NetworkMessage &msg, const ShopInfo &item, uint16
 	// Sends the item information empty if the player doesn't have the storage to buy/sell a certain item
 	int32_t storageValue;
 	player->getStorageValue(item.storageKey, storageValue);
-	if (storageValue < item.storageValue)
+	if (item.storageKey != 0 && storageValue < item.storageValue)
 	{
 		AddHiddenShopItem(msg);
 		return;

diff --git a/src/utils/definitions.h b/src/utils/definitions.h
@@ -21,7 +21,7 @@
 #define SRC_UTILS_DEFINITIONS_H_
 
 static constexpr auto STATUS_SERVER_NAME = "Canary";
-static constexpr auto STATUS_SERVER_VERSION = "1.1.0";
+static constexpr auto STATUS_SERVER_VERSION = "1.1.1";
 static constexpr auto STATUS_SERVER_DEVELOPERS = "OpenTibiaBR Organization and Mark Samman";
 
 static constexpr auto AUTHENTICATOR_DIGITS = 6U;