Scripts/Spells: Fix Argent Tournament mount spells:
* Break-Shield * Charge * Defend (visual) * Mounted duel * Faction Pennants when riding argent tournament mounts Closes #4917.
This commit is contained in:
@@ -5607,6 +5607,7 @@ void Spell::EffectDuel(SpellEffIndex effIndex)
|
||||
duel->opponent = target;
|
||||
duel->startTime = 0;
|
||||
duel->startTimer = 0;
|
||||
duel->isMounted = (GetSpellInfo()->Id == 62875); // Mounted Duel
|
||||
caster->duel = duel;
|
||||
|
||||
DuelInfo* duel2 = new DuelInfo;
|
||||
@@ -5614,6 +5615,7 @@ void Spell::EffectDuel(SpellEffIndex effIndex)
|
||||
duel2->opponent = caster;
|
||||
duel2->startTime = 0;
|
||||
duel2->startTimer = 0;
|
||||
duel2->isMounted = (GetSpellInfo()->Id == 62875); // Mounted Duel
|
||||
target->duel = duel2;
|
||||
|
||||
caster->SetUInt64Value(PLAYER_DUEL_ARBITER, pGameObj->GetGUID());
|
||||
|
||||
@@ -2889,6 +2889,22 @@ void SpellMgr::LoadSpellCustomAttr()
|
||||
case 69293: // Wing Buffet
|
||||
case 74439: // Machine Gun
|
||||
case 63278: // Mark of the Faceless (General Vezax)
|
||||
case 62544: // Thrust (Argent Tournament)
|
||||
case 64588: // Thrust (Argent Tournament)
|
||||
case 66479: // Thrust (Argent Tournament)
|
||||
case 68505: // Thrust (Argent Tournament)
|
||||
case 62626: // Break-Shield (Argent Tournament, Player)
|
||||
case 64590: // Break-Shield (Argent Tournament, Player)
|
||||
case 64342: // Break-Shield (Argent Tournament, NPC)
|
||||
case 64686: // Break-Shield (Argent Tournament, NPC)
|
||||
case 65147: // Break-Shield (Argent Tournament, NPC)
|
||||
case 68504: // Break-Shield (Argent Tournament, NPC)
|
||||
case 62874: // Charge (Argent Tournament, Player)
|
||||
case 68498: // Charge (Argent Tournament, Player)
|
||||
case 64591: // Charge (Argent Tournament, Player)
|
||||
case 63003: // Charge (Argent Tournament, NPC)
|
||||
case 63010: // Charge (Argent Tournament, NPC)
|
||||
case 68321: // Charge (Argent Tournament, NPC)
|
||||
case 72255: // Mark of the Fallen Champion (Deathbringer Saurfang)
|
||||
case 72444: // Mark of the Fallen Champion (Deathbringer Saurfang)
|
||||
case 72445: // Mark of the Fallen Champion (Deathbringer Saurfang)
|
||||
@@ -2972,6 +2988,7 @@ void SpellMgr::LoadDbcDataCorrections()
|
||||
spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_TARGET_ENEMY;
|
||||
spellInfo->EffectImplicitTargetB[0] = 0;
|
||||
break;
|
||||
case 63665: // Charge (Argent Tournament emote on riders)
|
||||
case 31447: // Mark of Kaz'rogal (needs target selection script)
|
||||
case 31298: // Sleep (needs target selection script)
|
||||
case 51904: // Summon Ghouls On Scarlet Crusade (this should use conditions table, script for this spell needs to be fixed)
|
||||
|
||||
Reference in New Issue
Block a user