Merge branch 'dev' of https://github.com/andyli00/PathOfBuilding into dev

Author: andyli00

src/Classes/ImportTab.lua

@@ -707,6 +707,8 @@ function ImportTabClass:ImportPassiveTreeAndJewels(json, charData)
 		charPassiveData.mastery_effects or {}, 
 		latestTreeVersion .. (charData.league:match("Ruthless") and "_ruthless" or "") .. (isAscendancyInTree(charData.class, latestTreeVersion) and "" or "_alternate")
 	)
+	self.build.treeTab:SetActiveSpec(self.build.treeTab.activeSpec)
+	self.build.spec:BuildClusterJewelGraphs()
 	self.build.spec:AddUndoState()
 	self.build.characterLevel = charData.level
 	self.build.characterLevelAutoMode = false
@@ -723,7 +725,6 @@ function ImportTabClass:ImportPassiveTreeAndJewels(json, charData)
 		end
 	end
 	self.build.configTab.varControls["resistancePenalty"]:SetSel(resistancePenaltyIndex)
-	self.build.buildFlag = true
 	main:SetWindowTitleSubtext(string.format("%s (%s, %s, %s)", self.build.buildName, charData.name, charData.class, charData.league))
 end
 

src/Data/ModCache.lua

@@ -663,7 +663,6 @@ return {
 	["LocalBaseEnergyShieldAndMana4"] = { type = "Prefix", affix = "Bishop's", "+(26-30) to maximum Energy Shield", "+(23-25) to maximum Mana", statOrder = { 1421, 1441 }, level = 78, group = "LocalBaseEnergyShieldAndMana", weightKey = { "shield", "boots", "gloves", "helmet", "int_armour", "str_int_armour", "dex_int_armour", "str_dex_int_armour", "default", }, weightVal = { 0, 0, 0, 0, 500, 250, 250, 166, 0 }, modTags = { "resource", "mana", "defences", "energy_shield" }, },
 	["MovementVelocity1"] = { type = "Prefix", affix = "Runner's", "10% increased Movement Speed", statOrder = { 1659 }, level = 1, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
 	["MovementVelocity2"] = { type = "Prefix", affix = "Sprinter's", "15% increased Movement Speed", statOrder = { 1659 }, level = 15, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
-	["MovementVelocity2Royale"] = { type = "Prefix", affix = "Sprinter's", "(15-25)% increased Movement Speed", statOrder = { 1659 }, level = 5, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
 	["MovementVelocity3"] = { type = "Prefix", affix = "Stallion's", "20% increased Movement Speed", statOrder = { 1659 }, level = 30, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
 	["MovementVelocity4"] = { type = "Prefix", affix = "Gazelle's", "25% increased Movement Speed", statOrder = { 1659 }, level = 40, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
 	["MovementVelocity5"] = { type = "Prefix", affix = "Cheetah's", "30% increased Movement Speed", statOrder = { 1659 }, level = 55, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, },
@@ -827,7 +826,6 @@ return {
 	["ItemFoundRarityIncreasePrefix4_"] = { type = "Prefix", affix = "Perandus'", "(25-28)% increased Rarity of Items found", statOrder = { 1458 }, level = 84, group = "ItemFoundRarityIncreasePrefix", weightKey = { "ring", "amulet", "default", }, weightVal = { 1000, 1000, 0 }, modTags = { "drop" }, },
 	["IncreasedCastSpeed1"] = { type = "Suffix", affix = "of Talent", "(5-8)% increased Cast Speed", statOrder = { 1310 }, level = 2, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "ring", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 800, 0 }, modTags = { "caster", "speed" }, },
 	["IncreasedCastSpeed2"] = { type = "Suffix", affix = "of Nimbleness", "(9-12)% increased Cast Speed", statOrder = { 1310 }, level = 15, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "ring", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 800, 0 }, modTags = { "caster", "speed" }, },
-	["IncreasedCastSpeed2Royale"] = { type = "Suffix", affix = "of Nimbleness", "(8-15)% increased Cast Speed", statOrder = { 1310 }, level = 4, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "sceptre", "amulet", "focus", "str_int_shield", "dex_int_shield", "gloves", "default", }, weightVal = { 1000, 0, 1000, 800, 1000, 1000, 1000, 500, 0 }, modTags = { "caster", "speed" }, },
 	["IncreasedCastSpeed3"] = { type = "Suffix", affix = "of Expertise", "(13-16)% increased Cast Speed", statOrder = { 1310 }, level = 30, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "ring", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 800, 0 }, modTags = { "caster", "speed" }, },
 	["IncreasedCastSpeed4"] = { type = "Suffix", affix = "of Legerdemain", "(17-20)% increased Cast Speed", statOrder = { 1310 }, level = 40, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 0 }, modTags = { "caster", "speed" }, },
 	["IncreasedCastSpeed5"] = { type = "Suffix", affix = "of Prestidigitation", "(21-24)% increased Cast Speed", statOrder = { 1310 }, level = 55, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 0 }, modTags = { "caster", "speed" }, },
@@ -849,7 +847,6 @@ return {
 	["IncreasedCastSpeedFishing"] = { type = "Suffix", affix = "of Casting", "(24-28)% increased Cast Speed", statOrder = { 1310 }, level = 10, group = "IncreasedCastSpeedFishing", weightKey = { "fishing_rod", "default", }, weightVal = { 1000, 0 }, modTags = { "red_herring", "caster", "speed" }, },
 	["LocalIncreasedAttackSpeed1"] = { type = "Suffix", affix = "of Skill", "(5-7)% increased Attack Speed", statOrder = { 1278 }, level = 1, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, },
 	["LocalIncreasedAttackSpeed2"] = { type = "Suffix", affix = "of Ease", "(8-10)% increased Attack Speed", statOrder = { 1278 }, level = 11, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, },
-	["LocalIncreasedAttackSpeed2Royale____"] = { type = "Suffix", affix = "of Ease", "(15-25)% increased Attack Speed", statOrder = { 1278 }, level = 4, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, },
 	["LocalIncreasedAttackSpeed3"] = { type = "Suffix", affix = "of Mastery", "(11-13)% increased Attack Speed", statOrder = { 1278 }, level = 22, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, },
 	["LocalIncreasedAttackSpeed4"] = { type = "Suffix", affix = "of Renown", "(14-16)% increased Attack Speed", statOrder = { 1278 }, level = 30, group = "LocalIncreasedAttackSpeed", weightKey = { "ranged", "weapon", "default", }, weightVal = { 500, 1000, 0 }, modTags = { "attack", "speed" }, },
 	["LocalIncreasedAttackSpeed5"] = { type = "Suffix", affix = "of Acclaim", "(17-19)% increased Attack Speed", statOrder = { 1278 }, level = 37, group = "LocalIncreasedAttackSpeed", weightKey = { "ranged", "weapon", "default", }, weightVal = { 500, 1000, 0 }, modTags = { "attack", "speed" }, },
@@ -865,7 +862,6 @@ return {
 	["LocalIncreasedAttackSpeedRangedEnhancedMod_"] = { type = "Suffix", affix = "of Tacati", "Adds (23-36) to (49-61) Chaos Damage", "(14-16)% increased Attack Speed", statOrder = { 1255, 1278 }, level = 1, group = "LocalIncreasedAttackSpeedAddedChaos", weightKey = { "default", }, weightVal = { 0 }, modTags = { "chaos_damage", "damage", "chaos", "attack", "speed" }, },
 	["IncreasedAttackSpeed1"] = { type = "Suffix", affix = "of Skill", "(5-7)% increased Attack Speed", statOrder = { 1275 }, level = 1, group = "IncreasedAttackSpeed", weightKey = { "ring", "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, },
 	["IncreasedAttackSpeed2"] = { type = "Suffix", affix = "of Ease", "(8-10)% increased Attack Speed", statOrder = { 1275 }, level = 11, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, },
-	["IncreasedAttackSpeed2Royale"] = { type = "Suffix", affix = "of Ease", "(8-15)% increased Attack Speed", statOrder = { 1275 }, level = 4, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, },
 	["IncreasedAttackSpeed3"] = { type = "Suffix", affix = "of Mastery", "(11-13)% increased Attack Speed", statOrder = { 1275 }, level = 22, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, },
 	["IncreasedAttackSpeed4"] = { type = "Suffix", affix = "of Grandmastery", "(14-16)% increased Attack Speed", statOrder = { 1275 }, level = 76, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, },
 	["IncreasedAttackSpeedEssenceGloves7"] = { type = "Suffix", affix = "of the Essence", "(17-18)% increased Attack Speed", statOrder = { 1275 }, level = 82, group = "IncreasedAttackSpeed", weightKey = { "default", }, weightVal = { 0 }, modTags = { "attack", "speed" }, },