From 18bd56496ebc1e2c5a1d1a28d1d94dbfcecf3d95 Mon Sep 17 00:00:00 2001
From: ErikasKontenis <e.kontenis@gmail.com>
Date: Wed, 6 Apr 2022 18:14:49 +0300
Subject: [PATCH] introduce 8.0 configs

---
 config.lua     | 10 +++++-----
 src/const.h    |  1 +
 src/otserv.cpp |  5 ++++-
 src/tools.cpp  |  3 +++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/config.lua b/config.lua
index 01caf06..3b865b7 100644
--- a/config.lua
+++ b/config.lua
@@ -1,15 +1,15 @@
 -- Custom
-clientVersion = 792
+clientVersion = 800
 knightCloseAttackDamageIncreasePercent = 15
 paladinRangeAttackDamageIncreasePercent = 10
 -- Min/Max rate spawn is a multiplication of the map spawntime in spawns.xml Regular monster spawn time is 600. The formula would be randomValue = random(600*100, 600*200) which varies between 60s and 120s
 minRateSpawn = 100
 maxRateSpawn = 200
 corpseOwnerEnabled = false
-uhTrap = true
+uhTrap = false
 ropeSpotBlock = false
 showMonsterLoot = true
-blockHeight = true
+blockHeight = false
 dropItems = false
 
 -- Combat settings
@@ -22,7 +22,7 @@ removeChargesFromRunes = true
 stairJumpExhaustion = 0
 experienceByKillingPlayers = true
 expFromPlayersLevelRange = 50
-distanceWeaponsDropOnGround = true
+distanceWeaponsDropOnGround = false
 
 -- Skull System
 banLength = 2 * 24 * 60 * 60
@@ -50,7 +50,7 @@ serverName = "Tibianus"
 statusTimeout = 5000
 replaceKickOnLogin = true
 maxPacketsPerSecond = -1
-autoStackCumulatives = false
+autoStackCumulatives = true
 moneyRate = 1
 
 -- Deaths
diff --git a/src/const.h b/src/const.h
index 58aa0de..68aa943 100644
--- a/src/const.h
+++ b/src/const.h
@@ -370,6 +370,7 @@ enum ClientVersion_t : uint16_t {
 	CLIENT_VERSION_781 = 781,
 	CLIENT_VERSION_790 = 790,
 	CLIENT_VERSION_792 = 792,
+	CLIENT_VERSION_800 = 800,
 };
 
 static constexpr int32_t CHANNEL_GUILD = 0x00;
diff --git a/src/otserv.cpp b/src/otserv.cpp
index 159c418..f52bdf3 100644
--- a/src/otserv.cpp
+++ b/src/otserv.cpp
@@ -185,11 +185,14 @@ void mainLoader(int, char*[], ServiceManager* services)
 	else if (clientVersion == 792) {
 		g_game.setClientVersion(CLIENT_VERSION_792);
 	}
+	else if (clientVersion == 800) {
+		g_game.setClientVersion(CLIENT_VERSION_800);
+	}
 	else {
 		std::cout << std::endl;
 
 		std::ostringstream ss;
-		ss << "> ERROR: Unknown client version: " << g_config.getNumber(ConfigManager::CLIENT_VERSION) << ", valid client versions are: 780, 781, 790, 792.";
+		ss << "> ERROR: Unknown client version: " << g_config.getNumber(ConfigManager::CLIENT_VERSION) << ", valid client versions are: 780, 781, 790, 792, 800.";
 		startupErrorMessage(ss.str());
 		return;
 	}
diff --git a/src/tools.cpp b/src/tools.cpp
index 7846671..d3522b3 100644
--- a/src/tools.cpp
+++ b/src/tools.cpp
@@ -1258,6 +1258,9 @@ std::string getClientVersionString(ClientVersion_t version)
 	case CLIENT_VERSION_792:
 		result = "7.92";
 		break;
+	case CLIENT_VERSION_800:
+		result = "8.00";
+		break;
 	default:
 		result = "Unknown";
 		break;