diff --git a/Source/Framework/Constants/ItemConst.cs b/Source/Framework/Constants/ItemConst.cs index f01c76407..eb54b0f5a 100644 --- a/Source/Framework/Constants/ItemConst.cs +++ b/Source/Framework/Constants/ItemConst.cs @@ -1495,7 +1495,6 @@ namespace Framework.Constants // One-handed AxeMaceSword1H, Dagger, - Fist, Invalid } diff --git a/Source/Game/Entities/Item/Item.cs b/Source/Game/Entities/Item/Item.cs index c109ebc6c..651b5d226 100644 --- a/Source/Game/Entities/Item/Item.cs +++ b/Source/Game/Entities/Item/Item.cs @@ -1513,36 +1513,9 @@ namespace Game.Entities if (proto.HasFlag(ItemFlags2.NoAlterItemVisual)) return false; - if (!HasStats()) - return false; - return true; } - bool HasStats() - { - ItemTemplate proto = GetTemplate(); - Player owner = GetOwner(); - for (byte i = 0; i < ItemConst.MaxStats; ++i) - { - if ((owner != null ? GetItemStatValue(i, owner) : proto.GetStatPercentEditor(i)) != 0) - return true; - } - - return false; - } - - static bool HasStats(ItemInstance itemInstance, BonusData bonus) - { - for (byte i = 0; i < ItemConst.MaxStats; ++i) - { - if (bonus.StatPercentEditor[i] != 0) - return true; - } - - return false; - } - static ItemTransmogrificationWeaponCategory GetTransmogrificationWeaponCategory(ItemTemplate proto) { if (proto.GetClass() == ItemClass.Weapon) @@ -1563,11 +1536,10 @@ namespace Game.Entities case ItemSubClassWeapon.Mace: case ItemSubClassWeapon.Sword: case ItemSubClassWeapon.Warglaives: + case ItemSubClassWeapon.Fist: return ItemTransmogrificationWeaponCategory.AxeMaceSword1H; case ItemSubClassWeapon.Dagger: return ItemTransmogrificationWeaponCategory.Dagger; - case ItemSubClassWeapon.Fist: - return ItemTransmogrificationWeaponCategory.Fist; default: break; } diff --git a/Source/Game/Entities/Player/CollectionManager.cs b/Source/Game/Entities/Player/CollectionManager.cs index ce7b1ac6e..c85fe0ec5 100644 --- a/Source/Game/Entities/Player/CollectionManager.cs +++ b/Source/Game/Entities/Player/CollectionManager.cs @@ -543,22 +543,6 @@ namespace Game.Entities } } - uint[] PlayerClassByArmorSubclass = - { - (int)Class.ClassMaskAllPlayable, //ITEM_SUBCLASS_ARMOR_MISCELLANEOUS - (1 << ((int)Class.Priest - 1)) | (1 << ((int)Class.Mage - 1)) | (1 << ((int)Class.Warlock - 1)), //ITEM_SUBCLASS_ARMOR_CLOTH - (1 << ((int)Class.Rogue - 1)) | (1 << ((int)Class.Monk - 1)) | (1 << ((int)Class.Druid - 1)) | (1 << ((int)Class.DemonHunter - 1)), //ITEM_SUBCLASS_ARMOR_LEATHER - (1 << ((int)Class.Hunter - 1)) | (1 << ((int)Class.Shaman - 1)) | (1 << ((int)Class.Evoker - 1)), //ITEM_SUBCLASS_ARMOR_MAIL - (1 << ((int)Class.Warrior - 1)) | (1 << ((int)Class.Paladin - 1)) | (1 << ((int)Class.Deathknight - 1)), //ITEM_SUBCLASS_ARMOR_PLATE - (int)Class.ClassMaskAllPlayable, //ITEM_SUBCLASS_ARMOR_BUCKLER - (1 << ((int)Class.Warrior - 1)) | (1 << ((int)Class.Paladin - 1)) | (1 << ((int)Class.Shaman - 1)), //ITEM_SUBCLASS_ARMOR_SHIELD - 1 << ((int)Class.Paladin - 1), //ITEM_SUBCLASS_ARMOR_LIBRAM - 1 << ((int)Class.Druid - 1), //ITEM_SUBCLASS_ARMOR_IDOL - 1 << ((int)Class.Shaman - 1), //ITEM_SUBCLASS_ARMOR_TOTEM - 1 << ((int)Class.Deathknight - 1), //ITEM_SUBCLASS_ARMOR_SIGIL - (1 << ((int)Class.Paladin - 1)) | (1 << ((int)Class.Deathknight - 1)) | (1 << ((int)Class.Shaman - 1)) | (1 << ((int)Class.Druid - 1)), //ITEM_SUBCLASS_ARMOR_RELIC - }; - public void AddItemAppearance(Item item) { if (!item.IsSoulBound()) @@ -601,12 +585,6 @@ namespace Game.Entities if (itemTemplate == null) return false; - if (_owner.GetPlayer() == null) - return false; - - if (_owner.GetPlayer().CanUseItem(itemTemplate) != InventoryResult.Ok) - return false; - if (itemTemplate.HasFlag(ItemFlags2.NoSourceForItemVisual) || itemTemplate.GetQuality() == ItemQuality.Artifact) return false; @@ -614,8 +592,6 @@ namespace Game.Entities { case ItemClass.Weapon: { - if (!Convert.ToBoolean(_owner.GetPlayer().GetWeaponProficiency() & (1 << (int)itemTemplate.GetSubClass()))) - return false; if (itemTemplate.GetSubClass() == (int)ItemSubClassWeapon.Exotic || itemTemplate.GetSubClass() == (int)ItemSubClassWeapon.Exotic2 || itemTemplate.GetSubClass() == (int)ItemSubClassWeapon.Miscellaneous || @@ -650,9 +626,6 @@ namespace Game.Entities default: return false; } - if (itemTemplate.GetInventoryType() != InventoryType.Cloak) - if (!Convert.ToBoolean(PlayerClassByArmorSubclass[itemTemplate.GetSubClass()] & _owner.GetPlayer().GetClassMask())) - return false; break; } default: @@ -664,6 +637,7 @@ namespace Game.Entities return true; } + //todo check this void AddItemAppearance(ItemModifiedAppearanceRecord itemModifiedAppearance) {