Merge branch 'Generals' of github.com:Nostrademous/PathOfBuilding into Generals

Modules/CalcPerform.lua

@@ -17,7 +17,6 @@ local s_format = string.format
 local bor = bit.bor
 local band = bit.band
 
-local tempTable1 = { }
 
 -- Identify the trigger action skill for trigger conditions, take highest Attack Per Second 
 local function findTriggerSkill(env, skill, source, triggerRate, reqManaCost)

Modules/CalcSetup.lua

@@ -475,7 +475,7 @@ function calcs.initEnv(build, mode, override, specEnv)
 	end
 
 	-- Build and merge item modifiers, and create list of radius jewels
-	if not (accelerate.requirementsItems) then
+	if not accelerate.requirementsItems then
 		for _, slot in pairs(build.itemsTab.orderedSlots) do
 			local slotName = slot.slotName
 			local item

Modules/Calcs.lua

@@ -121,7 +121,7 @@ function calcs.getMiscCalculator(build)
 		calcs.perform(env)
 		-- prevent upcoming calculation from using Cached Data and thus forcing it to re-calculate new FullDPS roll-up 
 		-- without this, FullDPS increase/decrease when for node/item/gem comparison would be all 0 as it would be comparing
-		-- A with A (do to cache reuse) instead of A with B
+		-- A with A (due to cache reuse) instead of A with B
 		GlobalCache.dontUseCache = true
 		fullDPS = calcs.calcFullDPS(build, "CALCULATOR", override, { cachedPlayerDB = cachedPlayerDB, cachedEnemyDB = cachedEnemyDB, cachedMinionDB = cachedMinionDB, env = env, accelerate = accelerate })
 		GlobalCache.dontUseCache = nil
@@ -180,9 +180,7 @@ function calcs.calcFullDPS(build, mode, override, specEnv)
 					fullEnv.player.mainSkill = activeSkill
 					calcs.perform(fullEnv)
 					usedEnv = fullEnv
-					if forceCache then
-						GlobalCache.dontUseCache = true
-					end
+				        GlobalCache.dontUseCache = forceCache
 				end
 				if activeSkill.minion then
 					if usedEnv.minion.output.TotalDPS and usedEnv.minion.output.TotalDPS > 0 then
@@ -610,4 +608,4 @@ function calcs.buildOutput(build, mode)
 	return env
 end
 
-return calcs
+return calcs