diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2018-08-28 11:50:02 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2018-08-28 12:05:05 +0200 |
| commit | 2c030ed5e7dc809e384415716789e0a663352d16 (patch) | |
| tree | 4f56b3dbca8333d678e526d3742c028c97eff990 | |
| parent | 7611242530e7037ecab9bc8a619628128b22fb6f (diff) | |
Scripts/Commands: .npc info now includes react state info
| -rw-r--r-- | sql/updates/world/3.3.5/2018_08_28_01_world.sql | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/UnitDefines.h | 9 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_npc.cpp | 1 |
4 files changed, 13 insertions, 1 deletions
diff --git a/sql/updates/world/3.3.5/2018_08_28_01_world.sql b/sql/updates/world/3.3.5/2018_08_28_01_world.sql new file mode 100644 index 00000000000..a95527b2d53 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_08_28_01_world.sql @@ -0,0 +1,2 @@ +DELETE FROM `trinity_string` WHERE `entry`=5018; +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES (5018,"React state: %s"); diff --git a/src/server/game/Entities/Unit/UnitDefines.h b/src/server/game/Entities/Unit/UnitDefines.h index f6b621731be..8c43a314999 100644 --- a/src/server/game/Entities/Unit/UnitDefines.h +++ b/src/server/game/Entities/Unit/UnitDefines.h @@ -340,6 +340,15 @@ enum ReactStates REACT_DEFENSIVE = 1, REACT_AGGRESSIVE = 2 }; +static char const* DescribeReactState(ReactStates state) { + switch (state) + { + case REACT_PASSIVE: return "PASSIVE"; + case REACT_DEFENSIVE: return "DEFENSIVE"; + case REACT_AGGRESSIVE: return "AGGRESSIVE"; + default: return "<Invalid react state>"; + } +} enum CommandStates : uint8 { diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 9917f0c5609..443f7fcff50 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -991,7 +991,7 @@ enum TrinityStrings LANG_BATTLEGROUND = 5015, LANG_ARENA = 5016, LANG_RAID = 5017, - // = 5018, unused + LANG_NPCINFO_REACTSTATE = 5018, LANG_COMMAND_TEMP_FROZEN_PLAYER = 5019, LANG_NPCINFO_PHASEMASK = 5020, LANG_NPCINFO_ARMOR = 5021, diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index db606da8c86..0a2085b57dd 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -813,6 +813,7 @@ public: handler->PSendSysMessage(LANG_NPCINFO_ARMOR, target->GetArmor()); handler->PSendSysMessage(LANG_NPCINFO_POSITION, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); handler->PSendSysMessage(LANG_OBJECTINFO_AIINFO, target->GetAIName().c_str(), target->GetScriptName().c_str()); + handler->PSendSysMessage(LANG_NPCINFO_REACTSTATE, DescribeReactState(target->GetReactState())); if (CreatureAI const* ai = target->AI()) handler->PSendSysMessage(LANG_OBJECTINFO_AITYPE, boost::core::demangle(typeid(*ai).name()).c_str()); handler->PSendSysMessage(LANG_NPCINFO_FLAGS_EXTRA, cInfo->flags_extra); |