Skip to content

Commit

Permalink
Release 1.4.170
Browse files Browse the repository at this point in the history
* Added 3.11 tree
* Updated bases, mods, etc
  • Loading branch information
Openarl committed Jun 20, 2020
1 parent 115c383 commit 81eeead
Show file tree
Hide file tree
Showing 43 changed files with 6,203 additions and 6,027 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 1.4.170 - 2020/06/20
* Added 3.11.0 passive tree
* Updated item bases, mods, and enchantments for 3.11.0

### 1.4.169 - 2020/03/31
* Fixed Stormbind and Barrage Support not importing correctly when importing a character's skills
* Fixed certain Cluster Jewels not importing correctly
Expand Down
2 changes: 2 additions & 0 deletions Classes/PassiveTreeView.lua
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,8 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
overlay = node.expansionJewel and "JewelSocketActiveBlueAlt" or "JewelSocketActiveBlue"
elseif jewel.baseName == "Prismatic Jewel" then
overlay = node.expansionJewel and "JewelSocketActivePrismaticAlt" or "JewelSocketActivePrismatic"
elseif jewel.baseName == "Timeless Jewel" then
overlay = node.expansionJewel and "JewelSocketActiveLegionAlt" or "JewelSocketActiveLegion"
elseif jewel.base.subType == "Abyss" then
overlay = node.expansionJewel and "JewelSocketActiveAbyssAlt" or "JewelSocketActiveAbyss"
elseif jewel.baseName == "Large Cluster Jewel" then
Expand Down
3 changes: 2 additions & 1 deletion Classes/TreeTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ local TreeTabClass = newClass("TreeTab", "ControlHost", function(self, build)
local newSpec = new("PassiveSpec", self.build, self.build.targetVersionData.latestTreeVersion)
newSpec.title = self.build.spec.title
newSpec.jewels = copyTable(self.build.spec.jewels)
newSpec:DecodeURL(self.build.spec:EncodeURL())
newSpec:RestoreUndoState(self.build.spec:CreateUndoState())
newSpec:BuildClusterJewelGraphs()
t_insert(self.specList, self.activeSpec + 1, newSpec)
self:SetActiveSpec(self.activeSpec + 1)
self.modFlag = true
Expand Down
46 changes: 24 additions & 22 deletions Data/3_0/Bases/axe.lua
Original file line number Diff line number Diff line change
Expand Up @@ -185,156 +185,158 @@ itemBases["Stone Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 10, PhysicalMax = 17, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
weapon = { PhysicalMin = 12, PhysicalMax = 20, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
req = { str = 17, dex = 8, },
}
itemBases["Jade Chopper"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 16, PhysicalMax = 25, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
weapon = { PhysicalMin = 19, PhysicalMax = 30, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
req = { level = 9, str = 31, dex = 9, },
}
itemBases["Woodsplitter"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 16, PhysicalMax = 33, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
weapon = { PhysicalMin = 19, PhysicalMax = 39, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
req = { level = 13, str = 36, dex = 17, },
}
itemBases["Poleaxe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 25, PhysicalMax = 37, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
weapon = { PhysicalMin = 29, PhysicalMax = 43, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
req = { level = 18, str = 44, dex = 25, },
}
itemBases["Double Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 31, PhysicalMax = 51, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
weapon = { PhysicalMin = 36, PhysicalMax = 60, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
req = { level = 23, str = 62, dex = 27, },
}
itemBases["Gilded Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 37, PhysicalMax = 50, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
weapon = { PhysicalMin = 43, PhysicalMax = 58, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
req = { level = 28, str = 64, dex = 37, },
}
itemBases["Shadow Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 42, PhysicalMax = 62, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
weapon = { PhysicalMin = 49, PhysicalMax = 73, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
req = { level = 33, str = 80, dex = 37, },
}
itemBases["Dagger Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, not_for_sale = true, maraketh = true, },
implicit = "50% increased Critical Strike Chance",
weapon = { PhysicalMin = 45, PhysicalMax = 71, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
weapon = { PhysicalMin = 53, PhysicalMax = 83, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 36, str = 89, dex = 43, },
}
itemBases["Jasper Chopper"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 50, PhysicalMax = 78, CritChanceBase = 5, AttackRateBase = 1.15, Range = 13, },
weapon = { PhysicalMin = 58, PhysicalMax = 91, CritChanceBase = 5, AttackRateBase = 1.15, Range = 13, },
req = { level = 37, str = 100, dex = 29, },
}
itemBases["Timber Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 41, PhysicalMax = 85, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
weapon = { PhysicalMin = 48, PhysicalMax = 99, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
req = { level = 41, str = 97, dex = 45, },
}
itemBases["Headsman Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 53, PhysicalMax = 79, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
weapon = { PhysicalMin = 61, PhysicalMax = 92, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
req = { level = 45, str = 99, dex = 57, },
}
itemBases["Labrys"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 63, PhysicalMax = 105, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
weapon = { PhysicalMin = 74, PhysicalMax = 123, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 49, str = 122, dex = 53, },
}
itemBases["Noble Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 65, PhysicalMax = 88, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
weapon = { PhysicalMin = 76, PhysicalMax = 103, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
req = { level = 52, str = 113, dex = 65, },
}
itemBases["Abyssal Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 69, PhysicalMax = 104, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
weapon = { PhysicalMin = 81, PhysicalMax = 121, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
req = { level = 55, str = 128, dex = 60, },
}
itemBases["Talon Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, not_for_sale = true, maraketh = true, },
implicit = "50% increased Critical Strike Chance",
weapon = { PhysicalMin = 75, PhysicalMax = 118, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
weapon = { PhysicalMin = 88, PhysicalMax = 138, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 59, str = 140, dex = 67, },
}
itemBases["Karui Chopper"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 80, PhysicalMax = 125, CritChanceBase = 5, AttackRateBase = 1.15, Range = 13, },
weapon = { PhysicalMin = 121, PhysicalMax = 189, CritChanceBase = 5, AttackRateBase = 1.05, Range = 13, },
req = { level = 58, str = 151, dex = 43, },
}
itemBases["Sundering Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 62, PhysicalMax = 128, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
implicit = "+20% to Damage over Time Multiplier for Bleeding",
weapon = { PhysicalMin = 74, PhysicalMax = 155, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
req = { level = 60, str = 149, dex = 76, },
}
itemBases["Ezomyte Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 72, PhysicalMax = 108, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
weapon = { PhysicalMin = 87, PhysicalMax = 131, CritChanceBase = 5.7, AttackRateBase = 1.35, Range = 13, },
req = { level = 62, str = 140, dex = 86, },
}
itemBases["Vaal Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 79, PhysicalMax = 131, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
implicit = "25% chance to Maim on Hit",
weapon = { PhysicalMin = 104, PhysicalMax = 174, CritChanceBase = 5, AttackRateBase = 1.15, Range = 13, },
req = { level = 64, str = 158, dex = 76, },
}
itemBases["Despot Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 76, PhysicalMax = 103, CritChanceBase = 5, AttackRateBase = 1.3, Range = 13, },
weapon = { PhysicalMin = 90, PhysicalMax = 122, CritChanceBase = 5, AttackRateBase = 1.4, Range = 13, },
req = { level = 66, str = 140, dex = 86, },
}
itemBases["Void Axe"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 76, PhysicalMax = 114, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
weapon = { PhysicalMin = 96, PhysicalMax = 144, CritChanceBase = 6, AttackRateBase = 1.25, Range = 13, },
req = { level = 68, str = 149, dex = 76, },
}
itemBases["Fleshripper"] = {
type = "Two Handed Axe",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, axe = true, two_hand_weapon = true, not_for_sale = true, maraketh = true, },
implicit = "50% increased Critical Strike Chance",
weapon = { PhysicalMin = 80, PhysicalMax = 125, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
weapon = { PhysicalMin = 97, PhysicalMax = 152, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 70, str = 156, dex = 84, },
}
18 changes: 9 additions & 9 deletions Data/3_0/Bases/bow.lua
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ itemBases["Decurve Bow"] = {
type = "Bow",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, bow = true, ranged = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 17, PhysicalMax = 70, CritChanceBase = 6, AttackRateBase = 1.25, Range = 120, },
weapon = { PhysicalMin = 17, PhysicalMax = 69, CritChanceBase = 6, AttackRateBase = 1.25, Range = 120, },
req = { level = 38, dex = 125, },
}
itemBases["Compound Bow"] = {
type = "Bow",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, bow = true, ranged = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 26, PhysicalMax = 54, CritChanceBase = 6, AttackRateBase = 1.3, Range = 120, },
weapon = { PhysicalMin = 26, PhysicalMax = 55, CritChanceBase = 6, AttackRateBase = 1.3, Range = 120, },
req = { level = 41, dex = 134, },
}
itemBases["Sniper Bow"] = {
Expand All @@ -110,7 +110,7 @@ itemBases["Highborn Bow"] = {
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, bow = true, ranged = true, two_hand_weapon = true, },
implicit = "(20-24)% increased Elemental Damage with Attack Skills",
weapon = { PhysicalMin = 17, PhysicalMax = 66, CritChanceBase = 5, AttackRateBase = 1.45, Range = 120, },
weapon = { PhysicalMin = 17, PhysicalMax = 67, CritChanceBase = 5, AttackRateBase = 1.45, Range = 120, },
req = { level = 50, dex = 161, },
}
itemBases["Decimation Bow"] = {
Expand All @@ -133,21 +133,21 @@ itemBases["Thicket Bow"] = {
type = "Bow",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, bow = true, ranged = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 22, PhysicalMax = 66, CritChanceBase = 5, AttackRateBase = 1.5, Range = 120, },
weapon = { PhysicalMin = 22, PhysicalMax = 67, CritChanceBase = 5, AttackRateBase = 1.5, Range = 120, },
req = { level = 56, dex = 179, },
}
itemBases["Citadel Bow"] = {
type = "Bow",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, bow = true, ranged = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 25, PhysicalMax = 101, CritChanceBase = 6, AttackRateBase = 1.25, Range = 120, },
weapon = { PhysicalMin = 25, PhysicalMax = 100, CritChanceBase = 6, AttackRateBase = 1.25, Range = 120, },
req = { level = 58, dex = 185, },
}
itemBases["Ranger Bow"] = {
type = "Bow",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, bow = true, ranged = true, two_hand_weapon = true, },
weapon = { PhysicalMin = 39, PhysicalMax = 80, CritChanceBase = 6, AttackRateBase = 1.3, Range = 120, },
weapon = { PhysicalMin = 39, PhysicalMax = 81, CritChanceBase = 6, AttackRateBase = 1.3, Range = 120, },
req = { level = 60, dex = 212, },
}
itemBases["Assassin Bow"] = {
Expand All @@ -170,22 +170,22 @@ itemBases["Imperial Bow"] = {
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, bow = true, ranged = true, two_hand_weapon = true, },
implicit = "(20-24)% increased Elemental Damage with Attack Skills",
weapon = { PhysicalMin = 19, PhysicalMax = 78, CritChanceBase = 5, AttackRateBase = 1.45, Range = 120, },
weapon = { PhysicalMin = 20, PhysicalMax = 78, CritChanceBase = 5, AttackRateBase = 1.45, Range = 120, },
req = { level = 66, dex = 212, },
}
itemBases["Harbinger Bow"] = {
type = "Bow",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, bow = true, ranged = true, two_hand_weapon = true, },
implicit = "(30-50)% increased Critical Strike Chance",
weapon = { PhysicalMin = 35, PhysicalMax = 91, CritChanceBase = 5, AttackRateBase = 1.2, Range = 120, },
weapon = { PhysicalMin = 35, PhysicalMax = 92, CritChanceBase = 5, AttackRateBase = 1.2, Range = 120, },
req = { level = 68, dex = 212, },
}
itemBases["Maraketh Bow"] = {
type = "Bow",
socketLimit = 6,
tags = { default = true, weapon = true, twohand = true, bow = true, ranged = true, two_hand_weapon = true, not_for_sale = true, maraketh = true, },
implicit = "10% increased Movement Speed",
weapon = { PhysicalMin = 44, PhysicalMax = 65, CritChanceBase = 5.5, AttackRateBase = 1.4, Range = 120, },
weapon = { PhysicalMin = 44, PhysicalMax = 66, CritChanceBase = 5.5, AttackRateBase = 1.4, Range = 120, },
req = { level = 71, dex = 222, },
}
5 changes: 5 additions & 0 deletions Data/3_0/Bases/jewel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ itemBases["Prismatic Jewel"] = {
tags = { default = true, jewel = true, intjewel = true, dexjewel = true, strjewel = true, not_for_sale = true, },
req = { },
}
itemBases["Timeless Jewel"] = {
type = "Jewel",
tags = { default = true, jewel = true, intjewel = true, dexjewel = true, strjewel = true, not_for_sale = true, },
req = { },
}

itemBases["Ghastly Eye Jewel"] = {
type = "Jewel",
Expand Down
Loading

0 comments on commit 81eeead

Please sign in to comment.