Skip to content

Commit

Permalink
Migrate item data to (unique_)itemdat.tsv
Browse files Browse the repository at this point in the history
  • Loading branch information
@glebm
glebm committed Nov 12, 2023
1 parent 99fea0d commit b2b3127
Show file tree
Hide file tree
Showing 16 changed files with 1,353 additions and 304 deletions.
2 changes: 2 additions & 0 deletions CMake/Assets.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ set(devilutionx_assets
txtdata/classes/rogue/attributes.tsv
txtdata/classes/sorcerer/attributes.tsv
txtdata/classes/warrior/attributes.tsv
txtdata/items/itemdat.tsv
txtdata/items/unique_itemdat.tsv
txtdata/monsters/monstdat.tsv
txtdata/monsters/unique_monstdat.tsv
ui_art/diablo.pal
Expand Down
169 changes: 169 additions & 0 deletions Packaging/resources/assets/txtdata/items/itemdat.tsv
View file

Large diffs are not rendered by default.

111 changes: 111 additions & 0 deletions Packaging/resources/assets/txtdata/items/unique_itemdat.tsv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
name uniqueBaseItem minLevel value powers[0].type powers[0].param1 powers[0].param2 powers[1].type powers[1].param1 powers[1].param2 powers[2].type powers[2].param1 powers[2].param2 powers[3].type powers[3].param1 powers[3].param2 powers[4].type powers[4].param1 powers[4].param2 powers[5].type powers[5].param1 powers[5].param2
The Butcher's Cleaver CLEAVER 1 3650 STR 10 10 SETDAM 4 24 SETDUR 10 10
The Undead Crown SKCROWN 1 16650 RNDSTEALLIFE SETAC 8 8 INVCURS 77
Empyrean Band INFRARING 1 8000 ATTRIBS 2 2 LIGHT 2 2 FASTRECOVER 1 1 ABSHALFTRAP
Optic Amulet OPTAMULET 1 9750 LIGHT 2 2 LIGHTRES 20 20 GETHIT 1 1 MAG 5 5 INVCURS 44
Ring of Truth TRING 1 9100 LIFE 10 10 GETHIT 1 1 ALLRES 10 10 INVCURS 10
Harlequin Crest HARCREST 1 4000 AC_CURSE 3 3 GETHIT 1 1 ATTRIBS 2 2 LIFE 7 7 MANA 7 7 INVCURS 81
Veil of Steel STEELVEIL 1 63800 ALLRES 50 50 LIGHT_CURSE 2 2 ACP 60 60 MANA_CURSE 30 30 STR 15 15 VIT 15 15
Arkaine's Valor ARMOFVAL 1 42000 SETAC 25 25 VIT 10 10 GETHIT 3 3 FASTRECOVER 3 3
Griswold's Edge GRISWOLD 1 42000 FIREDAM 1 10 TOHIT 25 25 FASTATTACK 2 2 KNOCKBACK MANA 20 20 LIFE_CURSE 20 20
Bovine Plate BOVINE 1 400 SETAC 150 150 INDESTRUCTIBLE LIGHT 5 5 ALLRES 30 30 MANA_CURSE 50 50 SPLLVLADD -2 -2
The Rift Bow SHORTBOW 1 1800 RNDARROWVEL DAMMOD 2 2 DEX_CURSE 3 3
The Needler SHORTBOW 2 8900 TOHIT 50 50 SETDAM 1 3 FASTATTACK 2 2 INVCURS 158
The Celestial Bow LONGBOW 2 1200 NOMINSTR DAMMOD 2 2 SETAC 5 5 INVCURS 133
Deadly Hunter COMPBOW 3 8750 3XDAMVDEM 10 10 TOHIT 20 20 MAG_CURSE 5 5 INVCURS 108
Bow of the Dead COMPBOW 5 2500 TOHIT 10 10 DEX 4 4 VIT_CURSE 3 3 LIGHT_CURSE 2 2 SETDUR 30 30 INVCURS 108
The Blackoak Bow LONGBOW 5 2500 DEX 10 10 VIT_CURSE 10 10 DAMP 50 50 LIGHT_CURSE 1 1
Flamedart HUNTBOW 10 14250 FIRE_ARROWS 0 0 FIREDAM 1 6 TOHIT 20 20 FIRERES 40 40
Fleshstinger LONGBOW 13 16500 DEX 15 15 TOHIT 40 40 DAMP 80 80 DUR 6 6
Windforce WARBOW 17 37750 STR 5 5 DAMP 200 200 KNOCKBACK INVCURS 164
Eaglehorn BATTLEBOW 26 42500 DEX 20 20 TOHIT 50 50 DAMP 100 100 INDESTRUCTIBLE INVCURS 108
Gonnagal's Dirk DAGGER 1 7040 DEX_CURSE 5 5 DAMMOD 4 4 FASTATTACK 2 2 FIRERES 25 25 INVCURS 54
The Defender SABRE 1 2000 SETAC 5 5 VIT 5 5 TOHIT_CURSE 5 5
Gryphon's Claw FALCHION 1 1000 DAMP 100 100 MAG_CURSE 2 2 DEX_CURSE 5 5 INVCURS 68
Black Razor DAGGER 1 2000 DAMP 150 150 VIT 2 2 SETDUR 5 5 INVCURS 53
Gibbous Moon BROADSWR 2 6660 ATTRIBS 2 2 DAMP 25 25 MANA 15 15 LIGHT_CURSE 3 3
Ice Shank LONGSWR 3 5250 FIRERES 40 40 SETDUR 15 15 STR 5 10
The Executioner's Blade FALCHION 3 7080 DAMP 150 150 LIFE_CURSE 10 10 LIGHT_CURSE 1 1 DUR 200 200 INVCURS 58
The Bonesaw CLAYMORE 6 4400 DAMMOD 10 10 STR 10 10 MAG_CURSE 5 5 DEX_CURSE 5 5 LIFE 10 10 MANA_CURSE 10 10
Shadowhawk BROADSWR 8 13750 LIGHT_CURSE 2 2 STEALLIFE 5 5 TOHIT 15 15 ALLRES 5 5
Wizardspike DAGGER 11 12920 MAG 15 15 MANA 35 35 TOHIT 25 25 ALLRES 15 15 INVCURS 50
Lightsabre SABRE 13 19150 LIGHT 2 2 LIGHTDAM 1 10 TOHIT 20 20 LIGHTRES 50 50
The Falcon's Talon SCIMITAR 15 7867 FASTATTACK 4 4 TOHIT 20 20 DAMP_CURSE 33 33 DEX 10 10 INVCURS 68
Inferno LONGSWR 17 34600 FIREDAM 2 12 LIGHT 3 3 MANA 20 20 FIRERES 80 80
Doombringer BASTARDSWR 19 18250 TOHIT 25 25 DAMP 250 250 ATTRIBS_CURSE 5 5 LIFE_CURSE 25 25 LIGHT_CURSE 2 2
The Grizzly TWOHANDSWR 23 50000 STR 20 20 VIT_CURSE 5 5 DAMP 200 200 KNOCKBACK DUR 100 100 INVCURS 160
The Grandfather GREATSWR 27 119800 ONEHAND ATTRIBS 5 5 TOHIT 20 20 DAMP 70 70 LIFE 20 20 INVCURS 161
The Mangler LARGEAXE 2 2850 DAMP 200 200 DEX_CURSE 5 5 MAG_CURSE 5 5 MANA_CURSE 10 10 INVCURS 144
Sharp Beak LARGEAXE 2 2850 LIFE 20 20 MAG_CURSE 10 10 MANA_CURSE 10 10 INVCURS 143
BloodSlayer BROADAXE 3 2500 DAMP 100 100 3XDAMVDEM 50 50 ATTRIBS_CURSE 5 5 SPLLVLADD -1 -1 INVCURS 144
The Celestial Axe BATTLEAXE 4 14100 NOMINSTR TOHIT 15 15 LIFE 15 15 STR_CURSE 15 15
Wicked Axe LARGEAXE 5 31150 TOHIT 30 30 DEX 10 10 VIT_CURSE 10 10 GETHIT 1 6 INDESTRUCTIBLE INVCURS 143
Stonecleaver BROADAXE 7 23900 LIFE 30 30 TOHIT 20 20 DAMP 50 50 LIGHTRES 40 40 INVCURS 104
Aguinara's Hatchet SMALLAXE 12 24800 SPLLVLADD 1 1 MAG 10 10 MAGICRES 80 80
Hellslayer BATTLEAXE 15 26200 STR 8 8 VIT 8 8 DAMP 100 100 LIFE 25 25 MANA_CURSE 25 25
Messerschmidt's Reaver GREATAXE 25 58000 DAMP 200 200 DAMMOD 15 15 ATTRIBS 5 5 LIFE_CURSE 50 50 FIREDAM 2 12 INVCURS 163
Crackrust MACE 1 11375 ATTRIBS 2 2 INDESTRUCTIBLE ALLRES 15 15 DAMP 50 50 SPLLVLADD -1 -1
Hammer of Jholm MAUL 1 8700 DAMP 4 10 INDESTRUCTIBLE STR 3 3 TOHIT 15 15
Civerb's Cudgel MACE 1 2000 3XDAMVDEM 35 35 DEX_CURSE 5 5 MAG_CURSE 2 2
The Celestial Star FLAIL 2 7810 NOMINSTR LIGHT 2 2 DAMMOD 10 10 AC_CURSE 8 8 INVCURS 131
Baranar's Star MORNSTAR 5 6850 TOHIT 12 12 DAMP 80 80 FASTATTACK 1 1 VIT 4 4 DEX_CURSE 4 4 SETDUR 60 60
Gnarled Root SPIKCLUB 9 9820 TOHIT 20 20 DAMP 300 300 DEX 10 10 MAG 5 5 ALLRES 10 10 AC_CURSE 10 10
The Cranium Basher MAUL 12 36500 DAMMOD 20 20 STR 15 15 INDESTRUCTIBLE MANA_CURSE 150 150 ALLRES 5 5 INVCURS 122
Schaefer's Hammer WARHAMMER 16 56125 DAMP_CURSE 100 100 LIGHTDAM 1 50 LIFE 50 50 TOHIT 30 30 LIGHTRES 80 80 LIGHT 1 1
Dreamflange MACE 26 26450 MAG 30 30 MANA 50 50 MAGICRES 50 50 LIGHT 2 2 SPLLVLADD 1 1
Staff of Shadows LONGSTAFF 2 1250 MAG_CURSE 10 10 TOHIT 10 10 DAMP 60 60 LIGHT_CURSE 2 2 FASTATTACK 1 1
Immolator LONGSTAFF 4 3900 FIRERES 20 20 FIREDAM 4 4 MANA 10 10 VIT_CURSE 5 5
Storm Spire WARSTAFF 8 22500 LIGHTRES 50 50 LIGHTDAM 2 8 STR 10 10 MAG_CURSE 10 10
Gleamsong SHORTSTAFF 8 6520 MANA 25 25 STR_CURSE 3 3 VIT_CURSE 3 3 SPELL 10 76
Thundercall COMPSTAFF 14 22250 TOHIT 35 35 LIGHTDAM 1 10 SPELL 3 76 LIGHTRES 30 30 LIGHT 2 2
The Protector SHORTSTAFF 16 17240 VIT 5 5 GETHIT 5 5 SETAC 40 40 SPELL 2 86 THORNS 1 3 INVCURS 162
Naj's Puzzler LONGSTAFF 18 34000 MAG 20 20 DEX 10 10 ALLRES 20 20 SPELL 23 57 LIFE_CURSE 25 25
Mindcry QUARSTAFF 20 41500 MAG 15 15 SPELL 13 69 ALLRES 15 15 SPLLVLADD 1 1
Rod of Onan WARSTAFF 22 44167 SPELL 21 50 DAMP 100 100 ATTRIBS 5 5
Helm of Spirits HELM 1 7525 STEALLIFE 5 5 INVCURS 77
Thinking Cap SKULLCAP 6 2020 MANA 30 30 SPLLVLADD 2 2 ALLRES 20 20 SETDUR 1 1 INVCURS 93
OverLord's Helm HELM 7 12500 STR 20 20 DEX 15 15 VIT 5 5 MAG_CURSE 20 20 SETDUR 15 15 INVCURS 99
Fool's Crest HELM 12 10150 ATTRIBS_CURSE 4 4 LIFE 100 100 GETHIT_CURSE 1 6 THORNS 1 3 INVCURS 80
Gotterdamerung GREATHELM 21 54900 ATTRIBS 20 20 SETAC 60 60 GETHIT 4 4 ALLRESZERO LIGHT_CURSE 4 4 INVCURS 85
Royal Circlet CROWN 27 24875 ATTRIBS 10 10 MANA 40 40 SETAC 40 40 LIGHT 1 1 INVCURS 79
Torn Flesh of Souls RAGS 2 4825 SETAC 8 8 VIT 10 10 GETHIT 1 1 INDESTRUCTIBLE INVCURS 92
The Gladiator's Bane STUDARMOR 6 3450 SETAC 25 25 GETHIT 2 2 DUR 200 200 ATTRIBS_CURSE 3 3
The Rainbow Cloak CLOAK 2 4900 SETAC 10 10 ATTRIBS 1 1 ALLRES 10 10 LIFE 5 5 DUR 50 50 INVCURS 138
Leather of Aut LEATHARMOR 4 10550 SETAC 15 15 STR 5 5 MAG_CURSE 5 5 DEX 5 5 INDESTRUCTIBLE
Wisdom's Wrap ROBE 5 6200 MAG 5 5 MANA 10 10 LIGHTRES 25 25 SETAC 15 15 GETHIT 1 1 INVCURS 138
Sparking Mail CHAINMAIL 9 15750 SETAC 30 30 LIGHTDAM 1 10
Scavenger Carapace BREASTPLATE 13 14000 GETHIT 15 15 AC_CURSE 30 30 DEX 5 5 LIGHTRES 40 40
Nightscape CAPE 16 11600 FASTRECOVER 2 2 LIGHT_CURSE 4 4 SETAC 15 15 DEX 3 3 ALLRES 20 20 INVCURS 138
Naj's Light Plate PLATEMAIL 19 78700 NOMINSTR MAG 5 5 MANA 20 20 ALLRES 20 20 SPLLVLADD 1 1 INVCURS 159
Demonspike Coat FULLPLATE 25 251175 SETAC 100 100 GETHIT 6 6 STR 10 10 INDESTRUCTIBLE FIRERES 50 50
The Deflector BUCKLER 1 1500 SETAC 7 7 ALLRES 10 10 DAMP_CURSE 20 20 TOHIT_CURSE 5 5 INVCURS 83
Split Skull Shield BUCKLER 1 2025 SETAC 10 10 LIFE 10 10 STR 2 2 LIGHT_CURSE 1 1 SETDUR 15 15 INVCURS 116
Dragon's Breach KITESHIELD 2 19200 FIRERES 25 25 STR 5 5 SETAC 20 20 MAG_CURSE 5 5 INDESTRUCTIBLE INVCURS 117
Blackoak Shield SMALLSHIELD 4 5725 DEX 10 10 VIT_CURSE 10 10 SETAC 18 18 LIGHT_CURSE 1 1 DUR 150 150 INVCURS 146
Holy Defender LARGESHIELD 10 13800 SETAC 15 15 GETHIT 2 2 FIRERES 20 20 DUR 200 200 FASTBLOCK 1 1 INVCURS 146
Stormshield GOTHSHIELD 24 49000 SETAC 40 40 GETHIT_CURSE 4 4 STR 10 10 INDESTRUCTIBLE FASTBLOCK 1 1 INVCURS 148
Bramble RING 1 1000 ATTRIBS_CURSE 2 2 DAMMOD 3 3 MANA 10 10 INVCURS 9
Ring of Regha RING 1 4175 MAG 10 10 MAGICRES 10 10 LIGHT 1 1 STR_CURSE 3 3 DEX_CURSE 3 3 INVCURS 11
The Bleeder RING 2 8500 MAGICRES 20 20 MANA 30 30 LIFE_CURSE 10 10 INVCURS 8
Constricting Ring RING 5 62000 ALLRES 75 75 DRAINLIFE INVCURS 14
Ring of Engagement RING 11 12476 GETHIT 1 2 THORNS 1 3 SETAC 5 5 TARGAC 2 2 INVCURS 13
Giant's Knuckle RING 8 8000 STR 60 60 DEX_CURSE 30 30 INVCURS 179
Mercurial Ring RING 8 8000 DEX 60 60 STR_CURSE 30 30 INVCURS 176
Xorine's Ring RING 8 8000 MAG 60 60 STR_CURSE 30 30 INVCURS 168
Karik's Ring RING 8 8000 VIT 60 60 MAG_CURSE 30 30 INVCURS 173
Ring of Magma RING 8 8000 FIRERES 60 60 LIGHTRES_CURSE 30 30 MAGICRES_CURSE 30 30 INVCURS 184
Ring of the Mystics RING 8 8000 MAGICRES 60 60 FIRERES_CURSE 30 30 LIGHTRES_CURSE 30 30 INVCURS 181
Ring of Thunder RING 8 8000 LIGHTRES 60 60 FIRERES_CURSE 30 30 MAGICRES_CURSE 30 30 INVCURS 177
Amulet of Warding AMULET 12 30000 ALLRES 40 40 LIFE_CURSE 100 100 INVCURS 170
Gnat Sting HUNTBOW 15 30000 MULT_ARROWS 3 3 SETDAM 1 2 FASTATTACK 1 1 INDESTRUCTIBLE INVCURS 210
Flambeau COMPBOW 11 30000 FIREBALL 15 20 SETDAM 0 0 INDESTRUCTIBLE INVCURS 209
Armor of Gloom FULLPLATE 25 200000 NOMINSTR SETAC 225 225 ALLRESZERO LIGHT_CURSE 2 2 INVCURS 203
Blitzen COMPBOW 13 30000 ADDACLIFE 10 15 SETDAM 0 0 INDESTRUCTIBLE INVCURS 219
Thunderclap WARHAMMER 13 30000 ADDMANAAC 3 6 STR 20 20 LIGHTRES 30 30 LIGHT 2 2 INDESTRUCTIBLE INVCURS 205
Shirotachi GREATSWR 21 36000 ONEHAND FASTATTACK 4 4 TARGAC 2 2 LIGHTDAM 6 6
Eater of Souls TWOHANDSWR 23 42000 INDESTRUCTIBLE LIFE 50 50 STEALLIFE 5 5 STEALMANA 5 5 DRAINLIFE INVCURS 200
Diamondedge LONGSWR 17 42000 SETDUR 10 10 TOHIT 50 50 DAMP 100 100 LIGHTRES 50 50 SETAC 10 10 INVCURS 206
Bone Chain Armor CHAINMAIL 13 36000 SETAC 40 40 ACUNDEAD INVCURS 204
Demon Plate Armor FULLPLATE 25 80000 SETAC 80 80 ACDEMON INVCURS 225
Acolyte's Amulet AMULET 10 10000 MANATOLIFE 50 50 INVCURS 183
Gladiator's Ring RING 10 10000 LIFETOMANA 40 40 INVCURS 186
1 change: 1 addition & 0 deletions Source/diablo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2477,6 +2477,7 @@ int DiabloMain(int argc, char **argv)

// TODO: We can probably load this much later (when the game is starting).
LoadMonsterData();
LoadItemData();

DiabloInit();
#ifdef __UWP__
Expand Down
Loading

0 comments on commit b2b3127

Please sign in to comment.