Add new bases and clean up base matching (#2615)

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

src/Data/Bases/amulet.lua

@@ -94,6 +94,13 @@ itemBases["Marble Amulet"] = {
 	implicitModTypes = { { "resource", "life" }, },
 	req = { level = 74, },
 }
+itemBases["Seaglass Amulet"] = {
+	type = "Amulet",
+	tags = { not_for_sale = true, atlas_base_type = true, amuletatlas3 = true, amulet = true, default = true, },
+	implicit = "(10-15)% faster start of Energy Shield Recharge",
+	implicitModTypes = { { "energy_shield", "defences" }, },
+	req = { level = 74, },
+}
 itemBases["Astrolabe Amulet"] = {
 	type = "Amulet",
 	tags = { not_for_sale = true, default = true, amulet = true, },

src/Data/Bases/boots.lua

@@ -586,6 +586,16 @@ itemBases["Murder Boots"] = {
 	armour = { EvasionBase = 185, EnergyShieldBase = 17, },
 	req = { level = 69, dex = 82, int = 42, },
 }
+itemBases["Blessed Boots"] = {
+	type = "Boots",
+	subType = "Evasion/Energy Shield",
+	socketLimit = 4,
+	tags = { boots = true, bootsatlasdexint = true, not_for_sale = true, atlas_base_type = true, armour = true, dex_int_armour = true, default = true, },
+	implicit = "+(7-13)% to Chaos Resistance",
+	implicitModTypes = { { "chaos", "resistance" }, },
+	armour = { EvasionBase = 112, EnergyShieldBase = 31, },
+	req = { level = 70, dex = 56, int = 76, },
+}
 itemBases["Two-Toned Boots (Evasion/Energy Shield)"] = {
 	type = "Boots",
 	subType = "Evasion/Energy Shield",

src/Data/Bases/gloves.lua

@@ -514,6 +514,16 @@ itemBases["Crusader Gloves"] = {
 	armour = { ArmourBase = 121, EnergyShieldBase = 24, },
 	req = { level = 66, str = 51, int = 51, },
 }
+itemBases["Apothecary's Gloves"] = {
+	type = "Gloves",
+	subType = "Armour/Energy Shield",
+	socketLimit = 4,
+	tags = { gloves = true, str_int_armour = true, not_for_sale = true, atlas_base_type = true, armour = true, glovesatlasstrint = true, default = true, },
+	implicit = "(14-18)% increased Damage over Time",
+	implicitModTypes = { { "damage" }, },
+	armour = { ArmourBase = 108, EnergyShieldBase = 27, },
+	req = { level = 70, str = 46, int = 58, },
+}
 
 itemBases["Wrapped Mitts"] = {
 	type = "Gloves",

src/Data/Bases/quiver.lua

@@ -105,3 +105,10 @@ itemBases["Ornate Quiver"] = {
 	implicitModTypes = { {  }, },
 	req = { level = 45, },
 }
+itemBases["Artillery Quiver"] = {
+	type = "Quiver",
+	tags = { not_for_sale = true, atlas_base_type = true, quiveratlas1 = true, quiver = true, default = true, },
+	implicit = "(20-30)% increased Totem Placement speed",
+	implicitModTypes = { { "speed" }, },
+	req = { level = 74, },
+}

src/Data/Bases/ring.lua

@@ -110,6 +110,41 @@ itemBases["Unset Ring"] = {
 	implicitModTypes = { {  }, },
 	req = { level = 5, },
 }
+itemBases["Steel Ring"] = {
+	type = "Ring",
+	tags = { not_for_sale = true, ring = true, ringatlas1 = true, atlas_base_type = true, default = true, },
+	implicit = "Adds (3-4) to (10-14) Physical Damage to Attacks",
+	implicitModTypes = { { "physical_damage", "damage", "physical", "attack" }, },
+	req = { level = 80, },
+}
+itemBases["Opal Ring"] = {
+	type = "Ring",
+	tags = { not_for_sale = true, ring = true, ringatlas2 = true, atlas_base_type = true, default = true, },
+	implicit = "(15-25)% increased Elemental Damage",
+	implicitModTypes = { { "elemental_damage", "damage", "elemental" }, },
+	req = { level = 80, },
+}
+itemBases["Vermillion Ring"] = {
+	type = "Ring",
+	tags = { ringatlas3 = true, not_for_sale = true, ring = true, atlas_base_type = true, default = true, },
+	implicit = "(5-7)% increased maximum Life",
+	implicitModTypes = { { "resource", "life" }, },
+	req = { level = 80, },
+}
+itemBases["Cerulean Ring"] = {
+	type = "Ring",
+	tags = { not_for_sale = true, ring = true, atlas_base_type = true, ringatlas4 = true, default = true, },
+	implicit = "(8-10)% increased maximum Mana",
+	implicitModTypes = { { "resource", "mana" }, },
+	req = { level = 80, },
+}
+itemBases["Iolite Ring"] = {
+	type = "Ring",
+	tags = { not_for_sale = true, ring = true, ringatlas5 = true, atlas_base_type = true, default = true, },
+	implicit = "(17-23)% increased Chaos Damage",
+	implicitModTypes = { { "chaos_damage", "damage", "chaos" }, },
+	req = { level = 80, },
+}
 itemBases["Two-Stone Ring (Fire/Lightning)"] = {
 	type = "Ring",
 	tags = { ring = true, twostonering = true, default = true, },
@@ -145,34 +180,6 @@ itemBases["Geodesic Ring"] = {
 	implicitModTypes = { {  }, {  }, {  }, },
 	req = { level = 24, },
 }
-itemBases["Steel Ring"] = {
-	type = "Ring",
-	tags = { not_for_sale = true, ring = true, ringatlas1 = true, atlas_base_type = true, default = true, },
-	implicit = "Adds (3-4) to (10-14) Physical Damage to Attacks",
-	implicitModTypes = { { "physical_damage", "damage", "physical", "attack" }, },
-	req = { level = 80, },
-}
-itemBases["Opal Ring"] = {
-	type = "Ring",
-	tags = { not_for_sale = true, ring = true, ringatlas2 = true, atlas_base_type = true, default = true, },
-	implicit = "(15-25)% increased Elemental Damage",
-	implicitModTypes = { { "elemental_damage", "damage", "elemental" }, },
-	req = { level = 80, },
-}
-itemBases["Vermillion Ring"] = {
-	type = "Ring",
-	tags = { ringatlas3 = true, not_for_sale = true, ring = true, atlas_base_type = true, default = true, },
-	implicit = "(5-7)% increased maximum Life",
-	implicitModTypes = { { "resource", "life" }, },
-	req = { level = 80, },
-}
-itemBases["Cerulean Ring"] = {
-	type = "Ring",
-	tags = { not_for_sale = true, ring = true, atlas_base_type = true, ringatlas4 = true, default = true, },
-	implicit = "(8-10)% increased maximum Mana",
-	implicitModTypes = { { "resource", "mana" }, },
-	req = { level = 80, },
-}
 
 itemBases["Breach Ring"] = {
 	type = "Ring",

src/Export/Bases/amulet.txt

@@ -5,11 +5,9 @@ local itemBases = ...
 #baseTags amulet
 
 #baseMatch Metadata/Items/Amulets/Amulet%d+
-#base Metadata/Items/Amulet/AmuletAtlas1
-#base Metadata/Items/Amulet/AmuletAtlas2
+#baseMatch Metadata/Items/Amulet/AmuletAtlas%d+
 #forceShow true
-#base Metadata/Items/Amulets/AmuletE1
-#base Metadata/Items/Amulets/AmuletE2
+#baseMatch Metadata/Items/Amulets/AmuletE%d+
 #forceShow false
 #base Metadata/Items/Amulet/AmuletVictor1
 

src/Export/Bases/belt.txt

@@ -5,11 +5,9 @@ local itemBases = ...
 #baseTags belt
 #baseMatch Metadata/Items/Belts/Belt%d+
 #forceShow true
-#base Metadata/Items/Belts/BeltE1
-#base Metadata/Items/Belts/BeltE2
+#baseMatch Metadata/Items/Belts/BeltE%d+
 #forceShow false
-#base Metadata/Items/Belts/BeltAtlas1
-#base Metadata/Items/Belts/BeltAtlas2
+#baseMatch Metadata/Items/Belts/BeltAtlas%d+
 #base Metadata/Items/Belts/BeltAbyss
 
 #base Metadata/Items/Belts/BeltDemigods1

src/Export/Bases/boots.txt

@@ -31,6 +31,7 @@ local itemBases = ...
 
 #subType Evasion/Energy Shield
 #baseMatch Metadata/Items/Armours/Boots/BootsDexInt%d+
+#base Metadata/Items/Armours/Boots/BootsAtlas4
 #forceShow true
 #base Metadata/Items/Armours/Boots/BootsAtlas1 Two-Toned Boots (Evasion/Energy Shield)
 #forceShow false

src/Export/Bases/gloves.txt

@@ -25,6 +25,7 @@ local itemBases = ...
 
 #subType Armour/Energy Shield
 #baseMatch Metadata/Items/Armours/Gloves/GlovesStrInt%d+
+#base Metadata/Items/Armours/Gloves/GlovesAtlasStrInt
 
 #subType Evasion/Energy Shield
 #baseMatch Metadata/Items/Armours/Gloves/GlovesDexInt%d+

src/Export/Bases/quiver.txt

@@ -4,3 +4,4 @@ local itemBases = ...
 #type Quiver
 #baseTags quiver
 #baseMatch Metadata/Items/Quivers/Quiver%d+
+#baseMatch Metadata/Items/Quivers/QuiverAtlas%d+

src/Export/Bases/ring.txt

@@ -5,17 +5,13 @@ local itemBases = ...
 #baseTags ring
 
 #baseMatch Metadata/Items/Rings/Ring%d+
+#baseMatch Metadata/Items/Rings/RingAtlas%d+
 #forceShow true
 #base Metadata/Items/Rings/Ring12 Two-Stone Ring (Fire/Lightning)
 #base Metadata/Items/Rings/Ring13 Two-Stone Ring (Cold/Lightning)
 #base Metadata/Items/Rings/Ring14 Two-Stone Ring (Fire/Cold)
-#base Metadata/Items/Rings/RingE1
-#base Metadata/Items/Rings/RingE2
+#baseMatch Metadata/Items/Rings/RingE%d+
 #forceShow false
-#base Metadata/Items/Rings/RingAtlas1
-#base Metadata/Items/Rings/RingAtlas2
-#base Metadata/Items/Rings/RingAtlas3
-#base Metadata/Items/Rings/RingAtlas4
 
 #base Metadata/Items/Rings/BreachRing
 #base Metadata/Items/Rings/RingDemigods1