Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace clean-up

Browse Source
This commit is contained in:
Gustavo
2016-08-28 20:11:04 -03:00
committed by Aokromes
parent 6947017200
commit 6ee35734e4
12 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Commands/cs_npc.cpp
View File

@@ -1434,7 +1434,7 @@ public:
why = CreatureAI::EVADE_REASON_SEQUENCE_BREAK;
else if (stricmp(type_str, "FORCE") == 0)
force = true;
if (!force && force_str)
if (stricmp(force_str, "FORCE") == 0)
force = true;

4
src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
View File

@@ -94,7 +94,7 @@ public:
{
if (Creature* midnight = ObjectAccessor::GetCreature(*me, _midnightGUID))
BossAI::_DespawnAtEvade(Seconds(10), midnight);
me->DespawnOrUnsummon();
}
@@ -130,7 +130,7 @@ public:
if (_phase == PHASE_ATTUMEN_ENGAGES && me->HealthBelowPctDamaged(25, damage))
{
_phase = PHASE_NONE;
if (Creature* midnight = ObjectAccessor::GetCreature(*me, _midnightGUID))
midnight->AI()->DoCastAOE(SPELL_MOUNT, true);
}

2
src/server/scripts/Kalimdor/zone_silithus.cpp
View File

@@ -1114,7 +1114,7 @@ enum WS
WATER = 0x2,
EARTH = 0x4,
AIR = 0x8
};
};
enum WSTexts
{

2
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
View File

@@ -268,7 +268,7 @@ class npc_pit_of_saron_icicle : public CreatureScript
{
DoCastSelf(SPELL_ICICLE_FALL_TRIGGER, true);
DoCastSelf(SPELL_ICICLE_FALL_VISUAL);
if (Unit* caster = ObjectAccessor::GetUnit(*me, _summonerGUID))
caster->RemoveDynObject(SPELL_ICICLE_SUMMON);
});

14
src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
View File

@@ -200,7 +200,7 @@ public:
if (zombie)
{
zombieToBeEatenGUID = zombie->GetGUID(); // save for later use
// the soon-to-be-eaten zombie should stop moving and stop attacking
zombie->AI()->SetData(DATA_ZOMBIE_STATE, STATE_ZOMBIE_TOBE_EATEN);
@@ -225,7 +225,7 @@ public:
case EVENT_KILL_ZOMBIE_SINGLE:
{
Creature* zombieToBeEaten = ObjectAccessor::GetCreature(*me, zombieToBeEatenGUID);
if (zombieToBeEaten && zombieToBeEaten->IsAlive() && zombieToBeEaten->IsWithinDistInMap(me, 10.0))
if (zombieToBeEaten && zombieToBeEaten->IsAlive() && zombieToBeEaten->IsWithinDistInMap(me, 10.0))
DoCast(zombieToBeEaten, SPELL_ZOMBIE_CHOW_SEARCH_SINGLE); // do the killing + healing in done inside by spell script see below.
zombieToBeEatenGUID = ObjectGuid::Empty;
@@ -249,11 +249,11 @@ public:
if (zombie && zombie->IsAlive() && zombie->GetExactDist2d(me) > 18.0)
zombie = nullptr;
}
if (zombie) // cast the aoe spell only if at least one zombie is found nearby
{
Talk(EMOTE_DEVOURS_ALL);
DoCastAOE(SPELL_ZOMBIE_CHOW_SEARCH_MULTI);
DoCastAOE(SPELL_ZOMBIE_CHOW_SEARCH_MULTI);
}
break;
}
@@ -269,7 +269,7 @@ public:
me->GetMotionMaster()->MoveIdle();
events.ScheduleEvent(EVENT_KILL_ZOMBIE_SINGLE, Seconds(1));
}
}
void DoAction(int32 action) override
@@ -432,10 +432,10 @@ public:
{
me->SetReactState(ReactStates::REACT_PASSIVE);
me->AttackStop();
me->SetTarget(ObjectGuid::Empty);
me->SetTarget(ObjectGuid::Empty);
// at this point, the zombie should be non attacking and non moving.
me->SetWalk(true); // it doesnt seem to work with MoveFollow() (but it does work with MovePoint()).
me->SetWalk(true); // it doesnt seem to work with MoveFollow() (but it does work with MovePoint()).
timer = 1000;
}

10
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
View File

@@ -264,7 +264,7 @@ public:
_JustDied();
Talk(SAY_DEATH);
}
void DamageTaken(Unit* /*attacker*/, uint32& damage) override
{
if (events.IsInPhase(PHASE_ONE))
@@ -432,7 +432,7 @@ public:
if (Is25ManRaid())
events.ScheduleEvent(EVENT_CHAINS, randtime(Seconds(60), Seconds(80)), 0, PHASE_TWO);
break;
case EVENT_FROSTBOLT_VOLLEY:
DoCastAOE(SPELL_FROSTBOLT_VOLLEY);
events.Repeat(randtime(Seconds(16), Seconds(18)));
@@ -624,7 +624,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI
ScriptedAI::MoveInLineOfSight(who);
return;
}
if (me->CanStartAttack(who, false) && me->GetDistance2d(who) <= MINION_AGGRO_DISTANCE)
EnterCombat(who);
}
@@ -641,7 +641,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI
return pocketId;
return 0;
}
void MovementInform(uint32 /*type*/, uint32 id) override
{
if (id == MOVEMENT_MINION_RANDOM)
@@ -665,7 +665,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI
protected:
InstanceScript* const instance;
uint32 pocketId;
private:
uint32 _movementTimer;
Position const _home;

2
src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
View File

@@ -548,7 +548,7 @@ class spell_sapphiron_frost_breath : public SpellScriptLoader
toRemove.push_back(target);
continue;
}
bool found = false;
for (GameObject* block : blocks)
if (block->IsInBetween(GetCaster(), target, 2.0f) && GetCaster()->GetExactDist2d(block) + 5 >= GetCaster()->GetExactDist2d(target))

4
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
View File

@@ -389,7 +389,7 @@ class boss_high_astromancer_solarian : public CreatureScript
else
VoidBolt_Timer -= diff;
}
//When Solarian reaches 20% she will transform into a huge void walker.
if (Phase != 4 && me->HealthBelowPct(20))
{
@@ -403,7 +403,7 @@ class boss_high_astromancer_solarian : public CreatureScript
me->SetDisplayId(MODEL_VOIDWALKER);
me->SetObjectScale(defaultsize*2.5f);
}
DoMeleeAttackIfReady();
}
};