Changeset 109 for trunk/src/bindings/scripts/scripts/creature

Timestamp:

11/19/08 13:36:49 (17 years ago)

Author:

yumileroy

Message:

[svn] Update trinityscript to SD2 rev 700. Source: scriptdev2. Patch provided by SLG.

Original author: megamage
Date: 2008-10-25 11:40:10-05:00

Location:

trunk/src/bindings/scripts/scripts/creature

Files:

• mob_event_ai.cpp (modified) (2 diffs)
• mob_event_ai.h (modified) (3 diffs)

trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp

@@ -524 +524 @@
         switch (type)
         {
-        case ACTION_T_SAY:
-            DoSay(GetEventAIText(param1), LANG_UNIVERSAL, pActionInvoker ? pActionInvoker : m_creature->getVictim());
-            break;
-        case ACTION_T_YELL:
-            DoYell(GetEventAIText(param1), LANG_UNIVERSAL, pActionInvoker ? pActionInvoker : m_creature->getVictim());
-            break;
-        case ACTION_T_TEXTEMOTE:
-            DoTextEmote(GetEventAIText(param1), pActionInvoker ? pActionInvoker : m_creature->getVictim());
+        case ACTION_T_TEXT:
+            {
+                if (!param1)
+                    return;
+
+                uint32 temp = 0;
+
+                if (param2 && param3)
+                {
+                    switch( rand()%3 )
+                    {
+                        case 0: temp = param1; break;
+                        case 2: temp = param2; break;
+                        case 3: temp = param3; break;
+                    }
+                }else if ( param2 && urand(0,1) )
+                {
+                    temp = param2;
+                }else
+                {
+                    temp = param1;
+                }
+
+                if (temp)
+                {
+                    Unit* target = NULL;
+                    Unit* owner = NULL;
+
+                    if (pActionInvoker)
+                    {
+                        if (pActionInvoker->GetTypeId() == TYPEID_PLAYER)
+                            target = pActionInvoker;
+                        else if (owner = pActionInvoker->GetOwner())
+                        {
+                            if (owner->GetTypeId() == TYPEID_PLAYER)
+                                target = owner;
+                        }
+                    }
+                    else if (target = m_creature->getVictim())
+                    {
+                        if (target->GetTypeId() != TYPEID_PLAYER)
+                        {
+                            if (owner = target->GetOwner())
+                            {
+                                if (owner->GetTypeId() == TYPEID_PLAYER)
+                                    target = owner;
+                            }
+                        }
+                    }
+
+                    DoScriptText(temp, m_creature, target);
+                }
+            }
             break;
         case ACTION_T_SOUND:
@@ -538 +583 @@
         case ACTION_T_EMOTE:
             m_creature->HandleEmoteCommand(param1);
-            break;
-        case ACTION_T_RANDOM_SAY:
-            {
-                uint32 temp = GetRandActionParam(rnd, param1, param2, param3);
-
-                if (temp != 0xffffffff)
-                    DoSay(GetEventAIText(temp), LANG_UNIVERSAL, pActionInvoker ? pActionInvoker : m_creature->getVictim());
-            }
-            break;
-        case ACTION_T_RANDOM_YELL:
-            {
-                uint32 temp = GetRandActionParam(rnd, param1, param2, param3);
-
-                if (temp != 0xffffffff)
-                    DoYell(GetEventAIText(temp), LANG_UNIVERSAL, pActionInvoker ? pActionInvoker : m_creature->getVictim());
-            }
-            break;
-        case ACTION_T_RANDOM_TEXTEMOTE:
-            {
-                uint32 temp = GetRandActionParam(rnd, param1, param2, param3);
-
-                if (temp != 0xffffffff)
-                    DoTextEmote(GetEventAIText(temp), pActionInvoker ? pActionInvoker : m_creature->getVictim());
-            }
             break;
         case ACTION_T_RANDOM_SOUND:

trunk/src/bindings/scripts/scripts/creature/mob_event_ai.h

@@ -31 +31 @@
     EVENT_T_QUEST_ACCEPT            = 19,   //QuestID
     EVENT_T_QUEST_COMPLETE          = 20,   //
-    
+
     EVENT_T_END,
 };
@@ -38 +38 @@
 {
     ACTION_T_NONE                   = 0,    //No action
-    ACTION_T_SAY                    = 1,    //TextId
-    ACTION_T_YELL                   = 2,    //TextId
-    ACTION_T_TEXTEMOTE              = 3,    //TextId
+    ACTION_T_TEXT                   = 1,    //-TextId1, optionally -TextId2, optionally -TextId3(if -TextId2 exist). If more than just -TextId1 is defined, randomize. Negative values.
+    ACTION_T_YELL                   = 2,    //UNUSED
+    ACTION_T_TEXTEMOTE              = 3,    //UNUSED
     ACTION_T_SOUND                  = 4,    //SoundId
     ACTION_T_EMOTE                  = 5,    //EmoteId
-    ACTION_T_RANDOM_SAY             = 6,    //TextId1, TextId2, TextId3 (-1 in any field means no output if randomed that field)
-    ACTION_T_RANDOM_YELL            = 7,    //TextId1, TextId2, TextId3 (-1 in any field means no output if randomed that field)
-    ACTION_T_RANDOM_TEXTEMOTE       = 8,    //TextId1, TextId2, TextId3 (-1 in any field means no output if randomed that field)
+    ACTION_T_RANDOM_SAY             = 6,    //UNUSED
+    ACTION_T_RANDOM_YELL            = 7,    //UNUSED
+    ACTION_T_RANDOM_TEXTEMOTE       = 8,    //UNUSED
     ACTION_T_RANDOM_SOUND           = 9,    //SoundId1, SoundId2, SoundId3 (-1 in any field means no output if randomed that field)
     ACTION_T_RANDOM_EMOTE           = 10,   //EmoteId1, EmoteId2, EmoteId3 (-1 in any field means no output if randomed that field)
@@ -209 +209 @@
 
 //Error prevention list
-extern HM_NAMESPACE::hash_map<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList; 
+extern HM_NAMESPACE::hash_map<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList;
 
 //Defines