diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-13 17:10:26 -0700 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-13 17:10:26 -0700 |
| commit | 731b0cc587a1d191413bd8f10b3201b6e00df54f (patch) | |
| tree | 97b327609c4cd1d6b6e7e3cd6fabf1812749ff84 | |
| parent | 2c4de60a66b0af8dd02e645f4ea694b71c1ac8d2 (diff) | |
| parent | 12ad39c43cc9ee576289203b76dc8faa0bfde517 (diff) | |
Merge pull request #7390 from Kiperr/2
Core/Player: Now players will able to equip all types of relics when mee...
| -rw-r--r-- | sql/updates/world/2012_08_14_00_reputation_spillover_template.sql | 3 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 28 |
2 files changed, 6 insertions, 25 deletions
diff --git a/sql/updates/world/2012_08_14_00_reputation_spillover_template.sql b/sql/updates/world/2012_08_14_00_reputation_spillover_template.sql index cc7e011ca43..afce8209afa 100644 --- a/sql/updates/world/2012_08_14_00_reputation_spillover_template.sql +++ b/sql/updates/world/2012_08_14_00_reputation_spillover_template.sql @@ -9,4 +9,5 @@ UPDATE `reputation_spillover_template` SET `faction5`=1133,`rate_5`=0.25,`rank_5 DELETE FROM `reputation_spillover_template` WHERE `faction` IN (1134,1133); INSERT INTO `reputation_spillover_template`(`faction`,`faction1`,`rate_1`,`rank_1`,`faction2`,`rate_2`,`rank_2`,`faction3`,`rate_3`,`rank_3`,`faction4`,`rate_4`,`rank_4`,`faction5`,`rate_5`,`rank_5`) VALUES (1134,72,0.25,7,47,0.27,7,54,0.25,7,930,0.25,7,69,0.25,7), -(1133,76,0.25,7,530,0.27,7,911,0.25,7,81,0.25,7,68,0.25,7),
\ No newline at end of file +(1133,76,0.25,7,530,0.27,7,911,0.25,7,81,0.25,7,68,0.25,7); + diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 188fdb5e9f4..17cead41795 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -9936,30 +9936,10 @@ uint8 Player::FindEquipSlot(ItemTemplate const* proto, uint32 slot, bool swap) c break; case INVTYPE_RELIC: { - switch (proto->SubClass) - { - case ITEM_SUBCLASS_ARMOR_LIBRAM: - if (playerClass == CLASS_PALADIN) - slots[0] = EQUIPMENT_SLOT_RANGED; - break; - case ITEM_SUBCLASS_ARMOR_IDOL: - if (playerClass == CLASS_DRUID) - slots[0] = EQUIPMENT_SLOT_RANGED; - break; - case ITEM_SUBCLASS_ARMOR_TOTEM: - if (playerClass == CLASS_SHAMAN) - slots[0] = EQUIPMENT_SLOT_RANGED; - break; - case ITEM_SUBCLASS_ARMOR_MISCELLANEOUS: - if (playerClass == CLASS_WARLOCK) - slots[0] = EQUIPMENT_SLOT_RANGED; - break; - case ITEM_SUBCLASS_ARMOR_SIGIL: - if (playerClass == CLASS_DEATH_KNIGHT) - slots[0] = EQUIPMENT_SLOT_RANGED; - break; - } - break; + if (playerClass == CLASS_PALADIN || playerClass == CLASS_DRUID || + playerClass == CLASS_SHAMAN || playerClass == CLASS_DEATH_KNIGHT) + slots[0] = EQUIPMENT_SLOT_RANGED; + break; } default: return NULL_SLOT; |