Skip to content

Commit 6209d88

Browse files
Blitz54Blitz54
committed
flails mostly working, disabled along axes for now
1 parent 2a59a5c commit 6209d88

File tree

5 files changed

+128
-1
lines changed

5 files changed

+128
-1
lines changed

‎src/Data/Bases/flail.lua

+119
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,122 @@
22
-- Item data (c) Grinding Gear Games
33
local itemBases = ...
44

5+
itemBases["Splintered Flail"] = {
6+
type = "Flail",
7+
quality = 20,
8+
socketLimit = 2,
9+
tags = { onehand = true, flail = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, },
10+
implicitModTypes = { },
11+
weapon = { PhysicalMin = 6, PhysicalMax = 9, CritChanceBase = 10, AttackRateBase = 1.45, Range = 11, },
12+
req = { },
13+
}
14+
itemBases["Chain Flail"] = {
15+
type = "Flail",
16+
quality = 20,
17+
socketLimit = 2,
18+
tags = { onehand = true, flail = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, },
19+
implicitModTypes = { },
20+
weapon = { PhysicalMin = 8, PhysicalMax = 14, CritChanceBase = 10, AttackRateBase = 1.45, Range = 11, },
21+
req = { level = 6, str = 13, },
22+
}
23+
itemBases["Holy Flail"] = {
24+
type = "Flail",
25+
quality = 20,
26+
socketLimit = 2,
27+
tags = { onehand = true, flail = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, },
28+
implicitModTypes = { },
29+
weapon = { PhysicalMin = 10, PhysicalMax = 17, CritChanceBase = 10, AttackRateBase = 1.45, Range = 11, },
30+
req = { level = 11, str = 22, int = 11, },
31+
}
32+
itemBases["Iron Flail"] = {
33+
type = "Flail",
34+
quality = 20,
35+
socketLimit = 2,
36+
tags = { maraketh_basetype = true, onehand = true, flail = true, weapon = true, one_hand_weapon = true, default = true, },
37+
implicitModTypes = { },
38+
weapon = { PhysicalMin = 14, PhysicalMax = 23, CritChanceBase = 10, AttackRateBase = 1.45, Range = 11, },
39+
req = { level = 16, str = 30, int = 14, },
40+
}
41+
itemBases["Twin Flail"] = {
42+
type = "Flail",
43+
quality = 20,
44+
socketLimit = 2,
45+
tags = { maraketh_basetype = true, onehand = true, flail = true, weapon = true, one_hand_weapon = true, default = true, },
46+
implicitModTypes = { },
47+
weapon = { PhysicalMin = 8, PhysicalMax = 18, CritChanceBase = 10, AttackRateBase = 1.4, Range = 11, },
48+
req = { level = 20, str = 37, int = 16, },
49+
}
50+
itemBases["Slender Flail"] = {
51+
type = "Flail",
52+
quality = 20,
53+
socketLimit = 2,
54+
tags = { maraketh_basetype = true, onehand = true, flail = true, weapon = true, one_hand_weapon = true, default = true, },
55+
implicitModTypes = { },
56+
weapon = { PhysicalMin = 19, PhysicalMax = 32, CritChanceBase = 8, AttackRateBase = 1.5, Range = 11, },
57+
req = { level = 26, str = 48, int = 20, },
58+
}
59+
itemBases["Stone Flail"] = {
60+
type = "Flail",
61+
quality = 20,
62+
socketLimit = 2,
63+
tags = { onehand = true, flail = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, },
64+
implicit = "Unblockable",
65+
implicitModTypes = { { }, },
66+
weapon = { PhysicalMin = 23, PhysicalMax = 38, CritChanceBase = 10, AttackRateBase = 1.45, Range = 11, },
67+
req = { level = 33, str = 60, int = 25, },
68+
}
69+
itemBases["Ring Flail"] = {
70+
type = "Flail",
71+
quality = 20,
72+
socketLimit = 2,
73+
tags = { onehand = true, flail = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, },
74+
implicitModTypes = { },
75+
weapon = { PhysicalMin = 23, PhysicalMax = 44, CritChanceBase = 10, AttackRateBase = 1.45, Range = 11, },
76+
req = { level = 38, str = 69, int = 28, },
77+
}
78+
itemBases["Guarded Flail"] = {
79+
type = "Flail",
80+
quality = 20,
81+
socketLimit = 2,
82+
tags = { onehand = true, flail = true, weapon = true, one_hand_weapon = true, default = true, },
83+
implicitModTypes = { },
84+
weapon = { PhysicalMin = 31, PhysicalMax = 57, CritChanceBase = 10, AttackRateBase = 1.4, Range = 11, },
85+
req = { level = 45, str = 81, int = 33, },
86+
}
87+
itemBases["Icicle Flail"] = {
88+
type = "Flail",
89+
quality = 20,
90+
socketLimit = 2,
91+
tags = { onehand = true, flail = true, weapon = true, one_hand_weapon = true, default = true, },
92+
implicitModTypes = { },
93+
weapon = { ColdMin = 24, ColdMax = 55, CritChanceBase = 10, AttackRateBase = 1.45, Range = 11, },
94+
req = { level = 47, str = 84, int = 34, },
95+
}
96+
itemBases["Tearing Flail"] = {
97+
type = "Flail",
98+
quality = 20,
99+
socketLimit = 2,
100+
tags = { onehand = true, flail = true, weapon = true, one_hand_weapon = true, default = true, },
101+
implicitModTypes = { },
102+
weapon = { PhysicalMin = 27, PhysicalMax = 56, CritChanceBase = 12.5, AttackRateBase = 1.4, Range = 11, },
103+
req = { level = 52, str = 93, int = 37, },
104+
}
105+
itemBases["Great Flail"] = {
106+
type = "Flail",
107+
quality = 20,
108+
socketLimit = 2,
109+
tags = { onehand = true, flail = true, weapon = true, one_hand_weapon = true, default = true, },
110+
implicitModTypes = { },
111+
weapon = { PhysicalMin = 35, PhysicalMax = 58, CritChanceBase = 10, AttackRateBase = 1.45, Range = 11, },
112+
req = { level = 58, str = 103, int = 41, },
113+
}
114+
itemBases["Abyssal Flail"] = {
115+
type = "Flail",
116+
quality = 20,
117+
socketLimit = 2,
118+
tags = { onehand = true, flail = true, weapon = true, one_hand_weapon = true, default = true, },
119+
implicitModTypes = { },
120+
weapon = { PhysicalMin = 36, PhysicalMax = 66, CritChanceBase = 10, AttackRateBase = 1.45, Range = 11, },
121+
req = { level = 65, str = 116, int = 45, },
122+
}
123+
-- not working this way? baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Flails/AbstractFlail

