Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code Style (game + scripts only):

Browse Source 
">=" --> " >= " (when needed)
"  >=" --> " >="
">=  " --> ">= "
"<=" --> " <= " (when needed)
"  <=" --> " <="
"<=  " --> "<= "
" ==" --> " =="
"==  " --> "== "

--HG--
branch : trunk
This commit is contained in:
Spp
2010-04-07 23:56:35 +02:00
parent 2454c290b8
commit 46f0674e23
54 changed files with 159 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
View File

@@ -94,7 +94,7 @@ struct boss_midnightAI : public ScriptedAI
if (Unit *pAttumen = Unit::GetUnit(*m_creature, Attumen))
Mount(pAttumen);
}
else if (Phase == 3)
else if (Phase == 3)
{
if (Mount_Timer)
{

2
src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
View File

@@ -104,7 +104,7 @@ struct boss_netherspiteAI : public ScriptedAI
yh = pTarget->GetPositionY();
// check if target is between (not checking distance from the beam yet)
if (dist(xn,yn,xh,yh)>=dist(xn,yn,xp,yp) || dist(xp,yp,xh,yh)>=dist(xn,yn,xp,yp))
if (dist(xn,yn,xh,yh) >= dist(xn,yn,xp,yp) || dist(xp,yp,xh,yh) >= dist(xn,yn,xp,yp))
return false;
// check distance from the beam
return (abs((xn-xp)*yh+(yp-yn)*xh-xn*yp+xp*yn)/dist(xn,yn,xp,yp) < 1.5f);

6
src/scripts/kalimdor/azshara.cpp
View File

@@ -56,7 +56,7 @@ struct mobs_spitelashesAI : public ScriptedAI
if (!spellhit &&
Hitter->GetTypeId() == TYPEID_PLAYER &&
CAST_PLR(Hitter)->GetQuestStatus(9364) == QUEST_STATUS_INCOMPLETE &&
(Spellkind->Id == 118 || Spellkind->Id == 12824 || Spellkind->Id == 12825 || Spellkind->Id == 12826))
(Spellkind->Id == 118 || Spellkind->Id == 12824 || Spellkind->Id == 12825 || Spellkind->Id == 12826))
{
spellhit=true;
DoCast(m_creature, 29124); //become a sheep
@@ -66,7 +66,7 @@ struct mobs_spitelashesAI : public ScriptedAI
void UpdateAI(const uint32 diff)
{
// we mustn't remove the Creature in the same round in which we cast the summon spell, otherwise there will be no summons
if (spellhit && morphtimer>=5000)
if (spellhit && morphtimer >= 5000)
{
m_creature->ForcedDespawn();
return;
@@ -75,7 +75,7 @@ struct mobs_spitelashesAI : public ScriptedAI
if (spellhit && morphtimer<5000)
{
morphtimer+=diff;
if (morphtimer>=5000)
if (morphtimer >= 5000)
{
DoCast(m_creature, 28406); //summon copies
DoCast(m_creature, 6924); //visual explosion

34
src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
View File

@@ -422,7 +422,7 @@ struct mob_giant_infernalAI : public hyjal_trashAI
void UpdateAI(const uint32 diff)
{
if (Delay<= diff)
if (Delay <= diff)
{
Delay=0;
}else{
@@ -444,7 +444,7 @@ struct mob_giant_infernalAI : public hyjal_trashAI
m_creature->GetMotionMaster()->Clear();
meteor = true;
} else if (!CanMove){
if (spawnTimer<= diff)
if (spawnTimer <= diff)
{
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -488,7 +488,7 @@ struct mob_giant_infernalAI : public hyjal_trashAI
DoCast(m_creature, SPELL_IMMOLATION);
imol=true;
}
if (FlameBuffetTimer<= diff)
if (FlameBuffetTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_FLAME_BUFFET, true);
FlameBuffetTimer = 7000;
@@ -583,7 +583,7 @@ struct mob_abominationAI : public hyjal_trashAI
DoCast(m_creature, SPELL_DISEASE_CLOUD);
if (!UpdateVictim())
return;
if (KnockDownTimer<= diff)
if (KnockDownTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_KNOCKDOWN);
KnockDownTimer = 15000+rand()%10000;
@@ -679,7 +679,7 @@ struct mob_ghoulAI : public hyjal_trashAI
}
}
}
if (FrenzyTimer<= diff)
if (FrenzyTimer <= diff)
{
DoCast(m_creature, SPELL_FRENZY);
FrenzyTimer = 15000+rand()%15000;
@@ -796,7 +796,7 @@ struct mob_necromancerAI : public hyjal_trashAI
}
if (!UpdateVictim())
return;
if (ShadowBoltTimer<= diff)
if (ShadowBoltTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_SHADOW_BOLT);
ShadowBoltTimer = 20000+rand()%10000;
@@ -887,17 +887,17 @@ struct mob_bansheeAI : public hyjal_trashAI
}
if (!UpdateVictim())
return;
if (CourseTimer<= diff)
if (CourseTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_BANSHEE_CURSE);
CourseTimer = 20000+rand()%5000;
} else CourseTimer -= diff;
if (WailTimer<= diff)
if (WailTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_BANSHEE_WAIL);
WailTimer = 15000+rand()%5000;
} else WailTimer -= diff;
if (ShellTimer<= diff)
if (ShellTimer <= diff)
{
DoCast(m_creature, SPELL_ANTI_MAGIC_SHELL);
ShellTimer = 50000+rand()%10000;
@@ -982,7 +982,7 @@ struct mob_crypt_fiendAI : public hyjal_trashAI
}
if (!UpdateVictim())
return;
if (WebTimer<= diff)
if (WebTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_WEB);
WebTimer = 20000+rand()%5000;
@@ -1067,7 +1067,7 @@ struct mob_fel_stalkerAI : public hyjal_trashAI
}
if (!UpdateVictim())
return;
if (ManaBurnTimer<= diff)
if (ManaBurnTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_MANA_BURN);
ManaBurnTimer = 9000+rand()%5000;
@@ -1166,14 +1166,14 @@ struct mob_frost_wyrmAI : public hyjal_trashAI
if (!UpdateVictim())
return;
if (!m_creature->IsWithinDist(m_creature->getVictim(), 25)){
if (MoveTimer<= diff)
if (MoveTimer <= diff)
{
m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
MoveTimer = 2000;
} else MoveTimer-=diff;
}
if (FrostBreathTimer<= diff)
if (FrostBreathTimer <= diff)
{
if (!m_creature->IsWithinDist(m_creature->getVictim(), 25))
{
@@ -1278,7 +1278,7 @@ struct mob_gargoyleAI : public hyjal_trashAI
{
if (faction == 0)//alliance
{
if (StrikeTimer<= diff)
if (StrikeTimer <= diff)
{
m_creature->CastSpell(DummyTarget[0],DummyTarget[1],DummyTarget[2],SPELL_GARGOYLE_STRIKE,false);
StrikeTimer = 2000+rand()%1000;
@@ -1296,17 +1296,17 @@ struct mob_gargoyleAI : public hyjal_trashAI
if (pTarget)
m_creature->Attack(pTarget,false);
}
if (MoveTimer<= diff)
if (MoveTimer <= diff)
{
float x,y,z;
m_creature->getVictim()->GetPosition(x,y,z);
m_creature->GetMotionMaster()->MovePoint(0,x,y,z+Zpos);
Zpos-=1.0;
if (Zpos<=0)Zpos=0;
if (Zpos <= 0)Zpos=0;
MoveTimer = 2000;
} else MoveTimer-=diff;
}
if (StrikeTimer<= diff)
if (StrikeTimer <= diff)
{
if (m_creature->IsWithinDist(m_creature->getVictim(), 20))
{

2
src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
View File

@@ -98,7 +98,7 @@ struct boss_captain_skarlocAI : public ScriptedAI
} else Holy_Light_Timer -= diff;
//Cleanse
if (Cleanse_Timer <= diff)
if (Cleanse_Timer <= diff)
{
DoCast(m_creature, SPELL_CLEANSE);
Cleanse_Timer = 10000;

2
src/scripts/kalimdor/felwood.cpp
View File

@@ -69,7 +69,7 @@ bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCrea
bool GossipSelect_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
{
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{
pPlayer->CLOSE_GOSSIP_MENU();
pCreature->CastSpell(pPlayer, 15120, false);

2
src/scripts/kalimdor/silithus.cpp
View File

@@ -931,7 +931,7 @@ struct npc_anachronos_quest_triggerAI : public ScriptedAI
if (Spawn)
{
Spawn->LoadCreaturesAddon();
if (Spawn->GetGUID() == 15423)
if (Spawn->GetGUID() == 15423)
Spawn->SetUInt32Value(UNIT_FIELD_DISPLAYID,15427+rand()%4);
if (i >= 30) WaveCount = 1;
if (i >= 33) WaveCount = 2;

2
src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
View File

@@ -122,7 +122,7 @@ struct boss_fankrissAI : public ScriptedAI
//We will only telport if fankriss has more than 3% of hp so teleported gamers can always loot.
if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > 3)
{
if (SpawnHatchlings_Timer<= diff)
if (SpawnHatchlings_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);

2
src/scripts/kalimdor/winterspring.cpp
View File

@@ -134,7 +134,7 @@ bool GossipHello_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature)
bool GossipSelect_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
{
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
{
pPlayer->CLOSE_GOSSIP_MENU();
pCreature->CastSpell(pPlayer, 16351, false);

6
src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
View File

@@ -131,11 +131,11 @@ struct boss_malygosAI : public ScriptedAI
if (victim == m_creature)
return;
if (phase == 1)
if (phase == 1)
DoScriptText(RAND(SAY_PHASE1_SLAY_1,SAY_PHASE1_SLAY_2,SAY_PHASE1_SLAY_3), m_creature);
if (phase == 2)
if (phase == 2)
DoScriptText(RAND(SAY_PHASE2_SLAY_1,SAY_PHASE2_SLAY_2,SAY_PHASE2_SLAY_3), m_creature);
if (phase == 3)
if (phase == 3)
DoScriptText(RAND(SAY_PHASE3_SLAY_1,SAY_PHASE3_SLAY_2,SAY_PHASE3_SLAY_3), m_creature);
}
};

2
src/scripts/northrend/nexus/nexus/boss_ormorok.cpp
View File

@@ -170,7 +170,7 @@ struct boss_ormorokAI : public ScriptedAI
{
Unit *pTarget = NULL;
uint8 Healer = 0;
for (uint8 j = 1; j<=4; j++)
for (uint8 j = 1; j <= 4; j++)
{
switch (j)
{

2
src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp
View File

@@ -314,7 +314,7 @@ struct boss_algalonAI : public ScriptedAI
{
if (Enrage)
{
if (Ascend_Timer <= diff)
if (Ascend_Timer <= diff)
{
DoCast(m_creature, SPELL_ASCEND);
DoScriptText(SAY_BERSERK, m_creature);

4
src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
View File

@@ -705,9 +705,9 @@ struct mob_palehoof_orbAI : public ScriptedAI
if (currentPhase == PHASE_NONE)
return;
if (SummonTimer<=diff)
if (SummonTimer <= diff)
{
if (currentPhase<5&&currentPhase>=0)
if (currentPhase<5&&currentPhase >= 0)
{
Creature *pNext;
switch(currentPhase)

2
src/scripts/outland/black_temple/boss_bloodboil.cpp
View File

@@ -161,7 +161,7 @@ struct boss_gurtogg_bloodboilAI : public ScriptedAI
for (uint32 i = 0; i<3; ++i)
{
uint8 eff = spellInfo->Effect[i];
if (eff>=TOTAL_SPELL_EFFECTS)
if (eff >= TOTAL_SPELL_EFFECTS)
continue;
Aura *Aur = new Aura(spellInfo, i, pTarget, pTarget, pTarget);

2
src/scripts/outland/black_temple/boss_supremus.cpp
View File

@@ -250,7 +250,7 @@ struct npc_volcanoAI : public Scripted_NoMovementAI
void UpdateAI(const uint32 diff)
{
if (wait<=diff)//wait 3secs before casting
if (wait <= diff)//wait 3secs before casting
{
DoCast(m_creature, SPELL_VOLCANIC_ERUPTION);
wait = 60000;

2
src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
View File

@@ -384,7 +384,7 @@ struct boss_leotheras_the_blindAI : public ScriptedAI
//Return since we have no target
if (m_creature->HasAura(AURA_BANISH) || !UpdateVictim())
{
if (BanishTimer<= diff)
if (BanishTimer <= diff)
{
CheckBanish();//no need to check every update tick
BanishTimer = 1000;

10
src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
View File

@@ -260,7 +260,7 @@ struct boss_high_astromancer_solarianAI : public ScriptedAI
//After these 50 seconds she portals to the middle of the room and disappears, leaving 3 light portals behind.
m_creature->GetMotionMaster()->Clear();
m_creature->GetMap()->CreatureRelocation(m_creature, CENTER_X, CENTER_Y, CENTER_Z, CENTER_O);
for (uint8 i=0; i<=2; ++i)
for (uint8 i=0; i <= 2; ++i)
{
if (!i)
{
@@ -283,7 +283,7 @@ struct boss_high_astromancer_solarianAI : public ScriptedAI
Portals[2][0] = Portals[2][0]+7*i;
Portals[2][1] = Portal_Y(Portals[2][0], LARGE_PORTAL_RADIUS);
}
for (int i=0; i<=2; ++i)
for (int i=0; i <= 2; ++i)
{
if (Creature* Summoned = m_creature->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer+Phase3_Timer+AppearDelay_Timer+1700))
{
@@ -302,8 +302,8 @@ struct boss_high_astromancer_solarianAI : public ScriptedAI
if (Phase2_Timer <= diff)
{
Phase = 3;
for (int i=0; i<=2; ++i)
for (int j=1; j<=4; j++)
for (int i=0; i <= 2; ++i)
for (int j=1; j <= 4; j++)
SummonMinion(NPC_SOLARIUM_AGENT, Portals[i][0], Portals[i][1], Portals[i][2]);
DoScriptText(SAY_SUMMON1, m_creature);
@@ -325,7 +325,7 @@ struct boss_high_astromancer_solarianAI : public ScriptedAI
m_creature->GetMotionMaster()->Clear();
m_creature->GetMap()->CreatureRelocation(m_creature, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O);
for (int j=0; j<=2; j++)
for (int j=0; j <= 2; j++)
if (j!=i)
SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]);

12
src/scripts/world/npc_professions.cpp
View File

@@ -361,7 +361,7 @@ bool GossipHello_npc_prof_alchemy(Player* pPlayer, Creature* pCreature)
uint32 eCreature = pCreature->GetEntry();
if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetBaseSkillValue(SKILL_ALCHEMY)>=350 && pPlayer->getLevel() > 67)
if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetBaseSkillValue(SKILL_ALCHEMY) >= 350 && pPlayer->getLevel() > 67)
{
if (pPlayer->GetQuestRewardStatus(10899) || pPlayer->GetQuestRewardStatus(10902) || pPlayer->GetQuestRewardStatus(10897))
{
@@ -548,13 +548,13 @@ bool GossipHello_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature)
uint32 eCreature = pCreature->GetEntry();
//WEAPONSMITH & ARMORSMITH
if (pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING)>=225)
if (pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING) >= 225)
{
switch (eCreature)
{
case 11145: //Myolor Sunderfury
case 11176: //Krathok Moltenfist
if (!pPlayer->HasSpell(S_ARMOR) && !pPlayer->HasSpell(S_WEAPON) && pPlayer->GetReputationRank(REP_ARMOR) >= REP_FRIENDLY)
if (!pPlayer->HasSpell(S_ARMOR) && !pPlayer->HasSpell(S_WEAPON) && pPlayer->GetReputationRank(REP_ARMOR) >= REP_FRIENDLY)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_LEARN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
if (!pPlayer->HasSpell(S_WEAPON) && !pPlayer->HasSpell(S_ARMOR) && pPlayer->GetReputationRank(REP_WEAPON) >= REP_FRIENDLY)
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_LEARN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
@@ -572,7 +572,7 @@ bool GossipHello_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature)
}
}
//WEAPONSMITH SPEC
if (pPlayer->HasSpell(S_WEAPON) && pPlayer->getLevel() > 49 && pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING)>=250)
if (pPlayer->HasSpell(S_WEAPON) && pPlayer->getLevel() > 49 && pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING) >= 250)
{
switch (eCreature)
{
@@ -958,7 +958,7 @@ bool GossipHello_npc_prof_leather(Player* pPlayer, Creature* pCreature)
uint32 eCreature = pCreature->GetEntry();
if (pPlayer->HasSkill(SKILL_LEATHERWORKING) && pPlayer->GetBaseSkillValue(SKILL_LEATHERWORKING)>=250 && pPlayer->getLevel() > 49)
if (pPlayer->HasSkill(SKILL_LEATHERWORKING) && pPlayer->GetBaseSkillValue(SKILL_LEATHERWORKING) >= 250 && pPlayer->getLevel() > 49)
{
switch (eCreature)
{
@@ -1102,7 +1102,7 @@ bool GossipHello_npc_prof_tailor(Player* pPlayer, Creature* pCreature)
uint32 eCreature = pCreature->GetEntry();
//TAILORING SPEC
if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING)>=350 && pPlayer->getLevel() > 59)
if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 350 && pPlayer->getLevel() > 59)
{
if (pPlayer->GetQuestRewardStatus(10831) || pPlayer->GetQuestRewardStatus(10832) || pPlayer->GetQuestRewardStatus(10833))
{