fix: conditions and spells

opentibiabr · Dec 3, 2024 · b67867b · b67867b
1 parent 3647df2
commit b67867b
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 22 deletions.
diff --git a/data-otservbr-global/lib/others/soulpit.lua b/data-otservbr-global/lib/others/soulpit.lua
@@ -1,5 +1,6 @@
 SoulPit = {
 	encounter = nil,
+	kickEvent = nil,
 	soulCores = Game.getSoulCoreItems(),
 	requiredLevel = 8,
 	playerPositions = {

diff --git a/data-otservbr-global/scripts/actions/soulpit/soulpit_fight.lua b/data-otservbr-global/scripts/actions/soulpit/soulpit_fight.lua
@@ -10,6 +10,9 @@ function zoneEvent.afterLeave(zone, creature)
 			SoulPit.encounter:reset()
 			SoulPit.encounter = nil
 		end
+		if SoulPit.kickEvent then
+			stopEvent(SoulPit.kickEvent)
+		end
 	end
 
 	for abilityName, abilityInfo in pairs(SoulPit.bossAbilities) do
@@ -79,6 +82,22 @@ function soulPitAction.onUse(player, item, fromPosition, target, toPosition, isH
 		zone = SoulPit.zone,
 	})
 
+	function encounter:onReset(position)
+		SoulPit.zone:removeMonsters()
+
+		for _, player in pairs(SoulPit.zone:getPlayers()) do
+			player:sendTextMessage(MESSAGE_EVENT_ADVANCE, string.format("You have defeated the core of the %s soul and unlocked its animus mastery!", monsterName))
+			-- Add the monster animus mastery for the player.
+		end
+
+		SoulPit.kickEvent = addEvent(function()
+			SoulPit.encounter = nil
+			for _, player in pairs(SoulPit.zone:getPlayers()) do
+				player:teleportTo(SoulPit.exit)
+			end
+		end, SoulPit.timeToKick)
+	end
+
 	SoulPit.encounter = encounter
 
 	local function waveStart()
@@ -123,22 +142,6 @@ function soulPitAction.onUse(player, item, fromPosition, target, toPosition, isH
 			:autoAdvance({ delay = SoulPit.checkMonstersDelay, monstersKilled = true })
 	end
 
-	function encounter:onReset(position)
-		SoulPit.zone:removeMonsters()
-
-		for _, player in pairs(SoulPit.zone:getPlayers()) do
-			player:sendTextMessage(MESSAGE_EVENT_ADVANCE, string.format("You have defeated the core of the %s soul and unlocked its animus mastery!", monsterName))
-			-- Add the monster animus mastery for the player.
-		end
-
-		addEvent(function()
-			SoulPit.encounter = nil
-			for _, player in pairs(SoulPit.zone:getPlayers()) do
-				player:teleportTo(SoulPit.exit)
-			end
-		end, SoulPit.timeToKick)
-	end
-
 	encounter:start()
 	encounter:register()
 

diff --git a/data-otservbr-global/scripts/spells/monster/soulpit_opressor.lua b/data-otservbr-global/scripts/spells/monster/soulpit_opressor.lua
@@ -15,7 +15,7 @@ local combatFear = Combat()
 combatFear:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_BLUE_GHOST)
 
 local area = createCombatArea(AREA_FEAR_OPRESSOR)
-combatRoot:setArea(area)
+combatFear:setArea(area)
 
 local condition = Condition(CONDITION_FEARED)
 condition:setParameter(CONDITION_PARAM_TICKS, 3000)

diff --git a/src/creatures/combat/combat.cpp b/src/creatures/combat/combat.cpp
@@ -641,6 +641,10 @@ void Combat::CombatHealthFunc(const std::shared_ptr<Creature> &caster, const std
 			}
 		}
 
+		if (targetPlayer && damage.primary.type == COMBAT_HEALING) {
+			damage.primary.value *= targetPlayer->getBuff(BUFF_HEALINGRECEIVED) / 100.;
+		}
+
 		damage.damageMultiplier += attackerPlayer->wheel()->getMajorStatConditional("Divine Empowerment", WheelMajor_t::DAMAGE);
 		g_logger().trace("Wheel Divine Empowerment damage multiplier {}", damage.damageMultiplier);
 	}

