Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Refactor: Part 5

Browse Source
This commit is contained in:
hondacrx
2018-07-05 10:57:42 -04:00
parent badf6c2714
commit 7255455b22
24 changed files with 109 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/GrandChampions.cs
+3 -3
View File
@@ -564,10 +564,10 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion
{
me.InterruptNonMeleeSpells(true);
Unit target1 = Global.ObjAccessor.GetUnit(me, uiTargetGUID);
if (target1 && me.IsInRange(target1, 5.0f, 30.0f, false))
Unit uiTarget = Global.ObjAccessor.GetUnit(me, uiTargetGUID);
if (uiTarget && me.IsInRange(uiTarget, 5.0f, 30.0f, false))
{
DoCast(target1, TrialOfChampionSpells.MULTI_SHOT);
DoCast(uiTarget, TrialOfChampionSpells.MULTI_SHOT);
}
else
{
Source/Scripts/Northrend/IcecrownCitadel/IcecrownCitadel.cs
+12 -8
View File
@@ -1091,10 +1091,12 @@ namespace Scripts.Northrend.IcecrownCitadel
switch (eventId)
{
case EventTypes.ArnathFlashHeal:
Creature target = FindFriendlyCreature();
if (target)
DoCast(target, InstanceSpells.SpellFlashHeal(IsUndead));
_events.ScheduleEvent(EventTypes.ArnathFlashHeal, RandomHelper.URand(6000, 9000));
{
Creature target = FindFriendlyCreature();
if (target)
DoCast(target, InstanceSpells.SpellFlashHeal(IsUndead));
_events.ScheduleEvent(EventTypes.ArnathFlashHeal, RandomHelper.URand(6000, 9000));
}
break;
case EventTypes.ArnathPwShield:
{
@@ -1108,10 +1110,12 @@ namespace Scripts.Northrend.IcecrownCitadel
_events.ScheduleEvent(EventTypes.ArnathSmite, RandomHelper.URand(4000, 7000));
break;
case EventTypes.ArnathDominateMind:
Unit target1 = SelectTarget(SelectAggroTarget.Random, 1, 0.0f, true);
if (target1)
DoCast(target1, InstanceSpells.DominateMind);
_events.ScheduleEvent(EventTypes.ArnathDominateMind, RandomHelper.URand(28000, 37000));
{
Unit target = SelectTarget(SelectAggroTarget.Random, 1, 0.0f, true);
if (target)
DoCast(target, InstanceSpells.DominateMind);
_events.ScheduleEvent(EventTypes.ArnathDominateMind, RandomHelper.URand(28000, 37000));
}
break;
default:
break;
Source/Scripts/Northrend/IcecrownCitadel/IcecrownCitadelConst.cs
+6 -6
View File
@@ -145,9 +145,9 @@ namespace Scripts.Northrend.IcecrownCitadel
public const uint FlashHealUndead = 71782;
public const uint PowerWordShieldUndead = 71780;
public const uint SmiteUndead = 71778;
public static uint SpellFlashHeal(bool isUndead) { return isUndead ? InstanceSpells.FlashHealUndead : InstanceSpells.FlashHealNormal; }
public static uint SpellPowerWordShield(bool isUndead) { return isUndead ? InstanceSpells.PowerWordShieldUndead : InstanceSpells.PowerWordShieldNormal; }
public static uint SpellSmite(bool isUndead) { return isUndead ? InstanceSpells.SmiteUndead : InstanceSpells.SmiteNormal; }
public static uint SpellFlashHeal(bool isUndead) { return isUndead ? FlashHealUndead : FlashHealNormal; }
public static uint SpellPowerWordShield(bool isUndead) { return isUndead ? PowerWordShieldUndead : PowerWordShieldNormal; }
public static uint SpellSmite(bool isUndead) { return isUndead ? SmiteUndead : SmiteNormal; }
// Captain Brandon
public const uint CrusaderStrike = 71549;
@@ -168,9 +168,9 @@ namespace Scripts.Northrend.IcecrownCitadel
public const uint FelIronBombUndead = 71787;
public const uint MachineGunUndead = 71788;
public const uint RocketLaunchUndead = 71786;
public static uint SpellFelIronBomb(bool isUndead) { return isUndead ? InstanceSpells.FelIronBombUndead : InstanceSpells.FelIronBombNormal; }
public static uint SpellMachineGun(bool isUndead) { return isUndead ? InstanceSpells.MachineGunUndead : InstanceSpells.MachineGunNormal; }
public static uint SpellRocketLaunch(bool isUndead) { return isUndead ? InstanceSpells.RocketLaunchUndead : InstanceSpells.RocketLaunchNormal; }
public static uint SpellFelIronBomb(bool isUndead) { return isUndead ? FelIronBombUndead : FelIronBombNormal; }
public static uint SpellMachineGun(bool isUndead) { return isUndead ? MachineGunUndead : MachineGunNormal; }
public static uint SpellRocketLaunch(bool isUndead) { return isUndead ? RocketLaunchUndead : RocketLaunchNormal; }
// Invisible Stalker (Float; Uninteractible; Largeaoi)
public const uint SoulMissile = 72585;