Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions spec/System/TestItemParse_spec.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe("TestItemParse", function()
local function raw(s, base)
base = base or "Arcane Robe"
base = base or "Arcane Raiment"
return "Rarity: Rare\nName\n"..base.."\n"..s
end

Expand Down Expand Up @@ -243,9 +243,9 @@ describe("TestItemParse", function()
Corrupted
]])
item:BuildAndParseRaw()
assert.are.equals(45, item.requirements.strMod)
assert.are.equals(111, item.requirements.dexMod)
assert.are.equals(71, item.requirements.intMod)
assert.are.equals(35, item.requirements.strMod)
assert.are.equals(86, item.requirements.dexMod)
assert.are.equals(55, item.requirements.intMod)

end)

Expand Down
14 changes: 14 additions & 0 deletions src/Data/Bases/amulet.lua
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ itemBases["Gold Amulet"] = {
implicitModTypes = { { "drop" }, },
req = { level = 35, },
}
itemBases["Pearlescent Amulet"] = {
type = "Amulet",
tags = { amulet = true, default = true, },
implicit = "+(7-10)% to all Elemental Resistances",
implicitModTypes = { { "elemental", "fire", "cold", "lightning", "resistance" }, },
req = { level = 30, },
}
itemBases["Dusk Amulet"] = {
type = "Amulet",
tags = { amulet = true, default = true, },
Expand Down Expand Up @@ -100,3 +107,10 @@ itemBases["Tenebrous Amulet"] = {
implicitModTypes = { { }, { }, },
req = { },
}
itemBases["Distorted Amulet"] = {
type = "Amulet",
tags = { amulet = true, default = true, },
implicit = "-1 Prefix Modifier allowed\n-1 Suffix Modifier allowed",
implicitModTypes = { { }, { }, },
req = { },
}
48 changes: 24 additions & 24 deletions src/Data/Bases/axe.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ itemBases["Hook Axe"] = {
implicit = "Gain 1 Rage on Hit",
implicitModTypes = { { }, },
weapon = { PhysicalMin = 5, PhysicalMax = 14, CritChanceBase = 5, AttackRateBase = 1.45, Range = 11, },
req = { str = 10, },
req = { str = 9, },
}
itemBases["Bearded Axe"] = {
type = "One Handed Axe",
Expand All @@ -28,7 +28,7 @@ itemBases["Bearded Axe"] = {
tags = { axe = true, onehand = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 8, PhysicalMax = 21, CritChanceBase = 5, AttackRateBase = 1.45, Range = 11, },
req = { level = 10, str = 20, dex = 10, },
req = { level = 10, str = 17, dex = 9, },
}
itemBases["Extended Cleaver"] = {
type = "One Handed Axe",
Expand All @@ -38,7 +38,7 @@ itemBases["Extended Cleaver"] = {
implicit = "Has no Accuracy Penalty from Range",
implicitModTypes = { { }, },
weapon = { PhysicalMin = 8, PhysicalMax = 25, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
req = { level = 16, str = 30, dex = 14, },
req = { level = 16, str = 25, dex = 12, },
}
itemBases["Bandit Hatchet"] = {
type = "One Handed Axe",
Expand All @@ -47,7 +47,7 @@ itemBases["Bandit Hatchet"] = {
tags = { axe = true, onehand = true, maraketh_basetype = true, weapon = true, one_hand_weapon = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 13, PhysicalMax = 31, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
req = { level = 20, str = 37, dex = 16, },
req = { level = 20, str = 30, dex = 14, },
}
itemBases["Crescent Axe"] = {
type = "One Handed Axe",
Expand All @@ -56,7 +56,7 @@ itemBases["Crescent Axe"] = {
tags = { axe = true, onehand = true, maraketh_basetype = true, weapon = true, one_hand_weapon = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 18, PhysicalMax = 37, CritChanceBase = 6.5, AttackRateBase = 1.4, Range = 11, },
req = { level = 26, str = 48, dex = 20, },
req = { level = 26, str = 38, dex = 17, },
}
itemBases["Carving Hatchet"] = {
type = "One Handed Axe",
Expand All @@ -65,7 +65,7 @@ itemBases["Carving Hatchet"] = {
tags = { axe = true, onehand = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 19, PhysicalMax = 44, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
req = { level = 33, str = 60, dex = 25, },
req = { level = 33, str = 47, dex = 20, },
}
itemBases["Sacrificial Axe"] = {
type = "One Handed Axe",
Expand All @@ -75,7 +75,7 @@ itemBases["Sacrificial Axe"] = {
implicit = "Gain (28-35) Mana per Enemy Killed",
implicitModTypes = { { "resource", "mana" }, },
weapon = { PhysicalMin = 20, PhysicalMax = 42, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
req = { level = 37, str = 67, dex = 27, },
req = { level = 37, str = 52, dex = 22, },
}
itemBases["Boarding Hatchet"] = {
type = "One Handed Axe",
Expand All @@ -84,7 +84,7 @@ itemBases["Boarding Hatchet"] = {
tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 24, PhysicalMax = 55, CritChanceBase = 5, AttackRateBase = 1.55, Range = 11, },
req = { level = 45, str = 81, dex = 33, },
req = { level = 45, str = 63, dex = 26, },
}
itemBases["Fury Cleaver"] = {
type = "One Handed Axe",
Expand All @@ -94,7 +94,7 @@ itemBases["Fury Cleaver"] = {
implicit = "10% increased Damage taken",
implicitModTypes = { { }, },
weapon = { PhysicalMin = 30, PhysicalMax = 62, CritChanceBase = 5, AttackRateBase = 1.55, Range = 11, },
req = { level = 48, str = 86, dex = 35, },
req = { level = 48, str = 67, dex = 27, },
}
itemBases["Battle Axe"] = {
type = "One Handed Axe",
Expand All @@ -103,7 +103,7 @@ itemBases["Battle Axe"] = {
tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 28, PhysicalMax = 65, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
req = { level = 52, str = 93, dex = 37, },
req = { level = 52, str = 72, dex = 29, },
}
itemBases["Profane Cleaver"] = {
type = "One Handed Axe",
Expand All @@ -112,7 +112,7 @@ itemBases["Profane Cleaver"] = {
tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 26, PhysicalMax = 69, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
req = { level = 54, str = 96, dex = 38, },
req = { level = 54, str = 75, dex = 30, },
}
itemBases["Dread Hatchet"] = {
type = "One Handed Axe",
Expand All @@ -121,7 +121,7 @@ itemBases["Dread Hatchet"] = {
tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 34, PhysicalMax = 79, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, },
req = { level = 65, str = 116, dex = 45, },
req = { level = 65, str = 89, dex = 36, },
}

itemBases["Splitting Greataxe"] = {
Expand All @@ -140,7 +140,7 @@ itemBases["Light Halberd"] = {
tags = { axe = true, ezomyte_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 10, PhysicalMax = 25, CritChanceBase = 5, AttackRateBase = 1.25, Range = 13, },
req = { str = 10, },
req = { str = 9, },
}
itemBases["Executioner Greataxe"] = {
type = "Two Handed Axe",
Expand All @@ -150,7 +150,7 @@ itemBases["Executioner Greataxe"] = {
implicit = "Culling Strike",
implicitModTypes = { { }, },
weapon = { PhysicalMin = 10, PhysicalMax = 41, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 10, str = 20, dex = 10, },
req = { level = 10, str = 17, dex = 9, },
}
itemBases["Arched Greataxe"] = {
type = "Two Handed Axe",
Expand All @@ -159,7 +159,7 @@ itemBases["Arched Greataxe"] = {
tags = { axe = true, maraketh_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 17, PhysicalMax = 59, CritChanceBase = 5, AttackRateBase = 1.15, Range = 13, },
req = { level = 16, str = 30, dex = 14, },
req = { level = 16, str = 25, dex = 12, },
}
itemBases["Elegant Glaive"] = {
type = "Two Handed Axe",
Expand All @@ -168,7 +168,7 @@ itemBases["Elegant Glaive"] = {
tags = { axe = true, maraketh_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 19, PhysicalMax = 64, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 20, str = 37, dex = 16, },
req = { level = 20, str = 30, dex = 14, },
}
itemBases["Savage Greataxe"] = {
type = "Two Handed Axe",
Expand All @@ -178,7 +178,7 @@ itemBases["Savage Greataxe"] = {
implicit = "Gain (34-43) Life per Enemy Killed",
implicitModTypes = { { "resource", "life" }, },
weapon = { PhysicalMin = 23, PhysicalMax = 70, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 27, str = 50, dex = 21, },
req = { level = 27, str = 39, dex = 17, },
}
itemBases["Rending Halberd"] = {
type = "Two Handed Axe",
Expand All @@ -187,7 +187,7 @@ itemBases["Rending Halberd"] = {
tags = { axe = true, vaal_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 27, PhysicalMax = 91, CritChanceBase = 6.5, AttackRateBase = 1.2, Range = 13, },
req = { level = 33, str = 60, dex = 25, },
req = { level = 33, str = 47, dex = 20, },
}
itemBases["Jagged Greataxe"] = {
type = "Two Handed Axe",
Expand All @@ -197,7 +197,7 @@ itemBases["Jagged Greataxe"] = {
implicit = "(15-25)% chance to cause Bleeding on Hit",
implicitModTypes = { { "bleed", "physical", "attack", "ailment" }, },
weapon = { PhysicalMin = 43, PhysicalMax = 99, CritChanceBase = 5, AttackRateBase = 1.15, Range = 13, },
req = { level = 40, str = 72, dex = 29, },
req = { level = 40, str = 56, dex = 23, },
}
itemBases["Reaver Glaive"] = {
type = "Two Handed Axe",
Expand All @@ -206,7 +206,7 @@ itemBases["Reaver Glaive"] = {
tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 43, PhysicalMax = 113, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 45, str = 81, dex = 33, },
req = { level = 45, str = 63, dex = 26, },
}
itemBases["Ember Greataxe"] = {
type = "Two Handed Axe",
Expand All @@ -215,7 +215,7 @@ itemBases["Ember Greataxe"] = {
tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, },
implicitModTypes = { },
weapon = { FireMin = 58, FireMax = 154, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 50, str = 89, dex = 36, },
req = { level = 50, str = 70, dex = 28, },
}
itemBases["Ceremonial Halberd"] = {
type = "Two Handed Axe",
Expand All @@ -225,7 +225,7 @@ itemBases["Ceremonial Halberd"] = {
implicit = "Cannot use Projectile Attacks",
implicitModTypes = { { }, },
weapon = { PhysicalMin = 53, PhysicalMax = 123, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 52, str = 93, dex = 37, },
req = { level = 52, str = 72, dex = 29, },
}
itemBases["Monument Greataxe"] = {
type = "Two Handed Axe",
Expand All @@ -234,7 +234,7 @@ itemBases["Monument Greataxe"] = {
tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 48, PhysicalMax = 143, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 57, str = 102, dex = 40, },
req = { level = 57, str = 79, dex = 32, },
}
itemBases["Vile Greataxe"] = {
type = "Two Handed Axe",
Expand All @@ -243,5 +243,5 @@ itemBases["Vile Greataxe"] = {
tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 59, PhysicalMax = 155, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { level = 65, str = 116, dex = 45, },
req = { level = 65, str = 89, dex = 36, },
}
Loading