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

Add spaces after commas

Browse Source
This commit is contained in:
leak
2011-04-29 20:47:02 +02:00
parent 01a79947d5
commit 1003f30448
645 changed files with 9439 additions and 9439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+78 -78
View File
@@ -25,66 +25,66 @@ int const pyramidSpawnTotal = 54;
/* list of wave spawns: 0 = wave ID, 1 = creature id, 2 = x, 3 = y
no z coordinat b/c they're all the same */
float pyramidSpawns [pyramidSpawnTotal][4] = {
{1,7789,1894.64f,1206.29f},
{1,7787,1890.08f,1218.68f},
{1,8876,1883.76f,1222.3f},
{1,7789,1874.18f,1221.24f},
{1,7787,1892.28f,1225.49f},
{1,7788,1889.94f,1212.21f},
{1,7787,1879.02f,1223.06f},
{1,7789,1874.45f,1204.44f},
{1,8876,1898.23f,1217.97f},
{1,7787,1882.07f,1225.7f},
{1,8877,1896.46f,1205.62f},
{1,7787,1886.97f,1225.86f},
{1,7787,1894.72f,1221.91f},
{1,7787,1883.5f,1218.25f},
{1,7787,1886.93f,1221.4f},
{1,8876,1889.82f,1222.51f},
{1,7788,1893.07f,1215.26f},
{1,7788,1878.57f,1214.16f},
{1,7788,1883.74f,1212.35f},
{1,8877,1877,1207.27f},
{1,8877,1873.63f,1204.65f},
{1,8876,1877.4f,1216.41f},
{1,8877,1899.63f,1202.52f},
{2,7789,1902.83f,1223.41f},
{2,8876,1889.82f,1222.51f},
{2,7787,1883.5f,1218.25f},
{2,7788,1883.74f,1212.35f},
{2,8877,1877,1207.27f},
{2,7787,1890.08f,1218.68f},
{2,7789,1894.64f,1206.29f},
{2,8876,1877.4f,1216.41f},
{2,7787,1892.28f,1225.49f},
{2,7788,1893.07f,1215.26f},
{2,8877,1896.46f,1205.62f},
{2,7789,1874.45f,1204.44f},
{2,7789,1874.18f,1221.24f},
{2,7787,1879.02f,1223.06f},
{2,8876,1898.23f,1217.97f},
{2,7787,1882.07f,1225.7f},
{2,8877,1873.63f,1204.65f},
{2,7787,1886.97f,1225.86f},
{2,7788,1878.57f,1214.16f},
{2,7787,1894.72f,1221.91f},
{2,7787,1886.93f,1221.4f},
{2,8876,1883.76f,1222.3f},
{2,7788,1889.94f,1212.21f},
{2,8877,1899.63f,1202.52f},
{3,7788,1878.57f,1214.16f},
{3,7787,1894.72f,1221.91f},
{3,7787,1886.93f,1221.4f},
{3,8876,1883.76f,1222.3f},
{3,7788,1889.94f,1212.21f},
{3,7275,1889.23f,1207.72f},
{3,7796,1879.77f,1207.96f}
{1, 7789, 1894.64f, 1206.29f},
{1, 7787, 1890.08f, 1218.68f},
{1, 8876, 1883.76f, 1222.3f},
{1, 7789, 1874.18f, 1221.24f},
{1, 7787, 1892.28f, 1225.49f},
{1, 7788, 1889.94f, 1212.21f},
{1, 7787, 1879.02f, 1223.06f},
{1, 7789, 1874.45f, 1204.44f},
{1, 8876, 1898.23f, 1217.97f},
{1, 7787, 1882.07f, 1225.7f},
{1, 8877, 1896.46f, 1205.62f},
{1, 7787, 1886.97f, 1225.86f},
{1, 7787, 1894.72f, 1221.91f},
{1, 7787, 1883.5f, 1218.25f},
{1, 7787, 1886.93f, 1221.4f},
{1, 8876, 1889.82f, 1222.51f},
{1, 7788, 1893.07f, 1215.26f},
{1, 7788, 1878.57f, 1214.16f},
{1, 7788, 1883.74f, 1212.35f},
{1, 8877, 1877, 1207.27f},
{1, 8877, 1873.63f, 1204.65f},
{1, 8876, 1877.4f, 1216.41f},
{1, 8877, 1899.63f, 1202.52f},
{2, 7789, 1902.83f, 1223.41f},
{2, 8876, 1889.82f, 1222.51f},
{2, 7787, 1883.5f, 1218.25f},
{2, 7788, 1883.74f, 1212.35f},
{2, 8877, 1877, 1207.27f},
{2, 7787, 1890.08f, 1218.68f},
{2, 7789, 1894.64f, 1206.29f},
{2, 8876, 1877.4f, 1216.41f},
{2, 7787, 1892.28f, 1225.49f},
{2, 7788, 1893.07f, 1215.26f},
{2, 8877, 1896.46f, 1205.62f},
{2, 7789, 1874.45f, 1204.44f},
{2, 7789, 1874.18f, 1221.24f},
{2, 7787, 1879.02f, 1223.06f},
{2, 8876, 1898.23f, 1217.97f},
{2, 7787, 1882.07f, 1225.7f},
{2, 8877, 1873.63f, 1204.65f},
{2, 7787, 1886.97f, 1225.86f},
{2, 7788, 1878.57f, 1214.16f},
{2, 7787, 1894.72f, 1221.91f},
{2, 7787, 1886.93f, 1221.4f},
{2, 8876, 1883.76f, 1222.3f},
{2, 7788, 1889.94f, 1212.21f},
{2, 8877, 1899.63f, 1202.52f},
{3, 7788, 1878.57f, 1214.16f},
{3, 7787, 1894.72f, 1221.91f},
{3, 7787, 1886.93f, 1221.4f},
{3, 8876, 1883.76f, 1222.3f},
{3, 7788, 1889.94f, 1212.21f},
{3, 7275, 1889.23f, 1207.72f},
{3, 7796, 1879.77f, 1207.96f}
};
float Spawnsway[2][3] =
{
{1884.86f,1228.62f,9},
{1887.53f,1263,41}
{1884.86f, 1228.62f, 9},
{1887.53f, 1263, 41}
};
class instance_zulfarrak : public InstanceMapScript
@@ -217,7 +217,7 @@ public:
break;
case PYRAMID_ARRIVED_AT_STAIR:
SpawnPyramidWave(1);
SetData(EVENT_PYRAMID,PYRAMID_WAVE_1);
SetData(EVENT_PYRAMID, PYRAMID_WAVE_1);
major_wave_Timer=120000;
minor_wave_Timer=0;
addGroupSize=2;
@@ -225,7 +225,7 @@ public:
case PYRAMID_WAVE_1:
if (IsWaveAllDead())
{
SetData(EVENT_PYRAMID,PYRAMID_PRE_WAVE_2);
SetData(EVENT_PYRAMID, PYRAMID_PRE_WAVE_2);
major_wave_Timer = 10000; //give players a few seconds before wave 2 starts to rebuff
}
else
@@ -242,7 +242,7 @@ public:
{
// beginning 2nd wave!
SpawnPyramidWave(2);
SetData(EVENT_PYRAMID,PYRAMID_WAVE_2);
SetData(EVENT_PYRAMID, PYRAMID_WAVE_2);
minor_wave_Timer = 0;
addGroupSize=2;
}
@@ -253,7 +253,7 @@ public:
if (IsWaveAllDead())
{
SpawnPyramidWave(3);
SetData(EVENT_PYRAMID,PYRAMID_PRE_WAVE_3);
SetData(EVENT_PYRAMID, PYRAMID_PRE_WAVE_3);
major_wave_Timer = 5000; //give NPCs time to return to their home spots
}
else
@@ -269,12 +269,12 @@ public:
if (major_wave_Timer<diff)
{
// move NPCs to bottom of stair
MoveNPCIfAlive(ENTRY_BLY,1887.92f,1228.179f,9.98f,4.78f);
MoveNPCIfAlive(ENTRY_MURTA,1891.57f,1228.68f,9.69f,4.78f);
MoveNPCIfAlive(ENTRY_ORO,1897.23f,1228.34f,9.43f,4.78f);
MoveNPCIfAlive(ENTRY_RAVEN,1883.68f,1227.95f,9.543f,4.78f);
MoveNPCIfAlive(ENTRY_WEEGLI,1878.02f,1227.65f,9.485f,4.78f);
SetData(EVENT_PYRAMID,PYRAMID_WAVE_3);
MoveNPCIfAlive(ENTRY_BLY, 1887.92f, 1228.179f, 9.98f, 4.78f);
MoveNPCIfAlive(ENTRY_MURTA, 1891.57f, 1228.68f, 9.69f, 4.78f);
MoveNPCIfAlive(ENTRY_ORO, 1897.23f, 1228.34f, 9.43f, 4.78f);
MoveNPCIfAlive(ENTRY_RAVEN, 1883.68f, 1227.95f, 9.543f, 4.78f);
MoveNPCIfAlive(ENTRY_WEEGLI, 1878.02f, 1227.65f, 9.485f, 4.78f);
SetData(EVENT_PYRAMID, PYRAMID_WAVE_3);
}
else
major_wave_Timer -= diff;
@@ -282,28 +282,28 @@ public:
case PYRAMID_WAVE_3:
if (IsWaveAllDead()) // move NPCS to their final positions
{
SetData(EVENT_PYRAMID,PYRAMID_KILLED_ALL_TROLLS);
MoveNPCIfAlive(ENTRY_BLY,1883.82f,1200.83f,8.87f,1.32f);
MoveNPCIfAlive(ENTRY_MURTA,1891.83f,1201.45f,8.87f,1.32f);
MoveNPCIfAlive(ENTRY_ORO,1894.50f,1204.40f,8.87f,1.32f);
MoveNPCIfAlive(ENTRY_RAVEN,1874.11f,1206.17f,8.87f,1.32f);
MoveNPCIfAlive(ENTRY_WEEGLI,1877.52f,1199.63f,8.87f,1.32f);
SetData(EVENT_PYRAMID, PYRAMID_KILLED_ALL_TROLLS);
MoveNPCIfAlive(ENTRY_BLY, 1883.82f, 1200.83f, 8.87f, 1.32f);
MoveNPCIfAlive(ENTRY_MURTA, 1891.83f, 1201.45f, 8.87f, 1.32f);
MoveNPCIfAlive(ENTRY_ORO, 1894.50f, 1204.40f, 8.87f, 1.32f);
MoveNPCIfAlive(ENTRY_RAVEN, 1874.11f, 1206.17f, 8.87f, 1.32f);
MoveNPCIfAlive(ENTRY_WEEGLI, 1877.52f, 1199.63f, 8.87f, 1.32f);
}
break;
};
}
std::list<uint64> addsAtBase,movedadds;
std::list<uint64> addsAtBase, movedadds;
void MoveNPCIfAlive(uint32 entry,float x,float y,float z,float o)
void MoveNPCIfAlive(uint32 entry, float x, float y, float z, float o)
{
if (Creature* npc = instance->GetCreature(GetData64(entry)))
{
if (npc->isAlive())
{
npc->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
npc->GetMotionMaster()->MovePoint(1,x,y,z);
npc->SetHomePosition(x,y,z,o);
npc->GetMotionMaster()->MovePoint(1, x, y, z);
npc->SetHomePosition(x, y, z, o);
}
}
}
@@ -314,7 +314,7 @@ public:
if (pyramidSpawns[i][0] == (float)wave)
{
Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87f, 0};
TempSummon* ts = instance->SummonCreature(uint32(pyramidSpawns[i][1]),pos);
TempSummon* ts = instance->SummonCreature(uint32(pyramidSpawns[i][1]), pos);
ts->GetMotionMaster()->MoveRandom(10);
addsAtBase.push_back(ts->GetGUID());
}
@@ -348,7 +348,7 @@ public:
{
if (Creature* add = instance->GetCreature(*addsAtBase.begin()))
{
add->GetMotionMaster()->MovePath(PATH_ADDS,false);
add->GetMotionMaster()->MovePath(PATH_ADDS, false);
movedadds.push_back(add->GetGUID());
}
addsAtBase.erase(addsAtBase.begin());
src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+23 -23
View File
@@ -67,7 +67,7 @@ public:
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{
pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI,pCreature->AI())->PlayerGUID = pPlayer->GetGUID();
CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID();
pCreature->AI()->DoAction(0);
}
return true;
@@ -133,11 +133,11 @@ public:
//weegli doesn't fight - he goes & blows up the door
if (Creature* pWeegli = pInstance->instance->GetCreature(pInstance->GetData64(ENTRY_WEEGLI)))
pWeegli->AI()->DoAction(0);
DoScriptText(SAY_1,me);
DoScriptText(SAY_1, me);
Text_Timer = 5000;
break;
case 2:
DoScriptText(SAY_2,me);
DoScriptText(SAY_2, me);
Text_Timer = 5000;
break;
case 3:
@@ -185,7 +185,7 @@ public:
Text_Timer = 0;
}
void switchFactionIfAlive(InstanceScript* pInstance,uint32 entry)
void switchFactionIfAlive(InstanceScript* pInstance, uint32 entry)
{
if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry)))
if (crew->isAlive())
@@ -199,14 +199,14 @@ public:
+## go_troll_cage
+######*/
void initBlyCrewMember(InstanceScript* pInstance, uint32 entry,float x,float y, float z)
void initBlyCrewMember(InstanceScript* pInstance, uint32 entry, float x, float y, float z)
{
if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry)))
{
crew->SetReactState(REACT_AGGRESSIVE);
crew->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
crew->SetHomePosition(x,y,z,0);
crew->GetMotionMaster()->MovePoint(1,x,y,z);
crew->SetHomePosition(x, y, z, 0);
crew->GetMotionMaster()->MovePoint(1, x, y, z);
crew->setFaction(FACTION_FREED);
}
}
@@ -222,11 +222,11 @@ public:
{
pInstance->SetData(EVENT_PYRAMID, PYRAMID_CAGES_OPEN);
//set bly & co to aggressive & start moving to top of stairs
initBlyCrewMember(pInstance,ENTRY_BLY,1884.99f,1263,41.52f);
initBlyCrewMember(pInstance,ENTRY_RAVEN,1882.5f,1263,41.52f);
initBlyCrewMember(pInstance,ENTRY_ORO,1886.47f,1270.68f,41.68f);
initBlyCrewMember(pInstance,ENTRY_WEEGLI,1890,1263,41.52f);
initBlyCrewMember(pInstance,ENTRY_MURTA,1891.19f,1272.03f,41.60f);
initBlyCrewMember(pInstance, ENTRY_BLY, 1884.99f, 1263, 41.52f);
initBlyCrewMember(pInstance, ENTRY_RAVEN, 1882.5f, 1263, 41.52f);
initBlyCrewMember(pInstance, ENTRY_ORO, 1886.47f, 1270.68f, 41.68f);
initBlyCrewMember(pInstance, ENTRY_WEEGLI, 1890, 1263, 41.52f);
initBlyCrewMember(pInstance, ENTRY_MURTA, 1891.19f, 1272.03f, 41.60f);
}
return false;
}
@@ -319,7 +319,7 @@ public:
void AttackStart(Unit *victim)
{
AttackStartCaster(victim,10);//keep back & toss bombs/shoot
AttackStartCaster(victim, 10);//keep back & toss bombs/shoot
}
void JustDied(Unit * /*victim*/)
@@ -335,7 +335,7 @@ public:
if (Bomb_Timer < diff)
{
DoCast(me->getVictim(),SPELL_BOMB);
DoCast(me->getVictim(), SPELL_BOMB);
Bomb_Timer = 10000;
}
else
@@ -343,7 +343,7 @@ public:
if (me->isAttackReady() && !me->IsWithinMeleeRange(me->getVictim()))
{
DoCast(me->getVictim(),SPELL_SHOOT);
DoCast(me->getVictim(), SPELL_SHOOT);
me->SetSheath(SHEATH_STATE_RANGED);
}
else
@@ -359,9 +359,9 @@ public:
{
if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN)
{
pInstance->SetData(EVENT_PYRAMID,PYRAMID_ARRIVED_AT_STAIR);
DoScriptText(SAY_WEEGLI_OHNO,me);
me->SetHomePosition(1882.69f,1272.28f,41.87f,0);
pInstance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR);
DoScriptText(SAY_WEEGLI_OHNO, me);
me->SetHomePosition(1882.69f, 1272.28f, 41.87f, 0);
}
else
if (destroyingDoor)
@@ -383,9 +383,9 @@ public:
if (me->isAlive())
{
me->setFaction(FACTION_FRIENDLY);
me->GetMotionMaster()->MovePoint(0, 1858.57f,1146.35f,14.745f);
me->SetHomePosition(1858.57f,1146.35f,14.745f,3.85f); // in case he gets interrupted
DoScriptText(SAY_WEEGLI_OK_I_GO,me);
me->GetMotionMaster()->MovePoint(0, 1858.57f, 1146.35f, 14.745f);
me->SetHomePosition(1858.57f, 1146.35f, 14.745f, 3.85f); // in case he gets interrupted
DoScriptText(SAY_WEEGLI_OK_I_GO, me);
destroyingDoor=true;
}
}
@@ -415,7 +415,7 @@ public:
// randomly summon a zombie or dead hero the first time a grave is used
if (pGo->GetUseCount() == 0)
{
uint32 randomchance = urand(0,100);
uint32 randomchance = urand(0, 100);
if (randomchance < ZOMBIE_CHANCE)
pGo->SummonCreature(ZOMBIE, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000);
else
@@ -443,7 +443,7 @@ class at_zumrah : public AreaTriggerScript
public:
at_zumrah() : AreaTriggerScript("at_zumrah") { }
bool OnTrigger(Player* pPlayer,const AreaTriggerEntry * /*at*/)
bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/)
{
Creature* pZumrah = pPlayer->FindNearestCreature(ZUMRAH_ID, 30.0f);