diff options
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/World/guards.cpp | 20 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index ef3daa406b9..24c4f63cb0c 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -120,7 +120,7 @@ class boss_kologarn : public CreatureScript void EnterCombat(Unit * who) { DoScriptText(SAY_AGGRO, me); - + events.ScheduleEvent(EVENT_MELEE_CHECK, 6000); events.ScheduleEvent(EVENT_SMASH, 5000); events.ScheduleEvent(EVENT_SWEEP, 19000); @@ -138,7 +138,7 @@ class boss_kologarn : public CreatureScript void Reset() { _Reset(); - eyebeamTarget = 0; + eyebeamTarget = 0; } void JustDied(Unit * /*victim*/) @@ -188,7 +188,7 @@ class boss_kologarn : public CreatureScript return; who->CastSpell(me, SPELL_ARM_DEAD_DAMAGE, true); - + if (Creature* rubbleStalker = who->FindNearestCreature(NPC_RUBBLE_STALKER, 70.0f)) { if (rubbleStalker) @@ -233,7 +233,7 @@ class boss_kologarn : public CreatureScript summon->SetReactState(REACT_PASSIVE); summon->SetFlag(UNIT_FIELD_ATTACK_POWER, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED); // One of the above spells is a channeled spell, we need to clear this unit state for MoveChase to work - summon->ClearUnitState(UNIT_STAT_CASTING); + summon->ClearUnitState(UNIT_STAT_CASTING); // Victim gets 67351 if (eyebeamTarget) @@ -294,7 +294,7 @@ class boss_kologarn : public CreatureScript case EVENT_RESPAWN_RIGHT_ARM: { if (Creature* arm = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_RIGHT_ARM) : 0)) - RespawnArm(arm->ToCreature()); + RespawnArm(arm->ToCreature()); events.CancelEvent(EVENT_RESPAWN_RIGHT_ARM); break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index cc709913406..c4538abffd9 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -166,14 +166,14 @@ public: // The below hacks are courtesy of the grid/visibilitysystem if (GetBossState(TYPE_KOLOGARN) == DONE) { - creature->SetDeadByDefault(true); - creature->setDeathState(CORPSE); + creature->SetDeadByDefault(true); + creature->setDeathState(CORPSE); creature->DestroyForNearbyPlayers(); creature->UpdateObjectVisibility(true); } else { - creature->SetDeadByDefault(false); + creature->SetDeadByDefault(false); creature->setDeathState(CORPSE); creature->RemoveCorpse(true); } diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index 107ada81863..f3f7bd27720 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Guards SD%Complete: 100 -SDComment: +SDComment: SDCategory: Guards EndScriptData */ @@ -35,7 +35,7 @@ EndContentData */ enum GuardGeneric { GENERIC_CREATURE_COOLDOWN = 5000, - + SAY_GUARD_SIL_AGGRO1 = -1070001, SAY_GUARD_SIL_AGGRO2 = -1070002, SAY_GUARD_SIL_AGGRO3 = -1070003, @@ -118,9 +118,9 @@ public: info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING); //No healing spell available, select a hostile spell - if (info) + if (info) healing = true; - else + else info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); //20% chance to replace our white hit with a spell @@ -129,13 +129,13 @@ public: //Cast the spell if (healing) DoCast(me, info->Id); - else + else DoCast(me->getVictim(), info->Id); //Set our global cooldown globalCooldown = GENERIC_CREATURE_COOLDOWN; } - else + else me->AttackerStateUpdate(me->getVictim()); me->resetAttackTimer(); @@ -154,7 +154,7 @@ public: info = SelectSpell(me, 0, 0, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_HEALING); //No healing spell available, See if we can cast a ranged spell (Range must be greater than ATTACK_DISTANCE) - if (info) + if (info) healing = true; else info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, NOMINAL_MELEE_RANGE, 0, SELECT_EFFECT_DONTCARE); @@ -170,9 +170,9 @@ public: } //Cast spell - if (healing) + if (healing) DoCast(me,info->Id); - else + else DoCast(me->getVictim(),info->Id); //Set our global cooldown @@ -204,7 +204,7 @@ public: case TEXTEMOTE_CHICKEN: me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); break; } } - + void ReceiveEmote(Player* player, uint32 textEmote) { switch(me->GetEntry()) |