feat: place monster spawn with default time if not set correctly (ope…

…ntibiabr#2671)
lamonato29 · Jun 1, 2024 · 3b90a69 · 3b90a69
1 parent 7e7a610
commit 3b90a69
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/config.lua.dist b/config.lua.dist
@@ -511,6 +511,7 @@ bossDefaultTimeToFightAgain = 20 * 60 * 60 -- 20 hours
 bossDefaultTimeToDefeat = 20 * 60 -- 20 minutes
 
 -- Monsters
+defaultRespawnTime = 60
 deSpawnRange = 2
 deSpawnRadius = 50
 

diff --git a/src/config/config_enums.hpp b/src/config/config_enums.hpp
@@ -50,6 +50,7 @@ enum ConfigKey_t : uint16_t {
 	DATA_DIRECTORY,
 	DAY_KILLS_TO_RED,
 	DEATH_LOSE_PERCENT,
+	DEFAULT_RESPAWN_TIME,
 	DEFAULT_DESPAWNRADIUS,
 	DEFAULT_DESPAWNRANGE,
 	DEFAULT_PRIORITY,

diff --git a/src/config/configmanager.cpp b/src/config/configmanager.cpp
@@ -225,6 +225,7 @@ bool ConfigManager::load() {
 	loadIntConfig(L, CRITICALCHANCE, "criticalChance", 10);
 	loadIntConfig(L, DAY_KILLS_TO_RED, "dayKillsToRedSkull", 3);
 	loadIntConfig(L, DEATH_LOSE_PERCENT, "deathLosePercent", -1);
+	loadIntConfig(L, DEFAULT_RESPAWN_TIME, "defaultRespawnTime", 60);
 	loadIntConfig(L, DEFAULT_DESPAWNRADIUS, "deSpawnRadius", 50);
 	loadIntConfig(L, DEFAULT_DESPAWNRANGE, "deSpawnRange", 2);
 	loadIntConfig(L, DEPOTCHEST, "depotChest", 4);

diff --git a/src/creatures/monsters/spawns/spawn_monster.cpp b/src/creatures/monsters/spawns/spawn_monster.cpp
@@ -94,7 +94,15 @@ bool SpawnsMonster::loadFromXML(const std::string &filemonstername) {
 					weight = pugi::cast<uint32_t>(weightAttribute.value());
 				}
 
-				spawnMonster.addMonster(nameAttribute.as_string(), pos, dir, pugi::cast<uint32_t>(childMonsterNode.attribute("spawntime").value()) * 1000, weight);
+				uint32_t scheduleInterval = g_configManager().getNumber(DEFAULT_RESPAWN_TIME, __FUNCTION__);
+
+				try {
+					scheduleInterval = pugi::cast<uint32_t>(childMonsterNode.attribute("spawntime").value());
+				} catch (...) {
+					g_logger().warn("Failed to add schedule interval to monster: {}, interval: {}. Setting to default respawn time: {}", nameAttribute.value(), childMonsterNode.attribute("spawntime").value(), scheduleInterval);
+				}
+
+				spawnMonster.addMonster(nameAttribute.as_string(), pos, dir, scheduleInterval * 1000, weight);
 			}
 		}
 	}