Merge remote-tracking branch 'origin/dev'

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 1.4.122 - 2019/01/01
+ * Updated the crafting bench options for 3.5
+ * Added support for most of the new craft modifiers
+ * Applied the weapon restriction changes from 3.5
+ * Adrenaline can now always be enabled (as it is no longer exclusive to Champion)
+ * Fixed issue with modifiers to socketed gem level applying twice
+
 ### 1.4.121 - 2018/12/12
  * Applied the unique balance changes for 3.5
  * Added base radius values for Vortex (20), Armageddon Brand (18/8), Winter Orb (16), and the Banner skills (40)

Classes/ItemsTab.lua

@@ -1555,8 +1555,14 @@ function ItemsTabClass:AddCustomModifierToDisplayItem()
 		if sourceId == "MASTER" then
 			for _, craft in ipairs(self.build.data.masterMods) do
 				if craft.types[self.displayItem.type] then
+					local label
+					if craft.master then
+						label = craft.master .. " " .. craft.masterLevel .. "   "..craft.type:sub(1,3).."^8[" .. table.concat(craft, "/") .. "]"
+					else
+						label = table.concat(craft, "/")
+					end
 					t_insert(modList, {
-						label = craft.master .. " " .. craft.masterLevel .. "   "..craft.type:sub(1,3).."^8[" .. table.concat(craft, "/") .. "]",
+						label = label,
 						mod = craft,
 						type = "crafted",
 					})
@@ -1606,8 +1612,10 @@ function ItemsTabClass:AddCustomModifierToDisplayItem()
 			end)
 		end
 	end
+	if self.build.targetVersion ~= "2_6" or (self.displayItem.type ~= "Jewel" and self.displayItem.type ~= "Flask") then
+		t_insert(sourceList, { label = "Crafting Bench", sourceId = "MASTER" })
+	end
 	if self.displayItem.type ~= "Jewel" and self.displayItem.type ~= "Flask" then
-		t_insert(sourceList, { label = "Master", sourceId = "MASTER" })
 		t_insert(sourceList, { label = "Essence", sourceId = "ESSENCE" })
 	end
 	if not self.displayItem.crafted then
@@ -1634,7 +1642,7 @@ function ItemsTabClass:AddCustomModifierToDisplayItem()
 		return item
 	end
 	controls.sourceLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, 95, 20, 0, 16, "^7Source:")
-	controls.source = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, 100, 20, 100, 18, sourceList, function(index, value)
+	controls.source = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, 100, 20, 150, 18, sourceList, function(index, value)
 		buildMods(value.sourceId)
 		controls.modSelect:SetSel(1)
 	end)

Data/2_6/Skills/act_dex.lua

@@ -127,7 +127,6 @@ skills["AnimateWeapon"] = {
 		[30] = { 90, 45, },
 	},
 }
-
 skills["NewArcticArmour"] = {
 	name = "Arctic Armour",
 	color = 2,
@@ -245,9 +244,9 @@ skills["Barrage"] = {
 			name = "All Projectiles",
 		},
 	},
