Fix Thrusting swords were not a base subType (#4720)

* Fix: Thrusting should be a base subType * Same changes but with less diff Co-authored-by: Wires77 <Wires77@users.noreply.github.com>
PathOfBuildingCommunity · Aug 14, 2022 · fa4aa64 · fa4aa64
1 parent 9eddc38
commit fa4aa64
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 27 deletions.
diff --git a/src/Data/Bases/sword.lua b/src/Data/Bases/sword.lua
@@ -277,7 +277,8 @@ itemBases["Energy Blade One Handed"] = {
 }
 
 itemBases["Rusted Spike"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -286,7 +287,8 @@ itemBases["Rusted Spike"] = {
 	req = { dex = 20, },
 }
 itemBases["Whalebone Rapier"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -295,7 +297,8 @@ itemBases["Whalebone Rapier"] = {
 	req = { level = 7, dex = 32, },
 }
 itemBases["Battered Foil"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -304,7 +307,8 @@ itemBases["Battered Foil"] = {
 	req = { level = 12, dex = 47, },
 }
 itemBases["Basket Rapier"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -313,7 +317,8 @@ itemBases["Basket Rapier"] = {
 	req = { level = 17, dex = 62, },
 }
 itemBases["Jagged Foil"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -322,7 +327,8 @@ itemBases["Jagged Foil"] = {
 	req = { level = 22, dex = 77, },
 }
 itemBases["Antique Rapier"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -331,7 +337,8 @@ itemBases["Antique Rapier"] = {
 	req = { level = 26, dex = 89, },
 }
 itemBases["Elegant Foil"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -340,7 +347,8 @@ itemBases["Elegant Foil"] = {
 	req = { level = 30, dex = 101, },
 }
 itemBases["Thorn Rapier"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+35% to Global Critical Strike Multiplier",
@@ -349,7 +357,8 @@ itemBases["Thorn Rapier"] = {
 	req = { level = 34, dex = 113, },
 }
 itemBases["Smallsword"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { maraketh = true, rapier = true, onehand = true, not_for_sale = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "15% chance to cause Bleeding on Hit",
@@ -358,7 +367,8 @@ itemBases["Smallsword"] = {
 	req = { level = 36, dex = 124, },
 }
 itemBases["Wyrmbone Rapier"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -367,7 +377,8 @@ itemBases["Wyrmbone Rapier"] = {
 	req = { level = 37, dex = 122, },
 }
 itemBases["Burnished Foil"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -376,7 +387,8 @@ itemBases["Burnished Foil"] = {
 	req = { level = 40, dex = 131, },
 }
 itemBases["Estoc"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -385,7 +397,8 @@ itemBases["Estoc"] = {
 	req = { level = 43, dex = 140, },
 }
 itemBases["Serrated Foil"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -394,7 +407,8 @@ itemBases["Serrated Foil"] = {
 	req = { level = 46, dex = 149, },
 }
 itemBases["Primeval Rapier"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -403,7 +417,8 @@ itemBases["Primeval Rapier"] = {
 	req = { level = 49, dex = 158, },
 }
 itemBases["Fancy Foil"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -412,7 +427,8 @@ itemBases["Fancy Foil"] = {
 	req = { level = 52, dex = 167, },
 }
 itemBases["Apex Rapier"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+35% to Global Critical Strike Multiplier",
@@ -421,7 +437,8 @@ itemBases["Apex Rapier"] = {
 	req = { level = 55, dex = 176, },
 }
 itemBases["Courtesan Sword"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { maraketh = true, rapier = true, onehand = true, not_for_sale = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "15% chance to cause Bleeding on Hit",
@@ -430,7 +447,8 @@ itemBases["Courtesan Sword"] = {
 	req = { level = 57, dex = 190, },
 }
 itemBases["Dragonbone Rapier"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -439,7 +457,8 @@ itemBases["Dragonbone Rapier"] = {
 	req = { level = 58, dex = 185, },
 }
 itemBases["Tempered Foil"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -448,7 +467,8 @@ itemBases["Tempered Foil"] = {
 	req = { level = 60, dex = 212, },
 }
 itemBases["Pecoraro"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -457,7 +477,8 @@ itemBases["Pecoraro"] = {
 	req = { level = 62, dex = 212, },
 }
 itemBases["Spiraled Foil"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -466,7 +487,8 @@ itemBases["Spiraled Foil"] = {
 	req = { level = 64, dex = 212, },
 }
 itemBases["Vaal Rapier"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -475,7 +497,8 @@ itemBases["Vaal Rapier"] = {
 	req = { level = 66, dex = 212, },
 }
 itemBases["Jewelled Foil"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+25% to Global Critical Strike Multiplier",
@@ -484,7 +507,8 @@ itemBases["Jewelled Foil"] = {
 	req = { level = 68, dex = 212, },
 }
 itemBases["Harpy Rapier"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { onehand = true, rapier = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "+35% to Global Critical Strike Multiplier",
@@ -493,7 +517,8 @@ itemBases["Harpy Rapier"] = {
 	req = { level = 70, dex = 212, },
 }
 itemBases["Dragoon Sword"] = {
-	type = "Thrusting One Handed Sword",
+	type = "One Handed Sword",
+	subType = "Thrusting",
 	socketLimit = 3,
 	tags = { maraketh = true, rapier = true, onehand = true, not_for_sale = true, weapon = true, sword = true, one_hand_weapon = true, default = true, },
 	implicit = "20% chance to cause Bleeding on Hit",

diff --git a/src/Export/Bases/sword.txt b/src/Export/Bases/sword.txt
@@ -13,14 +13,16 @@ local itemBases = ...
 #base Metadata/Items/Weapons/OneHandWeapons/OneHandSwords/StormBladeOneHand
 #forceHide false
 
-#type Thrusting One Handed Sword
+#type One Handed Sword
+#subType Thrusting
 #baseMatch Metadata/Items/Weapons/OneHandWeapons/OneHandThrustingSwords/Rapier
 
 #type Two Handed Sword
+#subType
 #socketLimit 6
 #baseTags weapon twohand sword two_hand_weapon
 #baseMatch Metadata/Items/Weapons/TwoHandWeapons/TwoHandSwords/TwoHandSword
 
 #forceHide true
 #base Metadata/Items/Weapons/TwoHandWeapons/TwoHandSwords/StormBladeTwoHand
-#forceHide false
+#forceHide false