diff --git a/src/Data/Bases/staff.lua b/src/Data/Bases/staff.lua
index 999ddd0a19..64d4b6e282 100644
--- a/src/Data/Bases/staff.lua
+++ b/src/Data/Bases/staff.lua
@@ -354,6 +354,82 @@ itemBases["Guardian Quarterstaff"] = {
 	weapon = { PhysicalMin = 52, PhysicalMax = 86, CritChanceBase = 10, AttackRateBase = 1.4, Range = 14, },
 	req = { level = 62, dex = 85, int = 34, },
 }
+itemBases["Runeforged Wrapped Quarterstaff"] = {
+	type = "Staff",
+	subType = "Warstaff",
+	quality = 20,
+	socketLimit = 4,
+	tags = { default = true, ezomyte_basetype = true, runeforged = true, two_hand_weapon = true, twohand = true, warstaff = true, weapon = true, },
+	implicit = "50% increased Magnitude of Bleeding you inflict",
+	implicitModTypes = { { "bleed", "physical_damage", "damage", "physical", "attack", "ailment" }, },
+	weapon = { PhysicalMin = 93, PhysicalMax = 155, CritChanceBase = 10, AttackRateBase = 1.4, Range = 14, },
+	req = { level = 38, dex = 54, int = 23, },
+}
+itemBases["Runeforged Long Quarterstaff"] = {
+	type = "Staff",
+	subType = "Warstaff",
+	quality = 20,
+	socketLimit = 4,
+	tags = { default = true, ezomyte_basetype = true, runeforged = true, two_hand_weapon = true, twohand = true, warstaff = true, weapon = true, },
+	implicit = "16% increased Melee Strike Range with this weapon",
+	implicitModTypes = { { "attack" }, },
+	weapon = { PhysicalMin = 21, PhysicalMax = 43, CritChanceBase = 10, AttackRateBase = 1.4, Range = 14, },
+	req = { level = 38, dex = 54, int = 23, },
+}
+itemBases["Runemastered Long Quarterstaff"] = {
+	type = "Staff",
+	subType = "Warstaff",
+	quality = 20,
+	hidden = true,
+	socketLimit = 4,
+	tags = { default = true, ezomyte_basetype = true, runeforged = true, two_hand_weapon = true, twohand = true, warstaff = true, weapon = true, },
+	implicit = "16% increased Melee Strike Range with this weapon",
+	implicitModTypes = { { "attack" }, },
+	weapon = { ColdMin = 43, ColdMax = 89, CritChanceBase = 10, AttackRateBase = 1.4, Range = 14, },
+	req = { level = 55, dex = 76, int = 31, },
+}
+itemBases["Runeforged Gothic Quarterstaff"] = {
+	type = "Staff",
+	subType = "Warstaff",
+	quality = 20,
+	socketLimit = 4,
+	tags = { default = true, ezomyte_basetype = true, runeforged = true, two_hand_weapon = true, twohand = true, warstaff = true, weapon = true, },
+	implicitModTypes = { },
+	weapon = { FireMin = 80, FireMax = 134, CritChanceBase = 12, AttackRateBase = 1.4, Range = 14, },
+	req = { level = 38, dex = 54, int = 23, },
+}
+itemBases["Runemastered Gothic Quarterstaff"] = {
+	type = "Staff",
+	subType = "Warstaff",
+	quality = 20,
+	hidden = true,
+	socketLimit = 4,
+	tags = { default = true, ezomyte_basetype = true, runeforged = true, two_hand_weapon = true, twohand = true, warstaff = true, weapon = true, },
+	implicit = "Ignites you inflict deal Damage (30-40)% faster",
+	implicitModTypes = { { "elemental_damage", "damage", "elemental", "fire", "ailment" }, },
+	weapon = { FireMin = 118, FireMax = 196, CritChanceBase = 12, AttackRateBase = 1.4, Range = 14, },
+	req = { level = 55, dex = 76, int = 31, },
+}
+itemBases["Runeforged Crescent Quarterstaff"] = {
+	type = "Staff",
+	subType = "Warstaff",
+	quality = 20,
+	socketLimit = 4,
+	tags = { default = true, maraketh_basetype = true, runeforged = true, two_hand_weapon = true, twohand = true, warstaff = true, weapon = true, },
+	implicitModTypes = { },
+	weapon = { ColdMin = 39, ColdMax = 81, LightningMin = 39, LightningMax = 81, CritChanceBase = 10, AttackRateBase = 1.5, Range = 14, },
+	req = { level = 40, dex = 56, int = 23, },
+}
+itemBases["Runeforged Steelpoint Quarterstaff"] = {
+	type = "Staff",
+	subType = "Warstaff",
+	quality = 20,
+	socketLimit = 4,
+	tags = { default = true, maraketh_basetype = true, runeforged = true, two_hand_weapon = true, twohand = true, warstaff = true, weapon = true, },
+	implicitModTypes = { },
+	weapon = { PhysicalMin = 90, PhysicalMax = 167, CritChanceBase = 10, AttackRateBase = 1.4, Range = 14, },
+	req = { level = 40, dex = 56, int = 23, },
+}
 itemBases["Sinister Quarterstaff"] = {
 	type = "Staff",
 	subType = "Warstaff",
diff --git a/src/Export/Bases/staff.txt b/src/Export/Bases/staff.txt
index d6144a5dd4..4a7f63f2c0 100644
--- a/src/Export/Bases/staff.txt
+++ b/src/Export/Bases/staff.txt
@@ -8,6 +8,5 @@ return function(itemBases)
 #type Staff
 #subType Warstaff
 #socketLimit 4
-#baseMatch Metadata/Items/Weapons/TwoHandWeapons/Staves/FourQuarterstaff%d+
-#baseMatch Metadata/Items/Weapons/TwoHandWeapons/Staves/FourQuarterstaffUnique
+#baseMatch BaseType Metadata/Items/Weapons/TwoHandWeapons/Staves/AbstractWarstaff
 end
\ No newline at end of file