Skip to content

Commit

Permalink
Fix export of Tags for Sceptres and Fishing Rods (#6185)
Browse files Browse the repository at this point in the history 
We no longer need to specify the base tags for item bases as they are already correctly pulled from the files
Also adds support for the `remove_tag` option only found on fishing rods to fix them receiving weapon mods

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
  • Loading branch information
@LocalIdentity
LocalIdentity and LocalIdentity authored May 4, 2023
1 parent 8ec1dad commit fb4f170
Show file tree
Hide file tree
Showing 24 changed files with 45 additions and 84 deletions.
28 changes: 14 additions & 14 deletions src/Data/Bases/dagger.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ local itemBases = ...
itemBases["Glass Shank"] = {
type = "Dagger",
socketLimit = 3,
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "30% increased Global Critical Strike Chance",
implicitModTypes = { { "critical" }, },
Expand All @@ -15,7 +15,7 @@ itemBases["Glass Shank"] = {
itemBases["Skinning Knife"] = {
type = "Dagger",
socketLimit = 3,
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "30% increased Global Critical Strike Chance",
implicitModTypes = { { "critical" }, },
Expand All @@ -25,7 +25,7 @@ itemBases["Skinning Knife"] = {
itemBases["Stiletto"] = {
type = "Dagger",
socketLimit = 3,
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "30% increased Global Critical Strike Chance",
implicitModTypes = { { "critical" }, },
Expand All @@ -35,7 +35,7 @@ itemBases["Stiletto"] = {
itemBases["Prong Dagger"] = {
type = "Dagger",
socketLimit = 3,
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "4% Chance to Block Attack Damage",
implicitModTypes = { { "block" }, },
Expand All @@ -45,7 +45,7 @@ itemBases["Prong Dagger"] = {
itemBases["Flaying Knife"] = {
type = "Dagger",
socketLimit = 3,
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "30% increased Global Critical Strike Chance",
implicitModTypes = { { "critical" }, },
Expand All @@ -55,7 +55,7 @@ itemBases["Flaying Knife"] = {
itemBases["Poignard"] = {
type = "Dagger",
socketLimit = 3,
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "30% increased Global Critical Strike Chance",
implicitModTypes = { { "critical" }, },
Expand All @@ -65,7 +65,7 @@ itemBases["Poignard"] = {
itemBases["Trisula"] = {
type = "Dagger",
socketLimit = 3,
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "4% Chance to Block Attack Damage",
implicitModTypes = { { "block" }, },
Expand All @@ -75,7 +75,7 @@ itemBases["Trisula"] = {
itemBases["Gutting Knife"] = {
type = "Dagger",
socketLimit = 3,
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "30% increased Global Critical Strike Chance",
implicitModTypes = { { "critical" }, },
Expand All @@ -85,7 +85,7 @@ itemBases["Gutting Knife"] = {
itemBases["Ambusher"] = {
type = "Dagger",
socketLimit = 3,
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "30% increased Global Critical Strike Chance",
implicitModTypes = { { "critical" }, },
Expand All @@ -95,7 +95,7 @@ itemBases["Ambusher"] = {
itemBases["Sai"] = {
type = "Dagger",
socketLimit = 3,
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "6% Chance to Block Attack Damage",
implicitModTypes = { { "block" }, },
Expand All @@ -105,7 +105,7 @@ itemBases["Sai"] = {
itemBases["Hollowpoint Dagger"] = {
type = "Dagger",
socketLimit = 3,
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, experimental_base = true, attack_dagger = true, default = true, },
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, experimental_base = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "All Damage from Hits with This Weapon can Poison",
implicitModTypes = { { }, },
Expand All @@ -115,7 +115,7 @@ itemBases["Hollowpoint Dagger"] = {
itemBases["Pressurised Dagger"] = {
type = "Dagger",
socketLimit = 3,
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, experimental_base = true, attack_dagger = true, default = true, },
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, experimental_base = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "All Damage from Hits with This Weapon can Poison",
implicitModTypes = { { }, },
Expand All @@ -125,7 +125,7 @@ itemBases["Pressurised Dagger"] = {
itemBases["Pneumatic Dagger"] = {
type = "Dagger",
socketLimit = 3,
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, experimental_base = true, attack_dagger = true, default = true, },
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, experimental_base = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicit = "All Damage from Hits with This Weapon can Poison",
implicitModTypes = { { }, },
Expand All @@ -136,7 +136,7 @@ itemBases["Ethereal Blade"] = {
type = "Dagger",
hidden = true,
socketLimit = 3,
tags = { one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
tags = { one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
influenceTags = { shaper = "dagger_shaper", elder = "dagger_elder", adjudicator = "dagger_adjudicator", basilisk = "dagger_basilisk", crusader = "dagger_crusader", eyrie = "dagger_eyrie", cleansing = "dagger_cleansing", tangle = "dagger_tangle" },
implicitModTypes = { },
weapon = { PhysicalMin = 4, PhysicalMax = 8, CritChanceBase = 6, AttackRateBase = 1.5, Range = 10, },
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Bases/fishing.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ local itemBases = ...
itemBases["Fishing Rod"] = {
type = "Fishing Rod",
socketLimit = 4,
tags = { two_hand_weapon = true, not_for_sale = true, weapon = true, twohand = true, fishing_rod = true, default = true, },
tags = { not_for_sale = true, fishing_rod = true, twohand = true, default = true, },
implicitModTypes = { },
weapon = { PhysicalMin = 8, PhysicalMax = 15, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
req = { str = 8, dex = 8, },
Expand Down
Loading

0 comments on commit fb4f170

Please sign in to comment.