josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sourcefile sleanups -> tabs to spaces, remove whitespace - also update the cleanupscripts very slightly

Browse Source 
--HG--
branch : trunk
This commit is contained in:
click
2010-08-08 19:45:53 +02:00
parent 31160bcfce
commit 1f80c7b3c0
174 changed files with 1066 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+20 -20
View File
@@ -18,10 +18,10 @@
/* ScriptData
SDName: Boss_Onyxia
SD%Complete: 95
SDComment: <Known bugs>
Ground visual for Deep Breath effect;
Wing Buffet not ignoring armor;
Not summoning whelps on phase 3 (lacks info)
SDComment: <Known bugs>
Ground visual for Deep Breath effect;
Wing Buffet not ignoring armor;
Not summoning whelps on phase 3 (lacks info)
</Known bugs>
SDCategory: Onyxia's Lair
EndScriptData */
@@ -110,7 +110,7 @@ public:
struct boss_onyxiaAI : public ScriptedAI
{
boss_onyxiaAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me)
boss_onyxiaAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me)
{
m_pInstance = pCreature->GetInstanceScript();
Reset();
@@ -140,7 +140,7 @@ public:
uint8 m_uiSummonWhelpCount;
uint8 m_uiSummonLairGuardCount;
bool m_bIsMoving;
void Reset()
{
if (!IsCombatMovement())
@@ -168,7 +168,7 @@ public:
m_uiSummonWhelpCount = 0;
m_uiSummonLairGuardCount = 0;
m_bIsMoving = false;
if (m_pInstance)
{
m_pInstance->SetData(DATA_ONYXIA, NOT_STARTED);
@@ -181,7 +181,7 @@ public:
{
DoScriptText(SAY_AGGRO, me);
me->SetInCombatWithZone();
if (m_pInstance)
{
m_pInstance->SetData(DATA_ONYXIA, IN_PROGRESS);
@@ -203,7 +203,7 @@ public:
pSummoned->SetInCombatWithZone();
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
pSummoned->AI()->AttackStart(pTarget);
switch (pSummoned->GetEntry())
{
case NPC_WHELP:
@@ -217,7 +217,7 @@ public:
Summons.Summon(pSummoned);
}
void SummonedCreatureDespawn(Creature *summon)
void SummonedCreatureDespawn(Creature *summon)
{
Summons.Despawn(summon);
}
@@ -265,14 +265,14 @@ public:
default:
m_bIsMoving = false;
break;
}
}
}
}
void SpellHitTarget(Unit* target, const SpellEntry* pSpell)
void SpellHitTarget(Unit* target, const SpellEntry* pSpell)
{
//Workaround - Couldn't find a way to group this spells (All Eruption)
if (((pSpell->Id >= 17086 && pSpell->Id <= 17095) ||
if (((pSpell->Id >= 17086 && pSpell->Id <= 17095) ||
(pSpell->Id == 17097) ||
(pSpell->Id >= 18351 && pSpell->Id <= 18361) ||
(pSpell->Id >= 18564 && pSpell->Id <= 18576) ||
@@ -331,7 +331,7 @@ public:
if (me->GetHealth()*100 / me->GetMaxHealth() < 60)
{
m_uiPhase = PHASE_BREATH;
if (m_pInstance)
m_pInstance->SetData(DATA_ONYXIA_PHASE, m_uiPhase);
@@ -419,7 +419,7 @@ public:
if (m_uiDeepBreathTimer <= uiDiff)
{
if (!m_bIsMoving)
if (!m_bIsMoving)
{
if (me->IsNonMeleeSpellCasted(false))
me->InterruptNonMeleeSpells(false);
@@ -434,7 +434,7 @@ public:
if (m_uiMovementTimer <= uiDiff)
{
if (!m_bIsMoving)
if (!m_bIsMoving)
{
SetNextRandomPoint();
m_pPointData = GetMoveData();
@@ -463,7 +463,7 @@ public:
else
m_uiFireballTimer -= uiDiff;
if (m_uiLairGuardTimer <= uiDiff)
if (m_uiLairGuardTimer <= uiDiff)
{
me->SummonCreature(NPC_LAIRGUARD, aSpawnLocations[2].GetPositionX(), aSpawnLocations[2].GetPositionY(), aSpawnLocations[2].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_DESPAWN);
if (m_uiSummonLairGuardCount >= RAID_MODE(1,2))
@@ -484,8 +484,8 @@ public:
if (m_uiSummonWhelpCount >= RAID_MODE(20,40))
{
m_uiSummonWhelpCount = 0;
m_uiWhelpTimer = 90000;
}
m_uiWhelpTimer = 90000;
}
else
m_uiWhelpTimer = 500;
}
src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+7 -7
View File
@@ -18,7 +18,7 @@
/* ScriptData
SDName: Instance_Onyxias_Lair
SD%Complete: 100
SDComment:
SDComment:
SDCategory: Onyxia's Lair
EndScriptData */
@@ -40,9 +40,9 @@ public:
//Eruption is a BFS graph problem
//One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed
std::map<uint64,uint32> FloorEruptionGUID[2];
std::queue<uint64> FloorEruptionGUIDQueue;
std::map<uint64,uint32> FloorEruptionGUID[2];
std::queue<uint64> FloorEruptionGUIDQueue;
uint64 m_uiOnyxiasGUID;
uint32 m_uiOnyxiaLiftoffTimer;
uint32 m_uiManyWhelpsCounter;
@@ -110,7 +110,7 @@ public:
pFloorEruption->SendCustomAnim();
pFloorEruption->CastSpell(NULL, Difficulty(instance->GetSpawnMode()) == RAID_DIFFICULTY_10MAN_NORMAL ? 17731 : 69294); //pFloorEruption->GetGOInfo()->trap.spellId
//Get all immediatly nearby floors
//Get all immediatly nearby floors
std::list<GameObject*> nearFloorList;
Trinity::GameObjectInRangeCheck check(pFloorEruption->GetPositionX(), pFloorEruption->GetPositionY(), pFloorEruption->GetPositionZ(), 15);
Trinity::GameObjectListSearcher<Trinity::GameObjectInRangeCheck> searcher(pFloorEruption, nearFloorList, check);
@@ -211,12 +211,12 @@ public:
} else m_uiOnyxiaLiftoffTimer -= uiDiff;
}
if (!FloorEruptionGUIDQueue.empty())
if (!FloorEruptionGUIDQueue.empty())
{
if (m_uiEruptTimer <= uiDiff)
{
uint32 treeHeight = 0;
do
do
{
treeHeight = (*FloorEruptionGUID[1].find(FloorEruptionGUIDQueue.front())).second;
FloorEruption(FloorEruptionGUIDQueue.front());
src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+8 -8
View File
@@ -79,7 +79,7 @@ float pyramidSpawns [pyramidSpawnTotal][4] = {
{3,7788,1889.94,1212.21},
{3,7275,1889.23,1207.72},
{3,7796,1879.77,1207.96}
};
};
float Spawnsway[2][3] =
{
@@ -205,7 +205,7 @@ public:
PyramidPhase=data;
break;
};
}
}
virtual void Update(uint32 diff)
{
@@ -254,14 +254,14 @@ public:
SpawnPyramidWave(3);
SetData(EVENT_PYRAMID,PYRAMID_PRE_WAVE_3);
major_wave_Timer = 5000; //give NPCs time to return to their home spots
}
else
}
else
if (minor_wave_Timer<diff)
{
SendAddsUpStairs(addGroupSize++);
minor_wave_Timer=10000;
}
else
}
else
minor_wave_Timer -= diff;
break;
case PYRAMID_PRE_WAVE_3:
@@ -274,8 +274,8 @@ public:
MoveNPCIfAlive(ENTRY_RAVEN,1883.68,1227.95,9.543,4.78);
MoveNPCIfAlive(ENTRY_WEEGLI,1878.02,1227.65,9.485,4.78);
SetData(EVENT_PYRAMID,PYRAMID_WAVE_3);
}
else
}
else
major_wave_Timer -= diff;
break;
case PYRAMID_WAVE_3:
src/server/scripts/Kalimdor/desolace.cpp
+8 -8
View File
@@ -28,7 +28,7 @@ npc_aged_dying_ancient_kodo
EndContentData */
#include "ScriptPCH.h"
#include "ScriptedEscortAI.h"
#include "ScriptedEscortAI.h"
enum eDyingKodo
{
@@ -200,7 +200,7 @@ public:
bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest)
{
if (quest->GetQuestId() == QUEST_RETURN_TO_VAHLARRIEL)
{
{
if (npc_escortAI* pEscortAI = CAST_AI(npc_dalinda::npc_dalindaAI, pCreature->AI()))
{
pEscortAI->Start(true, false, pPlayer->GetGUID());
@@ -217,8 +217,8 @@ public:
struct npc_dalindaAI : public npc_escortAI
{
npc_dalindaAI(Creature* pCreature) : npc_escortAI(pCreature) { }
npc_dalindaAI(Creature* pCreature) : npc_escortAI(pCreature) { }
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
@@ -226,11 +226,11 @@ public:
{
case 1:
me->IsStandState();
break;
case 15:
break;
case 15:
if (pPlayer)
pPlayer->GroupEventHappens(QUEST_RETURN_TO_VAHLARRIEL, me);
break;
break;
}
}
@@ -247,7 +247,7 @@ public:
}
void UpdateAI(const uint32 uiDiff)
{
{
npc_escortAI::UpdateAI(uiDiff);
if (!UpdateVictim())
return;