Merge branch 'main' into bug-cyclopedia-resistance-values

opentibiabr · Jan 28, 2023 · 4ad1f60 · 4ad1f60
2 parents 83ed72f + 9f85261
commit 4ad1f60
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 19 deletions.
diff --git a/config.lua.dist b/config.lua.dist
@@ -171,10 +171,12 @@ deathLosePercent = -1
 
 -- Houses
 -- NOTE: set housePriceEachSQM to -1 to disable the ingame buy house functionality
+-- NOTE: set houseBuyLevel to 0 to disable the min level purchase functionality.
 -- Periods: daily/weekly/monthly/yearly/never
 housePriceEachSQM = 1000
 houseRentPeriod = "never"
 houseOwnedByAccount = false
+houseBuyLevel = 100
 
 -- Item Usage
 timeBetweenActions = 200

diff --git a/data-canary/scripts/actions/door/custom_door.lua b/data-canary/scripts/actions/door/custom_door.lua
@@ -12,7 +12,7 @@ end
 local customDoor = Action()
 
 function customDoor.onUse(player, item, fromPosition, target, toPosition, isHotkey)
-	if Creature.isInsideDoor(player, toPosition) then
+	if Creature.checkCreatureInsideDoor(player, toPosition) then
 		return true
 	end
 

diff --git a/data-canary/scripts/actions/door/key_door.lua b/data-canary/scripts/actions/door/key_door.lua
@@ -44,7 +44,7 @@ function keyDoor.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	end
 	for index, value in ipairs(KeyDoorTable) do
 		if value.openDoor == item.itemid then
-			if Creature.isInsideDoor(player, toPosition) then
+			if Creature.checkCreatureInsideDoor(player, toPosition) then
 				return false
 			end
 			item:transform(value.closedDoor)

