Skip to content

Commit 2a59a5c

Browse files
Blitz54Blitz54
committed
cleaned up extra lines, and more templates made
1 parent 338b921 commit 2a59a5c

File tree

11 files changed

+132
-1906
lines changed

11 files changed

+132
-1906
lines changed

‎src/Data/Bases/body.lua

+60-591
Large diffs are not rendered by default.

‎src/Data/Bases/boots.lua

-390
Large diffs are not rendered by default.

‎src/Data/Bases/gloves.lua

+6-385
Large diffs are not rendered by default.

‎src/Data/Bases/helmet.lua

+6-475
Large diffs are not rendered by default.

‎src/Data/Bases/sceptre.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,4 @@ itemBases["Shrine Sceptre (Purity of Lighting)"] = {
195195
implicit = "Grants Skill: Level (1-20) Purity of Lightning",
196196
implicitModTypes = { },
197197
req = { },
198-
}
198+
}

‎src/Data/Rares.lua

+29-6
Original file line numberDiff line numberDiff line change
@@ -345,12 +345,18 @@ Prefix: IncreasedPhysicalDamageReductionRating5
345345
Prefix: IncreasedLife7
346346
]],
347347
-- Quivers
348-
349348
[[
349+
Poison Quiver
350+
Toxic Quiver
351+
Crafted: true
352+
Prefix: DamageWithBows4
353+
Suffix: IncreasedAttackSpeed3
354+
Suffix: GlobalProjectileSkillGemLevel1
355+
]],[[
350356
Critical Quiver
351357
Visceral Quiver
352358
Crafted: true
353-
Prefix: DamageWithBows3
359+
Prefix: DamageWithBows4
354360
Suffix: AttackCriticalStrikeMultiplier3
355361
Suffix: AttackCriticalStrikeChance3
356362
]],
@@ -751,7 +757,7 @@ Prefix: LocalAddedLightningDamageTwoHand8
751757
Suffix: LocalIncreasedAttackSpeed3
752758
Suffix: LocalCriticalStrikeChance3
753759
Suffix: LocalCriticalMultiplier4
754-
]],-- Spell Staffs
760+
]],-- Spell Staves
755761
[[
756762
Fire Staff
757763
Ashen Staff
@@ -778,9 +784,7 @@ Prefix: LocalAddedLightningDamageTwoHand8
778784
Suffix: LocalIncreasedAttackSpeed3
779785
Suffix: LocalCriticalStrikeChance3
780786
Suffix: LocalCriticalMultiplier4
781-
]],
782-
783-
-- Wands
787+
]],-- Wands
784788
[[
785789
Chaos Wand
786790
Withered Wand
@@ -822,6 +826,25 @@ Prefix: ColdDamagePrefixOnWeapon4
822826
Prefix: LightningDamagePrefixOnWeapon4
823827
Suffix: GlobalSpellGemsLevelWeapon3
824828
]],
829+
-- Not in game yet. Flails are throwing an error on hover too
830+
---- One Hand Swords
831+
---setBase Dark Blade, Physical %s, [ ]
832+
---setBase Dark Blade, Elemental %s, [ ]
833+
---- Two Hand Swords
834+
---setBase Ultra Greatsword, Physical %s, [ ]
835+
---setBase Ultra Greatsword, Elemental %s, [ ]
836+
---- Spears
837+
---setBase Helix Spear, Physical %s, [ Prefix: LocalIncreasedPhysicalDamagePercent5, Prefix: LocalIncreasedPhysicalDamagePercentAndAccuracyRating5, Prefix: LocalAddedPhysicalDamage6, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
838+
---setBase Helix Spear, Elemental %s, [ Prefix: LocalAddedFireDamage8, Prefix: LocalAddedColdDamage8, Prefix: LocalAddedLightningDamage8, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
839+
---setBase Striking Spear, Elemental %s, [ Prefix: LocalAddedFireDamage8, Prefix: LocalAddedColdDamage8, Prefix: LocalAddedLightningDamage8, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
840+
---- Flails
841+
---- One Hand Axes
842+
---setBase Dread Hatchet, Physical %s, [ ]
843+
---setBase Dread Hatchet, Elemental %s, [ ]
844+
---- Two Hand Axes
845+
---setBase Vile Greataxe, Physical %s, [ ]
846+
---setBase Vile Greataxe, Elemental %s, [ ]
847+
825848
-- Jewels
826849
[[
827850
Jewel

‎src/Export/Bases/Rares.txt

+22-5
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ return {
7171
#setBase Plate Belt, [ Prefix: IncreasedPhysicalDamageReductionRating5, Prefix: IncreasedLife7]
7272

7373
-- Quivers
74-
75-
#setBase Visceral Quiver, Critical %s, [ Prefix: DamageWithBows3, Suffix: AttackCriticalStrikeMultiplier3, Suffix: AttackCriticalStrikeChance3]
74+
#setBase Toxic Quiver, Poison %s, [ Prefix: DamageWithBows4, Suffix: IncreasedAttackSpeed3, Suffix: GlobalProjectileSkillGemLevel1]
75+
#setBase Visceral Quiver, Critical %s, [ Prefix: DamageWithBows4, Suffix: AttackCriticalStrikeMultiplier3, Suffix: AttackCriticalStrikeChance3]
7676

7777
-- Sceptres
7878
#setBase Rattling Sceptre, Minion %s, [ Prefix: LocalIncreasedSpiritPercent4, Prefix: NearbyAlliesAllDamage4, Suffix: GlobalMinionSpellSkillGemLevelWeapon3]
@@ -127,21 +127,38 @@ return {
127127
#setBase Expert Long Quarterstaff, Physical %s, [ ]
128128
#setBase Expert Long Quarterstaff, Elemental %s, [ ]
129129
#setBase Expert Crackling Quarterstaff, Elemental %s, [ ]
130-
-- Spell Staffs
130+
-- Spell Staves
131131
#setBase Ashen Staff, Fire %s, [ ] -- problem, used the two hand modifiers
132132
#setBase Gelid Staff, Cold %s, [ ] -- problem, used the two hand modifiers
133133
#setBase Voltaic Staff, Lightning %s, [ ] -- problem, used the two hand modifiers
134134
#setBase Pyrophyte Staff, Fire %s, [ ] -- problem, used the two hand modifiers
135135
#setBase Chiming Staff, Elemental %s, [ ] -- problem, used the two hand modifiers
136-
137-
138136
-- Wands
139137
#setBase Withered Wand, Chaos %s, [ Prefix: ChaosDamagePrefixOnWeapon4, Prefix: SpellDamageOnWeapon4, Prefix: SpellDamageAndManaOnWeapon4, Suffix: GlobalSpellGemsLevelWeapon3]
140138
#setBase Bone Wand, Physical %s, [ Prefix: PhysicalDamagePrefixOnWeapon4, Prefix: SpellDamageOnWeapon4, Prefix: SpellDamageAndManaOnWeapon4, Suffix: GlobalSpellGemsLevelWeapon3]
141139
#setBase Siphoning Wand, Elemental %s, [ Prefix: FireDamagePrefixOnWeapon4, Prefix: ColdDamagePrefixOnWeapon4, Prefix: LightningDamagePrefixOnWeapon4, Suffix: GlobalSpellGemsLevelWeapon3]
142140
#setBase Volatile Wand, Fire %s, [ Prefix: FireDamagePrefixOnWeapon4, Prefix: SpellDamageOnWeapon4, Prefix: SpellDamageAndManaOnWeapon4, Suffix: GlobalSpellGemsLevelWeapon3]
143141
#setBase Attuned Wand, Elemental %s, [ Prefix: FireDamagePrefixOnWeapon4, Prefix: ColdDamagePrefixOnWeapon4, Prefix: LightningDamagePrefixOnWeapon4, Suffix: GlobalSpellGemsLevelWeapon3]
144142

143+
-- Not in game yet. Flails are throwing an error on hover too
144+
---- One Hand Swords
145+
---setBase Dark Blade, Physical %s, [ ]
146+
---setBase Dark Blade, Elemental %s, [ ]
147+
---- Two Hand Swords
148+
---setBase Ultra Greatsword, Physical %s, [ ]
149+
---setBase Ultra Greatsword, Elemental %s, [ ]
150+
---- Spears
151+
---setBase Helix Spear, Physical %s, [ Prefix: LocalIncreasedPhysicalDamagePercent5, Prefix: LocalIncreasedPhysicalDamagePercentAndAccuracyRating5, Prefix: LocalAddedPhysicalDamage6, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
152+
---setBase Helix Spear, Elemental %s, [ Prefix: LocalAddedFireDamage8, Prefix: LocalAddedColdDamage8, Prefix: LocalAddedLightningDamage8, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
153+
---setBase Striking Spear, Elemental %s, [ Prefix: LocalAddedFireDamage8, Prefix: LocalAddedColdDamage8, Prefix: LocalAddedLightningDamage8, Suffix: LocalIncreasedAttackSpeed3, Suffix: LocalCriticalStrikeChance3, Suffix: LocalCriticalMultiplier4]
154+
---- Flails
155+
---- One Hand Axes
156+
---setBase Dread Hatchet, Physical %s, [ ]
157+
---setBase Dread Hatchet, Elemental %s, [ ]
158+
---- Two Hand Axes
159+
---setBase Vile Greataxe, Physical %s, [ ]
160+
---setBase Vile Greataxe, Elemental %s, [ ]
161+
145162
-- Jewels
146163
#setBase Ruby, [ ]
147164
#setBase Emerald, [ ]

‎src/Export/Bases/body.txt

+2-15
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,25 @@ local itemBases = ...
66

77
#subType Armour
88
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStr%d+
9-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStr%d+Cruel
10-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStr%d+Endgame
119

1210
#subType Evasion
1311
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyDex%d+
14-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyDex%d+Cruel
15-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyDex%d+Endgame
1612

1713
#subType Energy Shield
1814
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyInt%d+
19-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyInt%d+Cruel
20-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyInt%d+Endgame
2115

2216
#subType Armour/Evasion
2317
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStrDex%d+
24-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStrDex%d+Cruel
25-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStrDex%d+Endgame
2618

2719
#subType Armour/Energy Shield
2820
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStrInt%d+
29-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStrInt%d+Cruel
30-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStrInt%d+Endgame
3121

3222
#subType Evasion/Energy Shield
3323
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyDexInt%d+
34-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyDexInt%d+Cruel
35-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyDexInt%d+Endgame
3624

3725
#subType Armour/Evasion/Energy Shield
3826
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStrDexInt%d+
39-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStrDexInt%d+Cruel
40-
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStrDexInt%d+Endgame
27+
#baseMatch Metadata/Items/Armours/BodyArmours/FourBodyStrDexIntBase
4128

4229
#subType
43-
#baseMatch BaseType Metadata/Items/Armours/BodyArmours/BodyDemigods1
30+
#baseMatch BaseType Metadata/Items/Armours/BodyArmours/BodyDemigods1

‎src/Export/Bases/boots.txt

-14
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,24 @@ local itemBases = ...
66

77
#subType Armour
88
#baseMatch Metadata/Items/Armours/Boots/FourBootsStr%d+
9-
#baseMatch Metadata/Items/Armours/Boots/FourBootsStr%d+Cruel
10-
#baseMatch Metadata/Items/Armours/Boots/FourBootsStr%d+Endgame
119

1210
#subType Evasion
1311
#baseMatch Metadata/Items/Armours/Boots/FourBootsDex%d+
14-
#baseMatch Metadata/Items/Armours/Boots/FourBootsDex%d+Cruel
15-
#baseMatch Metadata/Items/Armours/Boots/FourBootsDex%d+Endgame
1612

1713
#subType Energy Shield
1814
#baseMatch Metadata/Items/Armours/Boots/FourBootsInt%d+
19-
#baseMatch Metadata/Items/Armours/Boots/FourBootsInt%d+Cruel
20-
#baseMatch Metadata/Items/Armours/Boots/FourBootsInt%d+Endgame
2115

2216
#subType Armour/Evasion
2317
#baseMatch Metadata/Items/Armours/Boots/FourBootsStrDex%d+
24-
#baseMatch Metadata/Items/Armours/Boots/FourBootsStrDex%d+Cruel
25-
#baseMatch Metadata/Items/Armours/Boots/FourBootsStrDex%d+Endgame
2618

2719
#subType Armour/Energy Shield
2820
#baseMatch Metadata/Items/Armours/Boots/FourBootsStrInt%d+
29-
#baseMatch Metadata/Items/Armours/Boots/FourBootsStrInt%d+Cruel
30-
#baseMatch Metadata/Items/Armours/Boots/FourBootsStrInt%d+Endgame
3121

3222
#subType Evasion/Energy Shield
3323
#baseMatch Metadata/Items/Armours/Boots/FourBootsDexInt%d+
34-
#baseMatch Metadata/Items/Armours/Boots/FourBootsDexInt%d+Cruel
35-
#baseMatch Metadata/Items/Armours/Boots/FourBootsDexInt%d+Endgame
3624

3725
#subType Armour/Evasion/Energy Shield
3826
#baseMatch Metadata/Items/Armours/Boots/FourBootsStrDexInt%d+
39-
#baseMatch Metadata/Items/Armours/Boots/FourBootsStrDexInt%d+Cruel
40-
#baseMatch Metadata/Items/Armours/Boots/FourBootsStrDexInt%d+Endgame
4127

4228
#subType
4329
#base Metadata/Items/Armours/Boots/BootsDemigods1

‎src/Export/Bases/gloves.txt

+3-12
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,24 @@ local itemBases = ...
66

77
#subType Armour
88
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesStr%d+
9-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesStr%d+Cruel
10-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesStr%d+Endgame
119

1210
#subType Evasion
1311
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesDex%d+
14-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesDex%d+Cruel
15-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesDex%d+Endgame
1612

1713
#subType Energy Shield
1814
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesInt%d+
19-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesInt%d+Cruel
20-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesInt%d+Endgame
2115

2216
#subType Armour/Evasion
2317
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesStrDex%d+
24-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesStrDex%d+Cruel
25-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesStrDex%d+Endgame
2618

2719
#subType Armour/Energy Shield
2820
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesStrInt%d+
29-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesStrInt%d+Cruel
30-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesStrInt%d+Endgame
3121

3222
#subType Evasion/Energy Shield
3323
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesDexInt%d+
34-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesDexInt%d+Cruel
35-
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesDexInt%d+Endgame
24+
25+
#subType Armour/Evasion/Energy Shield
26+
#baseMatch Metadata/Items/Armours/Gloves/FourGlovesStrDexInt%d+
3627

3728
#subType
3829
#baseMatch BaseType Metadata/Items/Armours/Gloves/GlovesDemigods1

‎src/Export/Bases/helmet.txt

+3-12
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,24 @@ local itemBases = ...
66

77
#subType Armour
88
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetStr%d+
9-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetStr%d+Cruel
10-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetStr%d+Endgame
119

1210
#subType Evasion
1311
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetDex%d+
14-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetDex%d+Cruel
15-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetDex%d+Endgame
1612

1713
#subType Energy Shield
1814
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetInt%d+
19-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetInt%d+Cruel
20-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetInt%d+Endgame
2115

2216
#subType Armour/Evasion
2317
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetStrDex%d+
24-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetStrDex%d+Cruel
25-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetStrDex%d+Endgame
2618

2719
#subType Armour/Energy Shield
2820
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetStrInt%d+
29-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetStrInt%d+Cruel
30-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetStrInt%d+Endgame
3121

3222
#subType Evasion/Energy Shield
3323
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetDexInt%d+
34-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetDexInt%d+Cruel
35-
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetDexInt%d+Endgame
24+
25+
#subType Armour/Evasion/Energy Shield
26+
#baseMatch Metadata/Items/Armours/Helmets/FourHelmetStrDexInt%d+
3627

3728
#subType
3829
#baseMatch Metadata/Items/Armours/Helmets/HelmetWreath1

0 commit comments

Comments
 (0)