‎src/Data/Rares.lua

+3
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ Implicits: 3
393393
{variant:3}Grants Skill: Level (1-20) Purity of Lightning
394394
]],
395395
-- Weapons
396+
396397
-- Bows
397398
[[
398399
Physical Bow
@@ -838,6 +839,8 @@ Suffix: GlobalSpellGemsLevelWeapon3
838839
---setBase Helix Spear, Elemental %s, [ Prefix: LocalAddedFireDamage8, Prefix: LocalAddedColdDamage8, Prefix: LocalAddedLightningDamage8, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
839840
---setBase Striking Spear, Elemental %s, [ Prefix: LocalAddedFireDamage8, Prefix: LocalAddedColdDamage8, Prefix: LocalAddedLightningDamage8, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
840841
---- Flails
842+
---setBase Abyssal Flail, Physical %s, [ ] -- For some reason Flails and Spears don't grab the BaseGroup like maces and axes do.
843+
---setBase Abyssal Flail, Elemental %s, [ ]
841844
---- One Hand Axes
842845
---setBase Dread Hatchet, Physical %s, [ ]
843846
---setBase Dread Hatchet, Elemental %s, [ ]

‎src/Export/Bases/Rares.txt

+3
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ return {
8686
#baseGroup Elemental One Handed, [ Prefix: LocalAddedFireDamage8, Prefix: LocalAddedColdDamage8, Prefix: LocalAddedLightningDamage8, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
8787
#baseGroup Physical Two Handed, [ Prefix: LocalIncreasedPhysicalDamagePercent5, Prefix: LocalIncreasedPhysicalDamagePercentAndAccuracyRating5, Prefix: LocalAddedPhysicalDamageTwoHand6, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
8888
#baseGroup Elemental Two Handed, [ Prefix: LocalAddedFireDamageTwoHand8_, Prefix: LocalAddedColdDamageTwoHand8, Prefix: LocalAddedLightningDamageTwoHand8, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
89+
8990
-- Bows
9091
#setBase Expert Zealot Bow, Physical %s, [ Prefix: LocalIncreasedPhysicalDamagePercent5, Prefix: LocalIncreasedPhysicalDamagePercentAndAccuracyRating5, Prefix: LocalAddedPhysicalDamage6, Suffix: LocalIncreasedAttackSpeed2, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
9192
#setBase Expert Zealot Bow, Elemental %s, [ Prefix: LocalAddedFireDamage8, Prefix: LocalAddedColdDamage8, Prefix: LocalAddedLightningDamage8, Suffix: LocalIncreasedAttackSpeed2, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
@@ -152,6 +153,8 @@ return {
152153
---setBase Helix Spear, Elemental %s, [ Prefix: LocalAddedFireDamage8, Prefix: LocalAddedColdDamage8, Prefix: LocalAddedLightningDamage8, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
153154
---setBase Striking Spear, Elemental %s, [ Prefix: LocalAddedFireDamage8, Prefix: LocalAddedColdDamage8, Prefix: LocalAddedLightningDamage8, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
154155
---- Flails
156+
---setBase Abyssal Flail, Physical %s, [ ] -- For some reason Flails and Spears don't grab the BaseGroup like maces and axes do.
157+
---setBase Abyssal Flail, Elemental %s, [ ]
155158
---- One Hand Axes
156159
---setBase Dread Hatchet, Physical %s, [ ]
157160
---setBase Dread Hatchet, Elemental %s, [ ]

‎src/Export/Bases/flail.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ local itemBases = ...
33

44
#type Flail
55
#socketLimit 2
6-
#baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Flails/AbstractFlail
6+
#baseMatch Metadata/Items/Weapons/OneHandWeapons/Flails/FourFlail%d+
7+
-- not working this way? baseMatch BaseType Metadata/Items/Weapons/OneHandWeapons/Flails/AbstractFlail

‎src/Modules/Data.lua

+1
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,7 @@ data.weaponTypeInfo = {
473473
["Claw"] = { oneHand = true, melee = true, flag = "Claw" },
474474
["Dagger"] = { oneHand = true, melee = true, flag = "Dagger" },
475475
["Spear"] = { oneHand = true, melee = true, flag = "Spear" },
476+
["Flail"] = { oneHand = true, melee = true, flag = "Flail" },
476477
["Staff"] = { oneHand = false, melee = true, flag = "Staff", label = "Quarterstaff" },
477478
["Wand"] = { oneHand = true, melee = false, flag = "Wand" },
478479
["One Handed Axe"] = { oneHand = true, melee = true, flag = "Axe" },

0 commit comments

Comments
 (0)