fix: transcendence not apply correct status

opentibiabr · Apr 21, 2024 · 5c800f0 · 5c800f0
1 parent 955fdde
commit 5c800f0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp
@@ -6688,7 +6688,7 @@ void Player::triggerTranscendance() {
 		outfit.lookType = getVocation()->getAvatarLookType();
 		outfitCondition->setOutfit(outfit);
 		addCondition(outfitCondition);
-		wheel()->setOnThinkTimer(WheelOnThink_t::AVATAR, OTSYS_TIME() + duration);
+		wheel()->setOnThinkTimer(WheelOnThink_t::AVATAR_FORGE, OTSYS_TIME() + duration);
 		g_game().addMagicEffect(getPosition(), CONST_ME_AVATAR_APPEAR);
 		sendTextMessage(MESSAGE_ATTENTION, "Transcendance was triggered.");
 		sendSkills();

diff --git a/src/creatures/players/wheel/player_wheel.cpp b/src/creatures/players/wheel/player_wheel.cpp
@@ -2410,21 +2410,25 @@ int32_t PlayerWheel::checkBattleHealingAmount() const {
 }
 
 int32_t PlayerWheel::checkAvatarSkill(WheelAvatarSkill_t skill) const {
-	if (skill == WheelAvatarSkill_t::NONE || getOnThinkTimer(WheelOnThink_t::AVATAR) <= OTSYS_TIME()) {
+	if (skill == WheelAvatarSkill_t::NONE || (getOnThinkTimer(WheelOnThink_t::AVATAR_SPELL) <= OTSYS_TIME() && getOnThinkTimer(WheelOnThink_t::AVATAR_FORGE) <= OTSYS_TIME())) {
 		return 0;
 	}
 
 	uint8_t stage = 0;
-	if (getInstant("Avatar of Light")) {
-		stage = getStage(WheelStage_t::AVATAR_OF_LIGHT);
-	} else if (getInstant("Avatar of Steel")) {
-		stage = getStage(WheelStage_t::AVATAR_OF_STEEL);
-	} else if (getInstant("Avatar of Nature")) {
-		stage = getStage(WheelStage_t::AVATAR_OF_NATURE);
-	} else if (getInstant("Avatar of Storm")) {
-		stage = getStage(WheelStage_t::AVATAR_OF_STORM);
+	if (getOnThinkTimer(WheelOnThink_t::AVATAR_SPELL) > OTSYS_TIME()) {
+		if (getInstant("Avatar of Light")) {
+			stage = getStage(WheelStage_t::AVATAR_OF_LIGHT);
+		} else if (getInstant("Avatar of Steel")) {
+			stage = getStage(WheelStage_t::AVATAR_OF_STEEL);
+		} else if (getInstant("Avatar of Nature")) {
+			stage = getStage(WheelStage_t::AVATAR_OF_NATURE);
+		} else if (getInstant("Avatar of Storm")) {
+			stage = getStage(WheelStage_t::AVATAR_OF_STORM);
+		} else {
+			return 0;
+		}
 	} else {
-		return 0;
+		stage = 3;
 	}
 
 	if (skill == WheelAvatarSkill_t::DAMAGE_REDUCTION) {

diff --git a/src/creatures/players/wheel/wheel_definitions.hpp b/src/creatures/players/wheel/wheel_definitions.hpp
@@ -105,9 +105,10 @@ enum class WheelOnThink_t : uint8_t {
 	FOCUS_MASTERY = 4,
 	GIFT_OF_LIFE = 5,
 	DIVINE_EMPOWERMENT = 6,
-	AVATAR = 7,
+	AVATAR_SPELL = 7,
+	AVATAR_FORGE = 8,
 
-	TOTAL_COUNT = 8
+	TOTAL_COUNT = 9
 };
 
 enum class WheelStat_t : uint8_t {

diff --git a/src/lua/functions/creatures/player/player_functions.cpp b/src/lua/functions/creatures/player/player_functions.cpp
@@ -3997,9 +3997,9 @@ int PlayerFunctions::luaPlayerAvatarTimer(lua_State* L) {
 	}
 
 	if (lua_gettop(L) == 1) {
-		lua_pushnumber(L, (lua_Number)player->wheel()->getOnThinkTimer(WheelOnThink_t::AVATAR));
+		lua_pushnumber(L, (lua_Number)player->wheel()->getOnThinkTimer(WheelOnThink_t::AVATAR_SPELL));
 	} else {
-		player->wheel()->setOnThinkTimer(WheelOnThink_t::AVATAR, getNumber<int64_t>(L, 2));
+		player->wheel()->setOnThinkTimer(WheelOnThink_t::AVATAR_SPELL, getNumber<int64_t>(L, 2));
 		pushBoolean(L, true);
 	}
 	return 1;