diff --git a/src/creatures/combat/condition.cpp b/src/creatures/combat/condition.cpp
@@ -206,6 +206,8 @@ bool Condition::executeCondition(const std::shared_ptr<Creature> &creature, int3
 }
 
 std::shared_ptr<Condition> Condition::createCondition(ConditionId_t id, ConditionType_t type, int32_t ticks, int32_t param /* = 0*/, bool buff /* = false*/, uint32_t subId /* = 0*/, bool isPersistent /* = false*/) {
+
+	std::shared_ptr<ConditionAttributes> conditionAttributes = nullptr;
 	switch (type) {
 		case CONDITION_POISON:
 		case CONDITION_FIRE:
@@ -251,6 +253,24 @@ std::shared_ptr<Condition> Condition::createCondition(ConditionId_t id, Conditio
 		case CONDITION_FEARED:
 			return std::make_shared<ConditionFeared>(id, type, ticks, buff, subId);
 
+		case CONDITION_LESSERHEX:
+			conditionAttributes = std::make_shared<ConditionAttributes>(id, type, ticks, buff, subId);
+			conditionAttributes->setParam(CONDITION_PARAM_BUFF_HEALINGRECEIVED, 50);
+			return conditionAttributes;
+
+		case CONDITION_INTENSEHEX:
+			conditionAttributes = std::make_shared<ConditionAttributes>(id, type, ticks, buff, subId);
+			conditionAttributes->setParam(CONDITION_PARAM_BUFF_HEALINGRECEIVED, 50);
+			conditionAttributes->setParam(CONDITION_PARAM_BUFF_DAMAGEDEALT, 50);
+			return conditionAttributes;
+
+		case CONDITION_GREATERHEX:
+			conditionAttributes = std::make_shared<ConditionAttributes>(id, type, ticks, buff, subId);
+			conditionAttributes->setParam(CONDITION_PARAM_BUFF_HEALINGRECEIVED, 50);
+			conditionAttributes->setParam(CONDITION_PARAM_BUFF_DAMAGEDEALT, 50);
+			conditionAttributes->setParam(CONDITION_PARAM_STAT_MAXHITPOINTSPERCENT, 60);
+			return conditionAttributes;
+
 		case CONDITION_ROOTED:
 		case CONDITION_INFIGHT:
 		case CONDITION_DRUNK:
@@ -261,9 +281,6 @@ std::shared_ptr<Condition> Condition::createCondition(ConditionId_t id, Conditio
 		case CONDITION_CHANNELMUTEDTICKS:
 		case CONDITION_YELLTICKS:
 		case CONDITION_POWERLESS:
-		case CONDITION_LESSERHEX:
-		case CONDITION_INTENSEHEX:
-		case CONDITION_GREATERHEX:
 		case CONDITION_PACIFIED:
 			return std::make_shared<ConditionGeneric>(id, type, ticks, buff, subId);
 		case CONDITION_BAKRAGORE:
@@ -1022,6 +1039,11 @@ bool ConditionAttributes::setParam(ConditionParam_t param, int32_t value) {
 			return true;
 		}
 
+		case CONDITION_PARAM_BUFF_HEALINGRECEIVED: {
+			buffsPercent[BUFF_HEALINGRECEIVED] = std::max<int32_t>(0, value);
+			return true;
+		}
+
 		case CONDITION_PARAM_BUFF_DAMAGEDEALT: {
 			buffsPercent[BUFF_DAMAGEDEALT] = std::max<int32_t>(0, value);
 			return true;

diff --git a/src/creatures/combat/spells.cpp b/src/creatures/combat/spells.cpp
@@ -1053,11 +1053,15 @@ void Spell::setLockedPZ(bool b) {
 
 InstantSpell::InstantSpell() = default;
 
-bool InstantSpell::playerCastInstant(const std::shared_ptr<Player> &player, std::string &param) const {
+bool InstantSpell::playerCastInstant(const std::shared_ptr<Player> &player, std::string &param) {
 	if (!playerSpellCheck(player)) {
 		return false;
 	}
 
+	if (player->hasCondition(CONDITION_POWERLESS) && getGroup() == SPELLGROUP_ATTACK) {
+		return false;
+	}
+
 	LuaVariant var;
 	var.instantName = getName();
 	std::shared_ptr<Player> playerTarget = nullptr;
@@ -1379,6 +1383,10 @@ bool RuneSpell::executeUse(const std::shared_ptr<Player> &player, const std::sha
 		return false;
 	}
 
+	if (player->hasCondition(CONDITION_POWERLESS) && getGroup() == SPELLGROUP_ATTACK) {
+		return false;
+	}
+
 	LuaVariant var;
 	var.runeName = getName();
 

diff --git a/src/creatures/combat/spells.hpp b/src/creatures/combat/spells.hpp
@@ -280,7 +280,7 @@ class Spell : public BaseSpell {
 class InstantSpell final : public Spell {
 public:
 	InstantSpell();
-	bool playerCastInstant(const std::shared_ptr<Player> &player, std::string &param) const;
+	bool playerCastInstant(const std::shared_ptr<Player> &player, std::string &param);
 
 	bool castSpell(const std::shared_ptr<Creature> &creature) override;
 	bool castSpell(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &target) override;

diff --git a/src/creatures/creatures_definitions.hpp b/src/creatures/creatures_definitions.hpp
@@ -223,6 +223,7 @@ enum ConditionParam_t {
 	CONDITION_PARAM_INCREASE_MANADRAINPERCENT = 80,
 	CONDITION_PARAM_INCREASE_DROWNPERCENT = 81,
 	CONDITION_PARAM_CHARM_CHANCE_MODIFIER = 82,
+	CONDITION_PARAM_BUFF_HEALINGRECEIVED = 83,
 };
 
 enum stats_t {