fix: progress

opentibiabr · Feb 18, 2024 · 9811c6e · 9811c6e
1 parent 372bc53
commit 9811c6e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/data-otservbr-global/scripts/game_migrations/20241708000535_move_achievement_to_kv.lua b/data-otservbr-global/scripts/game_migrations/20241708000535_move_achievement_to_kv.lua
@@ -6,7 +6,7 @@ local function migrateAchievementProgress(player)
 		local oldStorageKey = achievementProgressStorage + id
 		local progressNumber = player:getStorageValue(oldStorageKey)
 		if progressNumber > 0 then
-			local achievScopeName = tostring(foundAchievement.name .. "-progress")
+			local achievScopeName = tostring(achievement.name .. "-progress")
 			player:kv():scoped(achievScopeName, progressNumber)
 			player:setStorageValue(oldStorageKey, -1)
 		end

diff --git a/data/scripts/lib/register_achievements.lua b/data/scripts/lib/register_achievements.lua
@@ -646,11 +646,13 @@ function Player.addAchievementProgress(self, achievement, totalProgress)
 	local achievScopeName = tostring(foundAchievement.name .. "-progress")
 	local progressNumber = achievScope:get(achievScopeName) or 0
 	local newProgress = progressNumber + 1
+	if newProgress > totalProgress then
+		return
+	end
+
 	if newProgress == totalProgress then
 		self:addAchievement(foundAchievement.id)
 		logger.debug("[Player.addAchievementProgress] - Achievement '{}' completed", foundAchievement.name)
-		achievScope:remove(achievScopeName)
-		return
 	end
 
 	logger.debug("[Player.addAchievementProgress] - Achievement '{}' progress updated to '{}', total progress '{}'", foundAchievement.name, newProgress, totalProgress)