Core/Script: Code style and remove unused core.
Signed-off-by: Gyx <[email protected]>
This commit is contained in:
@@ -45,12 +45,12 @@ public:
|
||||
player->GetSession()->SendNotification("Instance script not initialized");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (instance->GetData(EVENT_STATE) != CANNON_NOT_USED)
|
||||
return false;
|
||||
|
||||
if (targets.GetGOTarget() && targets.GetGOTarget()->GetEntry() == GO_DEFIAS_CANNON)
|
||||
{
|
||||
instance->SetData(EVENT_STATE, CANNON_GUNPOWDER_USED);
|
||||
}
|
||||
|
||||
player->DestroyItemCount(item->GetEntry(), 1, true);
|
||||
return true;
|
||||
|
||||
@@ -578,7 +578,8 @@ public:
|
||||
temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[16].x, LightofDawnLoc[16].y, LightofDawnLoc[16].z);
|
||||
}
|
||||
JumpToNextStep(10000);
|
||||
} break;
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
DoScriptText(SAY_LIGHT_OF_DAWN27, me);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
@@ -938,7 +939,7 @@ public:
|
||||
case 33: // Darion supports to jump to lich king here
|
||||
if (Unit::GetCreature(*me, uiLichKingGUID))
|
||||
DoCast(me, SPELL_MOGRAINE_CHARGE); // jumping charge
|
||||
// doesn't make it looks well, so workarounds, Darion charges, looks better
|
||||
// doesn't make it looks well, so workarounds, Darion charges, looks better
|
||||
me->SetSpeed(MOVE_RUN, 3.0f);
|
||||
me->SetWalk(false);
|
||||
SetHoldState(false);
|
||||
@@ -1309,7 +1310,6 @@ public:
|
||||
case 71:
|
||||
//if (GameObject* go = me->GetMap()->GetGameObject(uiDawnofLightGUID)) // Turn off dawn of light
|
||||
// go->SetPhaseMask(0, true);
|
||||
|
||||
{
|
||||
Map* map = me->GetMap(); // search players with in 50 yards for quest credit
|
||||
Map::PlayerList const &PlayerList = map->GetPlayers();
|
||||
|
||||
@@ -209,9 +209,7 @@ class boss_akilzon : public CreatureScript
|
||||
for (std::list<Unit*>::const_iterator i = tempUnitMap.begin(); i != tempUnitMap.end(); ++i)
|
||||
{
|
||||
if (!Cloud->IsWithinDist(*i, 6, false))
|
||||
{
|
||||
Cloud->CastCustomSpell(*i, 43137, &bp0, NULL, NULL, true, 0, 0, me->GetGUID());
|
||||
}
|
||||
}
|
||||
// visual
|
||||
float x, y, z;
|
||||
@@ -311,7 +309,8 @@ class boss_akilzon : public CreatureScript
|
||||
isRaining = true;
|
||||
}
|
||||
|
||||
if (ElectricalStorm_Timer <= diff) {
|
||||
if (ElectricalStorm_Timer <= diff)
|
||||
{
|
||||
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true);
|
||||
if (!target)
|
||||
{
|
||||
@@ -390,15 +389,11 @@ class boss_akilzon : public CreatureScript
|
||||
class mob_akilzon_eagle : public CreatureScript
|
||||
{
|
||||
public:
|
||||
|
||||
mob_akilzon_eagle()
|
||||
: CreatureScript("mob_akilzon_eagle")
|
||||
{
|
||||
}
|
||||
mob_akilzon_eagle() : CreatureScript("mob_akilzon_eagle") { }
|
||||
|
||||
struct mob_akilzon_eagleAI : public ScriptedAI
|
||||
{
|
||||
mob_akilzon_eagleAI(Creature* creature) : ScriptedAI(creature) {}
|
||||
mob_akilzon_eagleAI(Creature* creature) : ScriptedAI(creature) { }
|
||||
|
||||
uint32 EagleSwoop_Timer;
|
||||
bool arrived;
|
||||
@@ -412,7 +407,10 @@ class mob_akilzon_eagle : public CreatureScript
|
||||
me->SetUnitMovementFlags(MOVEMENTFLAG_DISABLE_GRAVITY);
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) {DoZoneInCombat();}
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
{
|
||||
DoZoneInCombat();
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) {}
|
||||
|
||||
|
||||
@@ -186,7 +186,10 @@ struct boss_hexlord_addAI : public ScriptedAI
|
||||
|
||||
void Reset() {}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) {DoZoneInCombat();}
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
{
|
||||
DoZoneInCombat();
|
||||
}
|
||||
|
||||
void UpdateAI(const uint32 /*diff*/)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user