aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-08-28 11:50:02 +0200
committerShauren <shauren.trinity@gmail.com>2021-10-23 14:33:21 +0200
commitdd239e8b0f945a70c9d738024bdc2d75d54575f4 (patch)
tree8cc62266db326c726cc6a4512d55df315525612d /src
parent437fb2aaba8850dd81a15d661c82403be9170c4e (diff)
Scripts/Commands: .npc info now includes react state info
(cherry picked from commit 2c030ed5e7dc809e384415716789e0a663352d16)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/UnitDefines.h12
-rw-r--r--src/server/game/Miscellaneous/Language.h5
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp1
3 files changed, 16 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/UnitDefines.h b/src/server/game/Entities/Unit/UnitDefines.h
index 8796809b2c8..c87d1afb91b 100644
--- a/src/server/game/Entities/Unit/UnitDefines.h
+++ b/src/server/game/Entities/Unit/UnitDefines.h
@@ -373,6 +373,18 @@ enum ReactStates
REACT_ASSIST = 3
};
+static char const* DescribeReactState(ReactStates state)
+{
+ switch (state)
+ {
+ case REACT_PASSIVE: return "PASSIVE";
+ case REACT_DEFENSIVE: return "DEFENSIVE";
+ case REACT_AGGRESSIVE: return "AGGRESSIVE";
+ case REACT_ASSIST: return "ASSIST";
+ default: return "<Invalid react state>";
+ }
+}
+
enum CommandStates : uint8
{
COMMAND_STAY = 0,
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h
index cd6eeae178f..36fd7717b2c 100644
--- a/src/server/game/Miscellaneous/Language.h
+++ b/src/server/game/Miscellaneous/Language.h
@@ -996,7 +996,7 @@ enum TrinityStrings
LANG_BATTLEGROUND = 5015,
LANG_ARENA = 5016,
LANG_RAID = 5017,
- LANG_NPCINFO_PHASE_IDS = 5018,
+ LANG_NPCINFO_REACTSTATE = 5018,
LANG_COMMAND_TEMP_FROZEN_PLAYER = 5019,
LANG_NPCINFO_PHASES = 5020,
LANG_NPCINFO_ARMOR = 5021,
@@ -1074,8 +1074,9 @@ enum TrinityStrings
LANG_NPCINFO_UNIT_FIELD_FLAGS_2 = 5084,
LANG_NPCINFO_UNIT_FIELD_FLAGS_3 = 5085,
LANG_NPCINFO_NPC_FLAGS = 5086,
+ LANG_NPCINFO_PHASE_IDS = 5087,
- // Room for more Trinity strings 5087-6603
+ // Room for more Trinity strings 5088-6603
// Level requirement notifications
LANG_SAY_REQ = 6604,
LANG_WHISPER_REQ = 6605,
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 229f1ea9b64..a4558463224 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -877,6 +877,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);