* - New Feature: blackSkulledDeathHealth and blackSkulledDeathMana are now configurable in config.lua.

jprzimba · jprzimba · commit 766989fbc635 · 2024-12-13T10:41:26.000-03:00
diff --git a/config.lua.dist b/config.lua.dist
@@ -46,6 +46,8 @@ monthKillsToRedSkull = 10
 redSkullDuration = 1
 blackSkullDuration = 3
 orangeSkullDuration = 7
+blackSkulledDeathHealth = 40
+blackSkulledDeathMana = 0
 
 cleanProtectionZones = false
 
diff --git a/markdowns/CHANGELOG.md b/markdowns/CHANGELOG.md
@@ -10,6 +10,7 @@
 - New configurations in `config.lua`: `timeToRegenMinuteStamina` and `timeToRegenMinutePremiumStamina`. ([Tryller](https://github.com/jprzimba))
 - Added a new attribute `attackspeed` to mounts.xml, allowing mounts to increase player attack speed. ([Tryller](https://github.com/jprzimba))
 - New Feature: `fairFightTimeRange` is now configurable in `config.lua`. ([Tryller](https://github.com/jprzimba))
+- New Feature: `blackSkulledDeathHealth` and `blackSkulledDeathMana` are now configurable in `config.lua`. ([Tryller](https://github.com/jprzimba))
 
 ## Added files
 
diff --git a/src/config/config_enums.hpp b/src/config/config_enums.hpp
@@ -343,4 +343,6 @@ enum ConfigKey_t : uint16_t {
 	STAMINA_REGEN_MINUTE,
 	STAMINA_REGEN_PREMIUM,
 	FAIRFIGHT_TIMERANGE,
+	BLACK_SKULL_DEATH_HEALTH,
+	BLACK_SKULL_DEATH_MANA,
 };
diff --git a/src/config/configmanager.cpp b/src/config/configmanager.cpp
@@ -358,6 +358,8 @@ bool ConfigManager::load() {
 	loadIntConfig(L, STAMINA_REGEN_MINUTE, "timeToRegenMinuteStamina", 3 * 60);
 	loadIntConfig(L, STAMINA_REGEN_PREMIUM, "timeToRegenMinutePremiumStamina", 6 * 60);
 	loadIntConfig(L, FAIRFIGHT_TIMERANGE, "fairFightTimeRange", 5 * 60 * 1000);
+	loadIntConfig(L, BLACK_SKULL_DEATH_HEALTH, "blackSkulledDeathHealth", 40);
+	loadIntConfig(L, BLACK_SKULL_DEATH_MANA, "blackSkulledDeathMana", 0);
 
 	loadStringConfig(L, CORE_DIRECTORY, "coreDirectory", "data");
 	loadStringConfig(L, DATA_DIRECTORY, "dataPackDirectory", "data-global");
diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp
@@ -3664,8 +3664,8 @@ void Player::death(const std::shared_ptr<Creature> &lastHitCreature) {
 		sendReLoginWindow(unfairFightReduction);
 		sendBlessStatus();
 		if (getSkull() == SKULL_BLACK) {
-			health = 40;
-			mana = 0;
+			health = g_configManager().getNumber(BLACK_SKULL_DEATH_HEALTH);
+			mana = g_configManager().getNumber(BLACK_SKULL_DEATH_MANA);
 		} else {
 			health = healthMax;
 			mana = manaMax;
