[Fix] remove summon bug and added new config tag for teleport summon (#…

…428)

Added new config.lua tag: teleportSummons = false
Usage: if false, the summon will not teleport when the player goes up/down stairs and moves far away, if true, it will teleport the summon
Fixed the bug that did not remove the summon when the player leaves the summon range, thus preventing the player from summoning a new monster

config.lua.dist

@@ -98,6 +98,9 @@ autoLoot = false
 -- autoBank = true, the dropped coins from monsters will be automatically 
 -- deposited to your bank account.
 autoBank = false
+-- teleporte summon
+-- true will never remove the summon
+teleportSummons = false
 
 -- Stamina in Trainers
 staminaTrainer = false

src/config/config_definitions.hpp

@@ -75,6 +75,7 @@ enum booleanConfig_t {
 	AUTOBANK,
 	RATE_USE_STAGES,
 	INVENTORY_GLOW,
+	TELEPORT_SUMMONS,
 	TOGGLE_DOWNLOAD_MAP,
 
 	LAST_BOOLEAN_CONFIG

src/config/configmanager.cpp

@@ -183,6 +183,7 @@ bool ConfigManager::load()
 	boolean[SORT_LOOT_BY_CHANCE] = getGlobalBoolean(L, "sortLootByChance", false);
 	boolean[TOGGLE_SAVE_INTERVAL] = getGlobalBoolean(L, "toggleSaveInterval", false);
 	boolean[TOGGLE_SAVE_INTERVAL_CLEAN_MAP] = getGlobalBoolean(L, "toggleSaveIntervalCleanMap", false);
+	boolean[TELEPORT_SUMMONS] = getGlobalBoolean(L, "teleportSummons", false);
 
 	boolean[ONLY_PREMIUM_ACCOUNT] = getGlobalBoolean(L, "onlyPremiumAccount", false);
 	boolean[RATE_USE_STAGES] = getGlobalBoolean(L, "rateUseStages", false);

src/creatures/creature.cpp

@@ -447,29 +447,38 @@ void Creature::onAttackedCreatureChangeZone(ZoneType_t zone)
 void Creature::checkSummonMove(const Position& newPos, bool teleportSummon) const
 {
 	if (hasSummons()) {
-		// Check if any of our summons is out of range (+/- 2 floors or 30 tiles away)
-		std::forward_list<Creature*> despawnMonsterList;
+		std::vector<Creature*> despawnMonsterList;
 		for (Creature* creature : getSummons()) {
 			if (!creature) {
 				continue;
 			}
 
-			const Monster* monster = creature->getMonster();
-			// Check is is familiar for teleport to the master, if "teleportSummon" is true, this is not executed
 			const Position& pos = creature->getPosition();
-			if (!teleportSummon && !monster->isFamiliar()) {
-				SPDLOG_DEBUG("[Creature::checkSummonMove] - Creature name {}", creature->getName());
+			const Monster* monster = creature->getMonster();
+			bool protectionZoneCheck = this->getTile()->hasFlag(TILESTATE_PROTECTIONZONE);
+			// Check if any of our summons is out of range (+/- 0 floors or 15 tiles away)
+			bool checkSummonDist = Position::getDistanceZ(newPos, pos) > 0 ||
+				(std::max<int32_t>(Position::getDistanceX(newPos, pos),
+					Position::getDistanceY(newPos, pos)) > 15);
+			// Check if any of our summons is out of range (+/- 2 floors or 30 tiles away)
+			bool checkRemoveDist = Position::getDistanceZ(newPos, pos) > 2 ||
+				(std::max<int32_t>(Position::getDistanceX(newPos, pos),
+					Position::getDistanceY(newPos, pos)) > 30);
+
+			if (monster->isFamiliar() && checkSummonDist || teleportSummon && !protectionZoneCheck && checkSummonDist) {
+				g_game().internalTeleport(creature, creature->getMaster()->getPosition(), true);
 				continue;
 			}
 
-			if (Position::getDistanceZ(newPos, pos) > 0 || (std::max<int32_t>(Position::getDistanceX(newPos, pos), Position::getDistanceY(newPos, pos)) > 15))
-			{
-				g_game().internalTeleport(creature, creature->getMaster()->getPosition(), true);
+			if (monster->isSummon() && !monster->isFamiliar() && !teleportSummon && checkRemoveDist) {
+				despawnMonsterList.push_back(creature);
 			}
 		}
 
 		for (Creature* despawnCreature : despawnMonsterList) {
-			g_game().removeCreature(despawnCreature, true);
+			if (!despawnMonsterList.empty()) {
+				g_game().removeCreature(despawnCreature, true);
+			}
 		}
 	}
 }
@@ -493,7 +502,7 @@ void Creature::onCreatureMove(Creature* creature, const Tile* newTile, const Pos
 			stopEventWalk();
 		}
 
-		checkSummonMove(newPos, false);
+		checkSummonMove(newPos, g_configManager().getBoolean(TELEPORT_SUMMONS));
 
 		if (Player* player = creature->getPlayer()) {
 			if (player->isExerciseTraining()){