-	setupFunc = function(actor, output)
-		if actor.mainSkill.skillPart == 2 then
-			actor.mainSkill.skillData.dpsMultiplier = output.ProjectileCount
+	setupFunc = function(activeSkill, output)
+		if activeSkill.skillPart == 2 then
+			activeSkill.skillData.dpsMultiplier = output.ProjectileCount
 		end
 	end,
 	baseFlags = {
@@ -1718,8 +1717,8 @@ skills["DetonateDead"] = {
 	color = 2,
 	description = "Explodes an unused corpse, dealing fire damage to nearby enemies.",
 	skillTypes = { [39] = true, [10] = true, [11] = true, [17] = true, [18] = true, [19] = true, [26] = true, [36] = true, [33] = true, },
-	setupFunc = function(actor, output)
-		local skillData = actor.mainSkill.skillData
+	setupFunc = function(activeSkill, output)
+		local skillData = activeSkill.skillData
 		if skillData.corpseLife then
 			skillData.FireMin = skillData.FireMin + skillData.corpseLife * 0.06
 			skillData.FireMax = skillData.FireMax + skillData.corpseLife * 0.06
@@ -1820,8 +1819,8 @@ skills["VaalDetonateDead"] = {
 	color = 2,
 	description = "Explodes an unused corpse, dealing fire damage to nearby enemies. Nearby corpses will also explode in a chain reaction.",
 	skillTypes = { [39] = true, [10] = true, [11] = true, [17] = true, [18] = true, [19] = true, [26] = true, [43] = true, [33] = true, },
-	setupFunc = function(actor, output)
-		local skillData = actor.mainSkill.skillData
+	setupFunc = function(activeSkill, output)
+		local skillData = activeSkill.skillData
 		if skillData.corpseLife then
 			skillData.FireMin = skillData.FireMin + skillData.corpseLife * 0.08
 			skillData.FireMax = skillData.FireMax + skillData.corpseLife * 0.08

Data/2_6/Skills/act_int.lua

@@ -3125,9 +3125,9 @@ skills["FreezingPulse"] = {
 	color = 3,
 	description = "An icy projectile which has a chance to freeze enemies it passes through. The projectile fades quickly, reducing damage and freezing chance until it runs out of time and dissipates completely.",
 	skillTypes = { [2] = true, [3] = true, [10] = true, [17] = true, [18] = true, [19] = true, [26] = true, [36] = true, [34] = true, [60] = true, },
-	setupFunc = function(env, output)
-		env.modDB:NewMod("Damage", "MORE", -100, "Skill:Freezing Pulse", ModFlag.Spell, { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
-		env.modDB:NewMod("EnemyFreezeChance", "BASE", 25, "Skill:Freezing Pulse", { type = "DistanceRamp", ramp = {{0,1},{15*output.ProjectileSpeedMod,0}} })
+	setupFunc = function(activeSkill, output)
+		activeSkill.skillModList:NewMod("Damage", "MORE", -100, "Skill:Freezing Pulse", ModFlag.Spell, { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
+		activeSkill.skillModList:NewMod("EnemyFreezeChance", "BASE", 25, "Skill:Freezing Pulse", { type = "DistanceRamp", ramp = {{0,1},{15*output.ProjectileSpeedMod,0}} })
 	end,
 	baseFlags = {
 		spell = true,
@@ -5620,11 +5620,11 @@ skills["RighteousFire"] = {
 	color = 3,
 	description = "Engulfs you in magical fire that rapidly burns you and nearby enemies. Your spell damage is substantially increased while under this effect. The effect ends when you have 1 life remaining.",
 	skillTypes = { [2] = true, [5] = true, [11] = true, [18] = true, [29] = true, [36] = true, [40] = true, [33] = true, },
-	setupFunc = function(actor, output)
-		if actor.mainSkill.skillFlags.totem then
-			actor.mainSkill.skillData.FireDot = output.TotemLife * 0.5
+	setupFunc = function(activeSkill, output)
+		if activeSkill.skillFlags.totem then
+			activeSkill.skillData.FireDot = output.TotemLife * 0.5
 		else
-			actor.mainSkill.skillData.FireDot = (output.Life + output.EnergyShield) * 0.5
+			activeSkill.skillData.FireDot = (output.Life + output.EnergyShield) * 0.5
 		end
 	end,
 	statMap = {
@@ -5736,9 +5736,9 @@ skills["VaalRighteousFire"] = {
 	color = 3,
 	description = "A fiery blast removes your energy shield and all but 1 life, exploding outwards to deal fire damage to nearby enemies based on the life and energy shield lost.",
 	skillTypes = { [2] = true, [11] = true, [10] = true, [43] = true, [33] = true, },
-	setupFunc = function(actor, output)
-		actor.mainSkill.skillData.FireMin = output.EnergyShield + output.Life - 1
-		actor.mainSkill.skillData.FireMax = output.EnergyShield + output.Life - 1
+	setupFunc = function(activeSkill, output)
+		activeSkill.skillData.FireMin = output.EnergyShield + output.Life - 1
+		activeSkill.skillData.FireMax = output.EnergyShield + output.Life - 1
 	end,
 	baseFlags = {
 		spell = true,

Data/2_6/Skills/sup_dex.lua

@@ -988,7 +988,7 @@ skills["SupportAdditionalQuality"] = {
 	supportGemsOnly = true,
 	statMap = {
 		["supported_active_skill_gem_quality_%"] = {
-			mod("GemProperty", "LIST", { keyword = "active_skill", key = "quality", value = nil }),
+			mod("SupportedGemProperty", "LIST", { keyword = "active_skill", key = "quality", value = nil }),
 		},
 	},
 	qualityStats = {

Data/2_6/Skills/sup_str.lua

@@ -552,7 +552,7 @@ skills["SupportAdditionalLevel"] = {
 	supportGemsOnly = true,
 	statMap = {
 		["supported_active_skill_gem_level_+"] = {
-			mod("GemProperty", "LIST", { keyword = "active_skill", key = "level", value = nil }),
+			mod("SupportedGemProperty", "LIST", { keyword = "active_skill", key = "level", value = nil }),
 		},
 	},
 	qualityStats = {