Mercurial > wow > buffalo2

diff Modules/ArtifactPower.lua @ 131:15a7f27b11e6 v7.3.2-20111027

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Fixed an infinite loop occurring with Artifact XP calculations on fresh 110 toons - Fixed combat state response - Mask out redundant cheevos (Cutting Edge/AotC and end boss)
author Nenue
date Mon, 20 Nov 2017 12:01:52 -0500
parents 9f2cf5609420
children 86621c60512b
line wrap: on
line diff
--- a/Modules/ArtifactPower.lua	Sun Oct 22 18:29:09 2017 -0400
+++ b/Modules/ArtifactPower.lua	Mon Nov 20 12:01:52 2017 -0500
@@ -506,13 +506,10 @@
 
           local questTitle, factionID, capped = C_TaskQuest.GetQuestInfoByQuestID(questID)
           --print(questTitle, HaveQuestRewardData(questID))
-          if HaveQuestRewardData(questID) then
+          if HaveQuestRewardData(questID) and not IsQuestComplete(questID) then
 
 
-            local numQuestRewards = GetNumQuestLogRewards(questID);
-
-            if numQuestRewards > 0 then
-              for i = 1, numQuestRewards do
+              for i = 1, GetNumQuestLogRewards(questID) or 0 do
                 local name, texture, numItems, quality, isUsable, itemID = GetQuestLogRewardInfo(i, questID)
                 if IsArtifactPowerItem(itemID) then
                   local _, link = GetItemInfo(itemID)
@@ -535,8 +532,6 @@
 
               end
 
-            end
-
 
           else
             C_TaskQuest.RequestPreloadRewardData(questID);
@@ -992,7 +987,7 @@
 
   print('tier:', artifact.tier)
   print('current:', self.level, self.currentXP, '/', self.currentCost)
-  while actualXP >= actualCost do
+  while (actualXP >= actualCost) and (actualCost > 0) do
     actualXP = actualXP - actualCost
     actualLevel = actualLevel + 1
     actualCost = C_ArtifactUI.GetCostForPointAtRank(actualLevel, artifact.tier)
@@ -1010,7 +1005,7 @@
   local nextCost = artifact.currentCost
   print(totalXP, totalCost)
   if remaining > nextCost then
-    while remaining >= nextCost do
+    while (remaining >= nextCost) and (nextCost > 0) do
       totalLevel = totalLevel + 1
       remaining = remaining - nextCost
       nextCost = C_ArtifactUI.GetCostForPointAtRank(totalLevel, artifact.tier)