* add armor output in .npc info

--HG--
branch : trunk
This commit is contained in:
Brian
2010-01-10 16:11:24 -07:00
parent 6b05543087
commit 1e7087c75c
4 changed files with 7 additions and 1 deletions
@@ -0,0 +1,3 @@
DELETE FROM `trinity_string` WHERE `entry`=5021;
INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES (5021, 'Armor: %u');
+1
View File
@@ -7657,6 +7657,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
(5018, '[Heroic reset time: %s]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (5018, '[Heroic reset time: %s]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5019, '[Mountable]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (5019, '[Mountable]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5020, 'Phasemask: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (5020, 'Phasemask: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5021, 'Armor: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6613, '|cfff00000[GM Announcement]: %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6613, '|cfff00000[GM Announcement]: %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6614, 'Notification to GM''s - ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6614, 'Notification to GM''s - ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6615, '|cffffff00[|c1f40af20GM Announce by|r |cffff0000%s|cffffff00]:|r %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6615, '|cffffff00[|c1f40af20GM Announce by|r |cffff0000%s|cffffff00]:|r %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+2 -1
View File
@@ -886,7 +886,8 @@ enum TrinityStrings
LANG_HEROIC = 5018, LANG_HEROIC = 5018,
LANG_MOUNTABLE = 5019, LANG_MOUNTABLE = 5019,
LANG_NPCINFO_PHASEMASK = 5020, LANG_NPCINFO_PHASEMASK = 5020,
// Room for more Trinity strings 5021-9999 LANG_NPCINFO_ARMOR = 5021,
// Room for more Trinity strings 5022-9999
// Used for GM Announcements // Used for GM Announcements
LANG_GM_BROADCAST = 6613, LANG_GM_BROADCAST = 6613,
LANG_GM_NOTIFY = 6614, LANG_GM_NOTIFY = 6614,
+1
View File
@@ -4612,6 +4612,7 @@ bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/)
PSendSysMessage(LANG_NPCINFO_LOOT, cInfo->lootid,cInfo->pickpocketLootId,cInfo->SkinLootId); PSendSysMessage(LANG_NPCINFO_LOOT, cInfo->lootid,cInfo->pickpocketLootId,cInfo->SkinLootId);
PSendSysMessage(LANG_NPCINFO_DUNGEON_ID, target->GetInstanceId()); PSendSysMessage(LANG_NPCINFO_DUNGEON_ID, target->GetInstanceId());
PSendSysMessage(LANG_NPCINFO_PHASEMASK, target->GetPhaseMask()); PSendSysMessage(LANG_NPCINFO_PHASEMASK, target->GetPhaseMask());
PsendSysMessage(LANG_NPCINFO_ARMOR, target->GetArmor());
PSendSysMessage(LANG_NPCINFO_POSITION,float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ())); PSendSysMessage(LANG_NPCINFO_POSITION,float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ()));
if(const CreatureData* const linked = target->GetLinkedRespawnCreatureData()) if(const CreatureData* const linked = target->GetLinkedRespawnCreatureData())
if(CreatureInfo const *master = GetCreatureInfo(linked->id)) if(CreatureInfo const *master = GetCreatureInfo(linked->id))