diff --git a/data-canary/scripts/actions/door/level_door.lua b/data-canary/scripts/actions/door/level_door.lua
@@ -26,7 +26,7 @@ function levelDoor.onUse(player, item, fromPosition, target, toPosition, isHotke
 		end
 	end
 
-	if Creature.isInsideDoor(player, toPosition) then
+	if Creature.checkCreatureInsideDoor(player, toPosition) then
 		return true
 	end
 	return true

diff --git a/data-canary/scripts/actions/door/quest_door.lua b/data-canary/scripts/actions/door/quest_door.lua
@@ -26,7 +26,7 @@ function questDoor.onUse(player, item, fromPosition, target, toPosition, isHotke
 		end
 	end
 
-	if Creature.isInsideDoor(player, toPosition) then
+	if Creature.checkCreatureInsideDoor(player, toPosition) then
 		return true
 	end
 	return true

diff --git a/data-canary/scripts/talkactions/player/buy_house.lua b/data-canary/scripts/talkactions/player/buy_house.lua
@@ -11,6 +11,12 @@ function buyHouse.onSay(player, words, param)
 		return false
 	end
 
+	local houseBuyLevel = configManager.getNumber(configKeys.HOUSE_BUY_LEVEL)
+	if (houseBuyLevel ~= nil and player:getLevel() < houseBuyLevel) then
+		player:sendCancelMessage("You need to be level " .. houseBuyLevel .. " to buy a house.")
+		return false;
+	end
+
 	local position = player:getPosition()
 	position:getNextPosition(player:getDirection())
 

diff --git a/data-canary/scripts/talkactions/player/server_info.lua b/data-canary/scripts/talkactions/player/server_info.lua
@@ -1,11 +1,18 @@
 local serverInfo = TalkAction("!serverinfo")
 
 function serverInfo.onSay(player, words, param)
-	player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Server Info:"
+	local text = "Server Info:"
 	.. "\nExp rate: " .. getRateFromTable(experienceStages, player:getLevel(), configManager.getNumber(configKeys.RATE_EXPERIENCE))
 	.. "\nSkill rate: " .. configManager.getNumber(configKeys.RATE_SKILL)
 	.. "\nMagic rate: " .. configManager.getNumber(configKeys.RATE_MAGIC)
-	.. "\nLoot rate: " .. configManager.getNumber(configKeys.RATE_LOOT))
+	.. "\nLoot rate: " .. configManager.getNumber(configKeys.RATE_LOOT)
+
+	local houseBuyLevel = configManager.getNumber(configKeys.HOUSE_BUY_LEVEL)
+	if (houseBuyLevel ~= nil and player:getLevel() < houseBuyLevel) then
+		text = text .. '\nLevel to buy house: ' .. houseBuyLevel
+	end
+
+	player:sendTextMessage(MESSAGE_EVENT_ADVANCE, text)
 	return false
 end
 

diff --git a/data-otservbr-global/scripts/talkactions/player/buy_house.lua b/data-otservbr-global/scripts/talkactions/player/buy_house.lua
@@ -11,6 +11,12 @@ function buyHouse.onSay(player, words, param)
 		return false
 	end
 
+	local houseBuyLevel = configManager.getNumber(configKeys.HOUSE_BUY_LEVEL)
+	if (houseBuyLevel ~= nil and player:getLevel() < houseBuyLevel) then
+		player:sendCancelMessage("You need to be level " .. houseBuyLevel .. " to buy a house.")
+		return false;
+	end
+
 	local position = player:getPosition()
 	position:getNextPosition(player:getDirection())
 

diff --git a/data-otservbr-global/scripts/talkactions/player/server_info.lua b/data-otservbr-global/scripts/talkactions/player/server_info.lua
@@ -1,9 +1,9 @@
 local serverInfo = TalkAction("!serverinfo")
 
 function serverInfo.onSay(player, words, param)
-	local configRateSkill =  configManager.getNumber(configKeys.RATE_SKILL)
+	local configRateSkill = configManager.getNumber(configKeys.RATE_SKILL)
 	local baseRate = player:getFinalBaseRateExperience()
-	player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Server Info:"
+	local text = "Server Info:"
 	.. "\nExp rate: " .. baseRate
 	.. "\nSword Skill rate: " .. getRateFromTable(skillsStages, player:getSkillLevel(SKILL_SWORD), configRateSkill)
 	.. "\nClub Skill rate: " .. getRateFromTable(skillsStages, player:getSkillLevel(SKILL_CLUB), configRateSkill)
@@ -12,7 +12,14 @@ function serverInfo.onSay(player, words, param)
 	.. "\nShield Skill rate: " .. getRateFromTable(skillsStages, player:getSkillLevel(SKILL_SHIELD), configRateSkill)
 	.. "\nFist Skill rate: " .. getRateFromTable(skillsStages, player:getSkillLevel(SKILL_FIST), configRateSkill)
 	.. "\nMagic rate: " .. getRateFromTable(magicLevelStages, player:getBaseMagicLevel(), configManager.getNumber(configKeys.RATE_MAGIC))
-	.. "\nLoot rate: " .. configManager.getNumber(configKeys.RATE_LOOT))
+	.. "\nLoot rate: " .. configManager.getNumber(configKeys.RATE_LOOT)
+
+	local houseBuyLevel = configManager.getNumber(configKeys.HOUSE_BUY_LEVEL)
+	if (houseBuyLevel ~= nil and player:getLevel() < houseBuyLevel) then
+		text = text .. '\nLevel to buy house: ' .. houseBuyLevel
+	end
+
+	player:sendTextMessage(MESSAGE_EVENT_ADVANCE, text)
 	return false
 end
 

