diff options
| -rw-r--r-- | sql/updates/world/2011_09_04_00_world_quest_template.sql (renamed from sql/updates/world/2011_09_04_world_quest_template.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/world/2011_09_04_01_world_trinity_string.sql | 3 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.h | 7 | ||||
| -rwxr-xr-x | src/server/game/Miscellaneous/Language.h | 1 |
5 files changed, 12 insertions, 1 deletions
diff --git a/sql/updates/world/2011_09_04_world_quest_template.sql b/sql/updates/world/2011_09_04_00_world_quest_template.sql index 4ff774b65b4..4ff774b65b4 100644 --- a/sql/updates/world/2011_09_04_world_quest_template.sql +++ b/sql/updates/world/2011_09_04_00_world_quest_template.sql diff --git a/sql/updates/world/2011_09_04_01_world_trinity_string.sql b/sql/updates/world/2011_09_04_01_world_trinity_string.sql new file mode 100644 index 00000000000..0f36a362db9 --- /dev/null +++ b/sql/updates/world/2011_09_04_01_world_trinity_string.sql @@ -0,0 +1,3 @@ +DELETE FROM `trinity_string` WHERE `entry`=5030; +INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES +(5030, '%s attempts to run away in fear!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 0de13280376..680c0815c6b 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -692,6 +692,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u return; me->DoFleeToGetAssistance(); + if (e.action.flee.withEmote) + sCreatureTextMgr->SendChatString(me, sObjectMgr->GetTrinityStringForDBCLocale(LANG_FLEE), CHAT_MSG_MONSTER_EMOTE); sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_FLEE_FOR_ASSIST: Creature %u DoFleeToGetAssistance", me->GetGUIDLow()); break; } diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index d6235b05667..de60737f3b6 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -383,7 +383,7 @@ enum SMART_ACTION SMART_ACTION_SET_EVENT_PHASE = 22, // Phase SMART_ACTION_INC_EVENT_PHASE = 23, // Value (may be negative to decrement phase, should not be 0) SMART_ACTION_EVADE = 24, // No Params - SMART_ACTION_FLEE_FOR_ASSIST = 25, // No Params + SMART_ACTION_FLEE_FOR_ASSIST = 25, // With Emote SMART_ACTION_CALL_GROUPEVENTHAPPENS = 26, // QuestID SMART_ACTION_CALL_CASTEDCREATUREORGO = 27, // CreatureId, SpellId SMART_ACTION_REMOVEAURASFROMSPELL = 28, // Spellid @@ -854,6 +854,11 @@ struct SmartAction struct { + uint32 withEmote; + } flee; + + struct + { uint32 param1; uint32 param2; uint32 param3; diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index e824a3cf5da..9e8a4b17f84 100755 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -943,6 +943,7 @@ enum TrinityStrings LANG_GOINFO_LOOTID = 5028, LANG_COMMAND_LOOKUP_MAX_RESULTS = 5029, // Room for more Trinity strings 5030-9999 + LANG_FLEE = 5030, // Level requirement notifications LANG_SAY_REQ = 6604, |