Implement SCRIPT_COMMAND_CAST_CUSTOM_SPELL

Example of command usage: boarding a passenger into a vehicle on a predefined seat id Signed-off-by: Xfurry <xfurry.cmangos@outlook.com>
cmangos · Dec 30, 2017 · df14c11 · df14c11
1 parent f94c280
commit df14c11
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 0 deletions.
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
@@ -359,3 +359,8 @@ Defining a buddy could be done in several way:
                                             * source and target of command define source and target of launched dbscript
                                             * datalong = dbscripts_on_relay id
                                             * datalong2 = dbscript_random_templates id
+
+46 SCRIPT_COMMAND_CAST_CUSTOM_SPELL         resultingSource = Unit, cast spell at resultingTarget = Unit
+                                            * datalong = spell id
+                                            * datalong2 = TriggerCastFlags
+                                            * dataint1-dataint3 define the &bp for the spell. At least one field is required.
diff --git a/src/game/DBScripts/ScriptMgr.cpp b/src/game/DBScripts/ScriptMgr.cpp
@@ -760,6 +760,21 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
                 }
                 break;
             }
+            case SCRIPT_COMMAND_CAST_CUSTOM_SPELL:          // 46
+            {
+                if (!sSpellTemplate.LookupEntry<SpellEntry>(tmp.castSpell.spellId))
+                {
+                    sLog.outErrorDb("Table `%s` using nonexistent spell (id: %u) in SCRIPT_COMMAND_CAST_CUSTOM_SPELL for script id %u",
+                        tablename, tmp.castSpell.spellId, tmp.id);
+                    continue;
+                }
+                if (tmp.textId[0] == 0 && tmp.textId[1] == 0 && tmp.textId[2] == 0)
+                {
+                    sLog.outErrorDb("Table `%s` has invalid BP values (dataint = %u, dataint2 = %u, dataint3 = %u) in SCRIPT_COMMAND_CAST_CUSTOM_SPELL for script id %u. At least one field has to be populated.", tablename, tmp.textId[0], tmp.textId[1], tmp.textId[2], tmp.id);
+                    continue;
+                }
+                break;
+            }
             default:
             {
                 sLog.outErrorDb("Table `%s` unknown command %u, skipping.", tablename, tmp.command);
@@ -2319,6 +2334,16 @@ bool ScriptAction::HandleScriptStep()
                 m_map->ScriptsStart(sRelayScripts, chosenId, pSource, pTarget);
             break;
         }
+        case SCRIPT_COMMAND_CAST_CUSTOM_SPELL:              // 46
+        {
+            if (LogIfNotUnit(pTarget))
+                break;
+            if (LogIfNotUnit(pSource))
+                break;
+
+            ((Unit*)pSource)->CastCustomSpell((Unit*)pTarget, m_script->castCustomSpell.spellId, &m_script->textId[0], &m_script->textId[1], &m_script->textId[2], m_script->castCustomSpell.castFlags);
+            break;
+        }
         default:
             sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u unknown command used.", m_table, m_script->id, m_script->command);
             break;

diff --git a/src/game/DBScripts/ScriptMgr.h b/src/game/DBScripts/ScriptMgr.h
@@ -122,6 +122,10 @@ enum ScriptCommand                                          // resSource, resTar
     // datalong = new Creature entry
     // datalong2 = Alliance(0) Horde(1), other values throw error
     SCRIPT_COMMAND_START_RELAY_SCRIPT       = 45,           // datalong = relayId, datalong2 = random template Id
+    SCRIPT_COMMAND_CAST_CUSTOM_SPELL        = 46,           // resSource = Unit, cast spell at resTarget = Unit
+    // datalong=spellid
+    // datalong2=castFlags, enum TriggerCastFlags
+    // dataint1-3 define the &bp value for the spell. At least one field is required.
 };
 
 #define MAX_TEXT_ID 4                                       // used for SCRIPT_COMMAND_TALK, SCRIPT_COMMAND_EMOTE, SCRIPT_COMMAND_CAST_SPELL, SCRIPT_COMMAND_TERMINATE_SCRIPT
@@ -406,6 +410,12 @@ struct ScriptInfo
             uint32 templateId;                              // datalong2
         } relayScript;
 
+        struct                                              // SCRIPT_COMMAND_CAST_CUSTOM_SPELL (46)
+        {
+            uint32 spellId;                                 // datalong
+            uint32 castFlags;                               // datalong2
+        } castCustomSpell;
+
         struct
         {
             uint32 data[3];