diff --git a/src/config/config_definitions.hpp b/src/config/config_definitions.hpp
@@ -116,6 +116,7 @@ enum integerConfig_t {
 	RATE_MAGIC,
 	RATE_SPAWN,
 	HOUSE_PRICE,
+	HOUSE_BUY_LEVEL,
 	MAX_MESSAGEBUFFER,
 	ACTIONS_DELAY_INTERVAL,
 	EX_ACTIONS_DELAY_INTERVAL,

diff --git a/src/config/configmanager.cpp b/src/config/configmanager.cpp
@@ -208,6 +208,7 @@ bool ConfigManager::load()
 	integer[RATE_MAGIC] = getGlobalNumber(L, "rateMagic", 1);
 	integer[RATE_SPAWN] = getGlobalNumber(L, "rateSpawn", 1);
 	integer[HOUSE_PRICE] = getGlobalNumber(L, "housePriceEachSQM", 1000);
+	integer[HOUSE_BUY_LEVEL] = getGlobalNumber(L, "houseBuyLevel", 0);
 	integer[ACTIONS_DELAY_INTERVAL] = getGlobalNumber(L, "timeBetweenActions", 200);
 	integer[EX_ACTIONS_DELAY_INTERVAL] = getGlobalNumber(L, "timeBetweenExActions", 1000);
 	integer[MAX_MESSAGEBUFFER] = getGlobalNumber(L, "maxMessageBuffer", 4);

diff --git a/src/creatures/players/grouping/party.cpp b/src/creatures/players/grouping/party.cpp
@@ -151,6 +151,7 @@ bool Party::passPartyLeadership(Player* player)
 	memberList.insert(memberList.begin(), oldLeader);
 
 	updateSharedExperience();
+	updateTrackerAnalyzer();
 
 	for (Player* member : memberList) {
 		member->sendPartyCreatureShield(oldLeader);

diff --git a/src/lua/functions/core/game/config_functions.cpp b/src/lua/functions/core/game/config_functions.cpp
@@ -100,6 +100,7 @@ void ConfigFunctions::init(lua_State* L) {
 	registerEnumIn(L, "configKeys", RATE_MAGIC)
 	registerEnumIn(L, "configKeys", RATE_SPAWN)
 	registerEnumIn(L, "configKeys", HOUSE_PRICE)
+	registerEnumIn(L, "configKeys", HOUSE_BUY_LEVEL)
 	registerEnumIn(L, "configKeys", MAX_MESSAGEBUFFER)
 	registerEnumIn(L, "configKeys", ACTIONS_DELAY_INTERVAL)
 	registerEnumIn(L, "configKeys", EX_ACTIONS_DELAY_INTERVAL)

diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
@@ -486,14 +486,10 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg)
 		return;
 	}
 
-	OperatingSystem_t operatingSystem = static_cast<OperatingSystem_t>(msg.get<uint16_t>());
-	if (operatingSystem <= CLIENTOS_NEW_MAC) {
-		setChecksumMethod(CHECKSUM_METHOD_SEQUENCE);
-		enableCompression();
-	} else {
-		setChecksumMethod(CHECKSUM_METHOD_ADLER32);
-	}
+	setChecksumMethod(CHECKSUM_METHOD_SEQUENCE);
+	enableCompression();
 
+	OperatingSystem_t operatingSystem = static_cast<OperatingSystem_t>(msg.get<uint16_t>());
 
 	version = msg.get<uint16_t>(); // Protocol version
 

diff --git a/src/utils/const.hpp b/src/utils/const.hpp
@@ -16,9 +16,7 @@ const uint32_t MAX_STATICWALK = 100;
 static constexpr size_t NETWORKMESSAGE_PLAYERNAME_MAXLENGTH = 30;
 static constexpr int32_t NETWORKMESSAGE_MAXSIZE = 65500;
 
-// QT clients probably have bigger input buffer because of exiva options
-// But for now we don't support exiva options
-static constexpr int32_t INPUTMESSAGE_MAXSIZE = 2048;
+static constexpr int32_t INPUTMESSAGE_MAXSIZE = 4096;
 
 static constexpr int32_t CHANNEL_GUILD = 0x00;
 static constexpr int32_t CHANNEL_PARTY = 0x01;