Merge branch 'main' into otsys_time-cached

opentibiabr · Nov 23, 2023 · ace3d5c · ace3d5c
2 parents d866d10 + 94f9769
commit ace3d5c
Show file tree

Hide file tree

Showing 9 changed files with 434 additions and 689 deletions.
diff --git a/data/items/items.xml b/data/items/items.xml
@@ -59786,7 +59786,7 @@
 		<attribute key="bedpartof" value="35193"/>
 		<attribute key="partnerdirection" value="north"/>
 		<attribute key="femaletransformto" value="35207"/>
-		<attribute key="rotateTo" value="37205"/>
+		<attribute key="rotateTo" value="35205"/>
 		<attribute key="description" value="Somebody is sleeping there"/>
 		<attribute key="wrapableTo" value="23398"/>
 	</item>
@@ -59826,7 +59826,7 @@
 		<attribute key="partnerdirection" value="north"/>
 		<attribute key="femaletransformto" value="35203"/>
 		<attribute key="maletransformto" value="35190"/>
-		<attribute key="rotateTo" value="37209"/>
+		<attribute key="rotateTo" value="35209"/>
 		<attribute key="wrapableto" value="23398"/>
 	</item>
 	<item id="35208" name="wrought-iron bed">
@@ -59836,7 +59836,7 @@
 		<attribute key="partnerdirection" value="east"/>
 		<attribute key="femaletransformto" value="35204"/>
 		<attribute key="maletransformto" value="35191"/>
-		<attribute key="rotateTo" value="37206"/>
+		<attribute key="rotateTo" value="35206"/>
 		<attribute key="wrapableto" value="23398"/>
 	</item>
 	<item id="35209" name="wrought-iron bed">

diff --git a/src/config/config_definitions.hpp b/src/config/config_definitions.hpp
@@ -10,7 +10,7 @@
 #pragma once
 
 // Enum
-enum booleanConfig_t {
+enum ConfigKey_t : uint16_t {
 	ALLOW_CHANGEOUTFIT,
 	ONE_PLAYER_ON_ACCOUNT,
 	AIMBOT_HOTKEY_ENABLED,
@@ -91,11 +91,6 @@ enum booleanConfig_t {
 	TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART,
 	TOGGLE_RECEIVE_REWARD,
 	TOGGLE_MAINTAIN_MODE,
-
-	LAST_BOOLEAN_CONFIG
-};
-
-enum stringConfig_t {
 	MAP_NAME,
 	MAP_DOWNLOAD_URL,
 	MAP_AUTHOR,
@@ -128,11 +123,6 @@ enum stringConfig_t {
 	TIBIADROME_CONCOCTION_TICK_TYPE,
 	M_CONST,
 	MAINTAIN_MODE_MESSAGE,
-
-	LAST_STRING_CONFIG
-};
-
-enum integerConfig_t {
 	SQL_PORT,
 	MAX_PLAYERS,
 	PZ_LOCKED,
@@ -251,53 +241,38 @@ enum integerConfig_t {
 	PARALLELISM,
 	BOSS_DEFAULT_TIME_TO_FIGHT_AGAIN,
 	BOSS_DEFAULT_TIME_TO_DEFEAT,
-
 	VIP_BONUS_EXP,
 	VIP_BONUS_LOOT,
 	VIP_BONUS_SKILL,
 	VIP_FAMILIAR_TIME_COOLDOWN_REDUCTION,
-
 	REWARD_CHEST_MAX_COLLECT_ITEMS,
 	DISCORD_WEBHOOK_DELAY_MS,
-
 	PVP_MAX_LEVEL_DIFFERENCE,
-
-	LAST_INTEGER_CONFIG
-};
-
-enum floatingConfig_t {
 	BESTIARY_RATE_CHARM_SHOP_PRICE,
-
 	RATE_HEALTH_REGEN,
 	RATE_HEALTH_REGEN_SPEED,
 	RATE_MANA_REGEN,
 	RATE_MANA_REGEN_SPEED,
 	RATE_SOUL_REGEN,
 	RATE_SOUL_REGEN_SPEED,
-
 	RATE_SPELL_COOLDOWN,
 	RATE_ATTACK_SPEED,
 	RATE_OFFLINE_TRAINING_SPEED,
 	RATE_EXERCISE_TRAINING_SPEED,
-
 	RATE_MONSTER_HEALTH,
 	RATE_MONSTER_ATTACK,
 	RATE_MONSTER_DEFENSE,
 	RATE_BOSS_HEALTH,
 	RATE_BOSS_ATTACK,
 	RATE_BOSS_DEFENSE,
-
 	RATE_NPC_HEALTH,
 	RATE_NPC_ATTACK,
 	RATE_NPC_DEFENSE,
 	LOYALTY_BONUS_PERCENTAGE_MULTIPLIER,
 	PARTY_SHARE_LOOT_BOOSTS_DIMINISHING_FACTOR,
-
 	PVP_RATE_DAMAGE_TAKEN_PER_LEVEL,
 	PVP_RATE_DAMAGE_REDUCTION_PER_LEVEL,
-
 	HOUSE_PRICE_RENT_MULTIPLIER,
 	HOUSE_RENT_RATE,
-
-	LAST_FLOATING_CONFIG
+	LOGLEVEL,
 };