Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: improved aurascript for Main Gauche attack checks

Browse Source
This commit is contained in:
Ovahlord
2018-07-08 20:26:18 +02:00
parent e1246f5c86
commit 36be801c73
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/custom/custom_2018_07_08_05_world.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `spell_proc` SET `ProcFlags`= `ProcFlags` | 0x00400000 WHERE `SpellId`= 76806;

23
src/server/scripts/Spells/spell_rogue.cpp
View File

@@ -1087,8 +1087,19 @@ class spell_rog_main_gauche : public AuraScript
return ValidateSpellInfo({ SPELL_ROGUE_MAIN_GAUCHE });
}
bool CheckProc(ProcEventInfo& /*eventInfo*/)
bool CheckProc(ProcEventInfo& eventInfo)
{
Player* player = eventInfo.GetActor()->ToPlayer();
if (!player)
return false;
Item* item = player->GetWeaponForAttack(BASE_ATTACK);
if (!item || !item->IsEquipped())
return false;
if (!(eventInfo.GetTypeMask() & PROC_FLAG_DONE_MAINHAND_ATTACK))
return false;
return roll_chance_i(GetEffect(EFFECT_0)->GetAmount());
}
@@ -1096,11 +1107,11 @@ class spell_rog_main_gauche : public AuraScript
{
PreventDefaultAction();
if (DamageInfo* damage = eventInfo.GetDamageInfo())
if (Unit* target = GetTarget())
if (target->getAttackTimer(BASE_ATTACK) > target->getAttackTimer(OFF_ATTACK))
if (Unit* victim = damage->GetVictim())
GetTarget()->CastSpell(victim, SPELL_ROGUE_MAIN_GAUCHE, true, nullptr, aurEff);
Player* caster = eventInfo.GetActor()->ToPlayer();
Unit* target = eventInfo.GetProcTarget();
Item* item = ASSERT_NOTNULL(caster->GetWeaponForAttack(BASE_ATTACK));
caster->CastSpell(target, SPELL_ROGUE_MAIN_GAUCHE, true, item, aurEff);
}
void Register() override