Merge branch 'main' into patch-1

config.lua.dist

@@ -401,6 +401,8 @@ coinPacketSize = 25
 coinImagesURL = "http://127.0.0.1/images/store/"
 classicAttackSpeed = false
 showScriptsLogInConsole = false
+-- time to suppress negative conditions after being affected by them (ms)
+minDelayBetweenConditions = 0
 -- configure maximum value of critical imbuement
 criticalChance = 10
 inventoryGlowOnFiveBless = false

data-otservbr-global/scripts/weapons/unscripted_weapons.lua

@@ -4605,14 +4605,14 @@ local weapons = {
 		itemId = 3348,
 		type = WEAPON_CLUB,
 	},
-	-- {
-	-- 	-- hunting spear
-	-- 	itemId = 3347,
-	-- 	type = WEAPON_MISSILE,
-	-- 	level = 20,
-	-- 	unproperly = true,
-	-- 	breakchance = 6
-	-- },
+	{
+		-- hunting spear
+		itemId = 3347,
+		type = WEAPON_MISSILE,
+		level = 20,
+		unproperly = true,
+		breakchance = 6,
+	},
 	{
 		-- ripper lance
 		itemId = 3346,
@@ -4650,17 +4650,17 @@ local weapons = {
 		unproperly = true,
 		action = "removecount",
 	},
-	-- {
-	-- 	-- -- arrow
-	-- 	-- itemId = 3447,
-	-- 	-- type = WEAPON_AMMO,
-	-- 	-- -- action = "removecount"
-	-- },
+	{
+		-- arrow
+		itemId = 3447,
+		type = WEAPON_AMMO,
+		action = "removecount",
+	},
 	{
 		-- bolt
 		itemId = 3446,
 		type = WEAPON_AMMO,
-		-- action = "removecount"
+		action = "removecount",
 	},
 	{
 		-- bow
@@ -5032,12 +5032,12 @@ local weapons = {
 		level = 80,
 		unproperly = true,
 	},
-	-- {
-	-- 	-- throwing star
-	-- 	itemId = 3287,
-	-- 	type = WEAPON_MISSILE,
-	-- 	breakchance = 10
-	-- },
+	{
+		-- throwing star
+		itemId = 3287,
+		type = WEAPON_MISSILE,
+		breakchance = 10,
+	},
 	{
 		-- mace
 		itemId = 3286,
@@ -5104,12 +5104,12 @@ local weapons = {
 			{ "Elite Knight" },
 		},
 	},
-	-- {
-	-- 	-- spear
-	-- 	itemId = 3277,
-	-- 	type = WEAPON_MISSILE,
-	-- 	-- breakchance = 3
-	-- },
+	{
+		-- spear
+		itemId = 3277,
+		type = WEAPON_MISSILE,
+		breakchance = 3,
+	},
 	{
 		-- hatchet
 		itemId = 3276,

src/config/config_definitions.hpp

@@ -147,6 +147,7 @@ enum ConfigKey_t : uint16_t {
 	METRICS_ENABLE_PROMETHEUS,
 	METRICS_OSTREAM_INTERVAL,
 	METRICS_PROMETHEUS_ADDRESS,
+	MIN_DELAY_BETWEEN_CONDITIONS,
 	MIN_ELEMENTAL_RESISTANCE,
 	MOMENTUM_CHANCE_FORMULA_A,
 	MOMENTUM_CHANCE_FORMULA_B,

src/config/configmanager.cpp

@@ -117,6 +117,7 @@ bool ConfigManager::load() {
 	loadBoolConfig(L, CLEAN_PROTECTION_ZONES, "cleanProtectionZones", false);
 	loadBoolConfig(L, GLOBAL_SERVER_SAVE_SHUTDOWN, "globalServerSaveShutdown", true);
 	loadBoolConfig(L, PUSH_WHEN_ATTACKING, "pushWhenAttacking", false);
+	loadIntConfig(L, MIN_DELAY_BETWEEN_CONDITIONS, "minDelayBetweenConditions", 0);
 
 	loadBoolConfig(L, WEATHER_RAIN, "weatherRain", false);
 	loadBoolConfig(L, WEATHER_THUNDER, "thunderEffect", false);

src/creatures/combat/combat.cpp

@@ -744,7 +744,7 @@ void Combat::CombatConditionFunc(std::shared_ptr<Creature> caster, std::shared_p
 
 			// TODO: infight condition until all aggressive conditions has ended
 			if (target) {
-				target->addCombatCondition(conditionCopy);
+				target->addCombatCondition(conditionCopy, caster && caster->getPlayer() != nullptr);
 			}
 		}
 	}

src/creatures/combat/condition.cpp

@@ -1644,7 +1644,9 @@ bool ConditionDamage::getNextDamage(int32_t &damage) {
 }
 
 bool ConditionDamage::doDamage(std::shared_ptr<Creature> creature, int32_t healthChange) {
-	if (creature->isSuppress(getType())) {
+	auto attacker = g_game().getPlayerByGUID(owner) ? g_game().getPlayerByGUID(owner)->getCreature() : g_game().getCreatureByID(owner);
+	bool isPlayer = attacker && attacker->getPlayer();
+	if (creature->isSuppress(getType(), isPlayer)) {
 		return true;
 	}
 
@@ -1653,7 +1655,6 @@ bool ConditionDamage::doDamage(std::shared_ptr<Creature> creature, int32_t healt
 	damage.primary.value = healthChange;
 	damage.primary.type = Combat::ConditionToDamageType(conditionType);
 
-	std::shared_ptr<Creature> attacker = g_game().getCreatureByID(owner);
 	if (field && creature->getPlayer() && attacker && attacker->getPlayer()) {
 		damage.primary.value = static_cast<int32_t>(std::round(damage.primary.value / 2.));
 	}

src/creatures/creature.cpp

@@ -1334,12 +1334,14 @@ bool Creature::setMaster(std::shared_ptr<Creature> newMaster, bool reloadCreatur
 	return true;
 }
 
-bool Creature::addCondition(std::shared_ptr<Condition> condition) {
+bool Creature::addCondition(std::shared_ptr<Condition> condition, bool attackerPlayer /* = false*/) {
 	metrics::method_latency measure(__METHOD_NAME__);
 	if (condition == nullptr) {
 		return false;
 	}
-
+	if (isSuppress(condition->getType(), attackerPlayer)) {
+		return false;
+	}
 	std::shared_ptr<Condition> prevCond = getCondition(condition->getType(), condition->getId(), condition->getSubId());
 	if (prevCond) {
 		prevCond->addCondition(getCreature(), condition);
@@ -1355,11 +1357,11 @@ bool Creature::addCondition(std::shared_ptr<Condition> condition) {
 	return false;
 }
 
-bool Creature::addCombatCondition(std::shared_ptr<Condition> condition) {
+bool Creature::addCombatCondition(std::shared_ptr<Condition> condition, bool attackerPlayer /* = false*/) {
 	// Caution: condition variable could be deleted after the call to addCondition
 	ConditionType_t type = condition->getType();
 
-	if (!addCondition(condition)) {
+	if (!addCondition(condition, attackerPlayer)) {
 		return false;
 	}
 
@@ -1490,7 +1492,7 @@ void Creature::executeConditions(uint32_t interval) {
 
 bool Creature::hasCondition(ConditionType_t type, uint32_t subId /* = 0*/) const {
 	metrics::method_latency measure(__METHOD_NAME__);
-	if (isSuppress(type)) {
+	if (isSuppress(type, false)) {
 		return false;
 	}
 

src/creatures/creature.hpp

@@ -388,8 +388,8 @@ class Creature : virtual public Thing, public SharedObject {
 		return SPEECHBUBBLE_NONE;
 	}
 
-	bool addCondition(std::shared_ptr<Condition> condition);
-	bool addCombatCondition(std::shared_ptr<Condition> condition);
+	bool addCondition(std::shared_ptr<Condition> condition, bool attackerPlayer = false);
+	bool addCombatCondition(std::shared_ptr<Condition> condition, bool attackerPlayer = false);
 	void removeCondition(ConditionType_t conditionType, ConditionId_t conditionId, bool force = false);
 	void removeCondition(ConditionType_t type);
 	void removeCondition(std::shared_ptr<Condition> condition);
@@ -406,7 +406,7 @@ class Creature : virtual public Thing, public SharedObject {
 	virtual bool isImmune(ConditionType_t type) const {
 		return false;
 	}
-	virtual bool isSuppress(ConditionType_t type) const {
+	virtual bool isSuppress(ConditionType_t type, bool attackerPlayer) const {
 		return false;
 	};
 

src/creatures/creatures_definitions.hpp

@@ -112,6 +112,28 @@ enum ConditionType_t : uint8_t {
 	CONDITION_COUNT = 39
 };
 
+// constexpr definiting suppressible conditions
+constexpr bool IsConditionSuppressible(ConditionType_t condition) {
+	constexpr ConditionType_t suppressibleConditions[] = {
+		CONDITION_POISON,
+		CONDITION_FIRE,
+		CONDITION_ENERGY,
+		CONDITION_BLEEDING,
+		CONDITION_PARALYZE,
+		CONDITION_DROWN,
+		CONDITION_FREEZING,
+		CONDITION_CURSED,
+	};
+
+	for (const auto &suppressibleCondition : suppressibleConditions) {
+		if (condition == suppressibleCondition) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 enum ConditionParam_t {
 	CONDITION_PARAM_OWNER = 1,
 	CONDITION_PARAM_TICKS = 2,

src/creatures/monsters/monster.cpp

@@ -685,7 +685,11 @@ void Monster::updateIdleStatus() {
 	bool idle = false;
 	if (conditions.empty()) {
 		if (!isSummon() && targetList.empty()) {
-			idle = true;
+			if (isInSpawnLocation()) {
+				idle = true;
+			} else {
+				isWalkingBack = true;
+			}
 		} else if (const auto &master = getMaster()) {
 			if ((!isSummon() && totalPlayersOnScreen == 0 || isSummon() && master->getMonster() && master->getMonster()->totalPlayersOnScreen == 0) && getFaction() != FACTION_DEFAULT) {
 				idle = true;
@@ -696,6 +700,13 @@ void Monster::updateIdleStatus() {
 	setIdle(idle);
 }
 
+bool Monster::isInSpawnLocation() const {
+	if (!spawnMonster) {
+		return true;
+	}
+	return position == masterPos || masterPos == Position();
+}
+
 void Monster::onAddCondition(ConditionType_t type) {
 	onConditionStatusChange(type);
 }
@@ -1159,6 +1170,8 @@ bool Monster::getNextStep(Direction &nextDirection, uint32_t &flags) {
 
 	if (getFollowCreature() && hasFollowPath) {
 		doFollowCreature(flags, nextDirection, result);
+	} else if (isWalkingBack) {
+		doWalkBack(flags, nextDirection, result);
 	} else {
 		doRandomStep(nextDirection, result);
 	}
@@ -1187,6 +1200,31 @@ void Monster::doRandomStep(Direction &nextDirection, bool &result) {
 	}
 }
 
+void Monster::doWalkBack(uint32_t &flags, Direction &nextDirection, bool &result) {
+	result = Creature::getNextStep(nextDirection, flags);
+	if (result) {
+		flags |= FLAG_PATHFINDING;
+	} else {
+		if (ignoreFieldDamage) {
+			ignoreFieldDamage = false;
+			updateMapCache();
+		}
+
+		int32_t distance = std::max<int32_t>(Position::getDistanceX(position, masterPos), Position::getDistanceY(position, masterPos));
+		if (distance == 0) {
+			isWalkingBack = false;
+			return;
+		}
+
+		stdext::arraylist<Direction> listDir(128);
+		if (!getPathTo(masterPos, listDir, 0, std::max<int32_t>(0, distance - 5), true, true, distance)) {
+			isWalkingBack = false;
+			return;
+		}
+		startAutoWalk(listDir.data());
+	}
+}
+
 void Monster::doFollowCreature(uint32_t &flags, Direction &nextDirection, bool &result) {
 	randomStepping = false;
 	result = Creature::getNextStep(nextDirection, flags);

src/creatures/monsters/monster.hpp

@@ -389,6 +389,7 @@ class Monster final : public Creature {
 
 	Position masterPos;
 
+	bool isWalkingBack = false;
 	bool isIdle = true;
 	bool extraMeleeAttack = false;
 	bool randomStepping = false;
@@ -427,6 +428,7 @@ class Monster final : public Creature {
 	bool canUseSpell(const Position &pos, const Position &targetPos, const spellBlock_t &sb, uint32_t interval, bool &inRange, bool &resetTicks);
 	bool getRandomStep(const Position &creaturePos, Direction &direction);
 	bool getDanceStep(const Position &creaturePos, Direction &direction, bool keepAttack = true, bool keepDistance = true);
+	bool isInSpawnLocation() const;
 	bool isInSpawnRange(const Position &pos) const;
 	bool canWalkTo(Position pos, Direction direction);
 
@@ -460,6 +462,7 @@ class Monster final : public Creature {
 
 	static std::vector<std::pair<int8_t, int8_t>> getPushItemLocationOptions(const Direction &direction);
 
+	void doWalkBack(uint32_t &flags, Direction &nextDirection, bool &result);
 	void doFollowCreature(uint32_t &flags, Direction &nextDirection, bool &result);
 	void doRandomStep(Direction &nextDirection, bool &result);
 

src/creatures/players/player.cpp

@@ -215,7 +215,12 @@ std::shared_ptr<Item> Player::getInventoryItem(Slots_t slot) const {
 	return inventory[slot];
 }
 
-bool Player::isSuppress(ConditionType_t conditionType) const {
+bool Player::isSuppress(ConditionType_t conditionType, bool attackerPlayer) const {
+	auto minDelay = g_configManager().getNumber(MIN_DELAY_BETWEEN_CONDITIONS, __FUNCTION__);
+	if (IsConditionSuppressible(conditionType) && checkLastConditionTimeWithin(conditionType, minDelay)) {
+		return true;
+	}
+
 	return m_conditionSuppressions[static_cast<size_t>(conditionType)];
 }
 
@@ -450,7 +455,7 @@ float Player::getDefenseFactor() const {
 uint32_t Player::getClientIcons() {
 	uint32_t icons = 0;
 	for (const auto &condition : conditions) {
-		if (!isSuppress(condition->getType())) {
+		if (!isSuppress(condition->getType(), false)) {
 			icons |= condition->getIcons();
 		}
 	}
@@ -4481,6 +4486,9 @@ void Player::onAddCondition(ConditionType_t type) {
 }
 
 void Player::onAddCombatCondition(ConditionType_t type) {
+	if (IsConditionSuppressible(type)) {
+		updateLastConditionTime(type);
+	}
 	switch (type) {
 		case CONDITION_POISON:
 			sendTextMessage(MESSAGE_FAILURE, "You are poisoned.");