Skip to content

Commit fb4f170

Browse files
LocalIdentityLocalIdentity
andauthored
Fix export of Tags for Sceptres and Fishing Rods (#6185)
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>
1 parent 8ec1dad commit fb4f170

File tree

24 files changed

+45
-84
lines changed

24 files changed

+45
-84
lines changed

src/Data/Bases/dagger.lua

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local itemBases = ...
55
itemBases["Glass Shank"] = {
66
type = "Dagger",
77
socketLimit = 3,
8-
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
8+
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
99
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" },
1010
implicit = "30% increased Global Critical Strike Chance",
1111
implicitModTypes = { { "critical" }, },
@@ -15,7 +15,7 @@ itemBases["Glass Shank"] = {
1515
itemBases["Skinning Knife"] = {
1616
type = "Dagger",
1717
socketLimit = 3,
18-
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
18+
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
1919
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" },
2020
implicit = "30% increased Global Critical Strike Chance",
2121
implicitModTypes = { { "critical" }, },
@@ -25,7 +25,7 @@ itemBases["Skinning Knife"] = {
2525
itemBases["Stiletto"] = {
2626
type = "Dagger",
2727
socketLimit = 3,
28-
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
28+
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
2929
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" },
3030
implicit = "30% increased Global Critical Strike Chance",
3131
implicitModTypes = { { "critical" }, },
@@ -35,7 +35,7 @@ itemBases["Stiletto"] = {
3535
itemBases["Prong Dagger"] = {
3636
type = "Dagger",
3737
socketLimit = 3,
38-
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
38+
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
3939
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" },
4040
implicit = "4% Chance to Block Attack Damage",
4141
implicitModTypes = { { "block" }, },
@@ -45,7 +45,7 @@ itemBases["Prong Dagger"] = {
4545
itemBases["Flaying Knife"] = {
4646
type = "Dagger",
4747
socketLimit = 3,
48-
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
48+
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
4949
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" },
5050
implicit = "30% increased Global Critical Strike Chance",
5151
implicitModTypes = { { "critical" }, },
@@ -55,7 +55,7 @@ itemBases["Flaying Knife"] = {
5555
itemBases["Poignard"] = {
5656
type = "Dagger",
5757
socketLimit = 3,
58-
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
58+
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
5959
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" },
6060
implicit = "30% increased Global Critical Strike Chance",
6161
implicitModTypes = { { "critical" }, },
@@ -65,7 +65,7 @@ itemBases["Poignard"] = {
6565
itemBases["Trisula"] = {
6666
type = "Dagger",
6767
socketLimit = 3,
68-
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
68+
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
6969
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" },
7070
implicit = "4% Chance to Block Attack Damage",
7171
implicitModTypes = { { "block" }, },
@@ -75,7 +75,7 @@ itemBases["Trisula"] = {
7575
itemBases["Gutting Knife"] = {
7676
type = "Dagger",
7777
socketLimit = 3,
78-
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
78+
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
7979
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" },
8080
implicit = "30% increased Global Critical Strike Chance",
8181
implicitModTypes = { { "critical" }, },
@@ -85,7 +85,7 @@ itemBases["Gutting Knife"] = {
8585
itemBases["Ambusher"] = {
8686
type = "Dagger",
8787
socketLimit = 3,
88-
tags = { onehand = true, one_hand_weapon = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
88+
tags = { onehand = true, one_hand_weapon = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
8989
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" },
9090
implicit = "30% increased Global Critical Strike Chance",
9191
implicitModTypes = { { "critical" }, },
@@ -95,7 +95,7 @@ itemBases["Ambusher"] = {
9595
itemBases["Sai"] = {
9696
type = "Dagger",
9797
socketLimit = 3,
98-
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
98+
tags = { maraketh = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
9999
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" },
100100
implicit = "6% Chance to Block Attack Damage",
101101
implicitModTypes = { { "block" }, },
@@ -105,7 +105,7 @@ itemBases["Sai"] = {
105105
itemBases["Hollowpoint Dagger"] = {
106106
type = "Dagger",
107107
socketLimit = 3,
108-
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, experimental_base = true, attack_dagger = true, default = true, },
108+
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, experimental_base = true, dagger = true, default = true, },
109109
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" },
110110
implicit = "All Damage from Hits with This Weapon can Poison",
111111
implicitModTypes = { { }, },
@@ -115,7 +115,7 @@ itemBases["Hollowpoint Dagger"] = {
115115
itemBases["Pressurised Dagger"] = {
116116
type = "Dagger",
117117
socketLimit = 3,
118-
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, experimental_base = true, attack_dagger = true, default = true, },
118+
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, experimental_base = true, dagger = true, default = true, },
119119
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" },
120120
implicit = "All Damage from Hits with This Weapon can Poison",
121121
implicitModTypes = { { }, },
@@ -125,7 +125,7 @@ itemBases["Pressurised Dagger"] = {
125125
itemBases["Pneumatic Dagger"] = {
126126
type = "Dagger",
127127
socketLimit = 3,
128-
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, experimental_base = true, attack_dagger = true, default = true, },
128+
tags = { weapon = true, one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, experimental_base = true, dagger = true, default = true, },
129129
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" },
130130
implicit = "All Damage from Hits with This Weapon can Poison",
131131
implicitModTypes = { { }, },
@@ -136,7 +136,7 @@ itemBases["Ethereal Blade"] = {
136136
type = "Dagger",
137137
hidden = true,
138138
socketLimit = 3,
139-
tags = { one_hand_weapon = true, onehand = true, not_for_sale = true, dagger = true, weapon = true, attack_dagger = true, default = true, },
139+
tags = { one_hand_weapon = true, onehand = true, not_for_sale = true, attack_dagger = true, weapon = true, dagger = true, default = true, },
140140
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" },
141141
implicitModTypes = { },
142142
weapon = { PhysicalMin = 4, PhysicalMax = 8, CritChanceBase = 6, AttackRateBase = 1.5, Range = 10, },

src/Data/Bases/fishing.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local itemBases = ...
55
itemBases["Fishing Rod"] = {
66
type = "Fishing Rod",
77
socketLimit = 4,
8-
tags = { two_hand_weapon = true, not_for_sale = true, weapon = true, twohand = true, fishing_rod = true, default = true, },
8+
tags = { not_for_sale = true, fishing_rod = true, twohand = true, default = true, },
99
implicitModTypes = { },
1010
weapon = { PhysicalMin = 8, PhysicalMax = 15, CritChanceBase = 5, AttackRateBase = 1.2, Range = 13, },
1111
req = { str = 8, dex = 8, },

0 commit comments

Comments
 (0)