From f14b3749e5d2d1f4d7276d9f671a6496f4a8ca0c Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 27 Jan 2025 19:54:58 +1100 Subject: [PATCH 01/15] Mostly change the script into the format I was thinking about --- src/Data/Bases/axe.lua | 236 +--------------------------------- src/Export/Bases/amulet.txt | 1 - src/Export/Bases/axe.txt | 2 - src/Export/Bases/belt.txt | 1 - src/Export/Bases/body.txt | 1 - src/Export/Bases/boots.txt | 1 - src/Export/Bases/bow.txt | 1 - src/Export/Bases/claw.txt | 1 - src/Export/Bases/crossbow.txt | 1 - src/Export/Bases/dagger.txt | 1 - src/Export/Bases/fishing.txt | 1 - src/Export/Bases/flail.txt | 1 - src/Export/Bases/flask.txt | 4 - src/Export/Bases/focus.txt | 1 - src/Export/Bases/gloves.txt | 1 - src/Export/Bases/helmet.txt | 1 - src/Export/Bases/jewel.txt | 3 - src/Export/Bases/mace.txt | 2 - src/Export/Bases/quiver.txt | 1 - src/Export/Bases/ring.txt | 1 - src/Export/Bases/sceptre.txt | 1 - src/Export/Bases/shield.txt | 1 - src/Export/Bases/soulcore.txt | 2 - src/Export/Bases/spear.txt | 1 - src/Export/Bases/staff.txt | 3 - src/Export/Bases/sword.txt | 3 - src/Export/Bases/traptool.txt | 1 - src/Export/Bases/wand.txt | 1 - src/Export/Launch.lua | 7 + src/Export/Scripts/bases.lua | 58 +++++++-- src/Export/spec.lua | 2 +- 31 files changed, 55 insertions(+), 287 deletions(-) diff --git a/src/Data/Bases/axe.lua b/src/Data/Bases/axe.lua index 6f8ca0ad98..9fe8794471 100644 --- a/src/Data/Bases/axe.lua +++ b/src/Data/Bases/axe.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Dull Hatchet"] = { - type = "One Handed Axe", + class = "One Hand Axe", + category = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -11,236 +12,3 @@ itemBases["Dull Hatchet"] = { weapon = { PhysicalMin = 4, PhysicalMax = 10, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, }, req = { }, } -itemBases["Hook Axe"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - tags = { axe = true, onehand = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, - implicit = "Gain 1 Rage on Hit", - implicitModTypes = { { }, }, - weapon = { PhysicalMin = 5, PhysicalMax = 14, CritChanceBase = 5, AttackRateBase = 1.45, Range = 11, }, - req = { str = 10, }, -} -itemBases["Bearded Axe"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - 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, }, -} -itemBases["Extended Cleaver"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - tags = { axe = true, onehand = true, maraketh_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, - 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, }, -} -itemBases["Bandit Hatchet"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - 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, }, -} -itemBases["Crescent Axe"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - 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, }, -} -itemBases["Carving Hatchet"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - 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, }, -} -itemBases["Sacrificial Axe"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - tags = { axe = true, onehand = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, - 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, }, -} -itemBases["Boarding Hatchet"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - 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, }, -} -itemBases["Fury Cleaver"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, }, - 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, }, -} -itemBases["Battle Axe"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - 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, }, -} -itemBases["Profane Cleaver"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - 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, }, -} -itemBases["Dread Hatchet"] = { - type = "One Handed Axe", - quality = 20, - socketLimit = 2, - 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, }, -} - -itemBases["Splitting Greataxe"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - tags = { axe = true, ezomyte_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 8, PhysicalMax = 20, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, }, - req = { }, -} -itemBases["Light Halberd"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - 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, }, -} -itemBases["Executioner Greataxe"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - tags = { axe = true, ezomyte_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, - implicit = "Culling Strike", - implicitModTypes = { { }, }, - weapon = { PhysicalMin = 10, PhysicalMax = 41, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, }, - req = { level = 10, str = 20, dex = 10, }, -} -itemBases["Arched Greataxe"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - 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, }, -} -itemBases["Elegant Glaive"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - 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, }, -} -itemBases["Savage Greataxe"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - tags = { axe = true, maraketh_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, - 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, }, -} -itemBases["Rending Halberd"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - 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, }, -} -itemBases["Jagged Greataxe"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - tags = { axe = true, vaal_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, - 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, }, -} -itemBases["Reaver Glaive"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - 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, }, -} -itemBases["Ember Greataxe"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - 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, }, -} -itemBases["Ceremonial Halberd"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 53, PhysicalMax = 123, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, }, - req = { level = 52, str = 93, dex = 37, }, -} -itemBases["Monument Greataxe"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - 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, }, -} -itemBases["Vile Greataxe"] = { - type = "Two Handed Axe", - quality = 20, - socketLimit = 3, - 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, }, -} diff --git a/src/Export/Bases/amulet.txt b/src/Export/Bases/amulet.txt index e3873861bd..9e35d3cb59 100644 --- a/src/Export/Bases/amulet.txt +++ b/src/Export/Bases/amulet.txt @@ -1,5 +1,4 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Amulet #baseMatch BaseType Metadata/Items/Amulets/AbstractAmulet \ No newline at end of file diff --git a/src/Export/Bases/axe.txt b/src/Export/Bases/axe.txt index 3abe3673e2..90c43e0e26 100644 --- a/src/Export/Bases/axe.txt +++ b/src/Export/Bases/axe.txt @@ -1,10 +1,8 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type One Handed Axe #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/OneHandAxes/AbstractOneHandAxe -#type Two Handed Axe #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/TwoHandAxes/AbstractTwoHandAxe diff --git a/src/Export/Bases/belt.txt b/src/Export/Bases/belt.txt index f5e2385959..66401c467e 100644 --- a/src/Export/Bases/belt.txt +++ b/src/Export/Bases/belt.txt @@ -1,6 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Belt #baseMatch BaseType Metadata/Items/Belts/AbstractBelt #baseMatch BaseType Metadata/Items/Belts/BeltDemigods \ No newline at end of file diff --git a/src/Export/Bases/body.txt b/src/Export/Bases/body.txt index df6e0f2986..ed83dbcae3 100644 --- a/src/Export/Bases/body.txt +++ b/src/Export/Bases/body.txt @@ -1,7 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Body Armour #socketLimit 3 #baseMatch BaseType Metadata/Items/Armours/BodyArmours/AbstractBodyArmour #baseMatch BaseType Metadata/Items/Armours/BodyArmours/BodyArmourDemigods diff --git a/src/Export/Bases/boots.txt b/src/Export/Bases/boots.txt index 576a187553..c3b04f0931 100644 --- a/src/Export/Bases/boots.txt +++ b/src/Export/Bases/boots.txt @@ -1,7 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Boots #socketLimit 2 #baseMatch BaseType Metadata/Items/Armours/Boots/AbstractBoots #baseMatch BaseType Metadata/Items/Armours/Boots/BootsDemigods diff --git a/src/Export/Bases/bow.txt b/src/Export/Bases/bow.txt index 87d2555c02..c37890e306 100644 --- a/src/Export/Bases/bow.txt +++ b/src/Export/Bases/bow.txt @@ -1,6 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Bow #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/Bows/AbstractBow \ No newline at end of file diff --git a/src/Export/Bases/claw.txt b/src/Export/Bases/claw.txt index 5130a350ec..512caf4f3d 100644 --- a/src/Export/Bases/claw.txt +++ b/src/Export/Bases/claw.txt @@ -1,6 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Claw #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Claws/AbstractClaw \ No newline at end of file diff --git a/src/Export/Bases/crossbow.txt b/src/Export/Bases/crossbow.txt index b1ec2a208a..47fdba8fd2 100644 --- a/src/Export/Bases/crossbow.txt +++ b/src/Export/Bases/crossbow.txt @@ -1,6 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Crossbow #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/Crossbows/AbstractCrossbow \ No newline at end of file diff --git a/src/Export/Bases/dagger.txt b/src/Export/Bases/dagger.txt index a0cccc587c..a811446130 100644 --- a/src/Export/Bases/dagger.txt +++ b/src/Export/Bases/dagger.txt @@ -1,6 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Dagger #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Daggers/AbstractDagger diff --git a/src/Export/Bases/fishing.txt b/src/Export/Bases/fishing.txt index 2f042fa21b..6dad726f6c 100644 --- a/src/Export/Bases/fishing.txt +++ b/src/Export/Bases/fishing.txt @@ -1,7 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Fishing Rod #socketLimit 3 #forceShow true #baseMatch BaseTypeMetadata/Items/Weapons/TwoHandWeapon/FishingRods/AbstractFishingRod diff --git a/src/Export/Bases/flail.txt b/src/Export/Bases/flail.txt index 2ad5f4827c..30140c76c9 100644 --- a/src/Export/Bases/flail.txt +++ b/src/Export/Bases/flail.txt @@ -1,6 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Flail #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Flails/AbstractFlail \ No newline at end of file diff --git a/src/Export/Bases/flask.txt b/src/Export/Bases/flask.txt index 573e649bd8..4cdefc989a 100644 --- a/src/Export/Bases/flask.txt +++ b/src/Export/Bases/flask.txt @@ -1,12 +1,8 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Charm #baseMatch Metadata/Items/Flasks/FourCharm -#type Flask -#subType Life #baseMatch Metadata/Items/Flasks/FourFlaskLife -#subType Mana #baseMatch Metadata/Items/Flasks/FourFlaskMana diff --git a/src/Export/Bases/focus.txt b/src/Export/Bases/focus.txt index 80c9b0c656..6423dd0fd7 100644 --- a/src/Export/Bases/focus.txt +++ b/src/Export/Bases/focus.txt @@ -1,7 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Focus #socketLimit 2 #baseMatch BaseType Metadata/Items/Armours/Focus/AbstractFocus \ No newline at end of file diff --git a/src/Export/Bases/gloves.txt b/src/Export/Bases/gloves.txt index 79a81c4b0b..28bb135416 100644 --- a/src/Export/Bases/gloves.txt +++ b/src/Export/Bases/gloves.txt @@ -1,7 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Gloves #socketLimit 2 #baseMatch BaseType Metadata/Items/Armours/Gloves/AbstractGloves #baseMatch BaseType Metadata/Items/Armours/Gloves/GlovesDemigods diff --git a/src/Export/Bases/helmet.txt b/src/Export/Bases/helmet.txt index a4db92fe93..7a133f1c9a 100644 --- a/src/Export/Bases/helmet.txt +++ b/src/Export/Bases/helmet.txt @@ -1,7 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Helmet #socketLimit 2 #baseMatch BaseType Metadata/Items/Armours/Helmets/AbstractHelmet diff --git a/src/Export/Bases/jewel.txt b/src/Export/Bases/jewel.txt index dc08e6d4d2..19c7801ed5 100644 --- a/src/Export/Bases/jewel.txt +++ b/src/Export/Bases/jewel.txt @@ -1,17 +1,14 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Jewel #base Metadata/Items/Jewels/JewelStr #base Metadata/Items/Jewels/JewelDex #base Metadata/Items/Jewels/JewelInt #base Metadata/Items/Jewels/JewelDiamond -#subType Radius #base Metadata/Items/Jewels/JewelRadiusStr #base Metadata/Items/Jewels/JewelRadiusDex #base Metadata/Items/Jewels/JewelRadiusInt #base Metadata/Items/Jewels/JewelRadiusDiamond -#subType Timeless #base Metadata/Items/Jewels/JewelTimeless diff --git a/src/Export/Bases/mace.txt b/src/Export/Bases/mace.txt index 1df72bc4be..135ea86cd4 100644 --- a/src/Export/Bases/mace.txt +++ b/src/Export/Bases/mace.txt @@ -1,10 +1,8 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type One Handed Mace #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/OneHandMaces/AbstractOneHandMace -#type Two Handed Mace #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/TwoHandMaces/AbstractTwoHandMace diff --git a/src/Export/Bases/quiver.txt b/src/Export/Bases/quiver.txt index 4df9f51085..bda1bcd80c 100644 --- a/src/Export/Bases/quiver.txt +++ b/src/Export/Bases/quiver.txt @@ -1,5 +1,4 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Quiver #baseMatch BaseType Metadata/Items/Quivers/AbstractQuiver diff --git a/src/Export/Bases/ring.txt b/src/Export/Bases/ring.txt index fbff4a61f1..76d7aaa859 100644 --- a/src/Export/Bases/ring.txt +++ b/src/Export/Bases/ring.txt @@ -1,6 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Ring #baseMatch BaseType Metadata/Items/Rings/AbstractRing #baseMatch BaseType Metadata/Items/Rings/RingDemigods diff --git a/src/Export/Bases/sceptre.txt b/src/Export/Bases/sceptre.txt index 2061aed87f..2a81a59293 100644 --- a/src/Export/Bases/sceptre.txt +++ b/src/Export/Bases/sceptre.txt @@ -1,5 +1,4 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Sceptre #baseMatch BaseType Metadata/Items/Sceptres/AbstractSceptre diff --git a/src/Export/Bases/shield.txt b/src/Export/Bases/shield.txt index bb00cd3777..8eafef6303 100644 --- a/src/Export/Bases/shield.txt +++ b/src/Export/Bases/shield.txt @@ -1,7 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Shield #socketLimit 2 #baseMatch BaseType Metadata/Items/Armours/Shields/AbstractShield diff --git a/src/Export/Bases/soulcore.txt b/src/Export/Bases/soulcore.txt index bfd33835af..a9711495fd 100644 --- a/src/Export/Bases/soulcore.txt +++ b/src/Export/Bases/soulcore.txt @@ -1,8 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type SoulCore #baseMatch Metadata/Items/SoulCores/SoulCore -#type Rune #baseMatch Metadata/Items/SoulCores/Rune diff --git a/src/Export/Bases/spear.txt b/src/Export/Bases/spear.txt index a1f9cb88fd..35f535a465 100644 --- a/src/Export/Bases/spear.txt +++ b/src/Export/Bases/spear.txt @@ -1,6 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Spear #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Spears/AbstractSpear \ No newline at end of file diff --git a/src/Export/Bases/staff.txt b/src/Export/Bases/staff.txt index 0aa1b64c09..7a44259224 100644 --- a/src/Export/Bases/staff.txt +++ b/src/Export/Bases/staff.txt @@ -1,10 +1,7 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Staff #baseMatch BaseType Metadata/Items/Staves/AbstractStaff -#type Staff -#subType Warstaff #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/Staves/AbstractWarstaff \ No newline at end of file diff --git a/src/Export/Bases/sword.txt b/src/Export/Bases/sword.txt index 7db1cd21c1..234d5a1435 100644 --- a/src/Export/Bases/sword.txt +++ b/src/Export/Bases/sword.txt @@ -1,7 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type One Handed Sword #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/OneHandSwords/AbstractOneHandSword @@ -11,8 +10,6 @@ local itemBases = ... #base Metadata/Items/Weapons/OneHandWeapons/OneHandSwords/StormBladeOneHand #forceHide false -#type Two Handed Sword -#subType #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/TwoHandSwords/AbstractTwoHandSword diff --git a/src/Export/Bases/traptool.txt b/src/Export/Bases/traptool.txt index 35cac607fc..c6acca1b29 100644 --- a/src/Export/Bases/traptool.txt +++ b/src/Export/Bases/traptool.txt @@ -1,6 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type TrapTool #baseMatch BaseType Metadata/Items/TrapTools/AbstractTrapTool \ No newline at end of file diff --git a/src/Export/Bases/wand.txt b/src/Export/Bases/wand.txt index 969fbd1335..c4fe38c79b 100644 --- a/src/Export/Bases/wand.txt +++ b/src/Export/Bases/wand.txt @@ -1,5 +1,4 @@ -- Item data (c) Grinding Gear Games local itemBases = ... -#type Wand #baseMatch Metadata/Items/Weapons/OneHandWeapons/Wands/FourWand diff --git a/src/Export/Launch.lua b/src/Export/Launch.lua index 7a3496e08f..ea34ffcab8 100644 --- a/src/Export/Launch.lua +++ b/src/Export/Launch.lua @@ -13,6 +13,13 @@ launch = { } SetMainObject(launch) function launch:OnInit() +-- -- This is the path to emmy_core.dll. The ?.dll at the end is intentional. +-- package.cpath = package.cpath .. ";C:/Users/Thomas/.vscode/extensions/tangzx.emmylua-0.8.20-win32-x64/debugger/emmy/windows/x64/?.dll" +-- local dbg = require("emmy_core") +-- -- This port must match the Visual Studio Code configuration. Default is 9966. +-- dbg.tcpListen("localhost", 9966) +-- -- Uncomment the next line if you want Path of Building to block until the debugger is attached +-- --dbg.waitIDE() self.devMode = true self.subScripts = { } RenderInit() diff --git a/src/Export/Scripts/bases.lua b/src/Export/Scripts/bases.lua index 990e8d240e..f45b5ba93b 100644 --- a/src/Export/Scripts/bases.lua +++ b/src/Export/Scripts/bases.lua @@ -8,18 +8,39 @@ local s_format = string.format local directiveTable = { } local bases = { All = { } } -directiveTable.type = function(state, args, out) - state.type = args +local influenceTags = { } + +local influenceTypes = { + "shaper", + "elder", + "crusader", + "eyrie", + "basilisk", + "adjudicator", +} + +for influenceTag in dat("InfluenceTags"):Rows() do + if not influenceTags[influenceTag.ItemClass] then + influenceTags[influenceTag.ItemClass] = { } + end + for _, tag in ipairs(influenceTag.Tags) do + influenceTags[influenceTag.ItemClass][influenceTypes[influenceTag.InfluenceType]] = tag.Id + break + end end -directiveTable.subType = function(state, args, out) - state.subType = args +directiveTable.type = function(state, args, out) + state.type = args end directiveTable.forceShow = function(state, args, out) state.forceShow = (args == "true") end +directiveTable.label = function(state, args, out) + state.label = args +end + directiveTable.forceHide = function(state, args, out) state.forceHide = (args == "true") end @@ -38,6 +59,9 @@ directiveTable.base = function(state, args, out) printf("Invalid Id %s", baseTypeId) return end + + local class = baseItemType.ItemClass.Id + local category = dat("ItemClasses"):GetRow("Id", class).ItemClassCategory.Id local function getBaseItemTags(baseItemType) if baseItemType == "nothing" then -- base case return {} @@ -90,16 +114,17 @@ directiveTable.base = function(state, args, out) end displayName = displayName:gsub("\195\182","o") displayName = displayName:gsub("^%s*(.-)%s*$", "%1") -- trim spaces GGG might leave in by accident - displayName = displayName ~= "Energy Blade" and displayName or (state.type == "One Handed Sword" and "Energy Blade One Handed" or "Energy Blade Two Handed") + displayName = displayName ~= "Energy Blade" and displayName or (category == "One Handed Sword" and "Energy Blade One Handed" or "Energy Blade Two Handed") out:write('itemBases["', displayName, '"] = {\n') - out:write('\ttype = "', state.type, '",\n') - if state.subType and #state.subType > 0 then - out:write('\tsubType = "', state.subType, '",\n') + if state.type then + out:write('\ttype = "', state.type, '",\n') end + out:write('\tclass = "', baseItemType.ItemClass.Id, '",\n') + out:write('\tcategory = "', , '",\n') if maximumQuality ~= 0 then out:write('\tquality = ', maximumQuality, ',\n') end - if state.type == "Belt" then + if category == "Belt" then local beltType = dat("BeltTypes"):GetRow("BaseItemType", baseItemType) if beltType then out:write('\tcharmLimit = ', beltType.CharmCount, ',\n') @@ -127,6 +152,13 @@ directiveTable.base = function(state, args, out) out:write(tag, ' = true, ') end out:write('},\n') + if influenceTags[baseItemType.ItemClass] and #influenceTags[baseItemType.ItemClass] > 0 then + out:write('\tinfluenceTags = { ') + for influence, influenceTags in pairs(influenceTags[baseItemType.ItemClass]) do + out:write(influence, ' = "', influenceTags, '", ') + end + out:write(' },\n') + end local implicitLines = { } local implicitModTypes = { } for _, mod in ipairs(baseItemType.ImplicitMods) do @@ -223,11 +255,11 @@ directiveTable.base = function(state, args, out) end out:write('},\n') end - if state.type == "Flask" or state.type == "Charm" then + if category == "Flask" or category == "Charm" then local flask = dat("Flasks"):GetRow("BaseItemType", baseItemType) if flask then local compCharges = dat("ComponentCharges"):GetRow("BaseItemType", baseItemType.Id) - if state.type == "Charm" then + if category == "Charm" then out:write('\tcharm = { ') else out:write('\tflask = { ') @@ -257,7 +289,7 @@ directiveTable.base = function(state, args, out) end end -- Special handling of Runes and SoulCores - if state.type == "Rune" or state.type == "SoulCore" then + if category == "SoulCore" then local soulcore = dat("SoulCores"):GetRow("BaseItemTypes", baseItemType) if soulcore then out:write('\timplicit = ') @@ -283,7 +315,7 @@ directiveTable.base = function(state, args, out) reqLevel = baseItemType.DropLevel end end - if state.type == "Flask" or state.type == "SoulCore" or state.type == "Rune" or state.type == "Charm" then + if category == "Flask" or category == "SoulCore" or category == "Charm" then if baseItemType.DropLevel > 2 then reqLevel = baseItemType.DropLevel end diff --git a/src/Export/spec.lua b/src/Export/spec.lua index 382aa5f6c8..e674467064 100644 --- a/src/Export/spec.lua +++ b/src/Export/spec.lua @@ -6853,7 +6853,7 @@ return { }, [3]={ list=false, - name="tags", + name="Tags", refTo="Tags", type="Key", width=150 From 229723f0797989476125e9e36b69d7574ed89927 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:06:20 +1100 Subject: [PATCH 02/15] Complete export and automatically export types. --- src/Data/Bases/amulet.lua | 30 +- src/Data/Bases/axe.lua | 258 ++++++++++++++++ src/Data/Bases/belt.lua | 36 ++- src/Data/Bases/body.lua | 579 ++++++++++++++++++++++++++--------- src/Data/Bases/boots.lua | 331 +++++++++++++++----- src/Data/Bases/bow.lua | 75 +++-- src/Data/Bases/claw.lua | 39 ++- src/Data/Bases/crossbow.lua | 75 +++-- src/Data/Bases/dagger.lua | 42 ++- src/Data/Bases/flask.lua | 108 ++++--- src/Data/Bases/focus.lua | 88 ++++-- src/Data/Bases/gloves.lua | 331 +++++++++++++++----- src/Data/Bases/helmet.lua | 430 +++++++++++++++++++------- src/Data/Bases/jewel.lua | 32 +- src/Data/Bases/mace.lua | 150 ++++++--- src/Data/Bases/quiver.lua | 33 +- src/Data/Bases/ring.lua | 42 ++- src/Data/Bases/sceptre.lua | 45 ++- src/Data/Bases/shield.lua | 339 +++++++++++++++----- src/Data/Bases/soulcore.lua | 75 +++-- src/Data/Bases/spear.lua | 39 ++- src/Data/Bases/staff.lua | 139 +++++---- src/Data/Bases/sword.lua | 100 ++++-- src/Data/Bases/traptool.lua | 39 ++- src/Data/Bases/wand.lua | 42 ++- src/Export/Launch.lua | 14 +- src/Export/Scripts/bases.lua | 30 +- 27 files changed, 2580 insertions(+), 961 deletions(-) diff --git a/src/Data/Bases/amulet.lua b/src/Data/Bases/amulet.lua index 05bb781f04..218b0f8ed1 100644 --- a/src/Data/Bases/amulet.lua +++ b/src/Data/Bases/amulet.lua @@ -3,70 +3,80 @@ local itemBases = ... itemBases["Crimson Amulet"] = { - type = "Amulet", + class = "Amulet", + category = "Amulet", tags = { amulet = true, default = true, }, implicit = "(2-4) Life Regeneration per second", implicitModTypes = { { "flat_life_regen", "resource", "life" }, }, req = { }, } itemBases["Azure Amulet"] = { - type = "Amulet", + class = "Amulet", + category = "Amulet", tags = { amulet = true, default = true, }, implicit = "(20-30)% increased Mana Regeneration Rate", implicitModTypes = { { "resource", "mana" }, }, req = { }, } itemBases["Amber Amulet"] = { - type = "Amulet", + class = "Amulet", + category = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(10-15) to Strength", implicitModTypes = { { "attribute" }, }, req = { level = 8, }, } itemBases["Jade Amulet"] = { - type = "Amulet", + class = "Amulet", + category = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(10-15) to Dexterity", implicitModTypes = { { "attribute" }, }, req = { level = 8, }, } itemBases["Lapis Amulet"] = { - type = "Amulet", + class = "Amulet", + category = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(10-15) to Intelligence", implicitModTypes = { { "attribute" }, }, req = { level = 8, }, } itemBases["Lunar Amulet"] = { - type = "Amulet", + class = "Amulet", + category = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(20-30) to maximum Energy Shield", implicitModTypes = { { "energy_shield", "defences" }, }, req = { level = 14, }, } itemBases["Bloodstone Amulet"] = { - type = "Amulet", + class = "Amulet", + category = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(30-40) to maximum Life", implicitModTypes = { { "resource", "life" }, }, req = { level = 18, }, } itemBases["Stellar Amulet"] = { - type = "Amulet", + class = "Amulet", + category = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(5-7) to all Attributes", implicitModTypes = { { "attribute" }, }, req = { level = 24, }, } itemBases["Solar Amulet"] = { - type = "Amulet", + class = "Amulet", + category = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(10-15) to Spirit", implicitModTypes = { { }, }, req = { level = 30, }, } itemBases["Gold Amulet"] = { - type = "Amulet", + class = "Amulet", + category = "Amulet", tags = { amulet = true, default = true, }, implicit = "(12-20)% increased Rarity of Items found", implicitModTypes = { { }, }, diff --git a/src/Data/Bases/axe.lua b/src/Data/Bases/axe.lua index 9fe8794471..6b3d20e4c9 100644 --- a/src/Data/Bases/axe.lua +++ b/src/Data/Bases/axe.lua @@ -12,3 +12,261 @@ itemBases["Dull Hatchet"] = { weapon = { PhysicalMin = 4, PhysicalMax = 10, CritChanceBase = 5, AttackRateBase = 1.5, Range = 11, }, req = { }, } +itemBases["Hook Axe"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + tags = { axe = true, onehand = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Gain 1 Rage on Hit", + implicitModTypes = { { }, }, + weapon = { PhysicalMin = 5, PhysicalMax = 14, CritChanceBase = 5, AttackRateBase = 1.45, Range = 11, }, + req = { str = 10, }, +} +itemBases["Bearded Axe"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + 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, }, +} +itemBases["Extended Cleaver"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + tags = { axe = true, onehand = true, maraketh_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, + 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, }, +} +itemBases["Bandit Hatchet"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + 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, }, +} +itemBases["Crescent Axe"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + 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, }, +} +itemBases["Carving Hatchet"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + 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, }, +} +itemBases["Sacrificial Axe"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + tags = { axe = true, onehand = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, + 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, }, +} +itemBases["Boarding Hatchet"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + 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, }, +} +itemBases["Fury Cleaver"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, }, + 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, }, +} +itemBases["Battle Axe"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + 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, }, +} +itemBases["Profane Cleaver"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + 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, }, +} +itemBases["Dread Hatchet"] = { + class = "One Hand Axe", + category = "One Hand Axe", + quality = 20, + socketLimit = 2, + 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, }, +} + +itemBases["Splitting Greataxe"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + tags = { axe = true, ezomyte_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, + implicitModTypes = { }, + weapon = { PhysicalMin = 8, PhysicalMax = 20, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, }, + req = { }, +} +itemBases["Light Halberd"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + 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, }, +} +itemBases["Executioner Greataxe"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + tags = { axe = true, ezomyte_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, + implicit = "Culling Strike", + implicitModTypes = { { }, }, + weapon = { PhysicalMin = 10, PhysicalMax = 41, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, }, + req = { level = 10, str = 20, dex = 10, }, +} +itemBases["Arched Greataxe"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + 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, }, +} +itemBases["Elegant Glaive"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + 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, }, +} +itemBases["Savage Greataxe"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + tags = { axe = true, maraketh_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, + 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, }, +} +itemBases["Rending Halberd"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + 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, }, +} +itemBases["Jagged Greataxe"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + tags = { axe = true, vaal_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, + 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, }, +} +itemBases["Reaver Glaive"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + 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, }, +} +itemBases["Ember Greataxe"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + 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, }, +} +itemBases["Ceremonial Halberd"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, + implicitModTypes = { }, + weapon = { PhysicalMin = 53, PhysicalMax = 123, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, }, + req = { level = 52, str = 93, dex = 37, }, +} +itemBases["Monument Greataxe"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + 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, }, +} +itemBases["Vile Greataxe"] = { + class = "Two Hand Axe", + category = "Two Hand Axe", + quality = 20, + socketLimit = 3, + 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, }, +} diff --git a/src/Data/Bases/belt.lua b/src/Data/Bases/belt.lua index 9bec0326f8..7b06a70a85 100644 --- a/src/Data/Bases/belt.lua +++ b/src/Data/Bases/belt.lua @@ -3,14 +3,16 @@ local itemBases = ... itemBases["Golden Obi"] = { - type = "Belt", + class = "Belt", + category = "Belt", tags = { demigods = true, not_for_sale = true, default = true, belt = true, }, implicit = "(20-30)% increased Rarity of Items found", implicitModTypes = { { }, }, req = { }, } itemBases["Rawhide Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(20-30)% increased Life Recovery from Flasks", @@ -18,7 +20,8 @@ itemBases["Rawhide Belt"] = { req = { }, } itemBases["Linen Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(20-30)% increased Mana Recovery from Flasks", @@ -26,7 +29,8 @@ itemBases["Linen Belt"] = { req = { }, } itemBases["Wide Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(20-30)% increased Flask Charges gained", @@ -34,7 +38,8 @@ itemBases["Wide Belt"] = { req = { level = 14, }, } itemBases["Long Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(15-20)% increased Charm Effect Duration", @@ -42,7 +47,8 @@ itemBases["Long Belt"] = { req = { level = 20, }, } itemBases["Plate Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "+(100-140) to Armour", @@ -50,7 +56,8 @@ itemBases["Plate Belt"] = { req = { level = 24, }, } itemBases["Ornate Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(10-15)% reduced Charm Charges used", @@ -58,7 +65,8 @@ itemBases["Ornate Belt"] = { req = { level = 31, }, } itemBases["Mail Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(10-15)% reduced Flask Charges used", @@ -66,7 +74,8 @@ itemBases["Mail Belt"] = { req = { level = 40, }, } itemBases["Double Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(20-30)% increased Charm Charges gained", @@ -74,7 +83,8 @@ itemBases["Double Belt"] = { req = { level = 44, }, } itemBases["Heavy Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(20-30)% increased Stun Threshold", @@ -82,7 +92,8 @@ itemBases["Heavy Belt"] = { req = { level = 50, }, } itemBases["Utility Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "20% of Flask Recovery applied Instantly", @@ -90,7 +101,8 @@ itemBases["Utility Belt"] = { req = { level = 55, }, } itemBases["Fine Belt"] = { - type = "Belt", + class = "Belt", + category = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "Flasks gain 0.17 charges per Second", diff --git a/src/Data/Bases/body.lua b/src/Data/Bases/body.lua index 83cea89a31..b6fc00ed70 100644 --- a/src/Data/Bases/body.lua +++ b/src/Data/Bases/body.lua @@ -3,805 +3,980 @@ local itemBases = ... itemBases["Golden Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_int_armour = true, demigods = true, armour = true, not_for_sale = true, default = true, }, implicit = "+(15-25)% to all Elemental Resistances", implicitModTypes = { { "elemental", "fire", "cold", "lightning", "resistance" }, }, armour = { Armour = 51, Evasion = 44, EnergyShield = 21, }, + type = "Armour/Evasion/Energy Shield", req = { level = 20, str = 8, dex = 8, int = 8, }, } itemBases["Rusted Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 45, MovementPenalty = 0.05, }, + type = "Armour", req = { }, } itemBases["Fur Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 60, MovementPenalty = 0.05, }, + type = "Armour", req = { str = 10, }, } itemBases["Iron Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 96, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 11, str = 24, }, } itemBases["Raider Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 121, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 16, str = 34, }, } itemBases["Maraketh Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 141, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 20, str = 42, }, } itemBases["Steel Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 177, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 27, str = 57, }, } itemBases["Full Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 208, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 33, str = 68, }, } itemBases["Vaal Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 228, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 37, str = 77, }, } itemBases["Juggernaut Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 269, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 45, str = 94, }, } itemBases["Chieftain Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 294, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 50, str = 104, }, } itemBases["Colosseum Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 304, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 52, str = 107, }, } itemBases["Champion Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 335, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 58, str = 120, }, } itemBases["Glorious Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 534, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 65, str = 157, }, } itemBases["Conqueror Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicit = "(30-40)% increased Stun Threshold", implicitModTypes = { { }, }, armour = { Armour = 445, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 68, str = 157, }, } itemBases["Abyssal Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicit = "Regenerate (1.5-2.5)% of Life per second", implicitModTypes = { { "resource", "life" }, }, armour = { Armour = 445, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 73, str = 157, }, } itemBases["Leather Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 30, MovementPenalty = 0.03, }, + type = "Evasion", req = { }, } itemBases["Quilted Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 44, MovementPenalty = 0.03, }, + type = "Evasion", req = { dex = 10, }, } itemBases["Pathfinder Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 78, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 11, dex = 24, }, } itemBases["Shrouded Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, dex_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 102, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 16, dex = 34, }, } itemBases["Rhoahide Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, dex_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 131, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 22, dex = 47, }, } itemBases["Studded Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, dex_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 150, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 26, dex = 55, }, } itemBases["Scout's Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, dex_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 184, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 33, dex = 68, }, } itemBases["Serpentscale Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, dex_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 198, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 36, dex = 75, }, } itemBases["Corsair Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 242, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 45, dex = 94, }, } itemBases["Smuggler Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 256, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 48, dex = 99, }, } itemBases["Strider Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 275, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 52, dex = 107, }, } itemBases["Hardleather Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 295, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 56, dex = 115, }, } itemBases["Exquisite Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 487, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 65, dex = 157, }, } itemBases["Mail Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicit = "(20-30)% reduced Slowing Potency of Debuffs on You", implicitModTypes = { { }, }, armour = { Evasion = 406, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 68, dex = 157, }, } itemBases["Armoured Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicit = "(30-40)% increased Elemental Ailment Threshold", implicitModTypes = { { }, }, armour = { Evasion = 406, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 73, dex = 157, }, } itemBases["Tattered Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 28, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { }, } itemBases["Feathered Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 35, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 5, int = 13, }, } itemBases["Hexer's Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 44, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 11, int = 24, }, } itemBases["Bone Raiment"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, int_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 52, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 16, int = 34, }, } itemBases["Silk Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, int_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 61, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 22, int = 47, }, } itemBases["Keth Raiment"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, int_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 70, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 28, int = 59, }, } itemBases["Votive Raiment"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 78, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 33, int = 68, }, } itemBases["Altar Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 89, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 40, int = 83, }, } itemBases["Elementalist Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 97, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 45, int = 94, }, } itemBases["Mystic Raiment"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 100, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 47, int = 97, }, } itemBases["Imperial Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 108, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 52, int = 107, }, } itemBases["Plated Raiment"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 117, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 58, int = 120, }, } itemBases["Havoc Raiment"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 184, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 65, int = 157, }, } itemBases["Enlightened Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicit = "(40-50)% increased Mana Regeneration Rate", implicitModTypes = { { "resource", "mana" }, }, armour = { EnergyShield = 153, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 68, int = 157, }, } itemBases["Arcane Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicit = "(40-50)% faster start of Energy Shield Recharge", implicitModTypes = { { "energy_shield", "defences" }, }, armour = { EnergyShield = 153, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 73, int = 157, }, } itemBases["Chain Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, ezomyte_basetype = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 25, Evasion = 16, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { }, } itemBases["Rogue Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, ezomyte_basetype = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 53, Evasion = 43, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 11, str = 14, dex = 14, }, } itemBases["Vagabond Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 67, Evasion = 56, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 16, str = 20, dex = 20, }, } itemBases["Cloaked Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 95, Evasion = 83, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 26, str = 31, dex = 31, }, } itemBases["Explorer Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 114, Evasion = 101, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 33, str = 39, dex = 39, }, } itemBases["Scale Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 125, Evasion = 112, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 37, str = 43, dex = 43, }, } itemBases["Knight Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 148, Evasion = 133, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 45, str = 51, dex = 51, }, } itemBases["Ancestral Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 162, Evasion = 146, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 50, str = 57, dex = 57, }, } itemBases["Lamellar Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 167, Evasion = 151, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 52, str = 59, dex = 59, }, } itemBases["Gladiator Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 184, Evasion = 167, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 58, str = 66, dex = 66, }, } itemBases["Heroic Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicit = "+(60-80) to maximum Life", implicitModTypes = { { "resource", "life" }, }, armour = { Armour = 245, Evasion = 223, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 65, str = 86, dex = 86, }, } itemBases["Tournament Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicit = "+(20-25)% to Fire Resistance", implicitModTypes = { { "elemental", "fire", "resistance" }, }, armour = { Armour = 245, Evasion = 223, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 68, str = 86, dex = 86, }, } itemBases["Tournament Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicit = "+(20-25)% to Cold Resistance", implicitModTypes = { { "elemental", "cold", "resistance" }, }, armour = { Armour = 245, Evasion = 223, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 68, str = 86, dex = 86, }, } itemBases["Tournament Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicit = "+(20-25)% to Lightning Resistance", implicitModTypes = { { "elemental", "lightning", "resistance" }, }, armour = { Armour = 245, Evasion = 223, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 68, str = 86, dex = 86, }, } itemBases["Slayer Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 294, Evasion = 268, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 73, str = 86, dex = 86, }, } itemBases["Pilgrim Vestments"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, ezomyte_basetype = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 25, EnergyShield = 16, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { }, } itemBases["Pelt Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, ezomyte_basetype = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 50, EnergyShield = 23, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 10, str = 14, int = 14, }, } itemBases["Mail Vestments"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 67, EnergyShield = 28, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 16, str = 20, int = 20, }, } itemBases["Shaman Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, armour = true, maraketh_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 100, EnergyShield = 39, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 28, str = 33, int = 33, }, } itemBases["Ironclad Vestments"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 114, EnergyShield = 43, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 33, str = 39, int = 39, }, } itemBases["Sacrificial Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 123, EnergyShield = 46, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 36, str = 41, int = 41, }, } itemBases["Cleric Vestments"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 148, EnergyShield = 53, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 45, str = 51, int = 51, }, } itemBases["Tideseer Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 165, EnergyShield = 58, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 51, str = 59, int = 59, }, } itemBases["Gilded Vestments"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 167, EnergyShield = 59, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 52, str = 59, int = 59, }, } itemBases["Venerated Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 173, EnergyShield = 61, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 54, str = 61, int = 61, }, } itemBases["Revered Vestments"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicit = "+1% to all Maximum Elemental Resistances", implicitModTypes = { { "elemental", "resistance" }, }, armour = { Armour = 245, EnergyShield = 84, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 65, str = 86, int = 86, }, } itemBases["Corvus Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicit = "+(20-30) to Spirit", implicitModTypes = { { }, }, armour = { Armour = 245, EnergyShield = 84, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 68, str = 86, int = 86, }, } itemBases["Zenith Vestments"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 294, EnergyShield = 101, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 73, str = 86, int = 86, }, } itemBases["Hermit Garb"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 16, EnergyShield = 16, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { }, } itemBases["Waxed Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 43, EnergyShield = 24, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 11, dex = 14, int = 14, }, } itemBases["Marabout Garb"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, maraketh_basetype = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 56, EnergyShield = 28, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 16, dex = 20, int = 20, }, } itemBases["Wayfarer Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, maraketh_basetype = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 88, EnergyShield = 39, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 28, dex = 33, int = 33, }, } itemBases["Anchorite Garb"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, vaal_basetype = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 101, EnergyShield = 43, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 33, dex = 39, int = 39, }, } itemBases["Scalper's Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, vaal_basetype = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 117, EnergyShield = 48, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 39, dex = 45, int = 45, }, } itemBases["Scoundrel Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 133, EnergyShield = 53, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 45, dex = 51, int = 51, }, } itemBases["Ascetic Garb"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 149, EnergyShield = 58, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 51, dex = 59, int = 59, }, } itemBases["Clandestine Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 151, EnergyShield = 59, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 52, dex = 59, int = 59, }, } itemBases["Monastic Garb"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 162, EnergyShield = 63, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 56, dex = 64, int = 64, }, } itemBases["Torment Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 268, EnergyShield = 101, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 65, dex = 86, int = 86, }, } itemBases["Devout Garb"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicit = "+(7-13)% to Chaos Resistance", implicitModTypes = { { "chaos", "resistance" }, }, armour = { Evasion = 223, EnergyShield = 84, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 68, dex = 86, int = 86, }, } itemBases["Assassin Garb"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicit = "5% increased Movement Speed", implicitModTypes = { { "speed" }, }, armour = { Evasion = 223, EnergyShield = 84, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 73, dex = 86, int = 86, }, } itemBases["Garment"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_int_armour = true, default = true, }, @@ -810,529 +985,643 @@ itemBases["Garment"] = { req = { }, } itemBases["Grand Regalia"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 135, Evasion = 123, EnergyShield = 46, MovementPenalty = 0.04, }, + type = "Armour/Evasion/Energy Shield", req = { level = 65, str = 51, dex = 51, int = 51, }, } itemBases["Advanced Fur Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 269, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 45, str = 94, }, } itemBases["Advanced Iron Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 284, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 48, str = 99, }, } itemBases["Advanced Maraketh Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 299, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 51, str = 105, }, } itemBases["Advanced Steel Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 320, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 55, str = 113, }, } itemBases["Advanced Full Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 340, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 59, str = 122, }, } itemBases["Advanced Vaal Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 355, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 62, str = 128, }, } itemBases["Advanced Quilted Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 242, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 45, dex = 94, }, } itemBases["Advanced Pathfinder Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 256, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 48, dex = 99, }, } itemBases["Advanced Rhoahide Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 271, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 51, dex = 105, }, } itemBases["Advanced Studded Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 290, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 55, dex = 113, }, } itemBases["Advanced Scout's Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 309, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 59, dex = 122, }, } itemBases["Advanced Serpentscale Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 324, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 62, dex = 128, }, } itemBases["Advanced Feathered Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 97, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 45, int = 94, }, } itemBases["Advanced Hexer's Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 101, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 48, int = 99, }, } itemBases["Advanced Silk Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 106, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 51, int = 105, }, } itemBases["Advanced Keth Raiment"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 112, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 55, int = 113, }, } itemBases["Advanced Votive Raiment"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 119, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 59, int = 122, }, } itemBases["Advanced Altar Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 123, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 62, int = 128, }, } itemBases["Advanced Chain Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 148, Evasion = 133, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 45, str = 51, dex = 51, }, } itemBases["Advanced Rogue Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 156, Evasion = 141, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 48, str = 55, dex = 55, }, } itemBases["Advanced Vagabond Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 165, Evasion = 149, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 51, str = 59, dex = 59, }, } itemBases["Advanced Cloaked Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 176, Evasion = 159, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 55, str = 62, dex = 62, }, } itemBases["Advanced Explorer Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 187, Evasion = 170, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 59, str = 67, dex = 67, }, } itemBases["Advanced Scale Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 195, Evasion = 178, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 62, str = 70, dex = 70, }, } itemBases["Advanced Pilgrim Vestments"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 148, EnergyShield = 53, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 45, str = 51, int = 51, }, } itemBases["Advanced Pelt Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 156, EnergyShield = 56, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 48, str = 55, int = 55, }, } itemBases["Advanced Mail Vestments"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 165, EnergyShield = 58, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 51, str = 59, int = 59, }, } itemBases["Advanced Shaman Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 176, EnergyShield = 62, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 55, str = 62, int = 62, }, } itemBases["Advanced Ironclad Vestments"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 187, EnergyShield = 65, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 59, str = 67, int = 67, }, } itemBases["Advanced Sacrificial Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 195, EnergyShield = 68, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 62, str = 70, int = 70, }, } itemBases["Advanced Hermit Garb"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 133, EnergyShield = 53, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 45, dex = 51, int = 51, }, } itemBases["Advanced Waxed Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 141, EnergyShield = 56, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 48, dex = 55, int = 55, }, } itemBases["Advanced Marabout Garb"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 149, EnergyShield = 58, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 51, dex = 59, int = 59, }, } itemBases["Advanced Wayfarer Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 159, EnergyShield = 62, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 55, dex = 62, int = 62, }, } itemBases["Advanced Anchorite Garb"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 170, EnergyShield = 65, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 59, dex = 67, int = 67, }, } itemBases["Advanced Scalper's Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 178, EnergyShield = 68, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 62, dex = 70, int = 70, }, } itemBases["Expert Iron Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 534, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 65, str = 157, }, } itemBases["Expert Steel Plate"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicit = "Regenerate (1.5-2.5)% of Life per second", implicitModTypes = { { "resource", "life" }, }, armour = { Armour = 445, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 70, str = 157, }, } itemBases["Expert Vaal Cuirass"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, implicit = "(30-40)% increased Stun Threshold", implicitModTypes = { { }, }, armour = { Armour = 445, MovementPenalty = 0.05, }, + type = "Armour", req = { level = 75, str = 157, }, } itemBases["Expert Pathfinder Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicit = "(20-30)% reduced Slowing Potency of Debuffs on You", implicitModTypes = { { }, }, armour = { Evasion = 406, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 65, dex = 157, }, } itemBases["Expert Studded Vest"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 487, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 70, dex = 157, }, } itemBases["Expert Serpentscale Coat"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, implicit = "(30-40)% increased Elemental Ailment Threshold", implicitModTypes = { { }, }, armour = { Evasion = 406, MovementPenalty = 0.03, }, + type = "Evasion", req = { level = 75, dex = 157, }, } itemBases["Expert Hexer's Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 184, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 65, int = 157, }, } itemBases["Expert Keth Raiment"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicit = "(40-50)% increased Mana Regeneration Rate", implicitModTypes = { { "resource", "mana" }, }, armour = { EnergyShield = 153, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 70, int = 157, }, } itemBases["Expert Altar Robe"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, implicit = "(40-50)% faster start of Energy Shield Recharge", implicitModTypes = { { "energy_shield", "defences" }, }, armour = { EnergyShield = 153, MovementPenalty = 0.03, }, + type = "EnergyShield", req = { level = 75, int = 157, }, } itemBases["Expert Rogue Armour"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicit = "+(60-80) to maximum Life", implicitModTypes = { { "resource", "life" }, }, armour = { Armour = 245, Evasion = 223, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 65, str = 86, dex = 86, }, } itemBases["Expert Cloaked Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicit = "+(20-25)% to Fire Resistance", implicitModTypes = { { "elemental", "fire", "resistance" }, }, armour = { Armour = 245, Evasion = 223, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 70, str = 86, dex = 86, }, } itemBases["Expert Cloaked Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicit = "+(20-25)% to Cold Resistance", implicitModTypes = { { "elemental", "cold", "resistance" }, }, armour = { Armour = 245, Evasion = 223, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 70, str = 86, dex = 86, }, } itemBases["Expert Cloaked Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicit = "+(20-25)% to Lightning Resistance", implicitModTypes = { { "elemental", "lightning", "resistance" }, }, armour = { Armour = 245, Evasion = 223, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 70, str = 86, dex = 86, }, } itemBases["Expert Scale Mail"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 294, Evasion = 268, MovementPenalty = 0.04, }, + type = "Armour/Evasion", req = { level = 75, str = 86, dex = 86, }, } itemBases["Expert Pelt Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 294, EnergyShield = 101, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 65, str = 86, int = 86, }, } itemBases["Expert Shaman Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicit = "+(20-30) to Spirit", implicitModTypes = { { }, }, armour = { Armour = 245, EnergyShield = 84, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 70, str = 86, int = 86, }, } itemBases["Expert Sacrificial Mantle"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, implicit = "+1% to all Maximum Elemental Resistances", implicitModTypes = { { "elemental", "resistance" }, }, armour = { Armour = 245, EnergyShield = 84, MovementPenalty = 0.04, }, + type = "Armour/Energy Shield", req = { level = 75, str = 86, int = 86, }, } itemBases["Expert Waxed Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 268, EnergyShield = 101, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 65, dex = 86, int = 86, }, } itemBases["Expert Wayfarer Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicit = "+(7-13)% to Chaos Resistance", implicitModTypes = { { "chaos", "resistance" }, }, armour = { Evasion = 223, EnergyShield = 84, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 70, dex = 86, int = 86, }, } itemBases["Expert Scalper's Jacket"] = { - type = "Body Armour", + class = "Body Armour", + category = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, implicit = "5% increased Movement Speed", implicitModTypes = { { "speed" }, }, armour = { Evasion = 223, EnergyShield = 84, MovementPenalty = 0.03, }, + type = "Evasion/Energy Shield", req = { level = 75, dex = 86, int = 86, }, } diff --git a/src/Data/Bases/boots.lua b/src/Data/Bases/boots.lua index b3a550d82d..d7931e732b 100644 --- a/src/Data/Bases/boots.lua +++ b/src/Data/Bases/boots.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Golden Caligae"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, not_for_sale = true, armour = true, demigods = true, default = true, }, @@ -13,740 +14,904 @@ itemBases["Golden Caligae"] = { req = { level = 12, }, } itemBases["Rough Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 22, }, + type = "Armour", req = { }, } itemBases["Iron Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 47, }, + type = "Armour", req = { level = 11, str = 20, }, } itemBases["Bronze Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, str_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 60, }, + type = "Armour", req = { level = 16, str = 29, }, } itemBases["Trimmed Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, str_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 87, }, + type = "Armour", req = { level = 27, str = 47, }, } itemBases["Stone Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, str_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 102, }, + type = "Armour", req = { level = 33, str = 57, }, } itemBases["Reefsteel Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 132, }, + type = "Armour", req = { level = 45, str = 78, }, } itemBases["Monument Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 150, }, + type = "Armour", req = { level = 52, str = 89, }, } itemBases["Totemic Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 182, }, + type = "Armour", req = { level = 65, str = 111, }, } itemBases["Rawhide Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 15, }, + type = "Evasion", req = { }, } itemBases["Laced Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 38, }, + type = "Evasion", req = { level = 11, dex = 20, }, } itemBases["Embossed Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 50, }, + type = "Evasion", req = { level = 16, dex = 29, }, } itemBases["Steeltoe Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 79, }, + type = "Evasion", req = { level = 28, dex = 49, }, } itemBases["Lizardscale Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, dex_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 90, }, + type = "Evasion", req = { level = 33, dex = 57, }, } itemBases["Flared Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 119, }, + type = "Evasion", req = { level = 45, dex = 78, }, } itemBases["Leatherplate Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 135, }, + type = "Evasion", req = { level = 52, dex = 89, }, } itemBases["Embroidered Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 166, }, + type = "Evasion", req = { level = 65, dex = 111, }, } itemBases["Straw Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 14, }, + type = "EnergyShield", req = { }, } itemBases["Wrapped Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 22, }, + type = "EnergyShield", req = { level = 11, int = 20, }, } itemBases["Lattice Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 25, }, + type = "EnergyShield", req = { level = 16, int = 29, }, } itemBases["Silk Slippers"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 34, }, + type = "EnergyShield", req = { level = 27, int = 47, }, } itemBases["Feathered Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 38, }, + type = "EnergyShield", req = { level = 33, int = 57, }, } itemBases["Flax Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 48, }, + type = "EnergyShield", req = { level = 45, int = 78, }, } itemBases["Studded Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 53, }, + type = "EnergyShield", req = { level = 52, int = 89, }, } itemBases["Elaborate Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 63, }, + type = "EnergyShield", req = { level = 65, int = 111, }, } itemBases["Mail Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 19, Evasion = 15, }, + type = "Armour/Evasion", req = { level = 6, str = 8, dex = 8, }, } itemBases["Braced Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 33, Evasion = 28, }, + type = "Armour/Evasion", req = { level = 16, str = 17, dex = 17, }, } itemBases["Stacked Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, vaal_basetype = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 56, Evasion = 50, }, + type = "Armour/Evasion", req = { level = 33, str = 32, dex = 32, }, } itemBases["Covered Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 73, Evasion = 65, }, + type = "Armour/Evasion", req = { level = 45, str = 43, dex = 43, }, } itemBases["Flexile Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 82, Evasion = 74, }, + type = "Armour/Evasion", req = { level = 52, str = 50, dex = 50, }, } itemBases["Bold Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 100, Evasion = 91, }, + type = "Armour/Evasion", req = { level = 65, str = 61, dex = 61, }, } itemBases["Padded Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 18, EnergyShield = 9, }, + type = "Armour/Energy Shield", req = { level = 5, str = 7, int = 7, }, } itemBases["Secured Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 33, EnergyShield = 14, }, + type = "Armour/Energy Shield", req = { level = 16, str = 17, int = 17, }, } itemBases["Pelt Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, vaal_basetype = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 56, EnergyShield = 21, }, + type = "Armour/Energy Shield", req = { level = 33, str = 32, int = 32, }, } itemBases["Weaver Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 73, EnergyShield = 26, }, + type = "Armour/Energy Shield", req = { level = 45, str = 43, int = 43, }, } itemBases["Gilt Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 82, EnergyShield = 29, }, + type = "Armour/Energy Shield", req = { level = 52, str = 50, int = 50, }, } itemBases["Pious Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 100, EnergyShield = 35, }, + type = "Armour/Energy Shield", req = { level = 65, str = 61, int = 61, }, } itemBases["Frayed Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, ezomyte_basetype = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 13, EnergyShield = 9, }, + type = "Evasion/Energy Shield", req = { level = 5, dex = 7, int = 7, }, } itemBases["Threaded Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 28, EnergyShield = 14, }, + type = "Evasion/Energy Shield", req = { level = 16, dex = 17, int = 17, }, } itemBases["Hunting Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, vaal_basetype = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 50, EnergyShield = 21, }, + type = "Evasion/Energy Shield", req = { level = 33, dex = 32, int = 32, }, } itemBases["Steelpoint Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 65, EnergyShield = 26, }, + type = "Evasion/Energy Shield", req = { level = 45, dex = 43, int = 43, }, } itemBases["Velour Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 74, EnergyShield = 29, }, + type = "Evasion/Energy Shield", req = { level = 52, dex = 50, int = 50, }, } itemBases["Bladed Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 91, EnergyShield = 35, }, + type = "Evasion/Energy Shield", req = { level = 65, dex = 61, int = 61, }, } itemBases["Grand Cuisses"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 66, Evasion = 60, EnergyShield = 23, }, + type = "Armour/Evasion/Energy Shield", req = { level = 65, str = 43, dex = 43, int = 43, }, } itemBases["Advanced Iron Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 132, }, + type = "Armour", req = { level = 45, str = 78, }, } itemBases["Advanced Bronze Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 147, }, + type = "Armour", req = { level = 51, str = 88, }, } itemBases["Advanced Trimmed Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 157, }, + type = "Armour", req = { level = 55, str = 95, }, } itemBases["Advanced Stone Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 167, }, + type = "Armour", req = { level = 59, str = 101, }, } itemBases["Advanced Laced Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 119, }, + type = "Evasion", req = { level = 45, dex = 78, }, } itemBases["Advanced Embossed Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 133, }, + type = "Evasion", req = { level = 51, dex = 88, }, } itemBases["Advanced Steeltoe Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 143, }, + type = "Evasion", req = { level = 55, dex = 95, }, } itemBases["Advanced Lizardscale Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 152, }, + type = "Evasion", req = { level = 59, dex = 101, }, } itemBases["Advanced Wrapped Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 48, }, + type = "EnergyShield", req = { level = 45, int = 78, }, } itemBases["Advanced Lattice Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 52, }, + type = "EnergyShield", req = { level = 51, int = 88, }, } itemBases["Advanced Silk Slippers"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 55, }, + type = "EnergyShield", req = { level = 55, int = 95, }, } itemBases["Advanced Feathered Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 58, }, + type = "EnergyShield", req = { level = 59, int = 101, }, } itemBases["Advanced Mail Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 73, Evasion = 65, }, + type = "Armour/Evasion", req = { level = 45, str = 43, dex = 43, }, } itemBases["Advanced Braced Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 81, Evasion = 73, }, + type = "Armour/Evasion", req = { level = 51, str = 49, dex = 49, }, } itemBases["Advanced Stacked Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 92, Evasion = 84, }, + type = "Armour/Evasion", req = { level = 59, str = 56, dex = 56, }, } itemBases["Advanced Padded Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 73, EnergyShield = 26, }, + type = "Armour/Energy Shield", req = { level = 45, str = 43, int = 43, }, } itemBases["Advanced Secured Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 81, EnergyShield = 29, }, + type = "Armour/Energy Shield", req = { level = 51, str = 49, int = 49, }, } itemBases["Advanced Pelt Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 92, EnergyShield = 32, }, + type = "Armour/Energy Shield", req = { level = 59, str = 56, int = 56, }, } itemBases["Advanced Frayed Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 65, EnergyShield = 26, }, + type = "Evasion/Energy Shield", req = { level = 45, dex = 43, int = 43, }, } itemBases["Advanced Threaded Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 73, EnergyShield = 29, }, + type = "Evasion/Energy Shield", req = { level = 51, dex = 49, int = 49, }, } itemBases["Advanced Hunting Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 84, EnergyShield = 32, }, + type = "Evasion/Energy Shield", req = { level = 59, dex = 56, int = 56, }, } itemBases["Expert Iron Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 182, }, + type = "Armour", req = { level = 65, str = 111, }, } itemBases["Expert Trimmed Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 200, }, + type = "Armour", req = { level = 70, str = 121, }, } itemBases["Expert Stone Greaves"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 219, }, + type = "Armour", req = { level = 75, str = 131, }, } itemBases["Expert Laced Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 166, }, + type = "Evasion", req = { level = 65, dex = 111, }, } itemBases["Expert Steeltoe Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 183, }, + type = "Evasion", req = { level = 70, dex = 121, }, } itemBases["Expert Lizardscale Boots"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 200, }, + type = "Evasion", req = { level = 75, dex = 131, }, } itemBases["Expert Wrapped Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 63, }, + type = "EnergyShield", req = { level = 65, int = 111, }, } itemBases["Expert Silk Slippers"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 69, }, + type = "EnergyShield", req = { level = 70, int = 121, }, } itemBases["Expert Feathered Sandals"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 75, }, + type = "EnergyShield", req = { level = 75, int = 131, }, } itemBases["Expert Mail Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 100, Evasion = 91, }, + type = "Armour/Evasion", req = { level = 65, str = 61, dex = 61, }, } itemBases["Expert Braced Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 110, Evasion = 101, }, + type = "Armour/Evasion", req = { level = 70, str = 66, dex = 66, }, } itemBases["Expert Stacked Sabatons"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 120, Evasion = 110, }, + type = "Armour/Evasion", req = { level = 75, str = 71, dex = 71, }, } itemBases["Expert Padded Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 100, EnergyShield = 35, }, + type = "Armour/Energy Shield", req = { level = 65, str = 61, int = 61, }, } itemBases["Expert Secured Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 110, EnergyShield = 38, }, + type = "Armour/Energy Shield", req = { level = 70, str = 66, int = 66, }, } itemBases["Expert Pelt Leggings"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Armour = 120, EnergyShield = 42, }, + type = "Armour/Energy Shield", req = { level = 75, str = 71, int = 71, }, } itemBases["Expert Frayed Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 91, EnergyShield = 35, }, + type = "Evasion/Energy Shield", req = { level = 65, dex = 61, int = 61, }, } itemBases["Expert Threaded Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 101, EnergyShield = 38, }, + type = "Evasion/Energy Shield", req = { level = 70, dex = 66, int = 66, }, } itemBases["Expert Hunting Shoes"] = { - type = "Boots", + class = "Boots", + category = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 110, EnergyShield = 42, }, + type = "Evasion/Energy Shield", req = { level = 75, dex = 71, int = 71, }, } diff --git a/src/Data/Bases/bow.lua b/src/Data/Bases/bow.lua index c0d16a097b..4becff3630 100644 --- a/src/Data/Bases/bow.lua +++ b/src/Data/Bases/bow.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Crude Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -12,7 +13,8 @@ itemBases["Crude Bow"] = { req = { }, } itemBases["Shortbow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -21,7 +23,8 @@ itemBases["Shortbow"] = { req = { level = 5, dex = 14, }, } itemBases["Warden Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -31,7 +34,8 @@ itemBases["Warden Bow"] = { req = { level = 11, dex = 27, }, } itemBases["Recurve Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -40,7 +44,8 @@ itemBases["Recurve Bow"] = { req = { level = 16, dex = 38, }, } itemBases["Composite Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -49,7 +54,8 @@ itemBases["Composite Bow"] = { req = { level = 22, dex = 52, }, } itemBases["Dualstring Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -59,7 +65,8 @@ itemBases["Dualstring Bow"] = { req = { level = 28, dex = 65, }, } itemBases["Cultist Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -68,7 +75,8 @@ itemBases["Cultist Bow"] = { req = { level = 33, dex = 76, }, } itemBases["Zealot Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -77,7 +85,8 @@ itemBases["Zealot Bow"] = { req = { level = 39, dex = 90, }, } itemBases["Artillery Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -87,7 +96,8 @@ itemBases["Artillery Bow"] = { req = { level = 45, dex = 104, }, } itemBases["Tribal Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -96,7 +106,8 @@ itemBases["Tribal Bow"] = { req = { level = 50, dex = 115, }, } itemBases["Greatbow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -105,7 +116,8 @@ itemBases["Greatbow"] = { req = { level = 52, str = 119, dex = 119, }, } itemBases["Double Limb Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -114,7 +126,8 @@ itemBases["Double Limb Bow"] = { req = { level = 56, dex = 128, }, } itemBases["Heavy Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -123,7 +136,8 @@ itemBases["Heavy Bow"] = { req = { level = 65, dex = 148, }, } itemBases["Advanced Shortbow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -132,7 +146,8 @@ itemBases["Advanced Shortbow"] = { req = { level = 45, dex = 104, }, } itemBases["Advanced Warden Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -142,7 +157,8 @@ itemBases["Advanced Warden Bow"] = { req = { level = 48, dex = 110, }, } itemBases["Advanced Composite Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -151,7 +167,8 @@ itemBases["Advanced Composite Bow"] = { req = { level = 51, dex = 117, }, } itemBases["Advanced Dualstring Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -161,7 +178,8 @@ itemBases["Advanced Dualstring Bow"] = { req = { level = 55, dex = 126, }, } itemBases["Advanced Cultist Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -170,7 +188,8 @@ itemBases["Advanced Cultist Bow"] = { req = { level = 59, dex = 135, }, } itemBases["Advanced Zealot Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -179,7 +198,8 @@ itemBases["Advanced Zealot Bow"] = { req = { level = 62, dex = 142, }, } itemBases["Expert Shortbow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -188,7 +208,8 @@ itemBases["Expert Shortbow"] = { req = { level = 67, dex = 174, }, } itemBases["Expert Composite Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -197,7 +218,8 @@ itemBases["Expert Composite Bow"] = { req = { level = 72, dex = 193, }, } itemBases["Expert Warden Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -207,7 +229,8 @@ itemBases["Expert Warden Bow"] = { req = { level = 77, dex = 212, }, } itemBases["Expert Dualstring Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -217,7 +240,8 @@ itemBases["Expert Dualstring Bow"] = { req = { level = 78, dex = 212, }, } itemBases["Expert Cultist Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -226,7 +250,8 @@ itemBases["Expert Cultist Bow"] = { req = { level = 79, dex = 212, }, } itemBases["Expert Zealot Bow"] = { - type = "Bow", + class = "Bow", + category = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, diff --git a/src/Data/Bases/claw.lua b/src/Data/Bases/claw.lua index a355aee8de..ef84d55752 100644 --- a/src/Data/Bases/claw.lua +++ b/src/Data/Bases/claw.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Crude Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -12,7 +13,8 @@ itemBases["Crude Claw"] = { req = { }, } itemBases["Pict Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -21,7 +23,8 @@ itemBases["Pict Claw"] = { req = { level = 6, dex = 16, }, } itemBases["Wolfbone Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -31,7 +34,8 @@ itemBases["Wolfbone Claw"] = { req = { level = 12, dex = 29, }, } itemBases["Forked Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -40,7 +44,8 @@ itemBases["Forked Claw"] = { req = { level = 16, dex = 38, }, } itemBases["Plated Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -49,7 +54,8 @@ itemBases["Plated Claw"] = { req = { level = 22, dex = 52, }, } itemBases["Edged Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -59,7 +65,8 @@ itemBases["Edged Claw"] = { req = { level = 28, dex = 65, }, } itemBases["Arced Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -68,7 +75,8 @@ itemBases["Arced Claw"] = { req = { level = 33, dex = 76, }, } itemBases["Hooked Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -77,7 +85,8 @@ itemBases["Hooked Claw"] = { req = { level = 36, dex = 83, }, } itemBases["Razorglass Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -86,7 +95,8 @@ itemBases["Razorglass Claw"] = { req = { level = 45, dex = 104, }, } itemBases["Sharktooth Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -95,7 +105,8 @@ itemBases["Sharktooth Claw"] = { req = { level = 49, dex = 112, }, } itemBases["Armoured Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -104,7 +115,8 @@ itemBases["Armoured Claw"] = { req = { level = 52, dex = 119, }, } itemBases["Piercing Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -113,7 +125,8 @@ itemBases["Piercing Claw"] = { req = { level = 55, dex = 126, }, } itemBases["Talon Claw"] = { - type = "Claw", + class = "Claw", + category = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, diff --git a/src/Data/Bases/crossbow.lua b/src/Data/Bases/crossbow.lua index 78e77e698d..3f132911f6 100644 --- a/src/Data/Bases/crossbow.lua +++ b/src/Data/Bases/crossbow.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Makeshift Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -12,7 +13,8 @@ itemBases["Makeshift Crossbow"] = { req = { }, } itemBases["Tense Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -22,7 +24,8 @@ itemBases["Tense Crossbow"] = { req = { str = 8, dex = 8, }, } itemBases["Sturdy Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -31,7 +34,8 @@ itemBases["Sturdy Crossbow"] = { req = { level = 10, str = 15, dex = 15, }, } itemBases["Varnished Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -40,7 +44,8 @@ itemBases["Varnished Crossbow"] = { req = { level = 16, str = 22, dex = 22, }, } itemBases["Dyad Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -50,7 +55,8 @@ itemBases["Dyad Crossbow"] = { req = { level = 20, str = 27, dex = 27, }, } itemBases["Alloy Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -59,7 +65,8 @@ itemBases["Alloy Crossbow"] = { req = { level = 26, str = 34, dex = 34, }, } itemBases["Bombard Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -69,7 +76,8 @@ itemBases["Bombard Crossbow"] = { req = { level = 33, str = 43, dex = 43, }, } itemBases["Construct Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -78,7 +86,8 @@ itemBases["Construct Crossbow"] = { req = { level = 38, str = 49, dex = 49, }, } itemBases["Blackfire Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -87,7 +96,8 @@ itemBases["Blackfire Crossbow"] = { req = { level = 45, str = 57, dex = 57, }, } itemBases["Piercing Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -97,7 +107,8 @@ itemBases["Piercing Crossbow"] = { req = { level = 48, str = 61, dex = 61, }, } itemBases["Cumbrous Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -107,7 +118,8 @@ itemBases["Cumbrous Crossbow"] = { req = { level = 52, str = 66, dex = 66, }, } itemBases["Dedalian Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -116,7 +128,8 @@ itemBases["Dedalian Crossbow"] = { req = { level = 56, str = 71, dex = 71, }, } itemBases["Esoteric Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -125,7 +138,8 @@ itemBases["Esoteric Crossbow"] = { req = { level = 65, str = 81, dex = 81, }, } itemBases["Advanced Tense Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -135,7 +149,8 @@ itemBases["Advanced Tense Crossbow"] = { req = { level = 45, str = 57, dex = 57, }, } itemBases["Advanced Sturdy Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -144,7 +159,8 @@ itemBases["Advanced Sturdy Crossbow"] = { req = { level = 48, str = 61, dex = 61, }, } itemBases["Advanced Varnished Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -153,7 +169,8 @@ itemBases["Advanced Varnished Crossbow"] = { req = { level = 51, str = 65, dex = 65, }, } itemBases["Advanced Dyad Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -163,7 +180,8 @@ itemBases["Advanced Dyad Crossbow"] = { req = { level = 55, str = 69, dex = 69, }, } itemBases["Advanced Bombard Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -173,7 +191,8 @@ itemBases["Advanced Bombard Crossbow"] = { req = { level = 59, str = 74, dex = 74, }, } itemBases["Advanced Forlorn Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -182,7 +201,8 @@ itemBases["Advanced Forlorn Crossbow"] = { req = { level = 62, str = 78, dex = 78, }, } itemBases["Expert Sturdy Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -191,7 +211,8 @@ itemBases["Expert Sturdy Crossbow"] = { req = { level = 67, str = 95, dex = 95, }, } itemBases["Expert Varnished Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -200,7 +221,8 @@ itemBases["Expert Varnished Crossbow"] = { req = { level = 72, str = 106, dex = 106, }, } itemBases["Expert Tense Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -210,7 +232,8 @@ itemBases["Expert Tense Crossbow"] = { req = { level = 77, str = 116, dex = 116, }, } itemBases["Expert Dyad Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -220,7 +243,8 @@ itemBases["Expert Dyad Crossbow"] = { req = { level = 78, str = 116, dex = 116, }, } itemBases["Expert Bombard Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -230,7 +254,8 @@ itemBases["Expert Bombard Crossbow"] = { req = { level = 79, str = 116, dex = 116, }, } itemBases["Expert Forlorn Crossbow"] = { - type = "Crossbow", + class = "Crossbow", + category = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, diff --git a/src/Data/Bases/dagger.lua b/src/Data/Bases/dagger.lua index de267a2e39..5e09de5843 100644 --- a/src/Data/Bases/dagger.lua +++ b/src/Data/Bases/dagger.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Ethereal Blade"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, hidden = true, socketLimit = 2, @@ -13,7 +14,8 @@ itemBases["Ethereal Blade"] = { req = { }, } itemBases["Glass Shank"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -22,7 +24,8 @@ itemBases["Glass Shank"] = { req = { }, } itemBases["Crone Knife"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -32,7 +35,8 @@ itemBases["Crone Knife"] = { req = { level = 6, dex = 10, int = 10, }, } itemBases["Simple Dagger"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -41,7 +45,8 @@ itemBases["Simple Dagger"] = { req = { level = 12, dex = 18, int = 18, }, } itemBases["Skinning Knife"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -50,7 +55,8 @@ itemBases["Skinning Knife"] = { req = { level = 16, dex = 22, int = 22, }, } itemBases["Moon Dagger"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -59,7 +65,8 @@ itemBases["Moon Dagger"] = { req = { level = 20, dex = 27, int = 27, }, } itemBases["Engraved Knife"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -68,7 +75,8 @@ itemBases["Engraved Knife"] = { req = { level = 27, dex = 36, int = 36, }, } itemBases["Obsidian Dagger"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -77,7 +85,8 @@ itemBases["Obsidian Dagger"] = { req = { level = 33, dex = 43, int = 43, }, } itemBases["Bloodletting Dagger"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -87,7 +96,8 @@ itemBases["Bloodletting Dagger"] = { req = { level = 39, dex = 50, int = 50, }, } itemBases["Mail Breaker"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -97,7 +107,8 @@ itemBases["Mail Breaker"] = { req = { level = 45, dex = 57, int = 57, }, } itemBases["Kris Knife"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -106,7 +117,8 @@ itemBases["Kris Knife"] = { req = { level = 49, dex = 62, int = 62, }, } itemBases["Parrying Dagger"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -115,7 +127,8 @@ itemBases["Parrying Dagger"] = { req = { level = 52, dex = 66, int = 66, }, } itemBases["Arcane Dirk"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -124,7 +137,8 @@ itemBases["Arcane Dirk"] = { req = { level = 56, dex = 71, int = 71, }, } itemBases["Cinquedea"] = { - type = "Dagger", + class = "Dagger", + category = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, diff --git a/src/Data/Bases/flask.lua b/src/Data/Bases/flask.lua index eb55998138..96aeaadabc 100644 --- a/src/Data/Bases/flask.lua +++ b/src/Data/Bases/flask.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Thawing Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you become Frozen", @@ -12,7 +13,8 @@ itemBases["Thawing Charm"] = { req = { level = 12, }, } itemBases["Staunching Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you start Bleeding", @@ -21,7 +23,8 @@ itemBases["Staunching Charm"] = { req = { level = 18, }, } itemBases["Antidote Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you become Poisoned", @@ -30,7 +33,8 @@ itemBases["Antidote Charm"] = { req = { level = 24, }, } itemBases["Dousing Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you become Ignited", @@ -39,7 +43,8 @@ itemBases["Dousing Charm"] = { req = { level = 32, }, } itemBases["Grounding Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you become Shocked", @@ -48,7 +53,8 @@ itemBases["Grounding Charm"] = { req = { level = 32, }, } itemBases["Stone Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you become Stunned", @@ -57,7 +63,8 @@ itemBases["Stone Charm"] = { req = { level = 8, }, } itemBases["Silver Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you are affected by a Slow", @@ -66,7 +73,8 @@ itemBases["Silver Charm"] = { req = { level = 10, }, } itemBases["Ruby Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you take Fire damage from a Hit", @@ -75,7 +83,8 @@ itemBases["Ruby Charm"] = { req = { level = 5, }, } itemBases["Sapphire Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you take Cold damage from a Hit", @@ -84,7 +93,8 @@ itemBases["Sapphire Charm"] = { req = { level = 5, }, } itemBases["Topaz Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you take Lightning damage from a Hit", @@ -93,7 +103,8 @@ itemBases["Topaz Charm"] = { req = { level = 5, }, } itemBases["Amethyst Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you take Chaos damage from a Hit", @@ -102,7 +113,8 @@ itemBases["Amethyst Charm"] = { req = { level = 40, }, } itemBases["Golden Charm"] = { - type = "Charm", + class = "UtilityFlask", + category = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you Kill a Rare or Unique Enemy", @@ -112,8 +124,8 @@ itemBases["Golden Charm"] = { } itemBases["Lesser Life Flask"] = { - type = "Flask", - subType = "Life", + class = "LifeFlask", + category = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -121,8 +133,8 @@ itemBases["Lesser Life Flask"] = { req = { }, } itemBases["Medium Life Flask"] = { - type = "Flask", - subType = "Life", + class = "LifeFlask", + category = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -130,8 +142,8 @@ itemBases["Medium Life Flask"] = { req = { level = 4, }, } itemBases["Greater Life Flask"] = { - type = "Flask", - subType = "Life", + class = "LifeFlask", + category = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -139,8 +151,8 @@ itemBases["Greater Life Flask"] = { req = { level = 10, }, } itemBases["Grand Life Flask"] = { - type = "Flask", - subType = "Life", + class = "LifeFlask", + category = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -148,8 +160,8 @@ itemBases["Grand Life Flask"] = { req = { level = 16, }, } itemBases["Giant Life Flask"] = { - type = "Flask", - subType = "Life", + class = "LifeFlask", + category = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -157,8 +169,8 @@ itemBases["Giant Life Flask"] = { req = { level = 23, }, } itemBases["Colossal Life Flask"] = { - type = "Flask", - subType = "Life", + class = "LifeFlask", + category = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -166,8 +178,8 @@ itemBases["Colossal Life Flask"] = { req = { level = 30, }, } itemBases["Gargantuan Life Flask"] = { - type = "Flask", - subType = "Life", + class = "LifeFlask", + category = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -175,8 +187,8 @@ itemBases["Gargantuan Life Flask"] = { req = { level = 40, }, } itemBases["Transcendent Life Flask"] = { - type = "Flask", - subType = "Life", + class = "LifeFlask", + category = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -184,8 +196,8 @@ itemBases["Transcendent Life Flask"] = { req = { level = 50, }, } itemBases["Ultimate Life Flask"] = { - type = "Flask", - subType = "Life", + class = "LifeFlask", + category = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -194,8 +206,8 @@ itemBases["Ultimate Life Flask"] = { } itemBases["Lesser Mana Flask"] = { - type = "Flask", - subType = "Mana", + class = "ManaFlask", + category = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -203,8 +215,8 @@ itemBases["Lesser Mana Flask"] = { req = { }, } itemBases["Medium Mana Flask"] = { - type = "Flask", - subType = "Mana", + class = "ManaFlask", + category = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -212,8 +224,8 @@ itemBases["Medium Mana Flask"] = { req = { level = 4, }, } itemBases["Greater Mana Flask"] = { - type = "Flask", - subType = "Mana", + class = "ManaFlask", + category = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -221,8 +233,8 @@ itemBases["Greater Mana Flask"] = { req = { level = 10, }, } itemBases["Grand Mana Flask"] = { - type = "Flask", - subType = "Mana", + class = "ManaFlask", + category = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -230,8 +242,8 @@ itemBases["Grand Mana Flask"] = { req = { level = 16, }, } itemBases["Giant Mana Flask"] = { - type = "Flask", - subType = "Mana", + class = "ManaFlask", + category = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -239,8 +251,8 @@ itemBases["Giant Mana Flask"] = { req = { level = 23, }, } itemBases["Colossal Mana Flask"] = { - type = "Flask", - subType = "Mana", + class = "ManaFlask", + category = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -248,8 +260,8 @@ itemBases["Colossal Mana Flask"] = { req = { level = 30, }, } itemBases["Gargantuan Mana Flask"] = { - type = "Flask", - subType = "Mana", + class = "ManaFlask", + category = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -257,8 +269,8 @@ itemBases["Gargantuan Mana Flask"] = { req = { level = 40, }, } itemBases["Transcendent Mana Flask"] = { - type = "Flask", - subType = "Mana", + class = "ManaFlask", + category = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -266,8 +278,8 @@ itemBases["Transcendent Mana Flask"] = { req = { level = 50, }, } itemBases["Ultimate Mana Flask"] = { - type = "Flask", - subType = "Mana", + class = "ManaFlask", + category = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, diff --git a/src/Data/Bases/focus.lua b/src/Data/Bases/focus.lua index 01706335da..d2125b72dc 100644 --- a/src/Data/Bases/focus.lua +++ b/src/Data/Bases/focus.lua @@ -4,200 +4,244 @@ local itemBases = ... itemBases["Twig Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { focus = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 12, }, + type = "EnergyShield", req = { }, } itemBases["Woven Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { focus = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 15, }, + type = "EnergyShield", req = { level = 6, int = 13, }, } itemBases["Antler Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { focus = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 17, }, + type = "EnergyShield", req = { level = 10, int = 20, }, } itemBases["Engraved Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, focus = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 21, }, + type = "EnergyShield", req = { level = 16, int = 30, }, } itemBases["Tonal Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, focus = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 25, }, + type = "EnergyShield", req = { level = 22, int = 42, }, } itemBases["Crystal Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, focus = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 28, }, + type = "EnergyShield", req = { level = 26, int = 49, }, } itemBases["Voodoo Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { focus = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 32, }, + type = "EnergyShield", req = { level = 33, int = 61, }, } itemBases["Plumed Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { focus = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 34, }, + type = "EnergyShield", req = { level = 36, int = 66, }, } itemBases["Jade Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 40, }, + type = "EnergyShield", req = { level = 45, int = 83, }, } itemBases["Paua Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 43, }, + type = "EnergyShield", req = { level = 51, int = 94, }, } itemBases["Elegant Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 44, }, + type = "EnergyShield", req = { level = 52, int = 95, }, } itemBases["Attuned Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 47, }, + type = "EnergyShield", req = { level = 57, int = 104, }, } itemBases["Magus Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 52, }, + type = "EnergyShield", req = { level = 65, int = 118, }, } itemBases["Advanced Woven Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 40, }, + type = "EnergyShield", req = { level = 45, int = 83, }, } itemBases["Advanced Antler Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 42, }, + type = "EnergyShield", req = { level = 48, int = 88, }, } itemBases["Advanced Tonal Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 43, }, + type = "EnergyShield", req = { level = 51, int = 94, }, } itemBases["Advanced Crystal Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 46, }, + type = "EnergyShield", req = { level = 55, int = 101, }, } itemBases["Advanced Voodoo Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 49, }, + type = "EnergyShield", req = { level = 59, int = 108, }, } itemBases["Advanced Plumed Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 50, }, + type = "EnergyShield", req = { level = 61, int = 112, }, } itemBases["Expert Antler Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 52, }, + type = "EnergyShield", req = { level = 65, int = 118, }, } itemBases["Expert Crystal Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 58, }, + type = "EnergyShield", req = { level = 70, int = 129, }, } itemBases["Expert Plumed Focus"] = { - type = "Focus", + class = "Focus", + category = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 63, }, + type = "EnergyShield", req = { level = 75, int = 139, }, } diff --git a/src/Data/Bases/gloves.lua b/src/Data/Bases/gloves.lua index a67b420071..54fbc9f6c5 100644 --- a/src/Data/Bases/gloves.lua +++ b/src/Data/Bases/gloves.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Golden Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, not_for_sale = true, armour = true, demigods = true, default = true, }, @@ -13,741 +14,905 @@ itemBases["Golden Bracers"] = { req = { level = 12, }, } itemBases["Stocky Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 15, }, + type = "Armour", req = { }, } itemBases["Riveted Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 31, }, + type = "Armour", req = { level = 11, str = 19, }, } itemBases["Tempered Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, str_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 40, }, + type = "Armour", req = { level = 16, str = 27, }, } itemBases["Bolstered Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, str_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 58, }, + type = "Armour", req = { level = 27, str = 44, }, } itemBases["Moulded Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, str_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 68, }, + type = "Armour", req = { level = 33, str = 53, }, } itemBases["Detailed Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 88, }, + type = "Armour", req = { level = 45, str = 73, }, } itemBases["Titan Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 100, }, + type = "Armour", req = { level = 52, str = 83, }, } itemBases["Grand Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 122, }, + type = "Armour", req = { level = 65, str = 104, }, } itemBases["Suede Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 10, }, + type = "Evasion", req = { }, } itemBases["Firm Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 26, }, + type = "Evasion", req = { level = 11, dex = 19, }, } itemBases["Bound Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 33, }, + type = "Evasion", req = { level = 16, dex = 27, }, } itemBases["Sectioned Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, dex_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 52, }, + type = "Evasion", req = { level = 28, dex = 46, }, } itemBases["Spined Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, dex_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 60, }, + type = "Evasion", req = { level = 33, dex = 53, }, } itemBases["Fine Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 79, }, + type = "Evasion", req = { level = 45, dex = 73, }, } itemBases["Hardened Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 90, }, + type = "Evasion", req = { level = 52, dex = 83, }, } itemBases["Engraved Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 111, }, + type = "Evasion", req = { level = 65, dex = 104, }, } itemBases["Torn Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 9, }, + type = "EnergyShield", req = { }, } itemBases["Sombre Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 15, }, + type = "EnergyShield", req = { level = 12, int = 20, }, } itemBases["Stitched Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 17, }, + type = "EnergyShield", req = { level = 16, int = 27, }, } itemBases["Jewelled Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, int_armour = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 22, }, + type = "EnergyShield", req = { level = 26, int = 43, }, } itemBases["Intricate Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 26, }, + type = "EnergyShield", req = { level = 33, int = 53, }, } itemBases["Pauascale Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 32, }, + type = "EnergyShield", req = { level = 45, int = 73, }, } itemBases["Embroidered Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 35, }, + type = "EnergyShield", req = { level = 52, int = 83, }, } itemBases["Adorned Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 42, }, + type = "EnergyShield", req = { level = 65, int = 104, }, } itemBases["Ringmail Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 13, Evasion = 10, }, + type = "Armour/Evasion", req = { level = 6, str = 7, dex = 7, }, } itemBases["Layered Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 22, Evasion = 18, }, + type = "Armour/Evasion", req = { level = 16, str = 15, dex = 15, }, } itemBases["Doubled Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, vaal_basetype = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 37, Evasion = 33, }, + type = "Armour/Evasion", req = { level = 33, str = 30, dex = 30, }, } itemBases["Plate Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 48, Evasion = 44, }, + type = "Armour/Evasion", req = { level = 45, str = 40, dex = 40, }, } itemBases["Burnished Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 55, Evasion = 50, }, + type = "Armour/Evasion", req = { level = 52, str = 46, dex = 46, }, } itemBases["Ornate Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 67, Evasion = 61, }, + type = "Armour/Evasion", req = { level = 65, str = 57, dex = 57, }, } itemBases["Rope Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 12, EnergyShield = 6, }, + type = "Armour/Energy Shield", req = { level = 5, str = 6, int = 6, }, } itemBases["Aged Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 22, EnergyShield = 9, }, + type = "Armour/Energy Shield", req = { level = 16, str = 15, int = 15, }, } itemBases["Goldcast Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, vaal_basetype = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 37, EnergyShield = 14, }, + type = "Armour/Energy Shield", req = { level = 33, str = 30, int = 30, }, } itemBases["Diviner Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 48, EnergyShield = 17, }, + type = "Armour/Energy Shield", req = { level = 45, str = 40, int = 40, }, } itemBases["Righteous Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 55, EnergyShield = 19, }, + type = "Armour/Energy Shield", req = { level = 52, str = 46, int = 46, }, } itemBases["Signet Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 67, EnergyShield = 23, }, + type = "Armour/Energy Shield", req = { level = 65, str = 57, int = 57, }, } itemBases["Gauze Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, ezomyte_basetype = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 8, EnergyShield = 6, }, + type = "Evasion/Energy Shield", req = { dex = 6, int = 6, }, } itemBases["Linen Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 18, EnergyShield = 9, }, + type = "Evasion/Energy Shield", req = { level = 16, dex = 15, int = 15, }, } itemBases["Spiral Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, vaal_basetype = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 33, EnergyShield = 14, }, + type = "Evasion/Energy Shield", req = { level = 33, dex = 30, int = 30, }, } itemBases["Buckled Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 44, EnergyShield = 17, }, + type = "Evasion/Energy Shield", req = { level = 45, dex = 40, int = 40, }, } itemBases["Furtive Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 50, EnergyShield = 19, }, + type = "Evasion/Energy Shield", req = { level = 52, dex = 46, int = 46, }, } itemBases["Utility Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 61, EnergyShield = 23, }, + type = "Evasion/Energy Shield", req = { level = 65, dex = 57, int = 57, }, } itemBases["Grand Manchettes"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 44, Evasion = 40, EnergyShield = 15, }, + type = "Armour/Evasion/Energy Shield", req = { level = 65, str = 40, dex = 40, int = 40, }, } itemBases["Advanced Riveted Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 88, }, + type = "Armour", req = { level = 45, str = 73, }, } itemBases["Advanced Tempered Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 98, }, + type = "Armour", req = { level = 51, str = 82, }, } itemBases["Advanced Bolstered Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 105, }, + type = "Armour", req = { level = 55, str = 88, }, } itemBases["Advanced Moulded Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 111, }, + type = "Armour", req = { level = 59, str = 95, }, } itemBases["Advanced Firm Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 79, }, + type = "Evasion", req = { level = 45, dex = 73, }, } itemBases["Advanced Bound Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 89, }, + type = "Evasion", req = { level = 51, dex = 82, }, } itemBases["Advanced Sectioned Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 95, }, + type = "Evasion", req = { level = 55, dex = 88, }, } itemBases["Advanced Spined Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 101, }, + type = "Evasion", req = { level = 59, dex = 95, }, } itemBases["Advanced Sombre Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 32, }, + type = "EnergyShield", req = { level = 45, int = 73, }, } itemBases["Advanced Stitched Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 35, }, + type = "EnergyShield", req = { level = 51, int = 82, }, } itemBases["Advanced Jewelled Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 37, }, + type = "EnergyShield", req = { level = 55, int = 88, }, } itemBases["Advanced Intricate Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 39, }, + type = "EnergyShield", req = { level = 59, int = 95, }, } itemBases["Advanced Ringmail Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 48, Evasion = 44, }, + type = "Armour/Evasion", req = { level = 45, str = 40, dex = 40, }, } itemBases["Advanced Layered Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 54, Evasion = 49, }, + type = "Armour/Evasion", req = { level = 51, str = 46, dex = 46, }, } itemBases["Advanced Doubled Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 61, Evasion = 56, }, + type = "Armour/Evasion", req = { level = 59, str = 52, dex = 52, }, } itemBases["Advanced Rope Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 48, EnergyShield = 17, }, + type = "Armour/Energy Shield", req = { level = 45, str = 40, int = 40, }, } itemBases["Advanced Aged Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 54, EnergyShield = 19, }, + type = "Armour/Energy Shield", req = { level = 51, str = 46, int = 46, }, } itemBases["Advanced Goldcast Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 61, EnergyShield = 21, }, + type = "Armour/Energy Shield", req = { level = 59, str = 52, int = 52, }, } itemBases["Advanced Gauze Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 44, EnergyShield = 17, }, + type = "Evasion/Energy Shield", req = { level = 45, dex = 40, int = 40, }, } itemBases["Advanced Linen Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 49, EnergyShield = 19, }, + type = "Evasion/Energy Shield", req = { level = 51, dex = 46, int = 46, }, } itemBases["Advanced Spiral Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 56, EnergyShield = 21, }, + type = "Evasion/Energy Shield", req = { level = 59, dex = 52, int = 52, }, } itemBases["Expert Riveted Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 122, }, + type = "Armour", req = { level = 65, str = 104, }, } itemBases["Expert Bolstered Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 134, }, + type = "Armour", req = { level = 70, str = 113, }, } itemBases["Expert Moulded Mitts"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 146, }, + type = "Armour", req = { level = 75, str = 122, }, } itemBases["Expert Firm Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 111, }, + type = "Evasion", req = { level = 65, dex = 104, }, } itemBases["Expert Sectioned Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 122, }, + type = "Evasion", req = { level = 70, dex = 113, }, } itemBases["Expert Spined Bracers"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 133, }, + type = "Evasion", req = { level = 75, dex = 122, }, } itemBases["Expert Sombre Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 42, }, + type = "EnergyShield", req = { level = 65, int = 104, }, } itemBases["Expert Jewelled Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 46, }, + type = "EnergyShield", req = { level = 70, int = 113, }, } itemBases["Expert Intricate Gloves"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 50, }, + type = "EnergyShield", req = { level = 75, int = 122, }, } itemBases["Expert Ringmail Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 67, Evasion = 61, }, + type = "Armour/Evasion", req = { level = 65, str = 57, dex = 57, }, } itemBases["Expert Layered Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 74, Evasion = 67, }, + type = "Armour/Evasion", req = { level = 70, str = 62, dex = 62, }, } itemBases["Expert Doubled Gauntlets"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 80, Evasion = 73, }, + type = "Armour/Evasion", req = { level = 75, str = 67, dex = 67, }, } itemBases["Expert Rope Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 67, EnergyShield = 23, }, + type = "Armour/Energy Shield", req = { level = 65, str = 57, int = 57, }, } itemBases["Expert Aged Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 74, EnergyShield = 25, }, + type = "Armour/Energy Shield", req = { level = 70, str = 62, int = 62, }, } itemBases["Expert Goldcast Cuffs"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Armour = 80, EnergyShield = 28, }, + type = "Armour/Energy Shield", req = { level = 75, str = 67, int = 67, }, } itemBases["Expert Gauze Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 61, EnergyShield = 23, }, + type = "Evasion/Energy Shield", req = { level = 65, dex = 57, int = 57, }, } itemBases["Expert Linen Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 67, EnergyShield = 25, }, + type = "Evasion/Energy Shield", req = { level = 70, dex = 62, int = 62, }, } itemBases["Expert Spiral Wraps"] = { - type = "Gloves", + class = "Gloves", + category = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 73, EnergyShield = 28, }, + type = "Evasion/Energy Shield", req = { level = 75, dex = 67, int = 67, }, } diff --git a/src/Data/Bases/helmet.lua b/src/Data/Bases/helmet.lua index 6e23b697c3..3b80aab773 100644 --- a/src/Data/Bases/helmet.lua +++ b/src/Data/Bases/helmet.lua @@ -4,7 +4,8 @@ local itemBases = ... itemBases["Golden Wreath"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { not_for_sale = true, helmet = true, armour = true, demigods = true, default = true, }, @@ -14,7 +15,8 @@ itemBases["Golden Wreath"] = { req = { level = 12, }, } itemBases["Golden Visage"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { not_for_sale = true, helmet = true, armour = true, demigods = true, default = true, }, @@ -24,956 +26,1168 @@ itemBases["Golden Visage"] = { req = { level = 12, }, } itemBases["Rusted Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { str_armour = true, helmet = true, armour = true, ezomyte_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 29, }, + type = "Armour", req = { }, } itemBases["Soldier Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { str_armour = true, helmet = true, armour = true, ezomyte_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 66, }, + type = "Armour", req = { level = 12, str = 23, }, } itemBases["Wrapped Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 79, }, + type = "Armour", req = { level = 16, str = 30, }, } itemBases["Spired Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 116, }, + type = "Armour", req = { level = 27, str = 50, }, } itemBases["Elite Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { str_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 136, }, + type = "Armour", req = { level = 33, str = 61, }, } itemBases["Warrior Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { str_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 146, }, + type = "Armour", req = { level = 36, str = 66, }, } itemBases["Commander Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 176, }, + type = "Armour", req = { level = 45, str = 83, }, } itemBases["Fierce Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 196, }, + type = "Armour", req = { level = 51, str = 94, }, } itemBases["Dueling Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 200, }, + type = "Armour", req = { level = 52, str = 95, }, } itemBases["Goliath Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 216, }, + type = "Armour", req = { level = 57, str = 104, }, } itemBases["Guardian Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 243, }, + type = "Armour", req = { level = 65, str = 118, }, } itemBases["Shabby Hood"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, dex_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 19, }, + type = "Evasion", req = { }, } itemBases["Felt Cap"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, dex_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 48, }, + type = "Evasion", req = { level = 10, dex = 20, }, } itemBases["Lace Hood"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, dex_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 67, }, + type = "Evasion", req = { level = 16, dex = 30, }, } itemBases["Swathed Cap"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, dex_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 98, }, + type = "Evasion", req = { level = 26, dex = 49, }, } itemBases["Hunter Hood"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { dex_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 121, }, + type = "Evasion", req = { level = 33, dex = 61, }, } itemBases["Viper Cap"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { dex_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 136, }, + type = "Evasion", req = { level = 38, dex = 70, }, } itemBases["Corsair Cap"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 158, }, + type = "Evasion", req = { level = 45, dex = 83, }, } itemBases["Leatherbound Hood"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 177, }, + type = "Evasion", req = { level = 51, dex = 94, }, } itemBases["Velvet Cap"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 181, }, + type = "Evasion", req = { level = 52, dex = 95, }, } itemBases["Covert Hood"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 193, }, + type = "Evasion", req = { level = 56, dex = 102, }, } itemBases["Armoured Cap"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 222, }, + type = "Evasion", req = { level = 65, dex = 118, }, } itemBases["Twig Circlet"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, int_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 19, }, + type = "EnergyShield", req = { }, } itemBases["Wicker Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, int_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 28, }, + type = "EnergyShield", req = { level = 10, int = 20, }, } itemBases["Beaded Circlet"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, int_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 34, }, + type = "EnergyShield", req = { level = 16, int = 30, }, } itemBases["Chain Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, int_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 44, }, + type = "EnergyShield", req = { level = 26, int = 49, }, } itemBases["Feathered Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { int_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 51, }, + type = "EnergyShield", req = { level = 33, int = 61, }, } itemBases["Gold Circlet"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { int_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 58, }, + type = "EnergyShield", req = { level = 40, int = 74, }, } itemBases["Coral Circlet"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 63, }, + type = "EnergyShield", req = { level = 45, int = 83, }, } itemBases["Jade Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 69, }, + type = "EnergyShield", req = { level = 50, int = 92, }, } itemBases["Noble Circlet"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 71, }, + type = "EnergyShield", req = { level = 52, int = 95, }, } itemBases["Twilight Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 77, }, + type = "EnergyShield", req = { level = 58, int = 106, }, } itemBases["Magus Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 84, }, + type = "EnergyShield", req = { level = 65, int = 118, }, } itemBases["Brimmed Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 23, Evasion = 18, }, + type = "Armour/Evasion", req = { level = 5, str = 7, dex = 7, }, } itemBases["Guarded Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 34, Evasion = 28, }, + type = "Armour/Evasion", req = { level = 11, str = 13, dex = 13, }, } itemBases["Visored Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 44, Evasion = 37, }, + type = "Armour/Evasion", req = { level = 16, str = 18, dex = 18, }, } itemBases["Cowled Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 62, Evasion = 54, }, + type = "Armour/Evasion", req = { level = 26, str = 27, dex = 27, }, } itemBases["Shielded Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 75, Evasion = 66, }, + type = "Armour/Evasion", req = { level = 33, str = 34, dex = 34, }, } itemBases["Closed Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 97, Evasion = 87, }, + type = "Armour/Evasion", req = { level = 45, str = 46, dex = 46, }, } itemBases["Decorated Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 110, Evasion = 99, }, + type = "Armour/Evasion", req = { level = 52, str = 53, dex = 53, }, } itemBases["Gallant Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 134, Evasion = 122, }, + type = "Armour/Evasion", req = { level = 65, str = 65, dex = 65, }, } itemBases["Iron Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 23, EnergyShield = 12, }, + type = "Armour/Energy Shield", req = { level = 5, str = 7, int = 7, }, } itemBases["Horned Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 33, EnergyShield = 15, }, + type = "Armour/Energy Shield", req = { level = 10, str = 12, int = 12, }, } itemBases["Cultist Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 44, EnergyShield = 19, }, + type = "Armour/Energy Shield", req = { level = 16, str = 18, int = 18, }, } itemBases["Martyr Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, helmet = true, armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 66, EnergyShield = 25, }, + type = "Armour/Energy Shield", req = { level = 28, str = 30, int = 30, }, } itemBases["Heavy Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { str_int_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, implicitModTypes = { }, armour = { Armour = 75, EnergyShield = 28, }, + type = "Armour/Energy Shield", req = { level = 33, str = 34, int = 34, }, } itemBases["Spiritbone Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 97, EnergyShield = 35, }, + type = "Armour/Energy Shield", req = { level = 45, str = 46, int = 46, }, } itemBases["Lavish Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 110, EnergyShield = 39, }, + type = "Armour/Energy Shield", req = { level = 52, str = 53, int = 53, }, } itemBases["Templar Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 134, EnergyShield = 46, }, + type = "Armour/Energy Shield", req = { level = 65, str = 65, int = 65, }, } itemBases["Hewn Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, helmet = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 18, EnergyShield = 12, }, + type = "Evasion/Energy Shield", req = { level = 5, dex = 7, int = 7, }, } itemBases["Face Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, helmet = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 26, EnergyShield = 15, }, + type = "Evasion/Energy Shield", req = { level = 10, dex = 12, int = 12, }, } itemBases["Hooded Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, helmet = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 37, EnergyShield = 19, }, + type = "Evasion/Energy Shield", req = { level = 16, dex = 18, int = 18, }, } itemBases["Veiled Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, helmet = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 58, EnergyShield = 25, }, + type = "Evasion/Energy Shield", req = { level = 28, dex = 30, int = 30, }, } itemBases["Tribal Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { vaal_basetype = true, helmet = true, armour = true, default = true, dex_int_armour = true, }, implicitModTypes = { }, armour = { Evasion = 66, EnergyShield = 28, }, + type = "Evasion/Energy Shield", req = { level = 33, dex = 34, int = 34, }, } itemBases["Solid Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 87, EnergyShield = 35, }, + type = "Evasion/Energy Shield", req = { level = 45, dex = 46, int = 46, }, } itemBases["Shaded Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 99, EnergyShield = 39, }, + type = "Evasion/Energy Shield", req = { level = 52, dex = 53, int = 53, }, } itemBases["Death Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 122, EnergyShield = 46, }, + type = "Evasion/Energy Shield", req = { level = 65, dex = 65, int = 65, }, } itemBases["Grand Visage"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 88, Evasion = 80, EnergyShield = 30, }, + type = "Armour/Evasion/Energy Shield", req = { level = 65, str = 46, dex = 46, int = 46, }, } itemBases["Advanced Rusted Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 176, }, + type = "Armour", req = { level = 45, str = 83, }, } itemBases["Advanced Soldier Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 186, }, + type = "Armour", req = { level = 48, str = 88, }, } itemBases["Advanced Wrapped Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 196, }, + type = "Armour", req = { level = 51, str = 94, }, } itemBases["Advanced Spired Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 210, }, + type = "Armour", req = { level = 55, str = 101, }, } itemBases["Advanced Elite Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 223, }, + type = "Armour", req = { level = 59, str = 108, }, } itemBases["Advanced Shabby Hood"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 158, }, + type = "Evasion", req = { level = 45, dex = 83, }, } itemBases["Advanced Felt Cap"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 168, }, + type = "Evasion", req = { level = 48, dex = 88, }, } itemBases["Advanced Lace Hood"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 177, }, + type = "Evasion", req = { level = 51, dex = 94, }, } itemBases["Advanced Swathed Cap"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 190, }, + type = "Evasion", req = { level = 55, dex = 101, }, } itemBases["Advanced Hunter Hood"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 203, }, + type = "Evasion", req = { level = 59, dex = 108, }, } itemBases["Advanced Twig Circlet"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 63, }, + type = "EnergyShield", req = { level = 45, int = 83, }, } itemBases["Advanced Wicker Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 67, }, + type = "EnergyShield", req = { level = 48, int = 88, }, } itemBases["Advanced Beaded Circlet"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 70, }, + type = "EnergyShield", req = { level = 51, int = 94, }, } itemBases["Advanced Chain Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 74, }, + type = "EnergyShield", req = { level = 55, int = 101, }, } itemBases["Advanced Feathered Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 78, }, + type = "EnergyShield", req = { level = 59, int = 108, }, } itemBases["Advanced Brimmed Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 97, Evasion = 87, }, + type = "Armour/Evasion", req = { level = 45, str = 46, dex = 46, }, } itemBases["Advanced Guarded Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 102, Evasion = 92, }, + type = "Armour/Evasion", req = { level = 48, str = 49, dex = 49, }, } itemBases["Advanced Visored Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 108, Evasion = 98, }, + type = "Armour/Evasion", req = { level = 51, str = 52, dex = 52, }, } itemBases["Advanced Cowled Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 115, Evasion = 105, }, + type = "Armour/Evasion", req = { level = 55, str = 55, dex = 55, }, } itemBases["Advanced Shielded Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 123, Evasion = 111, }, + type = "Armour/Evasion", req = { level = 59, str = 59, dex = 59, }, } itemBases["Advanced Iron Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 97, EnergyShield = 35, }, + type = "Armour/Energy Shield", req = { level = 45, str = 46, int = 46, }, } itemBases["Advanced Horned Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 102, EnergyShield = 37, }, + type = "Armour/Energy Shield", req = { level = 48, str = 49, int = 49, }, } itemBases["Advanced Cultist Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 108, EnergyShield = 38, }, + type = "Armour/Energy Shield", req = { level = 51, str = 52, int = 52, }, } itemBases["Advanced Martyr Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 115, EnergyShield = 41, }, + type = "Armour/Energy Shield", req = { level = 55, str = 55, int = 55, }, } itemBases["Advanced Heavy Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 123, EnergyShield = 43, }, + type = "Armour/Energy Shield", req = { level = 59, str = 59, int = 59, }, } itemBases["Advanced Hewn Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 87, EnergyShield = 35, }, + type = "Evasion/Energy Shield", req = { level = 45, dex = 46, int = 46, }, } itemBases["Advanced Face Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 92, EnergyShield = 37, }, + type = "Evasion/Energy Shield", req = { level = 48, dex = 49, int = 49, }, } itemBases["Advanced Hooded Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 98, EnergyShield = 38, }, + type = "Evasion/Energy Shield", req = { level = 51, dex = 52, int = 52, }, } itemBases["Advanced Veiled Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 105, EnergyShield = 41, }, + type = "Evasion/Energy Shield", req = { level = 55, dex = 55, int = 55, }, } itemBases["Advanced Tribal Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 111, EnergyShield = 43, }, + type = "Evasion/Energy Shield", req = { level = 59, dex = 59, int = 59, }, } itemBases["Expert Soldier Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 243, }, + type = "Armour", req = { level = 65, str = 118, }, } itemBases["Expert Spired Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 267, }, + type = "Armour", req = { level = 70, str = 129, }, } itemBases["Expert Elite Greathelm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 292, }, + type = "Armour", req = { level = 75, str = 139, }, } itemBases["Expert Felt Cap"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 222, }, + type = "Evasion", req = { level = 65, dex = 118, }, } itemBases["Expert Swathed Cap"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 244, }, + type = "Evasion", req = { level = 70, dex = 129, }, } itemBases["Expert Hunter Hood"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 266, }, + type = "Evasion", req = { level = 75, dex = 139, }, } itemBases["Expert Wicker Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 84, }, + type = "EnergyShield", req = { level = 65, int = 118, }, } itemBases["Expert Chain Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 92, }, + type = "EnergyShield", req = { level = 70, int = 129, }, } itemBases["Expert Feathered Tiara"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, implicitModTypes = { }, armour = { EnergyShield = 101, }, + type = "EnergyShield", req = { level = 75, int = 139, }, } itemBases["Expert Guarded Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 134, Evasion = 122, }, + type = "Armour/Evasion", req = { level = 65, str = 65, dex = 65, }, } itemBases["Expert Cowled Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 147, Evasion = 134, }, + type = "Armour/Evasion", req = { level = 70, str = 70, dex = 70, }, } itemBases["Expert Shielded Helm"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 160, Evasion = 146, }, + type = "Armour/Evasion", req = { level = 75, str = 76, dex = 76, }, } itemBases["Expert Horned Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 134, EnergyShield = 46, }, + type = "Armour/Energy Shield", req = { level = 65, str = 65, int = 65, }, } itemBases["Expert Martyr Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 147, EnergyShield = 51, }, + type = "Armour/Energy Shield", req = { level = 70, str = 70, int = 70, }, } itemBases["Expert Heavy Crown"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Armour = 160, EnergyShield = 55, }, + type = "Armour/Energy Shield", req = { level = 75, str = 76, int = 76, }, } itemBases["Expert Face Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 122, EnergyShield = 46, }, + type = "Evasion/Energy Shield", req = { level = 65, dex = 65, int = 65, }, } itemBases["Expert Veiled Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 134, EnergyShield = 51, }, + type = "Evasion/Energy Shield", req = { level = 70, dex = 70, int = 70, }, } itemBases["Expert Tribal Mask"] = { - type = "Helmet", + class = "Helmet", + category = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, implicitModTypes = { }, armour = { Evasion = 146, EnergyShield = 55, }, + type = "Evasion/Energy Shield", req = { level = 75, dex = 76, int = 76, }, } diff --git a/src/Data/Bases/jewel.lua b/src/Data/Bases/jewel.lua index 25f4931c1a..86eb6b7755 100644 --- a/src/Data/Bases/jewel.lua +++ b/src/Data/Bases/jewel.lua @@ -3,62 +3,66 @@ local itemBases = ... itemBases["Ruby"] = { - type = "Jewel", + class = "Jewel", + category = "Jewel", tags = { strjewel = true, jewel = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Emerald"] = { - type = "Jewel", + class = "Jewel", + category = "Jewel", tags = { dexjewel = true, jewel = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Sapphire"] = { - type = "Jewel", + class = "Jewel", + category = "Jewel", tags = { jewel = true, intjewel = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Diamond"] = { - type = "Jewel", + class = "Jewel", + category = "Jewel", tags = { jewel = true, not_for_sale = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Time-Lost Ruby"] = { - type = "Jewel", - subType = "Radius", + class = "Jewel", + category = "Jewel", tags = { str_radius_jewel = true, not_for_sale = true, jewel = true, radius_jewel = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Time-Lost Emerald"] = { - type = "Jewel", - subType = "Radius", + class = "Jewel", + category = "Jewel", tags = { not_for_sale = true, jewel = true, dex_radius_jewel = true, radius_jewel = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Time-Lost Sapphire"] = { - type = "Jewel", - subType = "Radius", + class = "Jewel", + category = "Jewel", tags = { not_for_sale = true, radius_jewel = true, jewel = true, int_radius_jewel = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Time-Lost Diamond"] = { - type = "Jewel", - subType = "Radius", + class = "Jewel", + category = "Jewel", tags = { not_for_sale = true, jewel = true, radius_jewel = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Timeless Jewel"] = { - type = "Jewel", - subType = "Timeless", + class = "Jewel", + category = "Jewel", tags = { dexjewel = true, not_for_sale = true, strjewel = true, jewel = true, default = true, intjewel = true, }, implicitModTypes = { }, req = { }, diff --git a/src/Data/Bases/mace.lua b/src/Data/Bases/mace.lua index a7f9454917..eff90b784c 100644 --- a/src/Data/Bases/mace.lua +++ b/src/Data/Bases/mace.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Wooden Club"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -12,7 +13,8 @@ itemBases["Wooden Club"] = { req = { }, } itemBases["Smithing Hammer"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -21,7 +23,8 @@ itemBases["Smithing Hammer"] = { req = { str = 11, }, } itemBases["Slim Mace"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -30,7 +33,8 @@ itemBases["Slim Mace"] = { req = { level = 10, str = 25, }, } itemBases["Spiked Club"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -39,7 +43,8 @@ itemBases["Spiked Club"] = { req = { level = 16, str = 38, }, } itemBases["Warpick"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -49,7 +54,8 @@ itemBases["Warpick"] = { req = { level = 22, str = 52, }, } itemBases["Plated Mace"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -58,7 +64,8 @@ itemBases["Plated Mace"] = { req = { level = 26, str = 61, }, } itemBases["Brigand Mace"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -67,7 +74,8 @@ itemBases["Brigand Mace"] = { req = { level = 33, str = 76, }, } itemBases["Construct Hammer"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -77,7 +85,8 @@ itemBases["Construct Hammer"] = { req = { level = 36, str = 83, }, } itemBases["Morning Star"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -86,7 +95,8 @@ itemBases["Morning Star"] = { req = { level = 45, str = 104, }, } itemBases["Jade Club"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -96,7 +106,8 @@ itemBases["Jade Club"] = { req = { level = 48, str = 110, }, } itemBases["Lumen Mace"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -105,7 +116,8 @@ itemBases["Lumen Mace"] = { req = { level = 52, str = 119, }, } itemBases["Execratus Hammer"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -114,7 +126,8 @@ itemBases["Execratus Hammer"] = { req = { level = 55, str = 126, }, } itemBases["Torment Club"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -123,7 +136,8 @@ itemBases["Torment Club"] = { req = { level = 65, str = 148, }, } itemBases["Advanced Smithing Hammer"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -132,7 +146,8 @@ itemBases["Advanced Smithing Hammer"] = { req = { level = 45, str = 104, }, } itemBases["Advanced Slim Mace"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -141,7 +156,8 @@ itemBases["Advanced Slim Mace"] = { req = { level = 48, str = 110, }, } itemBases["Advanced Warpick"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -151,7 +167,8 @@ itemBases["Advanced Warpick"] = { req = { level = 51, str = 117, }, } itemBases["Advanced Plated Mace"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -160,7 +177,8 @@ itemBases["Advanced Plated Mace"] = { req = { level = 55, str = 126, }, } itemBases["Advanced Brigand Mace"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -169,7 +187,8 @@ itemBases["Advanced Brigand Mace"] = { req = { level = 59, str = 135, }, } itemBases["Advanced Construct Hammer"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -179,7 +198,8 @@ itemBases["Advanced Construct Hammer"] = { req = { level = 62, str = 142, }, } itemBases["Expert Slim Mace"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -188,7 +208,8 @@ itemBases["Expert Slim Mace"] = { req = { level = 67, str = 174, }, } itemBases["Expert Plated Mace"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -197,7 +218,8 @@ itemBases["Expert Plated Mace"] = { req = { level = 72, str = 193, }, } itemBases["Expert Smithing Hammer"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -206,7 +228,8 @@ itemBases["Expert Smithing Hammer"] = { req = { level = 77, str = 212, }, } itemBases["Expert Warpick"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -216,7 +239,8 @@ itemBases["Expert Warpick"] = { req = { level = 78, str = 212, }, } itemBases["Expert Construct Hammer"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -226,7 +250,8 @@ itemBases["Expert Construct Hammer"] = { req = { level = 79, str = 212, }, } itemBases["Expert Brigand Mace"] = { - type = "One Handed Mace", + class = "One Hand Mace", + category = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -236,7 +261,8 @@ itemBases["Expert Brigand Mace"] = { } itemBases["Felled Greatclub"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -245,7 +271,8 @@ itemBases["Felled Greatclub"] = { req = { }, } itemBases["Oak Greathammer"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -255,7 +282,8 @@ itemBases["Oak Greathammer"] = { req = { str = 11, }, } itemBases["Forge Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -264,7 +292,8 @@ itemBases["Forge Maul"] = { req = { level = 11, str = 27, }, } itemBases["Studded Greatclub"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -273,7 +302,8 @@ itemBases["Studded Greatclub"] = { req = { level = 16, str = 38, }, } itemBases["Cultist Greathammer"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -283,7 +313,8 @@ itemBases["Cultist Greathammer"] = { req = { level = 22, str = 52, }, } itemBases["Temple Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -292,7 +323,8 @@ itemBases["Temple Maul"] = { req = { level = 28, str = 65, }, } itemBases["Leaden Greathammer"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -301,7 +333,8 @@ itemBases["Leaden Greathammer"] = { req = { level = 33, str = 76, }, } itemBases["Crumbling Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -311,7 +344,8 @@ itemBases["Crumbling Maul"] = { req = { level = 38, str = 88, }, } itemBases["Pointed Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -320,7 +354,8 @@ itemBases["Pointed Maul"] = { req = { level = 45, str = 104, }, } itemBases["Totemic Greatclub"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -330,7 +365,8 @@ itemBases["Totemic Greatclub"] = { req = { level = 50, str = 115, }, } itemBases["Greatmace"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -339,7 +375,8 @@ itemBases["Greatmace"] = { req = { level = 52, str = 119, }, } itemBases["Precise Greathammer"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -348,7 +385,8 @@ itemBases["Precise Greathammer"] = { req = { level = 54, str = 124, }, } itemBases["Giant Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -357,7 +395,8 @@ itemBases["Giant Maul"] = { req = { level = 65, str = 148, }, } itemBases["Advanced Oak Greathammer"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -367,7 +406,8 @@ itemBases["Advanced Oak Greathammer"] = { req = { level = 45, str = 104, }, } itemBases["Advanced Forge Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -376,7 +416,8 @@ itemBases["Advanced Forge Maul"] = { req = { level = 48, str = 110, }, } itemBases["Advanced Cultist Greathammer"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -386,7 +427,8 @@ itemBases["Advanced Cultist Greathammer"] = { req = { level = 51, str = 117, }, } itemBases["Advanced Temple Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -395,7 +437,8 @@ itemBases["Advanced Temple Maul"] = { req = { level = 55, str = 126, }, } itemBases["Advanced Leaden Greathammer"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -404,7 +447,8 @@ itemBases["Advanced Leaden Greathammer"] = { req = { level = 59, str = 135, }, } itemBases["Advanced Crumbling Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -414,7 +458,8 @@ itemBases["Advanced Crumbling Maul"] = { req = { level = 62, str = 142, }, } itemBases["Expert Forge Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -423,7 +468,8 @@ itemBases["Expert Forge Maul"] = { req = { level = 67, str = 174, }, } itemBases["Expert Temple Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -432,7 +478,8 @@ itemBases["Expert Temple Maul"] = { req = { level = 72, str = 193, }, } itemBases["Expert Oak Greathammer"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -442,7 +489,8 @@ itemBases["Expert Oak Greathammer"] = { req = { level = 77, str = 212, }, } itemBases["Expert Cultist Greathammer"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -452,7 +500,8 @@ itemBases["Expert Cultist Greathammer"] = { req = { level = 78, str = 212, }, } itemBases["Expert Crumbling Maul"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -462,7 +511,8 @@ itemBases["Expert Crumbling Maul"] = { req = { level = 79, str = 212, }, } itemBases["Expert Leaden Greathammer"] = { - type = "Two Handed Mace", + class = "Two Hand Mace", + category = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, diff --git a/src/Data/Bases/quiver.lua b/src/Data/Bases/quiver.lua index 9ca56e31f5..36b9985ccb 100644 --- a/src/Data/Bases/quiver.lua +++ b/src/Data/Bases/quiver.lua @@ -3,77 +3,88 @@ local itemBases = ... itemBases["Broadhead Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "Adds 1 to 3 Physical Damage to Attacks", implicitModTypes = { { "physical_damage", "damage", "physical", "attack" }, }, req = { }, } itemBases["Fire Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "Adds 3 to 5 Fire damage to Attacks", implicitModTypes = { { "elemental_damage", "damage", "elemental", "fire", "attack" }, }, req = { level = 8, }, } itemBases["Sacral Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "Gain (2-3) Life per Enemy Hit with Attacks", implicitModTypes = { { "resource", "life", "attack" }, }, req = { level = 16, }, } itemBases["Two-Point Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "(20-30)% increased Accuracy Rating", implicitModTypes = { { "attack" }, }, req = { level = 24, }, } itemBases["Blunt Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "(20-30)% reduced Enemy Stun Threshold", implicitModTypes = { { }, }, req = { level = 32, }, } itemBases["Toxic Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "(10-15)% chance to Poison on Hit with Attacks", implicitModTypes = { { "poison", "chaos", "attack", "ailment" }, }, req = { level = 39, }, } itemBases["Serrated Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "Attacks have (10-15)% chance to cause Bleeding", implicitModTypes = { { "bleed", "physical", "attack", "ailment" }, }, req = { level = 44, }, } itemBases["Primed Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "(7-10)% increased Attack Speed", implicitModTypes = { { "attack", "speed" }, }, req = { level = 51, }, } itemBases["Penetrating Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "100% chance to Pierce an Enemy", implicitModTypes = { { }, }, req = { level = 55, }, } itemBases["Volant Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "(20-30)% increased Arrow Speed", implicitModTypes = { { "attack", "speed" }, }, req = { level = 60, }, } itemBases["Visceral Quiver"] = { - type = "Quiver", + class = "Quiver", + category = "Quiver", tags = { quiver = true, default = true, }, implicit = "(20-30)% increased Critical Hit Chance for Attacks", implicitModTypes = { { "attack", "critical" }, }, diff --git a/src/Data/Bases/ring.lua b/src/Data/Bases/ring.lua index afd9c944dc..a746b1fe0d 100644 --- a/src/Data/Bases/ring.lua +++ b/src/Data/Bases/ring.lua @@ -3,97 +3,111 @@ local itemBases = ... itemBases["Golden Hoop"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, demigods = true, not_for_sale = true, default = true, }, implicit = "+(8-12) to all Attributes", implicitModTypes = { { "attribute" }, }, req = { level = 12, }, } itemBases["Iron Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "Adds 1 to 4 Physical Damage to Attacks", implicitModTypes = { { "physical_damage", "damage", "physical", "attack" }, }, req = { }, } itemBases["Lazuli Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "+(20-30) to maximum Mana", implicitModTypes = { { "resource", "mana" }, }, req = { }, } itemBases["Ruby Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "+(20-30)% to Fire Resistance", implicitModTypes = { { "elemental", "fire", "resistance" }, }, req = { level = 8, }, } itemBases["Sapphire Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "+(20-30)% to Cold Resistance", implicitModTypes = { { "elemental", "cold", "resistance" }, }, req = { level = 12, }, } itemBases["Topaz Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "+(20-30)% to Lightning Resistance", implicitModTypes = { { "elemental", "lightning", "resistance" }, }, req = { level = 16, }, } itemBases["Amethyst Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "+(7-13)% to Chaos Resistance", implicitModTypes = { { "chaos", "resistance" }, }, req = { level = 20, }, } itemBases["Emerald Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "+(120-160) to Accuracy Rating", implicitModTypes = { { "attack" }, }, req = { level = 26, }, } itemBases["Pearl Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "(7-10)% increased Cast Speed", implicitModTypes = { { "caster", "speed" }, }, req = { level = 32, }, } itemBases["Prismatic Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "+(7-10)% to all Elemental Resistances", implicitModTypes = { { "elemental", "fire", "cold", "lightning", "resistance" }, }, req = { level = 35, }, } itemBases["Gold Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "(6-15)% increased Rarity of Items found", implicitModTypes = { { }, }, req = { level = 40, }, } itemBases["Unset Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "Grants 1 additional Skill Slot", implicitModTypes = { { }, }, req = { level = 44, }, } itemBases["Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Breach Ring"] = { - type = "Ring", + class = "Ring", + category = "Ring", tags = { ring = true, default = true, }, implicit = "Maximum Quality is 50%", implicitModTypes = { { }, }, diff --git a/src/Data/Bases/sceptre.lua b/src/Data/Bases/sceptre.lua index 6be178020d..b3b7adb8d7 100644 --- a/src/Data/Bases/sceptre.lua +++ b/src/Data/Bases/sceptre.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Rattling Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -12,7 +13,8 @@ itemBases["Rattling Sceptre"] = { req = { }, } itemBases["Stoic Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -21,7 +23,8 @@ itemBases["Stoic Sceptre"] = { req = { }, } itemBases["Lupine Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -30,7 +33,8 @@ itemBases["Lupine Sceptre"] = { req = { }, } itemBases["Omen Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -39,7 +43,8 @@ itemBases["Omen Sceptre"] = { req = { }, } itemBases["Ochre Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -48,7 +53,8 @@ itemBases["Ochre Sceptre"] = { req = { }, } itemBases["Shrine Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -57,7 +63,8 @@ itemBases["Shrine Sceptre"] = { req = { }, } itemBases["Shrine Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -66,7 +73,8 @@ itemBases["Shrine Sceptre"] = { req = { }, } itemBases["Shrine Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -75,7 +83,8 @@ itemBases["Shrine Sceptre"] = { req = { }, } itemBases["Devouring Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -84,7 +93,8 @@ itemBases["Devouring Sceptre"] = { req = { }, } itemBases["Clasped Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -93,7 +103,8 @@ itemBases["Clasped Sceptre"] = { req = { }, } itemBases["Devotional Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -102,7 +113,8 @@ itemBases["Devotional Sceptre"] = { req = { }, } itemBases["Wrath Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -111,7 +123,8 @@ itemBases["Wrath Sceptre"] = { req = { }, } itemBases["Aromatic Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -120,7 +133,8 @@ itemBases["Aromatic Sceptre"] = { req = { }, } itemBases["Pious Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -129,7 +143,8 @@ itemBases["Pious Sceptre"] = { req = { }, } itemBases["Hallowed Sceptre"] = { - type = "Sceptre", + class = "Sceptre", + category = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, diff --git a/src/Data/Bases/shield.lua b/src/Data/Bases/shield.lua index f1b9a36dba..069584c95b 100644 --- a/src/Data/Bases/shield.lua +++ b/src/Data/Bases/shield.lua @@ -4,7 +4,8 @@ local itemBases = ... itemBases["Golden Flame"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { not_for_sale = true, demigods = true, armour = true, default = true, shield = true, }, @@ -14,820 +15,988 @@ itemBases["Golden Flame"] = { req = { level = 15, }, } itemBases["Splintered Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, ezomyte_basetype = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 18, MovementPenalty = 0.03, }, + type = "Armour", req = { }, } itemBases["Painted Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, ezomyte_basetype = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 29, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 6, str = 13, }, } itemBases["Braced Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, ezomyte_basetype = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 41, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 12, str = 23, }, } itemBases["Barricade Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 50, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 16, str = 30, }, } itemBases["Effigial Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 60, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 21, str = 40, }, } itemBases["Rampart Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 75, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 28, str = 52, }, } itemBases["Heraldric Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, vaal_basetype = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 85, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 33, str = 61, }, } itemBases["Stone Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, vaal_basetype = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 91, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 36, str = 66, }, } itemBases["Crucible Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 110, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 45, str = 83, }, } itemBases["Ancestor Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 121, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 50, str = 92, }, } itemBases["Phalanx Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 125, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 52, str = 95, }, } itemBases["Defiant Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 137, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 58, str = 106, }, } itemBases["Blacksteel Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 152, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 65, str = 118, }, } itemBases["Hardwood Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 10, Evasion = 7, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { }, } itemBases["Pelage Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 18, Evasion = 14, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 8, str = 10, dex = 10, }, } itemBases["Studded Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 27, Evasion = 23, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 16, str = 18, dex = 18, }, } itemBases["Crescent Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 39, Evasion = 34, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 26, str = 27, dex = 27, }, } itemBases["Chiseled Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, vaal_basetype = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 47, Evasion = 41, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 33, str = 34, dex = 34, }, } itemBases["Feathered Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, vaal_basetype = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 51, Evasion = 46, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 37, str = 38, dex = 38, }, } itemBases["Stratified Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 61, Evasion = 54, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 45, str = 46, dex = 46, }, } itemBases["Carved Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 63, Evasion = 57, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 47, str = 48, dex = 48, }, } itemBases["Mosaic Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 69, Evasion = 62, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 52, str = 53, dex = 53, }, } itemBases["Aureate Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 74, Evasion = 68, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 57, str = 58, dex = 58, }, } itemBases["Grand Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 84, Evasion = 76, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 65, str = 65, dex = 65, }, } itemBases["Blazon Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 10, EnergyShield = 6, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { }, } itemBases["Sigil Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 17, EnergyShield = 8, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 7, str = 10, int = 10, }, } itemBases["Emblem Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 27, EnergyShield = 12, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 16, str = 18, int = 18, }, } itemBases["Jingling Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 41, EnergyShield = 16, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 28, str = 30, int = 30, }, } itemBases["Sectarian Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, vaal_basetype = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 47, EnergyShield = 18, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 33, str = 34, int = 34, }, } itemBases["Omen Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, vaal_basetype = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 50, EnergyShield = 19, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 36, str = 37, int = 37, }, } itemBases["Wayward Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 61, EnergyShield = 22, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 45, str = 46, int = 46, }, } itemBases["Seer Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 65, EnergyShield = 23, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 49, str = 50, int = 50, }, } itemBases["Stoic Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 69, EnergyShield = 24, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 52, str = 53, int = 53, }, } itemBases["Empyreal Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 74, EnergyShield = 26, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 57, str = 58, int = 58, }, } itemBases["Deified Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 84, EnergyShield = 29, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 65, str = 65, int = 65, }, } itemBases["Leather Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, ezomyte_basetype = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 12, }, + type = "Evasion", req = { }, } itemBases["Wooden Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, ezomyte_basetype = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 20, }, + type = "Evasion", req = { level = 5, dex = 11, }, } itemBases["Plated Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, ezomyte_basetype = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 32, }, + type = "Evasion", req = { level = 11, dex = 22, }, } itemBases["Iron Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 42, }, + type = "Evasion", req = { level = 16, dex = 30, }, } itemBases["Ridged Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 54, }, + type = "Evasion", req = { level = 22, dex = 42, }, } itemBases["Spiked Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 62, }, + type = "Evasion", req = { level = 26, dex = 49, }, } itemBases["Ringed Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, vaal_basetype = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 75, }, + type = "Evasion", req = { level = 33, dex = 61, }, } itemBases["Edged Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, vaal_basetype = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 87, }, + type = "Evasion", req = { level = 39, dex = 72, }, } itemBases["Laminate Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 99, }, + type = "Evasion", req = { level = 45, dex = 83, }, } itemBases["Pearl Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 105, }, + type = "Evasion", req = { level = 48, dex = 88, }, } itemBases["Ornate Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 113, }, + type = "Evasion", req = { level = 52, dex = 95, }, } itemBases["Array Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 119, }, + type = "Evasion", req = { level = 55, dex = 101, }, } itemBases["Aegis Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 139, }, + type = "Evasion", req = { level = 65, dex = 118, }, } itemBases["Advanced Painted Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 110, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 45, str = 83, }, } itemBases["Advanced Braced Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 116, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 48, str = 88, }, } itemBases["Advanced Effigial Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 123, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 51, str = 94, }, } itemBases["Advanced Rampart Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 131, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 55, str = 101, }, } itemBases["Advanced Heraldric Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 139, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 59, str = 108, }, } itemBases["Advanced Stone Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 144, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 61, str = 112, }, } itemBases["Advanced Hardwood Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 61, Evasion = 54, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 45, str = 46, dex = 46, }, } itemBases["Advanced Pelage Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 64, Evasion = 58, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 48, str = 49, dex = 49, }, } itemBases["Advanced Studded Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 67, Evasion = 61, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 51, str = 52, dex = 52, }, } itemBases["Advanced Crescent Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 72, Evasion = 65, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 55, str = 55, dex = 55, }, } itemBases["Advanced Chiseled Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 77, Evasion = 70, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 59, str = 59, dex = 59, }, } itemBases["Advanced Feathered Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 80, Evasion = 73, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 62, str = 62, dex = 62, }, } itemBases["Advanced Blazon Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 61, EnergyShield = 22, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 45, str = 46, int = 46, }, } itemBases["Advanced Sigil Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 64, EnergyShield = 23, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 48, str = 49, int = 49, }, } itemBases["Advanced Emblem Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 67, EnergyShield = 24, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 51, str = 52, int = 52, }, } itemBases["Advanced Jingling Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 72, EnergyShield = 25, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 55, str = 55, int = 55, }, } itemBases["Advanced Sectarian Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 77, EnergyShield = 27, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 59, str = 59, int = 59, }, } itemBases["Advanced Omen Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 80, EnergyShield = 28, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 62, str = 62, int = 62, }, } itemBases["Advanced Wooden Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 99, }, + type = "Evasion", req = { level = 45, dex = 83, }, } itemBases["Advanced Plated Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 105, }, + type = "Evasion", req = { level = 48, dex = 88, }, } itemBases["Advanced Ridged Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 111, }, + type = "Evasion", req = { level = 51, dex = 94, }, } itemBases["Advanced Spiked Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 119, }, + type = "Evasion", req = { level = 55, dex = 101, }, } itemBases["Advanced Ringed Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 127, }, + type = "Evasion", req = { level = 59, dex = 108, }, } itemBases["Advanced Edged Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 131, }, + type = "Evasion", req = { level = 61, dex = 112, }, } itemBases["Expert Braced Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 152, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 65, str = 118, }, } itemBases["Expert Rampart Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 167, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 70, str = 129, }, } itemBases["Expert Stone Tower Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 26, Armour = 182, MovementPenalty = 0.03, }, + type = "Armour", req = { level = 75, str = 139, }, } itemBases["Expert Pelage Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 84, Evasion = 76, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 65, str = 65, dex = 65, }, } itemBases["Expert Crescent Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 92, Evasion = 84, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 70, str = 70, dex = 70, }, } itemBases["Expert Feathered Targe"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 100, Evasion = 91, MovementPenalty = 0.015, }, + type = "Armour/Evasion", req = { level = 75, str = 76, dex = 76, }, } itemBases["Expert Sigil Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 84, EnergyShield = 29, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 65, str = 65, int = 65, }, } itemBases["Expert Jingling Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 92, EnergyShield = 32, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 70, str = 70, int = 70, }, } itemBases["Expert Omen Crest Shield"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, implicit = "Grants Skill: Level (1-20) Raise Shield", implicitModTypes = { }, armour = { BlockChance = 25, Armour = 100, EnergyShield = 35, MovementPenalty = 0.015, }, + type = "Armour/Energy Shield", req = { level = 75, str = 76, int = 76, }, } itemBases["Expert Plated Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 139, }, + type = "Evasion", req = { level = 65, dex = 118, }, } itemBases["Expert Spiked Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 152, }, + type = "Evasion", req = { level = 70, dex = 129, }, } itemBases["Expert Edged Buckler"] = { - type = "Shield", + class = "Shield", + category = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, implicitModTypes = { }, armour = { BlockChance = 24, Evasion = 166, }, + type = "Evasion", req = { level = 75, dex = 139, }, } diff --git a/src/Data/Bases/soulcore.lua b/src/Data/Bases/soulcore.lua index 59951e312c..52633a9683 100644 --- a/src/Data/Bases/soulcore.lua +++ b/src/Data/Bases/soulcore.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Soul Core of Tacati"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier1 = true, default = true, }, implicitModTypes = { }, @@ -11,7 +12,8 @@ itemBases["Soul Core of Tacati"] = { req = { level = 35, }, } itemBases["Soul Core of Opiloti"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier1 = true, default = true, }, implicitModTypes = { }, @@ -19,7 +21,8 @@ itemBases["Soul Core of Opiloti"] = { req = { level = 35, }, } itemBases["Soul Core of Jiquani"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier2 = true, default = true, }, implicitModTypes = { }, @@ -27,7 +30,8 @@ itemBases["Soul Core of Jiquani"] = { req = { level = 35, }, } itemBases["Soul Core of Zalatl"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier2 = true, default = true, }, implicitModTypes = { }, @@ -35,7 +39,8 @@ itemBases["Soul Core of Zalatl"] = { req = { level = 35, }, } itemBases["Soul Core of Citaqualotl"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier1 = true, default = true, }, implicitModTypes = { }, @@ -43,7 +48,8 @@ itemBases["Soul Core of Citaqualotl"] = { req = { level = 35, }, } itemBases["Soul Core of Puhuarte"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier3 = true, default = true, }, implicitModTypes = { }, @@ -51,7 +57,8 @@ itemBases["Soul Core of Puhuarte"] = { req = { level = 35, }, } itemBases["Soul Core of Tzamoto"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier3 = true, default = true, }, implicitModTypes = { }, @@ -59,7 +66,8 @@ itemBases["Soul Core of Tzamoto"] = { req = { level = 35, }, } itemBases["Soul Core of Xopec"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier3 = true, default = true, }, implicitModTypes = { }, @@ -67,7 +75,8 @@ itemBases["Soul Core of Xopec"] = { req = { level = 35, }, } itemBases["Soul Core of Azcapa"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier3 = true, default = true, }, implicitModTypes = { }, @@ -75,7 +84,8 @@ itemBases["Soul Core of Azcapa"] = { req = { level = 35, }, } itemBases["Soul Core of Topotante"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier1 = true, default = true, }, implicitModTypes = { }, @@ -83,7 +93,8 @@ itemBases["Soul Core of Topotante"] = { req = { level = 35, }, } itemBases["Soul Core of Quipolatl"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier2 = true, default = true, }, implicitModTypes = { }, @@ -91,7 +102,8 @@ itemBases["Soul Core of Quipolatl"] = { req = { level = 35, }, } itemBases["Soul Core of Ticaba"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier2 = true, default = true, }, implicitModTypes = { }, @@ -99,7 +111,8 @@ itemBases["Soul Core of Ticaba"] = { req = { level = 35, }, } itemBases["Soul Core of Atmohua"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier2 = true, default = true, }, implicitModTypes = { }, @@ -107,7 +120,8 @@ itemBases["Soul Core of Atmohua"] = { req = { level = 35, }, } itemBases["Soul Core of Cholotl"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier2 = true, default = true, }, implicitModTypes = { }, @@ -115,7 +129,8 @@ itemBases["Soul Core of Cholotl"] = { req = { level = 35, }, } itemBases["Soul Core of Zantipi"] = { - type = "SoulCore", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { soul_core = true, soul_core_tier2 = true, default = true, }, implicitModTypes = { }, @@ -124,7 +139,8 @@ itemBases["Soul Core of Zantipi"] = { } itemBases["Desert Rune"] = { - type = "Rune", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { default = true, }, implicitModTypes = { }, @@ -132,7 +148,8 @@ itemBases["Desert Rune"] = { req = { level = 5, }, } itemBases["Glacial Rune"] = { - type = "Rune", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { default = true, }, implicitModTypes = { }, @@ -140,7 +157,8 @@ itemBases["Glacial Rune"] = { req = { level = 5, }, } itemBases["Storm Rune"] = { - type = "Rune", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { default = true, }, implicitModTypes = { }, @@ -148,7 +166,8 @@ itemBases["Storm Rune"] = { req = { level = 5, }, } itemBases["Iron Rune"] = { - type = "Rune", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { default = true, }, implicitModTypes = { }, @@ -156,7 +175,8 @@ itemBases["Iron Rune"] = { req = { level = 5, }, } itemBases["Body Rune"] = { - type = "Rune", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { default = true, }, implicitModTypes = { }, @@ -164,7 +184,8 @@ itemBases["Body Rune"] = { req = { level = 16, }, } itemBases["Mind Rune"] = { - type = "Rune", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { default = true, }, implicitModTypes = { }, @@ -172,7 +193,8 @@ itemBases["Mind Rune"] = { req = { level = 16, }, } itemBases["Rebirth Rune"] = { - type = "Rune", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { default = true, }, implicitModTypes = { }, @@ -180,7 +202,8 @@ itemBases["Rebirth Rune"] = { req = { level = 30, }, } itemBases["Inspiration Rune"] = { - type = "Rune", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { default = true, }, implicitModTypes = { }, @@ -188,7 +211,8 @@ itemBases["Inspiration Rune"] = { req = { level = 30, }, } itemBases["Stone Rune"] = { - type = "Rune", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { default = true, }, implicitModTypes = { }, @@ -196,7 +220,8 @@ itemBases["Stone Rune"] = { req = { level = 21, }, } itemBases["Vision Rune"] = { - type = "Rune", + class = "SoulCore", + category = "SoulCore", hidden = true, tags = { default = true, }, implicitModTypes = { }, diff --git a/src/Data/Bases/spear.lua b/src/Data/Bases/spear.lua index c0ccaefd84..e142a73b8e 100644 --- a/src/Data/Bases/spear.lua +++ b/src/Data/Bases/spear.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Hardwood Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -12,7 +13,8 @@ itemBases["Hardwood Spear"] = { req = { }, } itemBases["Ironhead Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -21,7 +23,8 @@ itemBases["Ironhead Spear"] = { req = { level = 5, dex = 11, }, } itemBases["Hunting Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -31,7 +34,8 @@ itemBases["Hunting Spear"] = { req = { level = 10, str = 10, dex = 20, }, } itemBases["Winged Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -40,7 +44,8 @@ itemBases["Winged Spear"] = { req = { level = 16, str = 14, dex = 30, }, } itemBases["War Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -50,7 +55,8 @@ itemBases["War Spear"] = { req = { level = 21, str = 17, dex = 39, }, } itemBases["Forked Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -59,7 +65,8 @@ itemBases["Forked Spear"] = { req = { level = 26, str = 20, dex = 48, }, } itemBases["Barbed Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -68,7 +75,8 @@ itemBases["Barbed Spear"] = { req = { level = 33, str = 25, dex = 60, }, } itemBases["Broad Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -78,7 +86,8 @@ itemBases["Broad Spear"] = { req = { level = 40, str = 29, dex = 72, }, } itemBases["Crossblade Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -87,7 +96,8 @@ itemBases["Crossblade Spear"] = { req = { level = 45, str = 33, dex = 81, }, } itemBases["Seaglass Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -96,7 +106,8 @@ itemBases["Seaglass Spear"] = { req = { level = 51, str = 36, dex = 91, int = 65, }, } itemBases["Sword Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -105,7 +116,8 @@ itemBases["Sword Spear"] = { req = { level = 52, str = 37, dex = 93, }, } itemBases["Striking Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -114,7 +126,8 @@ itemBases["Striking Spear"] = { req = { level = 55, str = 39, dex = 98, }, } itemBases["Helix Spear"] = { - type = "Spear", + class = "Spear", + category = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, diff --git a/src/Data/Bases/staff.lua b/src/Data/Bases/staff.lua index 21c8cf90af..e201fbfa98 100644 --- a/src/Data/Bases/staff.lua +++ b/src/Data/Bases/staff.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Ashen Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { no_physical_spell_mods = true, no_lightning_spell_mods = true, no_cold_spell_mods = true, no_chaos_spell_mods = true, staff = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Firebolt", @@ -11,7 +12,8 @@ itemBases["Ashen Staff"] = { req = { }, } itemBases["Gelid Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_lightning_spell_mods = true, staff = true, no_physical_spell_mods = true, no_chaos_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Freezing Shards", @@ -19,7 +21,8 @@ itemBases["Gelid Staff"] = { req = { }, } itemBases["Voltaic Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_physical_spell_mods = true, staff = true, no_chaos_spell_mods = true, no_cold_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Lightning Bolt", @@ -27,7 +30,8 @@ itemBases["Voltaic Staff"] = { req = { }, } itemBases["Spriggan Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { default = true, twohand = true, staff = true, }, implicit = "Grants Skill: Level (1-20) Firebolt", @@ -35,7 +39,8 @@ itemBases["Spriggan Staff"] = { req = { }, } itemBases["Pyrophyte Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { no_physical_spell_mods = true, no_lightning_spell_mods = true, no_cold_spell_mods = true, no_chaos_spell_mods = true, staff = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Living Bomb", @@ -43,7 +48,8 @@ itemBases["Pyrophyte Staff"] = { req = { }, } itemBases["Chiming Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { default = true, twohand = true, staff = true, }, implicit = "Grants Skill: Level (1-20) Sigil of Power", @@ -51,7 +57,8 @@ itemBases["Chiming Staff"] = { req = { }, } itemBases["Rending Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_lightning_spell_mods = true, staff = true, no_physical_spell_mods = true, no_cold_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Soulrend", @@ -59,7 +66,8 @@ itemBases["Rending Staff"] = { req = { }, } itemBases["Reaping Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_lightning_spell_mods = true, staff = true, no_chaos_spell_mods = true, no_cold_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Reap", @@ -67,7 +75,8 @@ itemBases["Reaping Staff"] = { req = { }, } itemBases["Icicle Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_lightning_spell_mods = true, staff = true, no_physical_spell_mods = true, no_chaos_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Firebolt", @@ -75,7 +84,8 @@ itemBases["Icicle Staff"] = { req = { }, } itemBases["Roaring Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { default = true, twohand = true, staff = true, }, implicit = "Grants Skill: Level (1-20) Unleash", @@ -83,7 +93,8 @@ itemBases["Roaring Staff"] = { req = { }, } itemBases["Paralysing Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_physical_spell_mods = true, staff = true, no_chaos_spell_mods = true, no_cold_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Shock Nova", @@ -91,7 +102,8 @@ itemBases["Paralysing Staff"] = { req = { }, } itemBases["Cleric Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { default = true, twohand = true, staff = true, }, implicit = "Grants Skill: Level (1-20) Consecrate", @@ -99,7 +111,8 @@ itemBases["Cleric Staff"] = { req = { }, } itemBases["Dark Staff"] = { - type = "Staff", + class = "Staff", + category = "Staff", quality = 20, tags = { default = true, twohand = true, staff = true, }, implicit = "Grants Skill: Level (1-20) Dark Pact", @@ -108,8 +121,8 @@ itemBases["Dark Staff"] = { } itemBases["Wrapped Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, ezomyte_basetype = true, weapon = true, twohand = true, default = true, }, @@ -118,8 +131,8 @@ itemBases["Wrapped Quarterstaff"] = { req = { }, } itemBases["Long Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, ezomyte_basetype = true, weapon = true, twohand = true, default = true, }, @@ -129,8 +142,8 @@ itemBases["Long Quarterstaff"] = { req = { dex = 10, }, } itemBases["Gothic Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, ezomyte_basetype = true, weapon = true, twohand = true, default = true, }, @@ -139,8 +152,8 @@ itemBases["Gothic Quarterstaff"] = { req = { level = 11, dex = 22, int = 11, }, } itemBases["Crackling Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, maraketh_basetype = true, weapon = true, twohand = true, default = true, }, @@ -149,8 +162,8 @@ itemBases["Crackling Quarterstaff"] = { req = { level = 16, dex = 30, int = 14, }, } itemBases["Crescent Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, maraketh_basetype = true, weapon = true, twohand = true, default = true, }, @@ -159,8 +172,8 @@ itemBases["Crescent Quarterstaff"] = { req = { level = 20, dex = 37, int = 16, }, } itemBases["Steelpoint Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, maraketh_basetype = true, weapon = true, twohand = true, default = true, }, @@ -169,8 +182,8 @@ itemBases["Steelpoint Quarterstaff"] = { req = { level = 28, dex = 51, int = 22, }, } itemBases["Slicing Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, vaal_basetype = true, weapon = true, twohand = true, default = true, }, @@ -179,8 +192,8 @@ itemBases["Slicing Quarterstaff"] = { req = { level = 33, dex = 60, int = 25, }, } itemBases["Barrier Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, vaal_basetype = true, weapon = true, twohand = true, default = true, }, @@ -190,8 +203,8 @@ itemBases["Barrier Quarterstaff"] = { req = { level = 37, dex = 67, int = 27, }, } itemBases["Hefty Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -200,8 +213,8 @@ itemBases["Hefty Quarterstaff"] = { req = { level = 45, dex = 81, int = 33, }, } itemBases["Smooth Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -210,8 +223,8 @@ itemBases["Smooth Quarterstaff"] = { req = { level = 47, dex = 84, int = 34, }, } itemBases["Anima Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -220,8 +233,8 @@ itemBases["Anima Quarterstaff"] = { req = { level = 52, dex = 93, int = 37, }, } itemBases["Graceful Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -230,8 +243,8 @@ itemBases["Graceful Quarterstaff"] = { req = { level = 56, dex = 100, int = 40, }, } itemBases["Wyrm Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -240,8 +253,8 @@ itemBases["Wyrm Quarterstaff"] = { req = { level = 65, dex = 116, int = 45, }, } itemBases["Advanced Long Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -251,8 +264,8 @@ itemBases["Advanced Long Quarterstaff"] = { req = { level = 45, dex = 81, int = 33, }, } itemBases["Advanced Gothic Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -261,8 +274,8 @@ itemBases["Advanced Gothic Quarterstaff"] = { req = { level = 48, dex = 86, int = 35, }, } itemBases["Advanced Crackling Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -271,8 +284,8 @@ itemBases["Advanced Crackling Quarterstaff"] = { req = { level = 51, dex = 91, int = 36, }, } itemBases["Advanced Crescent Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -281,8 +294,8 @@ itemBases["Advanced Crescent Quarterstaff"] = { req = { level = 55, dex = 98, int = 39, }, } itemBases["Advanced Slicing Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -291,8 +304,8 @@ itemBases["Advanced Slicing Quarterstaff"] = { req = { level = 59, dex = 105, int = 42, }, } itemBases["Advanced Barrier Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -302,8 +315,8 @@ itemBases["Advanced Barrier Quarterstaff"] = { req = { level = 62, dex = 110, int = 44, }, } itemBases["Expert Gothic Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -312,8 +325,8 @@ itemBases["Expert Gothic Quarterstaff"] = { req = { level = 67, dex = 135, int = 53, }, } itemBases["Expert Crescent Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -322,8 +335,8 @@ itemBases["Expert Crescent Quarterstaff"] = { req = { level = 72, dex = 150, int = 59, }, } itemBases["Expert Long Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -333,8 +346,8 @@ itemBases["Expert Long Quarterstaff"] = { req = { level = 77, dex = 165, int = 64, }, } itemBases["Expert Crackling Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -343,8 +356,8 @@ itemBases["Expert Crackling Quarterstaff"] = { req = { level = 78, dex = 165, int = 64, }, } itemBases["Expert Barrier Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -354,8 +367,8 @@ itemBases["Expert Barrier Quarterstaff"] = { req = { level = 79, dex = 165, int = 64, }, } itemBases["Expert Slicing Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", + class = "Warstaff", + category = "Warstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, diff --git a/src/Data/Bases/sword.lua b/src/Data/Bases/sword.lua index 32eee5afad..d759d0c7c1 100644 --- a/src/Data/Bases/sword.lua +++ b/src/Data/Bases/sword.lua @@ -4,7 +4,8 @@ local itemBases = ... itemBases["Golden Blade"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { demigods = true, onehand = true, not_for_sale = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -13,8 +14,9 @@ itemBases["Golden Blade"] = { weapon = { PhysicalMin = 3, PhysicalMax = 28, CritChanceBase = 5, AttackRateBase = 1.1, Range = 11, }, req = { }, } -itemBases["Energy Blade One Handed"] = { - type = "One Handed Sword", +itemBases["Energy Blade Two Handed"] = { + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, hidden = true, socketLimit = 3, @@ -24,7 +26,8 @@ itemBases["Energy Blade One Handed"] = { req = { }, } itemBases["Shortsword"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, ezomyte_basetype = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -33,7 +36,8 @@ itemBases["Shortsword"] = { req = { }, } itemBases["Broadsword"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, ezomyte_basetype = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -42,7 +46,8 @@ itemBases["Broadsword"] = { req = { level = 6, str = 10, dex = 10, }, } itemBases["Vampiric Blade"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, ezomyte_basetype = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -51,7 +56,8 @@ itemBases["Vampiric Blade"] = { req = { level = 11, str = 16, dex = 16, }, } itemBases["Scimitar"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { maraketh_basetype = true, onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -60,7 +66,8 @@ itemBases["Scimitar"] = { req = { level = 16, str = 22, dex = 22, }, } itemBases["Charred Shortsword"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { maraketh_basetype = true, onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -69,7 +76,8 @@ itemBases["Charred Shortsword"] = { req = { level = 21, str = 28, dex = 28, }, } itemBases["Sickle Sword"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { maraketh_basetype = true, onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -78,7 +86,8 @@ itemBases["Sickle Sword"] = { req = { level = 28, str = 37, dex = 37, }, } itemBases["Falchion"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, vaal_basetype = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -87,7 +96,8 @@ itemBases["Falchion"] = { req = { level = 33, str = 43, dex = 43, }, } itemBases["Treasured Blade"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, vaal_basetype = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -96,7 +106,8 @@ itemBases["Treasured Blade"] = { req = { level = 40, str = 51, dex = 51, }, } itemBases["Cutlass"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -105,7 +116,8 @@ itemBases["Cutlass"] = { req = { level = 45, str = 57, dex = 57, }, } itemBases["Runic Shortsword"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -114,7 +126,8 @@ itemBases["Runic Shortsword"] = { req = { level = 50, str = 63, dex = 63, }, } itemBases["Messer"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -123,7 +136,8 @@ itemBases["Messer"] = { req = { level = 52, str = 66, dex = 66, }, } itemBases["Commander Sword"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -132,7 +146,8 @@ itemBases["Commander Sword"] = { req = { level = 54, str = 68, dex = 68, }, } itemBases["Dark Blade"] = { - type = "One Handed Sword", + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -141,8 +156,9 @@ itemBases["Dark Blade"] = { req = { level = 65, str = 81, dex = 81, }, } -itemBases["Energy Blade One Handed"] = { - type = "One Handed Sword", +itemBases["Energy Blade Two Handed"] = { + class = "One Hand Sword", + category = "One Hand Sword", quality = 20, hidden = true, socketLimit = 3, @@ -153,7 +169,8 @@ itemBases["Energy Blade One Handed"] = { } itemBases["Keyblade"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, hidden = true, socketLimit = 3, @@ -163,7 +180,8 @@ itemBases["Keyblade"] = { req = { }, } itemBases["Energy Blade Two Handed"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, hidden = true, socketLimit = 3, @@ -173,7 +191,8 @@ itemBases["Energy Blade Two Handed"] = { req = { }, } itemBases["Corroded Longsword"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -182,7 +201,8 @@ itemBases["Corroded Longsword"] = { req = { }, } itemBases["Iron Greatsword"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -191,7 +211,8 @@ itemBases["Iron Greatsword"] = { req = { level = 6, str = 10, dex = 10, }, } itemBases["Blessed Claymore"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -200,7 +221,8 @@ itemBases["Blessed Claymore"] = { req = { level = 11, str = 16, dex = 16, }, } itemBases["Broad Greatsword"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -209,7 +231,8 @@ itemBases["Broad Greatsword"] = { req = { level = 16, str = 22, dex = 22, }, } itemBases["Rippled Greatsword"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -218,7 +241,8 @@ itemBases["Rippled Greatsword"] = { req = { level = 22, str = 30, dex = 30, }, } itemBases["Arced Longsword"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -227,7 +251,8 @@ itemBases["Arced Longsword"] = { req = { level = 28, str = 37, dex = 37, }, } itemBases["Stone Greatsword"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -236,7 +261,8 @@ itemBases["Stone Greatsword"] = { req = { level = 33, str = 43, dex = 43, }, } itemBases["Obsidian Greatsword"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -245,7 +271,8 @@ itemBases["Obsidian Greatsword"] = { req = { level = 36, str = 46, dex = 46, }, } itemBases["Keen Greatsword"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -254,7 +281,8 @@ itemBases["Keen Greatsword"] = { req = { level = 45, str = 57, dex = 57, }, } itemBases["Ancient Greatblade"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -263,7 +291,8 @@ itemBases["Ancient Greatblade"] = { req = { level = 49, str = 62, dex = 62, }, } itemBases["Flanged Greatblade"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -272,7 +301,8 @@ itemBases["Flanged Greatblade"] = { req = { level = 52, str = 66, dex = 66, }, } itemBases["Regalia Longsword"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -281,7 +311,8 @@ itemBases["Regalia Longsword"] = { req = { level = 54, str = 68, dex = 68, }, } itemBases["Ultra Greatsword"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -291,7 +322,8 @@ itemBases["Ultra Greatsword"] = { } itemBases["Energy Blade Two Handed"] = { - type = "Two Handed Sword", + class = "Two Hand Sword", + category = "Two Hand Sword", quality = 20, hidden = true, socketLimit = 3, diff --git a/src/Data/Bases/traptool.lua b/src/Data/Bases/traptool.lua index 6a4d55ac2b..b61a99445b 100644 --- a/src/Data/Bases/traptool.lua +++ b/src/Data/Bases/traptool.lua @@ -4,35 +4,40 @@ local itemBases = ... itemBases["Clay Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Clamping Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Shrapnel Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Urn Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Incense Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicit = "(20-30)% increased Cooldown Recovery Rate for throwing Traps", @@ -40,56 +45,64 @@ itemBases["Incense Trap"] = { req = { }, } itemBases["Bladed Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Dart Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Spike Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Coiled Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Lead Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Medallion Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Intricate Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, req = { }, } itemBases["Refined Trap"] = { - type = "TrapTool", + class = "TrapTool", + category = "TrapTool", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, diff --git a/src/Data/Bases/wand.lua b/src/Data/Bases/wand.lua index 6b8058e3c4..3b3513fd1c 100644 --- a/src/Data/Bases/wand.lua +++ b/src/Data/Bases/wand.lua @@ -3,7 +3,8 @@ local itemBases = ... itemBases["Withered Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_cold_spell_mods = true, no_lightning_spell_mods = true, no_physical_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Chaos Bolt", @@ -11,7 +12,8 @@ itemBases["Withered Wand"] = { req = { }, } itemBases["Bone Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_cold_spell_mods = true, no_lightning_spell_mods = true, no_chaos_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Bone Blast", @@ -19,7 +21,8 @@ itemBases["Bone Wand"] = { req = { }, } itemBases["Attuned Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Mana Drain", @@ -27,7 +30,8 @@ itemBases["Attuned Wand"] = { req = { }, } itemBases["Siphoning Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Power Siphon", @@ -35,7 +39,8 @@ itemBases["Siphoning Wand"] = { req = { }, } itemBases["Volatile Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { no_physical_spell_mods = true, onehand = true, no_cold_spell_mods = true, wand = true, no_lightning_spell_mods = true, no_chaos_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Volatile Dead", @@ -43,7 +48,8 @@ itemBases["Volatile Wand"] = { req = { }, } itemBases["Galvanic Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_physical_spell_mods = true, no_cold_spell_mods = true, no_chaos_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Galvanic Field", @@ -51,7 +57,8 @@ itemBases["Galvanic Wand"] = { req = { }, } itemBases["Acrid Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Decompose", @@ -59,7 +66,8 @@ itemBases["Acrid Wand"] = { req = { }, } itemBases["Offering Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_cold_spell_mods = true, no_lightning_spell_mods = true, no_chaos_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Exsanguinate", @@ -67,7 +75,8 @@ itemBases["Offering Wand"] = { req = { }, } itemBases["Frigid Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_physical_spell_mods = true, no_lightning_spell_mods = true, no_chaos_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Chaos Bolt", @@ -75,7 +84,8 @@ itemBases["Frigid Wand"] = { req = { }, } itemBases["Torture Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Chaos Bolt", @@ -83,7 +93,8 @@ itemBases["Torture Wand"] = { req = { }, } itemBases["Critical Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Chaos Bolt", @@ -91,7 +102,8 @@ itemBases["Critical Wand"] = { req = { }, } itemBases["Primordial Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_cold_spell_mods = true, no_lightning_spell_mods = true, no_physical_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Wither", @@ -99,7 +111,8 @@ itemBases["Primordial Wand"] = { req = { }, } itemBases["Dueling Wand"] = { - type = "Wand", + class = "Wand", + category = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Chaos Bolt", @@ -107,7 +120,8 @@ itemBases["Dueling Wand"] = { req = { }, } itemBases["Random Wand"] = { - type = "Wand", + class = "HiddenItem", + category = "", hidden = true, tags = { wand = true, default = true, }, implicitModTypes = { }, diff --git a/src/Export/Launch.lua b/src/Export/Launch.lua index ea34ffcab8..57267cf94d 100644 --- a/src/Export/Launch.lua +++ b/src/Export/Launch.lua @@ -13,13 +13,13 @@ launch = { } SetMainObject(launch) function launch:OnInit() --- -- This is the path to emmy_core.dll. The ?.dll at the end is intentional. --- package.cpath = package.cpath .. ";C:/Users/Thomas/.vscode/extensions/tangzx.emmylua-0.8.20-win32-x64/debugger/emmy/windows/x64/?.dll" --- local dbg = require("emmy_core") --- -- This port must match the Visual Studio Code configuration. Default is 9966. --- dbg.tcpListen("localhost", 9966) --- -- Uncomment the next line if you want Path of Building to block until the debugger is attached --- --dbg.waitIDE() + -- This is the path to emmy_core.dll. The ?.dll at the end is intentional. +package.cpath = package.cpath .. ";C:/Users/Thomas/.vscode/extensions/tangzx.emmylua-0.8.20-win32-x64/debugger/emmy/windows/x64/?.dll" +local dbg = require("emmy_core") +-- This port must match the Visual Studio Code configuration. Default is 9966. +dbg.tcpListen("localhost", 9966) +-- Uncomment the next line if you want Path of Building to block until the debugger is attached +--dbg.waitIDE() self.devMode = true self.subScripts = { } RenderInit() diff --git a/src/Export/Scripts/bases.lua b/src/Export/Scripts/bases.lua index f45b5ba93b..2c36f72f29 100644 --- a/src/Export/Scripts/bases.lua +++ b/src/Export/Scripts/bases.lua @@ -29,10 +29,6 @@ for influenceTag in dat("InfluenceTags"):Rows() do end end -directiveTable.type = function(state, args, out) - state.type = args -end - directiveTable.forceShow = function(state, args, out) state.forceShow = (args == "true") end @@ -61,7 +57,8 @@ directiveTable.base = function(state, args, out) end local class = baseItemType.ItemClass.Id - local category = dat("ItemClasses"):GetRow("Id", class).ItemClassCategory.Id + local itemClass = dat("ItemClasses"):GetRow("Id", class) + local category = itemClass.ItemClassCategory and itemClass.ItemClassCategory.Id or "" local function getBaseItemTags(baseItemType) if baseItemType == "nothing" then -- base case return {} @@ -116,11 +113,8 @@ directiveTable.base = function(state, args, out) displayName = displayName:gsub("^%s*(.-)%s*$", "%1") -- trim spaces GGG might leave in by accident displayName = displayName ~= "Energy Blade" and displayName or (category == "One Handed Sword" and "Energy Blade One Handed" or "Energy Blade Two Handed") out:write('itemBases["', displayName, '"] = {\n') - if state.type then - out:write('\ttype = "', state.type, '",\n') - end - out:write('\tclass = "', baseItemType.ItemClass.Id, '",\n') - out:write('\tcategory = "', , '",\n') + out:write('\tclass = "', class, '",\n') + out:write('\tcategory = "', category, '",\n') if maximumQuality ~= 0 then out:write('\tquality = ', maximumQuality, ',\n') end @@ -231,6 +225,7 @@ directiveTable.base = function(state, args, out) out:write('},\n') itemValueSum = weaponType.DamageMin + weaponType.DamageMax end + local type = "" -- used to store armour types. local armourType = dat("ArmourTypes"):GetRow("BaseItemType", baseItemType) if armourType then out:write('\tarmour = { ') @@ -240,14 +235,17 @@ directiveTable.base = function(state, args, out) end if armourType.Armour > 0 then out:write('Armour = ', armourType.Armour, ', ') + type = #type > 0 and type.."/Armour" or "Armour" itemValueSum = itemValueSum + armourType.Armour end if armourType.Evasion > 0 then out:write('Evasion = ', armourType.Evasion, ', ') + type = #type > 0 and type.."/Evasion" or "Evasion" itemValueSum = itemValueSum + armourType.Evasion end if armourType.EnergyShield > 0 then out:write('EnergyShield = ', armourType.EnergyShield, ', ') + type = #type > 0 and type.."/Energy Shield" or "EnergyShield" itemValueSum = itemValueSum + armourType.EnergyShield end if armourType.MovementPenalty ~= 0 then @@ -255,6 +253,9 @@ directiveTable.base = function(state, args, out) end out:write('},\n') end + if type and #type > 0 then + out:write('\ttype = "', type, '",\n') + end if category == "Flask" or category == "Charm" then local flask = dat("Flasks"):GetRow("BaseItemType", baseItemType) if flask then @@ -341,12 +342,11 @@ directiveTable.base = function(state, args, out) out:write('},\n}\n') if not ((baseItemType.Hidden == 0 or state.forceHide) and not baseTypeId:match("Talisman") and not state.forceShow) then - bases[state.type] = bases[state.type] or {} - local subtype = state.subType and #state.subType and state.subType or "" - if not bases[state.type][subtype] or itemValueSum > bases[state.type][subtype][2] then - bases[state.type][subtype] = { displayName, itemValueSum } + bases[class] = bases[class] or {} + if not bases[class][type] or itemValueSum > bases[class][type][2] then + bases[class][type] = { displayName, itemValueSum } end - bases["All"][displayName] = { state.type, state.subType } + bases["All"][displayName] = { class, type } end end From 664d6f0787fc041771ddb2cee521d475ddbbf84a Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:38:27 +1100 Subject: [PATCH 03/15] Export labels --- src/Data/Bases/amulet.lua | 10 +++ src/Data/Bases/axe.lua | 26 ++++++ src/Data/Bases/belt.lua | 12 +++ src/Data/Bases/body.lua | 145 ++++++++++++++++++++++++++++++++++ src/Data/Bases/boots.lua | 83 +++++++++++++++++++ src/Data/Bases/bow.lua | 25 ++++++ src/Data/Bases/claw.lua | 13 +++ src/Data/Bases/crossbow.lua | 25 ++++++ src/Data/Bases/dagger.lua | 14 ++++ src/Data/Bases/flask.lua | 30 +++++++ src/Data/Bases/focus.lua | 23 +++++- src/Data/Bases/gloves.lua | 83 +++++++++++++++++++ src/Data/Bases/helmet.lua | 109 ++++++++++++++++++++++++- src/Data/Bases/jewel.lua | 9 +++ src/Data/Bases/mace.lua | 50 ++++++++++++ src/Data/Bases/quiver.lua | 11 +++ src/Data/Bases/ring.lua | 14 ++++ src/Data/Bases/sceptre.lua | 15 ++++ src/Data/Bases/shield.lua | 86 +++++++++++++++++++- src/Data/Bases/spear.lua | 13 +++ src/Data/Bases/staff.lua | 38 +++++++++ src/Data/Bases/sword.lua | 33 +++++++- src/Data/Bases/traptool.lua | 14 +++- src/Data/Bases/wand.lua | 14 ++++ src/Export/Bases/amulet.txt | 1 + src/Export/Bases/axe.txt | 2 + src/Export/Bases/belt.txt | 1 + src/Export/Bases/body.txt | 1 + src/Export/Bases/boots.txt | 1 + src/Export/Bases/bow.txt | 1 + src/Export/Bases/claw.txt | 1 + src/Export/Bases/crossbow.txt | 1 + src/Export/Bases/dagger.txt | 1 + src/Export/Bases/fishing.txt | 1 + src/Export/Bases/flail.txt | 1 + src/Export/Bases/flask.txt | 2 + src/Export/Bases/focus.txt | 2 +- src/Export/Bases/gloves.txt | 1 + src/Export/Bases/helmet.txt | 2 +- src/Export/Bases/jewel.txt | 1 + src/Export/Bases/mace.txt | 2 + src/Export/Bases/quiver.txt | 1 + src/Export/Bases/ring.txt | 1 + src/Export/Bases/sceptre.txt | 1 + src/Export/Bases/shield.txt | 2 +- src/Export/Bases/spear.txt | 1 + src/Export/Bases/staff.txt | 2 + src/Export/Bases/sword.txt | 3 +- src/Export/Bases/traptool.txt | 2 +- src/Export/Bases/wand.txt | 1 + src/Export/Scripts/bases.lua | 3 + 51 files changed, 924 insertions(+), 10 deletions(-) diff --git a/src/Data/Bases/amulet.lua b/src/Data/Bases/amulet.lua index 218b0f8ed1..8dc02dc72a 100644 --- a/src/Data/Bases/amulet.lua +++ b/src/Data/Bases/amulet.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Crimson Amulet"] = { class = "Amulet", category = "Amulet", + label = "Amulet", tags = { amulet = true, default = true, }, implicit = "(2-4) Life Regeneration per second", implicitModTypes = { { "flat_life_regen", "resource", "life" }, }, @@ -13,6 +14,7 @@ itemBases["Crimson Amulet"] = { itemBases["Azure Amulet"] = { class = "Amulet", category = "Amulet", + label = "Amulet", tags = { amulet = true, default = true, }, implicit = "(20-30)% increased Mana Regeneration Rate", implicitModTypes = { { "resource", "mana" }, }, @@ -21,6 +23,7 @@ itemBases["Azure Amulet"] = { itemBases["Amber Amulet"] = { class = "Amulet", category = "Amulet", + label = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(10-15) to Strength", implicitModTypes = { { "attribute" }, }, @@ -29,6 +32,7 @@ itemBases["Amber Amulet"] = { itemBases["Jade Amulet"] = { class = "Amulet", category = "Amulet", + label = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(10-15) to Dexterity", implicitModTypes = { { "attribute" }, }, @@ -37,6 +41,7 @@ itemBases["Jade Amulet"] = { itemBases["Lapis Amulet"] = { class = "Amulet", category = "Amulet", + label = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(10-15) to Intelligence", implicitModTypes = { { "attribute" }, }, @@ -45,6 +50,7 @@ itemBases["Lapis Amulet"] = { itemBases["Lunar Amulet"] = { class = "Amulet", category = "Amulet", + label = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(20-30) to maximum Energy Shield", implicitModTypes = { { "energy_shield", "defences" }, }, @@ -53,6 +59,7 @@ itemBases["Lunar Amulet"] = { itemBases["Bloodstone Amulet"] = { class = "Amulet", category = "Amulet", + label = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(30-40) to maximum Life", implicitModTypes = { { "resource", "life" }, }, @@ -61,6 +68,7 @@ itemBases["Bloodstone Amulet"] = { itemBases["Stellar Amulet"] = { class = "Amulet", category = "Amulet", + label = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(5-7) to all Attributes", implicitModTypes = { { "attribute" }, }, @@ -69,6 +77,7 @@ itemBases["Stellar Amulet"] = { itemBases["Solar Amulet"] = { class = "Amulet", category = "Amulet", + label = "Amulet", tags = { amulet = true, default = true, }, implicit = "+(10-15) to Spirit", implicitModTypes = { { }, }, @@ -77,6 +86,7 @@ itemBases["Solar Amulet"] = { itemBases["Gold Amulet"] = { class = "Amulet", category = "Amulet", + label = "Amulet", tags = { amulet = true, default = true, }, implicit = "(12-20)% increased Rarity of Items found", implicitModTypes = { { }, }, diff --git a/src/Data/Bases/axe.lua b/src/Data/Bases/axe.lua index 6b3d20e4c9..2bb79f12b0 100644 --- a/src/Data/Bases/axe.lua +++ b/src/Data/Bases/axe.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Dull Hatchet"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -15,6 +16,7 @@ itemBases["Dull Hatchet"] = { itemBases["Hook Axe"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -26,6 +28,7 @@ itemBases["Hook Axe"] = { itemBases["Bearded Axe"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -36,6 +39,7 @@ itemBases["Bearded Axe"] = { itemBases["Extended Cleaver"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, maraketh_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -47,6 +51,7 @@ itemBases["Extended Cleaver"] = { itemBases["Bandit Hatchet"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, maraketh_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -57,6 +62,7 @@ itemBases["Bandit Hatchet"] = { itemBases["Crescent Axe"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, maraketh_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -67,6 +73,7 @@ itemBases["Crescent Axe"] = { itemBases["Carving Hatchet"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -77,6 +84,7 @@ itemBases["Carving Hatchet"] = { itemBases["Sacrificial Axe"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -88,6 +96,7 @@ itemBases["Sacrificial Axe"] = { itemBases["Boarding Hatchet"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -98,6 +107,7 @@ itemBases["Boarding Hatchet"] = { itemBases["Fury Cleaver"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -109,6 +119,7 @@ itemBases["Fury Cleaver"] = { itemBases["Battle Axe"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -119,6 +130,7 @@ itemBases["Battle Axe"] = { itemBases["Profane Cleaver"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -129,6 +141,7 @@ itemBases["Profane Cleaver"] = { itemBases["Dread Hatchet"] = { class = "One Hand Axe", category = "One Hand Axe", + label = "One Hand Axe", quality = 20, socketLimit = 2, tags = { axe = true, onehand = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -140,6 +153,7 @@ itemBases["Dread Hatchet"] = { itemBases["Splitting Greataxe"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, ezomyte_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -150,6 +164,7 @@ itemBases["Splitting Greataxe"] = { itemBases["Light Halberd"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, ezomyte_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -160,6 +175,7 @@ itemBases["Light Halberd"] = { itemBases["Executioner Greataxe"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, ezomyte_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -171,6 +187,7 @@ itemBases["Executioner Greataxe"] = { itemBases["Arched Greataxe"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, maraketh_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -181,6 +198,7 @@ itemBases["Arched Greataxe"] = { itemBases["Elegant Glaive"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, maraketh_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -191,6 +209,7 @@ itemBases["Elegant Glaive"] = { itemBases["Savage Greataxe"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, maraketh_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -202,6 +221,7 @@ itemBases["Savage Greataxe"] = { itemBases["Rending Halberd"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, vaal_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -212,6 +232,7 @@ itemBases["Rending Halberd"] = { itemBases["Jagged Greataxe"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, vaal_basetype = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -223,6 +244,7 @@ itemBases["Jagged Greataxe"] = { itemBases["Reaver Glaive"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -233,6 +255,7 @@ itemBases["Reaver Glaive"] = { itemBases["Ember Greataxe"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -243,6 +266,7 @@ itemBases["Ember Greataxe"] = { itemBases["Ceremonial Halberd"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -253,6 +277,7 @@ itemBases["Ceremonial Halberd"] = { itemBases["Monument Greataxe"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, @@ -263,6 +288,7 @@ itemBases["Monument Greataxe"] = { itemBases["Vile Greataxe"] = { class = "Two Hand Axe", category = "Two Hand Axe", + label = "Two Hand Axe", quality = 20, socketLimit = 3, tags = { axe = true, two_hand_weapon = true, weapon = true, twohand = true, default = true, }, diff --git a/src/Data/Bases/belt.lua b/src/Data/Bases/belt.lua index 7b06a70a85..7c618f2b5c 100644 --- a/src/Data/Bases/belt.lua +++ b/src/Data/Bases/belt.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Golden Obi"] = { class = "Belt", category = "Belt", + label = "Belt", tags = { demigods = true, not_for_sale = true, default = true, belt = true, }, implicit = "(20-30)% increased Rarity of Items found", implicitModTypes = { { }, }, @@ -13,6 +14,7 @@ itemBases["Golden Obi"] = { itemBases["Rawhide Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(20-30)% increased Life Recovery from Flasks", @@ -22,6 +24,7 @@ itemBases["Rawhide Belt"] = { itemBases["Linen Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(20-30)% increased Mana Recovery from Flasks", @@ -31,6 +34,7 @@ itemBases["Linen Belt"] = { itemBases["Wide Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(20-30)% increased Flask Charges gained", @@ -40,6 +44,7 @@ itemBases["Wide Belt"] = { itemBases["Long Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(15-20)% increased Charm Effect Duration", @@ -49,6 +54,7 @@ itemBases["Long Belt"] = { itemBases["Plate Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "+(100-140) to Armour", @@ -58,6 +64,7 @@ itemBases["Plate Belt"] = { itemBases["Ornate Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(10-15)% reduced Charm Charges used", @@ -67,6 +74,7 @@ itemBases["Ornate Belt"] = { itemBases["Mail Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(10-15)% reduced Flask Charges used", @@ -76,6 +84,7 @@ itemBases["Mail Belt"] = { itemBases["Double Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(20-30)% increased Charm Charges gained", @@ -85,6 +94,7 @@ itemBases["Double Belt"] = { itemBases["Heavy Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "(20-30)% increased Stun Threshold", @@ -94,6 +104,7 @@ itemBases["Heavy Belt"] = { itemBases["Utility Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "20% of Flask Recovery applied Instantly", @@ -103,6 +114,7 @@ itemBases["Utility Belt"] = { itemBases["Fine Belt"] = { class = "Belt", category = "Belt", + label = "Belt", charmLimit = 1, tags = { belt = true, default = true, }, implicit = "Flasks gain 0.17 charges per Second", diff --git a/src/Data/Bases/body.lua b/src/Data/Bases/body.lua index b6fc00ed70..f3f43c764c 100644 --- a/src/Data/Bases/body.lua +++ b/src/Data/Bases/body.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Golden Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_int_armour = true, demigods = true, armour = true, not_for_sale = true, default = true, }, @@ -17,6 +18,7 @@ itemBases["Golden Mantle"] = { itemBases["Rusted Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, @@ -28,6 +30,7 @@ itemBases["Rusted Cuirass"] = { itemBases["Fur Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, @@ -39,6 +42,7 @@ itemBases["Fur Plate"] = { itemBases["Iron Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, @@ -50,6 +54,7 @@ itemBases["Iron Cuirass"] = { itemBases["Raider Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -61,6 +66,7 @@ itemBases["Raider Plate"] = { itemBases["Maraketh Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -72,6 +78,7 @@ itemBases["Maraketh Cuirass"] = { itemBases["Steel Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -83,6 +90,7 @@ itemBases["Steel Plate"] = { itemBases["Full Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -94,6 +102,7 @@ itemBases["Full Plate"] = { itemBases["Vaal Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -105,6 +114,7 @@ itemBases["Vaal Cuirass"] = { itemBases["Juggernaut Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -116,6 +126,7 @@ itemBases["Juggernaut Plate"] = { itemBases["Chieftain Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -127,6 +138,7 @@ itemBases["Chieftain Cuirass"] = { itemBases["Colosseum Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -138,6 +150,7 @@ itemBases["Colosseum Plate"] = { itemBases["Champion Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -149,6 +162,7 @@ itemBases["Champion Cuirass"] = { itemBases["Glorious Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -160,6 +174,7 @@ itemBases["Glorious Plate"] = { itemBases["Conqueror Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -172,6 +187,7 @@ itemBases["Conqueror Plate"] = { itemBases["Abyssal Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -184,6 +200,7 @@ itemBases["Abyssal Cuirass"] = { itemBases["Leather Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, @@ -195,6 +212,7 @@ itemBases["Leather Vest"] = { itemBases["Quilted Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, @@ -206,6 +224,7 @@ itemBases["Quilted Vest"] = { itemBases["Pathfinder Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, @@ -217,6 +236,7 @@ itemBases["Pathfinder Coat"] = { itemBases["Shrouded Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, dex_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -228,6 +248,7 @@ itemBases["Shrouded Vest"] = { itemBases["Rhoahide Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, dex_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -239,6 +260,7 @@ itemBases["Rhoahide Coat"] = { itemBases["Studded Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, dex_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -250,6 +272,7 @@ itemBases["Studded Vest"] = { itemBases["Scout's Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, dex_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -261,6 +284,7 @@ itemBases["Scout's Vest"] = { itemBases["Serpentscale Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, dex_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -272,6 +296,7 @@ itemBases["Serpentscale Coat"] = { itemBases["Corsair Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -283,6 +308,7 @@ itemBases["Corsair Vest"] = { itemBases["Smuggler Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -294,6 +320,7 @@ itemBases["Smuggler Coat"] = { itemBases["Strider Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -305,6 +332,7 @@ itemBases["Strider Vest"] = { itemBases["Hardleather Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -316,6 +344,7 @@ itemBases["Hardleather Coat"] = { itemBases["Exquisite Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -327,6 +356,7 @@ itemBases["Exquisite Vest"] = { itemBases["Mail Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -339,6 +369,7 @@ itemBases["Mail Coat"] = { itemBases["Armoured Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -351,6 +382,7 @@ itemBases["Armoured Vest"] = { itemBases["Tattered Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, @@ -362,6 +394,7 @@ itemBases["Tattered Robe"] = { itemBases["Feathered Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, @@ -373,6 +406,7 @@ itemBases["Feathered Robe"] = { itemBases["Hexer's Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, @@ -384,6 +418,7 @@ itemBases["Hexer's Robe"] = { itemBases["Bone Raiment"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, int_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -395,6 +430,7 @@ itemBases["Bone Raiment"] = { itemBases["Silk Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, int_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -406,6 +442,7 @@ itemBases["Silk Robe"] = { itemBases["Keth Raiment"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, int_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -417,6 +454,7 @@ itemBases["Keth Raiment"] = { itemBases["Votive Raiment"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -428,6 +466,7 @@ itemBases["Votive Raiment"] = { itemBases["Altar Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -439,6 +478,7 @@ itemBases["Altar Robe"] = { itemBases["Elementalist Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -450,6 +490,7 @@ itemBases["Elementalist Robe"] = { itemBases["Mystic Raiment"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -461,6 +502,7 @@ itemBases["Mystic Raiment"] = { itemBases["Imperial Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -472,6 +514,7 @@ itemBases["Imperial Robe"] = { itemBases["Plated Raiment"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -483,6 +526,7 @@ itemBases["Plated Raiment"] = { itemBases["Havoc Raiment"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -494,6 +538,7 @@ itemBases["Havoc Raiment"] = { itemBases["Enlightened Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -506,6 +551,7 @@ itemBases["Enlightened Robe"] = { itemBases["Arcane Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -518,6 +564,7 @@ itemBases["Arcane Robe"] = { itemBases["Chain Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, ezomyte_basetype = true, armour = true, default = true, }, @@ -529,6 +576,7 @@ itemBases["Chain Mail"] = { itemBases["Rogue Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, ezomyte_basetype = true, armour = true, default = true, }, @@ -540,6 +588,7 @@ itemBases["Rogue Armour"] = { itemBases["Vagabond Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -551,6 +600,7 @@ itemBases["Vagabond Armour"] = { itemBases["Cloaked Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -562,6 +612,7 @@ itemBases["Cloaked Mail"] = { itemBases["Explorer Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -573,6 +624,7 @@ itemBases["Explorer Armour"] = { itemBases["Scale Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_dex_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -584,6 +636,7 @@ itemBases["Scale Mail"] = { itemBases["Knight Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -595,6 +648,7 @@ itemBases["Knight Armour"] = { itemBases["Ancestral Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -606,6 +660,7 @@ itemBases["Ancestral Mail"] = { itemBases["Lamellar Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -617,6 +672,7 @@ itemBases["Lamellar Mail"] = { itemBases["Gladiator Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -628,6 +684,7 @@ itemBases["Gladiator Armour"] = { itemBases["Heroic Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -640,6 +697,7 @@ itemBases["Heroic Armour"] = { itemBases["Tournament Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -652,6 +710,7 @@ itemBases["Tournament Mail"] = { itemBases["Tournament Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -664,6 +723,7 @@ itemBases["Tournament Mail"] = { itemBases["Tournament Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -676,6 +736,7 @@ itemBases["Tournament Mail"] = { itemBases["Slayer Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -687,6 +748,7 @@ itemBases["Slayer Armour"] = { itemBases["Pilgrim Vestments"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, ezomyte_basetype = true, armour = true, default = true, }, @@ -698,6 +760,7 @@ itemBases["Pilgrim Vestments"] = { itemBases["Pelt Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, ezomyte_basetype = true, armour = true, default = true, }, @@ -709,6 +772,7 @@ itemBases["Pelt Mantle"] = { itemBases["Mail Vestments"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -720,6 +784,7 @@ itemBases["Mail Vestments"] = { itemBases["Shaman Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, armour = true, maraketh_basetype = true, default = true, }, @@ -731,6 +796,7 @@ itemBases["Shaman Mantle"] = { itemBases["Ironclad Vestments"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -742,6 +808,7 @@ itemBases["Ironclad Vestments"] = { itemBases["Sacrificial Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, str_int_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -753,6 +820,7 @@ itemBases["Sacrificial Mantle"] = { itemBases["Cleric Vestments"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -764,6 +832,7 @@ itemBases["Cleric Vestments"] = { itemBases["Tideseer Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -775,6 +844,7 @@ itemBases["Tideseer Mantle"] = { itemBases["Gilded Vestments"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -786,6 +856,7 @@ itemBases["Gilded Vestments"] = { itemBases["Venerated Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -797,6 +868,7 @@ itemBases["Venerated Mantle"] = { itemBases["Revered Vestments"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -809,6 +881,7 @@ itemBases["Revered Vestments"] = { itemBases["Corvus Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -821,6 +894,7 @@ itemBases["Corvus Mantle"] = { itemBases["Zenith Vestments"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -832,6 +906,7 @@ itemBases["Zenith Vestments"] = { itemBases["Hermit Garb"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, armour = true, default = true, dex_int_armour = true, }, @@ -843,6 +918,7 @@ itemBases["Hermit Garb"] = { itemBases["Waxed Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, ezomyte_basetype = true, armour = true, default = true, dex_int_armour = true, }, @@ -854,6 +930,7 @@ itemBases["Waxed Jacket"] = { itemBases["Marabout Garb"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, maraketh_basetype = true, armour = true, default = true, dex_int_armour = true, }, @@ -865,6 +942,7 @@ itemBases["Marabout Garb"] = { itemBases["Wayfarer Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, maraketh_basetype = true, armour = true, default = true, dex_int_armour = true, }, @@ -876,6 +954,7 @@ itemBases["Wayfarer Jacket"] = { itemBases["Anchorite Garb"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, vaal_basetype = true, armour = true, default = true, dex_int_armour = true, }, @@ -887,6 +966,7 @@ itemBases["Anchorite Garb"] = { itemBases["Scalper's Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, vaal_basetype = true, armour = true, default = true, dex_int_armour = true, }, @@ -898,6 +978,7 @@ itemBases["Scalper's Jacket"] = { itemBases["Scoundrel Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -909,6 +990,7 @@ itemBases["Scoundrel Jacket"] = { itemBases["Ascetic Garb"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -920,6 +1002,7 @@ itemBases["Ascetic Garb"] = { itemBases["Clandestine Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -931,6 +1014,7 @@ itemBases["Clandestine Jacket"] = { itemBases["Monastic Garb"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -942,6 +1026,7 @@ itemBases["Monastic Garb"] = { itemBases["Torment Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -953,6 +1038,7 @@ itemBases["Torment Jacket"] = { itemBases["Devout Garb"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -965,6 +1051,7 @@ itemBases["Devout Garb"] = { itemBases["Assassin Garb"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -977,6 +1064,7 @@ itemBases["Assassin Garb"] = { itemBases["Garment"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_int_armour = true, default = true, }, @@ -987,6 +1075,7 @@ itemBases["Garment"] = { itemBases["Grand Regalia"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_int_armour = true, default = true, }, @@ -998,6 +1087,7 @@ itemBases["Grand Regalia"] = { itemBases["Advanced Fur Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -1009,6 +1099,7 @@ itemBases["Advanced Fur Plate"] = { itemBases["Advanced Iron Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -1020,6 +1111,7 @@ itemBases["Advanced Iron Cuirass"] = { itemBases["Advanced Maraketh Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -1031,6 +1123,7 @@ itemBases["Advanced Maraketh Cuirass"] = { itemBases["Advanced Steel Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -1042,6 +1135,7 @@ itemBases["Advanced Steel Plate"] = { itemBases["Advanced Full Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -1053,6 +1147,7 @@ itemBases["Advanced Full Plate"] = { itemBases["Advanced Vaal Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -1064,6 +1159,7 @@ itemBases["Advanced Vaal Cuirass"] = { itemBases["Advanced Quilted Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -1075,6 +1171,7 @@ itemBases["Advanced Quilted Vest"] = { itemBases["Advanced Pathfinder Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -1086,6 +1183,7 @@ itemBases["Advanced Pathfinder Coat"] = { itemBases["Advanced Rhoahide Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -1097,6 +1195,7 @@ itemBases["Advanced Rhoahide Coat"] = { itemBases["Advanced Studded Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -1108,6 +1207,7 @@ itemBases["Advanced Studded Vest"] = { itemBases["Advanced Scout's Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -1119,6 +1219,7 @@ itemBases["Advanced Scout's Vest"] = { itemBases["Advanced Serpentscale Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -1130,6 +1231,7 @@ itemBases["Advanced Serpentscale Coat"] = { itemBases["Advanced Feathered Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -1141,6 +1243,7 @@ itemBases["Advanced Feathered Robe"] = { itemBases["Advanced Hexer's Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -1152,6 +1255,7 @@ itemBases["Advanced Hexer's Robe"] = { itemBases["Advanced Silk Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -1163,6 +1267,7 @@ itemBases["Advanced Silk Robe"] = { itemBases["Advanced Keth Raiment"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -1174,6 +1279,7 @@ itemBases["Advanced Keth Raiment"] = { itemBases["Advanced Votive Raiment"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -1185,6 +1291,7 @@ itemBases["Advanced Votive Raiment"] = { itemBases["Advanced Altar Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -1196,6 +1303,7 @@ itemBases["Advanced Altar Robe"] = { itemBases["Advanced Chain Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1207,6 +1315,7 @@ itemBases["Advanced Chain Mail"] = { itemBases["Advanced Rogue Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1218,6 +1327,7 @@ itemBases["Advanced Rogue Armour"] = { itemBases["Advanced Vagabond Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1229,6 +1339,7 @@ itemBases["Advanced Vagabond Armour"] = { itemBases["Advanced Cloaked Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1240,6 +1351,7 @@ itemBases["Advanced Cloaked Mail"] = { itemBases["Advanced Explorer Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1251,6 +1363,7 @@ itemBases["Advanced Explorer Armour"] = { itemBases["Advanced Scale Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1262,6 +1375,7 @@ itemBases["Advanced Scale Mail"] = { itemBases["Advanced Pilgrim Vestments"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -1273,6 +1387,7 @@ itemBases["Advanced Pilgrim Vestments"] = { itemBases["Advanced Pelt Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -1284,6 +1399,7 @@ itemBases["Advanced Pelt Mantle"] = { itemBases["Advanced Mail Vestments"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -1295,6 +1411,7 @@ itemBases["Advanced Mail Vestments"] = { itemBases["Advanced Shaman Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -1306,6 +1423,7 @@ itemBases["Advanced Shaman Mantle"] = { itemBases["Advanced Ironclad Vestments"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -1317,6 +1435,7 @@ itemBases["Advanced Ironclad Vestments"] = { itemBases["Advanced Sacrificial Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -1328,6 +1447,7 @@ itemBases["Advanced Sacrificial Mantle"] = { itemBases["Advanced Hermit Garb"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -1339,6 +1459,7 @@ itemBases["Advanced Hermit Garb"] = { itemBases["Advanced Waxed Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -1350,6 +1471,7 @@ itemBases["Advanced Waxed Jacket"] = { itemBases["Advanced Marabout Garb"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -1361,6 +1483,7 @@ itemBases["Advanced Marabout Garb"] = { itemBases["Advanced Wayfarer Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -1372,6 +1495,7 @@ itemBases["Advanced Wayfarer Jacket"] = { itemBases["Advanced Anchorite Garb"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -1383,6 +1507,7 @@ itemBases["Advanced Anchorite Garb"] = { itemBases["Advanced Scalper's Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -1394,6 +1519,7 @@ itemBases["Advanced Scalper's Jacket"] = { itemBases["Expert Iron Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -1405,6 +1531,7 @@ itemBases["Expert Iron Cuirass"] = { itemBases["Expert Steel Plate"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -1417,6 +1544,7 @@ itemBases["Expert Steel Plate"] = { itemBases["Expert Vaal Cuirass"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_armour = true, default = true, }, @@ -1429,6 +1557,7 @@ itemBases["Expert Vaal Cuirass"] = { itemBases["Expert Pathfinder Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -1441,6 +1570,7 @@ itemBases["Expert Pathfinder Coat"] = { itemBases["Expert Studded Vest"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -1452,6 +1582,7 @@ itemBases["Expert Studded Vest"] = { itemBases["Expert Serpentscale Coat"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_armour = true, default = true, }, @@ -1464,6 +1595,7 @@ itemBases["Expert Serpentscale Coat"] = { itemBases["Expert Hexer's Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -1475,6 +1607,7 @@ itemBases["Expert Hexer's Robe"] = { itemBases["Expert Keth Raiment"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -1487,6 +1620,7 @@ itemBases["Expert Keth Raiment"] = { itemBases["Expert Altar Robe"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, int_armour = true, default = true, }, @@ -1499,6 +1633,7 @@ itemBases["Expert Altar Robe"] = { itemBases["Expert Rogue Armour"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1511,6 +1646,7 @@ itemBases["Expert Rogue Armour"] = { itemBases["Expert Cloaked Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1523,6 +1659,7 @@ itemBases["Expert Cloaked Mail"] = { itemBases["Expert Cloaked Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1535,6 +1672,7 @@ itemBases["Expert Cloaked Mail"] = { itemBases["Expert Cloaked Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1547,6 +1685,7 @@ itemBases["Expert Cloaked Mail"] = { itemBases["Expert Scale Mail"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_dex_armour = true, default = true, }, @@ -1558,6 +1697,7 @@ itemBases["Expert Scale Mail"] = { itemBases["Expert Pelt Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -1569,6 +1709,7 @@ itemBases["Expert Pelt Mantle"] = { itemBases["Expert Shaman Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -1581,6 +1722,7 @@ itemBases["Expert Shaman Mantle"] = { itemBases["Expert Sacrificial Mantle"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, str_int_armour = true, default = true, }, @@ -1593,6 +1735,7 @@ itemBases["Expert Sacrificial Mantle"] = { itemBases["Expert Waxed Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -1604,6 +1747,7 @@ itemBases["Expert Waxed Jacket"] = { itemBases["Expert Wayfarer Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, @@ -1616,6 +1760,7 @@ itemBases["Expert Wayfarer Jacket"] = { itemBases["Expert Scalper's Jacket"] = { class = "Body Armour", category = "Body Armour", + label = "Body Armour", quality = 20, socketLimit = 3, tags = { body_armour = true, armour = true, dex_int_armour = true, default = true, }, diff --git a/src/Data/Bases/boots.lua b/src/Data/Bases/boots.lua index d7931e732b..f5bb661b9d 100644 --- a/src/Data/Bases/boots.lua +++ b/src/Data/Bases/boots.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Golden Caligae"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, not_for_sale = true, armour = true, demigods = true, default = true, }, @@ -16,6 +17,7 @@ itemBases["Golden Caligae"] = { itemBases["Rough Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, @@ -27,6 +29,7 @@ itemBases["Rough Greaves"] = { itemBases["Iron Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, @@ -38,6 +41,7 @@ itemBases["Iron Greaves"] = { itemBases["Bronze Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, str_armour = true, armour = true, default = true, }, @@ -49,6 +53,7 @@ itemBases["Bronze Greaves"] = { itemBases["Trimmed Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, str_armour = true, armour = true, default = true, }, @@ -60,6 +65,7 @@ itemBases["Trimmed Greaves"] = { itemBases["Stone Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, str_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -71,6 +77,7 @@ itemBases["Stone Greaves"] = { itemBases["Reefsteel Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, @@ -82,6 +89,7 @@ itemBases["Reefsteel Greaves"] = { itemBases["Monument Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, @@ -93,6 +101,7 @@ itemBases["Monument Greaves"] = { itemBases["Totemic Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, @@ -104,6 +113,7 @@ itemBases["Totemic Greaves"] = { itemBases["Rawhide Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, @@ -115,6 +125,7 @@ itemBases["Rawhide Boots"] = { itemBases["Laced Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, @@ -126,6 +137,7 @@ itemBases["Laced Boots"] = { itemBases["Embossed Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, dex_armour = true, armour = true, default = true, }, @@ -137,6 +149,7 @@ itemBases["Embossed Boots"] = { itemBases["Steeltoe Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, dex_armour = true, armour = true, default = true, }, @@ -148,6 +161,7 @@ itemBases["Steeltoe Boots"] = { itemBases["Lizardscale Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, dex_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -159,6 +173,7 @@ itemBases["Lizardscale Boots"] = { itemBases["Flared Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, @@ -170,6 +185,7 @@ itemBases["Flared Boots"] = { itemBases["Leatherplate Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, @@ -181,6 +197,7 @@ itemBases["Leatherplate Boots"] = { itemBases["Embroidered Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, @@ -192,6 +209,7 @@ itemBases["Embroidered Boots"] = { itemBases["Straw Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, @@ -203,6 +221,7 @@ itemBases["Straw Sandals"] = { itemBases["Wrapped Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, @@ -214,6 +233,7 @@ itemBases["Wrapped Sandals"] = { itemBases["Lattice Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, int_armour = true, armour = true, default = true, }, @@ -225,6 +245,7 @@ itemBases["Lattice Sandals"] = { itemBases["Silk Slippers"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, int_armour = true, armour = true, default = true, }, @@ -236,6 +257,7 @@ itemBases["Silk Slippers"] = { itemBases["Feathered Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -247,6 +269,7 @@ itemBases["Feathered Sandals"] = { itemBases["Flax Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, @@ -258,6 +281,7 @@ itemBases["Flax Sandals"] = { itemBases["Studded Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, @@ -269,6 +293,7 @@ itemBases["Studded Sandals"] = { itemBases["Elaborate Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, @@ -280,6 +305,7 @@ itemBases["Elaborate Sandals"] = { itemBases["Mail Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, armour = true, boots = true, default = true, }, @@ -291,6 +317,7 @@ itemBases["Mail Sabatons"] = { itemBases["Braced Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, armour = true, boots = true, default = true, }, @@ -302,6 +329,7 @@ itemBases["Braced Sabatons"] = { itemBases["Stacked Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, vaal_basetype = true, armour = true, boots = true, default = true, }, @@ -313,6 +341,7 @@ itemBases["Stacked Sabatons"] = { itemBases["Covered Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, @@ -324,6 +353,7 @@ itemBases["Covered Sabatons"] = { itemBases["Flexile Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, @@ -335,6 +365,7 @@ itemBases["Flexile Sabatons"] = { itemBases["Bold Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, @@ -346,6 +377,7 @@ itemBases["Bold Sabatons"] = { itemBases["Padded Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, armour = true, boots = true, default = true, }, @@ -357,6 +389,7 @@ itemBases["Padded Leggings"] = { itemBases["Secured Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, armour = true, boots = true, default = true, }, @@ -368,6 +401,7 @@ itemBases["Secured Leggings"] = { itemBases["Pelt Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, vaal_basetype = true, armour = true, boots = true, default = true, }, @@ -379,6 +413,7 @@ itemBases["Pelt Leggings"] = { itemBases["Weaver Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, @@ -390,6 +425,7 @@ itemBases["Weaver Leggings"] = { itemBases["Gilt Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, @@ -401,6 +437,7 @@ itemBases["Gilt Leggings"] = { itemBases["Pious Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, @@ -412,6 +449,7 @@ itemBases["Pious Leggings"] = { itemBases["Frayed Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, ezomyte_basetype = true, armour = true, default = true, dex_int_armour = true, }, @@ -423,6 +461,7 @@ itemBases["Frayed Shoes"] = { itemBases["Threaded Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, boots = true, armour = true, default = true, dex_int_armour = true, }, @@ -434,6 +473,7 @@ itemBases["Threaded Shoes"] = { itemBases["Hunting Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, vaal_basetype = true, armour = true, default = true, dex_int_armour = true, }, @@ -445,6 +485,7 @@ itemBases["Hunting Shoes"] = { itemBases["Steelpoint Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, @@ -456,6 +497,7 @@ itemBases["Steelpoint Shoes"] = { itemBases["Velour Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, @@ -467,6 +509,7 @@ itemBases["Velour Shoes"] = { itemBases["Bladed Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, @@ -478,6 +521,7 @@ itemBases["Bladed Shoes"] = { itemBases["Grand Cuisses"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_int_armour = true, armour = true, boots = true, default = true, }, @@ -489,6 +533,7 @@ itemBases["Grand Cuisses"] = { itemBases["Advanced Iron Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, @@ -500,6 +545,7 @@ itemBases["Advanced Iron Greaves"] = { itemBases["Advanced Bronze Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, @@ -511,6 +557,7 @@ itemBases["Advanced Bronze Greaves"] = { itemBases["Advanced Trimmed Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, @@ -522,6 +569,7 @@ itemBases["Advanced Trimmed Greaves"] = { itemBases["Advanced Stone Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, @@ -533,6 +581,7 @@ itemBases["Advanced Stone Greaves"] = { itemBases["Advanced Laced Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, @@ -544,6 +593,7 @@ itemBases["Advanced Laced Boots"] = { itemBases["Advanced Embossed Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, @@ -555,6 +605,7 @@ itemBases["Advanced Embossed Boots"] = { itemBases["Advanced Steeltoe Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, @@ -566,6 +617,7 @@ itemBases["Advanced Steeltoe Boots"] = { itemBases["Advanced Lizardscale Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, @@ -577,6 +629,7 @@ itemBases["Advanced Lizardscale Boots"] = { itemBases["Advanced Wrapped Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, @@ -588,6 +641,7 @@ itemBases["Advanced Wrapped Sandals"] = { itemBases["Advanced Lattice Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, @@ -599,6 +653,7 @@ itemBases["Advanced Lattice Sandals"] = { itemBases["Advanced Silk Slippers"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, @@ -610,6 +665,7 @@ itemBases["Advanced Silk Slippers"] = { itemBases["Advanced Feathered Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, @@ -621,6 +677,7 @@ itemBases["Advanced Feathered Sandals"] = { itemBases["Advanced Mail Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, @@ -632,6 +689,7 @@ itemBases["Advanced Mail Sabatons"] = { itemBases["Advanced Braced Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, @@ -643,6 +701,7 @@ itemBases["Advanced Braced Sabatons"] = { itemBases["Advanced Stacked Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, @@ -654,6 +713,7 @@ itemBases["Advanced Stacked Sabatons"] = { itemBases["Advanced Padded Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, @@ -665,6 +725,7 @@ itemBases["Advanced Padded Leggings"] = { itemBases["Advanced Secured Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, @@ -676,6 +737,7 @@ itemBases["Advanced Secured Leggings"] = { itemBases["Advanced Pelt Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, @@ -687,6 +749,7 @@ itemBases["Advanced Pelt Leggings"] = { itemBases["Advanced Frayed Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, @@ -698,6 +761,7 @@ itemBases["Advanced Frayed Shoes"] = { itemBases["Advanced Threaded Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, @@ -709,6 +773,7 @@ itemBases["Advanced Threaded Shoes"] = { itemBases["Advanced Hunting Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, @@ -720,6 +785,7 @@ itemBases["Advanced Hunting Shoes"] = { itemBases["Expert Iron Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, @@ -731,6 +797,7 @@ itemBases["Expert Iron Greaves"] = { itemBases["Expert Trimmed Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, @@ -742,6 +809,7 @@ itemBases["Expert Trimmed Greaves"] = { itemBases["Expert Stone Greaves"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { boots = true, armour = true, str_armour = true, default = true, }, @@ -753,6 +821,7 @@ itemBases["Expert Stone Greaves"] = { itemBases["Expert Laced Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, @@ -764,6 +833,7 @@ itemBases["Expert Laced Boots"] = { itemBases["Expert Steeltoe Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, @@ -775,6 +845,7 @@ itemBases["Expert Steeltoe Boots"] = { itemBases["Expert Lizardscale Boots"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, boots = true, default = true, }, @@ -786,6 +857,7 @@ itemBases["Expert Lizardscale Boots"] = { itemBases["Expert Wrapped Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, @@ -797,6 +869,7 @@ itemBases["Expert Wrapped Sandals"] = { itemBases["Expert Silk Slippers"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, @@ -808,6 +881,7 @@ itemBases["Expert Silk Slippers"] = { itemBases["Expert Feathered Sandals"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, boots = true, default = true, }, @@ -819,6 +893,7 @@ itemBases["Expert Feathered Sandals"] = { itemBases["Expert Mail Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, @@ -830,6 +905,7 @@ itemBases["Expert Mail Sabatons"] = { itemBases["Expert Braced Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, @@ -841,6 +917,7 @@ itemBases["Expert Braced Sabatons"] = { itemBases["Expert Stacked Sabatons"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, boots = true, default = true, }, @@ -852,6 +929,7 @@ itemBases["Expert Stacked Sabatons"] = { itemBases["Expert Padded Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, @@ -863,6 +941,7 @@ itemBases["Expert Padded Leggings"] = { itemBases["Expert Secured Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, @@ -874,6 +953,7 @@ itemBases["Expert Secured Leggings"] = { itemBases["Expert Pelt Leggings"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, boots = true, default = true, }, @@ -885,6 +965,7 @@ itemBases["Expert Pelt Leggings"] = { itemBases["Expert Frayed Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, @@ -896,6 +977,7 @@ itemBases["Expert Frayed Shoes"] = { itemBases["Expert Threaded Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, @@ -907,6 +989,7 @@ itemBases["Expert Threaded Shoes"] = { itemBases["Expert Hunting Shoes"] = { class = "Boots", category = "Boots", + label = "Boots", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, boots = true, default = true, }, diff --git a/src/Data/Bases/bow.lua b/src/Data/Bases/bow.lua index 4becff3630..8a7517e9c6 100644 --- a/src/Data/Bases/bow.lua +++ b/src/Data/Bases/bow.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Crude Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -15,6 +16,7 @@ itemBases["Crude Bow"] = { itemBases["Shortbow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -25,6 +27,7 @@ itemBases["Shortbow"] = { itemBases["Warden Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -36,6 +39,7 @@ itemBases["Warden Bow"] = { itemBases["Recurve Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -46,6 +50,7 @@ itemBases["Recurve Bow"] = { itemBases["Composite Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -56,6 +61,7 @@ itemBases["Composite Bow"] = { itemBases["Dualstring Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -67,6 +73,7 @@ itemBases["Dualstring Bow"] = { itemBases["Cultist Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -77,6 +84,7 @@ itemBases["Cultist Bow"] = { itemBases["Zealot Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -87,6 +95,7 @@ itemBases["Zealot Bow"] = { itemBases["Artillery Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -98,6 +107,7 @@ itemBases["Artillery Bow"] = { itemBases["Tribal Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -108,6 +118,7 @@ itemBases["Tribal Bow"] = { itemBases["Greatbow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -118,6 +129,7 @@ itemBases["Greatbow"] = { itemBases["Double Limb Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -128,6 +140,7 @@ itemBases["Double Limb Bow"] = { itemBases["Heavy Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -138,6 +151,7 @@ itemBases["Heavy Bow"] = { itemBases["Advanced Shortbow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -148,6 +162,7 @@ itemBases["Advanced Shortbow"] = { itemBases["Advanced Warden Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -159,6 +174,7 @@ itemBases["Advanced Warden Bow"] = { itemBases["Advanced Composite Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -169,6 +185,7 @@ itemBases["Advanced Composite Bow"] = { itemBases["Advanced Dualstring Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -180,6 +197,7 @@ itemBases["Advanced Dualstring Bow"] = { itemBases["Advanced Cultist Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -190,6 +208,7 @@ itemBases["Advanced Cultist Bow"] = { itemBases["Advanced Zealot Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -200,6 +219,7 @@ itemBases["Advanced Zealot Bow"] = { itemBases["Expert Shortbow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -210,6 +230,7 @@ itemBases["Expert Shortbow"] = { itemBases["Expert Composite Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -220,6 +241,7 @@ itemBases["Expert Composite Bow"] = { itemBases["Expert Warden Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -231,6 +253,7 @@ itemBases["Expert Warden Bow"] = { itemBases["Expert Dualstring Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -242,6 +265,7 @@ itemBases["Expert Dualstring Bow"] = { itemBases["Expert Cultist Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, @@ -252,6 +276,7 @@ itemBases["Expert Cultist Bow"] = { itemBases["Expert Zealot Bow"] = { class = "Bow", category = "Bow", + label = "Bow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, diff --git a/src/Data/Bases/claw.lua b/src/Data/Bases/claw.lua index ef84d55752..66f708eebf 100644 --- a/src/Data/Bases/claw.lua +++ b/src/Data/Bases/claw.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Crude Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -15,6 +16,7 @@ itemBases["Crude Claw"] = { itemBases["Pict Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -25,6 +27,7 @@ itemBases["Pict Claw"] = { itemBases["Wolfbone Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -36,6 +39,7 @@ itemBases["Wolfbone Claw"] = { itemBases["Forked Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -46,6 +50,7 @@ itemBases["Forked Claw"] = { itemBases["Plated Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -56,6 +61,7 @@ itemBases["Plated Claw"] = { itemBases["Edged Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -67,6 +73,7 @@ itemBases["Edged Claw"] = { itemBases["Arced Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -77,6 +84,7 @@ itemBases["Arced Claw"] = { itemBases["Hooked Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -87,6 +95,7 @@ itemBases["Hooked Claw"] = { itemBases["Razorglass Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -97,6 +106,7 @@ itemBases["Razorglass Claw"] = { itemBases["Sharktooth Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -107,6 +117,7 @@ itemBases["Sharktooth Claw"] = { itemBases["Armoured Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -117,6 +128,7 @@ itemBases["Armoured Claw"] = { itemBases["Piercing Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, @@ -127,6 +139,7 @@ itemBases["Piercing Claw"] = { itemBases["Talon Claw"] = { class = "Claw", category = "Claw", + label = "Claw", quality = 20, socketLimit = 2, tags = { onehand = true, default = true, weapon = true, one_hand_weapon = true, claw = true, }, diff --git a/src/Data/Bases/crossbow.lua b/src/Data/Bases/crossbow.lua index 3f132911f6..3c0ad8d226 100644 --- a/src/Data/Bases/crossbow.lua +++ b/src/Data/Bases/crossbow.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Makeshift Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -15,6 +16,7 @@ itemBases["Makeshift Crossbow"] = { itemBases["Tense Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -26,6 +28,7 @@ itemBases["Tense Crossbow"] = { itemBases["Sturdy Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -36,6 +39,7 @@ itemBases["Sturdy Crossbow"] = { itemBases["Varnished Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -46,6 +50,7 @@ itemBases["Varnished Crossbow"] = { itemBases["Dyad Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -57,6 +62,7 @@ itemBases["Dyad Crossbow"] = { itemBases["Alloy Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -67,6 +73,7 @@ itemBases["Alloy Crossbow"] = { itemBases["Bombard Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -78,6 +85,7 @@ itemBases["Bombard Crossbow"] = { itemBases["Construct Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -88,6 +96,7 @@ itemBases["Construct Crossbow"] = { itemBases["Blackfire Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -98,6 +107,7 @@ itemBases["Blackfire Crossbow"] = { itemBases["Piercing Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -109,6 +119,7 @@ itemBases["Piercing Crossbow"] = { itemBases["Cumbrous Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -120,6 +131,7 @@ itemBases["Cumbrous Crossbow"] = { itemBases["Dedalian Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -130,6 +142,7 @@ itemBases["Dedalian Crossbow"] = { itemBases["Esoteric Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -140,6 +153,7 @@ itemBases["Esoteric Crossbow"] = { itemBases["Advanced Tense Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -151,6 +165,7 @@ itemBases["Advanced Tense Crossbow"] = { itemBases["Advanced Sturdy Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -161,6 +176,7 @@ itemBases["Advanced Sturdy Crossbow"] = { itemBases["Advanced Varnished Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -171,6 +187,7 @@ itemBases["Advanced Varnished Crossbow"] = { itemBases["Advanced Dyad Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -182,6 +199,7 @@ itemBases["Advanced Dyad Crossbow"] = { itemBases["Advanced Bombard Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -193,6 +211,7 @@ itemBases["Advanced Bombard Crossbow"] = { itemBases["Advanced Forlorn Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -203,6 +222,7 @@ itemBases["Advanced Forlorn Crossbow"] = { itemBases["Expert Sturdy Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -213,6 +233,7 @@ itemBases["Expert Sturdy Crossbow"] = { itemBases["Expert Varnished Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -223,6 +244,7 @@ itemBases["Expert Varnished Crossbow"] = { itemBases["Expert Tense Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -234,6 +256,7 @@ itemBases["Expert Tense Crossbow"] = { itemBases["Expert Dyad Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -245,6 +268,7 @@ itemBases["Expert Dyad Crossbow"] = { itemBases["Expert Bombard Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, @@ -256,6 +280,7 @@ itemBases["Expert Bombard Crossbow"] = { itemBases["Expert Forlorn Crossbow"] = { class = "Crossbow", category = "Crossbow", + label = "Crossbow", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ranged = true, weapon = true, twohand = true, crossbow = true, default = true, }, diff --git a/src/Data/Bases/dagger.lua b/src/Data/Bases/dagger.lua index 5e09de5843..3357b99a15 100644 --- a/src/Data/Bases/dagger.lua +++ b/src/Data/Bases/dagger.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Ethereal Blade"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, hidden = true, socketLimit = 2, @@ -16,6 +17,7 @@ itemBases["Ethereal Blade"] = { itemBases["Glass Shank"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -26,6 +28,7 @@ itemBases["Glass Shank"] = { itemBases["Crone Knife"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -37,6 +40,7 @@ itemBases["Crone Knife"] = { itemBases["Simple Dagger"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -47,6 +51,7 @@ itemBases["Simple Dagger"] = { itemBases["Skinning Knife"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -57,6 +62,7 @@ itemBases["Skinning Knife"] = { itemBases["Moon Dagger"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -67,6 +73,7 @@ itemBases["Moon Dagger"] = { itemBases["Engraved Knife"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -77,6 +84,7 @@ itemBases["Engraved Knife"] = { itemBases["Obsidian Dagger"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -87,6 +95,7 @@ itemBases["Obsidian Dagger"] = { itemBases["Bloodletting Dagger"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -98,6 +107,7 @@ itemBases["Bloodletting Dagger"] = { itemBases["Mail Breaker"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -109,6 +119,7 @@ itemBases["Mail Breaker"] = { itemBases["Kris Knife"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -119,6 +130,7 @@ itemBases["Kris Knife"] = { itemBases["Parrying Dagger"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -129,6 +141,7 @@ itemBases["Parrying Dagger"] = { itemBases["Arcane Dirk"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, @@ -139,6 +152,7 @@ itemBases["Arcane Dirk"] = { itemBases["Cinquedea"] = { class = "Dagger", category = "Dagger", + label = "Dagger", quality = 20, socketLimit = 2, tags = { onehand = true, one_hand_weapon = true, weapon = true, dagger = true, default = true, }, diff --git a/src/Data/Bases/flask.lua b/src/Data/Bases/flask.lua index 96aeaadabc..75cf9eb40c 100644 --- a/src/Data/Bases/flask.lua +++ b/src/Data/Bases/flask.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Thawing Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you become Frozen", @@ -15,6 +16,7 @@ itemBases["Thawing Charm"] = { itemBases["Staunching Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you start Bleeding", @@ -25,6 +27,7 @@ itemBases["Staunching Charm"] = { itemBases["Antidote Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you become Poisoned", @@ -35,6 +38,7 @@ itemBases["Antidote Charm"] = { itemBases["Dousing Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you become Ignited", @@ -45,6 +49,7 @@ itemBases["Dousing Charm"] = { itemBases["Grounding Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you become Shocked", @@ -55,6 +60,7 @@ itemBases["Grounding Charm"] = { itemBases["Stone Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you become Stunned", @@ -65,6 +71,7 @@ itemBases["Stone Charm"] = { itemBases["Silver Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you are affected by a Slow", @@ -75,6 +82,7 @@ itemBases["Silver Charm"] = { itemBases["Ruby Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you take Fire damage from a Hit", @@ -85,6 +93,7 @@ itemBases["Ruby Charm"] = { itemBases["Sapphire Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you take Cold damage from a Hit", @@ -95,6 +104,7 @@ itemBases["Sapphire Charm"] = { itemBases["Topaz Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you take Lightning damage from a Hit", @@ -105,6 +115,7 @@ itemBases["Topaz Charm"] = { itemBases["Amethyst Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you take Chaos damage from a Hit", @@ -115,6 +126,7 @@ itemBases["Amethyst Charm"] = { itemBases["Golden Charm"] = { class = "UtilityFlask", category = "Charm", + label = "Charm", quality = 20, tags = { flask = true, utility_flask = true, default = true, }, implicit = "Used when you Kill a Rare or Unique Enemy", @@ -126,6 +138,7 @@ itemBases["Golden Charm"] = { itemBases["Lesser Life Flask"] = { class = "LifeFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -135,6 +148,7 @@ itemBases["Lesser Life Flask"] = { itemBases["Medium Life Flask"] = { class = "LifeFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -144,6 +158,7 @@ itemBases["Medium Life Flask"] = { itemBases["Greater Life Flask"] = { class = "LifeFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -153,6 +168,7 @@ itemBases["Greater Life Flask"] = { itemBases["Grand Life Flask"] = { class = "LifeFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -162,6 +178,7 @@ itemBases["Grand Life Flask"] = { itemBases["Giant Life Flask"] = { class = "LifeFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -171,6 +188,7 @@ itemBases["Giant Life Flask"] = { itemBases["Colossal Life Flask"] = { class = "LifeFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -180,6 +198,7 @@ itemBases["Colossal Life Flask"] = { itemBases["Gargantuan Life Flask"] = { class = "LifeFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -189,6 +208,7 @@ itemBases["Gargantuan Life Flask"] = { itemBases["Transcendent Life Flask"] = { class = "LifeFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -198,6 +218,7 @@ itemBases["Transcendent Life Flask"] = { itemBases["Ultimate Life Flask"] = { class = "LifeFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, life_flask = true, default = true, }, implicitModTypes = { }, @@ -208,6 +229,7 @@ itemBases["Ultimate Life Flask"] = { itemBases["Lesser Mana Flask"] = { class = "ManaFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -217,6 +239,7 @@ itemBases["Lesser Mana Flask"] = { itemBases["Medium Mana Flask"] = { class = "ManaFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -226,6 +249,7 @@ itemBases["Medium Mana Flask"] = { itemBases["Greater Mana Flask"] = { class = "ManaFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -235,6 +259,7 @@ itemBases["Greater Mana Flask"] = { itemBases["Grand Mana Flask"] = { class = "ManaFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -244,6 +269,7 @@ itemBases["Grand Mana Flask"] = { itemBases["Giant Mana Flask"] = { class = "ManaFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -253,6 +279,7 @@ itemBases["Giant Mana Flask"] = { itemBases["Colossal Mana Flask"] = { class = "ManaFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -262,6 +289,7 @@ itemBases["Colossal Mana Flask"] = { itemBases["Gargantuan Mana Flask"] = { class = "ManaFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -271,6 +299,7 @@ itemBases["Gargantuan Mana Flask"] = { itemBases["Transcendent Mana Flask"] = { class = "ManaFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, @@ -280,6 +309,7 @@ itemBases["Transcendent Mana Flask"] = { itemBases["Ultimate Mana Flask"] = { class = "ManaFlask", category = "Flask", + label = "Flask", quality = 20, tags = { flask = true, mana_flask = true, default = true, }, implicitModTypes = { }, diff --git a/src/Data/Bases/focus.lua b/src/Data/Bases/focus.lua index d2125b72dc..66f6fb8260 100644 --- a/src/Data/Bases/focus.lua +++ b/src/Data/Bases/focus.lua @@ -2,10 +2,10 @@ -- Item data (c) Grinding Gear Games local itemBases = ... - itemBases["Twig Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { focus = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, @@ -17,6 +17,7 @@ itemBases["Twig Focus"] = { itemBases["Woven Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { focus = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, @@ -28,6 +29,7 @@ itemBases["Woven Focus"] = { itemBases["Antler Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { focus = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, @@ -39,6 +41,7 @@ itemBases["Antler Focus"] = { itemBases["Engraved Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, focus = true, int_armour = true, armour = true, default = true, }, @@ -50,6 +53,7 @@ itemBases["Engraved Focus"] = { itemBases["Tonal Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, focus = true, int_armour = true, armour = true, default = true, }, @@ -61,6 +65,7 @@ itemBases["Tonal Focus"] = { itemBases["Crystal Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, focus = true, int_armour = true, armour = true, default = true, }, @@ -72,6 +77,7 @@ itemBases["Crystal Focus"] = { itemBases["Voodoo Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { focus = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -83,6 +89,7 @@ itemBases["Voodoo Focus"] = { itemBases["Plumed Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { focus = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -94,6 +101,7 @@ itemBases["Plumed Focus"] = { itemBases["Jade Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -105,6 +113,7 @@ itemBases["Jade Focus"] = { itemBases["Paua Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -116,6 +125,7 @@ itemBases["Paua Focus"] = { itemBases["Elegant Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -127,6 +137,7 @@ itemBases["Elegant Focus"] = { itemBases["Attuned Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -138,6 +149,7 @@ itemBases["Attuned Focus"] = { itemBases["Magus Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -149,6 +161,7 @@ itemBases["Magus Focus"] = { itemBases["Advanced Woven Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -160,6 +173,7 @@ itemBases["Advanced Woven Focus"] = { itemBases["Advanced Antler Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -171,6 +185,7 @@ itemBases["Advanced Antler Focus"] = { itemBases["Advanced Tonal Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -182,6 +197,7 @@ itemBases["Advanced Tonal Focus"] = { itemBases["Advanced Crystal Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -193,6 +209,7 @@ itemBases["Advanced Crystal Focus"] = { itemBases["Advanced Voodoo Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -204,6 +221,7 @@ itemBases["Advanced Voodoo Focus"] = { itemBases["Advanced Plumed Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -215,6 +233,7 @@ itemBases["Advanced Plumed Focus"] = { itemBases["Expert Antler Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -226,6 +245,7 @@ itemBases["Expert Antler Focus"] = { itemBases["Expert Crystal Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, @@ -237,6 +257,7 @@ itemBases["Expert Crystal Focus"] = { itemBases["Expert Plumed Focus"] = { class = "Focus", category = "Focus", + label = "Focus", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, focus = true, default = true, }, diff --git a/src/Data/Bases/gloves.lua b/src/Data/Bases/gloves.lua index 54fbc9f6c5..ca43abbc85 100644 --- a/src/Data/Bases/gloves.lua +++ b/src/Data/Bases/gloves.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Golden Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, not_for_sale = true, armour = true, demigods = true, default = true, }, @@ -16,6 +17,7 @@ itemBases["Golden Bracers"] = { itemBases["Stocky Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, @@ -27,6 +29,7 @@ itemBases["Stocky Mitts"] = { itemBases["Riveted Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, str_armour = true, armour = true, ezomyte_basetype = true, default = true, }, @@ -38,6 +41,7 @@ itemBases["Riveted Mitts"] = { itemBases["Tempered Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, str_armour = true, armour = true, default = true, }, @@ -49,6 +53,7 @@ itemBases["Tempered Mitts"] = { itemBases["Bolstered Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, str_armour = true, armour = true, default = true, }, @@ -60,6 +65,7 @@ itemBases["Bolstered Mitts"] = { itemBases["Moulded Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, str_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -71,6 +77,7 @@ itemBases["Moulded Mitts"] = { itemBases["Detailed Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, @@ -82,6 +89,7 @@ itemBases["Detailed Mitts"] = { itemBases["Titan Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, @@ -93,6 +101,7 @@ itemBases["Titan Mitts"] = { itemBases["Grand Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, @@ -104,6 +113,7 @@ itemBases["Grand Mitts"] = { itemBases["Suede Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, @@ -115,6 +125,7 @@ itemBases["Suede Bracers"] = { itemBases["Firm Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, ezomyte_basetype = true, dex_armour = true, armour = true, default = true, }, @@ -126,6 +137,7 @@ itemBases["Firm Bracers"] = { itemBases["Bound Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, dex_armour = true, armour = true, default = true, }, @@ -137,6 +149,7 @@ itemBases["Bound Bracers"] = { itemBases["Sectioned Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, dex_armour = true, armour = true, default = true, }, @@ -148,6 +161,7 @@ itemBases["Sectioned Bracers"] = { itemBases["Spined Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, dex_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -159,6 +173,7 @@ itemBases["Spined Bracers"] = { itemBases["Fine Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, @@ -170,6 +185,7 @@ itemBases["Fine Bracers"] = { itemBases["Hardened Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, @@ -181,6 +197,7 @@ itemBases["Hardened Bracers"] = { itemBases["Engraved Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, @@ -192,6 +209,7 @@ itemBases["Engraved Bracers"] = { itemBases["Torn Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, @@ -203,6 +221,7 @@ itemBases["Torn Gloves"] = { itemBases["Sombre Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, ezomyte_basetype = true, int_armour = true, armour = true, default = true, }, @@ -214,6 +233,7 @@ itemBases["Sombre Gloves"] = { itemBases["Stitched Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, int_armour = true, armour = true, default = true, }, @@ -225,6 +245,7 @@ itemBases["Stitched Gloves"] = { itemBases["Jewelled Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, int_armour = true, armour = true, default = true, }, @@ -236,6 +257,7 @@ itemBases["Jewelled Gloves"] = { itemBases["Intricate Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, int_armour = true, armour = true, vaal_basetype = true, default = true, }, @@ -247,6 +269,7 @@ itemBases["Intricate Gloves"] = { itemBases["Pauascale Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, @@ -258,6 +281,7 @@ itemBases["Pauascale Gloves"] = { itemBases["Embroidered Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, @@ -269,6 +293,7 @@ itemBases["Embroidered Gloves"] = { itemBases["Adorned Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, @@ -280,6 +305,7 @@ itemBases["Adorned Gloves"] = { itemBases["Ringmail Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, armour = true, gloves = true, default = true, }, @@ -291,6 +317,7 @@ itemBases["Ringmail Gauntlets"] = { itemBases["Layered Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, armour = true, gloves = true, default = true, }, @@ -302,6 +329,7 @@ itemBases["Layered Gauntlets"] = { itemBases["Doubled Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, vaal_basetype = true, armour = true, gloves = true, default = true, }, @@ -313,6 +341,7 @@ itemBases["Doubled Gauntlets"] = { itemBases["Plate Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, @@ -324,6 +353,7 @@ itemBases["Plate Gauntlets"] = { itemBases["Burnished Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, @@ -335,6 +365,7 @@ itemBases["Burnished Gauntlets"] = { itemBases["Ornate Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, @@ -346,6 +377,7 @@ itemBases["Ornate Gauntlets"] = { itemBases["Rope Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, armour = true, gloves = true, default = true, }, @@ -357,6 +389,7 @@ itemBases["Rope Cuffs"] = { itemBases["Aged Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, armour = true, gloves = true, default = true, }, @@ -368,6 +401,7 @@ itemBases["Aged Cuffs"] = { itemBases["Goldcast Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, vaal_basetype = true, armour = true, gloves = true, default = true, }, @@ -379,6 +413,7 @@ itemBases["Goldcast Cuffs"] = { itemBases["Diviner Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, @@ -390,6 +425,7 @@ itemBases["Diviner Cuffs"] = { itemBases["Righteous Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, @@ -401,6 +437,7 @@ itemBases["Righteous Cuffs"] = { itemBases["Signet Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, @@ -412,6 +449,7 @@ itemBases["Signet Cuffs"] = { itemBases["Gauze Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, ezomyte_basetype = true, armour = true, default = true, dex_int_armour = true, }, @@ -423,6 +461,7 @@ itemBases["Gauze Wraps"] = { itemBases["Linen Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, gloves = true, armour = true, default = true, dex_int_armour = true, }, @@ -434,6 +473,7 @@ itemBases["Linen Wraps"] = { itemBases["Spiral Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, vaal_basetype = true, armour = true, default = true, dex_int_armour = true, }, @@ -445,6 +485,7 @@ itemBases["Spiral Wraps"] = { itemBases["Buckled Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, @@ -456,6 +497,7 @@ itemBases["Buckled Wraps"] = { itemBases["Furtive Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, @@ -467,6 +509,7 @@ itemBases["Furtive Wraps"] = { itemBases["Utility Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, @@ -478,6 +521,7 @@ itemBases["Utility Wraps"] = { itemBases["Grand Manchettes"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_int_armour = true, armour = true, gloves = true, default = true, }, @@ -489,6 +533,7 @@ itemBases["Grand Manchettes"] = { itemBases["Advanced Riveted Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, @@ -500,6 +545,7 @@ itemBases["Advanced Riveted Mitts"] = { itemBases["Advanced Tempered Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, @@ -511,6 +557,7 @@ itemBases["Advanced Tempered Mitts"] = { itemBases["Advanced Bolstered Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, @@ -522,6 +569,7 @@ itemBases["Advanced Bolstered Mitts"] = { itemBases["Advanced Moulded Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, @@ -533,6 +581,7 @@ itemBases["Advanced Moulded Mitts"] = { itemBases["Advanced Firm Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, @@ -544,6 +593,7 @@ itemBases["Advanced Firm Bracers"] = { itemBases["Advanced Bound Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, @@ -555,6 +605,7 @@ itemBases["Advanced Bound Bracers"] = { itemBases["Advanced Sectioned Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, @@ -566,6 +617,7 @@ itemBases["Advanced Sectioned Bracers"] = { itemBases["Advanced Spined Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, @@ -577,6 +629,7 @@ itemBases["Advanced Spined Bracers"] = { itemBases["Advanced Sombre Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, @@ -588,6 +641,7 @@ itemBases["Advanced Sombre Gloves"] = { itemBases["Advanced Stitched Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, @@ -599,6 +653,7 @@ itemBases["Advanced Stitched Gloves"] = { itemBases["Advanced Jewelled Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, @@ -610,6 +665,7 @@ itemBases["Advanced Jewelled Gloves"] = { itemBases["Advanced Intricate Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, @@ -621,6 +677,7 @@ itemBases["Advanced Intricate Gloves"] = { itemBases["Advanced Ringmail Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, @@ -632,6 +689,7 @@ itemBases["Advanced Ringmail Gauntlets"] = { itemBases["Advanced Layered Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, @@ -643,6 +701,7 @@ itemBases["Advanced Layered Gauntlets"] = { itemBases["Advanced Doubled Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, @@ -654,6 +713,7 @@ itemBases["Advanced Doubled Gauntlets"] = { itemBases["Advanced Rope Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, @@ -665,6 +725,7 @@ itemBases["Advanced Rope Cuffs"] = { itemBases["Advanced Aged Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, @@ -676,6 +737,7 @@ itemBases["Advanced Aged Cuffs"] = { itemBases["Advanced Goldcast Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, @@ -687,6 +749,7 @@ itemBases["Advanced Goldcast Cuffs"] = { itemBases["Advanced Gauze Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, @@ -698,6 +761,7 @@ itemBases["Advanced Gauze Wraps"] = { itemBases["Advanced Linen Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, @@ -709,6 +773,7 @@ itemBases["Advanced Linen Wraps"] = { itemBases["Advanced Spiral Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, @@ -720,6 +785,7 @@ itemBases["Advanced Spiral Wraps"] = { itemBases["Expert Riveted Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, @@ -731,6 +797,7 @@ itemBases["Expert Riveted Mitts"] = { itemBases["Expert Bolstered Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, @@ -742,6 +809,7 @@ itemBases["Expert Bolstered Mitts"] = { itemBases["Expert Moulded Mitts"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { gloves = true, armour = true, str_armour = true, default = true, }, @@ -753,6 +821,7 @@ itemBases["Expert Moulded Mitts"] = { itemBases["Expert Firm Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, @@ -764,6 +833,7 @@ itemBases["Expert Firm Bracers"] = { itemBases["Expert Sectioned Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, @@ -775,6 +845,7 @@ itemBases["Expert Sectioned Bracers"] = { itemBases["Expert Spined Bracers"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_armour = true, armour = true, gloves = true, default = true, }, @@ -786,6 +857,7 @@ itemBases["Expert Spined Bracers"] = { itemBases["Expert Sombre Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, @@ -797,6 +869,7 @@ itemBases["Expert Sombre Gloves"] = { itemBases["Expert Jewelled Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, @@ -808,6 +881,7 @@ itemBases["Expert Jewelled Gloves"] = { itemBases["Expert Intricate Gloves"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { int_armour = true, armour = true, gloves = true, default = true, }, @@ -819,6 +893,7 @@ itemBases["Expert Intricate Gloves"] = { itemBases["Expert Ringmail Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, @@ -830,6 +905,7 @@ itemBases["Expert Ringmail Gauntlets"] = { itemBases["Expert Layered Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, @@ -841,6 +917,7 @@ itemBases["Expert Layered Gauntlets"] = { itemBases["Expert Doubled Gauntlets"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, armour = true, gloves = true, default = true, }, @@ -852,6 +929,7 @@ itemBases["Expert Doubled Gauntlets"] = { itemBases["Expert Rope Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, @@ -863,6 +941,7 @@ itemBases["Expert Rope Cuffs"] = { itemBases["Expert Aged Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, @@ -874,6 +953,7 @@ itemBases["Expert Aged Cuffs"] = { itemBases["Expert Goldcast Cuffs"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { str_int_armour = true, armour = true, gloves = true, default = true, }, @@ -885,6 +965,7 @@ itemBases["Expert Goldcast Cuffs"] = { itemBases["Expert Gauze Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, @@ -896,6 +977,7 @@ itemBases["Expert Gauze Wraps"] = { itemBases["Expert Linen Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, @@ -907,6 +989,7 @@ itemBases["Expert Linen Wraps"] = { itemBases["Expert Spiral Wraps"] = { class = "Gloves", category = "Gloves", + label = "Gloves", quality = 20, socketLimit = 2, tags = { dex_int_armour = true, armour = true, gloves = true, default = true, }, diff --git a/src/Data/Bases/helmet.lua b/src/Data/Bases/helmet.lua index 3b80aab773..ae55e3fbe1 100644 --- a/src/Data/Bases/helmet.lua +++ b/src/Data/Bases/helmet.lua @@ -2,10 +2,10 @@ -- Item data (c) Grinding Gear Games local itemBases = ... - itemBases["Golden Wreath"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { not_for_sale = true, helmet = true, armour = true, demigods = true, default = true, }, @@ -17,6 +17,7 @@ itemBases["Golden Wreath"] = { itemBases["Golden Visage"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { not_for_sale = true, helmet = true, armour = true, demigods = true, default = true, }, @@ -28,6 +29,7 @@ itemBases["Golden Visage"] = { itemBases["Rusted Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { str_armour = true, helmet = true, armour = true, ezomyte_basetype = true, default = true, }, @@ -39,6 +41,7 @@ itemBases["Rusted Greathelm"] = { itemBases["Soldier Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { str_armour = true, helmet = true, armour = true, ezomyte_basetype = true, default = true, }, @@ -50,6 +53,7 @@ itemBases["Soldier Greathelm"] = { itemBases["Wrapped Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_armour = true, helmet = true, armour = true, default = true, }, @@ -61,6 +65,7 @@ itemBases["Wrapped Greathelm"] = { itemBases["Spired Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_armour = true, helmet = true, armour = true, default = true, }, @@ -72,6 +77,7 @@ itemBases["Spired Greathelm"] = { itemBases["Elite Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { str_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, @@ -83,6 +89,7 @@ itemBases["Elite Greathelm"] = { itemBases["Warrior Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { str_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, @@ -94,6 +101,7 @@ itemBases["Warrior Greathelm"] = { itemBases["Commander Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -105,6 +113,7 @@ itemBases["Commander Greathelm"] = { itemBases["Fierce Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -116,6 +125,7 @@ itemBases["Fierce Greathelm"] = { itemBases["Dueling Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -127,6 +137,7 @@ itemBases["Dueling Greathelm"] = { itemBases["Goliath Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -138,6 +149,7 @@ itemBases["Goliath Greathelm"] = { itemBases["Guardian Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -149,6 +161,7 @@ itemBases["Guardian Greathelm"] = { itemBases["Shabby Hood"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, dex_armour = true, helmet = true, armour = true, default = true, }, @@ -160,6 +173,7 @@ itemBases["Shabby Hood"] = { itemBases["Felt Cap"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, dex_armour = true, helmet = true, armour = true, default = true, }, @@ -171,6 +185,7 @@ itemBases["Felt Cap"] = { itemBases["Lace Hood"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, dex_armour = true, helmet = true, armour = true, default = true, }, @@ -182,6 +197,7 @@ itemBases["Lace Hood"] = { itemBases["Swathed Cap"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, dex_armour = true, helmet = true, armour = true, default = true, }, @@ -193,6 +209,7 @@ itemBases["Swathed Cap"] = { itemBases["Hunter Hood"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { dex_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, @@ -204,6 +221,7 @@ itemBases["Hunter Hood"] = { itemBases["Viper Cap"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { dex_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, @@ -215,6 +233,7 @@ itemBases["Viper Cap"] = { itemBases["Corsair Cap"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -226,6 +245,7 @@ itemBases["Corsair Cap"] = { itemBases["Leatherbound Hood"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -237,6 +257,7 @@ itemBases["Leatherbound Hood"] = { itemBases["Velvet Cap"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -248,6 +269,7 @@ itemBases["Velvet Cap"] = { itemBases["Covert Hood"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -259,6 +281,7 @@ itemBases["Covert Hood"] = { itemBases["Armoured Cap"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -270,6 +293,7 @@ itemBases["Armoured Cap"] = { itemBases["Twig Circlet"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, int_armour = true, helmet = true, armour = true, default = true, }, @@ -281,6 +305,7 @@ itemBases["Twig Circlet"] = { itemBases["Wicker Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, int_armour = true, helmet = true, armour = true, default = true, }, @@ -292,6 +317,7 @@ itemBases["Wicker Tiara"] = { itemBases["Beaded Circlet"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, int_armour = true, helmet = true, armour = true, default = true, }, @@ -303,6 +329,7 @@ itemBases["Beaded Circlet"] = { itemBases["Chain Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, int_armour = true, helmet = true, armour = true, default = true, }, @@ -314,6 +341,7 @@ itemBases["Chain Tiara"] = { itemBases["Feathered Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { int_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, @@ -325,6 +353,7 @@ itemBases["Feathered Tiara"] = { itemBases["Gold Circlet"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { int_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, @@ -336,6 +365,7 @@ itemBases["Gold Circlet"] = { itemBases["Coral Circlet"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -347,6 +377,7 @@ itemBases["Coral Circlet"] = { itemBases["Jade Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -358,6 +389,7 @@ itemBases["Jade Tiara"] = { itemBases["Noble Circlet"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -369,6 +401,7 @@ itemBases["Noble Circlet"] = { itemBases["Twilight Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -380,6 +413,7 @@ itemBases["Twilight Tiara"] = { itemBases["Magus Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -391,6 +425,7 @@ itemBases["Magus Tiara"] = { itemBases["Brimmed Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, helmet = true, armour = true, default = true, }, @@ -402,6 +437,7 @@ itemBases["Brimmed Helm"] = { itemBases["Guarded Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, helmet = true, armour = true, default = true, }, @@ -413,6 +449,7 @@ itemBases["Guarded Helm"] = { itemBases["Visored Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, helmet = true, armour = true, default = true, }, @@ -424,6 +461,7 @@ itemBases["Visored Helm"] = { itemBases["Cowled Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, helmet = true, armour = true, default = true, }, @@ -435,6 +473,7 @@ itemBases["Cowled Helm"] = { itemBases["Shielded Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, @@ -446,6 +485,7 @@ itemBases["Shielded Helm"] = { itemBases["Closed Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -457,6 +497,7 @@ itemBases["Closed Helm"] = { itemBases["Decorated Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -468,6 +509,7 @@ itemBases["Decorated Helm"] = { itemBases["Gallant Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -479,6 +521,7 @@ itemBases["Gallant Helm"] = { itemBases["Iron Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, helmet = true, armour = true, default = true, }, @@ -490,6 +533,7 @@ itemBases["Iron Crown"] = { itemBases["Horned Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, helmet = true, armour = true, default = true, }, @@ -501,6 +545,7 @@ itemBases["Horned Crown"] = { itemBases["Cultist Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, helmet = true, armour = true, default = true, }, @@ -512,6 +557,7 @@ itemBases["Cultist Crown"] = { itemBases["Martyr Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, helmet = true, armour = true, default = true, }, @@ -523,6 +569,7 @@ itemBases["Martyr Crown"] = { itemBases["Heavy Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { str_int_armour = true, helmet = true, armour = true, vaal_basetype = true, default = true, }, @@ -534,6 +581,7 @@ itemBases["Heavy Crown"] = { itemBases["Spiritbone Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -545,6 +593,7 @@ itemBases["Spiritbone Crown"] = { itemBases["Lavish Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -556,6 +605,7 @@ itemBases["Lavish Crown"] = { itemBases["Templar Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -567,6 +617,7 @@ itemBases["Templar Crown"] = { itemBases["Hewn Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, helmet = true, armour = true, default = true, dex_int_armour = true, }, @@ -578,6 +629,7 @@ itemBases["Hewn Mask"] = { itemBases["Face Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { ezomyte_basetype = true, helmet = true, armour = true, default = true, dex_int_armour = true, }, @@ -589,6 +641,7 @@ itemBases["Face Mask"] = { itemBases["Hooded Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, helmet = true, armour = true, default = true, dex_int_armour = true, }, @@ -600,6 +653,7 @@ itemBases["Hooded Mask"] = { itemBases["Veiled Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, helmet = true, armour = true, default = true, dex_int_armour = true, }, @@ -611,6 +665,7 @@ itemBases["Veiled Mask"] = { itemBases["Tribal Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { vaal_basetype = true, helmet = true, armour = true, default = true, dex_int_armour = true, }, @@ -622,6 +677,7 @@ itemBases["Tribal Mask"] = { itemBases["Solid Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, @@ -633,6 +689,7 @@ itemBases["Solid Mask"] = { itemBases["Shaded Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, @@ -644,6 +701,7 @@ itemBases["Shaded Mask"] = { itemBases["Death Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, @@ -655,6 +713,7 @@ itemBases["Death Mask"] = { itemBases["Grand Visage"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_int_armour = true, default = true, }, @@ -666,6 +725,7 @@ itemBases["Grand Visage"] = { itemBases["Advanced Rusted Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -677,6 +737,7 @@ itemBases["Advanced Rusted Greathelm"] = { itemBases["Advanced Soldier Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -688,6 +749,7 @@ itemBases["Advanced Soldier Greathelm"] = { itemBases["Advanced Wrapped Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -699,6 +761,7 @@ itemBases["Advanced Wrapped Greathelm"] = { itemBases["Advanced Spired Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -710,6 +773,7 @@ itemBases["Advanced Spired Greathelm"] = { itemBases["Advanced Elite Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -721,6 +785,7 @@ itemBases["Advanced Elite Greathelm"] = { itemBases["Advanced Shabby Hood"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -732,6 +797,7 @@ itemBases["Advanced Shabby Hood"] = { itemBases["Advanced Felt Cap"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -743,6 +809,7 @@ itemBases["Advanced Felt Cap"] = { itemBases["Advanced Lace Hood"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -754,6 +821,7 @@ itemBases["Advanced Lace Hood"] = { itemBases["Advanced Swathed Cap"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -765,6 +833,7 @@ itemBases["Advanced Swathed Cap"] = { itemBases["Advanced Hunter Hood"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -776,6 +845,7 @@ itemBases["Advanced Hunter Hood"] = { itemBases["Advanced Twig Circlet"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -787,6 +857,7 @@ itemBases["Advanced Twig Circlet"] = { itemBases["Advanced Wicker Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -798,6 +869,7 @@ itemBases["Advanced Wicker Tiara"] = { itemBases["Advanced Beaded Circlet"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -809,6 +881,7 @@ itemBases["Advanced Beaded Circlet"] = { itemBases["Advanced Chain Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -820,6 +893,7 @@ itemBases["Advanced Chain Tiara"] = { itemBases["Advanced Feathered Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -831,6 +905,7 @@ itemBases["Advanced Feathered Tiara"] = { itemBases["Advanced Brimmed Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -842,6 +917,7 @@ itemBases["Advanced Brimmed Helm"] = { itemBases["Advanced Guarded Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -853,6 +929,7 @@ itemBases["Advanced Guarded Helm"] = { itemBases["Advanced Visored Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -864,6 +941,7 @@ itemBases["Advanced Visored Helm"] = { itemBases["Advanced Cowled Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -875,6 +953,7 @@ itemBases["Advanced Cowled Helm"] = { itemBases["Advanced Shielded Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -886,6 +965,7 @@ itemBases["Advanced Shielded Helm"] = { itemBases["Advanced Iron Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -897,6 +977,7 @@ itemBases["Advanced Iron Crown"] = { itemBases["Advanced Horned Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -908,6 +989,7 @@ itemBases["Advanced Horned Crown"] = { itemBases["Advanced Cultist Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -919,6 +1001,7 @@ itemBases["Advanced Cultist Crown"] = { itemBases["Advanced Martyr Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -930,6 +1013,7 @@ itemBases["Advanced Martyr Crown"] = { itemBases["Advanced Heavy Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -941,6 +1025,7 @@ itemBases["Advanced Heavy Crown"] = { itemBases["Advanced Hewn Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, @@ -952,6 +1037,7 @@ itemBases["Advanced Hewn Mask"] = { itemBases["Advanced Face Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, @@ -963,6 +1049,7 @@ itemBases["Advanced Face Mask"] = { itemBases["Advanced Hooded Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, @@ -974,6 +1061,7 @@ itemBases["Advanced Hooded Mask"] = { itemBases["Advanced Veiled Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, @@ -985,6 +1073,7 @@ itemBases["Advanced Veiled Mask"] = { itemBases["Advanced Tribal Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, @@ -996,6 +1085,7 @@ itemBases["Advanced Tribal Mask"] = { itemBases["Expert Soldier Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -1007,6 +1097,7 @@ itemBases["Expert Soldier Greathelm"] = { itemBases["Expert Spired Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -1018,6 +1109,7 @@ itemBases["Expert Spired Greathelm"] = { itemBases["Expert Elite Greathelm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_armour = true, default = true, }, @@ -1029,6 +1121,7 @@ itemBases["Expert Elite Greathelm"] = { itemBases["Expert Felt Cap"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -1040,6 +1133,7 @@ itemBases["Expert Felt Cap"] = { itemBases["Expert Swathed Cap"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -1051,6 +1145,7 @@ itemBases["Expert Swathed Cap"] = { itemBases["Expert Hunter Hood"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_armour = true, default = true, }, @@ -1062,6 +1157,7 @@ itemBases["Expert Hunter Hood"] = { itemBases["Expert Wicker Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -1073,6 +1169,7 @@ itemBases["Expert Wicker Tiara"] = { itemBases["Expert Chain Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -1084,6 +1181,7 @@ itemBases["Expert Chain Tiara"] = { itemBases["Expert Feathered Tiara"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, int_armour = true, default = true, }, @@ -1095,6 +1193,7 @@ itemBases["Expert Feathered Tiara"] = { itemBases["Expert Guarded Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -1106,6 +1205,7 @@ itemBases["Expert Guarded Helm"] = { itemBases["Expert Cowled Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -1117,6 +1217,7 @@ itemBases["Expert Cowled Helm"] = { itemBases["Expert Shielded Helm"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_dex_armour = true, default = true, }, @@ -1128,6 +1229,7 @@ itemBases["Expert Shielded Helm"] = { itemBases["Expert Horned Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -1139,6 +1241,7 @@ itemBases["Expert Horned Crown"] = { itemBases["Expert Martyr Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -1150,6 +1253,7 @@ itemBases["Expert Martyr Crown"] = { itemBases["Expert Heavy Crown"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, str_int_armour = true, default = true, }, @@ -1161,6 +1265,7 @@ itemBases["Expert Heavy Crown"] = { itemBases["Expert Face Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, @@ -1172,6 +1277,7 @@ itemBases["Expert Face Mask"] = { itemBases["Expert Veiled Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, @@ -1183,6 +1289,7 @@ itemBases["Expert Veiled Mask"] = { itemBases["Expert Tribal Mask"] = { class = "Helmet", category = "Helmet", + label = "Helmet", quality = 20, socketLimit = 2, tags = { helmet = true, armour = true, dex_int_armour = true, default = true, }, diff --git a/src/Data/Bases/jewel.lua b/src/Data/Bases/jewel.lua index 86eb6b7755..4facf62c06 100644 --- a/src/Data/Bases/jewel.lua +++ b/src/Data/Bases/jewel.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Ruby"] = { class = "Jewel", category = "Jewel", + label = "Jewel", tags = { strjewel = true, jewel = true, default = true, }, implicitModTypes = { }, req = { }, @@ -12,6 +13,7 @@ itemBases["Ruby"] = { itemBases["Emerald"] = { class = "Jewel", category = "Jewel", + label = "Jewel", tags = { dexjewel = true, jewel = true, default = true, }, implicitModTypes = { }, req = { }, @@ -19,6 +21,7 @@ itemBases["Emerald"] = { itemBases["Sapphire"] = { class = "Jewel", category = "Jewel", + label = "Jewel", tags = { jewel = true, intjewel = true, default = true, }, implicitModTypes = { }, req = { }, @@ -26,6 +29,7 @@ itemBases["Sapphire"] = { itemBases["Diamond"] = { class = "Jewel", category = "Jewel", + label = "Jewel", tags = { jewel = true, not_for_sale = true, default = true, }, implicitModTypes = { }, req = { }, @@ -34,6 +38,7 @@ itemBases["Diamond"] = { itemBases["Time-Lost Ruby"] = { class = "Jewel", category = "Jewel", + label = "Jewel", tags = { str_radius_jewel = true, not_for_sale = true, jewel = true, radius_jewel = true, default = true, }, implicitModTypes = { }, req = { }, @@ -41,6 +46,7 @@ itemBases["Time-Lost Ruby"] = { itemBases["Time-Lost Emerald"] = { class = "Jewel", category = "Jewel", + label = "Jewel", tags = { not_for_sale = true, jewel = true, dex_radius_jewel = true, radius_jewel = true, default = true, }, implicitModTypes = { }, req = { }, @@ -48,6 +54,7 @@ itemBases["Time-Lost Emerald"] = { itemBases["Time-Lost Sapphire"] = { class = "Jewel", category = "Jewel", + label = "Jewel", tags = { not_for_sale = true, radius_jewel = true, jewel = true, int_radius_jewel = true, default = true, }, implicitModTypes = { }, req = { }, @@ -55,6 +62,7 @@ itemBases["Time-Lost Sapphire"] = { itemBases["Time-Lost Diamond"] = { class = "Jewel", category = "Jewel", + label = "Jewel", tags = { not_for_sale = true, jewel = true, radius_jewel = true, default = true, }, implicitModTypes = { }, req = { }, @@ -63,6 +71,7 @@ itemBases["Time-Lost Diamond"] = { itemBases["Timeless Jewel"] = { class = "Jewel", category = "Jewel", + label = "Jewel", tags = { dexjewel = true, not_for_sale = true, strjewel = true, jewel = true, default = true, intjewel = true, }, implicitModTypes = { }, req = { }, diff --git a/src/Data/Bases/mace.lua b/src/Data/Bases/mace.lua index eff90b784c..d9dd8f7f48 100644 --- a/src/Data/Bases/mace.lua +++ b/src/Data/Bases/mace.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Wooden Club"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -15,6 +16,7 @@ itemBases["Wooden Club"] = { itemBases["Smithing Hammer"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -25,6 +27,7 @@ itemBases["Smithing Hammer"] = { itemBases["Slim Mace"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, ezomyte_basetype = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -35,6 +38,7 @@ itemBases["Slim Mace"] = { itemBases["Spiked Club"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -45,6 +49,7 @@ itemBases["Spiked Club"] = { itemBases["Warpick"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -56,6 +61,7 @@ itemBases["Warpick"] = { itemBases["Plated Mace"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -66,6 +72,7 @@ itemBases["Plated Mace"] = { itemBases["Brigand Mace"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -76,6 +83,7 @@ itemBases["Brigand Mace"] = { itemBases["Construct Hammer"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, vaal_basetype = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -87,6 +95,7 @@ itemBases["Construct Hammer"] = { itemBases["Morning Star"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -97,6 +106,7 @@ itemBases["Morning Star"] = { itemBases["Jade Club"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -108,6 +118,7 @@ itemBases["Jade Club"] = { itemBases["Lumen Mace"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -118,6 +129,7 @@ itemBases["Lumen Mace"] = { itemBases["Execratus Hammer"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -128,6 +140,7 @@ itemBases["Execratus Hammer"] = { itemBases["Torment Club"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -138,6 +151,7 @@ itemBases["Torment Club"] = { itemBases["Advanced Smithing Hammer"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -148,6 +162,7 @@ itemBases["Advanced Smithing Hammer"] = { itemBases["Advanced Slim Mace"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -158,6 +173,7 @@ itemBases["Advanced Slim Mace"] = { itemBases["Advanced Warpick"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -169,6 +185,7 @@ itemBases["Advanced Warpick"] = { itemBases["Advanced Plated Mace"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -179,6 +196,7 @@ itemBases["Advanced Plated Mace"] = { itemBases["Advanced Brigand Mace"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -189,6 +207,7 @@ itemBases["Advanced Brigand Mace"] = { itemBases["Advanced Construct Hammer"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -200,6 +219,7 @@ itemBases["Advanced Construct Hammer"] = { itemBases["Expert Slim Mace"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -210,6 +230,7 @@ itemBases["Expert Slim Mace"] = { itemBases["Expert Plated Mace"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -220,6 +241,7 @@ itemBases["Expert Plated Mace"] = { itemBases["Expert Smithing Hammer"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -230,6 +252,7 @@ itemBases["Expert Smithing Hammer"] = { itemBases["Expert Warpick"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -241,6 +264,7 @@ itemBases["Expert Warpick"] = { itemBases["Expert Construct Hammer"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -252,6 +276,7 @@ itemBases["Expert Construct Hammer"] = { itemBases["Expert Brigand Mace"] = { class = "One Hand Mace", category = "One Hand Mace", + label = "One Hand Mace", quality = 20, socketLimit = 2, tags = { onehand = true, mace = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -263,6 +288,7 @@ itemBases["Expert Brigand Mace"] = { itemBases["Felled Greatclub"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -273,6 +299,7 @@ itemBases["Felled Greatclub"] = { itemBases["Oak Greathammer"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -284,6 +311,7 @@ itemBases["Oak Greathammer"] = { itemBases["Forge Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -294,6 +322,7 @@ itemBases["Forge Maul"] = { itemBases["Studded Greatclub"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -304,6 +333,7 @@ itemBases["Studded Greatclub"] = { itemBases["Cultist Greathammer"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -315,6 +345,7 @@ itemBases["Cultist Greathammer"] = { itemBases["Temple Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -325,6 +356,7 @@ itemBases["Temple Maul"] = { itemBases["Leaden Greathammer"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -335,6 +367,7 @@ itemBases["Leaden Greathammer"] = { itemBases["Crumbling Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -346,6 +379,7 @@ itemBases["Crumbling Maul"] = { itemBases["Pointed Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -356,6 +390,7 @@ itemBases["Pointed Maul"] = { itemBases["Totemic Greatclub"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -367,6 +402,7 @@ itemBases["Totemic Greatclub"] = { itemBases["Greatmace"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -377,6 +413,7 @@ itemBases["Greatmace"] = { itemBases["Precise Greathammer"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -387,6 +424,7 @@ itemBases["Precise Greathammer"] = { itemBases["Giant Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -397,6 +435,7 @@ itemBases["Giant Maul"] = { itemBases["Advanced Oak Greathammer"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -408,6 +447,7 @@ itemBases["Advanced Oak Greathammer"] = { itemBases["Advanced Forge Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -418,6 +458,7 @@ itemBases["Advanced Forge Maul"] = { itemBases["Advanced Cultist Greathammer"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -429,6 +470,7 @@ itemBases["Advanced Cultist Greathammer"] = { itemBases["Advanced Temple Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -439,6 +481,7 @@ itemBases["Advanced Temple Maul"] = { itemBases["Advanced Leaden Greathammer"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -449,6 +492,7 @@ itemBases["Advanced Leaden Greathammer"] = { itemBases["Advanced Crumbling Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -460,6 +504,7 @@ itemBases["Advanced Crumbling Maul"] = { itemBases["Expert Forge Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -470,6 +515,7 @@ itemBases["Expert Forge Maul"] = { itemBases["Expert Temple Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -480,6 +526,7 @@ itemBases["Expert Temple Maul"] = { itemBases["Expert Oak Greathammer"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -491,6 +538,7 @@ itemBases["Expert Oak Greathammer"] = { itemBases["Expert Cultist Greathammer"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -502,6 +550,7 @@ itemBases["Expert Cultist Greathammer"] = { itemBases["Expert Crumbling Maul"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, @@ -513,6 +562,7 @@ itemBases["Expert Crumbling Maul"] = { itemBases["Expert Leaden Greathammer"] = { class = "Two Hand Mace", category = "Two Hand Mace", + label = "Two Hand Mace", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, mace = true, weapon = true, twohand = true, default = true, }, diff --git a/src/Data/Bases/quiver.lua b/src/Data/Bases/quiver.lua index 36b9985ccb..d4a7707754 100644 --- a/src/Data/Bases/quiver.lua +++ b/src/Data/Bases/quiver.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Broadhead Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "Adds 1 to 3 Physical Damage to Attacks", implicitModTypes = { { "physical_damage", "damage", "physical", "attack" }, }, @@ -13,6 +14,7 @@ itemBases["Broadhead Quiver"] = { itemBases["Fire Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "Adds 3 to 5 Fire damage to Attacks", implicitModTypes = { { "elemental_damage", "damage", "elemental", "fire", "attack" }, }, @@ -21,6 +23,7 @@ itemBases["Fire Quiver"] = { itemBases["Sacral Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "Gain (2-3) Life per Enemy Hit with Attacks", implicitModTypes = { { "resource", "life", "attack" }, }, @@ -29,6 +32,7 @@ itemBases["Sacral Quiver"] = { itemBases["Two-Point Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "(20-30)% increased Accuracy Rating", implicitModTypes = { { "attack" }, }, @@ -37,6 +41,7 @@ itemBases["Two-Point Quiver"] = { itemBases["Blunt Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "(20-30)% reduced Enemy Stun Threshold", implicitModTypes = { { }, }, @@ -45,6 +50,7 @@ itemBases["Blunt Quiver"] = { itemBases["Toxic Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "(10-15)% chance to Poison on Hit with Attacks", implicitModTypes = { { "poison", "chaos", "attack", "ailment" }, }, @@ -53,6 +59,7 @@ itemBases["Toxic Quiver"] = { itemBases["Serrated Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "Attacks have (10-15)% chance to cause Bleeding", implicitModTypes = { { "bleed", "physical", "attack", "ailment" }, }, @@ -61,6 +68,7 @@ itemBases["Serrated Quiver"] = { itemBases["Primed Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "(7-10)% increased Attack Speed", implicitModTypes = { { "attack", "speed" }, }, @@ -69,6 +77,7 @@ itemBases["Primed Quiver"] = { itemBases["Penetrating Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "100% chance to Pierce an Enemy", implicitModTypes = { { }, }, @@ -77,6 +86,7 @@ itemBases["Penetrating Quiver"] = { itemBases["Volant Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "(20-30)% increased Arrow Speed", implicitModTypes = { { "attack", "speed" }, }, @@ -85,6 +95,7 @@ itemBases["Volant Quiver"] = { itemBases["Visceral Quiver"] = { class = "Quiver", category = "Quiver", + label = "Quiver", tags = { quiver = true, default = true, }, implicit = "(20-30)% increased Critical Hit Chance for Attacks", implicitModTypes = { { "attack", "critical" }, }, diff --git a/src/Data/Bases/ring.lua b/src/Data/Bases/ring.lua index a746b1fe0d..61053818e6 100644 --- a/src/Data/Bases/ring.lua +++ b/src/Data/Bases/ring.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Golden Hoop"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, demigods = true, not_for_sale = true, default = true, }, implicit = "+(8-12) to all Attributes", implicitModTypes = { { "attribute" }, }, @@ -13,6 +14,7 @@ itemBases["Golden Hoop"] = { itemBases["Iron Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "Adds 1 to 4 Physical Damage to Attacks", implicitModTypes = { { "physical_damage", "damage", "physical", "attack" }, }, @@ -21,6 +23,7 @@ itemBases["Iron Ring"] = { itemBases["Lazuli Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "+(20-30) to maximum Mana", implicitModTypes = { { "resource", "mana" }, }, @@ -29,6 +32,7 @@ itemBases["Lazuli Ring"] = { itemBases["Ruby Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "+(20-30)% to Fire Resistance", implicitModTypes = { { "elemental", "fire", "resistance" }, }, @@ -37,6 +41,7 @@ itemBases["Ruby Ring"] = { itemBases["Sapphire Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "+(20-30)% to Cold Resistance", implicitModTypes = { { "elemental", "cold", "resistance" }, }, @@ -45,6 +50,7 @@ itemBases["Sapphire Ring"] = { itemBases["Topaz Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "+(20-30)% to Lightning Resistance", implicitModTypes = { { "elemental", "lightning", "resistance" }, }, @@ -53,6 +59,7 @@ itemBases["Topaz Ring"] = { itemBases["Amethyst Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "+(7-13)% to Chaos Resistance", implicitModTypes = { { "chaos", "resistance" }, }, @@ -61,6 +68,7 @@ itemBases["Amethyst Ring"] = { itemBases["Emerald Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "+(120-160) to Accuracy Rating", implicitModTypes = { { "attack" }, }, @@ -69,6 +77,7 @@ itemBases["Emerald Ring"] = { itemBases["Pearl Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "(7-10)% increased Cast Speed", implicitModTypes = { { "caster", "speed" }, }, @@ -77,6 +86,7 @@ itemBases["Pearl Ring"] = { itemBases["Prismatic Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "+(7-10)% to all Elemental Resistances", implicitModTypes = { { "elemental", "fire", "cold", "lightning", "resistance" }, }, @@ -85,6 +95,7 @@ itemBases["Prismatic Ring"] = { itemBases["Gold Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "(6-15)% increased Rarity of Items found", implicitModTypes = { { }, }, @@ -93,6 +104,7 @@ itemBases["Gold Ring"] = { itemBases["Unset Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "Grants 1 additional Skill Slot", implicitModTypes = { { }, }, @@ -101,6 +113,7 @@ itemBases["Unset Ring"] = { itemBases["Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicitModTypes = { }, req = { }, @@ -108,6 +121,7 @@ itemBases["Ring"] = { itemBases["Breach Ring"] = { class = "Ring", category = "Ring", + label = "Ring", tags = { ring = true, default = true, }, implicit = "Maximum Quality is 50%", implicitModTypes = { { }, }, diff --git a/src/Data/Bases/sceptre.lua b/src/Data/Bases/sceptre.lua index b3b7adb8d7..804721dd03 100644 --- a/src/Data/Bases/sceptre.lua +++ b/src/Data/Bases/sceptre.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Rattling Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -15,6 +16,7 @@ itemBases["Rattling Sceptre"] = { itemBases["Stoic Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -25,6 +27,7 @@ itemBases["Stoic Sceptre"] = { itemBases["Lupine Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -35,6 +38,7 @@ itemBases["Lupine Sceptre"] = { itemBases["Omen Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -45,6 +49,7 @@ itemBases["Omen Sceptre"] = { itemBases["Ochre Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -55,6 +60,7 @@ itemBases["Ochre Sceptre"] = { itemBases["Shrine Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -65,6 +71,7 @@ itemBases["Shrine Sceptre"] = { itemBases["Shrine Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -75,6 +82,7 @@ itemBases["Shrine Sceptre"] = { itemBases["Shrine Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -85,6 +93,7 @@ itemBases["Shrine Sceptre"] = { itemBases["Devouring Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -95,6 +104,7 @@ itemBases["Devouring Sceptre"] = { itemBases["Clasped Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -105,6 +115,7 @@ itemBases["Clasped Sceptre"] = { itemBases["Devotional Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -115,6 +126,7 @@ itemBases["Devotional Sceptre"] = { itemBases["Wrath Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -125,6 +137,7 @@ itemBases["Wrath Sceptre"] = { itemBases["Aromatic Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -135,6 +148,7 @@ itemBases["Aromatic Sceptre"] = { itemBases["Pious Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, @@ -145,6 +159,7 @@ itemBases["Pious Sceptre"] = { itemBases["Hallowed Sceptre"] = { class = "Sceptre", category = "Sceptre", + label = "Sceptre", quality = 20, spirit = 100, tags = { default = true, onehand = true, sceptre = true, }, diff --git a/src/Data/Bases/shield.lua b/src/Data/Bases/shield.lua index 069584c95b..010d02c428 100644 --- a/src/Data/Bases/shield.lua +++ b/src/Data/Bases/shield.lua @@ -2,10 +2,10 @@ -- Item data (c) Grinding Gear Games local itemBases = ... - itemBases["Golden Flame"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { not_for_sale = true, demigods = true, armour = true, default = true, shield = true, }, @@ -17,6 +17,7 @@ itemBases["Golden Flame"] = { itemBases["Splintered Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, ezomyte_basetype = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -29,6 +30,7 @@ itemBases["Splintered Tower Shield"] = { itemBases["Painted Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, ezomyte_basetype = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -41,6 +43,7 @@ itemBases["Painted Tower Shield"] = { itemBases["Braced Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, ezomyte_basetype = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -53,6 +56,7 @@ itemBases["Braced Tower Shield"] = { itemBases["Barricade Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -65,6 +69,7 @@ itemBases["Barricade Tower Shield"] = { itemBases["Effigial Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -77,6 +82,7 @@ itemBases["Effigial Tower Shield"] = { itemBases["Rampart Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -89,6 +95,7 @@ itemBases["Rampart Tower Shield"] = { itemBases["Heraldric Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, vaal_basetype = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -101,6 +108,7 @@ itemBases["Heraldric Tower Shield"] = { itemBases["Stone Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, vaal_basetype = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -113,6 +121,7 @@ itemBases["Stone Tower Shield"] = { itemBases["Crucible Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -125,6 +134,7 @@ itemBases["Crucible Tower Shield"] = { itemBases["Ancestor Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -137,6 +147,7 @@ itemBases["Ancestor Tower Shield"] = { itemBases["Phalanx Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -149,6 +160,7 @@ itemBases["Phalanx Tower Shield"] = { itemBases["Defiant Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -161,6 +173,7 @@ itemBases["Defiant Tower Shield"] = { itemBases["Blacksteel Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -173,6 +186,7 @@ itemBases["Blacksteel Tower Shield"] = { itemBases["Hardwood Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -185,6 +199,7 @@ itemBases["Hardwood Targe"] = { itemBases["Pelage Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, ezomyte_basetype = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -197,6 +212,7 @@ itemBases["Pelage Targe"] = { itemBases["Studded Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -209,6 +225,7 @@ itemBases["Studded Targe"] = { itemBases["Crescent Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -221,6 +238,7 @@ itemBases["Crescent Targe"] = { itemBases["Chiseled Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, vaal_basetype = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -233,6 +251,7 @@ itemBases["Chiseled Targe"] = { itemBases["Feathered Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, vaal_basetype = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -245,6 +264,7 @@ itemBases["Feathered Targe"] = { itemBases["Stratified Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -257,6 +277,7 @@ itemBases["Stratified Targe"] = { itemBases["Carved Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -269,6 +290,7 @@ itemBases["Carved Targe"] = { itemBases["Mosaic Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -281,6 +303,7 @@ itemBases["Mosaic Targe"] = { itemBases["Aureate Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -293,6 +316,7 @@ itemBases["Aureate Targe"] = { itemBases["Grand Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -305,6 +329,7 @@ itemBases["Grand Targe"] = { itemBases["Blazon Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -317,6 +342,7 @@ itemBases["Blazon Crest Shield"] = { itemBases["Sigil Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, ezomyte_basetype = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -329,6 +355,7 @@ itemBases["Sigil Crest Shield"] = { itemBases["Emblem Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -341,6 +368,7 @@ itemBases["Emblem Crest Shield"] = { itemBases["Jingling Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -353,6 +381,7 @@ itemBases["Jingling Crest Shield"] = { itemBases["Sectarian Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, vaal_basetype = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -365,6 +394,7 @@ itemBases["Sectarian Crest Shield"] = { itemBases["Omen Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, vaal_basetype = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -377,6 +407,7 @@ itemBases["Omen Crest Shield"] = { itemBases["Wayward Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -389,6 +420,7 @@ itemBases["Wayward Crest Shield"] = { itemBases["Seer Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -401,6 +433,7 @@ itemBases["Seer Crest Shield"] = { itemBases["Stoic Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -413,6 +446,7 @@ itemBases["Stoic Crest Shield"] = { itemBases["Empyreal Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -425,6 +459,7 @@ itemBases["Empyreal Crest Shield"] = { itemBases["Deified Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -437,6 +472,7 @@ itemBases["Deified Crest Shield"] = { itemBases["Leather Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, ezomyte_basetype = true, armour = true, default = true, shield = true, }, @@ -448,6 +484,7 @@ itemBases["Leather Buckler"] = { itemBases["Wooden Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, ezomyte_basetype = true, armour = true, default = true, shield = true, }, @@ -459,6 +496,7 @@ itemBases["Wooden Buckler"] = { itemBases["Plated Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, ezomyte_basetype = true, armour = true, default = true, shield = true, }, @@ -470,6 +508,7 @@ itemBases["Plated Buckler"] = { itemBases["Iron Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -481,6 +520,7 @@ itemBases["Iron Buckler"] = { itemBases["Ridged Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -492,6 +532,7 @@ itemBases["Ridged Buckler"] = { itemBases["Spiked Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -503,6 +544,7 @@ itemBases["Spiked Buckler"] = { itemBases["Ringed Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, vaal_basetype = true, armour = true, default = true, shield = true, }, @@ -514,6 +556,7 @@ itemBases["Ringed Buckler"] = { itemBases["Edged Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, vaal_basetype = true, armour = true, default = true, shield = true, }, @@ -525,6 +568,7 @@ itemBases["Edged Buckler"] = { itemBases["Laminate Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -536,6 +580,7 @@ itemBases["Laminate Buckler"] = { itemBases["Pearl Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -547,6 +592,7 @@ itemBases["Pearl Buckler"] = { itemBases["Ornate Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -558,6 +604,7 @@ itemBases["Ornate Buckler"] = { itemBases["Array Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -569,6 +616,7 @@ itemBases["Array Buckler"] = { itemBases["Aegis Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -580,6 +628,7 @@ itemBases["Aegis Buckler"] = { itemBases["Advanced Painted Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -592,6 +641,7 @@ itemBases["Advanced Painted Tower Shield"] = { itemBases["Advanced Braced Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -604,6 +654,7 @@ itemBases["Advanced Braced Tower Shield"] = { itemBases["Advanced Effigial Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -616,6 +667,7 @@ itemBases["Advanced Effigial Tower Shield"] = { itemBases["Advanced Rampart Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -628,6 +680,7 @@ itemBases["Advanced Rampart Tower Shield"] = { itemBases["Advanced Heraldric Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -640,6 +693,7 @@ itemBases["Advanced Heraldric Tower Shield"] = { itemBases["Advanced Stone Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -652,6 +706,7 @@ itemBases["Advanced Stone Tower Shield"] = { itemBases["Advanced Hardwood Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -664,6 +719,7 @@ itemBases["Advanced Hardwood Targe"] = { itemBases["Advanced Pelage Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -676,6 +732,7 @@ itemBases["Advanced Pelage Targe"] = { itemBases["Advanced Studded Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -688,6 +745,7 @@ itemBases["Advanced Studded Targe"] = { itemBases["Advanced Crescent Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -700,6 +758,7 @@ itemBases["Advanced Crescent Targe"] = { itemBases["Advanced Chiseled Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -712,6 +771,7 @@ itemBases["Advanced Chiseled Targe"] = { itemBases["Advanced Feathered Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -724,6 +784,7 @@ itemBases["Advanced Feathered Targe"] = { itemBases["Advanced Blazon Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -736,6 +797,7 @@ itemBases["Advanced Blazon Crest Shield"] = { itemBases["Advanced Sigil Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -748,6 +810,7 @@ itemBases["Advanced Sigil Crest Shield"] = { itemBases["Advanced Emblem Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -760,6 +823,7 @@ itemBases["Advanced Emblem Crest Shield"] = { itemBases["Advanced Jingling Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -772,6 +836,7 @@ itemBases["Advanced Jingling Crest Shield"] = { itemBases["Advanced Sectarian Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -784,6 +849,7 @@ itemBases["Advanced Sectarian Crest Shield"] = { itemBases["Advanced Omen Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -796,6 +862,7 @@ itemBases["Advanced Omen Crest Shield"] = { itemBases["Advanced Wooden Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -807,6 +874,7 @@ itemBases["Advanced Wooden Buckler"] = { itemBases["Advanced Plated Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -818,6 +886,7 @@ itemBases["Advanced Plated Buckler"] = { itemBases["Advanced Ridged Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -829,6 +898,7 @@ itemBases["Advanced Ridged Buckler"] = { itemBases["Advanced Spiked Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -840,6 +910,7 @@ itemBases["Advanced Spiked Buckler"] = { itemBases["Advanced Ringed Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -851,6 +922,7 @@ itemBases["Advanced Ringed Buckler"] = { itemBases["Advanced Edged Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -862,6 +934,7 @@ itemBases["Advanced Edged Buckler"] = { itemBases["Expert Braced Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -874,6 +947,7 @@ itemBases["Expert Braced Tower Shield"] = { itemBases["Expert Rampart Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -886,6 +960,7 @@ itemBases["Expert Rampart Tower Shield"] = { itemBases["Expert Stone Tower Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, @@ -898,6 +973,7 @@ itemBases["Expert Stone Tower Shield"] = { itemBases["Expert Pelage Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -910,6 +986,7 @@ itemBases["Expert Pelage Targe"] = { itemBases["Expert Crescent Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -922,6 +999,7 @@ itemBases["Expert Crescent Targe"] = { itemBases["Expert Feathered Targe"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, @@ -934,6 +1012,7 @@ itemBases["Expert Feathered Targe"] = { itemBases["Expert Sigil Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -946,6 +1025,7 @@ itemBases["Expert Sigil Crest Shield"] = { itemBases["Expert Jingling Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -958,6 +1038,7 @@ itemBases["Expert Jingling Crest Shield"] = { itemBases["Expert Omen Crest Shield"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, @@ -970,6 +1051,7 @@ itemBases["Expert Omen Crest Shield"] = { itemBases["Expert Plated Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -981,6 +1063,7 @@ itemBases["Expert Plated Buckler"] = { itemBases["Expert Spiked Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, @@ -992,6 +1075,7 @@ itemBases["Expert Spiked Buckler"] = { itemBases["Expert Edged Buckler"] = { class = "Shield", category = "Shield", + label = "Shield", quality = 20, socketLimit = 2, tags = { dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, diff --git a/src/Data/Bases/spear.lua b/src/Data/Bases/spear.lua index e142a73b8e..4965192cfd 100644 --- a/src/Data/Bases/spear.lua +++ b/src/Data/Bases/spear.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Hardwood Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -15,6 +16,7 @@ itemBases["Hardwood Spear"] = { itemBases["Ironhead Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -25,6 +27,7 @@ itemBases["Ironhead Spear"] = { itemBases["Hunting Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -36,6 +39,7 @@ itemBases["Hunting Spear"] = { itemBases["Winged Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -46,6 +50,7 @@ itemBases["Winged Spear"] = { itemBases["War Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -57,6 +62,7 @@ itemBases["War Spear"] = { itemBases["Forked Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { maraketh_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -67,6 +73,7 @@ itemBases["Forked Spear"] = { itemBases["Barbed Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -77,6 +84,7 @@ itemBases["Barbed Spear"] = { itemBases["Broad Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -88,6 +96,7 @@ itemBases["Broad Spear"] = { itemBases["Crossblade Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -98,6 +107,7 @@ itemBases["Crossblade Spear"] = { itemBases["Seaglass Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -108,6 +118,7 @@ itemBases["Seaglass Spear"] = { itemBases["Sword Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -118,6 +129,7 @@ itemBases["Sword Spear"] = { itemBases["Striking Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, @@ -128,6 +140,7 @@ itemBases["Striking Spear"] = { itemBases["Helix Spear"] = { class = "Spear", category = "Spear", + label = "Spear", quality = 20, socketLimit = 2, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, diff --git a/src/Data/Bases/staff.lua b/src/Data/Bases/staff.lua index e201fbfa98..2dc1036cd4 100644 --- a/src/Data/Bases/staff.lua +++ b/src/Data/Bases/staff.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Ashen Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { no_physical_spell_mods = true, no_lightning_spell_mods = true, no_cold_spell_mods = true, no_chaos_spell_mods = true, staff = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Firebolt", @@ -14,6 +15,7 @@ itemBases["Ashen Staff"] = { itemBases["Gelid Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_lightning_spell_mods = true, staff = true, no_physical_spell_mods = true, no_chaos_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Freezing Shards", @@ -23,6 +25,7 @@ itemBases["Gelid Staff"] = { itemBases["Voltaic Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_physical_spell_mods = true, staff = true, no_chaos_spell_mods = true, no_cold_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Lightning Bolt", @@ -32,6 +35,7 @@ itemBases["Voltaic Staff"] = { itemBases["Spriggan Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { default = true, twohand = true, staff = true, }, implicit = "Grants Skill: Level (1-20) Firebolt", @@ -41,6 +45,7 @@ itemBases["Spriggan Staff"] = { itemBases["Pyrophyte Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { no_physical_spell_mods = true, no_lightning_spell_mods = true, no_cold_spell_mods = true, no_chaos_spell_mods = true, staff = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Living Bomb", @@ -50,6 +55,7 @@ itemBases["Pyrophyte Staff"] = { itemBases["Chiming Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { default = true, twohand = true, staff = true, }, implicit = "Grants Skill: Level (1-20) Sigil of Power", @@ -59,6 +65,7 @@ itemBases["Chiming Staff"] = { itemBases["Rending Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_lightning_spell_mods = true, staff = true, no_physical_spell_mods = true, no_cold_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Soulrend", @@ -68,6 +75,7 @@ itemBases["Rending Staff"] = { itemBases["Reaping Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_lightning_spell_mods = true, staff = true, no_chaos_spell_mods = true, no_cold_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Reap", @@ -77,6 +85,7 @@ itemBases["Reaping Staff"] = { itemBases["Icicle Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_lightning_spell_mods = true, staff = true, no_physical_spell_mods = true, no_chaos_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Firebolt", @@ -86,6 +95,7 @@ itemBases["Icicle Staff"] = { itemBases["Roaring Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { default = true, twohand = true, staff = true, }, implicit = "Grants Skill: Level (1-20) Unleash", @@ -95,6 +105,7 @@ itemBases["Roaring Staff"] = { itemBases["Paralysing Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { no_fire_spell_mods = true, no_physical_spell_mods = true, staff = true, no_chaos_spell_mods = true, no_cold_spell_mods = true, twohand = true, default = true, }, implicit = "Grants Skill: Level (1-20) Shock Nova", @@ -104,6 +115,7 @@ itemBases["Paralysing Staff"] = { itemBases["Cleric Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { default = true, twohand = true, staff = true, }, implicit = "Grants Skill: Level (1-20) Consecrate", @@ -113,6 +125,7 @@ itemBases["Cleric Staff"] = { itemBases["Dark Staff"] = { class = "Staff", category = "Staff", + label = "Staff", quality = 20, tags = { default = true, twohand = true, staff = true, }, implicit = "Grants Skill: Level (1-20) Dark Pact", @@ -123,6 +136,7 @@ itemBases["Dark Staff"] = { itemBases["Wrapped Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, ezomyte_basetype = true, weapon = true, twohand = true, default = true, }, @@ -133,6 +147,7 @@ itemBases["Wrapped Quarterstaff"] = { itemBases["Long Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, ezomyte_basetype = true, weapon = true, twohand = true, default = true, }, @@ -144,6 +159,7 @@ itemBases["Long Quarterstaff"] = { itemBases["Gothic Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, ezomyte_basetype = true, weapon = true, twohand = true, default = true, }, @@ -154,6 +170,7 @@ itemBases["Gothic Quarterstaff"] = { itemBases["Crackling Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, maraketh_basetype = true, weapon = true, twohand = true, default = true, }, @@ -164,6 +181,7 @@ itemBases["Crackling Quarterstaff"] = { itemBases["Crescent Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, maraketh_basetype = true, weapon = true, twohand = true, default = true, }, @@ -174,6 +192,7 @@ itemBases["Crescent Quarterstaff"] = { itemBases["Steelpoint Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, maraketh_basetype = true, weapon = true, twohand = true, default = true, }, @@ -184,6 +203,7 @@ itemBases["Steelpoint Quarterstaff"] = { itemBases["Slicing Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, vaal_basetype = true, weapon = true, twohand = true, default = true, }, @@ -194,6 +214,7 @@ itemBases["Slicing Quarterstaff"] = { itemBases["Barrier Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, vaal_basetype = true, weapon = true, twohand = true, default = true, }, @@ -205,6 +226,7 @@ itemBases["Barrier Quarterstaff"] = { itemBases["Hefty Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -215,6 +237,7 @@ itemBases["Hefty Quarterstaff"] = { itemBases["Smooth Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -225,6 +248,7 @@ itemBases["Smooth Quarterstaff"] = { itemBases["Anima Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -235,6 +259,7 @@ itemBases["Anima Quarterstaff"] = { itemBases["Graceful Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -245,6 +270,7 @@ itemBases["Graceful Quarterstaff"] = { itemBases["Wyrm Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -255,6 +281,7 @@ itemBases["Wyrm Quarterstaff"] = { itemBases["Advanced Long Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -266,6 +293,7 @@ itemBases["Advanced Long Quarterstaff"] = { itemBases["Advanced Gothic Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -276,6 +304,7 @@ itemBases["Advanced Gothic Quarterstaff"] = { itemBases["Advanced Crackling Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -286,6 +315,7 @@ itemBases["Advanced Crackling Quarterstaff"] = { itemBases["Advanced Crescent Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -296,6 +326,7 @@ itemBases["Advanced Crescent Quarterstaff"] = { itemBases["Advanced Slicing Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -306,6 +337,7 @@ itemBases["Advanced Slicing Quarterstaff"] = { itemBases["Advanced Barrier Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -317,6 +349,7 @@ itemBases["Advanced Barrier Quarterstaff"] = { itemBases["Expert Gothic Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -327,6 +360,7 @@ itemBases["Expert Gothic Quarterstaff"] = { itemBases["Expert Crescent Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -337,6 +371,7 @@ itemBases["Expert Crescent Quarterstaff"] = { itemBases["Expert Long Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -348,6 +383,7 @@ itemBases["Expert Long Quarterstaff"] = { itemBases["Expert Crackling Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -358,6 +394,7 @@ itemBases["Expert Crackling Quarterstaff"] = { itemBases["Expert Barrier Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, @@ -369,6 +406,7 @@ itemBases["Expert Barrier Quarterstaff"] = { itemBases["Expert Slicing Quarterstaff"] = { class = "Warstaff", category = "Warstaff", + label = "Quarterstaff", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, diff --git a/src/Data/Bases/sword.lua b/src/Data/Bases/sword.lua index d759d0c7c1..26f3312031 100644 --- a/src/Data/Bases/sword.lua +++ b/src/Data/Bases/sword.lua @@ -2,10 +2,10 @@ -- Item data (c) Grinding Gear Games local itemBases = ... - itemBases["Golden Blade"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { demigods = true, onehand = true, not_for_sale = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -17,6 +17,7 @@ itemBases["Golden Blade"] = { itemBases["Energy Blade Two Handed"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, hidden = true, socketLimit = 3, @@ -28,6 +29,7 @@ itemBases["Energy Blade Two Handed"] = { itemBases["Shortsword"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, ezomyte_basetype = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -38,6 +40,7 @@ itemBases["Shortsword"] = { itemBases["Broadsword"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, ezomyte_basetype = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -48,6 +51,7 @@ itemBases["Broadsword"] = { itemBases["Vampiric Blade"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, ezomyte_basetype = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -58,6 +62,7 @@ itemBases["Vampiric Blade"] = { itemBases["Scimitar"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { maraketh_basetype = true, onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -68,6 +73,7 @@ itemBases["Scimitar"] = { itemBases["Charred Shortsword"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { maraketh_basetype = true, onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -78,6 +84,7 @@ itemBases["Charred Shortsword"] = { itemBases["Sickle Sword"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { maraketh_basetype = true, onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -88,6 +95,7 @@ itemBases["Sickle Sword"] = { itemBases["Falchion"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, vaal_basetype = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -98,6 +106,7 @@ itemBases["Falchion"] = { itemBases["Treasured Blade"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, vaal_basetype = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -108,6 +117,7 @@ itemBases["Treasured Blade"] = { itemBases["Cutlass"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -118,6 +128,7 @@ itemBases["Cutlass"] = { itemBases["Runic Shortsword"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -128,6 +139,7 @@ itemBases["Runic Shortsword"] = { itemBases["Messer"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -138,6 +150,7 @@ itemBases["Messer"] = { itemBases["Commander Sword"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -148,6 +161,7 @@ itemBases["Commander Sword"] = { itemBases["Dark Blade"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, socketLimit = 3, tags = { onehand = true, weapon = true, sword = true, one_hand_weapon = true, default = true, }, @@ -159,6 +173,7 @@ itemBases["Dark Blade"] = { itemBases["Energy Blade Two Handed"] = { class = "One Hand Sword", category = "One Hand Sword", + label = "One Hand Sword", quality = 20, hidden = true, socketLimit = 3, @@ -171,6 +186,7 @@ itemBases["Energy Blade Two Handed"] = { itemBases["Keyblade"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, hidden = true, socketLimit = 3, @@ -182,6 +198,7 @@ itemBases["Keyblade"] = { itemBases["Energy Blade Two Handed"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, hidden = true, socketLimit = 3, @@ -193,6 +210,7 @@ itemBases["Energy Blade Two Handed"] = { itemBases["Corroded Longsword"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -203,6 +221,7 @@ itemBases["Corroded Longsword"] = { itemBases["Iron Greatsword"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -213,6 +232,7 @@ itemBases["Iron Greatsword"] = { itemBases["Blessed Claymore"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, ezomyte_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -223,6 +243,7 @@ itemBases["Blessed Claymore"] = { itemBases["Broad Greatsword"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -233,6 +254,7 @@ itemBases["Broad Greatsword"] = { itemBases["Rippled Greatsword"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -243,6 +265,7 @@ itemBases["Rippled Greatsword"] = { itemBases["Arced Longsword"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, maraketh_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -253,6 +276,7 @@ itemBases["Arced Longsword"] = { itemBases["Stone Greatsword"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -263,6 +287,7 @@ itemBases["Stone Greatsword"] = { itemBases["Obsidian Greatsword"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, vaal_basetype = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -273,6 +298,7 @@ itemBases["Obsidian Greatsword"] = { itemBases["Keen Greatsword"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -283,6 +309,7 @@ itemBases["Keen Greatsword"] = { itemBases["Ancient Greatblade"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -293,6 +320,7 @@ itemBases["Ancient Greatblade"] = { itemBases["Flanged Greatblade"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -303,6 +331,7 @@ itemBases["Flanged Greatblade"] = { itemBases["Regalia Longsword"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -313,6 +342,7 @@ itemBases["Regalia Longsword"] = { itemBases["Ultra Greatsword"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, socketLimit = 3, tags = { two_hand_weapon = true, weapon = true, sword = true, twohand = true, default = true, }, @@ -324,6 +354,7 @@ itemBases["Ultra Greatsword"] = { itemBases["Energy Blade Two Handed"] = { class = "Two Hand Sword", category = "Two Hand Sword", + label = "Two Hand Sword", quality = 20, hidden = true, socketLimit = 3, diff --git a/src/Data/Bases/traptool.lua b/src/Data/Bases/traptool.lua index b61a99445b..65d114dd17 100644 --- a/src/Data/Bases/traptool.lua +++ b/src/Data/Bases/traptool.lua @@ -2,10 +2,10 @@ -- Item data (c) Grinding Gear Games local itemBases = ... - itemBases["Clay Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -14,6 +14,7 @@ itemBases["Clay Trap"] = { itemBases["Clamping Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -22,6 +23,7 @@ itemBases["Clamping Trap"] = { itemBases["Shrapnel Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -30,6 +32,7 @@ itemBases["Shrapnel Trap"] = { itemBases["Urn Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -38,6 +41,7 @@ itemBases["Urn Trap"] = { itemBases["Incense Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicit = "(20-30)% increased Cooldown Recovery Rate for throwing Traps", @@ -47,6 +51,7 @@ itemBases["Incense Trap"] = { itemBases["Bladed Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -55,6 +60,7 @@ itemBases["Bladed Trap"] = { itemBases["Dart Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -63,6 +69,7 @@ itemBases["Dart Trap"] = { itemBases["Spike Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -71,6 +78,7 @@ itemBases["Spike Trap"] = { itemBases["Coiled Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -79,6 +87,7 @@ itemBases["Coiled Trap"] = { itemBases["Lead Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -87,6 +96,7 @@ itemBases["Lead Trap"] = { itemBases["Medallion Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -95,6 +105,7 @@ itemBases["Medallion Trap"] = { itemBases["Intricate Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, @@ -103,6 +114,7 @@ itemBases["Intricate Trap"] = { itemBases["Refined Trap"] = { class = "TrapTool", category = "TrapTool", + label = "Trap", quality = 20, tags = { twohand = true, trap = true, default = true, }, implicitModTypes = { }, diff --git a/src/Data/Bases/wand.lua b/src/Data/Bases/wand.lua index 3b3513fd1c..e28ac087a6 100644 --- a/src/Data/Bases/wand.lua +++ b/src/Data/Bases/wand.lua @@ -5,6 +5,7 @@ local itemBases = ... itemBases["Withered Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_cold_spell_mods = true, no_lightning_spell_mods = true, no_physical_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Chaos Bolt", @@ -14,6 +15,7 @@ itemBases["Withered Wand"] = { itemBases["Bone Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_cold_spell_mods = true, no_lightning_spell_mods = true, no_chaos_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Bone Blast", @@ -23,6 +25,7 @@ itemBases["Bone Wand"] = { itemBases["Attuned Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Mana Drain", @@ -32,6 +35,7 @@ itemBases["Attuned Wand"] = { itemBases["Siphoning Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Power Siphon", @@ -41,6 +45,7 @@ itemBases["Siphoning Wand"] = { itemBases["Volatile Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { no_physical_spell_mods = true, onehand = true, no_cold_spell_mods = true, wand = true, no_lightning_spell_mods = true, no_chaos_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Volatile Dead", @@ -50,6 +55,7 @@ itemBases["Volatile Wand"] = { itemBases["Galvanic Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_physical_spell_mods = true, no_cold_spell_mods = true, no_chaos_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Galvanic Field", @@ -59,6 +65,7 @@ itemBases["Galvanic Wand"] = { itemBases["Acrid Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Decompose", @@ -68,6 +75,7 @@ itemBases["Acrid Wand"] = { itemBases["Offering Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_cold_spell_mods = true, no_lightning_spell_mods = true, no_chaos_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Exsanguinate", @@ -77,6 +85,7 @@ itemBases["Offering Wand"] = { itemBases["Frigid Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_physical_spell_mods = true, no_lightning_spell_mods = true, no_chaos_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Chaos Bolt", @@ -86,6 +95,7 @@ itemBases["Frigid Wand"] = { itemBases["Torture Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Chaos Bolt", @@ -95,6 +105,7 @@ itemBases["Torture Wand"] = { itemBases["Critical Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Chaos Bolt", @@ -104,6 +115,7 @@ itemBases["Critical Wand"] = { itemBases["Primordial Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { no_fire_spell_mods = true, onehand = true, wand = true, no_cold_spell_mods = true, no_lightning_spell_mods = true, no_physical_spell_mods = true, default = true, }, implicit = "Grants Skill: Level (1-20) Wither", @@ -113,6 +125,7 @@ itemBases["Primordial Wand"] = { itemBases["Dueling Wand"] = { class = "Wand", category = "Wand", + label = "Wand", quality = 20, tags = { default = true, onehand = true, wand = true, }, implicit = "Grants Skill: Level (1-20) Chaos Bolt", @@ -122,6 +135,7 @@ itemBases["Dueling Wand"] = { itemBases["Random Wand"] = { class = "HiddenItem", category = "", + label = "Wand", hidden = true, tags = { wand = true, default = true, }, implicitModTypes = { }, diff --git a/src/Export/Bases/amulet.txt b/src/Export/Bases/amulet.txt index 9e35d3cb59..3cea4a76ae 100644 --- a/src/Export/Bases/amulet.txt +++ b/src/Export/Bases/amulet.txt @@ -1,4 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Amulet #baseMatch BaseType Metadata/Items/Amulets/AbstractAmulet \ No newline at end of file diff --git a/src/Export/Bases/axe.txt b/src/Export/Bases/axe.txt index 90c43e0e26..2e8d586f65 100644 --- a/src/Export/Bases/axe.txt +++ b/src/Export/Bases/axe.txt @@ -1,8 +1,10 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label One Hand Axe #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/OneHandAxes/AbstractOneHandAxe +#label Two Hand Axe #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/TwoHandAxes/AbstractTwoHandAxe diff --git a/src/Export/Bases/belt.txt b/src/Export/Bases/belt.txt index 66401c467e..cabc4b6341 100644 --- a/src/Export/Bases/belt.txt +++ b/src/Export/Bases/belt.txt @@ -1,5 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Belt #baseMatch BaseType Metadata/Items/Belts/AbstractBelt #baseMatch BaseType Metadata/Items/Belts/BeltDemigods \ No newline at end of file diff --git a/src/Export/Bases/body.txt b/src/Export/Bases/body.txt index ed83dbcae3..c6186a5b8e 100644 --- a/src/Export/Bases/body.txt +++ b/src/Export/Bases/body.txt @@ -1,6 +1,7 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Body Armour #socketLimit 3 #baseMatch BaseType Metadata/Items/Armours/BodyArmours/AbstractBodyArmour #baseMatch BaseType Metadata/Items/Armours/BodyArmours/BodyArmourDemigods diff --git a/src/Export/Bases/boots.txt b/src/Export/Bases/boots.txt index c3b04f0931..60ba0f3980 100644 --- a/src/Export/Bases/boots.txt +++ b/src/Export/Bases/boots.txt @@ -1,6 +1,7 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Boots #socketLimit 2 #baseMatch BaseType Metadata/Items/Armours/Boots/AbstractBoots #baseMatch BaseType Metadata/Items/Armours/Boots/BootsDemigods diff --git a/src/Export/Bases/bow.txt b/src/Export/Bases/bow.txt index c37890e306..463d2f9625 100644 --- a/src/Export/Bases/bow.txt +++ b/src/Export/Bases/bow.txt @@ -1,5 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Bow #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/Bows/AbstractBow \ No newline at end of file diff --git a/src/Export/Bases/claw.txt b/src/Export/Bases/claw.txt index 512caf4f3d..0146a28061 100644 --- a/src/Export/Bases/claw.txt +++ b/src/Export/Bases/claw.txt @@ -1,5 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Claw #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Claws/AbstractClaw \ No newline at end of file diff --git a/src/Export/Bases/crossbow.txt b/src/Export/Bases/crossbow.txt index 47fdba8fd2..950613168a 100644 --- a/src/Export/Bases/crossbow.txt +++ b/src/Export/Bases/crossbow.txt @@ -1,5 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Crossbow #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/Crossbows/AbstractCrossbow \ No newline at end of file diff --git a/src/Export/Bases/dagger.txt b/src/Export/Bases/dagger.txt index a811446130..ee192907cc 100644 --- a/src/Export/Bases/dagger.txt +++ b/src/Export/Bases/dagger.txt @@ -1,5 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Dagger #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Daggers/AbstractDagger diff --git a/src/Export/Bases/fishing.txt b/src/Export/Bases/fishing.txt index 6dad726f6c..a3a7a2cbd9 100644 --- a/src/Export/Bases/fishing.txt +++ b/src/Export/Bases/fishing.txt @@ -1,6 +1,7 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Fishing Rod #socketLimit 3 #forceShow true #baseMatch BaseTypeMetadata/Items/Weapons/TwoHandWeapon/FishingRods/AbstractFishingRod diff --git a/src/Export/Bases/flail.txt b/src/Export/Bases/flail.txt index 30140c76c9..22a195e906 100644 --- a/src/Export/Bases/flail.txt +++ b/src/Export/Bases/flail.txt @@ -1,5 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Flail #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Flails/AbstractFlail \ No newline at end of file diff --git a/src/Export/Bases/flask.txt b/src/Export/Bases/flask.txt index 4cdefc989a..95b9b34ca6 100644 --- a/src/Export/Bases/flask.txt +++ b/src/Export/Bases/flask.txt @@ -1,8 +1,10 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Charm #baseMatch Metadata/Items/Flasks/FourCharm +#label Flask #baseMatch Metadata/Items/Flasks/FourFlaskLife #baseMatch Metadata/Items/Flasks/FourFlaskMana diff --git a/src/Export/Bases/focus.txt b/src/Export/Bases/focus.txt index 6423dd0fd7..c1d817ff78 100644 --- a/src/Export/Bases/focus.txt +++ b/src/Export/Bases/focus.txt @@ -1,6 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Focus #socketLimit 2 - #baseMatch BaseType Metadata/Items/Armours/Focus/AbstractFocus \ No newline at end of file diff --git a/src/Export/Bases/gloves.txt b/src/Export/Bases/gloves.txt index 28bb135416..984045f1de 100644 --- a/src/Export/Bases/gloves.txt +++ b/src/Export/Bases/gloves.txt @@ -1,6 +1,7 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Gloves #socketLimit 2 #baseMatch BaseType Metadata/Items/Armours/Gloves/AbstractGloves #baseMatch BaseType Metadata/Items/Armours/Gloves/GlovesDemigods diff --git a/src/Export/Bases/helmet.txt b/src/Export/Bases/helmet.txt index 7a133f1c9a..c2772bbd7b 100644 --- a/src/Export/Bases/helmet.txt +++ b/src/Export/Bases/helmet.txt @@ -1,7 +1,7 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Helmet #socketLimit 2 - #baseMatch BaseType Metadata/Items/Armours/Helmets/AbstractHelmet #baseMatch BaseType Metadata/Items/Armours/Helmets/HelmetDemigods \ No newline at end of file diff --git a/src/Export/Bases/jewel.txt b/src/Export/Bases/jewel.txt index 19c7801ed5..dea2adeae0 100644 --- a/src/Export/Bases/jewel.txt +++ b/src/Export/Bases/jewel.txt @@ -1,6 +1,7 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Jewel #base Metadata/Items/Jewels/JewelStr #base Metadata/Items/Jewels/JewelDex #base Metadata/Items/Jewels/JewelInt diff --git a/src/Export/Bases/mace.txt b/src/Export/Bases/mace.txt index 135ea86cd4..8d1ac81d13 100644 --- a/src/Export/Bases/mace.txt +++ b/src/Export/Bases/mace.txt @@ -1,8 +1,10 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label One Hand Mace #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/OneHandMaces/AbstractOneHandMace +#label Two Hand Mace #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/TwoHandMaces/AbstractTwoHandMace diff --git a/src/Export/Bases/quiver.txt b/src/Export/Bases/quiver.txt index bda1bcd80c..2424ae2cd3 100644 --- a/src/Export/Bases/quiver.txt +++ b/src/Export/Bases/quiver.txt @@ -1,4 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Quiver #baseMatch BaseType Metadata/Items/Quivers/AbstractQuiver diff --git a/src/Export/Bases/ring.txt b/src/Export/Bases/ring.txt index 76d7aaa859..ea647fd3c6 100644 --- a/src/Export/Bases/ring.txt +++ b/src/Export/Bases/ring.txt @@ -1,5 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Ring #baseMatch BaseType Metadata/Items/Rings/AbstractRing #baseMatch BaseType Metadata/Items/Rings/RingDemigods diff --git a/src/Export/Bases/sceptre.txt b/src/Export/Bases/sceptre.txt index 2a81a59293..9df6ecd080 100644 --- a/src/Export/Bases/sceptre.txt +++ b/src/Export/Bases/sceptre.txt @@ -1,4 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Sceptre #baseMatch BaseType Metadata/Items/Sceptres/AbstractSceptre diff --git a/src/Export/Bases/shield.txt b/src/Export/Bases/shield.txt index 8eafef6303..f774cfc0cc 100644 --- a/src/Export/Bases/shield.txt +++ b/src/Export/Bases/shield.txt @@ -1,7 +1,7 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Shield #socketLimit 2 - #baseMatch BaseType Metadata/Items/Armours/Shields/AbstractShield #baseMatch BaseType Metadata/Items/Armours/Shields/ShieldDemigods \ No newline at end of file diff --git a/src/Export/Bases/spear.txt b/src/Export/Bases/spear.txt index 35f535a465..41c867df02 100644 --- a/src/Export/Bases/spear.txt +++ b/src/Export/Bases/spear.txt @@ -1,5 +1,6 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Spear #socketLimit 2 #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Spears/AbstractSpear \ No newline at end of file diff --git a/src/Export/Bases/staff.txt b/src/Export/Bases/staff.txt index 7a44259224..fe0a8f6884 100644 --- a/src/Export/Bases/staff.txt +++ b/src/Export/Bases/staff.txt @@ -1,7 +1,9 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Staff #baseMatch BaseType Metadata/Items/Staves/AbstractStaff +#label Quarterstaff #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/Staves/AbstractWarstaff \ No newline at end of file diff --git a/src/Export/Bases/sword.txt b/src/Export/Bases/sword.txt index 234d5a1435..d9847a0ab9 100644 --- a/src/Export/Bases/sword.txt +++ b/src/Export/Bases/sword.txt @@ -1,8 +1,8 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label One Hand Sword #socketLimit 3 - #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/OneHandSwords/AbstractOneHandSword #baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/OneHandSwords/OneHandSwordDemigods @@ -10,6 +10,7 @@ local itemBases = ... #base Metadata/Items/Weapons/OneHandWeapons/OneHandSwords/StormBladeOneHand #forceHide false +#label Two Hand Sword #socketLimit 3 #baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/TwoHandSwords/AbstractTwoHandSword diff --git a/src/Export/Bases/traptool.txt b/src/Export/Bases/traptool.txt index c6acca1b29..04af7fb9bf 100644 --- a/src/Export/Bases/traptool.txt +++ b/src/Export/Bases/traptool.txt @@ -1,5 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... - +#label Trap #baseMatch BaseType Metadata/Items/TrapTools/AbstractTrapTool \ No newline at end of file diff --git a/src/Export/Bases/wand.txt b/src/Export/Bases/wand.txt index c4fe38c79b..fc5676ea9f 100644 --- a/src/Export/Bases/wand.txt +++ b/src/Export/Bases/wand.txt @@ -1,4 +1,5 @@ -- Item data (c) Grinding Gear Games local itemBases = ... +#label Wand #baseMatch Metadata/Items/Weapons/OneHandWeapons/Wands/FourWand diff --git a/src/Export/Scripts/bases.lua b/src/Export/Scripts/bases.lua index 2c36f72f29..1e55c9511a 100644 --- a/src/Export/Scripts/bases.lua +++ b/src/Export/Scripts/bases.lua @@ -115,6 +115,9 @@ directiveTable.base = function(state, args, out) out:write('itemBases["', displayName, '"] = {\n') out:write('\tclass = "', class, '",\n') out:write('\tcategory = "', category, '",\n') + if state.label and #state.label > 0 then + out:write('\tlabel = "', state.label, '",\n') + end if maximumQuality ~= 0 then out:write('\tquality = ', maximumQuality, ',\n') end From ae9824843f97531709a039d9c08382bb74813426 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 3 Feb 2025 13:44:46 +1100 Subject: [PATCH 04/15] Classes update to use class and category --- src/Classes/ImportTab.lua | 6 +- src/Classes/Item.lua | 37 +++++----- src/Classes/ItemDBControl.lua | 30 ++++---- src/Classes/ItemListControl.lua | 2 +- src/Classes/ItemsTab.lua | 60 +++++++--------- src/Classes/ModStore.lua | 2 +- src/Classes/NotableDBControl.lua | 6 +- src/Classes/SkillListControl.lua | 16 ++--- src/Classes/TradeQueryGenerator.lua | 105 +++++++++++++--------------- 9 files changed, 124 insertions(+), 140 deletions(-) diff --git a/src/Classes/ImportTab.lua b/src/Classes/ImportTab.lua index f848e5c9fd..30bb8cb948 100644 --- a/src/Classes/ImportTab.lua +++ b/src/Classes/ImportTab.lua @@ -807,7 +807,7 @@ function ImportTabClass:ImportItem(itemData, slotName) end item.base = self.build.data.itemBases[item.baseName] if item.base then - item.type = item.base.type + item.category = item.base.category else ConPrintf("Unrecognised base in imported item: %s", item.baseName) end @@ -832,7 +832,7 @@ function ImportTabClass:ImportItem(itemData, slotName) item.baseName = baseName item.namePrefix = item.name:sub(1, s - 1) item.nameSuffix = item.name:sub(e + 1) - item.type = baseData.type + item.category = baseData.category break end end @@ -843,7 +843,7 @@ function ImportTabClass:ImportItem(itemData, slotName) item.baseName = "Two-Toned Boots (Armour/Energy Shield)" item.namePrefix = item.name:sub(1, s - 1) item.nameSuffix = item.name:sub(e + 1) - item.type = "Boots" + item.category = "Boots" end end item.base = self.build.data.itemBases[item.baseName] diff --git a/src/Classes/Item.lua b/src/Classes/Item.lua index 39b182df54..977b47fe42 100644 --- a/src/Classes/Item.lua +++ b/src/Classes/Item.lua @@ -421,7 +421,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality) self.itemSocketCount = #self.sockets elseif specName == "Rune" then t_insert(self.runes, specVal) - elseif specName == "Radius" and self.type == "Jewel" then + elseif specName == "Radius" and self.category == "Jewel" then self.jewelRadiusLabel = specVal:match("^[%a ]+") if specVal:match("^%a+") == "Variable" then -- Jewel radius is variable and must be read from it's mods instead after they are parsed @@ -434,7 +434,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality) end end end - elseif specName == "Limited to" and self.type == "Jewel" then + elseif specName == "Limited to" and self.category == "Jewel" then self.limit = specToNumber(specVal) elseif specName == "Variant" then if not self.variantList then @@ -656,14 +656,15 @@ function ItemClass:ParseRaw(raw, rarity, highQuality) if not (self.rarity == "NORMAL" or self.rarity == "MAGIC") then self.title = self.name end + self.category = base.category + self.class = base.class + self.label = base.label self.type = base.type self.base = base self.charmLimit = base.charmLimit self.spiritValue = base.spirit - self.affixes = (self.base.subType and data.itemMods[self.base.type..self.base.subType]) - or data.itemMods[self.base.type] - or data.itemMods.Item - self.corruptible = self.base.type ~= "Flask" and self.base.type ~= "Charm" and self.base.type ~= "Rune" and self.base.type ~= "SoulCore" + self.affixes = data.itemMods.Item + self.corruptible = self.base.category ~= "Flask" and self.base.category ~= "Charm" and self.base.category ~= "SoulCore" self.clusterJewel = data.clusterJewels and data.clusterJewels.jewels[self.baseName] self.requirements.str = self.base.req.str or 0 self.requirements.dex = self.base.req.dex or 0 @@ -754,7 +755,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality) foundExplicit = true end elseif mode == "GAME" then - if gameModeStage == "IMPLICIT" or gameModeStage == "EXPLICIT" or (gameModeStage == "FINDIMPLICIT" and (not data.itemBases[line]) and not (self.name == line) and not line:find("Two%-Toned") and not (self.base and (line == self.base.type or self.base.subType and line == self.base.subType .. " " .. self.base.type))) then + if gameModeStage == "IMPLICIT" or gameModeStage == "EXPLICIT" or (gameModeStage == "FINDIMPLICIT" and not data.itemBases[line] and not self.name == line and not line:find("Two%-Toned") and not (self.base and line == self.base.class)) then modLine.modList = { } modLine.extra = line t_insert(modLines, modLine) @@ -830,7 +831,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality) self.affixLimit = 2 end elseif self.rarity == "RARE" then - self.affixLimit = ((self.type == "Jewel" and not (self.base.subType == "Abyss" and self.corrupted)) and 4 or 6) + self.affixLimit = self.category == "Jewel" and 4 or 6 if self.prefixes.limit or self.suffixes.limit then self.prefixes.limit = m_max(m_min((self.prefixes.limit or 0) + self.affixLimit / 2, self.affixLimit), 0) self.suffixes.limit = m_max(m_min((self.suffixes.limit or 0) + self.affixLimit / 2, self.affixLimit), 0) @@ -898,7 +899,7 @@ function ItemClass:NormaliseQuality() if self.base and self.base.quality then if not self.quality then self.quality = 0 - elseif not self.uniqueID and not self.corrupted and not self.mirrored and not (self.base.type == "Charm") and self.quality < self.base.quality then -- charms cannot be modified by quality currency. + elseif not self.uniqueID and not self.corrupted and not self.mirrored and not (self.base.category == "Charm") and self.quality < self.base.quality then -- charms cannot be modified by quality currency. self.quality = self.base.quality end end @@ -1210,16 +1211,16 @@ end -- Return the name of the slot this item is equipped in function ItemClass:GetPrimarySlot() - if self.base.weapon or self.base.type == "Wand" or self.base.type == "Sceptre" or self.base.type == "Staff" then + if self.base.tags.onehand or self.base.tags.twohand then return "Weapon 1" - elseif self.type == "Quiver" or self.type == "Shield" then + elseif self.category == "Quiver" or self.category == "Shield" or self.category == "Focus" then return "Weapon 2" - elseif self.type == "Ring" then + elseif self.category == "Ring" then return "Ring 1" - elseif self.type == "Flask" then + elseif self.category == "Flask" then return "Flask 1" else - return self.type + return self.category end end @@ -1306,7 +1307,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum) if self.base.weapon then local weaponData = { } self.weaponData[slotNum] = weaponData - weaponData.type = self.base.type + weaponData.category = self.base.category weaponData.name = self.name weaponData.AttackSpeedInc = calcLocal(modList, "Speed", "INC", ModFlag.Attack) + m_floor(self.quality / 8 * calcLocal(modList, "AlternateQualityLocalAttackSpeedPer8Quality", "INC", 0)) weaponData.AttackRate = round(self.base.weapon.AttackRateBase * (1 + weaponData.AttackSpeedInc / 100), 2) @@ -1444,7 +1445,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum) for _, value in ipairs(modList:List(nil, "CharmData")) do charmData[value.key] = value.value end - elseif self.type == "Jewel" then + elseif self.category == "Jewel" then if self.name:find("Grand Spectrum") then local spectrumMod = modLib.createMod("Multiplier:GrandSpectrum", "BASE", 1, self.name) modList:AddMod(spectrumMod) @@ -1512,7 +1513,7 @@ function ItemClass:BuildModList() elseif self.base.charm then self.charmData = { } self.buffModList = { } - elseif self.type == "Jewel" then + elseif self.category == "Jewel" then self.jewelData = { } end self.baseModList = baseList @@ -1613,7 +1614,7 @@ function ItemClass:BuildModList() self.sockets = newSockets end self.socketedJewelEffectModifier = 1 + calcLocal(baseList, "SocketedJewelEffect", "INC", 0) / 100 - if self.base.weapon or self.base.type == "Wand" or self.base.type == "Sceptre" or self.base.type == "Staff" or self.type == "Ring" then + if self.base.tags.onehand or self.base.tags.twohand or self.category == "Ring" then self.slotModList = { } for i = 1, 2 do self.slotModList[i] = self:BuildModListForSlotNum(baseList, i) diff --git a/src/Classes/ItemDBControl.lua b/src/Classes/ItemDBControl.lua index 29c321755e..f993351634 100644 --- a/src/Classes/ItemDBControl.lua +++ b/src/Classes/ItemDBControl.lua @@ -25,13 +25,13 @@ local ItemDBClass = newClass("ItemDBControl", "ListControl", function(self, anch self.sortMode = "NAME" self.leaguesAndTypesLoaded = false self.leagueList = { "Any league", "No league" } - self.typeList = { "Any type", "Armour", "Jewellery", "One Handed Melee", "Two Handed Melee" } + self.categoryList = { "Any type", "Armour", "Jewellery", "One Handed Melee", "Two Handed Melee" } self.slotList = { "Any slot", "Weapon 1", "Weapon 2", "Helmet", "Body Armour", "Gloves", "Boots", "Amulet", "Ring", "Belt", "Jewel" } local baseY = dbType == "RARE" and -22 or -62 self.controls.slot = new("DropDownControl", {"BOTTOMLEFT",self,"TOPLEFT"}, {0, baseY, 179, 18}, self.slotList, function(index, value) self.listBuildFlag = true end) - self.controls.type = new("DropDownControl", {"LEFT",self.controls.slot,"RIGHT"}, {2, 0, 179, 18}, self.typeList, function(index, value) + self.controls.category = new("DropDownControl", {"LEFT",self.controls.slot,"RIGHT"}, {2, 0, 179, 18}, self.categoryList, function(index, value) self.listBuildFlag = true end) if dbType == "UNIQUE" then @@ -60,20 +60,20 @@ end) function ItemDBClass:LoadLeaguesAndTypes() local leagueFlag = { } - local typeFlag = { } + local categoryFlag = { } for _, item in pairs(self.db.list) do if item.league then for leagueName in item.league:gmatch(" ?([%w ]+),?") do leagueFlag[leagueName] = true end end - typeFlag[item.type] = true + categoryFlag[item.class == item.category and (item.label or item.class) or (item.category..": "..(item.label or item.class))] = true end for leagueName in pairsSortByKey(leagueFlag) do t_insert(self.leagueList, leagueName) end - for type in pairsSortByKey(typeFlag) do - t_insert(self.typeList, type) + for type in pairsSortByKey(categoryFlag) do + t_insert(self.categoryList, type) end self.leaguesAndTypesLoaded = true end @@ -85,22 +85,22 @@ function ItemDBClass:DoesItemMatchFilters(item) return false end end - local typeSel = self.controls.type.selIndex - if typeSel > 1 then - if typeSel == 2 then + local categorySel = self.controls.category.selIndex + if categorySel > 1 then + if categorySel == 2 then if not item.base.armour then return false end - elseif typeSel == 3 then - if not (item.type == "Amulet" or item.type == "Ring" or item.type == "Belt") then + elseif categorySel == 3 then + if not (item.category == "Amulet" or item.category == "Ring" or item.category == "Belt") then return false end - elseif typeSel == 4 or typeSel == 5 then - local weaponInfo = self.itemsTab.build.data.weaponTypeInfo[item.type] - if not (weaponInfo and weaponInfo.melee and ((typeSel == 4 and weaponInfo.oneHand) or (typeSel == 5 and not weaponInfo.oneHand))) then + elseif categorySel == 4 or categorySel == 5 then + local weaponInfo = self.itemsTab.build.data.weaponTypeInfo[item.category] + if not (weaponInfo and weaponInfo.melee and ((categorySel == 4 and weaponInfo.oneHand) or (categorySel == 5 and not weaponInfo.oneHand))) then return false end - elseif item.type ~= self.typeList[typeSel] then + elseif (item.class == item.category and (item.label or item.class) or (item.category..": "..(item.label or item.class))) ~= self.categoryList[categorySel] then return false end end diff --git a/src/Classes/ItemListControl.lua b/src/Classes/ItemListControl.lua index ac03df2b1f..4b75ade05a 100644 --- a/src/Classes/ItemListControl.lua +++ b/src/Classes/ItemListControl.lua @@ -68,7 +68,7 @@ local ItemListClass = newClass("ItemListControl", "ListControl", function(self, end) function ItemListClass:FindSocketedJewel(jewelId, excludeActiveSpec) - if not self.itemsTab.items[jewelId] or self.itemsTab.items[jewelId].type ~= "Jewel" then + if not self.itemsTab.items[jewelId] or self.itemsTab.items[jewelId].class ~= "Jewel" then return nil end local treeTab = self.itemsTab.build.treeTab diff --git a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua index 77c5d9059b..1955589be7 100644 --- a/src/Classes/ItemsTab.lua +++ b/src/Classes/ItemsTab.lua @@ -378,7 +378,7 @@ holding Shift will put it in the second.]]) self:AnointDisplayItem(1) end) self.controls.displayItemAnoint.shown = function() - return self.displayItem and (self.displayItem.base.type == "Amulet" or self.displayItem.canBeAnointed) + return self.displayItem and (self.displayItem.base.class == "Amulet" or self.displayItem.canBeAnointed) end self.controls.displayItemCorrupt = new("ButtonControl", {"TOPLEFT",self.controls.displayItemAnoint,"TOPRIGHT",true}, {8, 0, 100, 20}, "Corrupt...", function() self:CorruptDisplayItem() @@ -445,7 +445,7 @@ holding Shift will put it in the second.]]) self:UpdateDisplayItemTooltip() end) self.controls.displayItemCatalyst.shown = function() - return self.displayItem and (self.displayItem.crafted or self.displayItem.hasModTags) and (self.displayItem.base.type == "Amulet" or self.displayItem.base.type == "Ring") + return self.displayItem and (self.displayItem.crafted or self.displayItem.hasModTags) and (self.displayItem.base.class == "Amulet" or self.displayItem.base.class == "Ring") end self.controls.displayItemCatalystQualityEdit = new("EditControl", {"LEFT",self.controls.displayItemCatalyst,"RIGHT"}, {2, 0, 60, 20}, nil, nil, "%D", 2, function(buf) self.displayItem.catalystQuality = tonumber(buf) @@ -1638,7 +1638,7 @@ function ItemsTabClass:UpdateAffixControl(control, item, type, outputTable, outp control.slider.shown = false control.slider.val = main.defaultItemAffixQuality or 0.5 local selAffix = item[outputTable][outputIndex].modId - if (item.type == "Jewel" and item.base.subType ~= "Abyss") then + if item.class == "Jewel" then for i, modId in pairs(affixList) do local mod = item.affixes[modId] if selAffix == modId then @@ -1646,9 +1646,6 @@ function ItemsTabClass:UpdateAffixControl(control, item, type, outputTable, outp end local modString = table.concat(mod, "/") local label = modString - if item.type == "Flask" then - label = mod.affix .. " ^8[" .. modString .. "]" - end control.list[i + 1] = { label = label, modList = { modId }, @@ -1800,13 +1797,7 @@ function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet) if slotType == "Jewel" then -- Special checks for jewel sockets local node = self.build.spec.tree.nodes[tonumber(slotId)] or self.build.spec.nodes[tonumber(slotId)] - if not node or item.type ~= "Jewel" then - return false - elseif node.charmSocket or item.base.subType == "Charm" then - -- Charm sockets can only have charms, and charms can only be in charm sockets - if node.charmSocket and item.base.subType == "Charm" then - return true - end + if not node or item.class ~= "Jewel" then return false elseif item.clusterJewel and not node.expansionJewel then -- Don't allow cluster jewels in inner sockets @@ -1818,13 +1809,13 @@ function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet) -- Only allow jewels that fit in this socket return not item.clusterJewel or item.clusterJewel.sizeIndex <= node.expansionJewel.size end - elseif item.type == "Flask" and slotType == "Flask" then - if item.baseName:match("Life Flask") and slotName:match("Flask 1") then + elseif item.category == "Flask" and slotType == "Flask" then + if item.class == "LifeFlask" and slotName:match("Flask 1") then return true - elseif item.baseName:match("Mana Flask") and slotName:match("Flask 2") then + elseif item.class == "ManaFLask" and slotName:match("Flask 2") then return true end - elseif item.type == slotType then + elseif item.category == slotType then return true elseif slotName == "Weapon 1" or slotName == "Weapon 1 Swap" or slotName == "Weapon" then return item.base.tags.onehand or item.base.tags.twohand @@ -1836,11 +1827,11 @@ function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet) if self.build.calcsTab and self.build.calcsTab.mainEnv then giantsBlood = self.build.calcsTab.mainEnv.modDB:Flag(nil, "GiantsBlood") end - if weapon1Base.type == "Bow" then - return item.type == "Quiver" + if weapon1Base.class == "Bow" then + return item.class == "Quiver" elseif weapon1Base == "Unarmed" or weapon1Base.tags.onehand or (giantsBlood and (weapon1Base.tags.axe or weapon1Base.tags.mace or weapon1Base.tags.sword)) then - return item.type == "Shield" or item.type == "Focus" or item.type == "Sceptre" - or (item.base.tags.one_hand_weapon and weapon1Base.type ~= "Wand" and weapon1Base.type ~= "Sceptre") + return item.class == "Shield" or item.tyclasspe == "Focus" or item.class == "Sceptre" + or (item.base.tags.one_hand_weapon and weapon1Base.class ~= "Wand" and weapon1Base.class ~= "Sceptre") or (giantsBlood and (item.base.tags.axe or item.base.tags.mace or item.base.tags.sword)) end end @@ -1891,15 +1882,12 @@ function ItemsTabClass:CraftItem() end end local raritySel = controls.rarity.selIndex - if base.base.flask - or (base.base.type == "Jewel" and base.base.subType == "Charm") - or base.base.type == "Charm" - then + if base.base.flask or base.base.charm then if raritySel == 3 then raritySel = 2 end end - if base.base.type == "SoulCore" or base.base.type == "Rune" then + if base.base.class == "SoulCore" then if raritySel == 3 or raritySel == 2 then raritySel = 1 end @@ -1919,7 +1907,7 @@ function ItemsTabClass:CraftItem() implicitIndex = implicitIndex + 1 end end - if base.base.type == "Jewel" and base.base.subType == "Radius" then + if base.base.class == "Jewel" and base.base.tags.radius_jewel then item.jewelRadiusLabel = "Small" end item:NormaliseQuality() @@ -1933,14 +1921,14 @@ function ItemsTabClass:CraftItem() controls.title.shown = function() return controls.rarity.selIndex >= 3 end - controls.typeLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 45, 0, 16}, "Type:") - controls.type = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {55, 45, 295, 18}, self.build.data.itemBaseTypeList, function(index, value) - controls.base.list = self.build.data.itemBaseLists[self.build.data.itemBaseTypeList[index]] + controls.categoryLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 45, 0, 16}, "Category:") + controls.category = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {55, 45, 295, 18}, self.build.data.itemBaseCategoryList, function(index, value) + controls.base.list = self.build.data.itemBaseLists[self.build.data.itemBaseCategoryList[index]] controls.base.selIndex = 1 end) controls.type.selIndex = self.lastCraftTypeSel or 1 controls.baseLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 70, 0, 16}, "Base:") - controls.base = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {55, 70, 200, 18}, self.build.data.itemBaseLists[self.build.data.itemBaseTypeList[controls.type.selIndex]]) + controls.base = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {55, 70, 200, 18}, self.build.data.itemBaseLists[self.build.data.itemBaseCategoryList[controls.type.selIndex]]) controls.base.selIndex = self.lastCraftBaseSel or 1 controls.base.tooltipFunc = function(tooltip, mode, index, value) tooltip:Clear() @@ -2162,7 +2150,7 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco local corruptedRanges = {} local currentModType = "Corrupted" local sourceList = { "Corrupted" } - if self.displayItem.base.type == "Helmet" then + if self.displayItem.base.class == "Helmet" then t_insert(sourceList, "Glimpse of Chaos") end local function buildEnchantList(modType) @@ -2334,7 +2322,7 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco if value == "Corrupted" then currentModType = "Corrupted" enchantNum = 1 - elseif value == "Glimpse of Chaos" and self.displayItem.base.type == "Helmet" then -- special corruption enchants + elseif value == "Glimpse of Chaos" and self.displayItem.base.class == "Helmet" then -- special corruption enchants currentModType = "SpecialCorrupted" if self.displayItem.title == "Glimpse of Chaos" then -- glimpse of chaos can have all 8 special enchants enchantNum = 8 @@ -2586,7 +2574,9 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode) local slotNum = slot and slot.slotNum or (IsKeyDown("SHIFT") and 2 or 1) local modList = item.modList or item.slotModList[slotNum] - tooltip:AddLine(16, s_format("^x7F7F7F%s", base.weapon and self.build.data.weaponTypeInfo[base.type].label or base.type)) + if base.label then + tooltip:AddLine(16, s_format("^x7F7F7F%s", base.label)) + end if item.quality and item.quality > 0 then tooltip:AddLine(16, s_format("^x7F7F7FQuality: "..colorCodes.MAGIC.."+%d%%", item.quality)) end @@ -2692,7 +2682,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode) for _, modLine in pairs(item.buffModLines) do tooltip:AddLine(16, (modLine.extra and colorCodes.UNSUPPORTED or colorCodes.MAGIC) .. modLine.line) end - elseif item.type == "Jewel" then + elseif item.class == "Jewel" then -- Jewel-specific info if item.limit then tooltip:AddLine(16, "^x7F7F7FLimited to: ^7"..item.limit) diff --git a/src/Classes/ModStore.lua b/src/Classes/ModStore.lua index e9c2f9c8f0..08589bd902 100644 --- a/src/Classes/ModStore.lua +++ b/src/Classes/ModStore.lua @@ -574,7 +574,7 @@ function ModStoreClass:EvalMod(mod, cfg) end if tag.searchCond then for slot, item in pairs(items) do - if (not tag.allSlots or tag.allSlots and item.type ~= "Jewel") and slot ~= itemSlot or not tag.excludeSelf then + if (not tag.allSlots or tag.allSlots and item.class ~= "Jewel") and slot ~= itemSlot or not tag.excludeSelf then t_insert(matches, item:FindModifierSubstring(tag.searchCond:lower(), slot:lower())) end end diff --git a/src/Classes/NotableDBControl.lua b/src/Classes/NotableDBControl.lua index a6523f8674..00825b9c04 100644 --- a/src/Classes/NotableDBControl.lua +++ b/src/Classes/NotableDBControl.lua @@ -185,13 +185,13 @@ function NotableDBClass:ListBuilder() local infinites = { } local start = GetTime() local calcFunc = self.itemsTab.build.calcsTab:GetMiscCalculator() - local itemType = self.itemsTab.displayItem.base.type - local calcBase = calcFunc({ repSlotName = itemType, repItem = self.itemsTab:anointItem(nil) }) + local itemClass = self.itemsTab.displayItem.base.class -- this needs checking to make sure it works pressumably it was setup to handle annoints on any item type. + local calcBase = calcFunc({ repSlotName = itemClass, repItem = self.itemsTab:anointItem(nil) }) self.sortMaxPower = 0 for nodeIndex, node in ipairs(list) do node.measuredPower = 0 if node.modKey ~= "" then - local output = calcFunc({ repSlotName = itemType, repItem = self.itemsTab:anointItem(node) }) + local output = calcFunc({ repSlotName = itemClass, repItem = self.itemsTab:anointItem(node) }) node.measuredPower = self:CalculatePowerStat(self.sortDetail, output, calcBase) if node.measuredPower == m_huge then t_insert(infinites, node) diff --git a/src/Classes/SkillListControl.lua b/src/Classes/SkillListControl.lua index 02a95c3ffe..77881b379f 100644 --- a/src/Classes/SkillListControl.lua +++ b/src/Classes/SkillListControl.lua @@ -211,21 +211,21 @@ function SkillListClass:GetRowIcon(column, index, socketGroup) local slot = socketGroup.slot local itemsTab = self.skillsTab.build.itemsTab local weapon1Sel = itemsTab.activeItemSet["Weapon 1"].selItemId or 0 - local weapon1Type = itemsTab.items[weapon1Sel] and itemsTab.items[weapon1Sel].base.type or "None" + local weapon1Class = itemsTab.items[weapon1Sel] and itemsTab.items[weapon1Sel].base.class or "None" local weapon1SwapSel = itemsTab.activeItemSet["Weapon 1 Swap"].selItemId or 0 - local weapon1SwapType = itemsTab.items[weapon1SwapSel] and itemsTab.items[weapon1SwapSel].base.type or "None" + local weapon1SwapType = itemsTab.items[weapon1SwapSel] and itemsTab.items[weapon1SwapSel].base.class or "None" local weapon2Sel = itemsTab.activeItemSet["Weapon 2"].selItemId or 0 - local weapon2Type = itemsTab.items[weapon2Sel] and itemsTab.items[weapon2Sel].base.type or "None" + local weapon2Class = itemsTab.items[weapon2Sel] and itemsTab.items[weapon2Sel].base.class or "None" local weapon2SwapSel = itemsTab.activeItemSet["Weapon 2 Swap"].selItemId or 0 - local weapon2SwapType = itemsTab.items[weapon2SwapSel] and itemsTab.items[weapon2SwapSel].base.type or "None" - if slot == "Weapon 1" and weapon1Type == "Bow" then - slot = weapon1Type + local weapon2SwapType = itemsTab.items[weapon2SwapSel] and itemsTab.items[weapon2SwapSel].base.class or "None" + if slot == "Weapon 1" and weapon1Class == "Bow" then + slot = weapon1Class end if slot == "Weapon 1 Swap" and weapon1SwapType == "Bow" then slot = weapon1SwapType.." Swap" end - if slot == "Weapon 2" and (weapon2Type == "Quiver" or weapon2Type == "Shield") then - slot = weapon2Type + if slot == "Weapon 2" and (weapon2Class == "Quiver" or weapon2Class == "Shield") then + slot = weapon2Class end if slot == "Weapon 2 Swap" and (weapon2SwapType == "Quiver" or weapon2SwapType == "Shield") then slot = weapon2SwapType.." Swap" diff --git a/src/Classes/TradeQueryGenerator.lua b/src/Classes/TradeQueryGenerator.lua index a9f63e1e55..93a90c1937 100644 --- a/src/Classes/TradeQueryGenerator.lua +++ b/src/Classes/TradeQueryGenerator.lua @@ -10,8 +10,8 @@ local m_max = math.max local s_format = string.format local t_insert = table.insert --- string are an any type while tables require all fields to be matched with type and subType require both to be matched exactly. [1] type, [2] subType, subType is optional and must be nil if not present. -local tradeCategoryNames = { +-- strings are from GGPK itemClass used internally this aims to make them in an always consistent format. +local tradeClasses = { ["Ring"] = { "Ring" }, ["Amulet"] = { "Amulet" }, ["Belt"] = { "Belt" }, @@ -23,7 +23,7 @@ local tradeCategoryNames = { ["Shield"] = { "Shield" }, ["Focus"] = { "Focus" }, ["1HWeapon"] = { "One Handed Mace", "Wand", "Sceptre" }, - ["2HWeapon"] = { "Staff", "Staff: Warstaff", "Two Handed Mace", "Crossbow", "Bow" }, + ["2HWeapon"] = { "Staff", "Warstaff", "Two Handed Mace", "Crossbow", "Bow" }, -- ["1HAxe"] = { "One Handed Axe" }, -- ["1HSword"] = { "One Handed Sword", "Thrusting One Handed Sword" }, ["1HMace"] = { "One Handed Mace" }, @@ -32,7 +32,7 @@ local tradeCategoryNames = { ["Wand"] = { "Wand" }, -- ["Claw"] = { "Claw" }, ["Staff"] = { "Staff" }, - ["Quarterstaff"] = { "Staff: Warstaff" }, + ["Quarterstaff"] = { "Warstaff" }, ["Bow"] = { "Bow" }, ["Crossbow"] = { "Crossbow"}, -- ["2HAxe"] = { "Two Handed Axe" }, @@ -41,9 +41,9 @@ local tradeCategoryNames = { -- ["FishingRod"] = { "Fishing Rod" }, ["BaseJewel"] = { "Jewel" }, ["AnyJewel"] = { "Jewel" }, - ["LifeFlask"] = { "Flask: Life" }, - ["ManaFlask"] = { "Flask: Mana" }, - ["Charm"] = { "Charm" }, + ["LifeFlask"] = { "LifeFlask" }, + ["ManaFlask"] = { "ManaFlask" }, + ["Charm"] = { "UtilityFlask" }, -- doesn't have trade mods -- ["RadiusJewel"] = { "Jewel: Radius" }, -- not in the game yet. @@ -52,13 +52,13 @@ local tradeCategoryNames = { -- ["Spear"] = { "Spear" } } --- Build lists of tags present on a given item category +-- Build lists of tags present on a given item class local tradeCategoryTags = { } -for type, bases in pairs(data.itemBaseLists) do +for classList, bases in pairs(data.itemBaseLists) do for _, base in ipairs(bases) do if not base.hidden then - if not tradeCategoryTags[type] then - tradeCategoryTags[type] = { } + if not tradeCategoryTags[classList] then + tradeCategoryTags[classList] = { } end local baseTags = { } for tag, _ in pairs(base.base.tags) do @@ -67,13 +67,13 @@ for type, bases in pairs(data.itemBaseLists) do end end local present = false - for i, tags in ipairs(tradeCategoryTags[type]) do + for i, tags in ipairs(tradeCategoryTags[classList]) do if tableDeepEquals(baseTags, tags) then present = true end end if not present then - t_insert(tradeCategoryTags[type], baseTags) + t_insert(tradeCategoryTags[classList], baseTags) end end end @@ -115,7 +115,7 @@ local function fetchStats() end local function canModSpawnForItemCategory(mod, names) - for _, name in pairs(tradeCategoryNames[names]) do + for _, name in pairs(tradeClasses[names]) do for _, tags in ipairs(tradeCategoryTags[name]) do for i, key in ipairs(mod.weightKey) do if tags[key] then @@ -175,7 +175,7 @@ function TradeQueryGeneratorClass.WeightedRatioOutputs(baseOutput, newOutput, st return meanStatDiff end -function TradeQueryGeneratorClass:ProcessMod(mod, tradeQueryStatsParsed, itemCategoriesMask, itemCategoriesOverride) +function TradeQueryGeneratorClass:ProcessMod(mod, tradeQueryStatsParsed, itemClassesMask, itemClassesOverride) if mod.statOrder == nil then mod.statOrder = { } end if mod.group == nil then mod.group = "" end @@ -302,8 +302,8 @@ function TradeQueryGeneratorClass:ProcessMod(mod, tradeQueryStatsParsed, itemCat end -- Update the min and max values available for each item category - for category, _ in pairs(itemCategoriesOverride or itemCategoriesMask or tradeCategoryNames) do - if itemCategoriesOverride or canModSpawnForItemCategory(mod, category) then + for category, _ in pairs(itemClassesOverride or itemClassesMask or tradeClasses) do + if itemClassesOverride or canModSpawnForItemCategory(mod, category) then if self.modData[modType][uniqueIndex][category] == nil then self.modData[modType][uniqueIndex][category] = { min = 999999, max = -999999 } end @@ -326,9 +326,9 @@ function TradeQueryGeneratorClass:ProcessMod(mod, tradeQueryStatsParsed, itemCat ::continue:: end -function TradeQueryGeneratorClass:GenerateModData(mods, tradeQueryStatsParsed, itemCategoriesMask, itemCategoriesOverride) +function TradeQueryGeneratorClass:GenerateModData(mods, tradeQueryStatsParsed, itemClassesMask, itemClassesOverride) for _, mod in pairs(mods) do - self:ProcessMod( mod, tradeQueryStatsParsed, itemCategoriesMask, itemCategoriesOverride) + self:ProcessMod( mod, tradeQueryStatsParsed, itemClassesMask, itemClassesOverride) end end @@ -362,7 +362,7 @@ function TradeQueryGeneratorClass:InitMods() -- create mask for regular mods local regularItemMask = { } - for category, _ in pairs(tradeCategoryNames) do + for category, _ in pairs(tradeClasses) do regularItemMask[category] = true end @@ -391,14 +391,10 @@ function TradeQueryGeneratorClass:InitMods() -- create trade type mask for base type local maskOverride = {} - for tradeName, typeNames in pairs(tradeCategoryNames) do - for _, typeName in ipairs(typeNames) do - local entryName = entry.type - if entry.subType then - entryName = entryName..": "..entry.subType - end - if typeName == entryName then - maskOverride[tradeName] = true; + for tradeClass, classes in pairs(tradeClasses) do + for _, class in ipairs(classes) do + if class == entry.class then + maskOverride[tradeClass] = true; break end end @@ -553,77 +549,77 @@ function TradeQueryGeneratorClass:StartQuery(slot, options) end elseif slot.slotName == "Weapon 2" or slot.slotName == "Weapon 1" then if existingItem then - if existingItem.type == "Shield" then + if existingItem.class == "Shield" then itemCategoryQueryStr = "armour.shield" itemCategory = "Shield" - elseif existingItem.type == "Focus" then + elseif existingItem.class == "Focus" then itemCategoryQueryStr = "armour.focus" itemCategory = "Focus" - elseif existingItem.type == "Buckler" then -- not in game + elseif existingItem.class == "Buckler" then -- not in game itemCategoryQueryStr = "armour.buckler" itemCategory = "Buckler" - elseif existingItem.type == "Quiver" then + elseif existingItem.class == "Quiver" then itemCategoryQueryStr = "armour.quiver" itemCategory = "Quiver" - elseif existingItem.type == "Bow" then + elseif existingItem.class == "Bow" then itemCategoryQueryStr = "weapon.bow" itemCategory = "Bow" - elseif existingItem.type == "Crossbow" then + elseif existingItem.class == "Crossbow" then itemCategoryQueryStr = "weapon.crossbow" itemCategory = "Crossbow" - elseif existingItem.type == "Staff" and existingItem.base.subType == "Warstaff" then + elseif existingItem.class == "Warstaff" then itemCategoryQueryStr = "weapon.warstaff" itemCategory = "Quarterstaff" - elseif existingItem.type == "Staff" then + elseif existingItem.class == "Staff" then itemCategoryQueryStr = "weapon.staff" itemCategory = "Staff" - elseif existingItem.type == "Two Handed Sword" then + elseif existingItem.class == "Two Handed Sword" then itemCategoryQueryStr = "weapon.twosword" itemCategory = "2HSword" - elseif existingItem.type == "Two Handed Axe" then + elseif existingItem.class == "Two Handed Axe" then itemCategoryQueryStr = "weapon.twoaxe" itemCategory = "2HAxe" - elseif existingItem.type == "Two Handed Mace" then + elseif existingItem.class == "Two Handed Mace" then itemCategoryQueryStr = "weapon.twomace" itemCategory = "2HMace" - elseif existingItem.type == "Fishing Rod" then + elseif existingItem.class == "Fishing Rod" then itemCategoryQueryStr = "weapon.rod" itemCategory = "FishingRod" - elseif existingItem.type == "One Handed Sword" then + elseif existingItem.class == "One Handed Sword" then itemCategoryQueryStr = "weapon.onesword" itemCategory = "1HSword" - elseif existingItem.type == "Spear" then -- not in game + elseif existingItem.class == "Spear" then -- not in game itemCategoryQueryStr = "weapon.spear" itemCategory = "1HSword" - elseif existingItem.type == "Flail" then -- not in game + elseif existingItem.class == "Flail" then -- not in game itemCategoryQueryStr = "weapon.flail" itemCategory = "weapon.flail" - elseif existingItem.type == "One Handed Axe" then + elseif existingItem.class == "One Handed Axe" then itemCategoryQueryStr = "weapon.oneaxe" itemCategory = "1HAxe" - elseif existingItem.type == "One Handed Mace" then + elseif existingItem.class == "One Handed Mace" then itemCategoryQueryStr = "weapon.onemace" itemCategory = "1HMace" - elseif existingItem.type == "Sceptre" then + elseif existingItem.class == "Sceptre" then itemCategoryQueryStr = "weapon.sceptre" itemCategory = "Sceptre" - elseif existingItem.type == "Wand" then + elseif existingItem.class == "Wand" then itemCategoryQueryStr = "weapon.wand" itemCategory = "Wand" - elseif existingItem.type == "Dagger" then + elseif existingItem.class == "Dagger" then itemCategoryQueryStr = "weapon.dagger" itemCategory = "Dagger" - elseif existingItem.type == "Claw" then + elseif existingItem.class == "Claw" then itemCategoryQueryStr = "weapon.claw" itemCategory = "Claw" - elseif existingItem.type:find("Two Handed") ~= nil then + elseif existingItem.class:find("Two Handed") ~= nil then itemCategoryQueryStr = "weapon.twomelee" itemCategory = "2HWeapon" - elseif existingItem.type:find("One Handed") ~= nil then + elseif existingItem.class:find("One Handed") ~= nil then itemCategoryQueryStr = "weapon.one" itemCategory = "1HWeapon" else - logToFile("'%s' is not supported for weighted trade query generation", existingItem.type) + logToFile("'%s' is not supported for weighted trade query generation", existingItem.class) return end else @@ -652,9 +648,6 @@ function TradeQueryGeneratorClass:StartQuery(slot, options) elseif slot.slotName == "Belt" then itemCategoryQueryStr = "accessory.belt" itemCategory = "Belt" - elseif slot.slotName:find("Time-Lost") ~= nil then - itemCategoryQueryStr = "jewel" - itemCategory = "RadiusJewel" elseif slot.slotName:find("Jewel") ~= nil then itemCategoryQueryStr = "jewel" itemCategory = options.jewelType .. "Jewel" @@ -674,7 +667,7 @@ function TradeQueryGeneratorClass:StartQuery(slot, options) itemCategoryQueryStr = "flask" -- these don't have a unique string so overlapping mods of the same benefit could interfere. itemCategory = "Charm" else - logToFile("'%s' is not supported for weighted trade query generation", existingItem and existingItem.type or "n/a") + logToFile("'%s' is not supported for weighted trade query generation", existingItem and existingItem.class or "n/a") return end From 8f8cbae3f2817c90e1543e71883cd5d548476b11 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 3 Feb 2025 14:23:48 +1100 Subject: [PATCH 05/15] Update spec --- src/Export/Classes/GGPKData.lua | 1 + src/Export/spec.lua | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Export/Classes/GGPKData.lua b/src/Export/Classes/GGPKData.lua index fbb44ff314..305ec47a88 100644 --- a/src/Export/Classes/GGPKData.lua +++ b/src/Export/Classes/GGPKData.lua @@ -145,6 +145,7 @@ function GGPKClass:GetNeededFiles() "Data/VirtualStatContextFlags.dat", "Data/BaseItemTypes.dat", "Data/WeaponTypes.dat", + "Data/weaponCategories.dat", "Data/ArmourTypes.dat", "Data/ShieldTypes.dat", "Data/Flasks.dat", diff --git a/src/Export/spec.lua b/src/Export/spec.lua index e674467064..b84cbf8ca6 100644 --- a/src/Export/spec.lua +++ b/src/Export/spec.lua @@ -15327,9 +15327,9 @@ return { [3]={ list=false, name="", - refTo="", + refTo="clientStrings", type="Key", - width=150 + width=340 } }, weapondamagescaling={ From d737e7a43fa8b766ae4b8d54a88de0d2625817f3 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 3 Feb 2025 17:06:05 +1100 Subject: [PATCH 06/15] Update modules, modparser and exporters. --- src/Classes/ImportTab.lua | 2 +- src/Classes/Item.lua | 1 + src/Classes/ItemDBControl.lua | 2 +- src/Classes/ItemsTab.lua | 20 +-- src/Classes/SkillListControl.lua | 8 +- src/Data/Global.lua | 5 +- src/Data/Minions.lua | 16 +-- src/Data/Skills/act_dex.lua | 92 ++++++------- src/Data/Skills/act_int.lua | 128 ++++++++--------- src/Data/Skills/act_str.lua | 228 +++++++++++++++++-------------- src/Data/Skills/minion.lua | 11 +- src/Data/Skills/other.lua | 25 ++-- src/Data/Skills/spectre.lua | 92 ++++++------- src/Data/Skills/sup_dex.lua | 20 +-- src/Export/Scripts/minions.lua | 27 +--- src/Export/Scripts/skills.lua | 43 ++---- src/Export/Scripts/soulcores.lua | 5 +- src/Modules/CalcActiveSkill.lua | 36 ++--- src/Modules/CalcMirages.lua | 4 +- src/Modules/CalcOffence.lua | 22 +-- src/Modules/CalcPerform.lua | 36 ++--- src/Modules/CalcSetup.lua | 52 +++---- src/Modules/CalcTriggers.lua | 8 +- src/Modules/Data.lua | 55 ++++---- src/Modules/ModParser.lua | 24 ++-- 25 files changed, 466 insertions(+), 496 deletions(-) diff --git a/src/Classes/ImportTab.lua b/src/Classes/ImportTab.lua index 30bb8cb948..fe09bf3adb 100644 --- a/src/Classes/ImportTab.lua +++ b/src/Classes/ImportTab.lua @@ -816,7 +816,7 @@ function ImportTabClass:ImportItem(itemData, slotName) if item.name:match("Energy Blade") then local oneHanded = false for _, p in ipairs(itemData.properties) do - if self.build.data.weaponTypeInfo[p.name] and self.build.data.weaponTypeInfo[p.name].oneHand then + if self.build.data.weaponClassInfo[p.name] and self.build.data.weaponClassInfo[p.name].oneHand then oneHanded = true break end diff --git a/src/Classes/Item.lua b/src/Classes/Item.lua index 977b47fe42..aa2a2ecadf 100644 --- a/src/Classes/Item.lua +++ b/src/Classes/Item.lua @@ -1307,6 +1307,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum) if self.base.weapon then local weaponData = { } self.weaponData[slotNum] = weaponData + weaponData.class = self.base.class weaponData.category = self.base.category weaponData.name = self.name weaponData.AttackSpeedInc = calcLocal(modList, "Speed", "INC", ModFlag.Attack) + m_floor(self.quality / 8 * calcLocal(modList, "AlternateQualityLocalAttackSpeedPer8Quality", "INC", 0)) diff --git a/src/Classes/ItemDBControl.lua b/src/Classes/ItemDBControl.lua index f993351634..56d8a2906f 100644 --- a/src/Classes/ItemDBControl.lua +++ b/src/Classes/ItemDBControl.lua @@ -96,7 +96,7 @@ function ItemDBClass:DoesItemMatchFilters(item) return false end elseif categorySel == 4 or categorySel == 5 then - local weaponInfo = self.itemsTab.build.data.weaponTypeInfo[item.category] + local weaponInfo = self.itemsTab.build.data.weaponClassInfo[item.class] if not (weaponInfo and weaponInfo.melee and ((categorySel == 4 and weaponInfo.oneHand) or (categorySel == 5 and not weaponInfo.oneHand))) then return false end diff --git a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua index 1955589be7..a6a1ffc7b2 100644 --- a/src/Classes/ItemsTab.lua +++ b/src/Classes/ItemsTab.lua @@ -1914,21 +1914,21 @@ function ItemsTabClass:CraftItem() item:BuildAndParseRaw() return item end - controls.rarityLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 20, 0, 16}, "Rarity:") - controls.rarity = new("DropDownControl", nil, {-80, 20, 100, 18}, rarityDropList) + controls.rarityLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {70, 20, 0, 16}, "Rarity:") + controls.rarity = new("DropDownControl", {"TOPLEFT",controls.rarityLabel,"TOPRIGHT"}, {5, 0, 100, 18}, rarityDropList) controls.rarity.selIndex = self.lastCraftRaritySel or 3 - controls.title = new("EditControl", nil, {70, 20, 190, 18}, "", "Name") + controls.title = new("EditControl", {"TOPLEFT",controls.rarity,"TOPRIGHT"}, {5, 0, 190, 18}, "", "Name") controls.title.shown = function() return controls.rarity.selIndex >= 3 end - controls.categoryLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 45, 0, 16}, "Category:") - controls.category = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {55, 45, 295, 18}, self.build.data.itemBaseCategoryList, function(index, value) + controls.categoryLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {70, 45, 0, 16}, "^7Category:") + controls.category = new("DropDownControl", {"TOPLEFT",controls.categoryLabel,"TOPRIGHT"}, {5, 0, 295, 18}, self.build.data.itemBaseCategoryList, function(index, value) controls.base.list = self.build.data.itemBaseLists[self.build.data.itemBaseCategoryList[index]] controls.base.selIndex = 1 end) - controls.type.selIndex = self.lastCraftTypeSel or 1 - controls.baseLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 70, 0, 16}, "Base:") - controls.base = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {55, 70, 200, 18}, self.build.data.itemBaseLists[self.build.data.itemBaseCategoryList[controls.type.selIndex]]) + controls.category.selIndex = self.lastCraftTypeSel or 1 + controls.baseLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {70, 70, 0, 16}, "Base:") + controls.base = new("DropDownControl", {"TOPLEFT",controls.baseLabel,"TOPRIGHT"}, {5, 0, 200, 18}, self.build.data.itemBaseLists[self.build.data.itemBaseCategoryList[controls.category.selIndex]]) controls.base.selIndex = self.lastCraftBaseSel or 1 controls.base.tooltipFunc = function(tooltip, mode, index, value) tooltip:Clear() @@ -1944,13 +1944,13 @@ function ItemsTabClass:CraftItem() self:EditDisplayItemText() end self.lastCraftRaritySel = controls.rarity.selIndex - self.lastCraftTypeSel = controls.type.selIndex + self.lastCraftTypeSel = controls.category.selIndex self.lastCraftBaseSel = controls.base.selIndex end) controls.cancel = new("ButtonControl", nil, {45, 100, 80, 20}, "Cancel", function() main:ClosePopup() end) - main:OpenPopup(370, 130, "Craft Item", controls) + main:OpenPopup(460, 130, "Craft Item", controls) end -- Opens the item text editor popup diff --git a/src/Classes/SkillListControl.lua b/src/Classes/SkillListControl.lua index 77881b379f..a61caff4ea 100644 --- a/src/Classes/SkillListControl.lua +++ b/src/Classes/SkillListControl.lua @@ -211,13 +211,13 @@ function SkillListClass:GetRowIcon(column, index, socketGroup) local slot = socketGroup.slot local itemsTab = self.skillsTab.build.itemsTab local weapon1Sel = itemsTab.activeItemSet["Weapon 1"].selItemId or 0 - local weapon1Class = itemsTab.items[weapon1Sel] and itemsTab.items[weapon1Sel].base.class or "None" + local weapon1Class = itemsTab.items[weapon1Sel] and itemsTab.items[weapon1Sel].base.class or "Unarmed" local weapon1SwapSel = itemsTab.activeItemSet["Weapon 1 Swap"].selItemId or 0 - local weapon1SwapType = itemsTab.items[weapon1SwapSel] and itemsTab.items[weapon1SwapSel].base.class or "None" + local weapon1SwapType = itemsTab.items[weapon1SwapSel] and itemsTab.items[weapon1SwapSel].base.class or "Unarmed" local weapon2Sel = itemsTab.activeItemSet["Weapon 2"].selItemId or 0 - local weapon2Class = itemsTab.items[weapon2Sel] and itemsTab.items[weapon2Sel].base.class or "None" + local weapon2Class = itemsTab.items[weapon2Sel] and itemsTab.items[weapon2Sel].base.class or "Unarmed" local weapon2SwapSel = itemsTab.activeItemSet["Weapon 2 Swap"].selItemId or 0 - local weapon2SwapType = itemsTab.items[weapon2SwapSel] and itemsTab.items[weapon2SwapSel].base.class or "None" + local weapon2SwapType = itemsTab.items[weapon2SwapSel] and itemsTab.items[weapon2SwapSel].base.class or "Unarmed" if slot == "Weapon 1" and weapon1Class == "Bow" then slot = weapon1Class end diff --git a/src/Data/Global.lua b/src/Data/Global.lua index 059890f80f..0fc969ae57 100644 --- a/src/Data/Global.lua +++ b/src/Data/Global.lua @@ -236,12 +236,15 @@ ModFlag.Fishing = 0x0000000002000000 ModFlag.Crossbow = 0x0000000004000000 ModFlag.Flail = 0x0000000008000000 ModFlag.Spear = 0x0000000010000000 +ModFlag.Warstaff = 0x0000000020000000 +ModFlag.Sceptre = 0x0000000040000000 + -- Weapon classes ModFlag.WeaponMelee =0x0000000100000000 ModFlag.WeaponRanged=0x0000000200000000 ModFlag.Weapon1H = 0x0000000400000000 ModFlag.Weapon2H = 0x0000000800000000 -ModFlag.WeaponMask = 0x0000000F1FFF0000 +ModFlag.WeaponMask = 0x0000000F4FFF0000 KeywordFlag = { } -- Skill keywords diff --git a/src/Data/Minions.lua b/src/Data/Minions.lua index 5c26f87f73..384bc9c926 100644 --- a/src/Data/Minions.lua +++ b/src/Data/Minions.lua @@ -20,7 +20,7 @@ minions["RaisedZombie"] = { attackTime = 1.25, attackRange = 9, accuracy = 1, - weaponType1 = "One Handed Axe", + weaponType1 = "One Hand Axe", limit = "ActiveZombieLimit", skillList = { "MinionMeleeStep", @@ -93,7 +93,7 @@ minions["RaisedSkeletonWarrior"] = { attackTime = 1, attackRange = 12, accuracy = 1, - weaponType1 = "One Handed Sword", + weaponType1 = "One Hand Sword", weaponType2 = "Shield", limit = "ActiveSkeletonLimit", skillList = { @@ -121,7 +121,7 @@ minions["RaisedSkeletonBrute"] = { attackTime = 1.75, attackRange = 16, accuracy = 1, - weaponType1 = "Two Handed Mace", + weaponType1 = "Two Hand Mace", limit = "ActiveSkeletonLimit", skillList = { "MinionMeleeStep", @@ -173,7 +173,7 @@ minions["RaisedSkeletonFrostMage"] = { attackTime = 1, attackRange = 80, accuracy = 1, - weaponType1 = "None", + weaponType1 = "Unarmed", limit = "ActiveSkeletonLimit", skillList = { "FrostBoltSkeletonMageMinion", @@ -199,7 +199,7 @@ minions["RaisedSkeletonCleric"] = { attackTime = 1, attackRange = 80, accuracy = 1, - weaponType1 = "One Handed Mace", + weaponType1 = "Sceptre", limit = "ActiveSkeletonLimit", skillList = { "HealSkeletonClericMinion", @@ -225,7 +225,7 @@ minions["RaisedSkeletonArsonist"] = { attackTime = 1, attackRange = 80, accuracy = 1, - weaponType1 = "None", + weaponType1 = "Unarmed", limit = "ActiveSkeletonLimit", skillList = { "FireBombSkeletonMinion", @@ -251,8 +251,8 @@ minions["RaisedSkeletonReaver"] = { attackTime = 0.83, attackRange = 14, accuracy = 1, - weaponType1 = "One Handed Axe", - weaponType2 = "One Handed Axe", + weaponType1 = "One Hand Axe", + weaponType2 = "One Hand Axe", limit = "ActiveSkeletonLimit", skillList = { "MinionMeleeStep", diff --git a/src/Data/Skills/act_dex.lua b/src/Data/Skills/act_dex.lua index c889b9ea43..0d18ab8c17 100644 --- a/src/Data/Skills/act_dex.lua +++ b/src/Data/Skills/act_dex.lua @@ -137,7 +137,7 @@ skills["BarragePlayer"] = { color = 2, description = "Ready a volley of arrows, Empowering your next Bow Attack to repeat multiple times. Consumes your Frenzy Charges on use to add additional repeats.", skillTypes = { [SkillType.Spell] = true, [SkillType.Duration] = true, [SkillType.ModifiesNextSkill] = true, [SkillType.Cooldown] = true, [SkillType.ConsumesCharges] = true, [SkillType.Nonpathing] = true, [SkillType.Buff] = true, [SkillType.EmpowersOtherSkill] = true, [SkillType.SkillConsumesFrenzyChargesOnUse] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 0.7, @@ -399,7 +399,7 @@ skills["DetonatingArrowPlayer"] = { color = 2, description = "Channel to build up power before firing off a burning arrow. At maximum charge, the arrow will detonate at the end of its flight, causing an explosion in an area around it.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Fire] = true, [SkillType.Triggerable] = true, [SkillType.Channel] = true, [SkillType.CanRapidFire] = true, [SkillType.Area] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -570,7 +570,7 @@ skills["ElectrocutingArrowPlayer"] = { color = 2, description = "Leap forward into the air and fire downward. Hitting an enemy will attach an Electrocuting Rod to them, causing all incoming Lightning damage to build up Electrocution. This rod is removed when the enemy is next Electrocuted.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.Lightning] = true, [SkillType.Duration] = true, [SkillType.Jumping] = true, [SkillType.CannotChain] = true, [SkillType.ProjectileNoCollision] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -696,7 +696,7 @@ skills["EscapeShotPlayer"] = { color = 2, description = "Leap backwards and fire an arrow which can Chill or Freeze enemies around the location you escaped from.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Cold] = true, [SkillType.Area] = true, [SkillType.ProjectileSpeed] = true, [SkillType.ProjectileNumber] = true, [SkillType.Cooldown] = true, [SkillType.ProjectilesNumberModifiersNotApplied] = true, [SkillType.Jumping] = true, [SkillType.ProjectileNoCollision] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -825,7 +825,7 @@ skills["FreezingSalvoPlayer"] = { color = 2, description = "Passively coalesces icy missiles from the air over time. Using the skill fires a missile, firing an additional missile for each that has been accumulated.", skillTypes = { [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Cold] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.CannotChain] = true, [SkillType.ProjectileNoCollision] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -954,7 +954,7 @@ skills["GasArrowPlayer"] = { color = 2, description = "Fires a noxious arrow at the ground, creating a cloud of flammable poisonous gas at the end of its flight. The cloud will detonate if hit by a Detonator skill or if an Ignited enemy touches it, creating a fiery explosion.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.CanRapidFire] = true, [SkillType.Duration] = true, [SkillType.Nonpathing] = true, [SkillType.CanBecomeArrowRain] = true, [SkillType.Area] = true, [SkillType.Chaos] = true, [SkillType.Fire] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -1348,20 +1348,20 @@ skills["HeraldOfThunderPlayer"] = { color = 2, description = "While active, killing Shocked enemies with Attack damage, will cause subsequent Attack hits to release lightning bolts which deals Attack damage to all surrounding enemies.", skillTypes = { [SkillType.Buff] = true, [SkillType.HasReservation] = true, [SkillType.Area] = true, [SkillType.Lightning] = true, [SkillType.Herald] = true, [SkillType.Attack] = true, [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Sword"] = true, ["Flail"] = true, - ["Two Handed Sword"] = true, + ["Two Hand Mace"] = true, ["Dagger"] = true, ["Claw"] = true, + ["Two Hand Axe"] = true, ["Crossbow"] = true, - ["Bow"] = true, + ["One Hand Axe"] = true, ["Spear"] = true, - ["Two Handed Axe"] = true, - ["Two Handed Mace"] = true, - ["One Handed Axe"] = true, - ["Staff"] = true, - ["One Handed Sword"] = true, + ["Bow"] = true, + ["One Hand Sword"] = true, + ["Warstaff"] = true, }, castTime = 0, qualityStats = { @@ -1537,7 +1537,7 @@ skills["IceShotPlayer"] = { color = 2, description = "Fires an icy arrow that sprays a cone of ice shards when it hits a target.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Cold] = true, [SkillType.Triggerable] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Nonpathing] = true, [SkillType.CanRapidFire] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -1732,7 +1732,7 @@ skills["LightningArrowPlayer"] = { color = 2, description = "Fires a charged arrow at the target. On hitting an enemy or wall, the arrow will fire Chaining Lightning beams at nearby enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Area] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Lightning] = true, [SkillType.Triggerable] = true, [SkillType.CanRapidFire] = true, [SkillType.Nonpathing] = true, [SkillType.CanBecomeArrowRain] = true, [SkillType.Chains] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -1932,7 +1932,7 @@ skills["LightningRodPlayer"] = { color = 2, description = "Fire an arrow that drops from above, creating a Lightning burst. The arrow remains in the ground, and any Chaining Lightning beams can Chain to it. When Chained to, the arrows release another Lightning burst.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Rain] = true, [SkillType.Area] = true, [SkillType.CanRapidFire] = true, [SkillType.ProjectileSpeed] = true, [SkillType.ProjectileNumber] = true, [SkillType.Duration] = true, [SkillType.Nonpathing] = true, [SkillType.Lightning] = true, [SkillType.Sustained] = true, [SkillType.ProjectileNoCollision] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -2060,7 +2060,7 @@ skills["MagneticSalvoPlayer"] = { color = 2, description = "Aims skyward and fires energy missiles at lingering arrows or bolts created by other Lightning Attacks in front of you. The missiles explode if they land close to a lingering bolt or arrow, dealing more damage in a larger area but destroying that bolt or arrow in the process.", skillTypes = { [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Lightning] = true, [SkillType.ProjectileNoCollision] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -2480,7 +2480,7 @@ skills["PoisonBurstArrowPlayer"] = { color = 2, description = "Fires a virulent arrow that creates a burst of Poison on hit, affecting all enemies in an area.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.CanRapidFire] = true, [SkillType.Nonpathing] = true, [SkillType.CanBecomeArrowRain] = true, [SkillType.Area] = true, [SkillType.Chaos] = true, [SkillType.Duration] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -2683,7 +2683,7 @@ skills["RainOfArrowsPlayer"] = { color = 2, description = "Fire arrows into the air, causing them to rain from above. Consumes your Frenzy Charges to fire more arrows.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Rain] = true, [SkillType.Area] = true, [SkillType.ProjectileSpeed] = true, [SkillType.ProjectileNumber] = true, [SkillType.ConsumesCharges] = true, [SkillType.Nonpathing] = true, [SkillType.SkillConsumesFrenzyChargesOnUse] = true, [SkillType.ProjectileNoCollision] = true, [SkillType.Sustained] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -2823,7 +2823,7 @@ skills["ShockchainArrowPlayer"] = { color = 2, description = "Fires a Lightning-infused arrow that homes in on Shocked enemies. Hitting a Shocked enemy will Consume the Shock to charge the arrow, causing it to release a damaging shockwave and split beams towards up to two nearby targets, prioritising ones which are Shocked. If the beam hits a Shocked target, it will release another damaging shockwave and can continue to Chain.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Area] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Lightning] = true, [SkillType.Triggerable] = true, [SkillType.CanRapidFire] = true, [SkillType.Nonpathing] = true, [SkillType.CanBecomeArrowRain] = true, [SkillType.Chains] = true, [SkillType.SkillConsumesShock] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -3095,7 +3095,7 @@ skills["SnipePlayer"] = { color = 2, description = "Channel to charge up your bow before releasing a powerful shot. Releasing the moment you fully charge causes the arrow to explode on impact for a guaranteed Critical Hit.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Channel] = true, [SkillType.CanRapidFire] = true, [SkillType.Area] = true, [SkillType.PerfectTiming] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -3396,7 +3396,7 @@ skills["SpiralVolleyPlayer"] = { color = 2, description = "Loads your Bow with a volley of enchanted arrows and fires them in a circle as you spin forward, firing directly at targets if possible. Consumes Frenzy Charges to cause the arrows to deal more damage and Chain to other targets. Each target can only be Hit once.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Triggerable] = true, [SkillType.SkillConsumesFrenzyChargesOnUse] = true, [SkillType.Sustained] = true, [SkillType.ConsumesCharges] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -3532,7 +3532,7 @@ skills["StormcallerArrowPlayer"] = { color = 2, description = "Fires an arrow that embeds where it lands for a short duration. At the end of the duration, a Lightning bolt strikes the arrow, disintegrating it and damaging enemies with a high chance to Shock.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.CanRapidFire] = true, [SkillType.Duration] = true, [SkillType.Nonpathing] = true, [SkillType.CanBecomeArrowRain] = true, [SkillType.Area] = true, [SkillType.Lightning] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -3732,7 +3732,7 @@ skills["TornadoShotPlayer"] = { color = 2, description = "Fires a skyward shot that whips up a Tornado where it lands, dealing Physical damage over time and Hindering enemies standing in it. Arrows and Crossbow bolts fired at the Tornado are sucked into it, causing the Tornado to spit out a nova of copied Projectiles. Copied Projectiles cannot be copied again, even by further Tornados.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Area] = true, [SkillType.ProjectileSpeed] = true, [SkillType.ProjectileNumber] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Triggerable] = true, [SkillType.Rain] = true, [SkillType.CanRapidFire] = true, [SkillType.Physical] = true, [SkillType.DamageOverTime] = true, [SkillType.Duration] = true, [SkillType.Limit] = true, [SkillType.Nonpathing] = true, [SkillType.ProjectileNoCollision] = true, [SkillType.CannotChain] = true, [SkillType.SupportedByFountains] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -3939,7 +3939,7 @@ skills["ToxicGrowthPlayer"] = { color = 2, description = "Leap into the air and fire a volley of arrows which cause toxic pustules to sprout from the ground on impact. The pustules explode after a delay and can be Poisoned, causing them to explode faster and more violently.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Chaos] = true, [SkillType.SupportedByFountains] = true, [SkillType.Jumping] = true, [SkillType.ProjectileNoCollision] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -4075,7 +4075,7 @@ skills["VineArrowPlayer"] = { color = 2, description = "Fire an arrow into the air that lands after a short delay, damaging enemies and causing a plant to spring up at the impact location. The plant sprouts vines that latch onto nearby enemies, Slowing their movement speed and dealing Chaos damage over time. The plant can be Poisoned, causing it to deal more damage.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Rain] = true, [SkillType.Area] = true, [SkillType.CanRapidFire] = true, [SkillType.ProjectileSpeed] = true, [SkillType.ProjectileNumber] = true, [SkillType.Duration] = true, [SkillType.Nonpathing] = true, [SkillType.Chaos] = true, [SkillType.SupportedByFountains] = true, [SkillType.ProjectileNoCollision] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -4517,20 +4517,20 @@ skills["WindDancerPlayer"] = { color = 2, description = "Grants a buff that gives you more Evasion per stage. Being Hit by a Melee Attack while you have this buff consumes all stages to damage and Knock Back enemies around you.", skillTypes = { [SkillType.Buff] = true, [SkillType.HasReservation] = true, [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Sword"] = true, ["Flail"] = true, - ["Two Handed Sword"] = true, + ["Two Hand Mace"] = true, ["Dagger"] = true, ["Claw"] = true, + ["Two Hand Axe"] = true, ["Crossbow"] = true, - ["Bow"] = true, + ["One Hand Axe"] = true, ["Spear"] = true, - ["Two Handed Axe"] = true, - ["Two Handed Mace"] = true, - ["One Handed Axe"] = true, - ["Staff"] = true, - ["One Handed Sword"] = true, + ["Bow"] = true, + ["One Hand Sword"] = true, + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -4650,20 +4650,20 @@ skills["TriggeredWindDancerPlayer"] = { name = "Gale Force", hidden = true, skillTypes = { [SkillType.Attack] = true, [SkillType.Triggered] = true, [SkillType.Triggerable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Sword"] = true, ["Flail"] = true, - ["Two Handed Sword"] = true, + ["Two Hand Mace"] = true, ["Dagger"] = true, ["Claw"] = true, + ["Two Hand Axe"] = true, ["Crossbow"] = true, - ["Bow"] = true, + ["One Hand Axe"] = true, ["Spear"] = true, - ["Two Handed Axe"] = true, - ["Two Handed Mace"] = true, - ["One Handed Axe"] = true, - ["Staff"] = true, - ["One Handed Sword"] = true, + ["Bow"] = true, + ["One Hand Sword"] = true, + ["Warstaff"] = true, }, castTime = 1, qualityStats = { diff --git a/src/Data/Skills/act_int.lua b/src/Data/Skills/act_int.lua index df3cd4d8e0..569cc3f62f 100644 --- a/src/Data/Skills/act_int.lua +++ b/src/Data/Skills/act_int.lua @@ -3448,8 +3448,8 @@ skills["ChargedStaffPlayer"] = { color = 3, description = "Consume all Power Charges to infuse your Quarterstaff with electricity, adding Lightning damage and a Lightning shockwave to your Quarterstaff Attacks. Reusing this skill while the Buff is active adds to the Buff's duration and damage.", skillTypes = { [SkillType.Spell] = true, [SkillType.Duration] = true, [SkillType.Buff] = true, [SkillType.ConsumesCharges] = true, [SkillType.QuarterstaffSkill] = true, [SkillType.SkillConsumesPowerChargesOnUse] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 0.75, qualityStats = { @@ -3577,8 +3577,8 @@ skills["ChargedStaffShockwavePlayer"] = { name = "Charged Shockwave", hidden = true, skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.QuarterstaffSkill] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 0.75, qualityStats = { @@ -5973,8 +5973,8 @@ skills["FallingThunderPlayer"] = { color = 3, description = "Infuses your Quarterstaff with electrical energies, then Slams the ground to deal damage in a large cone in front of you. Consumes your Power Charges to fire Lightning Projectiles forwards from the impact.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Slam] = true, [SkillType.Multistrikeable] = true, [SkillType.Projectile] = true, [SkillType.RangedAttack] = true, [SkillType.ProjectilesNotFromUser] = true, [SkillType.Lightning] = true, [SkillType.ConsumesCharges] = true, [SkillType.QuarterstaffSkill] = true, [SkillType.SkillConsumesPowerChargesOnUse] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -7168,8 +7168,8 @@ skills["FlickerStrikePlayer"] = { color = 3, description = "Teleport to a enemy and Strike them. Consumes Power Charges to perform additional teleporting Strikes on nearby enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Area] = true, [SkillType.Multistrikeable] = true, [SkillType.ConsumesCharges] = true, [SkillType.QuarterstaffSkill] = true, [SkillType.SkillConsumesPowerChargesOnUse] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -8233,8 +8233,8 @@ skills["FrozenLocusPlayer"] = { color = 3, description = "Leap backward and crack the ground with your staff to call forth an Ice Crystal, which creates Chilled Ground around it and can be damaged by you and enemies. If the Crystal is destroyed it causes an icy explosion that deals Attack damage but does not use your weapon's damage.", skillTypes = { [SkillType.Melee] = true, [SkillType.Attack] = true, [SkillType.Duration] = true, [SkillType.Cold] = true, [SkillType.QuarterstaffSkill] = true, [SkillType.NonWeaponAttack] = true, [SkillType.CreatesGroundEffect] = true, [SkillType.IceCrystal] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -8636,8 +8636,8 @@ skills["GatheringStormPlayer"] = { color = 3, description = "Flips backward and Channels to charge your Quarterstaff with Lightning. Releasing dashes towards the target location, damaging enemies along the way. Releasing with perfect timing performs a Lightning-infused dash that releases shockwaves from enemies you dash through and leaves a trail of Shocked Ground in your wake.", skillTypes = { [SkillType.Attack] = true, [SkillType.Channel] = true, [SkillType.Travel] = true, [SkillType.PerfectTiming] = true, [SkillType.Lightning] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -9028,8 +9028,8 @@ skills["GlacialCascadePlayer"] = { color = 3, description = "Sweep your Quarterstaff upwards, releasing an icy fissure which deals damage in a series of bursts culminating in a large spike. Frozen enemies hit by the final spike are dealt heavy damage but the Freeze is Consumed. Ice Crystals hit by the final spike explode.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Cold] = true, [SkillType.Multistrikeable] = true, [SkillType.Area] = true, [SkillType.Nonpathing] = true, [SkillType.QuarterstaffSkill] = true, [SkillType.SkillConsumesFreeze] = true, [SkillType.CreatesFissure] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -9337,9 +9337,9 @@ skills["HandOfChayulaPlayer"] = { color = 3, description = "Dash to an enemy and Strike them with an unarmed Attack, applying socketed Curses and Marks with reduced effect. This skill always Strikes with your bare fist, even if you have a Quarterstaff equipped.", skillTypes = { [SkillType.Meta] = true, [SkillType.Attack] = true, [SkillType.UseGlobalStats] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Chaos] = true, [SkillType.MeleeSingleTarget] = true, }, - weaponTypes = { - ["None"] = true, - ["Staff"] = true, + weaponClasses = { + ["Unarmed"] = true, + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -9567,20 +9567,20 @@ skills["HeraldOfIcePlayer"] = { color = 3, description = "While active, Shattering an enemy with an Attack Hit will cause an icy explosion that deals Attack damage to surrounding enemies.", skillTypes = { [SkillType.Buff] = true, [SkillType.HasReservation] = true, [SkillType.Area] = true, [SkillType.Cold] = true, [SkillType.Attack] = true, [SkillType.Herald] = true, [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Sword"] = true, ["Flail"] = true, - ["Two Handed Sword"] = true, + ["Two Hand Mace"] = true, ["Dagger"] = true, ["Claw"] = true, + ["Two Hand Axe"] = true, ["Crossbow"] = true, - ["Bow"] = true, + ["One Hand Axe"] = true, ["Spear"] = true, - ["Two Handed Axe"] = true, - ["Two Handed Mace"] = true, - ["One Handed Axe"] = true, - ["Staff"] = true, - ["One Handed Sword"] = true, + ["Bow"] = true, + ["One Hand Sword"] = true, + ["Warstaff"] = true, }, castTime = 0, qualityStats = { @@ -10037,8 +10037,8 @@ skills["IceStrikePlayer"] = { color = 3, description = "Perform a fast icy Strike. Using this Attack three times in quick succession causes a final strike that is slower and more powerful.", skillTypes = { [SkillType.Attack] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Area] = true, [SkillType.Cold] = true, [SkillType.PerformsFinalStrike] = true, [SkillType.QuarterstaffSkill] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -10432,9 +10432,9 @@ skills["KillingPalmPlayer"] = { color = 3, description = "Dash to an enemy and Strike them with an unarmed Attack, Culling enemies if their life is low enough. Each enemy killed by this strike grants a Power Charge. Enemies around you that can be Culled will be highlighted. This skill always Strikes with your bare fist, even if you have a Quarterstaff equipped.", skillTypes = { [SkillType.Attack] = true, [SkillType.UseGlobalStats] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Physical] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.GeneratesCharges] = true, }, - weaponTypes = { - ["None"] = true, - ["Staff"] = true, + weaponClasses = { + ["Unarmed"] = true, + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -11746,8 +11746,8 @@ skills["MantraOfDestructionPlayer"] = { color = 3, description = "Build Combo by successfully Striking Enemies with other skills. After reaching maximum Combo, use this skill to Empower your next Quarterstaff Attack, causing it to deal additional Chaos damage. Each kill with the Empowered Attack grants\nPurple Flames of Chayula for a duration.", skillTypes = { [SkillType.ComboStacking] = true, [SkillType.Buff] = true, [SkillType.Duration] = true, [SkillType.Nonpathing] = true, [SkillType.EmpowersOtherSkill] = true, [SkillType.Chaos] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 0.6, qualityStats = { @@ -13327,9 +13327,9 @@ skills["ShatteringPalmPlayer"] = { color = 3, description = "Dash to an enemy and Strike them with an Unarmed Attack that manifests a wave of cold, coating nearby enemies in shards of ice. Dealing enough damage to these enemies will shatter the shards, causing an icy explosion that deals Attack damage. This skill always Strikes with your bare fist, even if you have a Quarterstaff equipped.", skillTypes = { [SkillType.Attack] = true, [SkillType.UseGlobalStats] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Cold] = true, [SkillType.MeleeSingleTarget] = true, }, - weaponTypes = { - ["None"] = true, - ["Staff"] = true, + weaponClasses = { + ["Unarmed"] = true, + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -13452,9 +13452,9 @@ skills["ShatteringPalmExplosionPlayer"] = { name = "Freezing Explosion", hidden = true, skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Triggerable] = true, [SkillType.Triggered] = true, [SkillType.Nova] = true, [SkillType.Cold] = true, [SkillType.UseGlobalStats] = true, }, - weaponTypes = { - ["None"] = true, - ["Staff"] = true, + weaponClasses = { + ["Unarmed"] = true, + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -13826,8 +13826,8 @@ skills["SiphoningStrikePlayer"] = { color = 3, description = "Dash to a target and Strike them with your Quarterstaff. If the target is Shocked, consumes the Shock to release a Lightning shockwave around the target and grant you a Power Charge.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Lightning] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.SkillConsumesShock] = true, [SkillType.GeneratesCharges] = true, [SkillType.QuarterstaffSkill] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -15538,9 +15538,9 @@ skills["StaggeringPalmPlayer"] = { color = 3, description = "Dash to an enemy and Strike them with an Unarmed Attack. Heavy Stunning an enemy with this Skill grants you a Buff that causes your Quarterstaff and Unarmed Attacks to also fire Projectiles for a short duration. Enemies which are Primed for Stun will instantly be Heavily Stunned. This skill always Strikes with your bare fist, even if you have a Quarterstaff equipped.", skillTypes = { [SkillType.Attack] = true, [SkillType.UseGlobalStats] = true, [SkillType.Area] = true, [SkillType.Physical] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Duration] = true, }, - weaponTypes = { - ["None"] = true, - ["Staff"] = true, + weaponClasses = { + ["Unarmed"] = true, + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -15662,9 +15662,9 @@ skills["StaggeringPalmProjectilePlayer"] = { name = "Wind Blast (Quarterstaff)", hidden = true, skillTypes = { [SkillType.RangedAttack] = true, [SkillType.Physical] = true, [SkillType.Attack] = true, [SkillType.Triggerable] = true, [SkillType.Projectile] = true, }, - weaponTypes = { - ["None"] = true, - ["Staff"] = true, + weaponClasses = { + ["Unarmed"] = true, + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -15780,9 +15780,9 @@ skills["StaggeringPalmUnarmedProjectilePlayer"] = { name = "Wind Blast (Unarmed)", hidden = true, skillTypes = { [SkillType.UseGlobalStats] = true, [SkillType.RangedAttack] = true, [SkillType.Physical] = true, [SkillType.Attack] = true, [SkillType.Triggerable] = true, [SkillType.Projectile] = true, }, - weaponTypes = { - ["None"] = true, - ["Staff"] = true, + weaponClasses = { + ["Unarmed"] = true, + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -15906,8 +15906,8 @@ skills["StormWavePlayer"] = { color = 3, description = "Sweep your Quarterstaff, projecting a bolt of Lightning through the ground in a long wave ahead of you.", skillTypes = { [SkillType.Attack] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Lightning] = true, [SkillType.Nonpathing] = true, [SkillType.QuarterstaffSkill] = true, [SkillType.CreatesFissure] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -16028,8 +16028,8 @@ skills["TempestBellPlayer"] = { color = 3, description = "Build Combo by successfully Striking Enemies with other skills. After reaching maximum Combo, use this skill to cause the Bell on your staff to grow to massive size as you drop it on the ground. The Bell damages enemies on impact and can be Hit by your skills, creating a damaging shockwave. Elemental Ailments applied to the Bell cause its shockwaves to deal extra damage of the corresponding type, and Hits which would have caused Knockback increase the area of effect of the shockwaves.", skillTypes = { [SkillType.ComboStacking] = true, [SkillType.Melee] = true, [SkillType.RangedAttack] = true, [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.ManualCooldownConsumption] = true, [SkillType.Duration] = true, [SkillType.Nova] = true, [SkillType.Limit] = true, [SkillType.Sustained] = true, [SkillType.QuarterstaffSkill] = true, [SkillType.SupportedByFountains] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -16300,8 +16300,8 @@ skills["TempestFlurryPlayer"] = { color = 3, description = "Perform a series of aggressive Strikes. When used in quick succession, the third use Strikes three times, and the fourth use performs a Final Strike that calls down a powerful Shocking bolt.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Lightning] = true, [SkillType.Area] = true, [SkillType.PerformsFinalStrike] = true, [SkillType.QuarterstaffSkill] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -16840,8 +16840,8 @@ skills["VaultingImpactPlayer"] = { color = 3, description = "Leaps forward and Slams the ground, sending out a Stunning shockwave that is especially potent against Dazed enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.Area] = true, [SkillType.QuarterstaffSkill] = true, [SkillType.Jumping] = true, [SkillType.Travel] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -17205,8 +17205,8 @@ skills["WaveOfFrostPlayer"] = { color = 3, description = "Flips backwards and sends forth a Freezing wave in front of you.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Multistrikeable] = true, [SkillType.Cold] = true, [SkillType.AttackInPlaceIsDefault] = true, [SkillType.QuarterstaffSkill] = true, [SkillType.Movement] = true, [SkillType.Jumping] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -17324,8 +17324,8 @@ skills["WhirlingAssaultPlayer"] = { color = 3, description = "Advance while hitting enemies around you with a series of spinning Strikes.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.QuarterstaffSkill] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -17446,8 +17446,8 @@ skills["GaleStrikePlayer"] = { color = 3, description = "Strike enemies at range by generating a gust of wind as you swing. Enemies will be Knocked Back based on how close they are to you.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.QuarterstaffSkill] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { diff --git a/src/Data/Skills/act_str.lua b/src/Data/Skills/act_str.lua index 6a877d253f..be1b44a128 100644 --- a/src/Data/Skills/act_str.lua +++ b/src/Data/Skills/act_str.lua @@ -12,9 +12,9 @@ skills["AncestralWarriorTotemPlayer"] = { color = 1, description = "Raises a Totem that uses socketed Mace Skills. Cannot use Channelling Skills or Skills with Cooldowns.", skillTypes = { [SkillType.SummonsTotem] = true, [SkillType.SummonsAttackTotem] = true, [SkillType.Duration] = true, [SkillType.Melee] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Meta] = true, [SkillType.Physical] = true, [SkillType.Area] = true, [SkillType.Limit] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, - ["Two Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, skillTotemId = 15, castTime = 0.5, @@ -146,8 +146,8 @@ skills["SupportAncestralWarriorTotemPlayer"] = { requireSkillTypes = { SkillType.Attack, }, addSkillTypes = { SkillType.UsedByTotem, }, excludeSkillTypes = { SkillType.Meta, SkillType.Triggered, SkillType.Cooldown, SkillType.Channel, }, - weaponTypes = { - ["Two Handed Mace"] = true, + weaponClasses = { + ["Two Hand Mace"] = true, }, levels = { [1] = { levelRequirement = 0, }, @@ -255,9 +255,9 @@ skills["ArmourBreakerPlayer"] = { color = 1, description = "Attack with a forceful blow, knocking enemies back and weakening their Armour.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Physical] = true, }, - weaponTypes = { - ["Two Handed Mace"] = true, - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -377,7 +377,7 @@ skills["ArtilleryBallistaPlayer"] = { color = 1, description = "Deploys a Ballista Totem that fires bolts skyward, to explode a short time after landing.", skillTypes = { [SkillType.ProjectilesFromUser] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.SummonsTotem] = true, [SkillType.SummonsAttackTotem] = true, [SkillType.TotemsAreBallistae] = true, [SkillType.Nonpathing] = true, [SkillType.UseGlobalStats] = true, [SkillType.Limit] = true, [SkillType.Duration] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, skillTotemId = 19, @@ -510,7 +510,7 @@ skills["ArtilleryBallistaProjectilePlayer"] = { name = "Artillery Shot", hidden = true, skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.CanRapidFire] = true, [SkillType.AttackInPlaceIsDefault] = true, [SkillType.Fire] = true, [SkillType.Area] = true, [SkillType.CannotChain] = true, [SkillType.UsedByTotem] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -936,9 +936,9 @@ skills["BoneshatterPlayer"] = { color = 1, description = "Attacks enemies with a melee Strike. The Strike will cause a Heavy Stun on enemies that are Primed for Stun. Upon causing a Heavy Stun it will also create a Shockwave, dealing a large amount of damage in an area.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, - ["Two Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -1484,7 +1484,7 @@ skills["ClusterGrenadePlayer"] = { color = 1, description = "Fires a bouncing Grenade that explodes when its fuse expires, throwing out a nova of mini Grenades that explode when they come to a stop.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Area] = true, [SkillType.ProjectileNumber] = true, [SkillType.ProjectileSpeed] = true, [SkillType.Cooldown] = true, [SkillType.Duration] = true, [SkillType.Grenade] = true, [SkillType.Fire] = true, [SkillType.Nonpathing] = true, [SkillType.ProjectileNoCollision] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -1617,7 +1617,7 @@ skills["ClusterGrenadeMiniPlayer"] = { name = "", hidden = true, skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Area] = true, [SkillType.ProjectileNumber] = true, [SkillType.ProjectileSpeed] = true, [SkillType.Cooldown] = true, [SkillType.Duration] = true, [SkillType.Grenade] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -2208,9 +2208,9 @@ skills["EarthquakePlayer"] = { color = 1, description = "Smashes the ground, dealing damage in an area and leaving behind Jagged Ground that slows enemies. The Jagged Ground erupts in a powerful Aftershock after a duration. Cannot create Jagged Ground on top of an existing patch, or if you already have the maximum number of active patches.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Multistrikeable] = true, [SkillType.Duration] = true, [SkillType.Slam] = true, [SkillType.Triggerable] = true, [SkillType.Totemable] = true, [SkillType.CreatesGroundEffect] = true, }, - weaponTypes = { - ["Two Handed Mace"] = true, - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -2423,9 +2423,9 @@ skills["EarthshatterPlayer"] = { color = 1, description = "Slam the ground, sending out a fissure that deals area damage to enemies it passes under and thrusts a spike from the ground when it ends. Warcries performed near the spike will cause it to shatter, damaging surrounding enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.Multistrikeable] = true, [SkillType.Duration] = true, [SkillType.Totemable] = true, [SkillType.SupportedByFountains] = true, [SkillType.CreatesFissure] = true, }, - weaponTypes = { - ["Two Handed Mace"] = true, - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -2606,7 +2606,7 @@ skills["EmergencyReloadPlayer"] = { color = 1, description = "Instantly reloads your active Crossbow Ammunition and Empowers the loaded bolts to deal more damage.", skillTypes = { [SkillType.Instant] = true, [SkillType.Cooldown] = true, [SkillType.Duration] = true, [SkillType.ModifiesNextSkill] = true, [SkillType.Buff] = true, [SkillType.EmpowersOtherSkill] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 0, @@ -2725,7 +2725,7 @@ skills["ExplosiveGrenadePlayer"] = { color = 1, description = "Fires a bouncing Grenade that unleashes a devastating fiery blast when its fuse expires.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Area] = true, [SkillType.ProjectileNumber] = true, [SkillType.ProjectileSpeed] = true, [SkillType.Cooldown] = true, [SkillType.Duration] = true, [SkillType.Grenade] = true, [SkillType.Fire] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -2986,7 +2986,7 @@ skills["FlashGrenadePlayer"] = { color = 1, description = "Fires a bouncing Grenade that unleashes a Blinding, Stunning explosion when its fuse expires. This explosion can Blind both Allies and Enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Area] = true, [SkillType.ProjectileNumber] = true, [SkillType.ProjectileSpeed] = true, [SkillType.Cooldown] = true, [SkillType.Duration] = true, [SkillType.Grenade] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -3122,7 +3122,7 @@ skills["ToxicGrenadePlayer"] = { color = 1, description = "Fires a bouncing Grenade that causes a burst of Poison gas when its fuse expires, damaging enemies and leaving behind a growing Poison cloud. Burning effects or Detonator skills will cause the cloud to explode in a fiery blast.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Area] = true, [SkillType.ProjectileNumber] = true, [SkillType.ProjectileSpeed] = true, [SkillType.Cooldown] = true, [SkillType.Duration] = true, [SkillType.Grenade] = true, [SkillType.Chaos] = true, [SkillType.Fire] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -3421,9 +3421,9 @@ skills["HammerOfTheGodsPlayer"] = { color = 1, description = "Entreats the Ancestors to crush your enemies, manifesting a massive hammer that falls from the sky onto your target, Slamming into the ground after a short duration and dealing immense damage based on your weapon.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.Multistrikeable] = true, [SkillType.Duration] = true, [SkillType.Totemable] = true, [SkillType.Cooldown] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, - ["Two Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -3546,20 +3546,20 @@ skills["HeraldOfAshPlayer"] = { color = 1, description = "While active, enemies you sufficiently Overkill with attacks will cause an explosion that Ignites nearby enemies based on the Overkill damage dealt.", skillTypes = { [SkillType.Buff] = true, [SkillType.HasReservation] = true, [SkillType.CausesBurning] = true, [SkillType.Area] = true, [SkillType.DamageOverTime] = true, [SkillType.Fire] = true, [SkillType.Herald] = true, [SkillType.Duration] = true, [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Sword"] = true, ["Flail"] = true, - ["Two Handed Sword"] = true, + ["Two Hand Mace"] = true, ["Dagger"] = true, ["Claw"] = true, + ["Two Hand Axe"] = true, ["Crossbow"] = true, - ["Bow"] = true, + ["One Hand Axe"] = true, ["Spear"] = true, - ["Two Handed Axe"] = true, - ["Two Handed Mace"] = true, - ["One Handed Axe"] = true, - ["Staff"] = true, - ["One Handed Sword"] = true, + ["Bow"] = true, + ["One Hand Sword"] = true, + ["Warstaff"] = true, }, castTime = 0, qualityStats = { @@ -3979,9 +3979,9 @@ skills["LeapSlamPlayer"] = { color = 1, description = "Jump into the air, damaging and Knocking Back enemies with your mace where you land. Enemies you would land on are\npushed out of the way.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, [SkillType.Travel] = true, [SkillType.Jumping] = true, [SkillType.ConsumesFullyBrokenArmour] = true, }, - weaponTypes = { - ["Two Handed Mace"] = true, - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1.4, qualityStats = { @@ -4109,7 +4109,7 @@ skills["ArmourPiercingBoltsAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with a clip of bolts that can be fired rapidly and Break enemy Armour. Using this skill again reloads the clip.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 0.6, @@ -4227,7 +4227,7 @@ skills["ArmourPiercingBoltsPlayer"] = { hidden = true, description = "Rapidly fires bolts that Break enemy Armour. Can fire a limited number of bolts before needing to reload.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Nonpathing] = true, [SkillType.Physical] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -4362,7 +4362,7 @@ skills["ExplosiveShotAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with flaming bolts that explode on impact. The explosion will cause any Grenades in its area of effect to also explode.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1.5, @@ -4481,7 +4481,7 @@ skills["ExplosiveShotPlayer"] = { hidden = true, description = "Fires a flaming bolt that explodes on impact. The explosion will cause any Grenades in its area of effect to also explode.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Fire] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -4700,7 +4700,7 @@ skills["FragmentationRoundsAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with Piercing bolts that fragment in flight. Bolts that hit a Frozen enemy consume the Freeze and cause an explosion of shrapnel. Bolts that hit an Ice Crystal cause it to explode.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 0.8, @@ -4818,7 +4818,7 @@ skills["FragmentationRoundsPlayer"] = { hidden = true, description = "Fires Piercing bolts that fragment in flight. Bolts that hit a Frozen enemy Consume the Freeze and cause an explosion of shrapnel. Bolts that hit an Ice Crystal cause it to explode.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Nonpathing] = true, [SkillType.SkillConsumesFreeze] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -5039,7 +5039,7 @@ skills["GalvanicShardsAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with a clip of charged bolts that fragment in flight, releasing Chaining Lightning beams when they Hit enemies. Using this skill again reloads the clip.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 0.6, @@ -5160,7 +5160,7 @@ skills["GalvanicShardsPlayer"] = { hidden = true, description = "Rapidly fires charged bolts that fragment in flight, releasing Chaining Lightning beams when they Hit enemies. Can fire a limited number of bursts before needing to reload.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Lightning] = true, [SkillType.Chains] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -5375,7 +5375,7 @@ skills["GlacialBoltAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with icy bolts that create two walls of Ice Crystals at the end of their flight.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -5494,7 +5494,7 @@ skills["GlacialBoltPlayer"] = { hidden = true, description = "Fires an icy bolt that creates two walls of Ice Crystals at the end of its flight.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Cold] = true, [SkillType.Wall] = true, [SkillType.SupportedByFountains] = true, [SkillType.Nonpathing] = true, [SkillType.IceCrystal] = true, [SkillType.Duration] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 0.8, @@ -5716,7 +5716,7 @@ skills["HailstormRoundsAmmoPlayer"] = { color = 1, description = "Passively generates bolts of ice at a frequency equal to reload time, up to a cap. Activate to Load the accumulated bolts into your Crossbow. All loaded bolts are fired at once, causing them to rain down over the target area.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -5840,7 +5840,7 @@ skills["HailstormRoundsPlayer"] = { hidden = true, description = "Fires all loaded bolts into the sky, causing them to rain down over the target area.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Area] = true, [SkillType.ProjectileNumber] = true, [SkillType.ProjectileSpeed] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Cold] = true, [SkillType.Sustained] = true, [SkillType.Nonpathing] = true, [SkillType.ProjectileNoCollision] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -5968,7 +5968,7 @@ skills["HighVelocityRoundsAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with Piercing bolts that can consume Fully Broken Armour on enemies to deal extra damage.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, [SkillType.ConsumesFullyBrokenArmour] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -6086,7 +6086,7 @@ skills["HighVelocityRoundsPlayer"] = { hidden = true, description = "Fires a powerful Piercing bolt that can consume Fully Broken Armour on enemies to deal extra damage.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Physical] = true, [SkillType.Nonpathing] = true, [SkillType.ConsumesFullyBrokenArmour] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 0.8, @@ -6310,7 +6310,7 @@ skills["IceShardsAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with a clip of icy bolts that rapidly fire at the ground, leaving a shard of ice at the impact location unless the bolt hits an enemy. The ice shards shatter when enemies step on them, dealing damage to nearby enemies. Using this skill again reloads the clip.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 0.6, @@ -6428,7 +6428,7 @@ skills["IceShardsPlayer"] = { hidden = true, description = "Rapidly fires icy bolts at the ground, leaving a shard of ice at the impact location unless the bolt hits an enemy. The ice shards shatter when enemies step on them, dealing damage to nearby enemies. Can fire a limited number of bolts before needing to reload.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Nonpathing] = true, [SkillType.Cold] = true, [SkillType.Sustained] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -6652,7 +6652,7 @@ skills["IncendiaryShotAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with flaming bolts that fragment in flight, damaging and Igniting enemies on hit and in a small cone behind their final target.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 0.8, @@ -6770,7 +6770,7 @@ skills["IncendiaryShotPlayer"] = { hidden = true, description = "Fires flaming bolts that fragment in flight, damaging and Igniting enemies on hit, and in a small cone behind their final target.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Fire] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -6916,7 +6916,7 @@ skills["PermafrostBoltsAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with icy bolts that fragment in flight, damaging enemies on hit and in a small cone behind their final target. The icy coating on the bolts makes them extremely potent at Freezing enemies.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 0.8, @@ -7034,7 +7034,7 @@ skills["PermafrostBoltsPlayer"] = { hidden = true, description = "Fires icy bolts that fragment in flight, damaging enemies on hit and in a small cone behind their final target. The icy coating on the bolts makes them extremely potent at Freezing enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Cold] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -7175,7 +7175,7 @@ skills["PlasmaBlastAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with unstable bolts that require a lengthy charging period to fire but deal devastating damage, Pierce through enemies, and explode upon hitting terrain.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -7294,7 +7294,7 @@ skills["PlasmaBlastPlayer"] = { hidden = true, description = "Channel to charge an unstable bolt. The bolt deals devastating damage and explodes on hitting terrain, but cannot be fired at all unless fully charged.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.CrossbowSkill] = true, [SkillType.Totemable] = true, [SkillType.Channel] = true, [SkillType.Lightning] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -7513,7 +7513,7 @@ skills["RapidShotAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with a large clip of heavily modified bolts that cause Heat to build up on your crossbow, before unleashing a stream of flaming bolts that gain Fire Damage based on your Heat. Heat also grants bonus damage to Grenades you fire, but dissipates rapidly when not building up. Using this skill again reloads the clip.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1.2, @@ -7632,7 +7632,7 @@ skills["RapidShotPlayer"] = { hidden = true, description = "Fires heavily modified bolts that cause Heat to build up on your crossbow. Using this skill causes an initial buildup of Heat before unleashing a stream of flaming bolts that gain Fire Damage based on your Heat. Heat also grants bonus damage to Grenades you fire, but dissipates rapidly when not building up. Can fire a large number of bolts before needing to reload.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Nonpathing] = true, [SkillType.Fire] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -7776,7 +7776,7 @@ skills["ShockburstRoundsAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with a clip of charged bolts which release damaging pulses upon Hitting an enemy affected by a Lightning Ailment. Using this skill again reloads the clip.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 0.8, @@ -7897,7 +7897,7 @@ skills["ShockburstRoundsPlayer"] = { hidden = true, description = "Rapidly fires charged bolts which release damaging pulses upon Hitting an enemy affected by a Lightning Ailment. Can fire a limited number of bolts before needing to reload.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Nonpathing] = true, [SkillType.Lightning] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -8113,7 +8113,7 @@ skills["SiegeCascadeAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with enemy-seeking payloads which are fired into the air, dropping a bolt near every enemy in the target area. These bolts lodge in the ground and explode after a short delay.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -8233,7 +8233,7 @@ skills["SiegeCascadePlayer"] = { hidden = true, description = "Aims skyward and fires an enemy-seeking payload which drops a bolt near every enemy in the target area. These bolts lodge in the ground and explode after a short delay.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Area] = true, [SkillType.ProjectileNumber] = true, [SkillType.ProjectileSpeed] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Fire] = true, [SkillType.Sustained] = true, [SkillType.Nonpathing] = true, [SkillType.ProjectileNoCollision] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -8442,7 +8442,7 @@ skills["StormblastBoltsAmmoPlayer"] = { color = 1, description = "Loads your Crossbow with charged bolts that land around the target location and explode if hit by a Detonator Skill. Using this skill again reloads the clip.", skillTypes = { [SkillType.CrossbowAmmoSkill] = true, [SkillType.ReservesManually] = true, [SkillType.Attack] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -8563,7 +8563,7 @@ skills["StormblastBoltsPlayer"] = { hidden = true, description = "Aims skyward and fires charged bolts that land around the target location, dealing damage and lodging in the ground for a duration. Detonator Skills will cause these bolts to explode. Can fire a limited number of bolts before needing to reload.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Area] = true, [SkillType.ProjectileNumber] = true, [SkillType.ProjectileSpeed] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Lightning] = true, [SkillType.Nonpathing] = true, [SkillType.Duration] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -8766,6 +8766,9 @@ skills["MagmaBarrierPlayer"] = { color = 1, description = "When you raise your Shield it is infused with magma for a short time. Blocking during this time will spray magma at the attacker and grant you an Endurance Charge.", skillTypes = { [SkillType.Buff] = true, [SkillType.OngoingSkill] = true, [SkillType.HasReservation] = true, [SkillType.Fire] = true, [SkillType.Duration] = true, [SkillType.Persistent] = true, }, + weaponClasses = { + ["Shield"] = true, + }, castTime = 0, qualityStats = { { "igneous_shield_perfect_block_window_time_ms", 10 }, @@ -8876,6 +8879,9 @@ skills["MagmaSprayPlayer"] = { name = "Magma Spray", hidden = true, skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Fire] = true, [SkillType.Triggered] = true, [SkillType.Triggerable] = true, [SkillType.InbuiltTrigger] = true, [SkillType.GeneratesCharges] = true, [SkillType.NonWeaponAttack] = true, }, + weaponClasses = { + ["Shield"] = true, + }, castTime = 1, qualityStats = { }, @@ -8997,9 +9003,9 @@ skills["MoltenBlastPlayer"] = { color = 1, description = "Gouges molten rock from the ground and flings it at the target. The Projectile explodes on collision, damaging enemies and scattering shrapnel in a cone behind it.", skillTypes = { [SkillType.Attack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Triggerable] = true, [SkillType.Fire] = true, }, - weaponTypes = { - ["Two Handed Mace"] = true, - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -9192,7 +9198,7 @@ skills["OilGrenadePlayer"] = { color = 1, description = "Fires a bouncing Grenade that bursts in a spray of Oil when the fuse expires or when it impacts an Enemy, dealing minimal damage but covering the ground and nearby enemies in Oil. Oil created this way can be Ignited by Detonator Skills or Ignited Ground.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Area] = true, [SkillType.ProjectileNumber] = true, [SkillType.ProjectileSpeed] = true, [SkillType.Cooldown] = true, [SkillType.Duration] = true, [SkillType.Grenade] = true, [SkillType.Fire] = true, [SkillType.Nonpathing] = true, [SkillType.CreatesGroundEffect] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -9443,9 +9449,9 @@ skills["PerfectStrikePlayer"] = { color = 1, description = "Charge up your weapon while channelling. Releasing the moment you fully charge will release a wave of Fire.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Channel] = true, [SkillType.Fire] = true, [SkillType.Duration] = true, [SkillType.Area] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.PerfectTiming] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, - ["Two Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -9763,6 +9769,9 @@ skills["ResonatingShieldPlayer"] = { color = 1, description = "Repeatedly strike your Shield with your weapon causing damaging shockwaves in an area around you. Enemies hit by the shockwave lose Armour for a duration. While using Resonating Shield, your Shield is raised and you will Block all incoming Blockable hits.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Physical] = true, [SkillType.Channel] = true, [SkillType.RequiresShield] = true, [SkillType.Nonpathing] = true, [SkillType.Area] = true, [SkillType.Sustained] = true, [SkillType.NonWeaponAttack] = true, }, + weaponClasses = { + ["Shield"] = true, + }, castTime = 1, qualityStats = { { "armour_break_amount_+%", 1 }, @@ -9892,7 +9901,7 @@ skills["RipwireBallistaPlayer"] = { color = 1, description = "Deploys a Ballista Totem that fires Pinning bolts which Maim Enemies.", skillTypes = { [SkillType.ProjectilesFromUser] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.SummonsTotem] = true, [SkillType.SummonsAttackTotem] = true, [SkillType.TotemsAreBallistae] = true, [SkillType.Nonpathing] = true, [SkillType.UseGlobalStats] = true, [SkillType.Limit] = true, [SkillType.Duration] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, skillTotemId = 22, @@ -10023,7 +10032,7 @@ skills["RipwireBallistaProjectilePlayer"] = { name = "Ripwire Bolt", hidden = true, skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.CanRapidFire] = true, [SkillType.AttackInPlaceIsDefault] = true, [SkillType.UsedByTotem] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -10155,9 +10164,9 @@ skills["RollingSlamPlayer"] = { color = 1, description = "Slam the ground to Stun enemies and knock them away, then continue forward and perform a devastating second Slam. Holding down the skill input allows you to change direction as you move.", skillTypes = { [SkillType.Attack] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.Area] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, - ["Two Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -10676,7 +10685,7 @@ skills["ShardScavengerPlayer"] = { color = 1, description = "While active, Consuming Freeze, Shock, Ignite, or Fully Broken Armour on an enemy reloads your Crossbow. This can only occur once every few seconds.", skillTypes = { [SkillType.OngoingSkill] = true, [SkillType.HasReservation] = true, [SkillType.Buff] = true, [SkillType.Persistent] = true, [SkillType.Cold] = true, [SkillType.Lightning] = true, [SkillType.Physical] = true, [SkillType.Fire] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -10787,6 +10796,9 @@ skills["ShieldChargePlayer"] = { color = 1, description = "Channel to charge in the target direction. You will crash into enemies on your path, stopping your charge and dealing damage to enemies in an area, and extra damage to the enemies you collided with. While charging, your Shield is raised and you will Block all incoming Blockable hits.", skillTypes = { [SkillType.Attack] = true, [SkillType.RequiresShield] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Physical] = true, [SkillType.Cooldown] = true, [SkillType.Channel] = true, [SkillType.Travel] = true, [SkillType.NonWeaponAttack] = true, }, + weaponClasses = { + ["Shield"] = true, + }, castTime = 1, qualityStats = { { "base_cooldown_speed_+%", 0.5 }, @@ -10994,6 +11006,9 @@ skills["ShieldWallPlayer"] = { color = 1, description = "Ram your Shield into the ground, throwing up a semi-circular wall of earth. Enemies can attack the walls and your Slams will instantly destroy them. Each wall segment explodes when destroyed, damaging enemies around it.", skillTypes = { [SkillType.Attack] = true, [SkillType.Wall] = true, [SkillType.Duration] = true, [SkillType.RequiresShield] = true, [SkillType.Physical] = true, [SkillType.Area] = true, [SkillType.SupportedByFountains] = true, [SkillType.NonWeaponAttack] = true, }, + weaponClasses = { + ["Shield"] = true, + }, castTime = 1, qualityStats = { { "base_number_of_shield_walls_allowed", 0.1 }, @@ -11120,21 +11135,21 @@ skills["ShockwaveTotemPlayer"] = { color = 1, description = "Raises a Totem that Slams the ground around it, repeatedly damaging nearby enemies. Jagged Ground erupts when hit by this Slam, damaging enemies standing on it.", skillTypes = { [SkillType.SummonsTotem] = true, [SkillType.SummonsAttackTotem] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Limit] = true, [SkillType.Duration] = true, }, - weaponTypes = { - ["None"] = true, - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Sword"] = true, ["Flail"] = true, - ["Two Handed Sword"] = true, + ["Two Hand Mace"] = true, ["Dagger"] = true, ["Claw"] = true, + ["Two Hand Axe"] = true, + ["Unarmed"] = true, ["Crossbow"] = true, - ["Bow"] = true, + ["One Hand Axe"] = true, ["Spear"] = true, - ["Two Handed Axe"] = true, - ["Two Handed Mace"] = true, - ["One Handed Axe"] = true, - ["Staff"] = true, - ["One Handed Sword"] = true, + ["Bow"] = true, + ["One Hand Sword"] = true, + ["Warstaff"] = true, }, skillTotemId = 5, castTime = 0.6, @@ -11258,6 +11273,9 @@ skills["ShockwaveTotemQuakePlayer"] = { name = "Shockwave Slam", hidden = true, skillTypes = { [SkillType.Area] = true, [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Physical] = true, [SkillType.Nova] = true, [SkillType.Slam] = true, [SkillType.UsedByTotem] = true, }, + weaponClasses = { + ["Nothing"] = true, + }, castTime = 0.6, qualityStats = { }, @@ -11437,9 +11455,9 @@ skills["StampedePlayer"] = { color = 1, description = "Charges forward, cracking the earth and leaving a patch of Jagged Ground with every footstep. At the end of your charge, a massive leaping Slam damages enemies and causes all nearby patches of Jagged Ground to explode, damaging enemies standing on them.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Slam] = true, [SkillType.Travel] = true, [SkillType.CreatesGroundEffect] = true, [SkillType.Duration] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, - ["Two Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -11703,9 +11721,9 @@ skills["SunderPlayer"] = { color = 1, description = "Slams the ground, creating a roiling fissure that damages enemies in a sequence of areas in front of you. A number of enemies hit by the wave will release a shockwave, damaging other enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, [SkillType.ConsumesFullyBrokenArmour] = true, [SkillType.CreatesFissure] = true, }, - weaponTypes = { - ["Two Handed Mace"] = true, - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -11901,8 +11919,8 @@ skills["SuperchargedSlamPlayer"] = { color = 1, description = "Channel to charge up a heavy swing, drawing earth from the ground to enlarge your mace. Release to Slam the ground, dealing damage in an area around the impact, followed by Aftershocks dealing damage in a larger area.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Channel] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.NoDualWield] = true, }, - weaponTypes = { - ["Two Handed Mace"] = true, + weaponClasses = { + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -12203,9 +12221,9 @@ skills["VolcanicFissurePlayer"] = { color = 1, description = "Slam the ground, creating a winding fissure that deals damage as it travels and remains for a duration. Using a different Slam on a fissure will cause an Aftershock, which spreads to all connected fissures.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.Fire] = true, [SkillType.Multistrikeable] = true, [SkillType.Duration] = true, [SkillType.Sustained] = true, [SkillType.CreatesFissure] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, - ["Two Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -12324,7 +12342,7 @@ skills["ShockGrenadePlayer"] = { color = 1, description = "Fires a bouncing Grenade that discharges an Electrocuting Lightning blast when its fuse expires.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Area] = true, [SkillType.ProjectileNumber] = true, [SkillType.ProjectileSpeed] = true, [SkillType.Cooldown] = true, [SkillType.Triggerable] = true, [SkillType.Duration] = true, [SkillType.Grenade] = true, [SkillType.Lightning] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, diff --git a/src/Data/Skills/minion.lua b/src/Data/Skills/minion.lua index 6cfb2bfd04..e1b8fb84d0 100644 --- a/src/Data/Skills/minion.lua +++ b/src/Data/Skills/minion.lua @@ -828,13 +828,14 @@ skills["TCAncestralLeagueKaruiHulk"] = { hidden = true, description = "Charges at an enemy, bashing it with the character's shield and striking it. This knocks it back and stuns it. Enemies in the way are pushed to the side. Damage and stun are proportional to distance travelled. Cannot be supported by Multistrike.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, }, - weaponTypes = { - ["None"] = true, - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Unarmed"] = true, + ["One Hand Axe"] = true, + ["Sceptre"] = true, ["Claw"] = true, - ["One Handed Axe"] = true, ["Dagger"] = true, - ["One Handed Sword"] = true, + ["One Hand Sword"] = true, }, castTime = 1, qualityStats = { diff --git a/src/Data/Skills/other.lua b/src/Data/Skills/other.lua index d387af16d6..307a6f1f40 100644 --- a/src/Data/Skills/other.lua +++ b/src/Data/Skills/other.lua @@ -268,7 +268,7 @@ skills["MeleeBowPlayer"] = { color = 4, description = "Fire an arrow with your Bow.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.CanRapidFire] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, castTime = 1, @@ -391,7 +391,7 @@ skills["MeleeCrossbowPlayer"] = { color = 4, description = "Fires a bolt from your crossbow.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.CrossbowSkill] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Nonpathing] = true, }, - weaponTypes = { + weaponClasses = { ["Crossbow"] = true, }, castTime = 1, @@ -1892,8 +1892,8 @@ skills["Melee1HMacePlayer"] = { color = 4, description = "Strike with your Mace.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -2008,8 +2008,8 @@ skills["Melee2HMacePlayer"] = { color = 4, description = "Strike with your Mace.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, }, - weaponTypes = { - ["Two Handed Mace"] = true, + weaponClasses = { + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -2124,9 +2124,9 @@ skills["MeleeMaceMacePlayer"] = { color = 4, description = "Strike with your Maces.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.DualWieldOnly] = true, }, - weaponTypes = { - ["One Handed Mace"] = true, - ["Two Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -2606,8 +2606,8 @@ skills["MeleeQuarterstaffPlayer"] = { color = 4, description = "Strike with your Quarterstaff.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.QuarterstaffSkill] = true, }, - weaponTypes = { - ["Staff"] = true, + weaponClasses = { + ["Warstaff"] = true, }, castTime = 1, qualityStats = { @@ -2722,6 +2722,9 @@ skills["ShieldBlockPlayer"] = { color = 4, description = "Raise your shield to Block all incoming blockable hits. Blocking too much damage while your shield is raised may stagger you.", skillTypes = { [SkillType.Channel] = true, [SkillType.RequiresShield] = true, [SkillType.Nonpathing] = true, }, + weaponClasses = { + ["Shield"] = true, + }, castTime = 1, qualityStats = { }, diff --git a/src/Data/Skills/spectre.lua b/src/Data/Skills/spectre.lua index c1ae84394e..4b5cfd34db 100644 --- a/src/Data/Skills/spectre.lua +++ b/src/Data/Skills/spectre.lua @@ -46,7 +46,7 @@ skills["AxisDoubleStrikeTrigger"] = { baseEffectiveness = 0, description = "Performs two fast strikes with a melee weapon.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Physical] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -85,7 +85,7 @@ skills["BanditExplosiveArrowAtAnimationSpeed"] = { incrementalEffectiveness = 0.037999998778105, description = "Fires an arrow which acts as a short duration fuse. Applying additional arrows to an enemy extends the duration. When the target dies or the fuses expire, the arrows explode, dealing fire AoE damage to nearby enemies. The AoE radius is proportional to the number of arrows upon death.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Fire] = true, [SkillType.Triggerable] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -133,7 +133,7 @@ skills["BanditChampionBlastRainSpectre"] = { color = 2, description = "Fires arrows up in the air, to rain down in an area. Each arrow deals area damage around where it lands, and they will all overlap on the targeted location.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Fire] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Area] = true, [SkillType.ProjectileSpeed] = true, [SkillType.ProjectileNumber] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Triggerable] = true, [SkillType.Rain] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -232,7 +232,7 @@ skills["BoneStalkerEarthquake"] = { color = 1, description = "Smashes the ground, dealing damage in an area and cracking the earth. The crack will erupt in a powerful aftershock after a duration. Cracks created before the first one has erupted will not generate their own aftershocks. Requires an Axe, Mace, Sceptre, Staff or Unarmed.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Multistrikeable] = true, [SkillType.Duration] = true, [SkillType.Slam] = true, [SkillType.Triggerable] = true, [SkillType.Totemable] = true, }, - weaponTypes = { + weaponClasses = { ["None"] = true, ["One Handed Mace"] = true, ["Sceptre"] = true, @@ -267,7 +267,7 @@ skills["BreachCleave"] = { color = 1, description = "The character swings their weapon (or both weapons if dual wielding) in an arc, damaging monsters in an area in front of them. Only works with Axes and Swords.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.ThresholdJewelArea] = true, }, - weaponTypes = { + weaponClasses = { ["Two Handed Axe"] = true, ["Thrusting One Handed Sword"] = true, ["One Handed Axe"] = true, @@ -327,7 +327,7 @@ skills["CageSpiderCycloneTriggerSandstorms"] = { color = 2, description = "Damage enemies around you, then perform a spinning series of attacks as you travel to a target location. Cannot be supported by Ruthless or Multistrike.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, }, - weaponTypes = { + weaponClasses = { ["None"] = true, ["One Handed Mace"] = true, ["Sceptre"] = true, @@ -746,7 +746,7 @@ skills["FireMonsterWhirlingBlades"] = { incrementalEffectiveness = 0.064599998295307, description = "Dive through enemies, dealing weapon damage. If dual wielding attacks with both weapons, dealing the damage of both in one hit. Only works with Daggers, Claws, and One-Handed Swords.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, }, - weaponTypes = { + weaponClasses = { ["Thrusting One Handed Sword"] = true, ["Claw"] = true, ["Dagger"] = true, @@ -854,7 +854,7 @@ skills["GoatmanEarthquake"] = { color = 1, description = "Smashes the ground, dealing damage in an area and cracking the earth. The crack will erupt in a powerful aftershock after a duration. Cracks created before the first one has erupted will not generate their own aftershocks. Requires an Axe, Mace, Sceptre, Staff or Unarmed.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Multistrikeable] = true, [SkillType.Duration] = true, [SkillType.Slam] = true, [SkillType.Triggerable] = true, [SkillType.Totemable] = true, }, - weaponTypes = { + weaponClasses = { ["None"] = true, ["One Handed Mace"] = true, ["Sceptre"] = true, @@ -1067,7 +1067,7 @@ skills["HalfSkeletonPuncture"] = { baseEffectiveness = 0, description = "Punctures enemies, causing a bleeding debuff, which will be affected by modifiers to skill duration. Puncture works with bows, daggers, claws or swords.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Totemable] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.DamageOverTime] = true, [SkillType.Triggerable] = true, [SkillType.Physical] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, ["Claw"] = true, ["Thrusting One Handed Sword"] = true, @@ -1214,7 +1214,7 @@ skills["IncursionLeapSlamChampion"] = { color = 4, description = "Jump through the air, damaging and knocking back enemies with your weapon where you land. Enemies you would land on are pushed out of the way. Requires an Axe, Mace, Sceptre, Sword or Staff.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -1371,7 +1371,7 @@ skills["KaomWarriorMoltenStrike"] = { baseEffectiveness = 0.69999998807907, description = "Infuses your melee weapon with molten energies to attack with physical and fire damage. This attack causes balls of molten magma to launch forth from the enemies you hit, divided amongst all enemies hit by the strike. These will deal area attack damage to enemies where they land.", skillTypes = { [SkillType.Attack] = true, [SkillType.Projectile] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Fire] = true, [SkillType.RangedAttack] = true, [SkillType.ProjectilesNotFromUser] = true, [SkillType.ThresholdJewelChaining] = true, [SkillType.Multistrikeable] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -1412,7 +1412,7 @@ skills["KitavaDemonLeapSlam"] = { baseEffectiveness = 0, description = "Jump through the air, damaging and knocking back enemies with your weapon where you land. Enemies you would land on are pushed out of the way. Requires an Axe, Mace, Sceptre, Sword or Staff.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -1450,7 +1450,7 @@ skills["KitavaDemonCleave"] = { baseEffectiveness = 0, description = "The character swings their weapon (or both weapons if dual wielding) in an arc, damaging monsters in an area in front of them. Only works with Axes and Swords.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.ThresholdJewelArea] = true, }, - weaponTypes = { + weaponClasses = { ["Two Handed Axe"] = true, ["Thrusting One Handed Sword"] = true, ["One Handed Axe"] = true, @@ -1485,7 +1485,7 @@ skills["KitavaDemonWhirlingBlades"] = { incrementalEffectiveness = 0.0625, description = "Dive through enemies, dealing weapon damage. If dual wielding attacks with both weapons, dealing the damage of both in one hit. Only works with Daggers, Claws, and One-Handed Swords.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, }, - weaponTypes = { + weaponClasses = { ["Thrusting One Handed Sword"] = true, ["Claw"] = true, ["Dagger"] = true, @@ -1659,7 +1659,7 @@ skills["MonsterCausticArrow"] = { incrementalEffectiveness = 0.03999999910593, description = "Fires an arrow which deals chaos damage in an area on impact, and spreads caustic ground. Enemies standing on the caustic ground take chaos damage over time.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Totemable] = true, [SkillType.DamageOverTime] = true, [SkillType.Chaos] = true, [SkillType.Triggerable] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -1705,7 +1705,7 @@ skills["MonsterCausticArrowAtAnimationSpeed"] = { incrementalEffectiveness = 0.03999999910593, description = "Fires an arrow which deals chaos damage in an area on impact, and spreads caustic ground. Enemies standing on the caustic ground take chaos damage over time.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Totemable] = true, [SkillType.DamageOverTime] = true, [SkillType.Chaos] = true, [SkillType.Triggerable] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -1979,7 +1979,7 @@ skills["MonsterFlickerStrike"] = { baseEffectiveness = 0, description = "Teleports the character to a nearby monster and attacks with a melee weapon. If no specific monster is targeted, one is picked at random. Grants a buff that increases movement speed for a duration. The cooldown can be bypassed by expending a Frenzy Charge.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Movement] = true, [SkillType.Duration] = true, [SkillType.Cooldown] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -2052,7 +2052,7 @@ skills["MonsterIceShot"] = { baseEffectiveness = 0.85000002384186, description = "Fires an arrow that converts some physical damage to cold on its target and converts all physical damage to cold in a cone behind that target.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Area] = true, [SkillType.Cold] = true, [SkillType.Triggerable] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -2114,7 +2114,7 @@ skills["MonsterLeapSlam"] = { baseEffectiveness = 0, description = "Jump through the air, damaging and knocking back enemies with your weapon where you land. Enemies you would land on are pushed out of the way. Requires an Axe, Mace, Sceptre, Sword or Staff.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -2150,7 +2150,7 @@ skills["MonsterLeapSlamFoothills"] = { baseEffectiveness = 0, description = "Jump through the air, damaging and knocking back enemies with your weapon where you land. Enemies you would land on are pushed out of the way. Requires an Axe, Mace, Sceptre, Sword or Staff.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -2246,7 +2246,7 @@ skills["MonsterLightningArrow"] = { incrementalEffectiveness = 0.019999999552965, description = "Fires a charged arrow which damages enemies by causing them to be struck by a bolt of lightning, which also damages a number of surrounding enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Area] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Lightning] = true, [SkillType.Triggerable] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -2277,7 +2277,7 @@ skills["SkeletonArcherLightningArrow"] = { incrementalEffectiveness = 0.019999999552965, description = "Fires a charged arrow which damages enemies by causing them to be struck by a bolt of lightning, which also damages a number of surrounding enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Area] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Lightning] = true, [SkillType.Triggerable] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -2441,7 +2441,7 @@ skills["MonsterPuncture"] = { baseEffectiveness = 0, description = "Punctures enemies, causing a bleeding debuff, which will be affected by modifiers to skill duration. Puncture works with bows, daggers, claws or swords.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Totemable] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.DamageOverTime] = true, [SkillType.Triggerable] = true, [SkillType.Physical] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, ["Claw"] = true, ["Thrusting One Handed Sword"] = true, @@ -2627,7 +2627,7 @@ skills["MonsterViperStrike"] = { incrementalEffectiveness = 0.025499999523163, description = "Hits enemies, converting some of your physical damage to chaos damage and inflicting poison which will be affected by modifiers to skill duration. If dual wielding, will strike with both weapons. Requires a claw, dagger or sword.", skillTypes = { [SkillType.Attack] = true, [SkillType.Duration] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.DamageOverTime] = true, [SkillType.Chaos] = true, }, - weaponTypes = { + weaponClasses = { ["Claw"] = true, ["Thrusting One Handed Sword"] = true, ["Two Handed Sword"] = true, @@ -3398,7 +3398,7 @@ skills["SkeletonSoldierTornadoShot"] = { color = 2, description = "Fires a piercing shot that travels until it reaches the targeted location. It will then fire projectiles out in all directions from that point, which will travel for a short time before disappearing.", skillTypes = { [SkillType.Attack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Totemable] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Triggerable] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -3710,7 +3710,7 @@ skills["UndyingWhirlingBlades"] = { baseEffectiveness = 0, description = "Dive through enemies, dealing weapon damage. If dual wielding attacks with both weapons, dealing the damage of both in one hit. Only works with Daggers, Claws, and One-Handed Swords.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, }, - weaponTypes = { + weaponClasses = { ["Thrusting One Handed Sword"] = true, ["Claw"] = true, ["Dagger"] = true, @@ -3740,7 +3740,7 @@ skills["WalkingDoubleSlash"] = { hidden = true, color = 2, skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, }, - weaponTypes = { + weaponClasses = { ["Two Handed Axe"] = true, ["Thrusting One Handed Sword"] = true, ["Two Handed Sword"] = true, @@ -3772,7 +3772,7 @@ skills["WickerManMoltenStrike"] = { baseEffectiveness = 0.69999998807907, description = "Infuses your melee weapon with molten energies to attack with physical and fire damage. This attack causes balls of molten magma to launch forth from the enemies you hit, divided amongst all enemies hit by the strike. These will deal area attack damage to enemies where they land.", skillTypes = { [SkillType.Attack] = true, [SkillType.Projectile] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Fire] = true, [SkillType.RangedAttack] = true, [SkillType.ProjectilesNotFromUser] = true, [SkillType.ThresholdJewelChaining] = true, [SkillType.Multistrikeable] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -4564,7 +4564,7 @@ skills["HarvestRhexLeapSlam"] = { color = 4, description = "Jump through the air, damaging and knocking back enemies with your weapon where you land. Enemies you would land on are pushed out of the way. Requires an Axe, Mace, Sceptre, Sword or Staff.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -4845,7 +4845,7 @@ skills["HeistThugRangedExplosiveArrow"] = { incrementalEffectiveness = 0.037999998778105, description = "Fires an arrow which will stick into an enemy or wall, and then explode, dealing area damage around it, either after a duration or when the maximum number of arrows stuck to that target is reached. If an enemy has multiple Explosive Arrows stuck in them, the first one to explode will consume the others, adding their damage to its explosion.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Fire] = true, [SkillType.Triggerable] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -5225,7 +5225,7 @@ skills["SecretDesecrateMonsterEarthquakeTriggered"] = { color = 4, description = "Smashes the ground, dealing damage in an area and cracking the earth. The crack will erupt in a powerful aftershock after a duration. Cracks created before the first one has erupted will not generate their own aftershocks. Requires an Axe, Mace, Sceptre, Staff or Unarmed.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Multistrikeable] = true, [SkillType.Duration] = true, [SkillType.Slam] = true, [SkillType.Triggerable] = true, [SkillType.Totemable] = true, }, - weaponTypes = { + weaponClasses = { ["None"] = true, ["One Handed Mace"] = true, ["Sceptre"] = true, @@ -6365,7 +6365,7 @@ skills["AzmeriHailrakeGlacialHammer"] = { baseEffectiveness = 0, description = "Hits enemies, converting some of your physical damage to cold damage. If a non-unique enemy is frozen and is on less than one third life, they will shatter when hit by Glacial Hammer. If striking three times in a row, the third strike will freeze enemies more easily. Requires a Mace, Sceptre or Staff.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Cold] = true, [SkillType.ThresholdJewelArea] = true, }, - weaponTypes = { + weaponClasses = { ["Two Handed Mace"] = true, ["Staff"] = true, ["One Handed Mace"] = true, @@ -6421,7 +6421,7 @@ skills["IceCrashAzmeriHailrake"] = { color = 1, description = "Slam the ground, damaging enemies in an area around the impact in three stages of increasing size. Enemies take slightly less damage on the second and third stage, and can only be hit by one stage. Works with Swords, Maces, Sceptres, Axes, Staves and Unarmed.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Cold] = true, [SkillType.Multistrikeable] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, [SkillType.Triggerable] = true, }, - weaponTypes = { + weaponClasses = { ["None"] = true, ["One Handed Mace"] = true, ["Sceptre"] = true, @@ -6496,7 +6496,7 @@ skills["AzmeriFireFuryMoltenStrike"] = { color = 1, description = "Infuses your melee weapon with molten energies to attack with physical and fire damage. This attack causes balls of molten magma to launch forth from the enemies you hit, divided amongst all enemies hit by the strike. These will deal area attack damage to enemies where they land.", skillTypes = { [SkillType.Attack] = true, [SkillType.Projectile] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Fire] = true, [SkillType.RangedAttack] = true, [SkillType.ProjectilesNotFromUser] = true, [SkillType.ThresholdJewelChaining] = true, [SkillType.Multistrikeable] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -6735,7 +6735,7 @@ skills["AzmeriHydraForkArrow"] = { hidden = true, color = 4, skillTypes = { [SkillType.Attack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -7242,7 +7242,7 @@ skills["AzmeriSawbladeAnimatedWeaponCyclone"] = { baseEffectiveness = 0.85000002384186, description = "Damage enemies around you, then perform a spinning series of attacks as you travel to a target location. Cannot be supported by Ruthless or Multistrike.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, }, - weaponTypes = { + weaponClasses = { ["None"] = true, ["One Handed Mace"] = true, ["Sceptre"] = true, @@ -7283,7 +7283,7 @@ skills["AzmeriDoubleSlashAnimatedWeapon"] = { color = 2, description = "Slashes twice, releasing waves of force that damage enemies they hit. Enemies in the middle of the slashes can be hit by both. The slashes will have a chance to inflict bleeding in Blood Stance, or have a wider angle in Sand Stance. Can be used with Axes and Swords. You are in Blood Stance by default.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Physical] = true, }, - weaponTypes = { + weaponClasses = { ["Two Handed Axe"] = true, ["Thrusting One Handed Sword"] = true, ["Two Handed Sword"] = true, @@ -7387,7 +7387,7 @@ skills["AzmeriBarrageDemonRainOfSpines"] = { baseEffectiveness = 0, description = "Fires a large number of arrows into the air, to land at the target after a short delay.", skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Area] = true, [SkillType.ProjectileSpeed] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Triggerable] = true, [SkillType.Rain] = true, }, - weaponTypes = { + weaponClasses = { ["Bow"] = true, }, statDescriptionScope = "skill_stat_descriptions", @@ -7945,7 +7945,7 @@ skills["AzmeriCycloneDemonDesecratedGroundCyclone"] = { baseEffectiveness = 0.85000002384186, description = "Damage enemies around you, then perform a spinning series of attacks as you travel to a target location. Cannot be supported by Ruthless or Multistrike.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, }, - weaponTypes = { + weaponClasses = { ["None"] = true, ["One Handed Mace"] = true, ["Sceptre"] = true, @@ -8090,7 +8090,7 @@ skills["AzmeriDualStrikeDemonDualStrike"] = { baseEffectiveness = 0, description = "Attacks with both weapons, dealing the damage of both in one strike. Dual wield only. Does not work with wands.", skillTypes = { [SkillType.Attack] = true, [SkillType.DualWieldOnly] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.ThresholdJewelArea] = true, }, - weaponTypes = { + weaponClasses = { ["Two Handed Axe"] = true, ["Claw"] = true, ["One Handed Mace"] = true, @@ -8355,7 +8355,7 @@ skills["AzmeriGeofriSmite"] = { incrementalEffectiveness = 0.028000000864267, description = "Performs a melee attack, and causes lightning to strike a nearby enemy, dealing damage in an area. Each target can only be hit once by this skill. Hitting an enemy grants an aura for a duration. Requires a Sword, Axe, Mace, Sceptre, Staff or Unarmed.", skillTypes = { [SkillType.Melee] = true, [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Multistrikeable] = true, [SkillType.Damage] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Aura] = true, [SkillType.Buff] = true, [SkillType.Lightning] = true, }, - weaponTypes = { + weaponClasses = { ["None"] = true, ["One Handed Mace"] = true, ["Sceptre"] = true, @@ -8916,7 +8916,7 @@ skills["AzmeriOakSweep"] = { baseEffectiveness = 0, description = "Swings a two handed melee weapon in a circle, knocking back monsters around the character.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, }, - weaponTypes = { + weaponClasses = { ["Two Handed Mace"] = true, ["Two Handed Sword"] = true, ["Staff"] = true, @@ -8949,7 +8949,7 @@ skills["AzmeriOakLeapSlam"] = { baseEffectiveness = 0, description = "Jump through the air, damaging and knocking back enemies with your weapon where you land. Enemies you would land on are pushed out of the way. Requires an Axe, Mace, Sceptre, Sword or Staff.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, @@ -9221,7 +9221,7 @@ skills["MonsterViperStrikeAtAnimationSpeed"] = { incrementalEffectiveness = 0.025499999523163, description = "Hits enemies, converting some of your physical damage to chaos damage and inflicting poison which will be affected by modifiers to skill duration. If dual wielding, will strike with both weapons. Requires a claw, dagger or sword.", skillTypes = { [SkillType.Attack] = true, [SkillType.Duration] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.DamageOverTime] = true, [SkillType.Chaos] = true, }, - weaponTypes = { + weaponClasses = { ["Claw"] = true, ["Thrusting One Handed Sword"] = true, ["Two Handed Sword"] = true, @@ -9833,7 +9833,7 @@ skills["AzmeriVikingCyclone"] = { incrementalEffectiveness = 0.050000000745058, description = "Damage enemies around you, then perform a spinning series of attacks as you travel to a target location. Cannot be supported by Ruthless or Multistrike.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, }, - weaponTypes = { + weaponClasses = { ["None"] = true, ["One Handed Mace"] = true, ["Sceptre"] = true, @@ -10437,7 +10437,7 @@ skills["AzmeriGolemLeapSlam"] = { color = 4, description = "Jump through the air, damaging and knocking back enemies with your weapon where you land. Enemies you would land on are pushed out of the way. Requires an Axe, Mace, Sceptre, Sword or Staff.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, }, - weaponTypes = { + weaponClasses = { ["One Handed Mace"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, diff --git a/src/Data/Skills/sup_dex.lua b/src/Data/Skills/sup_dex.lua index 84c156731a..2de61de5b2 100644 --- a/src/Data/Skills/sup_dex.lua +++ b/src/Data/Skills/sup_dex.lua @@ -311,19 +311,19 @@ skills["SupportComboFinisherPlayer"] = { addSkillTypes = { SkillType.ComboStacking, SkillType.SupportedByComboFinisher, }, excludeSkillTypes = { SkillType.Cooldown, SkillType.Herald, SkillType.Triggered, SkillType.InbuiltTrigger, SkillType.SummonsTotem, SkillType.UsedByTotem, SkillType.Trapped, SkillType.RemoteMined, SkillType.Spell, SkillType.Warcry, SkillType.ComboStacking, SkillType.SupportedByComboFinisher, SkillType.NOT, SkillType.AND, }, ignoreMinionTypes = true, - weaponTypes = { - ["None"] = true, - ["One Handed Mace"] = true, + weaponClasses = { + ["One Hand Mace"] = true, + ["Two Hand Sword"] = true, ["Flail"] = true, - ["Two Handed Sword"] = true, - ["Dagger"] = true, - ["Staff"] = true, + ["Two Hand Mace"] = true, + ["Unarmed"] = true, + ["One Hand Sword"] = true, + ["Two Hand Axe"] = true, + ["One Hand Axe"] = true, ["Spear"] = true, - ["Two Handed Axe"] = true, - ["Two Handed Mace"] = true, - ["One Handed Axe"] = true, + ["Dagger"] = true, ["Claw"] = true, - ["One Handed Sword"] = true, + ["Warstaff"] = true, }, levels = { [1] = { levelRequirement = 0, }, diff --git a/src/Export/Scripts/minions.lua b/src/Export/Scripts/minions.lua index 11da593976..7400f225f2 100644 --- a/src/Export/Scripts/minions.lua +++ b/src/Export/Scripts/minions.lua @@ -38,25 +38,6 @@ local function tableToString(tbl, pre) return tableString .. " }" end -local itemClassMap = { - ["Claw"] = "Claw", - ["Dagger"] = "Dagger", - ["Wand"] = "Wand", - ["One Hand Sword"] = "One Handed Sword", - ["Thrusting One Hand Sword"] = "One Handed Sword", - ["One Hand Axe"] = "One Handed Axe", - ["One Hand Mace"] = "One Handed Mace", - ["Bow"] = "Bow", - ["Fishing Rod"] = "Fishing Rod", - ["Staff"] = "Staff", - ["Two Hand Sword"] = "Two Handed Sword", - ["Two Hand Axe"] = "Two Handed Axe", - ["Two Hand Mace"] = "Two Handed Mace", - ["Shield"] = "Shield", - ["Sceptre"] = "One Handed Mace", - ["Unarmed"] = "None", -} - local directiveTable = { } -- #monster [] [] @@ -144,11 +125,11 @@ directiveTable.emit = function(state, args, out) out:write('\tdamageFixup = 0.33,\n') end end - if monsterVariety.MainHandItemClass and itemClassMap[monsterVariety.MainHandItemClass.Id] then - out:write('\tweaponType1 = "', itemClassMap[monsterVariety.MainHandItemClass.Id], '",\n') + if monsterVariety.MainHandItemClass and monsterVariety.MainHandItemClass.Id then + out:write('\tweaponType1 = "', monsterVariety.MainHandItemClass.Id, '",\n') end - if monsterVariety.OffHandItemClass and itemClassMap[monsterVariety.OffHandItemClass.Id] then - out:write('\tweaponType2 = "', itemClassMap[monsterVariety.OffHandItemClass.Id], '",\n') + if monsterVariety.OffHandItemClass and monsterVariety.OffHandItemClass.Id then + out:write('\tweaponType2 = "', monsterVariety.OffHandItemClass.Id, '",\n') end if state.limit then out:write('\tlimit = "', state.limit, '",\n') diff --git a/src/Export/Scripts/skills.lua b/src/Export/Scripts/skills.lua index 23f01ac2e7..9a52483bc0 100644 --- a/src/Export/Scripts/skills.lua +++ b/src/Export/Scripts/skills.lua @@ -193,25 +193,6 @@ local function mapAST(ast) return "SkillType."..(skillTypes[ast._rowIndex] or ("Unknown"..ast._rowIndex)) end -local weaponClassMap = { - ["Claw"] = "Claw", - ["Dagger"] = "Dagger", - ["One Hand Sword"] = "One Handed Sword", - ["Thrusting One Hand Sword"] = "Thrusting One Handed Sword", - ["One Hand Axe"] = "One Handed Axe", - ["One Hand Mace"] = "One Handed Mace", - ["Bow"] = "Bow", - ["Crossbow"] = "Crossbow", - ["Fishing Rod"] = "Fishing Rod", - ["Warstaff"] = "Staff", - ["Two Hand Sword"] = "Two Handed Sword", - ["Two Hand Axe"] = "Two Handed Axe", - ["Two Hand Mace"] = "Two Handed Mace", - ["Unarmed"] = "None", - ["Flail"] = "Flail", - ["Spear"] = "Spear", -} - local gems = { } local trueGemNames = { } @@ -492,15 +473,13 @@ directiveTable.skill = function(state, args, out) if granted.IgnoreMinionTypes then out:write('\tignoreMinionTypes = true,\n') end - local weaponTypes = { } + local weaponClasses = { } for _, class in ipairs(granted.WeaponRestrictions) do - if weaponClassMap[class.Id] then - weaponTypes[weaponClassMap[class.Id]] = true - end + weaponClasses[class.Id] = true end - if next(weaponTypes) then - out:write('\tweaponTypes = {\n') - for type in pairs(weaponTypes) do + if next(weaponClasses) then + out:write('\tweaponClasses = {\n') + for type in pairs(weaponClasses) do out:write('\t\t["', type, '"] = true,\n') end out:write('\t},\n') @@ -526,15 +505,13 @@ directiveTable.skill = function(state, args, out) end out:write('},\n') end - local weaponTypes = { } + local weaponClasses = { } for _, class in ipairs(granted.ActiveSkill.WeaponRestrictions) do - if weaponClassMap[class.Id] then - weaponTypes[weaponClassMap[class.Id]] = true - end + weaponClasses[class.Id] = true end - if next(weaponTypes) then - out:write('\tweaponTypes = {\n') - for type in pairs(weaponTypes) do + if next(weaponClasses) then + out:write('\tweaponClasses = {\n') + for type in pairs(weaponClasses) do out:write('\t\t["', type, '"] = true,\n') end out:write('\t},\n') diff --git a/src/Export/Scripts/soulcores.lua b/src/Export/Scripts/soulcores.lua index 838235a2ed..b0c3dc05ec 100644 --- a/src/Export/Scripts/soulcores.lua +++ b/src/Export/Scripts/soulcores.lua @@ -16,10 +16,6 @@ local s_format = string.format local directiveTable = { } -directiveTable.type = function(state, args, out) - state.type = args -end - directiveTable.base = function(state, args, out) local baseTypeId, displayName = args:match("([%w/_]+) (.+)") if not baseTypeId then @@ -58,6 +54,7 @@ directiveTable.base = function(state, args, out) end out:write("\t\tweapon = ") writeStats(stats, out) + -- armour stats = { } -- reset stats to empty for i, statKey in ipairs(soulcore.StatsKeysArmour) do local statValue = soulcore["StatsValuesArmour"][i] diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua index fed3f01cbd..1841e9f90d 100644 --- a/src/Modules/CalcActiveSkill.lua +++ b/src/Modules/CalcActiveSkill.lua @@ -197,16 +197,16 @@ function calcs.copyActiveSkill(env, mode, skill) end -- Get weapon flags and info for given weapon -local function getWeaponFlags(env, weaponData, weaponTypes) - local info = env.data.weaponTypeInfo[weaponData.type] +local function getWeaponFlags(env, weaponData, weaponClasses) + local info = env.data.weaponClassInfo[weaponData.class] if not info then return end - if weaponTypes then - for _, types in ipairs(weaponTypes) do - if not types[weaponData.type] and - (not weaponData.countsAsAll1H or not (types["Claw"] or types["Dagger"] or types["One Handed Axe"] or types["One Handed Mace"] or types["One Handed Sword"] - or types["Spear"])) then + if weaponClasses then + for _, classes in ipairs(weaponClasses) do + if not classes[weaponData.class] and + (not weaponData.countsAsAll1H or not (classes["Claw"] or classes["Dagger"] or classes["One Handed Axe"] or classes["One Handed Mace"] or classes["One Handed Sword"] + or classes["Spear"])) then return nil, info end end @@ -215,7 +215,7 @@ local function getWeaponFlags(env, weaponData, weaponTypes) if weaponData.countsAsAll1H then flags = bor(ModFlag.Axe, ModFlag.Claw, ModFlag.Dagger, ModFlag.Mace, ModFlag.Sword, ModFlag.Spear) end - if weaponData.type ~= "None" then + if weaponData.class ~= "Unarmed" then flags = bor(flags, ModFlag.Weapon) if info.oneHand then flags = bor(flags, ModFlag.Weapon1H) @@ -312,7 +312,7 @@ function calcs.buildActiveSkillModList(env, activeSkill) activeEffect.srcInstance.skillPartCalcs = nil end - if (skillTypes[SkillType.RequiresShield] or skillFlags.shieldAttack) and not activeSkill.summonSkill and (not activeSkill.actor.itemList["Weapon 2"] or activeSkill.actor.itemList["Weapon 2"].type ~= "Shield") then + if (skillTypes[SkillType.RequiresShield] or skillFlags.shieldAttack) and not activeSkill.summonSkill and (not activeSkill.actor.itemList["Weapon 2"] or activeSkill.actor.itemList["Weapon 2"].class ~= "Shield") then -- Skill requires a shield to be equipped skillFlags.disable = true activeSkill.disableReason = "This skill requires a Shield" @@ -333,16 +333,16 @@ function calcs.buildActiveSkillModList(env, activeSkill) activeSkill.weapon2Flags = 0 else -- Set weapon flags - local weaponTypes = { activeGrantedEffect.weaponTypes } + local weaponClasses = { activeGrantedEffect.weaponClasses } for _, skillEffect in pairs(activeSkill.effectList) do - if skillEffect.grantedEffect.support and skillEffect.grantedEffect.weaponTypes then - t_insert(weaponTypes, skillEffect.grantedEffect.weaponTypes) + if skillEffect.grantedEffect.support and skillEffect.grantedEffect.weaponClasses then + t_insert(weaponClasses, skillEffect.grantedEffect.weaponClasses) end end - local weapon1Flags, weapon1Info = getWeaponFlags(env, activeSkill.actor.weaponData1, weaponTypes) + local weapon1Flags, weapon1Info = getWeaponFlags(env, activeSkill.actor.weaponData1, weaponClasses) if not weapon1Flags and activeSkill.summonSkill then -- Minion skills seem to ignore weapon types - weapon1Flags, weapon1Info = ModFlag[env.data.weaponTypeInfo["None"].flag], env.data.weaponTypeInfo["None"] + weapon1Flags, weapon1Info = ModFlag[env.data.weaponClassInfo["Unarmed"].flag], env.data.weaponClassInfo["Unarmed"] end if weapon1Flags then if skillFlags.attack or skillFlags.dotFromAttack then @@ -361,9 +361,9 @@ function calcs.buildActiveSkillModList(env, activeSkill) activeSkill.disableReason = "Main Hand weapon is not usable with this skill" end if not skillTypes[SkillType.MainHandOnly] and not skillFlags.forceMainHand then - local weapon2Flags, weapon2Info = getWeaponFlags(env, activeSkill.actor.weaponData2, weaponTypes) + local weapon2Flags, weapon2Info = getWeaponFlags(env, activeSkill.actor.weaponData2, weaponClasses) if weapon2Flags then - if skillTypes[SkillType.DualWieldRequiresDifferentTypes] and (activeSkill.actor.weaponData1.type == activeSkill.actor.weaponData2.type) then + if skillTypes[SkillType.DualWieldRequiresDifferentCategories] and (activeSkill.actor.weaponData1.category == activeSkill.actor.weaponData2.category) then -- Skill requires a different compatible off hand weapon to main hand weapon skillFlags.disable = true activeSkill.disableReason = activeSkill.disableReason or "Weapon Types Need to be Different" @@ -747,13 +747,13 @@ function calcs.buildActiveSkillModList(env, activeSkill) activeEffect.srcInstance.skillMinionItemSetCalcs = nil activeEffect.srcInstance.skillMinionItemSet = nil end - if activeSkill.skillData.minionUseBowAndQuiver and env.player.weaponData1.type == "Bow" then + if activeSkill.skillData.minionUseBowAndQuiver and env.player.weaponData1.class == "Bow" then minion.weaponData1 = env.player.weaponData1 elseif env.theIronMass and minionType == "RaisedSkeleton" then minion.weaponData1 = env.player.weaponData1 else minion.weaponData1 = { - type = minion.minionData.weaponType1 or "None", + type = minion.minionData.weaponType1 or "Unarmed", AttackRate = 1 / attackTime, CritChance = 5, PhysicalMin = round(damage * (1 - minion.minionData.damageSpread)), diff --git a/src/Modules/CalcMirages.lua b/src/Modules/CalcMirages.lua index c28b521d1a..4b0e6c301e 100644 --- a/src/Modules/CalcMirages.lua +++ b/src/Modules/CalcMirages.lua @@ -64,7 +64,7 @@ function calcs.mirages(env) config = { calcMainSkillOffence = true, compareFunc = function(skill, env, config, mirageSkill) - if not env.player.mainSkill.skillCfg.skillCond["usedByMirage"] and env.player.weaponData1.type == "Bow" then + if not env.player.mainSkill.skillCfg.skillCond["usedByMirage"] and env.player.weaponData1.class == "Bow" then return env.player.mainSkill end end, @@ -298,7 +298,7 @@ function calcs.mirages(env) config = { calcMainSkillOffence = true, compareFunc = function(skill, env, config, mirageSkill) - if not env.player.mainSkill.skillCfg.skillCond["usedByMirage"] and env.player.weaponData1.type == "Wand" then + if not env.player.mainSkill.skillCfg.skillCond["usedByMirage"] and env.player.weaponData1.class == "Wand" then return env.player.mainSkill end end, diff --git a/src/Modules/CalcOffence.lua b/src/Modules/CalcOffence.lua index 5f441c7a77..e17bf0349a 100644 --- a/src/Modules/CalcOffence.lua +++ b/src/Modules/CalcOffence.lua @@ -554,8 +554,8 @@ function calcs.offence(env, actor, activeSkill) skillModList:NewMod(damageType.."Max", "BASE", m_floor((actor.weaponData1[damageType.."Max"] or 0) * multiplier), "Battlemage", ModFlag.Spell) end end - local weapon1info = env.data.weaponTypeInfo[actor.weaponData1.type] - local weapon2info = env.data.weaponTypeInfo[actor.weaponData2.type] + local weapon1info = env.data.weaponClassInfo[actor.weaponData1.class] + local weapon2info = env.data.weaponClassInfo[actor.weaponData2.class] -- -- account for Spellblade -- Note: we check conditions of Main Hand weapon using actor.itemList as actor.weaponData1 is populated with unarmed values when no weapon slotted. local spellbladeMulti = skillModList:Max(skillCfg, "OneHandWeaponDamageAppliesToSpells") @@ -830,17 +830,17 @@ function calcs.offence(env, actor, activeSkill) end if skillData.gainPercentBaseWandDamage then local mult = skillData.gainPercentBaseWandDamage / 100 - if actor.weaponData1.type == "Wand" and actor.weaponData2.type == "Wand" then + if actor.weaponData1.category == "Wand" and actor.weaponData2.category == "Wand" then for _, damageType in ipairs(dmgTypeList) do skillModList:NewMod(damageType.."Min", "BASE", ((actor.weaponData1[damageType.."Min"] or 0) + (actor.weaponData2[damageType.."Min"] or 0)) / 2 * mult, "Spellslinger") skillModList:NewMod(damageType.."Max", "BASE", ((actor.weaponData1[damageType.."Max"] or 0) + (actor.weaponData2[damageType.."Max"] or 0)) / 2 * mult, "Spellslinger") end - elseif actor.weaponData1.type == "Wand" then + elseif actor.weaponData1.category == "Wand" then for _, damageType in ipairs(dmgTypeList) do skillModList:NewMod(damageType.."Min", "BASE", (actor.weaponData1[damageType.."Min"] or 0) * mult, "Spellslinger") skillModList:NewMod(damageType.."Max", "BASE", (actor.weaponData1[damageType.."Max"] or 0) * mult, "Spellslinger") end - elseif actor.weaponData2.type == "Wand" then + elseif actor.weaponData2.category == "Wand" then for _, damageType in ipairs(dmgTypeList) do skillModList:NewMod(damageType.."Min", "BASE", (actor.weaponData2[damageType.."Min"] or 0) * mult, "Spellslinger") skillModList:NewMod(damageType.."Max", "BASE", (actor.weaponData2[damageType.."Max"] or 0) * mult, "Spellslinger") @@ -849,17 +849,17 @@ function calcs.offence(env, actor, activeSkill) end if skillData.gainPercentBaseDaggerDamage then local mult = skillData.gainPercentBaseDaggerDamage / 100 - if actor.weaponData1.type == "Dagger" and actor.weaponData2.type == "Dagger" then + if actor.weaponData1.category == "Dagger" and actor.weaponData2.category == "Dagger" then for _, damageType in ipairs(dmgTypeList) do skillModList:NewMod(damageType.."Min", "BASE", ((actor.weaponData1[damageType.."Min"] or 0) + (actor.weaponData2[damageType.."Min"] or 0)) / 2 * mult, "Blade Blast of Dagger Detonation") skillModList:NewMod(damageType.."Max", "BASE", ((actor.weaponData1[damageType.."Max"] or 0) + (actor.weaponData2[damageType.."Max"] or 0)) / 2 * mult, "Blade Blast of Dagger Detonation") end - elseif actor.weaponData1.type == "Dagger" then + elseif actor.weaponData1.category == "Dagger" then for _, damageType in ipairs(dmgTypeList) do skillModList:NewMod(damageType.."Min", "BASE", (actor.weaponData1[damageType.."Min"] or 0) * mult, "Blade Blast of Dagger Detonation") skillModList:NewMod(damageType.."Max", "BASE", (actor.weaponData1[damageType.."Max"] or 0) * mult, "Blade Blast of Dagger Detonation") end - elseif actor.weaponData2.type == "Dagger" then + elseif actor.weaponData2.category == "Dagger" then for _, damageType in ipairs(dmgTypeList) do skillModList:NewMod(damageType.."Min", "BASE", (actor.weaponData2[damageType.."Min"] or 0) * mult, "Blade Blast of Dagger Detonation") skillModList:NewMod(damageType.."Max", "BASE", (actor.weaponData2[damageType.."Max"] or 0) * mult, "Blade Blast of Dagger Detonation") @@ -1960,7 +1960,7 @@ function calcs.offence(env, actor, activeSkill) if skillFlags.unarmed then source = copyTable(data.unarmedWeaponData[env.classId]) end - if critOverride and source.type and source.type ~= "None" then + if critOverride and source.class and source.class ~= "Unarmed" then source.CritChance = critOverride end t_insert(passList, { @@ -1981,7 +1981,7 @@ function calcs.offence(env, actor, activeSkill) if skillFlags.unarmed then source = copyTable(data.unarmedWeaponData[env.classId]) end - if critOverride and source.type and source.type ~= "None" then + if critOverride and source.category and source.category ~= "Unarmed" then source.CritChance = critOverride end if skillData.CritChance then @@ -3045,7 +3045,7 @@ function calcs.offence(env, actor, activeSkill) t_insert(breakdown[damageType], "Base damage:") local plus = "" if (source[damageTypeMin] or 0) ~= 0 or (source[damageTypeMax] or 0) ~= 0 then - t_insert(breakdown[damageType], s_format("%d to %d ^8(damage from %s)", source[damageTypeMin], source[damageTypeMax], source.type and "weapon" or "skill")) + t_insert(breakdown[damageType], s_format("%d to %d ^8(damage from %s)", source[damageTypeMin], source[damageTypeMax], source.class and "weapon" or "skill")) end if addedMin ~= 0 or addedMax ~= 0 then t_insert(breakdown[damageType], s_format("%s%d to %d ^8(added damage)", plus, addedMin, addedMax)) diff --git a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua index f3e0aba7ab..2686e9ff15 100644 --- a/src/Modules/CalcPerform.lua +++ b/src/Modules/CalcPerform.lua @@ -85,20 +85,20 @@ local function doActorAttribsConditions(env, actor) local condList = modDB.conditions -- Set conditions - if (actor.itemList["Weapon 2"] and actor.itemList["Weapon 2"].type == "Shield") then + if (actor.itemList["Weapon 2"] and actor.itemList["Weapon 2"].class == "Shield") then condList["UsingShield"] = true - elseif (actor.itemList["Weapon 2"] and actor.itemList["Weapon 2"].type == "Focus") then + elseif (actor.itemList["Weapon 2"] and actor.itemList["Weapon 2"].class == "Focus") then condList["UsingFocus"] = true elseif not actor.itemList["Weapon 2"] then condList["OffHandIsEmpty"] = true end - if actor.weaponData1.type == "None" then + if actor.weaponData1.class == "Unarmed" then condList["Unarmed"] = true if not actor.itemList["Weapon 2"] and not actor.itemList["Gloves"] then condList["Unencumbered"] = true end else - local info = env.data.weaponTypeInfo[actor.weaponData1.type] + local info = env.data.weaponClassInfo[actor.weaponData1.class] condList["Using"..info.flag] = true if actor.weaponData1.countsAsAll1H then actor.weaponData1["AddedUsingAxe"] = not condList["UsingAxe"] @@ -114,7 +114,7 @@ local function doActorAttribsConditions(env, actor) actor.weaponData1["AddedUsingSpear"] = not condList["UsingSpear"] condList["UsingSpear"] = true -- GGG stated that a single Varunastra satisfied requirement for wielding two different weapons - condList["WieldingDifferentWeaponTypes"] = true + condList["WieldingDifferentWeaponCategories"] = true end if info.melee then condList["UsingMeleeWeapon"] = true @@ -131,8 +131,8 @@ local function doActorAttribsConditions(env, actor) condList["Using"..slotName] = true end end - if actor.weaponData2.type then - local info = env.data.weaponTypeInfo[actor.weaponData2.type] + if actor.weaponData2.class then + local info = env.data.weaponClassInfo[actor.weaponData2.class] condList["Using"..info.flag] = true if actor.weaponData2.countsAsAll1H then actor.weaponData2["AddedUsingAxe"] = not condList["UsingAxe"] @@ -148,7 +148,7 @@ local function doActorAttribsConditions(env, actor) actor.weaponData2["AddedUsingSpear"] = not condList["UsingSpear"] condList["UsingSpear"] = true -- GGG stated that a single Varunastra satisfied requirement for wielding two different weapons - condList["WieldingDifferentWeaponTypes"] = true + condList["WieldingDifferentWeaponCategories"] = true end if info.melee then condList["UsingMeleeWeapon"] = true @@ -159,19 +159,19 @@ local function doActorAttribsConditions(env, actor) condList["UsingTwoHandedWeapon"] = true end end - if actor.weaponData1.type and actor.weaponData2.type then + if actor.weaponData1.category and actor.weaponData2.category then condList["DualWielding"] = true - if (actor.weaponData1.type == "Claw" or actor.weaponData1.countsAsAll1H) and (actor.weaponData2.type == "Claw" or actor.weaponData2.countsAsAll1H) then + if (actor.weaponData1.category == "Claw" or actor.weaponData1.countsAsAll1H) and (actor.weaponData2.category == "Claw" or actor.weaponData2.countsAsAll1H) then condList["DualWieldingClaws"] = true end - if (actor.weaponData1.type == "Dagger" or actor.weaponData1.countsAsAll1H) and (actor.weaponData2.type == "Dagger" or actor.weaponData2.countsAsAll1H) then + if (actor.weaponData1.category == "Dagger" or actor.weaponData1.countsAsAll1H) and (actor.weaponData2.category == "Dagger" or actor.weaponData2.countsAsAll1H) then condList["DualWieldingDaggers"] = true end - if (env.data.weaponTypeInfo[actor.weaponData1.type].label or actor.weaponData1.type) ~= (env.data.weaponTypeInfo[actor.weaponData2.type].label or actor.weaponData2.type) then - local info1 = env.data.weaponTypeInfo[actor.weaponData1.type] - local info2 = env.data.weaponTypeInfo[actor.weaponData2.type] + if actor.weaponData1.category ~= actor.weaponData2.category then + local info1 = env.data.weaponClassInfo[actor.weaponData1.class] + local info2 = env.data.weaponClassInfo[actor.weaponData2.class] if info1.oneHand and info2.oneHand then - condList["WieldingDifferentWeaponTypes"] = true + condList["WieldingDifferentWeaponCategories"] = true end end end @@ -839,10 +839,10 @@ function calcs.perform(env, skipEHP) env.minion.modDB:AddList(env.theIronMass) end if env.player.mainSkill.skillData.minionUseBowAndQuiver then - if env.player.weaponData1.type == "Bow" then + if env.player.weaponData1.category == "Bow" then env.minion.modDB:AddList(env.player.itemList["Weapon 1"].slotModList[1]) end - if env.player.itemList["Weapon 2"] and env.player.itemList["Weapon 2"].type == "Quiver" then + if env.player.itemList["Weapon 2"] and env.player.itemList["Weapon 2"].category == "Quiver" then local quiverEffectMod = env.player.modDB:Sum("INC", nil, "EffectOfBonusesFromQuiver") / 100 if quiverEffectMod > 0 then for _, mod in ipairs(env.player.itemList["Weapon 2"].modList) do @@ -1105,7 +1105,7 @@ function calcs.perform(env, skipEHP) for _, slot in pairs(env.build.itemsTab.orderedSlots) do local slotName = slot.slotName local item = env.build.itemsTab.items[slot.selItemId] - if item and item.type == "Flask" then + if item and item.category == "Flask" then local mageblood_applies = item.rarity == "MAGIC" and not (item.baseName:match("Life Flask") or item.baseName:match("Mana Flask") or item.baseName:match("Hybrid Flask")) and curActiveMagicUtilityCount < maxActiveMagicUtilityCount diff --git a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua index 8e8e0dad26..4cc904ab04 100644 --- a/src/Modules/CalcSetup.lua +++ b/src/Modules/CalcSetup.lua @@ -719,8 +719,8 @@ function calcs.initEnv(build, mode, override, specEnv) if slotName == override.repSlotName then item = override.repItem elseif override.repItem and override.repSlotName:match("^Weapon 1") and slotName:match("^Weapon 2") and - (override.repItem.base.type == "Staff" or override.repItem.base.type == "Two Handed Sword" or override.repItem.base.type == "Two Handed Axe" or override.repItem.base.type == "Two Handed Mace" - or (override.repItem.base.type == "Bow" and item and item.base.type ~= "Quiver")) then + (override.repItem.base.category == "Staff" or override.repItem.base.category == "Two Handed Sword" or override.repItem.base.category == "Two Handed Axe" or override.repItem.base.category == "Two Handed Mace" + or (override.repItem.base.category == "Bow" and item and item.base.category ~= "Quiver")) then goto continue elseif slot.nodeId and override.spec then item = build.itemsTab.items[env.spec.jewels[slot.nodeId]] @@ -755,11 +755,11 @@ function calcs.initEnv(build, mode, override, specEnv) if item.jewelData then item.jewelData.limitDisabled = nil end - if item and item.type == "Jewel" and item.name:match("The Adorned, Diamond") then + if item and item.class == "Jewel" and item.name:match("The Adorned, Diamond") then env.modDB.multipliers["CorruptedMagicJewelEffect"] = item.jewelData.corruptedMagicJewelIncEffect / 100 end if item.limit and not env.configInput.ignoreJewelLimits then - local limitKey = item.base.subType == "Timeless" and "Historic" or item.title + local limitKey = item.baseName == "Timeless Jewel" and "Historic" or item.title if jewelLimits[limitKey] and jewelLimits[limitKey] >= item.limit then if item.jewelData then item.jewelData.limitDisabled = true @@ -852,7 +852,7 @@ function calcs.initEnv(build, mode, override, specEnv) for _, tag in ipairs(mod) do if tag.type == "DisablesItem" then -- e.g. Tincture in Flask 5 while using a Micro-Distillery Belt - if tag.excludeItemType and items[tag.slotName] and items[tag.slotName].type == tag.excludeItemType then + if tag.excludeItemClass and items[tag.slotName] and items[tag.slotName].class == tag.excludeItemClass then break end itemDisablers[slotName] = tag.slotName @@ -894,25 +894,25 @@ function calcs.initEnv(build, mode, override, specEnv) for _, slot in pairs(build.itemsTab.orderedSlots) do local slotName = slot.slotName local item = items[slotName] - if item and item.type == "Flask" then + if item and item.category == "Flask" then if slot.active then env.flasks[item] = true end - if item.base.subType == "Life" then + if item.base.class == "LifeFlask" then local highestLifeRecovery = env.itemModDB.multipliers["LifeFlaskRecovery"] or 0 if item.flaskData.lifeTotal > highestLifeRecovery then env.itemModDB.multipliers["LifeFlaskRecovery"] = item.flaskData.lifeTotal end end item = nil - elseif item and item.type == "Charm" then + elseif item and item.category == "Charm" then if slot.active then env.charms[item] = true end item = nil end local scale = 1 - if slot.nodeId and item and item.type == "Jewel" and item.jewelData and item.jewelData.jewelIncEffectFromClassStart then + if slot.nodeId and item and item.category == "Jewel" and item.jewelData and item.jewelData.jewelIncEffectFromClassStart then local node = env.spec.nodes[slot.nodeId] if node and node.distanceToClassStart then scale = scale + node.distanceToClassStart * (item.jewelData.jewelIncEffectFromClassStart / 100) @@ -966,25 +966,7 @@ function calcs.initEnv(build, mode, override, specEnv) end end end - - if item.type == "Jewel" and item.base.subType == "Abyss" then - -- Update Abyss Jewel conditions/multipliers - local cond = "Have"..item.baseName:gsub(" ","") - if not env.itemModDB.conditions[cond] then - env.itemModDB.conditions[cond] = true - env.itemModDB.multipliers["AbyssJewelType"] = (env.itemModDB.multipliers["AbyssJewelType"] or 0) + 1 - end - if slot.parentSlot then - env.itemModDB.conditions[cond.."In"..slot.parentSlot.slotName] = true - end - env.itemModDB.multipliers["AbyssJewel"] = (env.itemModDB.multipliers["AbyssJewel"] or 0) + 1 - if item.rarity == "NORMAL" then env.itemModDB.multipliers["NormalAbyssJewels"] = (env.itemModDB.multipliers["NormalAbyssJewels"] or 0) + 1 end - if item.rarity == "MAGIC" then env.itemModDB.multipliers["MagicAbyssJewels"] = (env.itemModDB.multipliers["MagicAbyssJewels"] or 0) + 1 end - if item.rarity == "RARE" then env.itemModDB.multipliers["RareAbyssJewels"] = (env.itemModDB.multipliers["RareAbyssJewels"] or 0) + 1 end - if item.rarity == "UNIQUE" or item.rarity == "RELIC" then env.itemModDB.multipliers["UniqueAbyssJewels"] = (env.itemModDB.multipliers["UniqueAbyssJewels"] or 0) + 1 end - env.itemModDB.multipliers[item.baseName:gsub(" ","")] = (env.itemModDB.multipliers[item.baseName:gsub(" ","")] or 0) + 1 - end - if item.type == "Amulet" and env.allocNodes[39935] and env.allocNodes[39935].dn == "Necromantic Talisman" then + if item.class == "Amulet" and env.allocNodes[39935] and env.allocNodes[39935].dn == "Necromantic Talisman" then -- Special handling for Necromantic Talisman env.talismanModList = new("ModList") for _, mod in ipairs(srcList) do @@ -993,9 +975,9 @@ function calcs.initEnv(build, mode, override, specEnv) end elseif (slotName == "Weapon 1" or slotName == "Weapon 2") and modDB.conditions["AffectedByEnergyBlade"] then local previousItem = env.player.itemList[slotName] - local type = previousItem and previousItem.weaponData and previousItem.weaponData[1].type - local info = env.data.weaponTypeInfo[type] - if info and type ~= "Bow" then + local class = previousItem and previousItem.weaponData and previousItem.weaponData[1].class + local info = env.data.weaponClassInfo[class] + if info and class ~= "Bow" then local name = info.oneHand and "Energy Blade One Handed" or "Energy Blade Two Handed" local item = new("Item") item.name = name @@ -1097,7 +1079,7 @@ function calcs.initEnv(build, mode, override, specEnv) env.itemModDB:ScaleAddMod(mod, scale) end end - elseif env.modDB.multipliers["CorruptedMagicJewelEffect"] and item.type == "Jewel" and item.rarity == "MAGIC" and item.corrupted and slot.nodeId and item.base.subType ~= "Charm" then + elseif env.modDB.multipliers["CorruptedMagicJewelEffect"] and item.category == "Jewel" and item.rarity == "MAGIC" and item.corrupted and slot.nodeId then scale = scale + env.modDB.multipliers["CorruptedMagicJewelEffect"] local combinedList = new("ModList") for _, mod in ipairs(srcList) do @@ -1117,7 +1099,7 @@ function calcs.initEnv(build, mode, override, specEnv) if item.spiritValue and not nodesModsList:Flag(nil, "CannotGainSpiritFromEquipment") then env.modDB:NewMod("Spirit", "BASE", item.spiritValue, item.title) end - if item.type ~= "Jewel" and item.type ~= "Flask" and item.type ~= "Charm" then + if item.category ~= "Jewel" and item.category ~= "Flask" and item.category ~= "Charm" then -- Update item counts local key if item.rarity == "UNIQUE" or item.rarity == "RELIC" then @@ -1137,7 +1119,7 @@ function calcs.initEnv(build, mode, override, specEnv) env.itemModDB.multipliers["NonCorruptedItem"] = (env.itemModDB.multipliers["NonCorruptedItem"] or 0) + 1 end - env.itemModDB.multipliers[item.type:gsub(" ", ""):gsub(".+Handed", "").."Item"] = (env.itemModDB.multipliers[item.type:gsub(" ", ""):gsub(".+Handed", "").."Item"] or 0) + 1 + env.itemModDB.multipliers[item.class:gsub(" ", ""):gsub(".+Handed", "").."Item"] = (env.itemModDB.multipliers[item.class:gsub(" ", ""):gsub(".+Handed", "").."Item"] or 0) + 1 end end end @@ -1205,7 +1187,7 @@ function calcs.initEnv(build, mode, override, specEnv) end end - if env.player.itemList["Weapon 2"] and env.player.itemList["Weapon 2"].type == "Quiver" then + if env.player.itemList["Weapon 2"] and env.player.itemList["Weapon 2"].category == "Quiver" then local quiverEffectMod = env.modDB:Sum("INC", nil, "EffectOfBonusesFromQuiver") / 100 local modList = env.player.itemList["Weapon 2"].modList for _, mod in ipairs(modList) do diff --git a/src/Modules/CalcTriggers.lua b/src/Modules/CalcTriggers.lua index 69db1a645b..78ffcc5cf4 100644 --- a/src/Modules/CalcTriggers.lua +++ b/src/Modules/CalcTriggers.lua @@ -429,7 +429,7 @@ local function defaultTriggerHandler(env, config) end -- Dual wield triggers - if trigRate and source and env.player.weaponData1.type and env.player.weaponData2.type and not source.skillData.doubleHitsWhenDualWielding and (source.skillTypes[SkillType.Melee] or source.skillTypes[SkillType.Attack]) and actor.mainSkill.triggeredBy and actor.mainSkill.triggeredBy.grantedEffect.support and actor.mainSkill.triggeredBy.grantedEffect.fromItem then + if trigRate and source and env.player.weaponData1.category and env.player.weaponData2.category and not source.skillData.doubleHitsWhenDualWielding and (source.skillTypes[SkillType.Melee] or source.skillTypes[SkillType.Attack]) and actor.mainSkill.triggeredBy and actor.mainSkill.triggeredBy.grantedEffect.support and actor.mainSkill.triggeredBy.grantedEffect.fromItem then trigRate = trigRate / 2 if breakdown then t_insert(breakdown.EffectiveSourceRate, 2, s_format("/ 2 ^8(due to dual wielding)")) @@ -722,7 +722,7 @@ local function defaultTriggerHandler(env, config) local sourceHitChance = GlobalCache.cachedData[env.mode][uuid].HitChance or 0 if sourceHitChance ~= 100 then -- Some skills hit with both weapons at the same time. Each weapon rolls accuracy and crit independently - if source and env.player.weaponData1.type and env.player.weaponData2.type and source.skillData.doubleHitsWhenDualWielding then + if source and env.player.weaponData1.category and env.player.weaponData2.category and source.skillData.doubleHitsWhenDualWielding then local mainHandHit = GlobalCache.cachedData[env.mode][uuid].Env.player.output.MainHand.HitChance local offHandHit = GlobalCache.cachedData[env.mode][uuid].Env.player.output.OffHand.HitChance local bothHit = mainHandHit * offHandHit / 100 @@ -747,7 +747,7 @@ local function defaultTriggerHandler(env, config) local sourceCritChance = GlobalCache.cachedData[env.mode][uuid].CritChance or 0 if sourceCritChance ~= 100 then -- Some skills hit with both weapons at the same time. Each weapon rolls accuracy and crit independently - if source and env.player.weaponData1.type and env.player.weaponData2.type and source.skillData.doubleHitsWhenDualWielding then + if source and env.player.weaponData1.category and env.player.weaponData2.category and source.skillData.doubleHitsWhenDualWielding then local mainHandCrit = GlobalCache.cachedData[env.mode][uuid].Env.player.output.MainHand.CritChance local offHandCrit = GlobalCache.cachedData[env.mode][uuid].Env.player.output.OffHand.CritChance local bothHit = mainHandCrit * offHandCrit / 100 @@ -1153,7 +1153,7 @@ local configTable = { return {triggerName = "Spellslinger", triggerOnUse = true, triggerSkillCond = function(env, skill) - local isWandAttack = (not skill.weaponTypes or (skill.weaponTypes and skill.weaponTypes["Wand"])) and skill.skillTypes[SkillType.Attack] + local isWandAttack = (not skill.weaponClasses or (skill.weaponClasses and skill.weaponClasses["Wand"])) and skill.skillTypes[SkillType.Attack] return isWandAttack and not skill.skillData.triggeredBySpellSlinger end} end diff --git a/src/Modules/Data.lua b/src/Modules/Data.lua index e583b381ac..a64c8c822b 100644 --- a/src/Modules/Data.lua +++ b/src/Modules/Data.lua @@ -422,32 +422,34 @@ data.highPrecisionMods = { }, } -data.weaponTypeInfo = { - ["None"] = { oneHand = true, melee = true, flag = "Unarmed" }, +data.weaponClassInfo = { + ["Unarmed"] = { oneHand = true, melee = true, flag = "Unarmed" }, ["Bow"] = { oneHand = false, melee = false, flag = "Bow" }, ["Crossbow"] = { oneHand = false, melee = false, flag = "Crossbow" }, ["Claw"] = { oneHand = true, melee = true, flag = "Claw" }, ["Dagger"] = { oneHand = true, melee = true, flag = "Dagger" }, ["Spear"] = { oneHand = true, melee = true, flag = "Spear" }, - ["Staff"] = { oneHand = false, melee = true, flag = "Staff", label = "Quarterstaff" }, - ["Wand"] = { oneHand = true, melee = false, flag = "Wand" }, + ["Warstaff"] = { oneHand = false, melee = true, flag = "Warstaff"}, ["One Handed Axe"] = { oneHand = true, melee = true, flag = "Axe" }, ["One Handed Mace"] = { oneHand = true, melee = true, flag = "Mace" }, ["One Handed Sword"] = { oneHand = true, melee = true, flag = "Sword" }, - ["Thrusting One Handed Sword"] = { oneHand = true, melee = true, flag = "Sword", label = "One Handed Sword" }, + ["Thrusting One Handed Sword"] = { oneHand = true, melee = true, flag = "Sword" }, ["Fishing Rod"] = { oneHand = false, melee = true, flag = "Fishing" }, ["Two Handed Axe"] = { oneHand = false, melee = true, flag = "Axe" }, ["Two Handed Mace"] = { oneHand = false, melee = true, flag = "Mace" }, ["Two Handed Sword"] = { oneHand = false, melee = true, flag = "Sword" }, + ["Wand"] = { oneHand = true, melee = false, flag = "Wand" }, + ["Staff"] = { oneHand = false, melee = false, flag = "Staff" }, + ["Sceptre"] = { oneHand = true, melee = false, flag = "Sceptre" }, } -data.unarmedWeaponData = { - [0] = { type = "None", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 6 }, -- Scion - [1] = { type = "None", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 8 }, -- Marauder - [2] = { type = "None", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 5 }, -- Ranger - [3] = { type = "None", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 5 }, -- Witch - [4] = { type = "None", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 6 }, -- Duelist - [5] = { type = "None", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 6 }, -- Templar - [6] = { type = "None", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 5 }, -- Shadow +data.unarmedWeaponData = { -- are these values correct for poe 2? + [0] = { class = "Unarmed", category = "Unarmed", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 6 }, -- Scion + [1] = { class = "Unarmed", category = "Unarmed", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 8 }, -- Marauder + [2] = { class = "Unarmed", category = "Unarmed", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 5 }, -- Ranger + [3] = { class = "Unarmed", category = "Unarmed", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 5 }, -- Witch + [4] = { class = "Unarmed", category = "Unarmed", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 6 }, -- Duelist + [5] = { class = "Unarmed", category = "Unarmed", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 6 }, -- Templar + [6] = { class = "Unarmed", category = "Unarmed", AttackRate = 1.2, CritChance = 0, PhysicalMin = 2, PhysicalMax = 5 }, -- Shadow } data.setJewelRadiiGlobally = function(treeVersion) @@ -844,22 +846,27 @@ for _, type in pairs(itemTypes) do LoadModule("Data/Bases/"..type, data.itemBases) end --- Build lists of item bases, separated by type +-- Build lists of item bases, separated by category label data.itemBaseLists = { } for name, base in pairs(data.itemBases) do if not base.hidden then - local type = base.type - if base.subType then - type = type .. ": " .. base.subType + local category = base.category + if base.category == base.class or base.label == base.category then + category = base.label or base.category + else + category = base.category..": "..(base.label or base.class) + end + if base.type then + category = category.." ("..base.type..")" end - data.itemBaseLists[type] = data.itemBaseLists[type] or { } - table.insert(data.itemBaseLists[type], { label = name:gsub(" %(.+%)",""), name = name, base = base }) + data.itemBaseLists[category] = data.itemBaseLists[category] or { } + table.insert(data.itemBaseLists[category], { label = name:gsub(" %(.+%)",""), name = name, base = base }) end end -data.itemBaseTypeList = { } -for type, list in pairs(data.itemBaseLists) do - table.insert(data.itemBaseTypeList, type) - table.sort(list, function(a, b) +data.itemBaseCategoryList = { } +for category, list in pairs(data.itemBaseLists) do + table.insert(data.itemBaseCategoryList, category) + table.sort(list, function(a, b) -- sort lists in itemBaseLists if a.base.req and b.base.req then if a.base.req.level == b.base.req.level then return a.name < b.name @@ -875,7 +882,7 @@ for type, list in pairs(data.itemBaseLists) do end end) end -table.sort(data.itemBaseTypeList) +table.sort(data.itemBaseCategoryList) -- sorted list of category names -- Rare templates --data.rares = LoadModule("Data/Rares") diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index df9b2a3980..266ad547b6 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -864,9 +864,9 @@ local modFlagList = { ["with staves"] = { flags = bor(ModFlag.Staff, ModFlag.Hit) }, ["to staff attacks"] = { flags = bor(ModFlag.Staff, ModFlag.Hit) }, ["with staff attacks"] = { flags = bor(ModFlag.Staff, ModFlag.Hit) }, - ["with quarterstaves"] = { flags = bor(ModFlag.Staff, ModFlag.Hit) }, - ["to quarterstaff attacks"] = { flags = bor(ModFlag.Staff, ModFlag.Hit) }, - ["with quarterstaff attacks"] = { flags = bor(ModFlag.Staff, ModFlag.Hit) }, + ["with quarterstaves"] = { flags = bor(ModFlag.Warstaff, ModFlag.Hit) }, + ["to quarterstaff attacks"] = { flags = bor(ModFlag.Warstaff, ModFlag.Hit) }, + ["with quarterstaff attacks"] = { flags = bor(ModFlag.Warstaff, ModFlag.Hit) }, ["with swords"] = { flags = bor(ModFlag.Sword, ModFlag.Hit) }, ["to sword attacks"] = { flags = bor(ModFlag.Sword, ModFlag.Hit) }, ["with sword attacks"] = { flags = bor(ModFlag.Sword, ModFlag.Hit) }, @@ -1500,7 +1500,7 @@ local modTagList = { ["while wielding a two handed weapon"] = { tag = { type = "Condition", var = "UsingTwoHandedWeapon" } }, ["while wielding a two handed melee weapon"] = { tagList = { { type = "Condition", var = "UsingTwoHandedWeapon" }, { type = "Condition", var = "UsingMeleeWeapon" } } }, ["while wielding a wand"] = { tag = { type = "Condition", var = "UsingWand" } }, - ["while wielding two different weapon types"] = { tag = { type = "Condition", var = "WieldingDifferentWeaponTypes" } }, + ["while wielding two different weapon types"] = { tag = { type = "Condition", var = "WieldingDifferentWeaponCategories" } }, ["while unarmed"] = { tag = { type = "Condition", var = "Unarmed" } }, ["while you are unencumbered"] = { tag = { type = "Condition", var = "Unencumbered" } }, ["while surrounded"] = { tag = { type = "Condition", var = "Surrounded" } }, @@ -3214,10 +3214,10 @@ local specialModList = { ["your fire damage can shock"] = { flag("FireCanShock") }, ["all y?o?u?r? ?damage can freeze"] = { flag("PhysicalCanFreeze"), flag("LightningCanFreeze"), flag("FireCanFreeze"), flag("ChaosCanFreeze") }, ["all damage with maces and sceptres inflicts chill"] = { - flag("PhysicalCanChill", { type = "Condition", var = "UsingMace" }), - flag("LightningCanChill", { type = "Condition", var = "UsingMace" }), - flag("FireCanChill", { type = "Condition", var = "UsingMace" }), - flag("ChaosCanChill", { type = "Condition", var = "UsingMace" }) + flag("PhysicalCanChill", { type = "Condition", varList = { "UsingMace", "UsingSceptre" } }), + flag("LightningCanChill", { type = "Condition", varList = { "UsingMace", "UsingSceptre" } }), + flag("FireCanChill", { type = "Condition", varList = { "UsingMace", "UsingSceptre" } }), + flag("ChaosCanChill", { type = "Condition", varList = { "UsingMace", "UsingSceptre" } }), }, ["your cold damage can ignite"] = { flag("ColdCanIgnite") }, ["your lightning damage can ignite"] = { flag("LightningCanIgnite") }, @@ -4525,7 +4525,7 @@ local specialModList = { ["(%a+) resistance cannot be penetrated"] = function(_, res) return { flag("EnemyCannotPen"..(res:gsub("^%l", string.upper)).."Resistance") } end, -- Knockback ["cannot knock enemies back"] = { flag("CannotKnockback") }, - ["knocks back enemies if you get a critical hit with a q?u?a?r?t?e?r?staff"] = { mod("EnemyKnockbackChance", "BASE", 100, nil, ModFlag.Staff, { type = "Condition", var = "CriticalStrike" }) }, + ["knocks back enemies if you get a critical hit with a q?u?a?r?t?e?r?staff"] = { mod("EnemyKnockbackChance", "BASE", 100, nil, ModFlag.Warstaff, { type = "Condition", var = "CriticalStrike" }) }, ["knocks back enemies if you get a critical hit with a bow"] = { mod("EnemyKnockbackChance", "BASE", 100, nil, ModFlag.Bow, { type = "Condition", var = "CriticalStrike" }) }, ["bow knockback at close range"] = { mod("EnemyKnockbackChance", "BASE", 100, nil, ModFlag.Bow, { type = "Condition", var = "AtCloseRange" }) }, ["adds knockback during f?l?a?s?k? ?effect"] = { mod("EnemyKnockbackChance", "BASE", 100, { type = "Condition", var = "UsingFlask" }) }, @@ -5013,7 +5013,7 @@ local specialModList = { } end, ["you are crushed"] = { flag("Condition:Crushed") }, ["nearby enemies are crushed"] = { mod("EnemyModifier", "LIST", { mod = flag("Condition:Crushed") }) }, - ["crush enemies on hit with maces and sceptres"] = { mod("EnemyModifier", "LIST", { mod = flag("Condition:Crushed") }, { type = "Condition", var = "UsingMace" }) }, + ["crush enemies on hit with maces and sceptres"] = { mod("EnemyModifier", "LIST", { mod = flag("Condition:Crushed") }, { type = "Condition", varList = { "UsingMace", "UsingSceptre" } }) }, ["you have fungal ground around you while stationary"] = { mod("ExtraAura", "LIST", { mod = mod("ChaosResist", "BASE", 25) }, { type = "Condition", varList = { "OnFungalGround", "Stationary" } }), mod("EnemyModifier", "LIST", { mod = mod("ChaosResist", "BASE", -10) }, { type = "ActorCondition", actor = "enemy", varList = { "OnFungalGround", "Stationary" } }), @@ -5859,7 +5859,7 @@ local jewelOtherFuncs = { ["Passives granting Fire Resistance or all Elemental Resistances in Radius also grant Chance to Block at 35% of its value"] = getSimpleConv({ "FireResist","ElementalResist" }, "BlockChance", "BASE", false, 0.35), ["Melee and Melee Weapon Type modifiers in Radius are Transformed to Bow Modifiers"] = function(node, out, data) if node then - local mask1 = bor(ModFlag.Axe, ModFlag.Claw, ModFlag.Dagger, ModFlag.Mace, ModFlag.Staff, ModFlag.Sword, ModFlag.Melee) + local mask1 = bor(ModFlag.Axe, ModFlag.Claw, ModFlag.Dagger, ModFlag.Mace, ModFlag.Warstaff, ModFlag.Sword, ModFlag.Melee) local mask2 = bor(ModFlag.Weapon1H, ModFlag.WeaponMelee) local mask3 = bor(ModFlag.Weapon2H, ModFlag.WeaponMelee) for _, mod in ipairs(node.modList) do @@ -5867,7 +5867,7 @@ local jewelOtherFuncs = { out:MergeNewMod(mod.name, mod.type, -mod.value, mod.source, mod.flags, mod.keywordFlags, unpack(mod)) out:MergeNewMod(mod.name, mod.type, mod.value, mod.source, bor(band(mod.flags, bnot(bor(mask1, mask2, mask3))), ModFlag.Bow), mod.keywordFlags, unpack(mod)) elseif mod[1] then - local using = { UsingAxe = true, UsingClaw = true, UsingDagger = true, UsingMace = true, UsingStaff = true, UsingSword = true, UsingMeleeWeapon = true } + local using = { UsingAxe = true, UsingClaw = true, UsingDagger = true, UsingMace = true, UsingWarstaff = true, UsingSword = true, UsingMeleeWeapon = true } for _, tag in ipairs(mod) do if tag.type == "Condition" and using[tag.var] then local newTagList = copyTable(mod) From aa57cdaedc60bed2d04437266823981ac192c7e4 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 3 Feb 2025 17:16:59 +1100 Subject: [PATCH 07/15] Remove debugger --- src/Export/Launch.lua | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Export/Launch.lua b/src/Export/Launch.lua index 57267cf94d..7a3496e08f 100644 --- a/src/Export/Launch.lua +++ b/src/Export/Launch.lua @@ -13,13 +13,6 @@ launch = { } SetMainObject(launch) function launch:OnInit() - -- This is the path to emmy_core.dll. The ?.dll at the end is intentional. -package.cpath = package.cpath .. ";C:/Users/Thomas/.vscode/extensions/tangzx.emmylua-0.8.20-win32-x64/debugger/emmy/windows/x64/?.dll" -local dbg = require("emmy_core") --- This port must match the Visual Studio Code configuration. Default is 9966. -dbg.tcpListen("localhost", 9966) --- Uncomment the next line if you want Path of Building to block until the debugger is attached ---dbg.waitIDE() self.devMode = true self.subScripts = { } RenderInit() From a6b68c2e5c4601e28e34760edf3c8ca02e9722b5 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 3 Feb 2025 17:36:00 +1100 Subject: [PATCH 08/15] Fix incorrect weaponClassInfo and remove not presented thrusting --- src/Classes/TradeQueryGenerator.lua | 2 +- src/Modules/Data.lua | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Classes/TradeQueryGenerator.lua b/src/Classes/TradeQueryGenerator.lua index 93a90c1937..65f39af644 100644 --- a/src/Classes/TradeQueryGenerator.lua +++ b/src/Classes/TradeQueryGenerator.lua @@ -25,7 +25,7 @@ local tradeClasses = { ["1HWeapon"] = { "One Handed Mace", "Wand", "Sceptre" }, ["2HWeapon"] = { "Staff", "Warstaff", "Two Handed Mace", "Crossbow", "Bow" }, -- ["1HAxe"] = { "One Handed Axe" }, - -- ["1HSword"] = { "One Handed Sword", "Thrusting One Handed Sword" }, + -- ["1HSword"] = { "One Handed Sword" }, ["1HMace"] = { "One Handed Mace" }, ["Sceptre"] = { "Sceptre" }, -- ["Dagger"] = { "Dagger" }, diff --git a/src/Modules/Data.lua b/src/Modules/Data.lua index a64c8c822b..7d8692ad34 100644 --- a/src/Modules/Data.lua +++ b/src/Modules/Data.lua @@ -430,14 +430,13 @@ data.weaponClassInfo = { ["Dagger"] = { oneHand = true, melee = true, flag = "Dagger" }, ["Spear"] = { oneHand = true, melee = true, flag = "Spear" }, ["Warstaff"] = { oneHand = false, melee = true, flag = "Warstaff"}, - ["One Handed Axe"] = { oneHand = true, melee = true, flag = "Axe" }, - ["One Handed Mace"] = { oneHand = true, melee = true, flag = "Mace" }, - ["One Handed Sword"] = { oneHand = true, melee = true, flag = "Sword" }, - ["Thrusting One Handed Sword"] = { oneHand = true, melee = true, flag = "Sword" }, - ["Fishing Rod"] = { oneHand = false, melee = true, flag = "Fishing" }, - ["Two Handed Axe"] = { oneHand = false, melee = true, flag = "Axe" }, - ["Two Handed Mace"] = { oneHand = false, melee = true, flag = "Mace" }, - ["Two Handed Sword"] = { oneHand = false, melee = true, flag = "Sword" }, + ["One Hand Axe"] = { oneHand = true, melee = true, flag = "Axe" }, + ["One Hand Mace"] = { oneHand = true, melee = true, flag = "Mace" }, + ["One Hand Sword"] = { oneHand = true, melee = true, flag = "Sword" }, + ["FishingRod"] = { oneHand = false, melee = true, flag = "Fishing" }, + ["Two Hand Axe"] = { oneHand = false, melee = true, flag = "Axe" }, + ["Two Hand Mace"] = { oneHand = false, melee = true, flag = "Mace" }, + ["Two Hand Sword"] = { oneHand = false, melee = true, flag = "Sword" }, ["Wand"] = { oneHand = true, melee = false, flag = "Wand" }, ["Staff"] = { oneHand = false, melee = false, flag = "Staff" }, ["Sceptre"] = { oneHand = true, melee = false, flag = "Sceptre" }, From 2308efbd157c8e002ca5c522ba79d4cd0dc9bab7 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 3 Feb 2025 17:37:25 +1100 Subject: [PATCH 09/15] Spelling --- src/Classes/ItemsTab.lua | 2 +- src/Classes/NotableDBControl.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua index a6a1ffc7b2..22b08bc228 100644 --- a/src/Classes/ItemsTab.lua +++ b/src/Classes/ItemsTab.lua @@ -1830,7 +1830,7 @@ function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet) if weapon1Base.class == "Bow" then return item.class == "Quiver" elseif weapon1Base == "Unarmed" or weapon1Base.tags.onehand or (giantsBlood and (weapon1Base.tags.axe or weapon1Base.tags.mace or weapon1Base.tags.sword)) then - return item.class == "Shield" or item.tyclasspe == "Focus" or item.class == "Sceptre" + return item.class == "Shield" or item.class == "Focus" or item.class == "Sceptre" or (item.base.tags.one_hand_weapon and weapon1Base.class ~= "Wand" and weapon1Base.class ~= "Sceptre") or (giantsBlood and (item.base.tags.axe or item.base.tags.mace or item.base.tags.sword)) end diff --git a/src/Classes/NotableDBControl.lua b/src/Classes/NotableDBControl.lua index 00825b9c04..8f18cdd846 100644 --- a/src/Classes/NotableDBControl.lua +++ b/src/Classes/NotableDBControl.lua @@ -185,7 +185,7 @@ function NotableDBClass:ListBuilder() local infinites = { } local start = GetTime() local calcFunc = self.itemsTab.build.calcsTab:GetMiscCalculator() - local itemClass = self.itemsTab.displayItem.base.class -- this needs checking to make sure it works pressumably it was setup to handle annoints on any item type. + local itemClass = self.itemsTab.displayItem.base.class -- this needs checking to make sure it works presumably it was setup to handle anoints on any item type. local calcBase = calcFunc({ repSlotName = itemClass, repItem = self.itemsTab:anointItem(nil) }) self.sortMaxPower = 0 for nodeIndex, node in ipairs(list) do From 47de0c7a095a8b768458cf6966ffa2b5d6d610b3 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 3 Feb 2025 17:56:36 +1100 Subject: [PATCH 10/15] Rewrite categoryLabel generation --- src/Modules/Data.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Modules/Data.lua b/src/Modules/Data.lua index 7d8692ad34..b4b4f7033d 100644 --- a/src/Modules/Data.lua +++ b/src/Modules/Data.lua @@ -849,11 +849,9 @@ end data.itemBaseLists = { } for name, base in pairs(data.itemBases) do if not base.hidden then - local category = base.category - if base.category == base.class or base.label == base.category then - category = base.label or base.category - else - category = base.category..": "..(base.label or base.class) + local category = base.label or base.category + if base.category ~= base.class then + category = category..": "..base.class:gsub("([a-z])([A-Z])", "%1 %2") end if base.type then category = category.." ("..base.type..")" From 46bc831aa2ea959a10fa6de26ffdb898dfc23302 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Mon, 3 Feb 2025 18:02:36 +1100 Subject: [PATCH 11/15] Fix itemDB as well --- src/Classes/ItemDBControl.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Classes/ItemDBControl.lua b/src/Classes/ItemDBControl.lua index 56d8a2906f..e0368a0d5a 100644 --- a/src/Classes/ItemDBControl.lua +++ b/src/Classes/ItemDBControl.lua @@ -67,7 +67,7 @@ function ItemDBClass:LoadLeaguesAndTypes() leagueFlag[leagueName] = true end end - categoryFlag[item.class == item.category and (item.label or item.class) or (item.category..": "..(item.label or item.class))] = true + categoryFlag[(item.label or item.category)..(item.class ~= item.category and ": "..item.class:gsub("([a-z])([A-Z])", "%1 %2") or "")] = true end for leagueName in pairsSortByKey(leagueFlag) do t_insert(self.leagueList, leagueName) @@ -100,7 +100,7 @@ function ItemDBClass:DoesItemMatchFilters(item) if not (weaponInfo and weaponInfo.melee and ((categorySel == 4 and weaponInfo.oneHand) or (categorySel == 5 and not weaponInfo.oneHand))) then return false end - elseif (item.class == item.category and (item.label or item.class) or (item.category..": "..(item.label or item.class))) ~= self.categoryList[categorySel] then + elseif ((item.label or item.category)..(item.class ~= item.category and ": "..item.class:gsub("([a-z])([A-Z])", "%1 %2") or "")) ~= self.categoryList[categorySel] then return false end end From 6750f22edec0b85cb9e2c241631db89622670d30 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Tue, 4 Feb 2025 19:38:54 +1100 Subject: [PATCH 12/15] Fix trade to use proper classes --- src/Classes/TradeQueryGenerator.lua | 74 ++-- src/Data/QueryMods.lua | 556 +++++++++++++++------------- 2 files changed, 330 insertions(+), 300 deletions(-) diff --git a/src/Classes/TradeQueryGenerator.lua b/src/Classes/TradeQueryGenerator.lua index 65f39af644..b6f6993f27 100644 --- a/src/Classes/TradeQueryGenerator.lua +++ b/src/Classes/TradeQueryGenerator.lua @@ -22,11 +22,11 @@ local tradeClasses = { ["Quiver"] = { "Quiver" }, ["Shield"] = { "Shield" }, ["Focus"] = { "Focus" }, - ["1HWeapon"] = { "One Handed Mace", "Wand", "Sceptre" }, - ["2HWeapon"] = { "Staff", "Warstaff", "Two Handed Mace", "Crossbow", "Bow" }, - -- ["1HAxe"] = { "One Handed Axe" }, - -- ["1HSword"] = { "One Handed Sword" }, - ["1HMace"] = { "One Handed Mace" }, + ["1HWeapon"] = { "One Hand Mace", "Wand", "Sceptre" }, + ["2HWeapon"] = { "Staff", "Warstaff", "Two Hand Mace", "Crossbow", "Bow" }, + -- ["1HAxe"] = { "One Hand Axe" }, + -- ["1HSword"] = { "One Hand Sword" }, + ["1HMace"] = { "One Hand Mace" }, ["Sceptre"] = { "Sceptre" }, -- ["Dagger"] = { "Dagger" }, ["Wand"] = { "Wand" }, @@ -35,10 +35,10 @@ local tradeClasses = { ["Quarterstaff"] = { "Warstaff" }, ["Bow"] = { "Bow" }, ["Crossbow"] = { "Crossbow"}, - -- ["2HAxe"] = { "Two Handed Axe" }, - -- ["2HSword"] = { "Two Handed Sword" }, - ["2HMace"] = { "Two Handed Mace" }, - -- ["FishingRod"] = { "Fishing Rod" }, + -- ["2HAxe"] = { "Two Hand Axe" }, + -- ["2HSword"] = { "Two Hand Sword" }, + ["2HMace"] = { "Two Hand Mace" }, + -- ["FishingRod"] = { "FishingRod" }, ["BaseJewel"] = { "Jewel" }, ["AnyJewel"] = { "Jewel" }, ["LifeFlask"] = { "LifeFlask" }, @@ -53,29 +53,27 @@ local tradeClasses = { } -- Build lists of tags present on a given item class -local tradeCategoryTags = { } -for classList, bases in pairs(data.itemBaseLists) do - for _, base in ipairs(bases) do - if not base.hidden then - if not tradeCategoryTags[classList] then - tradeCategoryTags[classList] = { } +local tradeClassTags = { } +for _, base in pairs(data.itemBases) do + if not base.hidden then + if not tradeClassTags[base.class] then + tradeClassTags[base.class] = { } + end + local baseTags = { } + for tag, _ in pairs(base.tags) do + if tag ~= "default" and tag ~= "demigods" and not tag:match("_basetype") and tag ~= "not_for_sale" then -- filter fluff tags not used on mods. + baseTags[tag] = true end - local baseTags = { } - for tag, _ in pairs(base.base.tags) do - if tag ~= "default" and tag ~= "demigods" and not tag:match("_basetype") and tag ~= "not_for_sale" then -- filter fluff tags not used on mods. - baseTags[tag] = true - end - end - local present = false - for i, tags in ipairs(tradeCategoryTags[classList]) do - if tableDeepEquals(baseTags, tags) then - present = true - end - end - if not present then - t_insert(tradeCategoryTags[classList], baseTags) + end + local present = false + for i, tags in ipairs(tradeClassTags[base.class]) do + if tableDeepEquals(baseTags, tags) then + present = true end end + if not present then + t_insert(tradeClassTags[base.class], baseTags) + end end end @@ -116,7 +114,7 @@ end local function canModSpawnForItemCategory(mod, names) for _, name in pairs(tradeClasses[names]) do - for _, tags in ipairs(tradeCategoryTags[name]) do + for _, tags in ipairs(tradeClassTags[name]) do for i, key in ipairs(mod.weightKey) do if tags[key] then if mod.weightVal[i] > 0 then @@ -573,19 +571,19 @@ function TradeQueryGeneratorClass:StartQuery(slot, options) elseif existingItem.class == "Staff" then itemCategoryQueryStr = "weapon.staff" itemCategory = "Staff" - elseif existingItem.class == "Two Handed Sword" then + elseif existingItem.class == "Two Hand Sword" then itemCategoryQueryStr = "weapon.twosword" itemCategory = "2HSword" - elseif existingItem.class == "Two Handed Axe" then + elseif existingItem.class == "Two Hand Axe" then itemCategoryQueryStr = "weapon.twoaxe" itemCategory = "2HAxe" - elseif existingItem.class == "Two Handed Mace" then + elseif existingItem.class == "Two Hand Mace" then itemCategoryQueryStr = "weapon.twomace" itemCategory = "2HMace" elseif existingItem.class == "Fishing Rod" then itemCategoryQueryStr = "weapon.rod" itemCategory = "FishingRod" - elseif existingItem.class == "One Handed Sword" then + elseif existingItem.class == "One Hand Sword" then itemCategoryQueryStr = "weapon.onesword" itemCategory = "1HSword" elseif existingItem.class == "Spear" then -- not in game @@ -594,10 +592,10 @@ function TradeQueryGeneratorClass:StartQuery(slot, options) elseif existingItem.class == "Flail" then -- not in game itemCategoryQueryStr = "weapon.flail" itemCategory = "weapon.flail" - elseif existingItem.class == "One Handed Axe" then + elseif existingItem.class == "One Hand Axe" then itemCategoryQueryStr = "weapon.oneaxe" itemCategory = "1HAxe" - elseif existingItem.class == "One Handed Mace" then + elseif existingItem.class == "One Hand Mace" then itemCategoryQueryStr = "weapon.onemace" itemCategory = "1HMace" elseif existingItem.class == "Sceptre" then @@ -612,10 +610,10 @@ function TradeQueryGeneratorClass:StartQuery(slot, options) elseif existingItem.class == "Claw" then itemCategoryQueryStr = "weapon.claw" itemCategory = "Claw" - elseif existingItem.class:find("Two Handed") ~= nil then + elseif existingItem.class:find("Two Hand") ~= nil then itemCategoryQueryStr = "weapon.twomelee" itemCategory = "2HWeapon" - elseif existingItem.class:find("One Handed") ~= nil then + elseif existingItem.class:find("One Hand") ~= nil then itemCategoryQueryStr = "weapon.one" itemCategory = "1HWeapon" else diff --git a/src/Data/QueryMods.lua b/src/Data/QueryMods.lua index adfea7eab3..0a95f73c57 100644 --- a/src/Data/QueryMods.lua +++ b/src/Data/QueryMods.lua @@ -2269,11 +2269,11 @@ return { ["1068_IncreasedBlockChance"] = { ["AnyJewel"] = { ["max"] = 7, - ["min"] = 3, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 7, - ["min"] = 3, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2286,11 +2286,11 @@ return { ["1091_TotemDamageForJewel"] = { ["AnyJewel"] = { ["max"] = 18, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 18, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2303,11 +2303,11 @@ return { ["1095_AttackDamage"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2320,11 +2320,11 @@ return { ["1124_PhysicalDamagePercent"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2337,11 +2337,11 @@ return { ["1126_MeleeDamage"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2354,11 +2354,11 @@ return { ["1177_IncreasedStaffDamageForJewel"] = { ["AnyJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2371,11 +2371,11 @@ return { ["1188_IncreasedMaceDamageForJewel"] = { ["AnyJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2388,11 +2388,11 @@ return { ["1192_IncreasedBowDamageForJewel"] = { ["AnyJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2405,11 +2405,11 @@ return { ["1258_StaffAttackSpeedForJewel"] = { ["AnyJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2422,11 +2422,11 @@ return { ["1262_BowAttackSpeedForJewel"] = { ["AnyJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2439,11 +2439,11 @@ return { ["1270_IncreasedAccuracyPercent"] = { ["AnyJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2456,11 +2456,11 @@ return { ["1279_BowIncreasedAccuracyRating"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2473,11 +2473,11 @@ return { ["1372_EnergyShieldDelay"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -2560,11 +2560,11 @@ return { ["1465_IncreasedTotemLife"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2577,11 +2577,11 @@ return { ["1472_BaseCurseDuration"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2594,11 +2594,11 @@ return { ["1546_IncreasedChillDuration"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 6, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 6, }, ["specialCaseData"] = { }, @@ -2611,11 +2611,11 @@ return { ["1547_ShockDuration"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2628,11 +2628,11 @@ return { ["1564_AreaOfEffect"] = { ["AnyJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2645,11 +2645,11 @@ return { ["1579_SkillEffectDuration"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -2662,11 +2662,11 @@ return { ["1655_MinionDamage"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2679,11 +2679,11 @@ return { ["1660_ElementalDamagePercent"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2696,11 +2696,11 @@ return { ["1673_ShieldArmourIncrease"] = { ["AnyJewel"] = { ["max"] = 32, - ["min"] = 18, + ["min"] = 8, }, ["BaseJewel"] = { ["max"] = 32, - ["min"] = 18, + ["min"] = 8, }, ["specialCaseData"] = { }, @@ -2713,11 +2713,11 @@ return { ["1675_ProjectileDamage"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2730,11 +2730,11 @@ return { ["1681_KnockbackDistance"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -2756,11 +2756,11 @@ return { ["1730_GlobalFlaskLifeRecovery"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2773,11 +2773,11 @@ return { ["1731_FlaskManaRecovery"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2790,11 +2790,11 @@ return { ["1831_LifeLeechAmount"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2807,11 +2807,11 @@ return { ["1833_ManaLeechAmount"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2824,11 +2824,11 @@ return { ["1882_MarkCastSpeed"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2841,11 +2841,11 @@ return { ["1886_CurseAreaOfEffect"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 6, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 6, }, ["specialCaseData"] = { }, @@ -2858,11 +2858,11 @@ return { ["1954_MinionPhysicalDamageReduction"] = { ["AnyJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2875,11 +2875,11 @@ return { ["2250_SummonTotemCastSpeed"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2892,11 +2892,11 @@ return { ["2266_CurseEffectivenessForJewel"] = { ["AnyJewel"] = { ["max"] = 5, - ["min"] = 3, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 5, - ["min"] = 3, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2909,11 +2909,11 @@ return { ["2268_MarkEffect"] = { ["AnyJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -2924,6 +2924,14 @@ return { }, }, ["2362_DamageRemovedFromManaBeforeLife"] = { + ["AnyJewel"] = { + ["max"] = 1, + ["min"] = 1, + }, + ["BaseJewel"] = { + ["max"] = 1, + ["min"] = 1, + }, ["specialCaseData"] = { }, ["tradeMod"] = { @@ -2935,11 +2943,11 @@ return { ["2562_MinionElementalResistance"] = { ["AnyJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2953,11 +2961,11 @@ return { ["2563_MinionChaosResistance"] = { ["AnyJewel"] = { ["max"] = 13, - ["min"] = 7, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 13, - ["min"] = 7, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2971,11 +2979,11 @@ return { ["2627_FireResistancePenetration"] = { ["AnyJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -2988,11 +2996,11 @@ return { ["2628_ColdResistancePenetration"] = { ["AnyJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -3005,11 +3013,11 @@ return { ["2629_LightningResistancePenetration"] = { ["AnyJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -3022,11 +3030,11 @@ return { ["2668_MinionAreaOfEffect"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3039,11 +3047,11 @@ return { ["2805_PoisonDuration"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3065,11 +3073,11 @@ return { ["2808_BaseChanceToPoison"] = { ["AnyJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -3082,11 +3090,11 @@ return { ["2840_DamageVsRareOrUnique"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3099,11 +3107,11 @@ return { ["2901_IncreasedStunThreshold"] = { ["AnyJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -3116,11 +3124,11 @@ return { ["2902_FreezeThreshold"] = { ["AnyJewel"] = { ["max"] = 32, - ["min"] = 18, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 32, - ["min"] = 18, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3133,11 +3141,11 @@ return { ["2907_WarcrySpeed"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3150,11 +3158,11 @@ return { ["2954_WarcryCooldownSpeed"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3167,11 +3175,11 @@ return { ["3847_DamageIfConsumedCorpse"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3184,11 +3192,11 @@ return { ["3895_CrossbowDamage"] = { ["AnyJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3201,11 +3209,11 @@ return { ["3899_CrossbowSpeed"] = { ["AnyJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -3218,11 +3226,11 @@ return { ["4144_AilmentChance"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3235,11 +3243,11 @@ return { ["4145_AilmentEffect"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3252,11 +3260,11 @@ return { ["4150_IncreasedAilmentThreshold"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3269,11 +3277,11 @@ return { ["4254_ArmourBreak"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -3286,11 +3294,11 @@ return { ["4257_ArmourBreakDuration"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -3303,11 +3311,11 @@ return { ["4399_AttacksBlindOnHitChance"] = { ["AnyJewel"] = { ["max"] = 7, - ["min"] = 3, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 7, - ["min"] = 3, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -3320,11 +3328,11 @@ return { ["4454_BleedDuration"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3337,11 +3345,11 @@ return { ["4461_BaseChanceToBleed"] = { ["AnyJewel"] = { ["max"] = 7, - ["min"] = 3, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 7, - ["min"] = 3, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -3354,11 +3362,11 @@ return { ["4467_GlobalCooldownRecovery"] = { ["AnyJewel"] = { ["max"] = 5, - ["min"] = 3, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 5, - ["min"] = 3, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -3371,11 +3379,11 @@ return { ["4504_LifeCost"] = { ["AnyJewel"] = { ["max"] = 8, - ["min"] = 4, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 8, - ["min"] = 4, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3387,11 +3395,11 @@ return { }, ["4506_SlowPotency"] = { ["AnyJewel"] = { - ["max"] = -5, + ["max"] = -2, ["min"] = -10, }, ["BaseJewel"] = { - ["max"] = -5, + ["max"] = -2, ["min"] = -10, }, ["invertOnNegative"] = true, @@ -3406,11 +3414,11 @@ return { ["4555_BleedDotMultiplier"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3423,11 +3431,11 @@ return { ["4671_BlindEffect"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3440,11 +3448,11 @@ return { ["4989_ForkingProjectiles"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -3470,11 +3478,11 @@ return { ["5066_CharmChargesGained"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3534,11 +3542,11 @@ return { ["5324_DamagevsArmourBrokenEnemies"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3551,11 +3559,11 @@ return { ["5387_CharmDamageWhileUsing"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3568,11 +3576,11 @@ return { ["5392_HeraldDamage"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3585,11 +3593,11 @@ return { ["5426_DamagingAilmentDuration"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3619,11 +3627,11 @@ return { ["5436_DazeBuildup"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3636,11 +3644,11 @@ return { ["5456_DebuffTimePassed"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3653,11 +3661,11 @@ return { ["5647_ExertedAttackDamage"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3670,11 +3678,11 @@ return { ["5708_EnergyGeneration"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3687,11 +3695,11 @@ return { ["5718_FocusEnergyShield"] = { ["AnyJewel"] = { ["max"] = 50, - ["min"] = 30, + ["min"] = 15, }, ["BaseJewel"] = { ["max"] = 50, - ["min"] = 30, + ["min"] = 15, }, ["specialCaseData"] = { }, @@ -3717,11 +3725,11 @@ return { ["5904_IncreasedFlaskChargesGained"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3768,11 +3776,11 @@ return { ["6379_PinBuildup"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -3785,11 +3793,11 @@ return { ["6432_IgniteEffect"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3802,11 +3810,11 @@ return { ["6433_ElementalAilmentDuration"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3819,11 +3827,11 @@ return { ["6561_LifeFlaskChargePercentGeneration"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -3855,6 +3863,14 @@ return { }, }, ["6817_JewelRadiusLargerRadius"] = { + ["AnyJewel"] = { + ["max"] = 1, + ["min"] = 1, + }, + ["BaseJewel"] = { + ["max"] = 1, + ["min"] = 1, + }, ["specialCaseData"] = { }, ["tradeMod"] = { @@ -3864,6 +3880,14 @@ return { }, }, ["6840_JewelRadiusSmallNodeEffect"] = { + ["AnyJewel"] = { + ["max"] = 30, + ["min"] = 15, + }, + ["BaseJewel"] = { + ["max"] = 30, + ["min"] = 15, + }, ["specialCaseData"] = { }, ["tradeMod"] = { @@ -3875,11 +3899,11 @@ return { ["6991_MaceStun"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 6, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 6, }, ["specialCaseData"] = { }, @@ -3892,11 +3916,11 @@ return { ["7018_ManaFlaskChargePercentGeneration"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -3909,11 +3933,11 @@ return { ["7720_MarkDuration"] = { ["AnyJewel"] = { ["max"] = 32, - ["min"] = 18, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 32, - ["min"] = 18, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -3926,11 +3950,11 @@ return { ["7857_MinionAccuracyRatingForJewel"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -3943,11 +3967,11 @@ return { ["7861_MinionAttackSpeedAndCastSpeed"] = { ["AnyJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -3960,11 +3984,11 @@ return { ["7878_MinionCriticalStrikeChanceIncrease"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -3977,11 +4001,11 @@ return { ["7880_MinionCriticalStrikeMultiplier"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 6, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 6, }, ["specialCaseData"] = { }, @@ -3992,6 +4016,14 @@ return { }, }, ["7925_MinionReviveSpeed"] = { + ["AnyJewel"] = { + ["max"] = 7, + ["min"] = 3, + }, + ["BaseJewel"] = { + ["max"] = 7, + ["min"] = 3, + }, ["specialCaseData"] = { }, ["tradeMod"] = { @@ -4003,11 +4035,11 @@ return { ["8123_OfferingDuration"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 6, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 6, }, ["specialCaseData"] = { }, @@ -4020,11 +4052,11 @@ return { ["8124_OfferingLife"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -4111,11 +4143,11 @@ return { ["8230_PoisonEffect"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -4276,11 +4308,11 @@ return { ["8273_ChainFromTerrain"] = { ["AnyJewel"] = { ["max"] = 7, - ["min"] = 3, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 7, - ["min"] = 3, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -4428,11 +4460,11 @@ return { ["8316_QuarterstaffFreezeBuildup"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -4458,11 +4490,11 @@ return { ["8324_QuiverModifierEffect"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -5431,11 +5463,11 @@ return { ["8436_CrossbowReloadSpeed"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -5616,11 +5648,11 @@ return { ["8515_ShockEffect"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -5679,11 +5711,11 @@ return { }, ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["Focus"] = { ["max"] = 119, @@ -5733,11 +5765,11 @@ return { ["856_FireDamagePercentage"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["Ring"] = { ["max"] = 30, @@ -5783,11 +5815,11 @@ return { ["857_ColdDamagePercentage"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["Ring"] = { ["max"] = 30, @@ -5833,11 +5865,11 @@ return { ["858_LightningDamagePercentage"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["Ring"] = { ["max"] = 30, @@ -5912,11 +5944,11 @@ return { ["859_IncreasedChaosDamage"] = { ["AnyJewel"] = { ["max"] = 12, - ["min"] = 6, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 12, - ["min"] = 6, + ["min"] = 1, }, ["Ring"] = { ["max"] = 30, @@ -6083,11 +6115,11 @@ return { }, ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -6118,11 +6150,11 @@ return { }, ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -6153,11 +6185,11 @@ return { }, ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -6588,11 +6620,11 @@ return { ["8775_StunThresholdfromEnergyShield"] = { ["AnyJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -6605,11 +6637,11 @@ return { ["8777_IncreasedStunThresholdIfNoRecentStun"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -6622,11 +6654,11 @@ return { ["877_ProjectileSpeed"] = { ["AnyJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 10, - ["min"] = 5, + ["min"] = 2, }, ["Quiver"] = { ["max"] = 46, @@ -6682,11 +6714,11 @@ return { ["880_CharmDuration"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -6699,11 +6731,11 @@ return { ["881_FlaskDuration"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -6801,11 +6833,11 @@ return { ["8883_ThornsDamageIncrease"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -6943,11 +6975,11 @@ return { ["8944_DamageWithTriggeredSpells"] = { ["AnyJewel"] = { ["max"] = 18, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 18, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -7163,11 +7195,11 @@ return { ["9081_WarcryEffect"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -7180,11 +7212,11 @@ return { ["9084_WarcryDamage"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -7214,11 +7246,11 @@ return { ["9093_WeaponSwapSpeed"] = { ["AnyJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 25, - ["min"] = 15, + ["min"] = 2, }, ["specialCaseData"] = { }, @@ -7257,11 +7289,11 @@ return { ["9112_WitheredEffect"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -7827,11 +7859,11 @@ return { }, ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["Helmet"] = { ["max"] = 34, @@ -7848,11 +7880,11 @@ return { ["926_AttackCriticalStrikeChance"] = { ["AnyJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 16, - ["min"] = 6, + ["min"] = 3, }, ["Quiver"] = { ["max"] = 38, @@ -7877,11 +7909,11 @@ return { }, ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["Focus"] = { ["max"] = 99, @@ -7910,11 +7942,11 @@ return { }, ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["Gloves"] = { ["max"] = 34, @@ -7931,11 +7963,11 @@ return { ["930_AttackCriticalStrikeMultiplier"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["Quiver"] = { ["max"] = 39, @@ -7952,11 +7984,11 @@ return { ["931_SpellCritMultiplierForJewel"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -7998,11 +8030,11 @@ return { ["933_IncreasedAttackSpeed"] = { ["AnyJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["Gloves"] = { ["max"] = 16, @@ -8035,11 +8067,11 @@ return { }, ["AnyJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["Focus"] = { ["max"] = 32, @@ -8656,11 +8688,11 @@ return { }, ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["Sceptre"] = { ["max"] = 50, @@ -8677,11 +8709,11 @@ return { ["956_EnergyShieldRegeneration"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["Focus"] = { ["max"] = 50, @@ -8731,11 +8763,11 @@ return { ["958_LifeRegenerationRate"] = { ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 3, }, ["specialCaseData"] = { }, @@ -8761,11 +8793,11 @@ return { ["959_LifeRecoupForJewel"] = { ["AnyJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 4, - ["min"] = 2, + ["min"] = 1, }, ["specialCaseData"] = { }, @@ -8984,11 +9016,11 @@ return { }, ["AnyJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["BaseJewel"] = { ["max"] = 15, - ["min"] = 5, + ["min"] = 1, }, ["Focus"] = { ["max"] = 69, @@ -9158,11 +9190,11 @@ return { ["973_StunDamageIncrease"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["specialCaseData"] = { }, @@ -9241,11 +9273,11 @@ return { }, ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["Staff"] = { ["max"] = 100, @@ -9274,11 +9306,11 @@ return { }, ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["Staff"] = { ["max"] = 80, @@ -9307,11 +9339,11 @@ return { }, ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 2, }, ["Staff"] = { ["max"] = 100, @@ -9538,11 +9570,11 @@ return { ["991_ChanceToPierce"] = { ["AnyJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["BaseJewel"] = { ["max"] = 20, - ["min"] = 10, + ["min"] = 5, }, ["Quiver"] = { ["max"] = 26, From 03f36be6356b89429021328f2cc5efa2d05628b4 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Tue, 4 Feb 2025 20:10:57 +1100 Subject: [PATCH 13/15] Add displayName override for cloaked mail --- src/Data/Bases/body.lua | 6 +++--- src/Export/Bases/body.txt | 5 ++++- src/Export/Scripts/bases.lua | 8 ++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Data/Bases/body.lua b/src/Data/Bases/body.lua index f3f43c764c..c4046e0a8e 100644 --- a/src/Data/Bases/body.lua +++ b/src/Data/Bases/body.lua @@ -1643,7 +1643,7 @@ itemBases["Expert Rogue Armour"] = { type = "Armour/Evasion", req = { level = 65, str = 86, dex = 86, }, } -itemBases["Expert Cloaked Mail"] = { +itemBases["Expert Cloaked Mail (Fire Resistance)"] = { class = "Body Armour", category = "Body Armour", label = "Body Armour", @@ -1656,7 +1656,7 @@ itemBases["Expert Cloaked Mail"] = { type = "Armour/Evasion", req = { level = 70, str = 86, dex = 86, }, } -itemBases["Expert Cloaked Mail"] = { +itemBases["Expert Cloaked Mail (Cold Resistance)"] = { class = "Body Armour", category = "Body Armour", label = "Body Armour", @@ -1669,7 +1669,7 @@ itemBases["Expert Cloaked Mail"] = { type = "Armour/Evasion", req = { level = 70, str = 86, dex = 86, }, } -itemBases["Expert Cloaked Mail"] = { +itemBases["Expert Cloaked Mail (Lightning Resistance)"] = { class = "Body Armour", category = "Body Armour", label = "Body Armour", diff --git a/src/Export/Bases/body.txt b/src/Export/Bases/body.txt index c6186a5b8e..30df7893a8 100644 --- a/src/Export/Bases/body.txt +++ b/src/Export/Bases/body.txt @@ -3,5 +3,8 @@ local itemBases = ... #label Body Armour #socketLimit 3 +#displayName Metadata/Items/Armours/BodyArmours/FourBodyStrDex4aEndgame Expert Cloaked Mail (Fire Resistance) +#displayName Metadata/Items/Armours/BodyArmours/FourBodyStrDex4bEndgame Expert Cloaked Mail (Cold Resistance) +#displayName Metadata/Items/Armours/BodyArmours/FourBodyStrDex4cEndgame Expert Cloaked Mail (Lightning Resistance) #baseMatch BaseType Metadata/Items/Armours/BodyArmours/AbstractBodyArmour -#baseMatch BaseType Metadata/Items/Armours/BodyArmours/BodyArmourDemigods +#baseMatch BaseType Metadata/Items/Armours/BodyArmours/BodyArmourDemigods \ No newline at end of file diff --git a/src/Export/Scripts/bases.lua b/src/Export/Scripts/bases.lua index 1e55c9511a..7daa3e01ed 100644 --- a/src/Export/Scripts/bases.lua +++ b/src/Export/Scripts/bases.lua @@ -37,6 +37,11 @@ directiveTable.label = function(state, args, out) state.label = args end +directiveTable.displayName = function(state, args, out) + if not state.displayNameOverride then state.displayNameOverride = { } end + local baseTypeId, displayName = args:match("([%w/_]+) (.+)") + state.displayNameOverride[baseTypeId] = displayName +end directiveTable.forceHide = function(state, args, out) state.forceHide = (args == "true") end @@ -109,6 +114,9 @@ directiveTable.base = function(state, args, out) if not displayName then displayName = baseItemType.Name end + if state.displayNameOverride and state.displayNameOverride[baseTypeId] then + displayName = state.displayNameOverride[baseTypeId] + end displayName = displayName:gsub("\195\182","o") displayName = displayName:gsub("^%s*(.-)%s*$", "%1") -- trim spaces GGG might leave in by accident displayName = displayName ~= "Energy Blade" and displayName or (category == "One Handed Sword" and "Energy Blade One Handed" or "Energy Blade Two Handed") From 3465473c1eac46d998d6aa064c25621d84f72cc5 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Tue, 4 Feb 2025 23:58:59 +1100 Subject: [PATCH 14/15] Fixup some other couple issues related to mistyped item classes --- src/Classes/TradeQueryGenerator.lua | 2 +- src/Modules/CalcActiveSkill.lua | 2 +- src/Modules/CalcSetup.lua | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Classes/TradeQueryGenerator.lua b/src/Classes/TradeQueryGenerator.lua index b6f6993f27..299bc28fdb 100644 --- a/src/Classes/TradeQueryGenerator.lua +++ b/src/Classes/TradeQueryGenerator.lua @@ -591,7 +591,7 @@ function TradeQueryGeneratorClass:StartQuery(slot, options) itemCategory = "1HSword" elseif existingItem.class == "Flail" then -- not in game itemCategoryQueryStr = "weapon.flail" - itemCategory = "weapon.flail" + itemCategory = "Flail" elseif existingItem.class == "One Hand Axe" then itemCategoryQueryStr = "weapon.oneaxe" itemCategory = "1HAxe" diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua index 1841e9f90d..b5495b40e1 100644 --- a/src/Modules/CalcActiveSkill.lua +++ b/src/Modules/CalcActiveSkill.lua @@ -205,7 +205,7 @@ local function getWeaponFlags(env, weaponData, weaponClasses) if weaponClasses then for _, classes in ipairs(weaponClasses) do if not classes[weaponData.class] and - (not weaponData.countsAsAll1H or not (classes["Claw"] or classes["Dagger"] or classes["One Handed Axe"] or classes["One Handed Mace"] or classes["One Handed Sword"] + (not weaponData.countsAsAll1H or not (classes["Claw"] or classes["Dagger"] or classes["One Hand Axe"] or classes["One Hand Mace"] or classes["One Hand Sword"] or classes["Spear"])) then return nil, info end diff --git a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua index 4cc904ab04..05a84c2900 100644 --- a/src/Modules/CalcSetup.lua +++ b/src/Modules/CalcSetup.lua @@ -719,7 +719,7 @@ function calcs.initEnv(build, mode, override, specEnv) if slotName == override.repSlotName then item = override.repItem elseif override.repItem and override.repSlotName:match("^Weapon 1") and slotName:match("^Weapon 2") and - (override.repItem.base.category == "Staff" or override.repItem.base.category == "Two Handed Sword" or override.repItem.base.category == "Two Handed Axe" or override.repItem.base.category == "Two Handed Mace" + (override.repItem.base.category == "Warstaff" or override.repItem.base.category == "Two Hand Sword" or override.repItem.base.category == "Two Hand Axe" or override.repItem.base.category == "Two Hand Mace" or (override.repItem.base.category == "Bow" and item and item.base.category ~= "Quiver")) then goto continue elseif slot.nodeId and override.spec then @@ -1119,7 +1119,7 @@ function calcs.initEnv(build, mode, override, specEnv) env.itemModDB.multipliers["NonCorruptedItem"] = (env.itemModDB.multipliers["NonCorruptedItem"] or 0) + 1 end - env.itemModDB.multipliers[item.class:gsub(" ", ""):gsub(".+Handed", "").."Item"] = (env.itemModDB.multipliers[item.class:gsub(" ", ""):gsub(".+Handed", "").."Item"] or 0) + 1 + env.itemModDB.multipliers[item.class:gsub(" ", ""):gsub(".+Hand", "").."Item"] = (env.itemModDB.multipliers[item.class:gsub(" ", ""):gsub(".+Hand", "").."Item"] or 0) + 1 end end end From d0246b8d9cb61631722e2525ddf048c16794f731 Mon Sep 17 00:00:00 2001 From: Thomas <31533893+QuickStick123@users.noreply.github.com> Date: Wed, 5 Feb 2025 00:08:52 +1100 Subject: [PATCH 15/15] Use order from GGPK this makes it more consistant as order isn't determined by the tables hash map. --- src/Data/Skills/act_dex.lua | 49 +++++++++++++++++------------------ src/Data/Skills/act_int.lua | 16 ++++++------ src/Data/Skills/act_str.lua | 46 ++++++++++++++++---------------- src/Data/Skills/minion.lua | 8 +++--- src/Data/Skills/sup_dex.lua | 16 ++++++------ src/Export/Scripts/skills.lua | 8 +++--- 6 files changed, 71 insertions(+), 72 deletions(-) diff --git a/src/Data/Skills/act_dex.lua b/src/Data/Skills/act_dex.lua index 0d18ab8c17..67f4818fd6 100644 --- a/src/Data/Skills/act_dex.lua +++ b/src/Data/Skills/act_dex.lua @@ -1349,19 +1349,19 @@ skills["HeraldOfThunderPlayer"] = { description = "While active, killing Shocked enemies with Attack damage, will cause subsequent Attack hits to release lightning bolts which deals Attack damage to all surrounding enemies.", skillTypes = { [SkillType.Buff] = true, [SkillType.HasReservation] = true, [SkillType.Area] = true, [SkillType.Lightning] = true, [SkillType.Herald] = true, [SkillType.Attack] = true, [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, }, weaponClasses = { - ["One Hand Mace"] = true, + ["One Hand Sword"] = true, ["Two Hand Sword"] = true, - ["Flail"] = true, + ["One Hand Axe"] = true, + ["Two Hand Axe"] = true, + ["One Hand Mace"] = true, ["Two Hand Mace"] = true, - ["Dagger"] = true, + ["Warstaff"] = true, ["Claw"] = true, - ["Two Hand Axe"] = true, - ["Crossbow"] = true, - ["One Hand Axe"] = true, + ["Dagger"] = true, ["Spear"] = true, ["Bow"] = true, - ["One Hand Sword"] = true, - ["Warstaff"] = true, + ["Flail"] = true, + ["Crossbow"] = true, }, castTime = 0, qualityStats = { @@ -1474,7 +1474,6 @@ skills["HeraldOfThunderPlayer"] = { statDescriptionScope = "herald_of_thunder_statset_1", baseFlags = { attack = true, - hit = true, }, constantStats = { { "active_skill_base_physical_damage_%_to_convert_to_lightning", 100 }, @@ -4518,19 +4517,19 @@ skills["WindDancerPlayer"] = { description = "Grants a buff that gives you more Evasion per stage. Being Hit by a Melee Attack while you have this buff consumes all stages to damage and Knock Back enemies around you.", skillTypes = { [SkillType.Buff] = true, [SkillType.HasReservation] = true, [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, }, weaponClasses = { - ["One Hand Mace"] = true, + ["One Hand Sword"] = true, ["Two Hand Sword"] = true, - ["Flail"] = true, + ["One Hand Axe"] = true, + ["Two Hand Axe"] = true, + ["One Hand Mace"] = true, ["Two Hand Mace"] = true, - ["Dagger"] = true, + ["Warstaff"] = true, ["Claw"] = true, - ["Two Hand Axe"] = true, - ["Crossbow"] = true, - ["One Hand Axe"] = true, + ["Dagger"] = true, ["Spear"] = true, ["Bow"] = true, - ["One Hand Sword"] = true, - ["Warstaff"] = true, + ["Flail"] = true, + ["Crossbow"] = true, }, castTime = 1, qualityStats = { @@ -4651,19 +4650,19 @@ skills["TriggeredWindDancerPlayer"] = { hidden = true, skillTypes = { [SkillType.Attack] = true, [SkillType.Triggered] = true, [SkillType.Triggerable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, }, weaponClasses = { - ["One Hand Mace"] = true, + ["One Hand Sword"] = true, ["Two Hand Sword"] = true, - ["Flail"] = true, + ["One Hand Axe"] = true, + ["Two Hand Axe"] = true, + ["One Hand Mace"] = true, ["Two Hand Mace"] = true, - ["Dagger"] = true, + ["Warstaff"] = true, ["Claw"] = true, - ["Two Hand Axe"] = true, - ["Crossbow"] = true, - ["One Hand Axe"] = true, + ["Dagger"] = true, ["Spear"] = true, ["Bow"] = true, - ["One Hand Sword"] = true, - ["Warstaff"] = true, + ["Flail"] = true, + ["Crossbow"] = true, }, castTime = 1, qualityStats = { diff --git a/src/Data/Skills/act_int.lua b/src/Data/Skills/act_int.lua index 569cc3f62f..7586f05b58 100644 --- a/src/Data/Skills/act_int.lua +++ b/src/Data/Skills/act_int.lua @@ -9568,19 +9568,19 @@ skills["HeraldOfIcePlayer"] = { description = "While active, Shattering an enemy with an Attack Hit will cause an icy explosion that deals Attack damage to surrounding enemies.", skillTypes = { [SkillType.Buff] = true, [SkillType.HasReservation] = true, [SkillType.Area] = true, [SkillType.Cold] = true, [SkillType.Attack] = true, [SkillType.Herald] = true, [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, }, weaponClasses = { - ["One Hand Mace"] = true, + ["One Hand Sword"] = true, ["Two Hand Sword"] = true, - ["Flail"] = true, + ["One Hand Axe"] = true, + ["Two Hand Axe"] = true, + ["One Hand Mace"] = true, ["Two Hand Mace"] = true, - ["Dagger"] = true, + ["Warstaff"] = true, ["Claw"] = true, - ["Two Hand Axe"] = true, - ["Crossbow"] = true, - ["One Hand Axe"] = true, + ["Dagger"] = true, ["Spear"] = true, ["Bow"] = true, - ["One Hand Sword"] = true, - ["Warstaff"] = true, + ["Flail"] = true, + ["Crossbow"] = true, }, castTime = 0, qualityStats = { diff --git a/src/Data/Skills/act_str.lua b/src/Data/Skills/act_str.lua index be1b44a128..0afb85d940 100644 --- a/src/Data/Skills/act_str.lua +++ b/src/Data/Skills/act_str.lua @@ -256,8 +256,8 @@ skills["ArmourBreakerPlayer"] = { description = "Attack with a forceful blow, knocking enemies back and weakening their Armour.", skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, [SkillType.Physical] = true, }, weaponClasses = { - ["One Hand Mace"] = true, ["Two Hand Mace"] = true, + ["One Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -2209,8 +2209,8 @@ skills["EarthquakePlayer"] = { description = "Smashes the ground, dealing damage in an area and leaving behind Jagged Ground that slows enemies. The Jagged Ground erupts in a powerful Aftershock after a duration. Cannot create Jagged Ground on top of an existing patch, or if you already have the maximum number of active patches.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Multistrikeable] = true, [SkillType.Duration] = true, [SkillType.Slam] = true, [SkillType.Triggerable] = true, [SkillType.Totemable] = true, [SkillType.CreatesGroundEffect] = true, }, weaponClasses = { - ["One Hand Mace"] = true, ["Two Hand Mace"] = true, + ["One Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -2424,8 +2424,8 @@ skills["EarthshatterPlayer"] = { description = "Slam the ground, sending out a fissure that deals area damage to enemies it passes under and thrusts a spike from the ground when it ends. Warcries performed near the spike will cause it to shatter, damaging surrounding enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.Multistrikeable] = true, [SkillType.Duration] = true, [SkillType.Totemable] = true, [SkillType.SupportedByFountains] = true, [SkillType.CreatesFissure] = true, }, weaponClasses = { - ["One Hand Mace"] = true, ["Two Hand Mace"] = true, + ["One Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -3547,19 +3547,19 @@ skills["HeraldOfAshPlayer"] = { description = "While active, enemies you sufficiently Overkill with attacks will cause an explosion that Ignites nearby enemies based on the Overkill damage dealt.", skillTypes = { [SkillType.Buff] = true, [SkillType.HasReservation] = true, [SkillType.CausesBurning] = true, [SkillType.Area] = true, [SkillType.DamageOverTime] = true, [SkillType.Fire] = true, [SkillType.Herald] = true, [SkillType.Duration] = true, [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, }, weaponClasses = { - ["One Hand Mace"] = true, + ["One Hand Sword"] = true, ["Two Hand Sword"] = true, - ["Flail"] = true, + ["One Hand Axe"] = true, + ["Two Hand Axe"] = true, + ["One Hand Mace"] = true, ["Two Hand Mace"] = true, - ["Dagger"] = true, + ["Warstaff"] = true, ["Claw"] = true, - ["Two Hand Axe"] = true, - ["Crossbow"] = true, - ["One Hand Axe"] = true, + ["Dagger"] = true, ["Spear"] = true, ["Bow"] = true, - ["One Hand Sword"] = true, - ["Warstaff"] = true, + ["Flail"] = true, + ["Crossbow"] = true, }, castTime = 0, qualityStats = { @@ -3980,8 +3980,8 @@ skills["LeapSlamPlayer"] = { description = "Jump into the air, damaging and Knocking Back enemies with your mace where you land. Enemies you would land on are\npushed out of the way.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, [SkillType.Travel] = true, [SkillType.Jumping] = true, [SkillType.ConsumesFullyBrokenArmour] = true, }, weaponClasses = { - ["One Hand Mace"] = true, ["Two Hand Mace"] = true, + ["One Hand Mace"] = true, }, castTime = 1.4, qualityStats = { @@ -9004,8 +9004,8 @@ skills["MoltenBlastPlayer"] = { description = "Gouges molten rock from the ground and flings it at the target. The Projectile explodes on collision, damaging enemies and scattering shrapnel in a cone behind it.", skillTypes = { [SkillType.Attack] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Triggerable] = true, [SkillType.Fire] = true, }, weaponClasses = { - ["One Hand Mace"] = true, ["Two Hand Mace"] = true, + ["One Hand Mace"] = true, }, castTime = 1, qualityStats = { @@ -11136,20 +11136,20 @@ skills["ShockwaveTotemPlayer"] = { description = "Raises a Totem that Slams the ground around it, repeatedly damaging nearby enemies. Jagged Ground erupts when hit by this Slam, damaging enemies standing on it.", skillTypes = { [SkillType.SummonsTotem] = true, [SkillType.SummonsAttackTotem] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Limit] = true, [SkillType.Duration] = true, }, weaponClasses = { - ["One Hand Mace"] = true, + ["One Hand Sword"] = true, ["Two Hand Sword"] = true, - ["Flail"] = true, + ["One Hand Axe"] = true, + ["Two Hand Axe"] = true, + ["One Hand Mace"] = true, ["Two Hand Mace"] = true, - ["Dagger"] = true, + ["Warstaff"] = true, ["Claw"] = true, - ["Two Hand Axe"] = true, - ["Unarmed"] = true, - ["Crossbow"] = true, - ["One Hand Axe"] = true, + ["Dagger"] = true, ["Spear"] = true, ["Bow"] = true, - ["One Hand Sword"] = true, - ["Warstaff"] = true, + ["Flail"] = true, + ["Crossbow"] = true, + ["Unarmed"] = true, }, skillTotemId = 5, castTime = 0.6, @@ -11722,8 +11722,8 @@ skills["SunderPlayer"] = { description = "Slams the ground, creating a roiling fissure that damages enemies in a sequence of areas in front of you. A number of enemies hit by the wave will release a shockwave, damaging other enemies.", skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Slam] = true, [SkillType.Totemable] = true, [SkillType.ConsumesFullyBrokenArmour] = true, [SkillType.CreatesFissure] = true, }, weaponClasses = { - ["One Hand Mace"] = true, ["Two Hand Mace"] = true, + ["One Hand Mace"] = true, }, castTime = 1, qualityStats = { diff --git a/src/Data/Skills/minion.lua b/src/Data/Skills/minion.lua index e1b8fb84d0..836b5ca76a 100644 --- a/src/Data/Skills/minion.lua +++ b/src/Data/Skills/minion.lua @@ -829,13 +829,13 @@ skills["TCAncestralLeagueKaruiHulk"] = { description = "Charges at an enemy, bashing it with the character's shield and striking it. This knocks it back and stuns it. Enemies in the way are pushed to the side. Damage and stun are proportional to distance travelled. Cannot be supported by Multistrike.", skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, }, weaponClasses = { - ["One Hand Mace"] = true, - ["Unarmed"] = true, - ["One Hand Axe"] = true, - ["Sceptre"] = true, ["Claw"] = true, ["Dagger"] = true, ["One Hand Sword"] = true, + ["One Hand Axe"] = true, + ["One Hand Mace"] = true, + ["Sceptre"] = true, + ["Unarmed"] = true, }, castTime = 1, qualityStats = { diff --git a/src/Data/Skills/sup_dex.lua b/src/Data/Skills/sup_dex.lua index 2de61de5b2..c694747990 100644 --- a/src/Data/Skills/sup_dex.lua +++ b/src/Data/Skills/sup_dex.lua @@ -312,18 +312,18 @@ skills["SupportComboFinisherPlayer"] = { excludeSkillTypes = { SkillType.Cooldown, SkillType.Herald, SkillType.Triggered, SkillType.InbuiltTrigger, SkillType.SummonsTotem, SkillType.UsedByTotem, SkillType.Trapped, SkillType.RemoteMined, SkillType.Spell, SkillType.Warcry, SkillType.ComboStacking, SkillType.SupportedByComboFinisher, SkillType.NOT, SkillType.AND, }, ignoreMinionTypes = true, weaponClasses = { - ["One Hand Mace"] = true, + ["Warstaff"] = true, + ["One Hand Sword"] = true, ["Two Hand Sword"] = true, - ["Flail"] = true, + ["One Hand Axe"] = true, + ["Two Hand Axe"] = true, + ["One Hand Mace"] = true, ["Two Hand Mace"] = true, + ["Flail"] = true, ["Unarmed"] = true, - ["One Hand Sword"] = true, - ["Two Hand Axe"] = true, - ["One Hand Axe"] = true, - ["Spear"] = true, - ["Dagger"] = true, ["Claw"] = true, - ["Warstaff"] = true, + ["Dagger"] = true, + ["Spear"] = true, }, levels = { [1] = { levelRequirement = 0, }, diff --git a/src/Export/Scripts/skills.lua b/src/Export/Scripts/skills.lua index 9a52483bc0..41d6b0f981 100644 --- a/src/Export/Scripts/skills.lua +++ b/src/Export/Scripts/skills.lua @@ -475,11 +475,11 @@ directiveTable.skill = function(state, args, out) end local weaponClasses = { } for _, class in ipairs(granted.WeaponRestrictions) do - weaponClasses[class.Id] = true + table.insert(weaponClasses, class.Id) end if next(weaponClasses) then out:write('\tweaponClasses = {\n') - for type in pairs(weaponClasses) do + for _, type in ipairs(weaponClasses) do out:write('\t\t["', type, '"] = true,\n') end out:write('\t},\n') @@ -507,11 +507,11 @@ directiveTable.skill = function(state, args, out) end local weaponClasses = { } for _, class in ipairs(granted.ActiveSkill.WeaponRestrictions) do - weaponClasses[class.Id] = true + table.insert(weaponClasses, class.Id) end if next(weaponClasses) then out:write('\tweaponClasses = {\n') - for type in pairs(weaponClasses) do + for _, type in ipairs(weaponClasses) do out:write('\t\t["', type, '"] = true,\n') end out:write('\t},\n')