From f67fbfeaca4c749a6e9524c432909c12e4eeab44 Mon Sep 17 00:00:00 2001 From: Eric Robinson <68359262+kphoenix137@users.noreply.github.com> Date: Sat, 13 Apr 2024 17:49:40 -0400 Subject: [PATCH] Conditionally set cursor graphic for unique items (#7067) --- Source/itemdat.cpp | 1 + Source/itemdat.h | 2 + Source/items.cpp | 11 +-- assets/txtdata/items/unique_itemdat.tsv | 96 ++++++++++++------------- 4 files changed, 58 insertions(+), 52 deletions(-) diff --git a/Source/itemdat.cpp b/Source/itemdat.cpp index 4162746de..2a009d1dc 100644 --- a/Source/itemdat.cpp +++ b/Source/itemdat.cpp @@ -238,6 +238,7 @@ tl::expected ParseItemCursorGraphic(std::strin if (value == "BLITZEN") return ICURS_BLITZEN; if (value == "DEMON_PLATE_ARMOR") return ICURS_DEMON_PLATE_ARMOR; if (value == "BOVINE") return ICURS_BOVINE; + if (value == "") return ICURS_DEFAULT; return tl::make_unexpected("Unknown enum value"); } diff --git a/Source/itemdat.h b/Source/itemdat.h index e01a123d0..3a4cacee2 100644 --- a/Source/itemdat.h +++ b/Source/itemdat.h @@ -282,6 +282,8 @@ enum item_cursor_graphic : uint8_t { ICURS_BLITZEN = 219, ICURS_DEMON_PLATE_ARMOR = 225, ICURS_BOVINE = 226, + + ICURS_DEFAULT = static_cast(-1), // clang-format on }; diff --git a/Source/items.cpp b/Source/items.cpp index 2e6d96d43..93aa72016 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -1478,15 +1478,18 @@ void GetUniqueItem(const Player &player, Item &item, _unique_items uid) { UniqueItemFlags[uid] = true; - for (auto power : UniqueItems[uid].powers) { + const auto &uniqueItemData = UniqueItems[uid]; + + for (auto power : uniqueItemData.powers) { if (power.type == IPL_INVALID) break; SaveItemPower(player, item, power); } - CopyUtf8(item._iIName, UniqueItems[uid].UIName, sizeof(item._iIName)); - item._iCurs = UniqueItems[uid].UICurs; - item._iIvalue = UniqueItems[uid].UIValue; + CopyUtf8(item._iIName, uniqueItemData.UIName, sizeof(item._iIName)); + if (uniqueItemData.UICurs != ICURS_DEFAULT) + item._iCurs = uniqueItemData.UICurs; + item._iIvalue = uniqueItemData.UIValue; if (item._iMiscId == IMISC_UNIQUE) item._iSeed = uid; diff --git a/assets/txtdata/items/unique_itemdat.tsv b/assets/txtdata/items/unique_itemdat.tsv index e0e8d9bff..87a0bb177 100644 --- a/assets/txtdata/items/unique_itemdat.tsv +++ b/assets/txtdata/items/unique_itemdat.tsv @@ -1,67 +1,67 @@ name cursorGraphic uniqueBaseItem minLevel value power0 power0.value1 power0.value2 power1 power1.value1 power1.value2 power2 power2.value1 power2.value2 power3 power3.value1 power3.value2 power4 power4.value1 power4.value2 power5 power5.value1 power5.value2 -The Butcher's Cleaver CLEAVER CLEAVER 1 3650 STR 10 10 SETDAM 4 24 SETDUR 10 10 +The Butcher's Cleaver CLEAVER 1 3650 STR 10 10 SETDAM 4 24 SETDUR 10 10 The Undead Crown HELM_OF_SPIRITS SKCROWN 1 16650 RNDSTEALLIFE SETAC 8 8 -Empyrean Band EMPYREAN_BAND INFRARING 1 8000 ATTRIBS 2 2 LIGHT 2 2 FASTRECOVER 1 1 ABSHALFTRAP -Optic Amulet OPTIC_AMULET OPTAMULET 1 9750 LIGHT 2 2 LIGHTRES 20 20 GETHIT 1 1 MAG 5 5 -Ring of Truth RING_OF_TRUTH TRING 1 9100 LIFE 10 10 GETHIT 1 1 ALLRES 10 10 -Harlequin Crest HARLEQUIN_CREST HARCREST 1 4000 AC_CURSE 3 3 GETHIT 1 1 ATTRIBS 2 2 LIFE 7 7 MANA 7 7 -Veil of Steel 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 ARKAINES_VALOR ARMOFVAL 1 42000 SETAC 25 25 VIT 10 10 GETHIT 3 3 FASTRECOVER 3 3 -Griswold's Edge BROAD_SWORD GRISWOLD 1 42000 FIREDAM 1 10 TOHIT 25 25 FASTATTACK 2 2 KNOCKBACK MANA 20 20 LIFE_CURSE 20 20 -Bovine Plate BOVINE BOVINE 1 400 SETAC 150 150 INDESTRUCTIBLE LIGHT 5 5 ALLRES 30 30 MANA_CURSE 50 50 SPLLVLADD -2 -2 -The Rift Bow SHORT_BOW SHORTBOW 1 1800 RNDARROWVEL DAMMOD 2 2 DEX_CURSE 3 3 +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 +Ring of Truth TRING 1 9100 LIFE 10 10 GETHIT 1 1 ALLRES 10 10 +Harlequin Crest HARCREST 1 4000 AC_CURSE 3 3 GETHIT 1 1 ATTRIBS 2 2 LIFE 7 7 MANA 7 7 +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 THE_NEEDLER SHORTBOW 2 8900 TOHIT 50 50 SETDAM 1 3 FASTATTACK 2 2 The Celestial Bow COMPOSITE_BOW LONGBOW 2 1200 NOMINSTR DAMMOD 2 2 SETAC 5 5 Deadly Hunter DEADLY_HUNTER COMPBOW 3 8750 3XDAMVDEM TOHIT 20 20 MAG_CURSE 5 5 Bow of the Dead DEADLY_HUNTER COMPBOW 5 2500 TOHIT 10 10 DEX 4 4 VIT_CURSE 3 3 LIGHT_CURSE 2 2 SETDUR 30 30 -The Blackoak Bow HUNTERS_BOW LONGBOW 5 2500 DEX 10 10 VIT_CURSE 10 10 DAMP 50 50 LIGHT_CURSE 1 1 -Flamedart HUNTERS_BOW HUNTBOW 10 14250 FIRE_ARROWS 0 0 FIREDAM 1 6 TOHIT 20 20 FIRERES 40 40 -Fleshstinger HUNTERS_BOW LONGBOW 13 16500 DEX 15 15 TOHIT 40 40 DAMP 80 80 DUR 6 6 +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 WINDFORCE WARBOW 17 37750 STR 5 5 DAMP 200 200 KNOCKBACK Eaglehorn DEADLY_HUNTER BATTLEBOW 26 42500 DEX 20 20 TOHIT 50 50 DAMP 100 100 INDESTRUCTIBLE Gonnagal's Dirk GONNAGALS_DIRK DAGGER 1 7040 DEX_CURSE 5 5 DAMMOD 4 4 FASTATTACK 2 2 FIRERES 25 25 -The Defender SABRE SABRE 1 2000 SETAC 5 5 VIT 5 5 TOHIT_CURSE 5 5 +The Defender SABRE 1 2000 SETAC 5 5 VIT 5 5 TOHIT_CURSE 5 5 Gryphon's Claw GRYPHONS_CLAW FALCHION 1 1000 DAMP 100 100 MAG_CURSE 2 2 DEX_CURSE 5 5 Black Razor BLACK_RAZOR DAGGER 1 2000 DAMP 150 150 VIT 2 2 SETDUR 5 5 -Gibbous Moon BROAD_SWORD BROADSWR 2 6660 ATTRIBS 2 2 DAMP 25 25 MANA 15 15 LIGHT_CURSE 3 3 -Ice Shank LONG_SWORD LONGSWR 3 5250 FIRERES 40 40 SETDUR 15 15 STR 5 10 +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 THE_EXECUTIONERS_BLADE FALCHION 3 7080 DAMP 150 150 LIFE_CURSE 10 10 LIGHT_CURSE 1 1 DUR 200 200 -The Bonesaw CLAYMORE 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 BROAD_SWORD BROADSWR 8 13750 LIGHT_CURSE 2 2 STEALLIFE 5 5 TOHIT 15 15 ALLRES 5 5 +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 WIZARDSPIKE DAGGER 11 12920 MAG 15 15 MANA 35 35 TOHIT 25 25 ALLRES 15 15 -Lightsabre SABRE SABRE 13 19150 LIGHT 2 2 LIGHTDAM 1 10 TOHIT 20 20 LIGHTRES 50 50 +Lightsabre SABRE 13 19150 LIGHT 2 2 LIGHTDAM 1 10 TOHIT 20 20 LIGHTRES 50 50 The Falcon's Talon GRYPHONS_CLAW SCIMITAR 15 7867 FASTATTACK 4 4 TOHIT 20 20 DAMP_CURSE 33 33 DEX 10 10 -Inferno LONG_SWORD LONGSWR 17 34600 FIREDAM 2 12 LIGHT 3 3 MANA 20 20 FIRERES 80 80 -Doombringer BASTARD_SWORD BASTARDSWR 19 18250 TOHIT 25 25 DAMP 250 250 ATTRIBS_CURSE 5 5 LIFE_CURSE 25 25 LIGHT_CURSE 2 2 +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 THE_GRIZZLY TWOHANDSWR 23 50000 STR 20 20 VIT_CURSE 5 5 DAMP 200 200 KNOCKBACK DUR 100 100 The Grandfather THE_GRANDFATHER GREATSWR 27 119800 ONEHAND ATTRIBS 5 5 TOHIT 20 20 DAMP 70 70 LIFE 20 20 The Mangler AXE LARGEAXE 2 2850 DAMP 200 200 DEX_CURSE 5 5 MAG_CURSE 5 5 MANA_CURSE 10 10 Sharp Beak GREAT_AXE LARGEAXE 2 2850 LIFE 20 20 MAG_CURSE 10 10 MANA_CURSE 10 10 BloodSlayer AXE BROADAXE 3 2500 DAMP 100 100 3XDAMVDEM ATTRIBS_CURSE 5 5 SPLLVLADD -1 -1 -The Celestial Axe BATTLE_AXE BATTLEAXE 4 14100 NOMINSTR TOHIT 15 15 LIFE 15 15 STR_CURSE 15 15 +The Celestial Axe BATTLEAXE 4 14100 NOMINSTR TOHIT 15 15 LIFE 15 15 STR_CURSE 15 15 Wicked Axe GREAT_AXE LARGEAXE 5 31150 TOHIT 30 30 DEX 10 10 VIT_CURSE 10 10 GETHIT 1 6 INDESTRUCTIBLE Stonecleaver STONECLEAVER BROADAXE 7 23900 LIFE 30 30 TOHIT 20 20 DAMP 50 50 LIGHTRES 40 40 -Aguinara's Hatchet SMALL_AXE SMALLAXE 12 24800 SPLLVLADD 1 1 MAG 10 10 MAGICRES 80 80 -Hellslayer BATTLE_AXE BATTLEAXE 15 26200 STR 8 8 VIT 8 8 DAMP 100 100 LIFE 25 25 MANA_CURSE 25 25 +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 MESSERSCHMIDTS_REAVER GREATAXE 25 58000 DAMP 200 200 DAMMOD 15 15 ATTRIBS 5 5 LIFE_CURSE 50 50 FIREDAM 2 12 -Crackrust MACE MACE 1 11375 ATTRIBS 2 2 INDESTRUCTIBLE ALLRES 15 15 DAMP 50 50 SPLLVLADD -1 -1 -Hammer of Jholm MAUL MAUL 1 8700 DAMP 4 10 INDESTRUCTIBLE STR 3 3 TOHIT 15 15 -Civerb's Cudgel MACE MACE 1 2000 3XDAMVDEM DEX_CURSE 5 5 MAG_CURSE 2 2 -The Celestial Star FLAIL FLAIL 2 7810 NOMINSTR LIGHT 2 2 DAMMOD 10 10 AC_CURSE 8 8 -Baranar's Star MORNING_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 SPIKED_CLUB 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 MAUL 12 36500 DAMMOD 20 20 STR 15 15 INDESTRUCTIBLE MANA_CURSE 150 150 ALLRES 5 5 -Schaefer's Hammer WAR_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 MACE 26 26450 MAG 30 30 MANA 50 50 MAGICRES 50 50 LIGHT 2 2 SPLLVLADD 1 1 -Staff of Shadows LONG_STAFF LONGSTAFF 2 1250 MAG_CURSE 10 10 TOHIT 10 10 DAMP 60 60 LIGHT_CURSE 2 2 FASTATTACK 1 1 -Immolator LONG_STAFF LONGSTAFF 4 3900 FIRERES 20 20 FIREDAM 4 4 MANA 10 10 VIT_CURSE 5 5 -Storm Spire WAR_STAFF WARSTAFF 8 22500 LIGHTRES 50 50 LIGHTDAM 2 8 STR 10 10 MAG_CURSE 10 10 -Gleamsong SHORT_STAFF SHORTSTAFF 8 6520 MANA 25 25 STR_CURSE 3 3 VIT_CURSE 3 3 SPELL 10 76 -Thundercall COMPOSITE_STAFF COMPSTAFF 14 22250 TOHIT 35 35 LIGHTDAM 1 10 SPELL 3 76 LIGHTRES 30 30 LIGHT 2 2 +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 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 +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 +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 THE_PROTECTOR SHORTSTAFF 16 17240 VIT 5 5 GETHIT 5 5 SETAC 40 40 SPELL 2 86 THORNS 1 3 -Naj's Puzzler LONG_STAFF LONGSTAFF 18 34000 MAG 20 20 DEX 10 10 ALLRES 20 20 SPELL 23 57 LIFE_CURSE 25 25 -Mindcry SHORT_STAFF QUARSTAFF 20 41500 MAG 15 15 SPELL 13 69 ALLRES 15 15 SPLLVLADD 1 1 -Rod of Onan WAR_STAFF WARSTAFF 22 44167 SPELL 21 50 DAMP 100 100 ATTRIBS 5 5 +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_OF_SPIRITS HELM 1 7525 STEALLIFE 5 5 Thinking Cap THINKING_CAP SKULLCAP 6 2020 MANA 30 30 SPLLVLADD 2 2 ALLRES 20 20 SETDUR 1 1 OverLord's Helm OVERLORDS_HELM HELM 7 12500 STR 20 20 DEX 15 15 VIT 5 5 MAG_CURSE 20 20 SETDUR 15 15 @@ -69,16 +69,16 @@ Fool's Crest FOOLS_CREST HELM 12 10150 ATTRIBS_CURSE 4 4 LIFE 100 100 GETHIT_CUR Gotterdamerung VEIL_OF_STEEL GREATHELM 21 54900 ATTRIBS 20 20 SETAC 60 60 GETHIT 4 4 ALLRESZERO LIGHT_CURSE 4 4 Royal Circlet ROYAL_CIRCLET CROWN 27 24875 ATTRIBS 10 10 MANA 40 40 SETAC 40 40 LIGHT 1 1 Torn Flesh of Souls TORN_FLESH_OF_SOULS RAGS 2 4825 SETAC 8 8 VIT 10 10 GETHIT 1 1 INDESTRUCTIBLE -The Gladiator's Bane STUDDED_LEATHER_ARMOR STUDARMOR 6 3450 SETAC 25 25 GETHIT 2 2 DUR 200 200 ATTRIBS_CURSE 3 3 +The Gladiator's Bane STUDARMOR 6 3450 SETAC 25 25 GETHIT 2 2 DUR 200 200 ATTRIBS_CURSE 3 3 The Rainbow Cloak THE_RAINBOW_CLOAK CLOAK 2 4900 SETAC 10 10 ATTRIBS 1 1 ALLRES 10 10 LIFE 5 5 DUR 50 50 -Leather of Aut LEATHER_ARMOR LEATHARMOR 4 10550 SETAC 15 15 STR 5 5 MAG_CURSE 5 5 DEX 5 5 INDESTRUCTIBLE +Leather of Aut LEATHARMOR 4 10550 SETAC 15 15 STR 5 5 MAG_CURSE 5 5 DEX 5 5 INDESTRUCTIBLE Wisdom's Wrap THE_RAINBOW_CLOAK ROBE 5 6200 MAG 5 5 MANA 10 10 LIGHTRES 25 25 SETAC 15 15 GETHIT 1 1 -Sparking Mail CHAIN_MAIL CHAINMAIL 9 15750 SETAC 30 30 LIGHTDAM 1 10 -Scavenger Carapace BREAST_PLATE BREASTPLATE 13 14000 GETHIT 15 15 AC_CURSE 30 30 DEX 5 5 LIGHTRES 40 40 +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 THE_RAINBOW_CLOAK CAPE 16 11600 FASTRECOVER 2 2 LIGHT_CURSE 4 4 SETAC 15 15 DEX 3 3 ALLRES 20 20 Naj's Light Plate NAJS_LIGHT_PLATE PLATEMAIL 19 78700 NOMINSTR MAG 5 5 MANA 20 20 ALLRES 20 20 SPLLVLADD 1 1 -Demonspike Coat FULL_PLATE_MAIL FULLPLATE 25 251175 SETAC 100 100 GETHIT 6 6 STR 10 10 INDESTRUCTIBLE FIRERES 50 50 -The Deflector BUCKLER BUCKLER 1 1500 SETAC 7 7 ALLRES 10 10 DAMP_CURSE 20 20 TOHIT_CURSE 5 5 +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 Split Skull Shield SPLIT_SKULL_SHIELD BUCKLER 1 2025 SETAC 10 10 LIFE 10 10 STR 2 2 LIGHT_CURSE 1 1 SETDUR 15 15 Dragon's Breach DRAGONS_BREACH KITESHIELD 2 19200 FIRERES 25 25 STR 5 5 SETAC 20 20 MAG_CURSE 5 5 INDESTRUCTIBLE Blackoak Shield BLACKOAK_SHIELD SMALLSHIELD 4 5725 DEX 10 10 VIT_CURSE 10 10 SETAC 18 18 LIGHT_CURSE 1 1 DUR 150 150 @@ -102,7 +102,7 @@ Flambeau FLAMBEAU COMPBOW 11 30000 FIREBALL 15 20 SETDAM 0 0 INDESTRUCTIBLE Armor of Gloom ARMOR_OF_GLOOM FULLPLATE 25 200000 NOMINSTR SETAC 225 225 ALLRESZERO LIGHT_CURSE 2 2 Blitzen BLITZEN COMPBOW 13 30000 ADDACLIFE 10 15 SETDAM 0 0 INDESTRUCTIBLE Thunderclap THUNDERCLAP WARHAMMER 13 30000 ADDMANAAC 3 6 STR 20 20 LIGHTRES 30 30 LIGHT 2 2 INDESTRUCTIBLE -Shirotachi GREAT_SWORD GREATSWR 21 36000 ONEHAND FASTATTACK 4 4 TARGAC 2 2 LIGHTDAM 6 6 +Shirotachi GREATSWR 21 36000 ONEHAND FASTATTACK 4 4 TARGAC 2 2 LIGHTDAM 6 6 Eater of Souls EATER_OF_SOULS TWOHANDSWR 23 42000 INDESTRUCTIBLE LIFE 50 50 STEALLIFE 5 5 STEALMANA 5 5 DRAINLIFE Diamondedge DIAMONDEDGE LONGSWR 17 42000 SETDUR 10 10 TOHIT 50 50 DAMP 100 100 LIGHTRES 50 50 SETAC 10 10 Bone Chain Armor BONE_CHAIN_ARMOR CHAINMAIL 13 36000 SETAC 40 40 ACUNDEAD