fix: wheel divine empowerment multiplier (#1899)

opentibiabr · Nov 24, 2023 · 0ba46fe · 0ba46fe
1 parent 760d265
commit 0ba46fe
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/data-otservbr-global/scripts/spells/support/divine_empowerment.lua b/data-otservbr-global/scripts/spells/support/divine_empowerment.lua
@@ -1,3 +1,17 @@
+local function removeEmpowermentItem(position)
+	for x = -1, 1 do
+		for y = -1, 1 do
+			local tile = Tile(Position(position.x + x, position.y + y, position.z))
+			if tile then
+				local item = tile:getItemById(ITEM_DIVINE_EMPOWERMENT)
+				if item then
+					item:remove()
+				end
+			end
+		end
+	end
+end
+
 local spell = Spell("instant")
 
 function spell.onCastSpell(creature, var)
@@ -29,10 +43,12 @@ function spell.onCastSpell(creature, var)
 		for y = -1, 1 do
 			local item = Game.createItem(ITEM_DIVINE_EMPOWERMENT, 1, Position(position.x + x, position.y + y, position.z))
 			if item then
-				item:setDuration(5, 5, 0, false)
+				item:setAttribute(ITEM_ATTRIBUTE_OWNER, creature:getId())
 			end
 		end
 	end
+
+	addEvent(removeEmpowermentItem, 5000, position)
 	creature:onThinkWheelOfDestiny(true)
 	return true
 end

diff --git a/src/creatures/combat/combat.cpp b/src/creatures/combat/combat.cpp
@@ -569,7 +569,7 @@ void Combat::CombatHealthFunc(std::shared_ptr<Creature> caster, std::shared_ptr<
 		targetPlayer = target->getPlayer();
 	}
 
-	if (caster && attackerPlayer) {
+	if (attackerPlayer) {
 		std::shared_ptr<Item> item = attackerPlayer->getWeapon();
 		damage = applyImbuementElementalDamage(attackerPlayer, item, damage);
 		g_events().eventPlayerOnCombat(attackerPlayer, target, item, damage);
@@ -582,6 +582,9 @@ void Combat::CombatHealthFunc(std::shared_ptr<Creature> caster, std::shared_ptr<
 				damage.secondary.value /= 2;
 			}
 		}
+
+		damage.damageMultiplier += attackerPlayer->wheel()->getMajorStatConditional("Divine Empowerment", WheelMajor_t::DAMAGE);
+		g_logger().debug("Wheel Divine Empowerment damage multiplier {}", damage.damageMultiplier);
 	}
 
 	if (g_game().combatBlockHit(damage, caster, target, params.blockedByShield, params.blockedByArmor, params.itemId != 0)) {

diff --git a/src/creatures/players/wheel/player_wheel.cpp b/src/creatures/players/wheel/player_wheel.cpp
@@ -2173,7 +2173,6 @@ void PlayerWheel::downgradeSpell(const std::string &name) {
 
 std::shared_ptr<Spell> PlayerWheel::getCombatDataSpell(CombatDamage &damage) {
 	std::shared_ptr<Spell> spell = nullptr;
-	damage.damageMultiplier += getMajorStatConditional("Divine Empowerment", WheelMajor_t::DAMAGE);
 	WheelSpellGrade_t spellGrade = WheelSpellGrade_t::NONE;
 	if (!(damage.instantSpellName).empty()) {
 		spellGrade = getSpellUpgrade(damage.instantSpellName);

diff --git a/src/lua/functions/creatures/player/player_functions.cpp b/src/lua/functions/creatures/player/player_functions.cpp
@@ -3877,7 +3877,7 @@ int PlayerFunctions::luaPlayerUpgradeSpellWOD(lua_State* L) {
 }
 
 int PlayerFunctions::luaPlayerRevelationStageWOD(lua_State* L) {
-	// player:revelationStagesWOD([name[, set]])
+	// player:revelationStageWOD([name[, set]])
 	std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1);
 	if (!player) {
 		lua_pushnil(L);