diff options
373 files changed, 2607 insertions, 2215 deletions
diff --git a/sql/updates/54_world.sql b/sql/updates/54_world.sql index 7cc8a5feb36..88ebc4b46db 100644 --- a/sql/updates/54_world.sql +++ b/sql/updates/54_world.sql @@ -1,4 +1,4 @@ -CREATE TABLE `game_event_battleground_holiday` ( +CREATE TABLE `game_event_battleground_holiday` ( `event` int(10) unsigned NOT NULL, `bgflag` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`event`) diff --git a/src/bindings/interface/ScriptMgr.cpp b/src/bindings/interface/ScriptMgr.cpp index 7c840416a73..d4a0ddbc6f1 100644 --- a/src/bindings/interface/ScriptMgr.cpp +++ b/src/bindings/interface/ScriptMgr.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * Thanks to the original authors: MaNGOS <http://getmangos.com/> diff --git a/src/bindings/interface/ScriptMgr.h b/src/bindings/interface/ScriptMgr.h index 416d6838b40..2296d2247de 100644 --- a/src/bindings/interface/ScriptMgr.h +++ b/src/bindings/interface/ScriptMgr.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * Thanks to the original authors: MaNGOS <http://getmangos.com/> diff --git a/src/bindings/interface/Scripts/sc_default.cpp b/src/bindings/interface/Scripts/sc_default.cpp index 65ef5c5d615..f6c8386579f 100644 --- a/src/bindings/interface/Scripts/sc_default.cpp +++ b/src/bindings/interface/Scripts/sc_default.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * Thanks to the original authors: MaNGOS <http://getmangos.com/> diff --git a/src/bindings/interface/Scripts/sc_defines.cpp b/src/bindings/interface/Scripts/sc_defines.cpp index 6d534ee84ee..45456a1d5e2 100644 --- a/src/bindings/interface/Scripts/sc_defines.cpp +++ b/src/bindings/interface/Scripts/sc_defines.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * Thanks to the original authors: MaNGOS <http://getmangos.com/> diff --git a/src/bindings/interface/Scripts/sc_defines.h b/src/bindings/interface/Scripts/sc_defines.h index d14ba0b0d1d..ecd55aa7282 100644 --- a/src/bindings/interface/Scripts/sc_defines.h +++ b/src/bindings/interface/Scripts/sc_defines.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * Thanks to the original authors: MaNGOS <http://getmangos.com/> diff --git a/src/bindings/interface/config.h b/src/bindings/interface/config.h index c2649045820..ab312d7d3f4 100644 --- a/src/bindings/interface/config.h +++ b/src/bindings/interface/config.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * Thanks to the original authors: MaNGOS <http://getmangos.com/> diff --git a/src/bindings/interface/system.cpp b/src/bindings/interface/system.cpp index 71115df4f9f..20eaf9ce64c 100644 --- a/src/bindings/interface/system.cpp +++ b/src/bindings/interface/system.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * Thanks to the original authors: MaNGOS <http://getmangos.com/> diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index 2108015d327..7f2c2eba313 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -650,7 +650,7 @@ void LoadDatabase() // Drop Existing Text Map, only done once and we are ready to add data from multiple sources. TextMap.clear(); - // Load EventAI Text + // Load EventAI Text outstring_log("TSCR: Loading EventAI Texts..."); LoadTrinityStrings(TScriptDB,"eventai_texts",-1,1+(TEXT_SOURCE_RANGE)); @@ -716,7 +716,7 @@ void LoadDatabase() outstring_log(">> Loaded 0 additional EventAI Texts data. DB table `eventai_texts` is empty."); } - // Load Script Text + // Load Script Text outstring_log("TSCR: Loading Script Texts..."); LoadTrinityStrings(TScriptDB,"script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2)); @@ -781,7 +781,7 @@ void LoadDatabase() outstring_log(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty."); } - // Load Custom Text + // Load Custom Text outstring_log("TSCR: Loading Custom Texts..."); LoadTrinityStrings(TScriptDB,"custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3)); @@ -1198,7 +1198,7 @@ void LoadDatabase() struct TSpellSummary { uint8 Targets; // set of enum SelectTarget - uint8 Effects; // set of enum SelectEffect + uint8 Effects; // set of enum SelectEffect }extern *SpellSummary; TRINITY_DLL_EXPORT diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 75a4843c5bb..346e381e4d7 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -136,7 +136,7 @@ void ScriptedAI::EnterEvadeMode() { if(owner->isAlive()) m_creature->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); - } + } else m_creature->GetMotionMaster()->MoveTargetedHome(); } @@ -434,7 +434,7 @@ void ScriptedAI::SelectUnitList(std::list<Unit*> &targetList, uint32 num, Select || playerOnly && target->GetTypeId() != TYPEID_PLAYER || dist && !m_creature->IsWithinCombatRange(target, dist)) { - continue; + continue; } targetList.push_back(target); --num; @@ -634,15 +634,15 @@ void FillSpellSummary() SpellSummary[i].Targets |= 1 << (SELECT_TARGET_ANY_FRIEND-1); //Make sure that this spell includes a damage effect - if ( TempSpell->Effect[j] == SPELL_EFFECT_SCHOOL_DAMAGE || - TempSpell->Effect[j] == SPELL_EFFECT_INSTAKILL || - TempSpell->Effect[j] == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE || + if ( TempSpell->Effect[j] == SPELL_EFFECT_SCHOOL_DAMAGE || + TempSpell->Effect[j] == SPELL_EFFECT_INSTAKILL || + TempSpell->Effect[j] == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE || TempSpell->Effect[j] == SPELL_EFFECT_HEALTH_LEECH ) SpellSummary[i].Effects |= 1 << (SELECT_EFFECT_DAMAGE-1); //Make sure that this spell includes a healing effect (or an apply aura with a periodic heal) - if ( TempSpell->Effect[j] == SPELL_EFFECT_HEAL || - TempSpell->Effect[j] == SPELL_EFFECT_HEAL_MAX_HEALTH || + if ( TempSpell->Effect[j] == SPELL_EFFECT_HEAL || + TempSpell->Effect[j] == SPELL_EFFECT_HEAL_MAX_HEALTH || TempSpell->Effect[j] == SPELL_EFFECT_HEAL_MECHANICAL || (TempSpell->Effect[j] == SPELL_EFFECT_APPLY_AURA && TempSpell->EffectApplyAuraName[j]== 8 )) SpellSummary[i].Effects |= 1 << (SELECT_EFFECT_HEALING-1); @@ -746,7 +746,7 @@ void ScriptedAI::DoTeleportAll(float x, float y, float z, float o) } Unit* FindCreature(uint32 entry, float range, Unit* Finder) -{ +{ if(!Finder) return NULL; Creature* target = NULL; diff --git a/src/bindings/scripts/include/sc_instance.h b/src/bindings/scripts/include/sc_instance.h index 8ecd982f5cb..c02b05fa709 100644 --- a/src/bindings/scripts/include/sc_instance.h +++ b/src/bindings/scripts/include/sc_instance.h @@ -38,7 +38,7 @@ class TRINITY_DLL_DECL ScriptedInstance : public InstanceData virtual void Update(uint32) {} // Save and Load instance data to the database - const char* Save() { return NULL; } + const char* Save() { return NULL; } void Load(const char* in) { } }; diff --git a/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp b/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp index 13ad8ff6f29..18757d05510 100644 --- a/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp +++ b/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp @@ -44,13 +44,13 @@ bool AreaTrigger_at_legion_teleporter(Player *player, AreaTriggerEntry *at) player->CastSpell(player,SPELL_TELE_A_TO,false); return true; } - + if (player->GetTeam()== HORDE && player->GetQuestRewardStatus(10604)) { player->CastSpell(player,SPELL_TELE_H_TO,false); return true; } - + return false; } return false; diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp index 043bf461c0c..be3168adbe4 100644 --- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp +++ b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp @@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI m_creature->resetAttackTimer(); } } - else + else { //Only run this code if we arn't already casting if (!m_creature->IsNonMeleeSpellCasted(false)) @@ -155,7 +155,7 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI } } } -}; +}; CreatureAI* GetAI_generic_creature(Creature *_Creature) { return new generic_creatureAI (_Creature); diff --git a/src/bindings/scripts/scripts/guard/guard_ai.cpp b/src/bindings/scripts/scripts/guard/guard_ai.cpp index 09b4a92a306..ed766d24e0e 100644 --- a/src/bindings/scripts/scripts/guard/guard_ai.cpp +++ b/src/bindings/scripts/scripts/guard/guard_ai.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Guard_AI SD%Complete: 90 -SDComment: +SDComment: SDCategory: Guards EndScriptData */ @@ -51,7 +51,7 @@ void guardAI::Aggro(Unit *who) break; } } - + if (SpellEntry const *spell = m_creature->reachWithSpellAttack(who)) DoCastSpell(who, spell); } diff --git a/src/bindings/scripts/scripts/item/item_scripts.cpp b/src/bindings/scripts/scripts/item/item_scripts.cpp index ba92a4adcd7..35d0cb5ab62 100644 --- a/src/bindings/scripts/scripts/item/item_scripts.cpp +++ b/src/bindings/scripts/scripts/item/item_scripts.cpp @@ -74,7 +74,7 @@ bool ItemUse_item_only_for_flight(Player *player, Item* _Item, SpellCastTargets { uint32 itemId = _Item->GetEntry(); bool disabled = false; - + //for special scripts switch(itemId) { @@ -84,10 +84,10 @@ bool ItemUse_item_only_for_flight(Player *player, Item* _Item, SpellCastTargets break; case 34489: if(player->GetZoneId() != 4080) - disabled = true; + disabled = true; break; } - + // allow use in flight only if( player->isInFlight() && !disabled) return false; @@ -110,7 +110,7 @@ bool ItemUse_item_attuned_crystal_cores(Player *player, Item* _Item, SpellCastTa ((Creature*)targets.getUnitTarget())->RemoveCorpse(); return false; } - + player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL); return true; } diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp index f17c134ab2c..bfe4138c8a5 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp @@ -31,7 +31,7 @@ void npc_escortAI::AttackStart(Unit *who) if (IsBeingEscorted && !Defend) return; - + if ( m_creature->Attack(who, true) ) { m_creature->AddThreat(who, 0.0f); @@ -237,7 +237,7 @@ void npc_escortAI::MovementInform(uint32 type, uint32 id) void npc_escortAI::OnPossess(bool apply) { - // We got possessed in the middle of being escorted, store the point + // We got possessed in the middle of being escorted, store the point // where we left off to come back to when possess is removed if (IsBeingEscorted) { diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp index 74905644fab..7e624f4d1e6 100644 --- a/src/bindings/scripts/scripts/npc/npcs_special.cpp +++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp @@ -139,7 +139,7 @@ bool QuestComplete_npc_chicken_cluck(Player *player, Creature *_Creature, const struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI { npc_dancing_flamesAI(Creature *c) : ScriptedAI(c) {Reset();} - + bool active; uint32 can_iteract; @@ -899,7 +899,7 @@ struct TRINITY_DLL_DECL npc_steam_tonkAI : public ScriptedAI void Reset() {} void Aggro(Unit *who) {} - + void OnPossess(bool apply) { if (apply) @@ -921,11 +921,11 @@ CreatureAI* GetAI_npc_steam_tonk(Creature *_Creature) return new npc_steam_tonkAI(_Creature); } -#define SPELL_TONK_MINE_DETONATE 25099 +#define SPELL_TONK_MINE_DETONATE 25099 struct TRINITY_DLL_DECL npc_tonk_mineAI : public ScriptedAI { - npc_tonk_mineAI(Creature *c) : ScriptedAI(c) + npc_tonk_mineAI(Creature *c) : ScriptedAI(c) { m_creature->SetReactState(REACT_PASSIVE); Reset(); @@ -1002,7 +1002,7 @@ bool ReceiveEmote_npc_brewfest_reveler( Player *player, Creature *_Creature, uin #define SPELL_DEADLY_POISON 34655 //Venomous Snake #define SPELL_CRIPPLING_POISON 3409 //Viper -#define VENOMOUS_SNAKE_TIMER 1200 +#define VENOMOUS_SNAKE_TIMER 1200 #define VIPER_TIMER 3000 #define C_VIPER 19921 @@ -1016,14 +1016,14 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI uint32 SpellTimer; Unit *Owner; bool IsViper; - + void Aggro(Unit *who) {} void Reset() { Owner = m_creature->GetOwner(); - - if (!m_creature->isPet() || !Owner) + + if (!m_creature->isPet() || !Owner) return; CreatureInfo const *Info = m_creature->GetCreatureInfo(); @@ -1051,25 +1051,25 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI { if (!m_creature->isPet() || !Owner) return; - + if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) && Owner->IsHostileTo(who))//don't attack not-pvp-flaged { if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) return; - + float attackRadius = m_creature->GetAttackDistance(who); if( m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who) ) - { + { if (!(rand() % RAND) ) - { - m_creature->setAttackTimer(BASE_ATTACK, (rand() % 10) * 100); + { + m_creature->setAttackTimer(BASE_ATTACK, (rand() % 10) * 100); SpellTimer = (rand() % 10) * 100; AttackStart(who); InCombat = true; } } - } - } + } + } void UpdateAI(const uint32 diff) { @@ -1077,41 +1077,41 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI return; //Follow if not in combat - if (!m_creature->hasUnitState(UNIT_STAT_FOLLOW)&& !InCombat) + if (!m_creature->hasUnitState(UNIT_STAT_FOLLOW)&& !InCombat) { m_creature->GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->MoveFollow(Owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); } - + //No victim -> get new from owner (need this because MoveInLineOfSight won't work while following -> corebug) if (!m_creature->getVictim()) { - if (InCombat) + if (InCombat) DoStopAttack(); InCombat = false; - + if(Owner->getAttackerForHelper()) AttackStart(Owner->getAttackerForHelper()); return; } - + if (SpellTimer < diff) { if (IsViper) //Viper { if (rand() % 3 == 0) //33% chance to cast { - uint32 spell; + uint32 spell; if( rand() % 2 == 0) spell = SPELL_MIND_NUMBING_POISON; else spell = SPELL_CRIPPLING_POISON; - + DoCast(m_creature->getVictim(),spell); } - + SpellTimer = VIPER_TIMER; } else //Venomous Snake @@ -1120,7 +1120,7 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI DoCast(m_creature->getVictim(),SPELL_DEADLY_POISON); SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() %5)*100; } - }else SpellTimer-=diff; + }else SpellTimer-=diff; DoMeleeAttackIfReady(); } }; diff --git a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp index ad03e9e8987..857b682748d 100644 --- a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp +++ b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp @@ -32,11 +32,11 @@ EndContentData */ ## npc_professor_phizzlethorpe ######*/ -#define SAY_PROGRESS_1 -1000235 +#define SAY_PROGRESS_1 -1000235 #define SAY_PROGRESS_2 -1000236 -#define SAY_PROGRESS_3 -1000237 -#define EMOTE_PROGRESS_4 -1000238 -#define SAY_AGGRO -1000239 +#define SAY_PROGRESS_3 -1000237 +#define EMOTE_PROGRESS_4 -1000238 +#define SAY_AGGRO -1000239 #define SAY_PROGRESS_5 -1000240 #define SAY_PROGRESS_6 -1000241 #define SAY_PROGRESS_7 -1000242 @@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI case 4:DoScriptText(SAY_PROGRESS_2, m_creature, player);break; case 5:DoScriptText(SAY_PROGRESS_3, m_creature, player);break; case 8:DoScriptText(EMOTE_PROGRESS_4, m_creature);break; - case 9: + case 9: { m_creature->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96, -2142.49, 20.15, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); m_creature->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96, -2142.49, 20.15, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); @@ -131,14 +131,14 @@ CreatureAI* GetAI_npc_professor_phizzlethorpeAI(Creature *_Creature) professor_phizzlethorpeAI->AddWaypoint(1, -2077.99, -2105.33, 13.24); professor_phizzlethorpeAI->AddWaypoint(2, -2074.60, -2109.67, 14.24); professor_phizzlethorpeAI->AddWaypoint(3, -2076.60, -2117.46, 16.67); - professor_phizzlethorpeAI->AddWaypoint(4, -2073.51, -2123.46, 18.42, 2000); - professor_phizzlethorpeAI->AddWaypoint(5, -2073.51, -2123.46, 18.42, 4000); + professor_phizzlethorpeAI->AddWaypoint(4, -2073.51, -2123.46, 18.42, 2000); + professor_phizzlethorpeAI->AddWaypoint(5, -2073.51, -2123.46, 18.42, 4000); professor_phizzlethorpeAI->AddWaypoint(6, -2066.60, -2131.85, 21.56); professor_phizzlethorpeAI->AddWaypoint(7, -2053.85, -2143.19, 20.31); professor_phizzlethorpeAI->AddWaypoint(8, -2043.49, -2153.73, 20.20, 12000); - professor_phizzlethorpeAI->AddWaypoint(9, -2043.49, -2153.73, 20.20, 14000); + professor_phizzlethorpeAI->AddWaypoint(9, -2043.49, -2153.73, 20.20, 14000); professor_phizzlethorpeAI->AddWaypoint(10, -2043.49, -2153.73, 20.20, 10000); - professor_phizzlethorpeAI->AddWaypoint(11, -2043.49, -2153.73, 20.20, 2000); + professor_phizzlethorpeAI->AddWaypoint(11, -2043.49, -2153.73, 20.20, 2000); professor_phizzlethorpeAI->AddWaypoint(12, -2053.85, -2143.19, 20.31); professor_phizzlethorpeAI->AddWaypoint(13, -2066.60, -2131.85, 21.56); professor_phizzlethorpeAI->AddWaypoint(14, -2073.51, -2123.46, 18.42); @@ -146,7 +146,7 @@ CreatureAI* GetAI_npc_professor_phizzlethorpeAI(Creature *_Creature) professor_phizzlethorpeAI->AddWaypoint(16, -2074.60, -2109.67, 14.24); professor_phizzlethorpeAI->AddWaypoint(17, -2077.99, -2105.33, 13.24); professor_phizzlethorpeAI->AddWaypoint(18, -2066.45, -2085.96, 9.08); - professor_phizzlethorpeAI->AddWaypoint(19, -2066.41, -2086.21, 8.97, 6000); + professor_phizzlethorpeAI->AddWaypoint(19, -2066.41, -2086.21, 8.97, 6000); professor_phizzlethorpeAI->AddWaypoint(20, -2066.41, -2086.21, 8.97, 2000); return (CreatureAI*)professor_phizzlethorpeAI; diff --git a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp index 10a311b3fc1..c684eeaf97d 100644 --- a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp +++ b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp @@ -20,12 +20,12 @@ SD%Complete: 70 SDComment: Quest support: 6544, 6482 SDCategory: Ashenvale Forest EndScriptData */ - + /* ContentData npc_torek npc_ruul_snowhoof EndContentData */ - + #include "precompiled.h" #include "../../npc/npc_escortAI.h" @@ -43,7 +43,7 @@ EndContentData */ #define SPELL_THUNDERCLAP 8078 #define QUEST_TOREK_ASSULT 6544 - + #define ENTRY_SPLINTERTREE_RAIDER 12859 #define ENTRY_DURIEL 12860 #define ENTRY_SILVERWING_SENTINEL 12896 @@ -52,18 +52,18 @@ EndContentData */ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI { npc_torekAI(Creature *c) : npc_escortAI(c) {Reset();} - + uint32 Rend_Timer; uint32 Thunderclap_Timer; bool Completed; - + void WaypointReached(uint32 i) { Unit* player = Unit::GetUnit((*m_creature), PlayerGUID); if (!player) return; - + switch (i) { case 1: @@ -89,23 +89,23 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI break; } } - + void Reset() { Rend_Timer = 5000; Thunderclap_Timer = 8000; Completed = false; } - + void Aggro(Unit* who) { } - + void JustSummoned(Creature* summoned) { summoned->AI()->AttackStart(m_creature); } - + void JustDied(Unit* killer) { if (PlayerGUID && !Completed) @@ -114,14 +114,14 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI ((Player*)player)->FailQuest(QUEST_TOREK_ASSULT); } } - + void UpdateAI(const uint32 diff) { npc_escortAI::UpdateAI(diff); - + if (!UpdateVictim()) return; - + if (Rend_Timer < diff) { DoCast(m_creature->getVictim(),SPELL_REND); @@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI }else Thunderclap_Timer -= diff; } }; - + bool QuestAccept_npc_torek(Player* player, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_TOREK_ASSULT) @@ -145,14 +145,14 @@ bool QuestAccept_npc_torek(Player* player, Creature* creature, Quest const* ques DoScriptText(SAY_READY, creature, player); creature->setFaction(113); } - + return true; } - + CreatureAI* GetAI_npc_torek(Creature *_Creature) { npc_torekAI* thisAI = new npc_torekAI(_Creature); - + thisAI->AddWaypoint(0, 1782.63, -2241.11, 109.73, 5000); thisAI->AddWaypoint(1, 1788.88, -2240.17, 111.71); thisAI->AddWaypoint(2, 1797.49, -2238.11, 112.31); @@ -176,7 +176,7 @@ CreatureAI* GetAI_npc_torek(Creature *_Creature) thisAI->AddWaypoint(20, 1776.90, -2024.56, 109.83); //win thisAI->AddWaypoint(21, 1776.87, -2028.31, 109.83,60000);//stay thisAI->AddWaypoint(22, 1776.90, -2028.30, 109.83); - + return (CreatureAI*)thisAI; } @@ -184,13 +184,13 @@ CreatureAI* GetAI_npc_torek(Creature *_Creature) # npc_ruul_snowhoof ####*/ -#define QUEST_FREEDOM_TO_RUUL 6482 +#define QUEST_FREEDOM_TO_RUUL 6482 #define GO_CAGE 178147 struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI { npc_ruul_snowhoofAI(Creature *c) : npc_escortAI(c) {Reset();} - + void WaypointReached(uint32 i) { Unit* player = Unit::GetUnit((*m_creature), PlayerGUID); @@ -200,33 +200,33 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI switch(i) { - case 0: { + case 0: { m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); GameObject* Cage = FindGameObject(GO_CAGE, 20, m_creature); if(Cage) Cage->SetGoState(0); break;} - case 13: + case 13: m_creature->SummonCreature(3922, 3449.218018, -587.825073, 174.978867, 4.714445, TEMPSUMMON_DEAD_DESPAWN, 60000); m_creature->SummonCreature(3921, 3446.384521, -587.830872, 175.186279, 4.714445, TEMPSUMMON_DEAD_DESPAWN, 60000); - m_creature->SummonCreature(3926, 3444.218994, -587.835327, 175.380600, 4.714445, TEMPSUMMON_DEAD_DESPAWN, 60000); - break; + m_creature->SummonCreature(3926, 3444.218994, -587.835327, 175.380600, 4.714445, TEMPSUMMON_DEAD_DESPAWN, 60000); + break; case 19: m_creature->SummonCreature(3922, 3508.344482, -492.024261, 186.929031, 4.145029, TEMPSUMMON_DEAD_DESPAWN, 60000); m_creature->SummonCreature(3921, 3506.265625, -490.531006, 186.740128, 4.239277, TEMPSUMMON_DEAD_DESPAWN, 60000); m_creature->SummonCreature(3926, 3503.682373, -489.393799, 186.629684, 4.349232, TEMPSUMMON_DEAD_DESPAWN, 60000); - break; - + break; + case 21:{ if (player && player->GetTypeId() == TYPEID_PLAYER) ((Player*)player)->GroupEventHappens(QUEST_FREEDOM_TO_RUUL,m_creature); - - break; } + + break; } } } - + void Aggro(Unit* who) {} - + void Reset() { if (!IsBeingEscorted) @@ -251,13 +251,13 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI ((Player*)player)->FailQuest(QUEST_FREEDOM_TO_RUUL); } } - + void UpdateAI(const uint32 diff) { npc_escortAI::UpdateAI(diff); } }; - + bool QuestAccept_npc_ruul_snowhoof(Player* player, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL) @@ -267,13 +267,13 @@ bool QuestAccept_npc_ruul_snowhoof(Player* player, Creature* creature, Quest con } return true; } - + CreatureAI* GetAI_npc_ruul_snowhoofAI(Creature *_Creature) { npc_ruul_snowhoofAI* ruul_snowhoofAI = new npc_ruul_snowhoofAI(_Creature); - + ruul_snowhoofAI->AddWaypoint(0, 3347.250089, -694.700989, 159.925995); - ruul_snowhoofAI->AddWaypoint(1, 3341.527039, -694.725891, 161.124542, 4000); + ruul_snowhoofAI->AddWaypoint(1, 3341.527039, -694.725891, 161.124542, 4000); ruul_snowhoofAI->AddWaypoint(2, 3338.351074, -686.088138, 163.444000); ruul_snowhoofAI->AddWaypoint(3, 3352.744873, -677.721741, 162.316269); ruul_snowhoofAI->AddWaypoint(4, 3370.291016, -669.366943, 160.751358); @@ -294,14 +294,14 @@ CreatureAI* GetAI_npc_ruul_snowhoofAI(Creature *_Creature) ruul_snowhoofAI->AddWaypoint(19,3497.619385, -510.411499, 188.345322, 1000); // Ambush 2 ruul_snowhoofAI->AddWaypoint(20,3498.498047, -497.787506, 185.806274); ruul_snowhoofAI->AddWaypoint(21,3484.218750, -489.717529, 182.389862, 4000); // End - + return (CreatureAI*)ruul_snowhoofAI; } void AddSC_ashenvale() { Script *newscript; - + newscript = new Script; newscript->Name = "npc_torek"; newscript->GetAI = &GetAI_npc_torek; diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp index 2f554c9ca1d..2db0ee3adc4 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -#define SPELL_INHIBITMAGIC 32264 +#define SPELL_INHIBITMAGIC 32264 #define SPELL_ATTRACTMAGIC 32265 #define N_SPELL_CARNIVOROUSBITE 36383 #define H_SPELL_CARNIVOROUSBITE 39382 @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI Unit *focusedTarget; void Reset() - { + { Inhibitmagic_Timer = 0; Attractmagic_Timer = 28000; Carnivorousbite_Timer = 10000; @@ -81,12 +81,12 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI { //Inhibitmagic_Timer if (Inhibitmagic_Timer < diff) - { - float dist; - Map *map = m_creature->GetMap(); - Map::PlayerList const &PlayerList = map->GetPlayers(); - for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* i_pl = i->getSource()) + { + float dist; + Map *map = m_creature->GetMap(); + Map::PlayerList const &PlayerList = map->GetPlayers(); + for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + if (Player* i_pl = i->getSource()) if (i_pl->isAlive() && (dist = i_pl->GetDistance(m_creature)) < 45) { i_pl->RemoveAurasDueToSpell(SPELL_INHIBITMAGIC); @@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_shirrak_the_dead_watcher(Creature *_Creature) { @@ -189,7 +189,7 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI //DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_mob_focus_fire(Creature *_Creature) { diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp index 8d2572f90de..f7dfcb3ed0c 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp @@ -53,7 +53,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI { - boss_darkweaver_sythAI(Creature *c) : ScriptedAI(c) + boss_darkweaver_sythAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); @@ -258,7 +258,7 @@ CreatureAI* GetAI_mob_syth_fire(Creature *_Creature) struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI { - mob_syth_arcaneAI(Creature *c) : ScriptedAI(c) + mob_syth_arcaneAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); @@ -310,8 +310,8 @@ CreatureAI* GetAI_mob_syth_arcane(Creature *_Creature) struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI { - mob_syth_frostAI(Creature *c) : ScriptedAI(c) - + mob_syth_frostAI(Creature *c) : ScriptedAI(c) + { HeroicMode = m_creature->GetMap()->IsHeroic(); Reset(); @@ -362,7 +362,7 @@ CreatureAI* GetAI_mob_syth_frost(Creature *_Creature) struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI { - mob_syth_shadowAI(Creature *c) : ScriptedAI(c) + mob_syth_shadowAI(Creature *c) : ScriptedAI(c) { HeroicMode = m_creature->GetMap()->IsHeroic(); diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp index ed6b1da35cd..0d04fc57f23 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Grandmaster_Vorpil SD%Complete: 100 -SDComment: +SDComment: SDCategory: Auchindoun, Shadow Labyrinth EndScriptData */ @@ -51,7 +51,7 @@ EndScriptData */ float VorpilPosition[3] = {-252.8820,-264.3030,17.1}; -float VoidPortalCoords[5][3] = +float VoidPortalCoords[5][3] = { {-283.5894, -239.5718, 12.7}, {-306.5853, -258.4539, 12.7}, @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI bool Intro, HelpYell; bool sumportals; bool HeroicMode; - + uint32 ShadowBoltVolley_Timer; uint32 DrawShadows_Timer; uint32 summonTraveler_Timer; @@ -288,7 +288,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI DoCast(m_creature,HeroicMode?H_SPELL_RAIN_OF_FIRE:SPELL_RAIN_OF_FIRE); ShadowBoltVolley_Timer = 6000; - DrawShadows_Timer = 30000; + DrawShadows_Timer = 30000; }else DrawShadows_Timer -= diff; if ( summonTraveler_Timer < diff) diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp index cbd8df9e649..155f1c0e443 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp @@ -104,21 +104,21 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance return plr; } } - + debug_log("SD2: Instance Shadow Labyrinth: GetPlayerInMap, but PlayerList is empty!"); return NULL; } - + void HandleGameObject(uint64 guid, uint32 state) { Player *player = GetPlayerInMap(); - + if (!player || !guid) { debug_log("SD2: Shadow Labyrinth: HandleGameObject fail"); return; } - + if (GameObject *go = GameObject::GetGameObject(*player,guid)) go->SetGoState(state); } @@ -166,20 +166,20 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance Encounter[4] = data; break; } - + if (data == DONE) { if (type == TYPE_OVERSEER && FelOverseerCount != 0) return; - + OUT_SAVE_INST_DATA; std::ostringstream saveStream; saveStream << Encounter[0] << " " << Encounter[1] << " " << Encounter[2] << " " << Encounter[3] << " " << Encounter[4]; - + str_data = saveStream.str(); - + SaveToDB(); OUT_SAVE_INST_DATA_COMPLETE; } @@ -209,7 +209,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance { return str_data.c_str(); } - + void Load(const char* in) { if (!in) @@ -217,16 +217,16 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance OUT_LOAD_INST_DATA_FAIL; return; } - + OUT_LOAD_INST_DATA(in); std::istringstream loadStream(in); loadStream >> Encounter[0] >> Encounter[1] >> Encounter[2] >> Encounter[3] >> Encounter[4]; - + for(uint8 i = 0; i < ENCOUNTERS; ++i) if (Encounter[i] == IN_PROGRESS) Encounter[i] = NOT_STARTED; - + OUT_LOAD_INST_DATA_COMPLETE; } }; diff --git a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp index e3851ab3821..6f31b7d0f67 100644 --- a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp @@ -371,7 +371,7 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI } void AttackStart(Unit *who) - { + { if (!who || PlayerGUID) return; @@ -447,7 +447,7 @@ struct TRINITY_DLL_DECL mob_depth_chargeAI : public ScriptedAI we_must_die = false; must_die_timer = 1000; } - + void UpdateAI(const uint32 diff) { if(we_must_die) @@ -471,9 +471,9 @@ struct TRINITY_DLL_DECL mob_depth_chargeAI : public ScriptedAI return; } } - + void AttackStart(Unit *who) - { + { return; } diff --git a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp index f0fde3ffbe2..4ff46437e35 100644 --- a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SPELL_MANASTORM 21097 #define SPELL_CHILL 21098 #define SPELL_FROSTBREATH 21099 -#define SPELL_REFLECT 22067 +#define SPELL_REFLECT 22067 #define SPELL_CLEAVE 8255 //Perhaps not right ID #define SPELL_ENRAGE 23537 diff --git a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp index 259c28da483..365e8e5effe 100644 --- a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp @@ -314,16 +314,16 @@ CreatureAI* GetAI_npc_injured_draenei(Creature *_Creature) /*###### ## npc_magwin ######*/ - + #define SAY_START -1000111 #define SAY_AGGRO -1000112 #define SAY_PROGRESS -1000113 #define SAY_END1 -1000114 #define SAY_END2 -1000115 #define EMOTE_HUG -1000116 - + #define QUEST_A_CRY_FOR_HELP 9528 - + struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI { npc_magwinAI(Creature *c) : npc_escortAI(c) {Reset();} @@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI void WaypointReached(uint32 i) { Unit* player = Unit::GetUnit((*m_creature), PlayerGUID); - + if (!player) return; @@ -355,7 +355,7 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI break; } } - + void Aggro(Unit* who) { DoScriptText(SAY_AGGRO, m_creature, who); @@ -376,7 +376,7 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI ((Player*)player)->FailQuest(QUEST_A_CRY_FOR_HELP); } } - + void UpdateAI(const uint32 diff) { npc_escortAI::UpdateAI(diff); @@ -392,7 +392,7 @@ bool QuestAccept_npc_magwin(Player* player, Creature* creature, Quest const* que } return true; } - + CreatureAI* GetAI_npc_magwinAI(Creature *_Creature) { npc_magwinAI* magwinAI = new npc_magwinAI(_Creature); @@ -495,7 +495,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI uint32 Step; uint32 SayTimer; - + bool EventStarted; void Reset() @@ -560,14 +560,14 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI Cell cell(pair); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - + Trinity::AllGameObjectsWithEntryInGrid go_check(GO_NAGA_FLAG); Trinity::GameObjectListSearcher<Trinity::AllGameObjectsWithEntryInGrid> go_search(m_creature, FlagList, go_check); TypeContainerVisitor <Trinity::GameObjectListSearcher<Trinity::AllGameObjectsWithEntryInGrid>, GridTypeMapContainer> go_visit(go_search); CellLock<GridReadGuard> cell_lock(cell, pair); cell_lock->Visit(cell_lock, go_visit, *(m_creature->GetMap())); - + Player* player = NULL; if (!FlagList.empty()) { diff --git a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp index 2cb282422a7..08fb76889da 100644 --- a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp +++ b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: The_Barrens SD%Complete: 90 -SDComment: Quest support: 2458, 4921, 6981, 1719, 863 +SDComment: Quest support: 2458, 4921, 6981, 1719, 863 SDCategory: Barrens EndScriptData */ @@ -218,7 +218,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI Wave = 0; PlayerGUID = 0; - for(uint8 i = 0; i < 6; ++i) + for(uint8 i = 0; i < 6; ++i) { AffrayChallenger[i] = 0; Challenger_down[i] = false; @@ -257,13 +257,13 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI DoScriptText(SAY_TWIGGY_FLATHEAD_DOWN, m_creature); pWarrior->FailQuest(1719); - for(uint8 i = 0; i < 6; ++i) + for(uint8 i = 0; i < 6; ++i) { - if (AffrayChallenger[i]) + if (AffrayChallenger[i]) { Creature* pCreature = (Creature*)Unit::GetUnit((*m_creature), AffrayChallenger[i]); if(pCreature) { - if(pCreature->isAlive()) + if(pCreature->isAlive()) { pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -275,7 +275,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI Challenger_down[i] = false; } - if (BigWill) + if (BigWill) { Creature* pCreature = (Creature*)Unit::GetUnit((*m_creature), BigWill); if(pCreature) { @@ -289,7 +289,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI BigWill = 0; } - if (!EventGrate && EventInProgress) + if (!EventGrate && EventInProgress) { float x,y,z; pWarrior->GetPosition(x, y, z); @@ -298,7 +298,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI pWarrior->AreaExploredOrEventHappens(1719); DoScriptText(SAY_TWIGGY_FLATHEAD_BEGIN, m_creature); - for(uint8 i = 0; i < 6; ++i) + for(uint8 i = 0; i < 6; ++i) { Creature* pCreature = m_creature->SummonCreature(AFFRAY_CHALLENGER, AffrayChallengerLoc[i][0], AffrayChallengerLoc[i][1], AffrayChallengerLoc[i][2], AffrayChallengerLoc[i][3], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); if(!pCreature) @@ -314,16 +314,16 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI EventGrate = true; } } - else if (EventInProgress) + else if (EventInProgress) { - if (Challenger_checker < diff) + if (Challenger_checker < diff) { - for(uint8 i = 0; i < 6; ++i) + for(uint8 i = 0; i < 6; ++i) { - if (AffrayChallenger[i]) + if (AffrayChallenger[i]) { Creature* pCreature = (Creature*)Unit::GetUnit((*m_creature), AffrayChallenger[i]); - if((!pCreature || (!pCreature->isAlive())) && !Challenger_down[i]) + if((!pCreature || (!pCreature->isAlive())) && !Challenger_down[i]) { DoScriptText(SAY_TWIGGY_FLATHEAD_DOWN, m_creature); Challenger_down[i] = true; @@ -333,13 +333,13 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI Challenger_checker = 1000; } else Challenger_checker -= diff; - if(Wave_Timer < diff) + if(Wave_Timer < diff) { - if (AffrayChallenger[Wave] && Wave < 6 && !EventBigWill) + if (AffrayChallenger[Wave] && Wave < 6 && !EventBigWill) { DoScriptText(SAY_TWIGGY_FLATHEAD_FRAY, m_creature); Creature* pCreature = (Creature*)Unit::GetUnit((*m_creature), AffrayChallenger[Wave]); - if(pCreature && (pCreature->isAlive())) + if(pCreature && (pCreature->isAlive())) { pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -363,10 +363,10 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI Wave_Timer = 1000; } } - else if (Wave >= 6 && EventBigWill && BigWill) + else if (Wave >= 6 && EventBigWill && BigWill) { Creature* pCreature = (Creature*)Unit::GetUnit((*m_creature), BigWill); - if (!pCreature || !pCreature->isAlive()) + if (!pCreature || !pCreature->isAlive()) { DoScriptText(SAY_TWIGGY_FLATHEAD_OVER, m_creature); EventInProgress = false; @@ -445,7 +445,7 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI Completed = true; if (player && player->GetTypeId() == TYPEID_PLAYER) ((Player*)player)->GroupEventHappens(QUEST_ESCAPE, m_creature); - break; + break; } } diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp index 8ec0f7c0d1b..29b625dcaf6 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp @@ -145,7 +145,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI std::list<HostilReference *> m_threatlist = m_creature->getThreatManager().getThreatList(); if(!m_threatlist.size()) // He doesn't have anyone in his threatlist, useless to continue - return; + return; std::list<Unit *> targets; std::list<HostilReference *>::iterator itr = m_threatlist.begin(); diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index 5d79ed05ae1..bb7c59e2d0e 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -130,7 +130,7 @@ EndScriptData */ #define SPELL_FAN_BLADES 39954 // bugged visual // Other defines -#define CENTER_X 676.740 +#define CENTER_X 676.740 #define CENTER_Y 305.297 #define CENTER_Z 353.192 @@ -249,7 +249,7 @@ struct Yells static Yells Conversation[]= { {11463, "Akama... your duplicity is hardly surprising. I should have slaughtered you and your malformed brethren long ago.", ILLIDAN_STORMRAGE, 8000, 0, true}, - {0, NULL, ILLIDAN_STORMRAGE, 5000, 396, true}, + {0, NULL, ILLIDAN_STORMRAGE, 5000, 396, true}, {11389, "We've come to end your reign, Illidan. My people and all of Outland shall be free!", AKAMA, 7000, 25, true}, {0, NULL, AKAMA, 5000, 66, true}, {11464, "Boldly said. But I remain unconvinced.", ILLIDAN_STORMRAGE, 8000, 396, true}, @@ -426,7 +426,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI EnterPhase(PHASE_FLIGHT); } else // handle flight sequence - Timer[EVENT_FLIGHT_SEQUENCE] = 1000; + Timer[EVENT_FLIGHT_SEQUENCE] = 1000; } void Aggro(Unit *who) @@ -691,7 +691,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI break; } if(Phase == PHASE_TRANSFORM_SEQUENCE) - Timer[EVENT_TRANSFORM_SEQUENCE] = DemonTransformation[TransformCount].timer; + Timer[EVENT_TRANSFORM_SEQUENCE] = DemonTransformation[TransformCount].timer; TransformCount++; } @@ -796,7 +796,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI case EVENT_DRAW_SOUL: DoCast(m_creature->getVictim(), SPELL_DRAW_SOUL); - Timer[EVENT_DRAW_SOUL] = 50000 + rand()%10000; + Timer[EVENT_DRAW_SOUL] = 50000 + rand()%10000; break; //PHASE_NORMAL_2 @@ -836,7 +836,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI break; case EVENT_EYE_BLAST: - CastEyeBlast(); + CastEyeBlast(); Timer[EVENT_EYE_BLAST] = 0; break; @@ -906,7 +906,7 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI void Aggro(Unit *who) {DoZoneInCombat();} void ChargeCheck() - { + { Unit* target = SelectUnit(SELECT_TARGET_FARTHEST, 0, 200, false); if(target && (!m_creature->IsWithinCombatRange(target, FLAME_CHARGE_DISTANCE))) { @@ -1497,7 +1497,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if((!UpdateVictim()) + if((!UpdateVictim()) && !Timer[EVENT_MAIEV_STEALTH]) return; @@ -1731,7 +1731,7 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI uint32 CheckTimer; void Reset() - { + { if(pInstance) IllidanGUID = pInstance->GetData64(DATA_ILLIDANSTORMRAGE); else @@ -1747,7 +1747,7 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI { if( m_creature->isAttackReady() && m_creature->IsWithinMeleeRange(m_creature->getVictim())) { - if(!m_creature->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND, 0) + if(!m_creature->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND, 0) && !m_creature->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND2, 0)) { m_creature->CastSpell(m_creature->getVictim(), SPELL_PARASITIC_SHADOWFIEND2, true, 0, 0, IllidanGUID); //do not stack diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp index 6a9cd6bc7b8..af712a9bfd0 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp @@ -58,7 +58,7 @@ EndScriptData */ #define AURA_OF_SUFFERING 41292 #define AURA_OF_SUFFERING_ARMOR 42017 // linked aura, need core support #define ESSENCE_OF_SUFFERING_PASSIVE 41296 // periodic trigger 41294 -#define ESSENCE_OF_SUFFERING_PASSIVE2 41623 +#define ESSENCE_OF_SUFFERING_PASSIVE2 41623 #define SPELL_FIXATE_TARGET 41294 // dummy, select target #define SPELL_FIXATE_TAUNT 41295 // force taunt #define SPELL_ENRAGE 41305 @@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL npc_enslaved_soulAI : public ScriptedAI struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI { - boss_reliquary_of_soulsAI(Creature *c) : ScriptedAI(c) + boss_reliquary_of_soulsAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); EssenceGUID = 0; @@ -282,7 +282,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI EssenceGUID = 0; SoulCount = 0; SoulDeathCount = 0; - Timer = 3000; + Timer = 3000; break; case 6: if(SoulCount < NUMBER_ENSLAVED_SOUL) @@ -467,7 +467,7 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI if(m_creature->m_currentSpells[CURRENT_GENERIC_SPELL]) for(uint8 i = 0; i < 3; ++i) if(spell->Effect[i] == SPELL_EFFECT_INTERRUPT_CAST) - if(m_creature->m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Id == SPELL_SOUL_SHOCK + if(m_creature->m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Id == SPELL_SOUL_SHOCK || m_creature->m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Id == SPELL_DEADEN) m_creature->InterruptSpell(CURRENT_GENERIC_SPELL, false); } @@ -483,9 +483,9 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI { switch(rand()%3) { - case 0: DoScriptText(DESI_SAY_SLAY1, m_creature); break; - case 1: DoScriptText(DESI_SAY_SLAY2, m_creature); break; - case 2: DoScriptText(DESI_SAY_SLAY3, m_creature); break; + case 0: DoScriptText(DESI_SAY_SLAY1, m_creature); break; + case 1: DoScriptText(DESI_SAY_SLAY2, m_creature); break; + case 2: DoScriptText(DESI_SAY_SLAY3, m_creature); break; } } @@ -572,8 +572,8 @@ struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI { switch(rand()%2) { - case 0: DoScriptText(ANGER_SAY_SLAY1, m_creature); break; - case 1: DoScriptText(ANGER_SAY_SLAY2, m_creature); break; + case 0: DoScriptText(ANGER_SAY_SLAY1, m_creature); break; + case 1: DoScriptText(ANGER_SAY_SLAY2, m_creature); break; } } @@ -592,7 +592,7 @@ struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI if(CheckTankTimer < diff) { if(m_creature->getVictim()->GetGUID() != AggroTargetGUID) - { + { DoScriptText(ANGER_SAY_BEFORE, m_creature); DoCast(m_creature, SPELL_SELF_SEETHE, true); AggroTargetGUID = m_creature->getVictim()->GetGUID(); diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp index 954d66c9d82..ae3955ac6e2 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp @@ -236,23 +236,23 @@ struct TRINITY_DLL_DECL npc_volcanoAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); } - + ScriptedInstance *pInstance; - + uint32 CheckTimer; bool Eruption; - + void Reset() { CheckTimer = 1500; Eruption = false; - + m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - + void Aggro(Unit *who) {} - + void MoveInLineOfSight(Unit *who) { return; // paralyze the npc @@ -263,7 +263,7 @@ struct TRINITY_DLL_DECL npc_volcanoAI : public ScriptedAI if(CheckTimer < diff) { uint64 SupremusGUID = pInstance->GetData64(DATA_SUPREMUS); - Creature* Supremus = ((Creature*)Unit::GetUnit((*m_creature), SupremusGUID)); + Creature* Supremus = ((Creature*)Unit::GetUnit((*m_creature), SupremusGUID)); if(!Eruption && !((boss_supremusAI*)Supremus->AI())->Phase1) { Eruption = true; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp index 69afd23f888..d691407b91c 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp @@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI { if(!who || (!who->isAlive()) || (who->GetGUID() == GhostGUID)) return; - + ScriptedAI::MoveInLineOfSight(who); } @@ -381,7 +381,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI if(AggroTargetGUID) { Unit* pUnit = Unit::GetUnit((*m_creature), AggroTargetGUID); - if(pUnit) + if(pUnit) AttackStart(pUnit); DoZoneInCombat(); diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp index 427ddbda2cb..d04ce294b22 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp @@ -48,7 +48,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI { - boss_najentusAI(Creature *c) : ScriptedAI(c) + boss_najentusAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); diff --git a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp index 1fd53ec2cd7..18acc17322c 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp @@ -30,33 +30,33 @@ EndScriptData */ #define SAY_GATH_DEATH -1564093 #define SAY_GATH_SPECIAL1 -1564077 #define SAY_GATH_SPECIAL2 -1564081 - + #define SAY_VERA_SLAY -1564086 #define SAY_VERA_COMNT -1564089 #define SAY_VERA_DEATH -1564094 #define SAY_VERA_SPECIAL1 -1564078 #define SAY_VERA_SPECIAL2 -1564082 - + #define SAY_MALA_SLAY -1564087 #define SAY_MALA_COMNT -1564090 #define SAY_MALA_DEATH -1564095 #define SAY_MALA_SPECIAL1 -1564079 #define SAY_MALA_SPECIAL2 -1564083 - + #define SAY_ZERE_SLAY -1564088 #define SAY_ZERE_COMNT -1564091 #define SAY_ZERE_DEATH -1564096 #define SAY_ZERE_SPECIAL1 -1564080 #define SAY_ZERE_SPECIAL2 -1564084 - + #define ERROR_INST_DATA "SD2 ERROR: Instance Data for Black Temple not set properly; Illidari Council event will not function properly." - + struct CouncilYells { int32 entry; uint32 timer; }; - + static CouncilYells CouncilAggro[]= { {-1564069, 5000}, // Gathios @@ -64,7 +64,7 @@ static CouncilYells CouncilAggro[]= {-1564071, 5000}, // Malande {-1564072, 0}, // Zerevor }; - + // Need to get proper timers for this later static CouncilYells CouncilEnrage[]= { @@ -456,7 +456,7 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun void JustDied(Unit *victim) { - DoScriptText(SAY_GATH_DEATH, m_creature); + DoScriptText(SAY_GATH_DEATH, m_creature); } Unit* SelectCouncilMember() @@ -568,12 +568,12 @@ struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_ void KilledUnit(Unit *victim) { - DoScriptText(SAY_ZERE_SLAY, m_creature); + DoScriptText(SAY_ZERE_SLAY, m_creature); } void JustDied(Unit *victim) { - DoScriptText(SAY_ZERE_DEATH, m_creature); + DoScriptText(SAY_ZERE_DEATH, m_creature); } void UpdateAI(const uint32 diff) @@ -656,12 +656,12 @@ struct TRINITY_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI void KilledUnit(Unit *victim) { - DoScriptText(SAY_MALA_SLAY, m_creature); + DoScriptText(SAY_MALA_SLAY, m_creature); } void JustDied(Unit *victim) { - DoScriptText(SAY_MALA_DEATH, m_creature); + DoScriptText(SAY_MALA_DEATH, m_creature); } void UpdateAI(const uint32 diff) @@ -730,7 +730,7 @@ struct TRINITY_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI void KilledUnit(Unit *victim) { - DoScriptText(SAY_VERA_SLAY, m_creature); + DoScriptText(SAY_VERA_SLAY, m_creature); } void JustDied(Unit *victim) diff --git a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp b/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp index 2f1a456fb35..564958924b2 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp @@ -124,7 +124,7 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance return plr; } } - + debug_log("TSCR: Instance Black Temple: GetPlayerInMap, but PlayerList is empty!"); return NULL; } @@ -132,13 +132,13 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance void HandleGameObject(uint64 guid, uint32 state) { Player *player = GetPlayerInMap(); - + if (!player || !guid) { debug_log("TSCR: Black Temple: HandleGameObject fail"); return; } - + if (GameObject *go = GameObject::GetGameObject(*player,guid)) go->SetGoState(state); } @@ -224,13 +224,13 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance HandleGameObject(NajentusGate, 0); } Encounters[1] = data; break; - case DATA_SHADEOFAKAMAEVENT: + case DATA_SHADEOFAKAMAEVENT: if(data == IN_PROGRESS) { HandleGameObject(ShadeOfAkamaDoor, 1); }else HandleGameObject(ShadeOfAkamaDoor, 0); Encounters[2] = data; break; - case DATA_TERONGOREFIENDEVENT: + case DATA_TERONGOREFIENDEVENT: if(data == IN_PROGRESS) { HandleGameObject(TeronDoor, 1); @@ -247,13 +247,13 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance HandleGameObject(GuurtogDoor, 0); } Encounters[4] = data; break; - case DATA_RELIQUARYOFSOULSEVENT: + case DATA_RELIQUARYOFSOULSEVENT: if(data == DONE) { HandleGameObject(TempleDoor, 0); } Encounters[5] = data; break; - case DATA_MOTHERSHAHRAZEVENT: + case DATA_MOTHERSHAHRAZEVENT: if(data == DONE) { HandleGameObject(MotherDoor, 0); @@ -274,15 +274,15 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance } if (data == DONE) - { + { OUT_SAVE_INST_DATA; std::ostringstream saveStream; saveStream << Encounters[0] << " " << Encounters[1] << " " - << Encounters[2] << " " << Encounters[3] << " " << Encounters[4] + << Encounters[2] << " " << Encounters[3] << " " << Encounters[4] << " " << Encounters[5] << " " << Encounters[6] << " " << Encounters[7] << " " << Encounters[8]; - + str_data = saveStream.str(); SaveToDB(); @@ -312,7 +312,7 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance { return str_data.c_str(); } - + void Load(const char* in) { if (!in) @@ -320,18 +320,18 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance OUT_LOAD_INST_DATA_FAIL; return; } - + OUT_LOAD_INST_DATA(in); std::istringstream loadStream(in); - loadStream >> Encounters[0] >> Encounters[1] >> Encounters[2] - >> Encounters[3] >> Encounters[4] >> Encounters[5] >> Encounters[6] + loadStream >> Encounters[0] >> Encounters[1] >> Encounters[2] + >> Encounters[3] >> Encounters[4] >> Encounters[5] >> Encounters[6] >> Encounters[7] >> Encounters[8]; - + for(uint8 i = 0; i < ENCOUNTERS; ++i) if (Encounters[i] == IN_PROGRESS) Encounters[i] = NOT_STARTED; - + OUT_LOAD_INST_DATA_COMPLETE; } }; diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp index 7c5ff1e942f..75818bca575 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp @@ -40,10 +40,10 @@ EndContentData */ #define C_GRIMSTONE 10096 #define C_THELDREN 16059 - + //4 or 6 in total? 1+2+1 / 2+2+2 / 3+3. Depending on this, code should be changed. #define MOB_AMOUNT 4 - + uint32 RingMob[]= { 8925, // Dredge Worm @@ -53,7 +53,7 @@ uint32 RingMob[]= 8933, // Cave Creeper 8932, // Borer Beetle }; - + uint32 RingBoss[]= { 9027, // Gorosh @@ -63,7 +63,7 @@ uint32 RingBoss[]= 9031, // Anub'shiah 9032, // Hedrum }; - + float RingLocations[6][3]= { {604.802673, -191.081985, -54.058590}, // ring @@ -73,16 +73,16 @@ float RingLocations[6][3]= {631.818359, -180.548126, -52.654770}, // second gate {627.390381, -201.075974, -52.692917} // hiding in corner }; - + bool AreaTrigger_at_ring_of_law(Player *player, AreaTriggerEntry *at) { ScriptedInstance* pInstance = ((ScriptedInstance*)player->GetInstanceData()); - + if (pInstance) { if (pInstance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || pInstance->GetData(TYPE_RING_OF_LAW) == DONE) return false; - + pInstance->SetData(TYPE_RING_OF_LAW,IN_PROGRESS); player->SummonCreature(C_GRIMSTONE,625.559,-205.618,-52.735,2.609,TEMPSUMMON_DEAD_DESPAWN,0); @@ -90,11 +90,11 @@ bool AreaTrigger_at_ring_of_law(Player *player, AreaTriggerEntry *at) } return false; } - + /*###### ## npc_grimstone ######*/ - + //TODO: implement quest part of event (different end boss) struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI { @@ -106,68 +106,68 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI } ScriptedInstance* pInstance; - + uint8 EventPhase; uint32 Event_Timer; - + uint8 MobSpawnId; uint8 MobCount; uint32 MobDeath_Timer; uint64 RingMobGUID[4]; uint64 RingBossGUID; - + bool CanWalk; - + void Reset() { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - + EventPhase = 0; Event_Timer = 1000; - + MobCount = 0; MobDeath_Timer = 0; - + for(uint8 i = 0; i < MOB_AMOUNT; i++) RingMobGUID[i] = 0; - + RingBossGUID = 0; - + CanWalk = false; } void Aggro(Unit *who) { } - + void DoGate(uint32 id, uint32 state) { if (GameObject *go = GameObject::GetGameObject(*m_creature,pInstance->GetData64(id))) go->SetGoState(state); - + debug_log("SD2: npc_grimstone, arena gate update state."); } - + //TODO: move them to center void SummonRingMob() { if (Creature* tmp = m_creature->SummonCreature(RingMob[MobSpawnId],608.960,-235.322,-53.907,1.857,TEMPSUMMON_DEAD_DESPAWN,0)) RingMobGUID[MobCount] = tmp->GetGUID(); - + ++MobCount; - + if (MobCount == MOB_AMOUNT) MobDeath_Timer = 2500; } - + //TODO: move them to center void SummonRingBoss() { if (Creature* tmp = m_creature->SummonCreature(RingBoss[rand()%6],644.300,-175.989,-53.739,3.418,TEMPSUMMON_DEAD_DESPAWN,0)) RingBossGUID = tmp->GetGUID(); - + MobDeath_Timer = 2500; } - + void WaypointReached(uint32 i) { switch(i) @@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI break; } } - + void UpdateAI(const uint32 diff) { if (!pInstance) @@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI } return; } - + for(uint8 i = 0; i < MOB_AMOUNT; i++) { Creature *mob = (Creature*)Unit::GetUnit(*m_creature,RingMobGUID[i]); @@ -245,7 +245,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI } }else MobDeath_Timer -= diff; } - + if (Event_Timer) { if (Event_Timer <= diff) @@ -313,21 +313,21 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI ++EventPhase; }else Event_Timer -= diff; } - + if (CanWalk) npc_escortAI::UpdateAI(diff); } }; - + CreatureAI* GetAI_npc_grimstone(Creature *_Creature) { npc_grimstoneAI* Grimstone_AI = new npc_grimstoneAI(_Creature); for(uint8 i = 0; i < 6; ++i) Grimstone_AI->AddWaypoint(i, RingLocations[i][0], RingLocations[i][1], RingLocations[i][2]); - + return (CreatureAI*)Grimstone_AI; - + } /*###### @@ -404,7 +404,7 @@ CreatureAI* GetAI_mob_phalanx(Creature *_Creature) #define GOSSIP_ITEM_KHARAN_1 "I need to know where the princess are, Kharan!" #define GOSSIP_ITEM_KHARAN_2 "All is not lost, Kharan!" - + #define GOSSIP_ITEM_KHARAN_3 "Gor'shak is my friend, you can trust me." #define GOSSIP_ITEM_KHARAN_4 "Not enough, you need to tell me more." #define GOSSIP_ITEM_KHARAN_5 "So what happened?" @@ -523,9 +523,9 @@ bool GossipSelect_npc_lokhtos_darkbargainer(Player *player, Creature *_Creature, player->CLOSE_GOSSIP_MENU(); player->CastSpell(player, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false); } - if (action == GOSSIP_ACTION_TRADE) + if (action == GOSSIP_ACTION_TRADE) player->SEND_VENDORLIST( _Creature->GetGUID() ); - + return true; } @@ -591,7 +591,7 @@ struct TRINITY_DLL_DECL npc_dughal_stormwingAI : public npc_escortAI } }; CreatureAI* GetAI_npc_dughal_stormwing(Creature *_Creature) -{ +{ npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(_Creature); dughal_stormwingAI->AddWaypoint(0, 280.42,-82.86, -77.12,0); @@ -635,18 +635,18 @@ bool GossipSelect_npc_dughal_stormwing(Player *player, Creature *_Creature, uint #define SAY_WINDSOR_4_3 "Good work! We're almost there, $N. This way." #define SAY_WINDSOR_6 "This is it, $N. My stuff should be in that room. Cover me, I'm going in!" #define SAY_WINDSOR_9 "Ah, there it is!" -#define MOB_ENTRY_REGINALD_WINDSOR 9682 +#define MOB_ENTRY_REGINALD_WINDSOR 9682 Player* PlayerStart; /* struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI { - npc_marshal_windsorAI(Creature *c) : npc_escortAI(c) - { + npc_marshal_windsorAI(Creature *c) : npc_escortAI(c) + { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); + Reset(); } - + void WaypointReached(uint32 i) { switch( i ) @@ -674,9 +674,9 @@ struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI m_creature->setFaction(11); break; case 16: - m_creature->Say(SAY_WINDSOR_9, LANG_UNIVERSAL, PlayerGUID); + m_creature->Say(SAY_WINDSOR_9, LANG_UNIVERSAL, PlayerGUID); break; - case 17: + case 17: m_creature->HandleEmoteCommand(EMOTE_STATE_USESTANDING);//EMOTE_STATE_WORK break; case 18: @@ -692,7 +692,7 @@ struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI } } - void Aggro(Unit* who) + void Aggro(Unit* who) { switch(rand()%3) { @@ -716,9 +716,9 @@ struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI IsOnHold = false; if(!pInstance->GetData(DATA_GATE_D) && pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_NOT_STARTED ) { - m_creature->Say(SAY_WINDSOR_4_2, LANG_UNIVERSAL, PlayerGUID); + m_creature->Say(SAY_WINDSOR_4_2, LANG_UNIVERSAL, PlayerGUID); pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_BEFORE_START); - } + } if( pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED ) { m_creature->Say(SAY_WINDSOR_4_3, LANG_UNIVERSAL, PlayerGUID); @@ -740,7 +740,7 @@ struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI } }; CreatureAI* GetAI_npc_marshal_windsor(Creature *_Creature) -{ +{ npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(_Creature); marshal_windsorAI->AddWaypoint(0, 316.336,-225.528, -77.7258,7000); @@ -769,13 +769,13 @@ CreatureAI* GetAI_npc_marshal_windsor(Creature *_Creature) bool QuestAccept_npc_marshal_windsor(Player *player, Creature *creature, Quest const *quest ) { - if( quest->GetQuestId() == 4322 ) + if( quest->GetQuestId() == 4322 ) {PlayerStart = player; if( pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED ) { ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID()); pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS); - creature->setFaction(11); + creature->setFaction(11); } } @@ -800,25 +800,25 @@ bool QuestAccept_npc_marshal_windsor(Player *player, Creature *creature, Quest c #define SAY_REGINALD_WINDSOR_14_2 "Excellent work, $N. Let's find the exit. I think I know the way. Follow me!" #define SAY_REGINALD_WINDSOR_20_1 "We made it!" #define SAY_REGINALD_WINDSOR_20_2 "Meet me at Maxwell's encampment. We'll go over the next stages of the plan there and figure out a way to decode my tablets without the decryption ring." -#define MOB_ENTRY_SHILL_DINGER 9678 -#define MOB_ENTRY_CREST_KILLER 9680 +#define MOB_ENTRY_SHILL_DINGER 9678 +#define MOB_ENTRY_CREST_KILLER 9680 int wp = 0; /* struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI { - npc_marshal_reginald_windsorAI(Creature *c) : npc_escortAI(c) - { - Reset(); + npc_marshal_reginald_windsorAI(Creature *c) : npc_escortAI(c) + { + Reset(); } - + void WaypointReached(uint32 i) { wp=i; switch( i ) { case 0: - m_creature->setFaction(11); + m_creature->setFaction(11); m_creature->Say(SAY_REGINALD_WINDSOR_0_1, LANG_UNIVERSAL, PlayerGUID); break; case 1: @@ -889,7 +889,7 @@ struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI } } - void Aggro(Unit* who) + void Aggro(Unit* who) { switch(rand()%3) { @@ -953,7 +953,7 @@ struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI } }; CreatureAI* GetAI_npc_marshal_reginald_windsor(Creature *_Creature) -{ +{ npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(_Creature); marshal_reginald_windsorAI->AddWaypoint(0, 403.61,-52.71, -63.92,4000); @@ -1004,7 +1004,7 @@ CreatureAI* GetAI_npc_marshal_reginald_windsor(Creature *_Creature) struct TRINITY_DLL_DECL npc_tobias_seecherAI : public npc_escortAI { npc_tobias_seecherAI(Creature *c) :npc_escortAI(c) {Reset();} - + void Aggro(Unit* who) { } void Reset() {} @@ -1055,7 +1055,7 @@ struct TRINITY_DLL_DECL npc_tobias_seecherAI : public npc_escortAI }; CreatureAI* GetAI_npc_tobias_seecher(Creature *_Creature) -{ +{ npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(_Creature); tobias_seecherAI->AddWaypoint(0, 549.21, -281.07, -75.27); @@ -1093,11 +1093,11 @@ bool GossipSelect_npc_tobias_seecher(Player *player, Creature *_Creature, uint32 /*###### ## npc_rocknot ######*/ - + #define SAY_GOT_BEER -1230000 #define SPELL_DRUNKEN_RAGE 14872 #define QUEST_ALE 4295 - + float BarWpLocations[8][3]= { {883.294861, -188.926300, -43.703655}, @@ -1109,7 +1109,7 @@ float BarWpLocations[8][3]= {877.035217, -187.048080, -43.703655}, {891.198000, -197.924000, -43.620400} //home }; - + uint32 BarWpWait[8]= { 0, @@ -1121,7 +1121,7 @@ uint32 BarWpWait[8]= 0, 0 }; - + struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI { npc_rocknotAI(Creature *c) : npc_escortAI(c) @@ -1129,7 +1129,7 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); } - + ScriptedInstance* pInstance; uint32 BreakKeg_Timer; @@ -1145,18 +1145,18 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI } void Aggro(Unit *who) { } - + void DoGo(uint32 id, uint32 state) { if (GameObject *go = GameObject::GetGameObject(*m_creature,pInstance->GetData64(id))) go->SetGoState(state); } - + void WaypointReached(uint32 i) { if (!pInstance) return; - + switch(i) { case 1: @@ -1177,12 +1177,12 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI break; } } - + void UpdateAI(const uint32 diff) { if (!pInstance) return; - + if (BreakKeg_Timer) { if (BreakKeg_Timer <= diff) @@ -1192,7 +1192,7 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI BreakDoor_Timer = 1000; }else BreakKeg_Timer -= diff; } - + if (BreakDoor_Timer) { if (BreakDoor_Timer <= diff) @@ -1203,46 +1203,46 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI if (Unit *tmp = Unit::GetUnit(*m_creature,pInstance->GetData64(DATA_PHALANX))) tmp->setFaction(14); - + //for later, this event(s) has alot more to it. //optionally, DONE can trigger bar to go hostile. pInstance->SetData(TYPE_BAR,DONE); - + BreakDoor_Timer = 0; }else BreakDoor_Timer -= diff; } - + npc_escortAI::UpdateAI(diff); } }; - + CreatureAI* GetAI_npc_rocknot(Creature *_Creature) { npc_rocknotAI* Rocknot_AI = new npc_rocknotAI(_Creature); - + for(uint8 i = 0; i < 8; ++i) Rocknot_AI->AddWaypoint(i, BarWpLocations[i][0], BarWpLocations[i][1], BarWpLocations[i][2], BarWpWait[i]); - + return (CreatureAI*)Rocknot_AI; } - + bool ChooseReward_npc_rocknot(Player *player, Creature *_Creature, const Quest *_Quest, uint32 item) { ScriptedInstance* pInstance = ((ScriptedInstance*)_Creature->GetInstanceData()); - + if (!pInstance) return true; - + if (pInstance->GetData(TYPE_BAR) == DONE || pInstance->GetData(TYPE_BAR) == SPECIAL) return true; - + if (_Quest->GetQuestId() == QUEST_ALE) { if (pInstance->GetData(TYPE_BAR) != IN_PROGRESS) pInstance->SetData(TYPE_BAR,IN_PROGRESS); pInstance->SetData(TYPE_BAR,SPECIAL); - + //keep track of amount in instance script, returns SPECIAL if amount ok and event in progress if (pInstance->GetData(TYPE_BAR) == SPECIAL) { @@ -1251,7 +1251,7 @@ bool ChooseReward_npc_rocknot(Player *player, Creature *_Creature, const Quest * ((npc_escortAI*)(_Creature->AI()))->Start(false, false, false); } } - + return true; } diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h b/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h index 1a7f8962752..355c557053a 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h @@ -1,25 +1,25 @@ /* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ - + #ifndef DEF_BRD_H #define DEF_BRD_H - + #define TYPE_RING_OF_LAW 1 #define TYPE_VAULT 2 #define TYPE_BAR 3 #define TYPE_TOMB_OF_SEVEN 4 #define TYPE_LYCEUM 5 #define TYPE_IRON_HALL 6 - + #define DATA_EMPEROR 10 #define DATA_PHALANX 11 - + #define DATA_ARENA1 12 #define DATA_ARENA2 13 #define DATA_ARENA3 14 #define DATA_ARENA4 15 - + #define DATA_GO_BAR_KEG 16 #define DATA_GO_BAR_KEG_TRAP 17 #define DATA_GO_BAR_DOOR 18 diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp index 8a45955c706..324e3bb8816 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Instance_Blackrock_Depths SD%Complete: 100 -SDComment: +SDComment: SDCategory: Blackrock Depths EndScriptData */ @@ -33,10 +33,10 @@ update `instance_template` set `script`='instance_blackrock_depths' where `map`= #include "def_blackrock_depths.h" #define ENCOUNTERS 6 - + #define C_EMPEROR 9019 #define C_PHALANX 9502 - + #define GO_ARENA1 161525 #define GO_ARENA2 161522 #define GO_ARENA3 161524 @@ -54,17 +54,17 @@ update `instance_template` set `script`='instance_blackrock_depths' where `map`= #define GO_GOLEM_ROOM_N 170573 #define GO_GOLEM_ROOM_S 170574 #define GO_THONE_ROOM 170575 - + struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance { instance_blackrock_depths(Map *map) : ScriptedInstance(map) {Initialize();}; - + uint32 Encounter[ENCOUNTERS]; std::string str_data; - + uint64 EmperorGUID; uint64 PhalanxGUID; - + uint64 GoArena1GUID; uint64 GoArena2GUID; uint64 GoArena3GUID; @@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance uint64 GoThoneGUID; uint32 BarAleCount; - + void Initialize() { EmperorGUID = 0; @@ -109,11 +109,11 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance GoThoneGUID = 0; BarAleCount = 0; - + for(uint8 i = 0; i < ENCOUNTERS; i++) Encounter[i] = NOT_STARTED; } - + Player* GetPlayerInMap() { Map::PlayerList const& players = instance->GetPlayers(); @@ -126,11 +126,11 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance return plr; } } - + debug_log("SD2: Instance Blackrock Depths: GetPlayerInMap, but PlayerList is empty!"); return NULL; } - + void OnCreatureCreate(Creature *creature, uint32 creature_entry) { switch(creature->GetEntry()) @@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance case GO_THONE_ROOM: GoThoneGUID = go->GetGUID(); break; } } - + void SetData(uint32 type, uint32 data) { Player *player = GetPlayerInMap(); @@ -173,9 +173,9 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance debug_log("SD2: Instance Blackrock Depths: SetData (Type: %u Data %u) cannot find any player.", type, data); return; } - + debug_log("SD2: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data); - + switch(type) { case TYPE_RING_OF_LAW: @@ -210,12 +210,12 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance << Encounter[3] << " " << Encounter[4] << " " << Encounter[5]; str_data = saveStream.str(); - + SaveToDB(); OUT_SAVE_INST_DATA_COMPLETE; } } - + uint32 GetData(uint32 type) { switch(type) @@ -238,7 +238,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance } return 0; } - + uint64 GetData64(uint32 data) { switch(data) @@ -264,12 +264,12 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance } return 0; } - + const char* Save() { return str_data.c_str(); } - + void Load(const char* in) { if (!in) @@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance OUT_LOAD_INST_DATA_FAIL; return; } - + OUT_LOAD_INST_DATA(in); std::istringstream loadStream(in); @@ -287,16 +287,16 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance for(uint8 i = 0; i < ENCOUNTERS; ++i) if (Encounter[i] == IN_PROGRESS) Encounter[i] = NOT_STARTED; - + OUT_LOAD_INST_DATA_COMPLETE; } }; - + InstanceData* GetInstanceData_instance_blackrock_depths(Map* map) { return new instance_blackrock_depths(map); } - + void AddSC_instance_blackrock_depths() { Script *newscript; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp index 7f8142c155a..17958fb8ce0 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp @@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI HeroicMode = m_creature->GetMap()->IsHeroic(); Reset(); } - + ScriptedInstance *pInstance; bool HeroicMode; @@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI m_creature->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } } - + ScriptedAI::MoveInLineOfSight(who); } @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI if (pInstance) { pInstance->SetData(TYPE_RIFT,DONE); - pInstance->SetData(TYPE_MEDIVH,DONE);//FIXME: later should be removed + pInstance->SetData(TYPE_MEDIVH,DONE);//FIXME: later should be removed } } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index eec99e8b9bb..79f5ff10920 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI HeroicMode = m_creature->GetMap()->IsHeroic(); Reset(); } - + ScriptedInstance *pInstance; bool HeroicMode; @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI m_creature->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } } - + ScriptedAI::MoveInLineOfSight(who); } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp index b112cd60c67..cacb460ac92 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI HeroicMode = m_creature->GetMap()->IsHeroic(); Reset(); } - + ScriptedInstance *pInstance; bool HeroicMode; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp index 8ceb9ddd44b..1f12c88e8f3 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp @@ -13,7 +13,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + /* ScriptData SDName: Dark_Portal SD%Complete: 30 @@ -26,7 +26,7 @@ npc_medivh_bm npc_time_rift npc_saat EndContentData */ - + #include "precompiled.h" #include "def_dark_portal.h" @@ -42,18 +42,18 @@ EndContentData */ #define SPELL_CHANNEL 31556 #define SPELL_PORTAL_RUNE 32570 //aura(portal on ground effect) - + #define SPELL_BLACK_CRYSTAL 32563 //aura #define SPELL_PORTAL_CRYSTAL 32564 //summon - + #define SPELL_BANISH_PURPLE 32566 //aura #define SPELL_BANISH_GREEN 32567 //aura - + #define SPELL_CORRUPT 31326 #define SPELL_CORRUPT_AEONUS 37853 #define C_COUNCIL_ENFORCER 17023 - + struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI { npc_medivh_bmAI(Creature *c) : ScriptedAI(c) @@ -61,9 +61,9 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); } - + ScriptedInstance *pInstance; - + uint32 SpellCorrupt_Timer; uint32 Check_Timer; @@ -77,25 +77,25 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI if (!pInstance) return; - + if (pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) m_creature->CastSpell(m_creature,SPELL_CHANNEL,true); else if (m_creature->HasAura(SPELL_CHANNEL,0)) m_creature->RemoveAura(SPELL_CHANNEL,0); - + m_creature->CastSpell(m_creature,SPELL_PORTAL_RUNE,true); } - + void MoveInLineOfSight(Unit *who) { if (!pInstance) return; - + if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 10.0f)) { if (pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) return; - + DoScriptText(SAY_INTRO, m_creature); pInstance->SetData(TYPE_MEDIVH,IN_PROGRESS); m_creature->CastSpell(m_creature,SPELL_CHANNEL,false); @@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI uint32 entry = who->GetEntry(); if (entry == C_ASSAS || entry == C_WHELP || entry == C_CHRON || entry == C_EXECU || entry == C_VANQU) - { + { who->StopMoving(); who->CastSpell(m_creature,SPELL_CORRUPT,false); } @@ -119,15 +119,15 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI } } } - + void AttackStart(Unit *who) { //if (pInstance && pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) //return; - + //ScriptedAI::AttackStart(who); } - + void Aggro(Unit *who) {} void SpellHit(Unit* caster, const SpellEntry* spell) @@ -141,15 +141,15 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI if (spell->Id == SPELL_CORRUPT) SpellCorrupt_Timer = 3000; } - - void JustDied(Unit* Killer) + + void JustDied(Unit* Killer) { if (Killer->GetEntry() == m_creature->GetEntry()) return; DoScriptText(SAY_DEATH, m_creature); } - + void UpdateAI(const uint32 diff) { if (!pInstance) @@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI uint32 pct = pInstance->GetData(DATA_SHIELD); Check_Timer = 5000; - + if (Life25 && pct <= 25) { DoScriptText(SAY_WEAK25, m_creature); @@ -194,7 +194,7 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI DoScriptText(SAY_WEAK75, m_creature); Life75 = false; } - + //if we reach this it means event was running but at some point reset. if (pInstance->GetData(TYPE_MEDIVH) == NOT_STARTED) { @@ -212,14 +212,14 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI } }else Check_Timer -= diff; } - + //if (!UpdateVictim()) //return; - + //DoMeleeAttackIfReady(); } }; - + CreatureAI* GetAI_npc_medivh_bm(Creature *_Creature) { return new npc_medivh_bmAI (_Creature); @@ -229,7 +229,7 @@ struct Wave { uint32 PortalMob[4]; //spawns for portal waves (in order) }; - + static Wave PortalWaves[]= { {C_ASSAS, C_WHELP, C_CHRON, 0}, @@ -244,7 +244,7 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); } - + ScriptedInstance *pInstance; uint32 TimeRiftWave_Timer; @@ -252,7 +252,7 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI uint8 mPortalCount; uint8 mWaveId; - void Reset() + void Reset() { TimeRiftWave_Timer = 15000; @@ -260,15 +260,15 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI if (!pInstance) return; - + mPortalCount = pInstance->GetData(DATA_PORTAL_COUNT); - + if (mPortalCount < 6) mWaveId = 0; else if (mPortalCount > 12) mWaveId = 2; else mWaveId = 1; - + } void Aggro(Unit *who) {} @@ -286,32 +286,32 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI float x,y,z; m_creature->GetRandomPoint(m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),10.0f,x,y,z); - + //normalize Z-level if we can, if rift is not at ground level. z = std::max(m_creature->GetMap()->GetHeight(x, y, MAX_HEIGHT), m_creature->GetMap()->GetWaterLevel(x, y)); - + Unit *Summon = m_creature->SummonCreature(creature_entry,x,y,z,m_creature->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - + if (Summon) { if (Unit *temp = Unit::GetUnit(*m_creature,pInstance->GetData64(DATA_MEDIVH))) Summon->AddThreat(temp,0.0f); } } - + void DoSelectSummon() { uint32 entry = 0; - + if ((mRiftWaveCount > 2 && mWaveId < 1) || mRiftWaveCount > 3) mRiftWaveCount = 0; - + entry = PortalWaves[mWaveId].PortalMob[mRiftWaveCount]; debug_log("SD2: npc_time_rift: summoning wave creature (Wave %u, Entry %u).",mRiftWaveCount,entry); - + ++mRiftWaveCount; - + if (entry == C_WHELP) { for(uint8 i = 0; i < 3; i++) @@ -323,23 +323,23 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI { if (!pInstance) return; - + if (TimeRiftWave_Timer < diff) { DoSelectSummon(); TimeRiftWave_Timer = 15000; }else TimeRiftWave_Timer -= diff; - + if (m_creature->IsNonMeleeSpellCasted(false)) return; - + debug_log("SD2: npc_time_rift: not casting anylonger, i need to die."); m_creature->setDeathState(JUST_DIED); pInstance->SetData(TYPE_RIFT,SPECIAL); } }; - + CreatureAI* GetAI_npc_time_rift(Creature *_Creature) { return new npc_time_riftAI (_Creature); @@ -350,7 +350,7 @@ CreatureAI* GetAI_npc_time_rift(Creature *_Creature) #define GOSSIP_ITEM_OBTAIN "[PH] Obtain Chrono-Beacon" #define SPELL_CHRONO_BEACON 34975 #define ITEM_CHRONO_BEACON 24289 - + bool GossipHello_npc_saat(Player *player, Creature *_Creature) { if (_Creature->isQuestGiver()) @@ -368,11 +368,11 @@ bool GossipHello_npc_saat(Player *player, Creature *_Creature) player->SEND_GOSSIP_MENU(10001,_Creature->GetGUID()); return true; } - + player->SEND_GOSSIP_MENU(10002,_Creature->GetGUID()); return true; } - + bool GossipSelect_npc_saat(Player *player, Creature *_Creature, uint32 sender, uint32 action) { if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -382,7 +382,7 @@ bool GossipSelect_npc_saat(Player *player, Creature *_Creature, uint32 sender, u } return true; } - + void AddSC_dark_portal() { Script *newscript; @@ -391,7 +391,7 @@ void AddSC_dark_portal() newscript->Name = "npc_medivh_bm"; newscript->GetAI = &GetAI_npc_medivh_bm; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "npc_time_rift"; newscript->GetAI = &GetAI_npc_time_rift; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h index 1470296cec0..4fa7c14c5ed 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h @@ -1,21 +1,21 @@ /* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ - + #ifndef DEF_DARKPORTAL_H #define DEF_DARKPORTAL_H #define TYPE_MEDIVH 1 #define TYPE_RIFT 2 - + #define DATA_MEDIVH 10 #define DATA_PORTAL_COUNT 11 #define DATA_SHIELD 12 - + #define WORLD_STATE_BM 2541 #define WORLD_STATE_BM_SHIELD 2540 #define WORLD_STATE_BM_RIFT 2784 - + #define QUEST_OPENING_PORTAL 10297 #define QUEST_MASTER_TOUCH 9836 diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp index ea9d64673f1..16b889a122b 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp @@ -13,14 +13,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + /* ScriptData SDName: Instance_Dark_Portal SD%Complete: 50 SDComment: Quest support: 9836, 10297. Currently in progress. SDCategory: Caverns of Time, The Dark Portal EndScriptData */ - + #include "precompiled.h" #include "def_dark_portal.h" @@ -28,12 +28,12 @@ EndScriptData */ #define C_MEDIVH 15608 #define C_TIME_RIFT 17838 - + #define SPELL_RIFT_CHANNEL 31387 #define RIFT_BOSS 1 inline uint32 RandRiftBoss() { return rand()%2 ? C_RKEEP : C_RLORD; } - + float PortalLocation[4][4]= { {-2041.06, 7042.08, 29.99, 1.30}, @@ -41,13 +41,13 @@ float PortalLocation[4][4]= {-1885.82, 7107.36, 22.32, 3.07}, {-1928.11, 7175.95, 22.11, 3.44} }; - + struct Wave { uint32 PortalBoss; //protector of current portal uint32 NextPortalTime; //time to next portal, or 0 if portal boss need to be killed }; - + static Wave RiftWaves[]= { {RIFT_BOSS, 0}, @@ -57,44 +57,44 @@ static Wave RiftWaves[]= {RIFT_BOSS, 120000}, {C_AEONUS, 0} }; - + struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance { instance_dark_portal(Map *map) : ScriptedInstance(map) {Initialize();}; - + uint32 Encounter[ENCOUNTERS]; - + uint32 mRiftPortalCount; uint32 mShieldPercent; uint8 mRiftWaveCount; uint8 mRiftWaveId; - + uint32 NextPortal_Timer; - + uint64 MedivhGUID; uint8 CurrentRiftId; - + void Initialize() { MedivhGUID = 0; Clear(); } - + void Clear() { for(uint8 i = 0; i < ENCOUNTERS; i++) Encounter[i] = NOT_STARTED; - + mRiftPortalCount = 0; mShieldPercent = 100; mRiftWaveCount = 0; mRiftWaveId = 0; - + CurrentRiftId = 0; - + NextPortal_Timer = 0; } - + Player* GetPlayerInMap() { Map::PlayerList const& players = instance->GetPlayers(); @@ -107,11 +107,11 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance return plr; } } - + debug_log("SD2: Instance Black Portal: GetPlayerInMap, but PlayerList is empty!"); return NULL; } - + void UpdateBMWorldState(uint32 id, uint32 state) { Map::PlayerList const& players = instance->GetPlayers(); @@ -125,19 +125,19 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance } }else debug_log("SD2: Instance Black Portal: UpdateBMWorldState, but PlayerList is empty!"); } - + void InitWorldState(bool Enable = true) { UpdateBMWorldState(WORLD_STATE_BM,Enable ? 1 : 0); UpdateBMWorldState(WORLD_STATE_BM_SHIELD,100); UpdateBMWorldState(WORLD_STATE_BM_RIFT,0); } - + bool IsEncounterInProgress() { if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return true; - + return false; } @@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance if (creature->GetEntry() == C_MEDIVH) MedivhGUID = creature->GetGUID(); } - + //what other conditions to check? bool CanProgressEvent() { @@ -180,7 +180,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance return mRiftWaveId; } } - + void SetData(uint32 type, uint32 data) { Player *player = GetPlayerInMap(); @@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance debug_log("SD2: Instance Black Portal: SetData (Type: %u Data %u) cannot find any player.", type, data); return; } - + switch(type) { case TYPE_MEDIVH: @@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance player->GroupEventHappens(QUEST_MASTER_TOUCH,medivh); } } - + Encounter[0] = data; } break; @@ -246,7 +246,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance break; } } - + uint32 GetData(uint32 type) { switch(type) @@ -262,7 +262,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance } return 0; } - + uint64 GetData64(uint32 data) { if (data == DATA_MEDIVH) @@ -283,17 +283,17 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance z = std::max(instance->GetHeight(x, y, MAX_HEIGHT), instance->GetWaterLevel(x, y)); debug_log("SD2: Instance Dark Portal: Summoning rift boss entry %u.",entry); - + Unit *Summon = source->SummonCreature(entry,x,y,z,source->GetOrientation(), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); - + if (Summon) return Summon; - + debug_log("SD2: Instance Dark Portal: what just happened there? No boss, no loot, no fun..."); return NULL; } - + void DoSpawnPortal() { Player *player = GetPlayerInMap(); @@ -301,7 +301,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance return; if (Unit *medivh = Unit::GetUnit(*player,MedivhGUID)) - { + { for(uint8 i = 0; i < 4; i++) { int tmp = rand()%4; @@ -316,18 +316,18 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance TEMPSUMMON_CORPSE_DESPAWN,0); if (temp) { - + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - - + + if (Unit* boss = SummonedPortalBoss(temp)) { if (boss->GetEntry() == C_AEONUS) { boss->AddThreat(medivh,0.0f); } - else + else { boss->AddThreat(temp,0.0f); temp->CastSpell(boss,SPELL_RIFT_CHANNEL,false); @@ -336,10 +336,10 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance } break; } - } + } } } - + void Update(uint32 diff) { if (Encounter[1] != IN_PROGRESS) @@ -365,12 +365,12 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance } } }; - + InstanceData* GetInstanceData_instance_dark_portal(Map* map) { return new instance_dark_portal(map); } - + void AddSC_instance_dark_portal() { Script *newscript; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp index f1c8b12e60b..e2248b541e9 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp @@ -492,10 +492,10 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public ScriptedAI if(target) Doomfire->AI()->AttackStart(target); - if(rand()%2 == 0) + if(rand()%2 == 0) DoScriptText(SAY_DOOMFIRE1, m_creature); else - DoScriptText(SAY_DOOMFIRE2, m_creature); + DoScriptText(SAY_DOOMFIRE2, m_creature); } } @@ -594,7 +594,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public ScriptedAI }else EnrageTimer -= diff; if(CheckDistanceTimer < diff) - { + { // To simplify the check, we simply summon a creature in the location and then check how far we are from the creature Creature* Check = m_creature->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 2000); if(Check) @@ -667,7 +667,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public ScriptedAI { if(rand()%2 == 0) DoScriptText(SAY_AIR_BURST1, m_creature); - else + else DoScriptText(SAY_AIR_BURST2, m_creature); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp index fb2ec0de734..d8b308d03cd 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp @@ -208,7 +208,7 @@ bool GossipHello_npc_tyrande_whisperwind(Player* player, Creature* _Creature) bool GossipSelect_npc_tyrande_whisperwind(Player *player, Creature *_Creature, uint32 sender, uint32 action) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (action == GOSSIP_ACTION_INFO_DEF) { ItemPosCountVec dest; uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp index a446bb007c5..58fcc5d526e 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp @@ -34,7 +34,7 @@ float AllianceBase[4][3]= }; // Locations for summoning waves in Horde base -float HordeBase[4][3]= +float HordeBase[4][3]= { {5554.399, -2581.419, 1480.820}, {5538.996, -2577.742, 1479.790}, @@ -83,7 +83,7 @@ void hyjalAI::Reset() break; } - //Bools + //Bools EventBegun = false; FirstBossDead = false; SecondBossDead = false; @@ -131,7 +131,7 @@ void hyjalAI::EnterEvadeMode() if(m_creature->isAlive()) m_creature->GetMotionMaster()->MoveTargetedHome(); - + m_creature->SetLootRecipient(NULL); InCombat = false; @@ -295,12 +295,12 @@ void hyjalAI::Talk(uint32 id) void hyjalAI::UpdateWorldState(uint32 id, uint32 state) { Map * map = m_creature->GetMap(); - - if(!map->IsDungeon()) + + if(!map->IsDungeon()) return; Map::PlayerList const& players = map->GetPlayers(); - + if (!players.isEmpty()) { for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h index 0c638385e78..ca95b1b99bf 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h @@ -46,25 +46,25 @@ struct Wave static Wave AllianceWaves[]= // Waves that will be summoned in the Alliance Base { // Rage Winterchill Wave 1-8 - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, 0, 0, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, 0, 0, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, // All 8 Waves are summoned, summon Rage Winterchill, next few waves are for Anetheron - {RAGE_WINTERCHILL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true}, + {RAGE_WINTERCHILL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true}, // Anetheron Wave 1-8 {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, 0, 0, 0, 0, 0, 0, 0, 0, 120000, false}, {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, BANSHEE, BANSHEE, 0, 0, 0, 0, 0, 0, 120000, false}, - {CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, BANSHEE, BANSHEE, BANSHEE, BANSHEE, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, - {CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, BANSHEE, BANSHEE, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, BANSHEE, BANSHEE, 0, 0, 0, 0, 0, 0, 120000, false}, + {CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, BANSHEE, BANSHEE, BANSHEE, BANSHEE, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, + {CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, BANSHEE, BANSHEE, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, // All 8 Waves are summoned, summon Anatheron {ANETHERON, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true} }; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp index 1d67582927b..a678b7f4776 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance void UpdateWorldState(uint32 id, uint32 state) { Map::PlayerList const& players = instance->GetPlayers(); - + if (!players.isEmpty()) { for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp index ee7b6749f22..1c8d9a3de6b 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp @@ -35,12 +35,12 @@ bool GOHello_go_barrel_old_hillsbrad(Player *player, GameObject* _GO) if (!pInstance) return false; - + if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE) return false; pInstance->SetData(TYPE_BARREL_DIVERSION, IN_PROGRESS); - + return false; } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp index 1d7c19e2f59..075def2f0d9 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp @@ -30,7 +30,7 @@ EndScriptData */ #define TARETHA_ENTRY 18887 #define DRAKE_ENTRY 17848 - + #define QUEST_ENTRY_DIVERSION 10283 #define LODGE_QUEST_TRIGGER 20155 @@ -68,15 +68,15 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance return plr; } } - + debug_log("SD2: Instance Old Hillsbrad: GetPlayerInMap, but PlayerList is empty!"); return NULL; } - + void UpdateOHWorldState() { Map::PlayerList const& players = instance->GetPlayers(); - + if (!players.isEmpty()) { for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) @@ -124,10 +124,10 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance { if (mBarrelCount >= 5) return; - + ++mBarrelCount; UpdateOHWorldState(); - + debug_log("SD2: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount); Encounter[0] = IN_PROGRESS; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index 6ec72bb9b25..8cc1dcabd43 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -126,22 +126,22 @@ bool GossipSelect_npc_erozion(Player *player, Creature *_Creature, uint32 sender #define SAY_TH_EPOCH_WONDER -1560031 #define SAY_TH_EPOCH_KILL_TARETHA -1560032 #define SAY_TH_EVENT_COMPLETE -1560033 - + #define SAY_TH_RANDOM_LOW_HP1 -1560034 #define SAY_TH_RANDOM_LOW_HP2 -1560035 - + #define SAY_TH_RANDOM_DIE1 -1560036 #define SAY_TH_RANDOM_DIE2 -1560037 - + #define SAY_TH_RANDOM_AGGRO1 -1560038 #define SAY_TH_RANDOM_AGGRO2 -1560039 #define SAY_TH_RANDOM_AGGRO3 -1560040 #define SAY_TH_RANDOM_AGGRO4 -1560041 - + #define SAY_TH_RANDOM_KILL1 -1560042 #define SAY_TH_RANDOM_KILL2 -1560043 #define SAY_TH_RANDOM_KILL3 -1560044 - + #define SAY_TH_LEAVE_COMBAT1 -1560045 #define SAY_TH_LEAVE_COMBAT2 -1560046 #define SAY_TH_LEAVE_COMBAT3 -1560047 @@ -269,7 +269,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI case 29: DoScriptText(SAY_TH_SKARLOC_MEET, m_creature); m_creature->SummonCreature(17862,2036.48,271.22,63.43,5.27,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - //temporary,skarloc should rather be triggered to walk up to thrall + //temporary,skarloc should rather be triggered to walk up to thrall break; case 30: IsOnHold = true; @@ -364,7 +364,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI //trigger taretha to run down outside if (uint64 TarethaGUID = pInstance->GetData64(DATA_TARETHA)) - { + { if (Creature* Taretha = ((Creature*)Unit::GetUnit(*m_creature, TarethaGUID))) ((npc_escortAI*)(Taretha->AI()))->Start(false, false, true, PlayerGUID); } @@ -380,13 +380,13 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI pPlayer->KilledMonster(20156,m_creature->GetGUID()); } } - + //alot will happen here, thrall and taretha talk, erozion appear at spot to explain m_creature->SummonCreature(EROZION_ENTRY,2646.47,680.416,55.38,4.16,TEMPSUMMON_TIMED_DESPAWN,120000); break; } } - + void Reset() { @@ -477,7 +477,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI pInstance->SetData(TYPE_THRALL_EVENT,FAIL); // Don't do a yell if he kills self (if player goes too far or at the end). - if(slayer == m_creature) + if(slayer == m_creature) return; switch(rand()%2) @@ -666,7 +666,7 @@ CreatureAI* GetAI_npc_thrall_old_hillsbrad(Creature *_Creature) bool GossipHello_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature) { if( _Creature->isQuestGiver() ) - { + { player->PrepareQuestMenu( _Creature->GetGUID() ); player->SendPreparedQuest(_Creature->GetGUID()); } diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp index 630b78ecbf2..c626a8d4544 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI Creature* pAdvisor = NULL; for( int i=0; i<3; i++ ) - + if(RAdvisors[i]) { pAdvisor = ((Creature*)Unit::GetUnit((*m_creature), RAdvisors[i])); @@ -145,8 +145,8 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI } pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - - + + } void EventSharkkisDeath() @@ -290,7 +290,7 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI break; } } - } + } if( continueTriggering ) { DoCast(m_creature, SPELL_BLESSING_OF_THE_TIDES); @@ -338,7 +338,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI { Pet->DealDamage( Pet, Pet->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false ); } - + SummonedPet = 0; if( pInstance ) @@ -404,7 +404,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI DoCast(m_creature->getVictim(), SPELL_MULTISHOT); Multishot_Timer = 20000; }else Multishot_Timer -= diff; - + //TheBeastWithin_Timer if(TheBeastWithin_Timer < diff) { @@ -416,7 +416,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI } TheBeastWithin_Timer = 30000; }else TheBeastWithin_Timer -= diff; - + //Pet_Timer if(Pet_Timer < diff && pet == false) { @@ -704,7 +704,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI break; case 1: pUnit = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_SHARKKIS)); - break; + break; case 2: pUnit = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_TIDALVESS)); break; @@ -713,7 +713,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI break; } }else pUnit = m_creature; - + return pUnit; } }; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp index df2c92246fb..6c28e61e863 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp @@ -79,7 +79,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI boss_hydross_the_unstableAI(Creature *c) : ScriptedAI(c), Summons(m_creature) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); - Reset(); + Reset(); } ScriptedInstance* pInstance; @@ -124,7 +124,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI } void SummonBeams() - { + { Creature* beamer = m_creature->SummonCreature(ENTRY_BEAM_DUMMY,-258.333,-356.34,22.0499,5.90835,TEMPSUMMON_CORPSE_DESPAWN,0); if(beamer) { @@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); beams[0]=beamer->GetGUID(); } - beamer = beamer = m_creature->SummonCreature(ENTRY_BEAM_DUMMY,-219.918,-371.308,22.0042,2.73072,TEMPSUMMON_CORPSE_DESPAWN,0); + beamer = beamer = m_creature->SummonCreature(ENTRY_BEAM_DUMMY,-219.918,-371.308,22.0042,2.73072,TEMPSUMMON_CORPSE_DESPAWN,0); if(beamer) { beamer->CastSpell(m_creature,SPELL_BLUE_BEAM,true); @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI } } void DeSummonBeams() - { + { for(uint8 i=0;i<2;i++) { Creature* mob = (Creature*)Unit::GetUnit(*m_creature,beams[i]); diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index 70db67f0f06..c1b2d786ac5 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -66,8 +66,8 @@ EndScriptData */ #define TAINTED_ELEMENTAL 22009 #define COILFANG_STRIDER 22056 #define COILFANG_ELITE 22055 -#define TOXIC_SPOREBAT 22140 -#define TOXIC_SPORES_TRIGGER 22207 +#define TOXIC_SPOREBAT 22140 +#define TOXIC_SPORES_TRIGGER 22207 float ElementPos[8][4] = { @@ -81,7 +81,7 @@ float ElementPos[8][4] = {-58.9, -901.6, 21.5, 6} }; -float ElementWPPos[8][3] = +float ElementWPPos[8][3] = { {71.700752, -883.905884, 41.097168}, {45.039848, -868.022827, 41.097015}, @@ -93,7 +93,7 @@ float ElementWPPos[8][3] = {69.945908, -964.663940, 41.097054} }; -float SporebatWPPos[8][3] = +float SporebatWPPos[8][3] = { {31.6,-896.3,59.1}, {9.1, -913.9, 56}, @@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; Intro = false; Reset(); - CanAttack = false;//must be after reset() + CanAttack = false;//must be after reset() m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //set it only once on creature create (no need do intro if wiped) } @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI uint64 ShieldGeneratorChannel[4]; - uint32 AggroTimer; + uint32 AggroTimer; uint32 ShockBlast_Timer; uint32 Entangle_Timer; uint32 StaticCharge_Timer; @@ -165,7 +165,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI void Reset() { - AggroTimer = 19000; + AggroTimer = 19000; ShockBlast_Timer = 1+rand()%60000; Entangle_Timer = 30000; StaticCharge_Timer = 10000+rand()%15000; @@ -193,12 +193,12 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI } if(pInstance) - pInstance->SetData(DATA_LADYVASHJEVENT, NOT_STARTED); + pInstance->SetData(DATA_LADYVASHJEVENT, NOT_STARTED); ShieldGeneratorChannel[0] = 0; ShieldGeneratorChannel[1] = 0; ShieldGeneratorChannel[2] = 0; ShieldGeneratorChannel[3] = 0; - + m_creature->SetCorpseDelay(1000*60*60); } @@ -271,7 +271,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI if (!Intro) { Intro = true; - DoScriptText(SAY_INTRO, m_creature); + DoScriptText(SAY_INTRO, m_creature); } if (!CanAttack) return; @@ -327,9 +327,9 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI if(AggroTimer < diff) { CanAttack = true; - m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); AggroTimer=19000; - }else + }else { AggroTimer-=diff; return; @@ -596,7 +596,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI Unit *Vashj; void Reset() - { + { m_creature->SetSpeed(MOVE_WALK,0.6);//walk m_creature->SetSpeed(MOVE_RUN,0.6);//run move = 0; @@ -628,17 +628,17 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI void Aggro(Unit *who) { return; } void MoveInLineOfSight(Unit *who){return;} - + void UpdateAI(const uint32 diff) { if(!pInstance) - return; + return; - if (!Vashj) + if (!Vashj) { return; } - + if(move < diff) { m_creature->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE); @@ -678,9 +678,9 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI { //call Unsummon() m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } + } move = 1000; - }else move -= diff; + }else move -= diff; } }; @@ -777,12 +777,12 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI void Aggro(Unit *who) { - + } void MoveInLineOfSight(Unit *who) { - + } void MovementInform(uint32 type, uint32 id) @@ -807,7 +807,7 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI m_creature->GetMotionMaster()->MovePoint(1,SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]); movement_timer = 6000; }else movement_timer -= diff; - + //toxic spores if(bolt_timer < diff) { @@ -986,7 +986,7 @@ bool ItemUse_item_tainted_core(Player *player, Item* _Item, SpellCastTargets con if(Channel) { //call Unsummon() - Channel->setDeathState(JUST_DIED); + Channel->setDeathState(JUST_DIED); } pInstance->SetData(identifier, 1); diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index c4ab9be63c4..e4e0e12a0cd 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -40,7 +40,7 @@ EndScriptData */ #define SPELL_MINDBLAST 37531 // --- Spells used by Inner Demons and creature ID -#define INNER_DEMON_ID 21857 +#define INNER_DEMON_ID 21857 #define AURA_DEMONIC_ALIGNMENT 37713 #define SPELL_SHADOWBOLT 39309 #define SPELL_SOUL_LINK 38007 @@ -80,13 +80,13 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI } uint32 ShadowBolt_Timer; - + uint32 Link_Timer; uint64 victimGUID; void Reset() { - ShadowBolt_Timer = 10000; + ShadowBolt_Timer = 10000; Link_Timer = 1000; } void JustDied(Unit *victim) @@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI { DoCast(m_creature->getVictim(), SPELL_SHADOWBOLT, false); ShadowBolt_Timer = 10000; - }else ShadowBolt_Timer -= diff; + }else ShadowBolt_Timer -= diff; DoMeleeAttackIfReady(); } @@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI m_creature->GetPosition(x,y,z); pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; Demon = 0; - + for(uint8 i = 0; i < 3; i++)//clear guids SpellBinderGUID[i] = 0; Reset(); @@ -164,14 +164,14 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI uint32 Berserk_Timer; uint32 InnerDemons_Timer; uint32 BanishTimer; - + bool DealDamage; bool NeedThreatReset; bool DemonForm; bool IsFinalForm; bool EnrageUsed; float x,y,z; - + uint64 InnderDemon[5]; uint32 InnderDemon_Count; uint64 Demon; @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true); m_creature->SetCorpseDelay(1000*60*60); if(pInstance) - pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, NOT_STARTED); + pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, NOT_STARTED); } void CheckChannelers(bool DoEvade = true) @@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI Creature* binder = m_creature->SummonCreature(MOB_SPELLBINDER,nx,ny,z,o,TEMPSUMMON_DEAD_DESPAWN,0); if (binder) SpellBinderGUID[i] = binder->GetGUID(); - + } } void MoveInLineOfSight(Unit *who) @@ -272,14 +272,14 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI // channelers == 0 remove banish aura if(AliveChannelers == 0 && m_creature->HasAura(AURA_BANISH, 0)) - { + { // removing banish aura m_creature->RemoveAurasDueToSpell(AURA_BANISH); - // Leotheras is getting immune again + // Leotheras is getting immune again m_creature->ApplySpellImmune(AURA_BANISH, IMMUNITY_MECHANIC, MECHANIC_BANISH, true); - // changing model to bloodelf + // changing model to bloodelf m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_NIGHTELF); // and reseting equipment @@ -292,7 +292,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI if(victim) m_creature->getThreatManager().addThreat(victim, 1); StartEvent(); - } + } } else if(AliveChannelers != 0 && !m_creature->HasAura(AURA_BANISH, 0)) { @@ -303,7 +303,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI // changing model m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_DEMON); - + // and removing weapons m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); @@ -418,7 +418,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI Unit *newTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); if(newTarget) { - DoResetThreat(); + DoResetThreat(); m_creature->GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->MovePoint(0,newTarget->GetPositionX(),newTarget->GetPositionY(),newTarget->GetPositionZ()); } @@ -427,13 +427,13 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI // reseting after changing forms and after ending whirlwind if(NeedThreatReset && !m_creature->HasAura(SPELL_WHIRLWIND, 0)) - { + { // when changing forms seting timers (or when ending whirlwind - to avoid adding new variable i use Whirlwind_Timer to countdown 2s while whirlwinding) if(DemonForm) InnerDemons_Timer = 30000; else Whirlwind_Timer = 15000; - + NeedThreatReset = false; DoResetThreat(); m_creature->GetMotionMaster()->Clear(); @@ -486,7 +486,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI m_creature->StopMoving(); if(ChaosBlast_Timer < diff) { - // will cast only when in range of spell + // will cast only when in range of spell if(m_creature->GetDistance(m_creature->getVictim()) < 30) { //m_creature->CastSpell(m_creature->getVictim(), SPELL_CHAOS_BLAST, true); @@ -499,13 +499,13 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI if(InnerDemons_Timer < diff) { std::list<HostilReference *>& ThreatList = m_creature->getThreatManager().getThreatList(); - std::vector<Unit *> TargetList; + std::vector<Unit *> TargetList; for(std::list<HostilReference *>::iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) { Unit *tempTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if(tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != m_creature->getVictim()->GetGUID() && TargetList.size()<5) TargetList.push_back( tempTarget ); - } + } SpellEntry *spell = (SpellEntry *)GetSpellStore()->LookupEntry(SPELL_INSIDIOUS_WHISPER); for(std::vector<Unit *>::iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) { @@ -516,7 +516,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI { ((ScriptedAI *)demon->AI())->AttackStart( (*itr) ); ((mob_inner_demonAI *)demon->AI())->victimGUID = (*itr)->GetGUID(); - + for (int i=0; i<3; i++) { if (!spell->Effect[i]) @@ -631,15 +631,15 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI //ChaosBlast_Timer if(m_creature->GetDistance(m_creature->getVictim()) < 30) m_creature->StopMoving(); - + if(ChaosBlast_Timer < diff) { - // will cast only when in range od spell + // will cast only when in range od spell if(m_creature->GetDistance(m_creature->getVictim()) < 30) { //m_creature->CastSpell(m_creature->getVictim(),SPELL_CHAOS_BLAST,true); int damage = 100; - m_creature->CastCustomSpell(m_creature->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, m_creature->GetGUID()); + m_creature->CastCustomSpell(m_creature->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, m_creature->GetGUID()); ChaosBlast_Timer = 3000; } }else ChaosBlast_Timer -= diff; @@ -705,12 +705,12 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI DoCast(leotheras, BANISH_BEAM); } } - } + } void UpdateAI(const uint32 diff) { if(pInstance) - { + { if(!leotherasGUID) leotherasGUID = pInstance->GetData64(DATA_LEOTHERAS); @@ -722,7 +722,7 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI AttackStart(victim); } } - + if(!UpdateVictim()) { CastChanneling(); @@ -757,7 +757,7 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI for(uint8 i = 0; i < CURRENT_MAX_SPELL; ++i) if(i_pl->m_currentSpells[i]) isCasting = true; - + if(isCasting) { DoCast(i_pl, SPELL_EARTHSHOCK); diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp index 7fb0215169b..0baec82ac0c 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp @@ -52,7 +52,7 @@ EndScriptData */ #define SPELL_ARCINGSMASH 38761 // Wrong SpellId. Can't find the right one. #define SPELL_HAMSTRING 26211 -float AddPos[9][3] = +float AddPos[9][3] = { {2.8553810, -459.823914, -19.182686}, //MOVE_AMBUSHER_1 X, Y, Z {12.400000, -466.042267, -19.182686}, //MOVE_AMBUSHER_2 X, Y, Z @@ -64,7 +64,7 @@ float AddPos[9][3] = {14.388216, -423.468018, -19.625271}, //MOVE_GUARDIAN_2 X, Y, Z {42.471519, -445.115295, -19.769423} //MOVE_GUARDIAN_3 X, Y, Z }; - + enum RotationType { NOROTATE = 0, @@ -74,7 +74,7 @@ enum RotationType struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI { - boss_the_lurker_belowAI(Creature *c) : Scripted_NoMovementAI(c) + boss_the_lurker_belowAI(Creature *c) : Scripted_NoMovementAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); @@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI }*/ } - + void MoveInLineOfSight(Unit *who) { if (!who || m_creature->getVictim()) @@ -143,18 +143,18 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI { float attackRadius = m_creature->GetAttackDistance(who); if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who)) - AttackStart(who); + AttackStart(who); } } - + void Aggro(Unit *who) { if(pInstance) pInstance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); - - if (!who || m_creature->getVictim()) + + if (!who || m_creature->getVictim()) return; - + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { float attackRadius = m_creature->GetAttackDistance(who); @@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI } void Rotate(const uint32 diff) - { + { bool Spout = false; switch (RotType) { @@ -211,7 +211,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI if(SpoutAnimTimer<diff) { DoCast(m_creature,SPELL_SPOUT_ANIM,true); - SpoutAnimTimer = 1000; + SpoutAnimTimer = 1000; }else SpoutAnimTimer-=diff; Map *map = m_creature->GetMap(); @@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI RotTimer=20000; if(victim) - SpoutAngle = m_creature->GetAngle(victim); + SpoutAngle = m_creature->GetAngle(victim); m_creature->MonsterTextEmote(EMOTE_SPOUT,0,true); //DoCast(m_creature,SPELL_SPOUT_BREATH);//take breath anim } @@ -260,7 +260,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI if (PlayerList.isEmpty()) return; - + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (i->getSource()->isAlive() && i->getSource()->IsInWater() && !i->getSource()->HasAura(SPELL_SCALDINGWATER, 0)) @@ -281,7 +281,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI Submerged = true; }else PhaseTimer-=diff; } - + if(!Submerged && RotType == NOROTATE)//is not spouting and not submerged { if(SpoutTimer < diff) @@ -318,13 +318,13 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI if(WaterboltTimer < diff) { - Unit* target = SelectUnit(SELECT_TARGET_NEAREST,0,14,true); + Unit* target = SelectUnit(SELECT_TARGET_NEAREST,0,14,true); if(!target) { target = SelectUnit(SELECT_TARGET_RANDOM,0); if(target) - DoCast(target,SPELL_WATERBOLT); - } + DoCast(target,SPELL_WATERBOLT); + } WaterboltTimer = 3000; }else WaterboltTimer -= diff; @@ -352,10 +352,10 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI PhaseTimer = 120000; return; }else PhaseTimer-=diff; - + if(!m_creature->isInCombat()) m_creature->SetInCombatState(false); - + if(!Spawned) { m_creature->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -397,7 +397,7 @@ CreatureAI* GetAI_mob_coilfang_guardian(Creature *_Creature) struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI { - mob_coilfang_ambusherAI(Creature *c) : Scripted_NoMovementAI(c) + mob_coilfang_ambusherAI(Creature *c) : Scripted_NoMovementAI(c) { Reset(); SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_SHOOT); @@ -407,7 +407,7 @@ struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI uint32 MultiShotTimer; uint32 ShootBowTimer; - + void Reset() { MultiShotTimer = 10000; @@ -417,7 +417,7 @@ struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI void Aggro(Unit *who) { - + } void MoveInLineOfSight(Unit *who) @@ -434,7 +434,7 @@ struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI { if(MultiShotTimer < diff) { - if(m_creature->getVictim()) + if(m_creature->getVictim()) DoCast(m_creature->getVictim(), SPELL_SPREAD_SHOT, true); MultiShotTimer = 10000; @@ -444,7 +444,7 @@ struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI if(ShootBowTimer < diff) { Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); + target = SelectUnit(SELECT_TARGET_RANDOM, 0); int bp0 = 1100; if(target) m_creature->CastCustomSpell(target,SPELL_SHOOT,&bp0,NULL,NULL,true); diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index 77d744d7006..3e0ff3e2c77 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI DoScriptText(SAY_AGGRO, m_creature); if (pInstance) - pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); + pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); } void KilledUnit(Unit *victim) @@ -161,9 +161,9 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, NOT_STARTED); } - - void Aggro(Unit *who) - { + + void Aggro(Unit *who) + { PlayerList = &((InstanceMap*)m_creature->GetMap())->GetPlayers(); Playercount = PlayerList->getSize(); StartEvent(); @@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI DoScriptText(EMOTE_EARTHQUAKE, m_creature); Earthquake = false; Earthquake_Timer = 40000+rand()%5000; - } + } }else Earthquake_Timer -= diff; //TidalWave_Timer @@ -234,7 +234,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI set<int>::iterator itr; for(uint8 i = 0; i < 4; i++) { - counter = 0; + counter = 0; do{target = SelectUnit(SELECT_TARGET_RANDOM, 1, 50, true); //target players only if(counter < Playercount) break; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp index 4e7f3d1989c..395004730d6 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp @@ -44,7 +44,7 @@ bool GOHello_go_bridge_console(Player *player, GameObject* go) if (pInstance) pInstance->SetData(DATA_CONTROL_CONSOLE, DONE); - + return true; } diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp index e3415630684..6ea5517acf7 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp @@ -42,13 +42,13 @@ bool GOHello_go_main_chambers_access_panel(Player *player, GameObject* _GO) if (!pInstance) return false; - + if (_GO->GetEntry() == ACCESS_PANEL_HYDRO && pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE) pInstance->SetData(TYPE_HYDROMANCER_THESPIA,SPECIAL); - + if (_GO->GetEntry() == ACCESS_PANEL_MEK && pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE) pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER,SPECIAL); - + return true; } @@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance return plr; } } - + debug_log("SD2: Instance Steamvault: GetPlayerInMap, but PlayerList is empty!"); return NULL; } @@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance void SetData(uint32 type, uint32 data) { Player *player = GetPlayerInMap(); - + if (!player) { debug_log("SD2: Instance Steamvault: SetData (Type: %u Data %u) cannot find any player.", type, data); diff --git a/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp b/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp index 0e22bbaef54..dfa3540857e 100644 --- a/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp +++ b/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance DoPlaySound(IronCladDoor, SOUND_MR_SMITE_ALARM1); State=CANNON_BLAST_INITIATED; break; - case CANNON_BLAST_INITIATED: + case CANNON_BLAST_INITIATED: PiratesDelay_Timer = PIRATES_DELAY_TIMER; if(CannonBlast_Timer<diff) { @@ -83,9 +83,9 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance LeverStucked(); IronCladDoor->Yell(SAY_MR_SMITE_ALARM2, LANG_UNIVERSAL, 0); DoPlaySound(IronCladDoor, SOUND_MR_SMITE_ALARM2); - State = PIRATES_ATTACK; + State = PIRATES_ATTACK; }else - CannonBlast_Timer-=diff; + CannonBlast_Timer-=diff; break; case PIRATES_ATTACK: if(PiratesDelay_Timer<diff) @@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance DefiasPirate2 = IronCladDoor->SummonCreature(657,IronCladDoor->GetPositionX() + 3,IronCladDoor->GetPositionY()-6,IronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); DefiasCompanion = IronCladDoor->SummonCreature(3450,IronCladDoor->GetPositionX() + 2,IronCladDoor->GetPositionY()-6,IronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); } - + void MoveCreaturesInside() { MoveCreatureInside(DefiasPirate1); @@ -155,14 +155,14 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance { if (type == EVENT_STATE) { - if (DefiasCannon && IronCladDoor) - State=data; + if (DefiasCannon && IronCladDoor) + State=data; } } uint32 GetData(uint32 type) { - if (type == EVENT_STATE) + if (type == EVENT_STATE) return State; return 0; } @@ -221,7 +221,7 @@ void AddSC_instance_deadmines() newscript->Name = "instance_deadmines"; newscript->GetInstanceData = &GetInstanceData_instance_deadmines; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "item_defias_gunpowder"; newscript->pItemUse = &ItemUse_item_defias_gunpowder; diff --git a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp index a7dcb7e34ac..32c3d19e718 100644 --- a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp +++ b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp @@ -97,13 +97,13 @@ struct TRINITY_DLL_DECL npc_prospector_anvilwardAI : public npc_escortAI } void JustDied(Unit* killer) - { + { m_creature->setFaction(35); } void UpdateAI(const uint32 diff) { - npc_escortAI::UpdateAI(diff); + npc_escortAI::UpdateAI(diff); } }; @@ -543,7 +543,7 @@ bool GOHello_go_second_trial(Player *player, GameObject* _GO) TypeContainerVisitor<Trinity::CreatureLastSearcher<Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); //cell_lock->Visit(cell_lock, grid_unit_searcher, *MapManager::Instance().GetMap(_GO->GetMap(), _GO)); cell_lock->Visit(cell_lock, grid_unit_searcher, *(_GO->GetMap())); - + if ( event_controller ) ((master_kelerun_bloodmournAI*)event_controller->AI())->StartEvent(); @@ -583,7 +583,7 @@ struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summoned) + void SummonedCreatureDespawn(Creature* summoned) { Summons.Despawn(summoned); ++KillCount; @@ -670,7 +670,7 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI bool Completed; bool Progress; uint64 PlayerGUID; - + void Reset() { EndTimer = 0; @@ -681,7 +681,7 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI } void Aggro(Unit* who){} - + void MoveInLineOfSight(Unit* who) { if( who->GetTypeId() == TYPEID_PLAYER && !m_creature->canStartAttack(who) && !Progress) @@ -704,7 +704,7 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI { summoned->AI()->AttackStart(m_creature); } - + void JustDied(Unit* killer) { if (PlayerGUID && !Completed) @@ -714,7 +714,7 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI ((Player*)player)->FailQuest(QUEST_POWERING_OUR_DEFENSES); } } - + void UpdateAI(const uint32 diff) { if(EndTimer < diff && Progress) @@ -743,7 +743,7 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI }else WaveTimer -= diff; } }; - + CreatureAI* GetAI_npc_infused_crystalAI(Creature *_Creature) { return new npc_infused_crystalAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp index ecbd37abf2e..a81adad1291 100644 --- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp +++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp @@ -134,7 +134,7 @@ bool GOHello_gilded_brazier(Player *player, GameObject* _GO) /*###### ## npc_ranger_lilatha ######*/ - + #define SAY_START -1000140 #define SAY_PROGRESS1 -1000141 #define SAY_PROGRESS2 -1000142 @@ -142,7 +142,7 @@ bool GOHello_gilded_brazier(Player *player, GameObject* _GO) #define SAY_END1 -1000144 #define SAY_END2 -1000145 #define SAY_CAPTAIN_ANSWER -1000146 - + #define QUEST_ESCAPE_FROM_THE_CATACOMBS 9212 #define GO_CAGE 181152 #define NPC_CAPTAIN_HELIOS 16220 @@ -152,7 +152,7 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI npc_ranger_lilathaAI(Creature *c) : npc_escortAI(c) {Reset();} std::list<GameObject*> CageList; - + void WaypointReached(uint32 i) { Unit* player = Unit::GetUnit((*m_creature), PlayerGUID); @@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI switch(i) { - case 0: + case 0: { m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); GameObject* Cage = FindGameObject(GO_CAGE, 20, m_creature); @@ -173,10 +173,10 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI } case 5: DoScriptText(SAY_PROGRESS1, m_creature, player); - case 11: + case 11: DoScriptText(SAY_PROGRESS2, m_creature, player); m_creature->SetOrientation(4.762841); - break; + break; case 18: { DoScriptText(SAY_PROGRESS3, m_creature, player); @@ -185,30 +185,30 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI Summ1->Attack(m_creature, true); Summ2->Attack(player, true); m_creature->AI()->AttackStart(Summ1); - break; + break; } case 19: m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break; case 25: m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break; case 30: if (player && player->GetTypeId() == TYPEID_PLAYER) - ((Player*)player)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,m_creature); + ((Player*)player)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,m_creature); break; - case 32: + case 32: m_creature->SetOrientation(2.978281); DoScriptText(SAY_END1, m_creature, player); - break; + break; case 33: m_creature->SetOrientation(5.858011); DoScriptText(SAY_END2, m_creature, player); Unit* CaptainHelios = FindCreature(NPC_CAPTAIN_HELIOS, 50, m_creature); if(CaptainHelios) - DoScriptText(SAY_CAPTAIN_ANSWER, CaptainHelios, player); - break; + DoScriptText(SAY_CAPTAIN_ANSWER, CaptainHelios, player); + break; } } - + void Aggro(Unit* who) {} - + void Reset() { if (!IsBeingEscorted) @@ -218,7 +218,7 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI if(Cage) Cage->SetGoState(1); } - + void JustDied(Unit* killer) { if (PlayerGUID) @@ -228,13 +228,13 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI ((Player*)player)->FailQuest(QUEST_ESCAPE_FROM_THE_CATACOMBS); } } - + void UpdateAI(const uint32 diff) { npc_escortAI::UpdateAI(diff); } }; - + bool QuestAccept_npc_ranger_lilatha(Player* player, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS) @@ -244,11 +244,11 @@ bool QuestAccept_npc_ranger_lilatha(Player* player, Creature* creature, Quest co } return true; } - + CreatureAI* GetAI_npc_ranger_lilathaAI(Creature *_Creature) { npc_ranger_lilathaAI* ranger_lilathaAI = new npc_ranger_lilathaAI(_Creature); - + ranger_lilathaAI->AddWaypoint(0, 7545.07, -7359.87, 162.354, 4000); // Say0 ranger_lilathaAI->AddWaypoint(1, 7550.048340, -7362.237793, 162.235657); ranger_lilathaAI->AddWaypoint(2, 7566.976074, -7364.315430, 161.738770); @@ -283,11 +283,11 @@ CreatureAI* GetAI_npc_ranger_lilathaAI(Creature *_Creature) ranger_lilathaAI->AddWaypoint(31, 7603.768066, -7667.000488, 153.997726); ranger_lilathaAI->AddWaypoint(32, 7603.768066, -7667.000488, 153.997726, 4000); // Say4 & Set orientation ranger_lilathaAI->AddWaypoint(33, 7603.768066, -7667.000488, 153.997726, 8000); // Say5 & Set orientation - ranger_lilathaAI->AddWaypoint(34, 7603.768066, -7667.000488, 153.997726); - + ranger_lilathaAI->AddWaypoint(34, 7603.768066, -7667.000488, 153.997726); + return (CreatureAI*)ranger_lilathaAI; } - + void AddSC_ghostlands() { Script *newscript; diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp index 8317f1d2062..0aed97dcf66 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp @@ -51,7 +51,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI { - boss_gruulAI(Creature *c) : ScriptedAI(c) + boss_gruulAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); @@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI void KilledUnit() { switch(rand()%3) - { + { case 0: DoScriptText(SAY_SLAY1, m_creature); break; case 1: DoScriptText(SAY_SLAY2, m_creature); break; case 2: DoScriptText(SAY_SLAY3, m_creature); break; diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp index fb0da17801f..e03055e9c50 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI void JustDied(Unit* Killer) { DoScriptText(SAY_DEATH, m_creature); - + if (pInstance) { pInstance->SetData(DATA_MAULGAREVENT, DONE); @@ -178,7 +178,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI GetCouncil(); DoScriptText(SAY_AGGRO, m_creature); - + pInstance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID()); pInstance->SetData(DATA_MAULGAREVENT, IN_PROGRESS); @@ -237,9 +237,9 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI Phase2 = true; DoScriptText(SAY_ENRAGE, m_creature); - m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true); + m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true); m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0); - m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); + m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); } if(Phase2) @@ -251,7 +251,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI target = SelectUnit(SELECT_TARGET_RANDOM, 0); if (target) AttackStart(target); - DoCast(target, SPELL_BERSERKER_C); + DoCast(target, SPELL_BERSERKER_C); Charging_Timer = 20000; }else Charging_Timer -= diff; @@ -416,7 +416,7 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI ((boss_high_king_maulgarAI*)Maulgar->AI())->AddDeath(); } } - + void UpdateAI(const uint32 diff) { //Only if not incombat check if the event is started diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 8e9a87d8c41..b8247eac92f 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Kelidan_The_Breaker SD%Complete: 100 -SDComment: +SDComment: SDCategory: Hellfire Citadel, Blood Furnace EndScriptData */ @@ -182,7 +182,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI void JustDied(Unit* Killer) { DoScriptText(SAY_DIE, m_creature); - if(pInstance) + if(pInstance) pInstance->SetData(DATA_KELIDANEVENT, DONE); } diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp index 3c803350bb6..aae064d77c6 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Instance_Blood_Furnace SD%Complete: 85 -SDComment: +SDComment: SDCategory: Hellfire Citadel, Blood Furnace EndScriptData */ @@ -63,21 +63,21 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance return plr; } } - + debug_log("TSCR: Instance Blood Furnace: GetPlayerInMap, but PlayerList is empty!"); return NULL; } - + void HandleGameObject(uint64 guid, uint32 state) { Player *player = GetPlayerInMap(); - + if (!player || !guid) { debug_log("TSCR: Blood Furnace: HandleGameObject fail"); return; } - + if (GameObject *go = GameObject::GetGameObject(*player,guid)) go->SetGoState(state); } diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp index 4d4e9dcdd5c..165b27c9a0f 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp @@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI Turn_Timer = 0; UnsummonCheck = 5000; } - + void Aggro(Unit* who) {} void JustSummoned(Creature *summoned) @@ -309,7 +309,7 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI void SummonAdds() { if(!summoned) - { + { Creature* Vazruden = m_creature->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000); VazrudenGUID = Vazruden->GetGUID(); Creature* Nazan = m_creature->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000); @@ -406,7 +406,7 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI break; } } -}; +}; struct TRINITY_DLL_DECL mob_hellfire_sentryAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index fdce1519c77..c6d7fd2031a 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -55,7 +55,7 @@ static Yell RandomTaunt[]= #define MOB_CHANNELLER 17256 #define MOB_ABYSSAL 17454 -#define SPELL_BLASTNOVA 30616 +#define SPELL_BLASTNOVA 30616 #define SPELL_CLEAVE 30619 #define SPELL_QUAKE_TRIGGER 30657 // must be cast with 30561 as the proc spell #define SPELL_QUAKE_KNOCKBACK 30571 @@ -125,7 +125,7 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->CastSpell(m_creature, SPELL_DEBRIS_VISUAL, true); FireBlast_Timer = 5000; - Despawn_Timer = 10000; + Despawn_Timer = 10000; } } @@ -169,9 +169,9 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI { - boss_magtheridonAI(Creature *c) : ScriptedAI(c) + boss_magtheridonAI(Creature *c) : ScriptedAI(c) { - pInstance =(ScriptedInstance*)m_creature->GetInstanceData(); + pInstance =(ScriptedInstance*)m_creature->GetInstanceData(); m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); m_creature->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); @@ -208,7 +208,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI bool NeedCheckCube; void Reset() - { + { if(pInstance) { pInstance->SetData(DATA_MAGTHERIDON_EVENT, NOT_STARTED); @@ -379,10 +379,10 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI Blaze_Timer = 20000 + rand()%20000; }else Blaze_Timer -= diff; - if(!Phase3 && m_creature->GetHealth()*10 < m_creature->GetMaxHealth()*3 + if(!Phase3 && m_creature->GetHealth()*10 < m_creature->GetMaxHealth()*3 && !m_creature->IsNonMeleeSpellCasted(false) // blast nova && !m_creature->hasUnitState(UNIT_STAT_STUNNED)) // shadow cage and earthquake - { + { Phase3 = true; DoScriptText(SAY_CHAMBER_DESTROY, m_creature); m_creature->CastSpell(m_creature, SPELL_CAMERA_SHAKE, true); @@ -471,8 +471,8 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI void UpdateAI(const uint32 diff) { if(!UpdateVictim()) - return; - + return; + if(ShadowBoltVolley_Timer < diff) { DoCast(m_creature, SPELL_SHADOW_BOLT_VOLLEY); @@ -497,7 +497,7 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI { if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) m_creature->CastSpell(target, SPELL_BURNING_ABYSSAL, true); - Infernal_Timer = 30000 + rand()%10000; + Infernal_Timer = 30000 + rand()%10000; }else Infernal_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp index 0925a5054f3..c4a2eabd068 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance MagtheridonGUID = 0; ChannelerGUID.clear(); DoorGUID = 0; - ColumnGUID.clear(); + ColumnGUID.clear(); CageTimer = 0; RespawnTimer = 0; diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index aa275d013e5..60df1f14b52 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 - 2009 BroodWyrm */ +/* Copyright (C) 2008 - 2009 BroodWyrm */ #include "precompiled.h" #define SPELL_BLADE_DANCE 30739 @@ -51,11 +51,11 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI uint32 Assassins_Timer; - uint32 summoned; + uint32 summoned; bool InBlade; uint32 target_num; - + void Reset() { removeAdds(); @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI if(id != 1) return; - + if(target_num > 0) // to prevent loops { Wait_Timer = 1; @@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI Unit* temp = Unit::GetUnit((*m_creature),*itr); if(temp && temp->isAlive()) { - (*temp).GetMotionMaster()->Clear(true); + (*temp).GetMotionMaster()->Clear(true); m_creature->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); ((Creature*)temp)->RemoveCorpse(); } @@ -181,10 +181,10 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI } void SpawnAssassin() { - m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]+8, AssassEntrance[2], 0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); - m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]-8, AssassEntrance[2], 0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); + m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]+8, AssassEntrance[2], 0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); + m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]-8, AssassEntrance[2], 0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]+8, AssassExit[2], 0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); - m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]-8, AssassExit[2], 0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); + m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]-8, AssassExit[2], 0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); } void UpdateAI(const uint32 diff) @@ -276,10 +276,10 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI tempy = m_creature->GetPositionY(); if ( tempx > 255 || tempx < 205) { - EnterEvadeMode(); + EnterEvadeMode(); } resetcheck_timer = 5000; - }else resetcheck_timer -= diff; + }else resetcheck_timer -= diff; } }; diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp index d4a8631a86a..05770d534f2 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp @@ -72,10 +72,10 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI { DoScriptText(SAY_INTRO, m_creature); } - + void Aggro(Unit *who) { - switch(rand()%2) + switch(rand()%2) { case 0: DoScriptText(SAY_AGGRO1, m_creature); break; case 1: DoScriptText(SAY_AGGRO2, m_creature); break; @@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI case 2: DoScriptText(SAY_KILL3, m_creature); break; } } - + void JustDied(Unit *victim) { DoScriptText(SAY_DEATH, m_creature); diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp index bda4d137894..7cfd32955ca 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp @@ -240,15 +240,15 @@ bool GossipSelect_npc_wing_commander_brack(Player *player, Creature *_Creature, { switch(action) { - case GOSSIP_ACTION_INFO_DEF + 1: + case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); player->CastSpell(player,33659,true); //TaxiPath 584 (Gateways Murket and Shaadraz) - break; + break; case GOSSIP_ACTION_INFO_DEF + 2: player->CLOSE_GOSSIP_MENU(); player->CastSpell(player,33825,true); //TaxiPath 587 (Aerial Assault Flight (Horde)) break; - case GOSSIP_ACTION_INFO_DEF + 3: + case GOSSIP_ACTION_INFO_DEF + 3: player->CLOSE_GOSSIP_MENU(); player->CastSpell(player,34578,true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge) break; @@ -259,7 +259,7 @@ bool GossipSelect_npc_wing_commander_brack(Player *player, Creature *_Creature, /*###### ## npc_wounded_blood_elf ######*/ - + #define SAY_ELF_START -1000117 #define SAY_ELF_SUMMON1 -1000118 #define SAY_ELF_RESTING -1000119 @@ -268,7 +268,7 @@ bool GossipSelect_npc_wing_commander_brack(Player *player, Creature *_Creature, #define SAY_ELF_AGGRO -1000122 #define QUEST_ROAD_TO_FALCON_WATCH 9375 - + struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI { npc_wounded_blood_elfAI(Creature *c) : npc_escortAI(c) {Reset();} @@ -279,7 +279,7 @@ struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI if (!player) return; - + switch (i) { case 0: @@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI break; } } - + void Reset() { if (!IsBeingEscorted) @@ -323,7 +323,7 @@ struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI if (IsBeingEscorted) DoScriptText(SAY_ELF_AGGRO, m_creature); } - + void JustSummoned(Creature* summoned) { summoned->AI()->AttackStart(m_creature); @@ -342,13 +342,13 @@ struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI ((Player*)player)->FailQuest(QUEST_ROAD_TO_FALCON_WATCH); } } - + void UpdateAI(const uint32 diff) { npc_escortAI::UpdateAI(diff); } }; - + CreatureAI* GetAI_npc_wounded_blood_elf(Creature *_Creature) { npc_wounded_blood_elfAI* welfAI = new npc_wounded_blood_elfAI(_Creature); @@ -381,10 +381,10 @@ CreatureAI* GetAI_npc_wounded_blood_elf(Creature *_Creature) welfAI->AddWaypoint(25, -656.74, 4147.72, 64.11); welfAI->AddWaypoint(26, -652.22, 4137.50, 64.58); welfAI->AddWaypoint(27, -649.99, 4136.38, 64.63, 30000);// Award Quest Credit - + return (CreatureAI*)welfAI; } - + bool QuestAccept_npc_wounded_blood_elf(Player* player, Creature* creature, Quest const* quest) { if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH) @@ -393,7 +393,7 @@ bool QuestAccept_npc_wounded_blood_elf(Player* player, Creature* creature, Quest // Change faction so mobs attack creature->setFaction(775); } - + return true; } @@ -432,7 +432,7 @@ void AddSC_hellfire_peninsula() newscript->pGossipHello = &GossipHello_npc_wing_commander_brack; newscript->pGossipSelect = &GossipSelect_npc_wing_commander_brack; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name="npc_wounded_blood_elf"; newscript->GetAI = &GetAI_npc_wounded_blood_elf; diff --git a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp index b5fab052181..99aedf23bca 100644 --- a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp +++ b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp @@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL npc_greengill_slaveAI : public ScriptedAI if(PlayerGUID) { Unit* plr = Unit::GetUnit((*m_creature), PlayerGUID); - if(plr && ((Player*)plr)->GetQuestStatus(QUESTG) == QUEST_STATUS_INCOMPLETE) + if(plr && ((Player*)plr)->GetQuestStatus(QUESTG) == QUEST_STATUS_INCOMPLETE) ((Player*)plr)->KilledMonster(25086, m_creature->GetGUID()); } DoCast(m_creature, ENRAGE); diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp index 300e06c5592..bf26d71398f 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp @@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI switch(rand()%2) { case 0: DoScriptText(SAY_KILL1, m_creature); break; - case 1: DoScriptText(SAY_KILL2, m_creature); break; + case 1: DoScriptText(SAY_KILL2, m_creature); break; } } diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp index e41ab83543e..3030715ff27 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI void KilledUnit(Unit* Victim) { - if(rand()%2) + if(rand()%2) return; switch(rand()%3) @@ -117,19 +117,19 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI if (Holyfire_Timer < diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) DoCast(target,SPELL_HOLYFIRE); - Holyfire_Timer = 8000 + rand()%17000; //Anywhere from 8 to 25 seconds, good luck having several of those in a row! + Holyfire_Timer = 8000 + rand()%17000; //Anywhere from 8 to 25 seconds, good luck having several of those in a row! }else Holyfire_Timer -= diff; if (Holywrath_Timer < diff) { if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) DoCast(target,SPELL_HOLYWRATH); - + Holywrath_Timer = 20000+(rand()%10000); //20-30 secs sounds nice - + }else Holywrath_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp index e1f6c89f8c2..731f7ce2df9 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI { DoScriptText(SAY_DEATH, m_creature); if (Unit *pMidnight = Unit::GetUnit(*m_creature, Midnight)) - pMidnight->DealDamage(pMidnight, pMidnight->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + pMidnight->DealDamage(pMidnight, pMidnight->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } void UpdateAI(const uint32 diff) @@ -293,8 +293,8 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI void SpellHit(Unit *source, const SpellEntry *spell) { - if(spell->Mechanic == MECHANIC_DISARM) - DoScriptText(SAY_DISARMED, m_creature); + if(spell->Mechanic == MECHANIC_DISARM) + DoScriptText(SAY_DISARMED, m_creature); } }; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp index 12115dfa1d0..12c2a92ec91 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI if (PlayerList.isEmpty()) return; - + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_GARROTE,0)) @@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI //Gouge highest aggro, and attack second highest if (Gouge_Timer < diff) { - DoCast(m_creature->getVictim(), SPELL_GOUGE); + DoCast(m_creature->getVictim(), SPELL_GOUGE); Gouge_Timer = 40000; }else Gouge_Timer -= diff; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp index 669b876f176..f9bcfef86e8 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" #include "def_karazhan.h" - + //phase 1 #define SPELL_BELLOWING_ROAR 39427 #define SPELL_CHARRED_EARTH 30129 @@ -44,7 +44,7 @@ EndScriptData */ #define YELL_LAND_PHASE_2 "Insects! Let me show you my strength up close!" #define EMOTE_BREATH "takes a deep breath." -float IntroWay[8][3] = +float IntroWay[8][3] = { {-11053.37,-1794.48,149}, {-11141.07,-1841.40,125}, @@ -52,11 +52,11 @@ float IntroWay[8][3] = {-11189.20,-1931.25,125}, {-11153.76,-1948.93,125}, {-11128.73,-1929.75,125}, - {-11140 , -1915 ,122}, + {-11140 , -1915 ,122}, {-11163 , -1903 ,91.473} }; -//float IntroWay[5][3] = +//float IntroWay[5][3] = //{ // {-11000.00, -1765.75, 140.40}, // {-11000.00, -1765.75, 171.00}, @@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI { pInstance = ((ScriptedInstance*)c->GetInstanceData()); Intro = true; - Reset(); + Reset(); } ScriptedInstance* pInstance; @@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI Phase =1; FlyCount = 0; MovePhase = 0; - + m_creature->SetSpeed(MOVE_RUN, 2.0f); m_creature->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT + MOVEMENTFLAG_LEVITATING); m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); @@ -139,7 +139,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI m_creature->GetMotionMaster()->MoveTargetedHome(); } } - + void HandleTerraceDoors(bool open) { if(GameObject *Door = GameObject::GetGameObject((*m_creature),pInstance->GetData64(DATA_MASTERS_TERRACE_DOOR_1))) @@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI { if(pInstance) pInstance->SetData(DATA_NIGHTBANE_EVENT, DONE); - + HandleTerraceDoors(true); } @@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI ScriptedAI::AttackStart(who); } } - + void MovementInform(uint32 type, uint32 id) { if(type != POINT_MOTION_TYPE) @@ -193,7 +193,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI m_creature->SetHomePosition(IntroWay[7][0],IntroWay[7][1],IntroWay[7][2],0); return; } - + WaitTimer = 1; } @@ -201,7 +201,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI { if(id == 0) { - DoTextEmote(EMOTE_BREATH, NULL, true); + DoTextEmote(EMOTE_BREATH, NULL, true); Flying = false; Phase = 2; return; @@ -240,7 +240,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI m_creature->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT + MOVEMENTFLAG_LEVITATING); (*m_creature).GetMotionMaster()->Clear(false); (*m_creature).GetMotionMaster()->MovePoint(0,IntroWay[2][0],IntroWay[2][1],IntroWay[2][2]); - + Flying = true; FlyTimer = 45000+rand()%15000; //timer wrong between 45 and 60 seconds @@ -259,37 +259,37 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if(Intro) { if(MovePhase >= 7) - { + { m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT + MOVEMENTFLAG_LEVITATING); m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAND); m_creature->GetMotionMaster()->MovePoint(8,IntroWay[7][0],IntroWay[7][1],IntroWay[7][2]); } - else + else { m_creature->GetMotionMaster()->MovePoint(MovePhase,IntroWay[MovePhase][0],IntroWay[MovePhase][1],IntroWay[MovePhase][2]); ++MovePhase; } } - + if(Flying) { if(MovePhase >= 7) - { + { m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT + MOVEMENTFLAG_LEVITATING); m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAND); m_creature->GetMotionMaster()->MovePoint(8,IntroWay[7][0],IntroWay[7][1],IntroWay[7][2]); } - else + else { m_creature->GetMotionMaster()->MovePoint(MovePhase,IntroWay[MovePhase][0],IntroWay[MovePhase][1],IntroWay[MovePhase][2]); ++MovePhase; } } - + WaitTimer = 0; }else WaitTimer -= diff; - if(!UpdateVictim()) + if(!UpdateVictim()) return; if(Flying) @@ -318,7 +318,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if (CharredEarthTimer < diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(target,SPELL_CHARRED_EARTH); CharredEarthTimer = 20000; //timer }else CharredEarthTimer -= diff; @@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if (TailSweepTimer < diff) { if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - if (!m_creature->HasInArc( M_PI, target)) + if (!m_creature->HasInArc( M_PI, target)) DoCast(target,SPELL_TAIL_SWEEP); TailSweepTimer = 15000;//timer }else TailSweepTimer -= diff; @@ -335,24 +335,24 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI { if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(target,SPELL_SEARING_CINDERS); - SearingCindersTimer = 10000; //timer + SearingCindersTimer = 10000; //timer }else SearingCindersTimer -= diff; uint32 Prozent; Prozent = (m_creature->GetHealth()*100) / m_creature->GetMaxHealth(); - if (Prozent < 75 && FlyCount == 0) // first take off 75% - TakeOff(); + if (Prozent < 75 && FlyCount == 0) // first take off 75% + TakeOff(); - if (Prozent < 50 && FlyCount == 1) // secound take off 50% - TakeOff(); + if (Prozent < 50 && FlyCount == 1) // secound take off 50% + TakeOff(); - if (Prozent < 25 && FlyCount == 2) // third take off 25% + if (Prozent < 25 && FlyCount == 2) // third take off 25% TakeOff(); - + DoMeleeAttackIfReady(); } - + //Phase 2 "FLYING FIGHT" if (Phase == 2) { @@ -368,7 +368,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if (RainofBonesTimer < diff && !RainBones) // only once at the beginning of phase 2 { - DoCast(m_creature->getVictim(),SPELL_RAIN_OF_BONES); + DoCast(m_creature->getVictim(),SPELL_RAIN_OF_BONES); RainBones = true; SmokingBlastTimer = 20000; }else RainofBonesTimer -= diff; @@ -394,20 +394,20 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI { if (Unit* target = SelectUnit(SELECT_TARGET_FARTHEST, 0)) DoCast(target,SPELL_FIREBALL_BARRAGE); - FireballBarrageTimer = 20000; //Timer + FireballBarrageTimer = 20000; //Timer }else FireballBarrageTimer -= diff; if (FlyTimer < diff) //landing { if(rand()%2 == 0) DoYell(YELL_LAND_PHASE_1, LANG_UNIVERSAL, NULL); - else - DoYell(YELL_LAND_PHASE_2, LANG_UNIVERSAL, NULL); + else + DoYell(YELL_LAND_PHASE_2, LANG_UNIVERSAL, NULL); (*m_creature).GetMotionMaster()->Clear(false); m_creature->GetMotionMaster()->MovePoint(3,IntroWay[3][0],IntroWay[3][1],IntroWay[3][2]); - Flying = true; + Flying = true; }else FlyTimer -= diff; } } diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp index a3a1cb462a9..847fb5f816e 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp @@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL netherspite_infernalAI : public ScriptedAI struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI { - boss_malchezaarAI(Creature *c) : ScriptedAI(c) + boss_malchezaarAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp index 030781fed64..555ebafcb9e 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp @@ -251,7 +251,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI } if (FrostCooldown) - { + { if (FrostCooldown >= diff) FrostCooldown -= diff; else FrostCooldown = 0; diff --git a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp index 0a0ae7e200e..b3d38ecaadc 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp @@ -32,20 +32,20 @@ EndScriptData */ #define SAY_DOROTHEE_SUMMON -1532026 #define SAY_DOROTHEE_TITO_DEATH -1532027 #define SAY_DOROTHEE_AGGRO -1532028 - + #define SAY_ROAR_AGGRO -1532029 #define SAY_ROAR_DEATH -1532030 #define SAY_ROAR_SLAY -1532031 - + #define SAY_STRAWMAN_AGGRO -1532032 #define SAY_STRAWMAN_DEATH -1532033 #define SAY_STRAWMAN_SLAY -1532034 - + #define SAY_TINHEAD_AGGRO -1532035 #define SAY_TINHEAD_DEATH -1532036 #define SAY_TINHEAD_SLAY -1532037 #define EMOTE_RUST -1532038 - + #define SAY_CRONE_AGGRO -1532039 #define SAY_CRONE_AGGRO2 -1532040 #define SAY_CRONE_DEATH -1532041 @@ -855,7 +855,7 @@ CreatureAI* GetAI_boss_bigbadwolf(Creature* _Creature) #define SAY_JULIANNE_DEATH02 -1532049 #define SAY_JULIANNE_RESURRECT -1532050 #define SAY_JULIANNE_SLAY -1532051 - + #define SAY_ROMULO_AGGRO -1532052 #define SAY_ROMULO_DEATH -1532053 #define SAY_ROMULO_ENTER -1532054 diff --git a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp index 5b5dd3dabd9..b0a6f5d130b 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp @@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance uint32 Encounters[ENCOUNTERS]; - uint32 OperaEvent; + uint32 OperaEvent; uint32 OzDeathCount; uint64 CurtainGUID; @@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance bool IsEncounterInProgress() const { for (uint8 i = 0; i < ENCOUNTERS; ++i) - if (Encounters[i] == IN_PROGRESS) + if (Encounters[i] == IN_PROGRESS) return true; return false; @@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance void SetData64(uint32 identifier, uint64 data) { switch(identifier) - { + { case DATA_IMAGE_OF_MEDIVH: ImageGUID = data; } } diff --git a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp index eb69b604be6..49febb5520f 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp @@ -484,7 +484,7 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI pInstance->SetData64(DATA_IMAGE_OF_MEDIVH, m_creature->GetGUID()); (*m_creature).GetMotionMaster()->MovePoint(1,MedivPos[0],MedivPos[1],MedivPos[2]); Step = 0; - }else + }else { m_creature->DealDamage(m_creature,m_creature->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); m_creature->RemoveCorpse(); @@ -591,11 +591,11 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI } return 50000; case 15: - arca->DealDamage(arca,arca->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + arca->DealDamage(arca,arca->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); return 5000; - default : return 9999999; - } - + default : return 9999999; + } + } void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp index 24df5e7d0d8..2141d8dcb2e 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp @@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI pInstance->SetData(DATA_KAELTHAS_EVENT, NOT_STARTED); } } - + void KilledUnit(Unit* victim) { if(victim && (victim->GetTypeId() == TYPEID_PLAYER)) @@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI void SetThreatList(Creature* SummonedUnit) { - if(!SummonedUnit) + if(!SummonedUnit) return; std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); @@ -276,7 +276,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList::const_iterator i; for (i = PlayerList.begin(); i != PlayerList.end(); ++i) - { + { if(Player* i_pl = i->getSource()) { i_pl->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY); @@ -419,10 +419,10 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI GravityLapseTimer = 30000; GravityLapsePhase = 4; for(uint8 i = 0; i < 3; ++i) - { + { Creature* Orb = m_creature->SummonCreature(CREATURE_ARCANE_SPHERE,KaelLocations[3+i][0],KaelLocations[3+i][1],LOCATION_Z,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,30000); - if(Orb) - { + if(Orb) + { SetThreatList(Orb); Unit *target = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,i); if(target) @@ -564,7 +564,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI DoCast(m_creature->getVictim(), SPELL_PHOENIX_FIREBALL); } BurnTimer = 2000; - }else BurnTimer -= diff; + }else BurnTimer -= diff; //DoMeleeAttackIfReady(); } @@ -586,7 +586,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public Scripted_NoMovementAI void MoveInLineOfSight(Unit* who) {} void UpdateAI(const uint32 diff) { - + if(HatchTimer < diff) { Creature *bird = DoSpawnCreature(CREATURE_PHOENIX, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 60000); @@ -695,7 +695,7 @@ bool GOHello_go_movie_orb(Player *player, GameObject* _GO) WorldPacket data(SMSG_TRIGGER_CINEMATIC, 4); data << (uint32)164; player->GetSession()->SendPacket(&data); - + if (player->GetQuestStatus(11490) == QUEST_STATUS_INCOMPLETE) { Unit *qUnit = player->SummonCreature(25042,player->GetPositionX(),player->GetPositionY(),player->GetPositionZ()-10,0,TEMPSUMMON_CORPSE_DESPAWN,0); diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp index 6688e40c27c..5eae41aa45f 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp @@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); Adds.clear(); //SummonAdds(); - Reset(); + Reset(); Heroic = c->GetMap()->IsHeroic(); } @@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI { pAdd->AI()->EnterEvadeMode(); pAdd->GetMotionMaster()->MovePoint(0,LackeyLocations[i][0], LackeyLocations[i][1], POS_Z); - } + } if(!pAdd || (pAdd && pAdd->isDead())) { if(pAdd) @@ -751,7 +751,7 @@ struct TRINITY_DLL_DECL boss_yazzaiAI : public boss_priestess_guestAI if(!UpdateVictim() ) return; - boss_priestess_guestAI::UpdateAI(diff); + boss_priestess_guestAI::UpdateAI(diff); if(Polymorph_Timer < diff) { @@ -816,7 +816,7 @@ struct TRINITY_DLL_DECL boss_yazzaiAI : public boss_priestess_guestAI x = rand()%2 ? x+10+rand()%10 : x-10-rand()%10; y = rand()%2 ? y+10+rand()%10 : y-10-rand()%10; m_creature->Relocate(x,y,z); - m_creature->SendMonsterMove(x, y, m_creature->GetPositionZ(), 0,0,0); + m_creature->SendMonsterMove(x, y, m_creature->GetPositionZ(), 0,0,0); } Blink_Timer = 8000; }else Blink_Timer -= diff; @@ -1206,7 +1206,7 @@ struct TRINITY_DLL_DECL boss_zelfanAI : public boss_priestess_guestAI boss_priestess_guestAI::UpdateAI(diff); if(Goblin_Dragon_Gun_Timer < diff) - { + { if (m_creature->GetDistance(m_creature->getVictim()) <= 5) { Goblin_Dragon_Gun_Timer = 10000; diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp index fe6d3cb7ca4..df5653eba1f 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp @@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI pInstance->SetData(DATA_SELIN_EVENT, DONE); else pInstance->SetData(DATA_SELIN_EVENT, NOT_STARTED); }else error_log(ERROR_INST_DATA); - + DrainLifeTimer = 3000 + rand()%4000; DrainManaTimer = DrainLifeTimer + 5000; FelExplosionTimer = 2100; diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp index 3caa4e1ebb1..fe07b7d7f2f 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp @@ -106,29 +106,29 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance { switch(identifier) { - case DATA_SELIN_EVENT: - Encounters[0] = data; + case DATA_SELIN_EVENT: + Encounters[0] = data; if(data==DONE) { DoorState[0] = 0; SaveToDB(); } break; - case DATA_VEXALLUS_EVENT: - Encounters[1] = data; + case DATA_VEXALLUS_EVENT: + Encounters[1] = data; if(data==DONE) { DoorState[1] = 0; SaveToDB(); } break; - case DATA_DELRISSA_EVENT: - Encounters[2] = data; + case DATA_DELRISSA_EVENT: + Encounters[2] = data; if(data==DONE) { DoorState[2] = 0; SaveToDB(); - } + } break; case DATA_KAELTHAS_EVENT: Encounters[3] = data; break; @@ -177,20 +177,20 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance { switch(go->GetEntry()) { - case 187896: - VexallusDoorGUID = go->GetGUID(); + case 187896: + VexallusDoorGUID = go->GetGUID(); go->SetGoState(DoorState[1]); break; //SunwellRaid Gate 02 - case 187979: - SelinDoorGUID = go->GetGUID(); + case 187979: + SelinDoorGUID = go->GetGUID(); go->SetGoState(DoorState[0]); break; //Assembly Chamber Door case 188065: SelinEncounterDoorGUID = go->GetGUID(); break; - case 187770: - DelrissaDoorGUID = go->GetGUID(); - go->SetGoState(DoorState[2]); + case 187770: + DelrissaDoorGUID = go->GetGUID(); + go->SetGoState(DoorState[2]); break; case 188165: KaelStatue[0] = go->GetGUID(); break; case 188166: KaelStatue[1] = go->GetGUID(); break; diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp index 1c849cd5936..1001a9240ab 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI void JustDied(Unit* Killer) { - + if(pInstance) pInstance->SetData(DATA_GOLEMAGG_DEATH, 0); } diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp index 3e77f52fa77..cce0a783d44 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp @@ -28,18 +28,18 @@ EndScriptData */ #define SAY_SLAY -1409005 #define SAY_SPECIAL -1409006 #define SAY_DEFEAT -1409007 - + #define SAY_SUMMON_MAJ -1409008 #define SAY_ARRIVAL1_RAG -1409009 #define SAY_ARRIVAL2_MAJ -1409010 #define SAY_ARRIVAL3_RAG -1409011 #define SAY_ARRIVAL5_RAG -1409012 - + #define SPAWN_RAG_X 838.51 #define SPAWN_RAG_Y -829.84 #define SPAWN_RAG_Z -232.00 #define SPAWN_RAG_O 1.70 - + #define SPELL_MAGIC_REFLECTION 20619 #define SPELL_DAMAGE_REFLECTION 21075 diff --git a/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp b/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp index cd13967e5ec..9069175a5ef 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp @@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance return false; }; - + void OnObjectCreate(GameObject *go) { switch(go->GetEntry()) @@ -188,7 +188,7 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance } return 0; - } + } uint32 GetData(uint32 type) { diff --git a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp index f2433ea9234..03d799e30d7 100644 --- a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp +++ b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp @@ -201,7 +201,7 @@ bool GossipSelect_npc_silva_filnaveth(Player *player, Creature *_Creature, uint3 ## npc_clintar_spirit ######*/ -float Clintar_spirit_WP[41][5] = +float Clintar_spirit_WP[41][5] = { //pos_x pos_y pos_z orien waitTime {7465.28, -3115.46, 439.327, 0.83, 4000}, @@ -524,7 +524,7 @@ CreatureAI* GetAI_npc_clintar_spirit(Creature *_Creature) # npc_clintar_dreamwalker ####*/ -#define CLINTAR_SPIRIT 22916 +#define CLINTAR_SPIRIT 22916 bool QuestAccept_npc_clintar_dreamwalker(Player *player, Creature *creature, Quest const *quest ) { @@ -538,7 +538,7 @@ bool QuestAccept_npc_clintar_dreamwalker(Player *player, Creature *creature, Que } /*#### -# +# ####*/ void AddSC_moonglade() diff --git a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp index a2027ac3904..8d4d68fe7fb 100644 --- a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp +++ b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp @@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL npc_kyle_frenziedAI : public ScriptedAI void MovementInform(uint32 type, uint32 id) { if(type == POINT_MOTION_TYPE) - { + { switch(STATE) { case 1: @@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL npc_kyle_frenziedAI : public ScriptedAI { switch(STATE) { - case 2: + case 2: STATE = 3; wait = 7000; m_creature->UpdateEntry(23622,HORDE); m_creature->HandleEmoteCommand(EMOTE_ONESHOT_DANCE); diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp index 49921ad24f0..1df59d08ca5 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp @@ -68,11 +68,11 @@ struct TRINITY_DLL_DECL boss_faerlinaAI : public ScriptedAI void MoveInLineOfSight(Unit *who) { - if (!HasTaunted && m_creature->IsWithinDistInMap(who, 60.0f)) + if (!HasTaunted && m_creature->IsWithinDistInMap(who, 60.0f)) { DoScriptText(SAY_GREET, m_creature); HasTaunted = true; - + } ScriptedAI::MoveInLineOfSight(who); } diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp index 527d19aff05..496d0d68526 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp @@ -13,20 +13,20 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + /* ScriptData SDName: Boss_Four_Horsemen SD%Complete: 75 SDComment: Lady Blaumeux, Thane Korthazz, Sir Zeliek, Baron Rivendare SDCategory: Naxxramas EndScriptData */ - + #include "precompiled.h" - + //all horsemen #define SPELL_SHIELDWALL 29061 #define SPELL_BESERK 26662 - + //lady blaumeux #define SAY_BLAU_AGGRO -1533044 #define SAY_BLAU_TAUNT1 -1533045 @@ -35,25 +35,25 @@ #define SAY_BLAU_SPECIAL -1533048 #define SAY_BLAU_SLAY -1533049 #define SAY_BLAU_DEATH -1533050 - + #define SPELL_MARK_OF_BLAUMEUX 28833 #define SPELL_UNYILDING_PAIN 57381 #define SPELL_VOIDZONE 28863 #define H_SPELL_VOIDZONE 57463 #define SPELL_SHADOW_BOLT 57374 #define H_SPELL_SHADOW_BOLT 57464 - + #define C_SPIRIT_OF_BLAUMEUX 16776 - + struct TRINITY_DLL_DECL boss_lady_blaumeuxAI : public ScriptedAI { boss_lady_blaumeuxAI(Creature *c) : ScriptedAI(c) {Reset();} - + uint32 Mark_Timer; uint32 VoidZone_Timer; bool ShieldWall1; bool ShieldWall2; - + void Reset() { Mark_Timer = 20000; // First Horsemen Mark is applied at 20 sec. @@ -61,34 +61,34 @@ ShieldWall1 = true; ShieldWall2 = true; } - + void Aggro(Unit *who) { DoScriptText(SAY_BLAU_AGGRO, m_creature); } - + void KilledUnit(Unit* Victim) { DoScriptText(SAY_BLAU_SLAY, m_creature); } - + void JustDied(Unit* Killer) { DoScriptText(SAY_BLAU_DEATH, m_creature); } - + void UpdateAI(const uint32 diff) { if (!UpdateVictim()) return; - + // Mark of Blaumeux if (Mark_Timer < diff) { DoCast(m_creature->getVictim(),SPELL_MARK_OF_BLAUMEUX); Mark_Timer = 12000; }else Mark_Timer -= diff; - + // Shield Wall - All 4 horsemen will shield wall at 50% hp and 20% hp for 20 seconds if (ShieldWall1 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50) { @@ -106,23 +106,23 @@ ShieldWall2 = false; } } - + // Void Zone if (VoidZone_Timer < diff) { DoCast(m_creature->getVictim(),SPELL_VOIDZONE); VoidZone_Timer = 12000; }else VoidZone_Timer -= diff; - + DoMeleeAttackIfReady(); } }; - + CreatureAI* GetAI_boss_lady_blaumeux(Creature *_Creature) { return new boss_lady_blaumeuxAI (_Creature); } - + //baron rivendare #define SAY_RIVE_AGGRO1 -1533065 #define SAY_RIVE_AGGRO2 -1533066 @@ -134,21 +134,21 @@ #define SAY_RIVE_TAUNT2 -1533072 #define SAY_RIVE_TAUNT3 -1533073 #define SAY_RIVE_DEATH -1533074 - + #define SPELL_MARK_OF_RIVENDARE 28834 #define SPELL_UNHOLY_SHADOW 28882 #define H_SPELL_UNHOLY_SHADOW 57369 - + #define C_SPIRIT_OF_RIVENDARE 0 //creature entry not known yet - + struct TRINITY_DLL_DECL boss_rivendare_naxxAI : public ScriptedAI { boss_rivendare_naxxAI(Creature *c) : ScriptedAI(c) {Reset();} - + void Reset() { } - + void Aggro(Unit *who) { switch(rand()%3) @@ -158,7 +158,7 @@ case 2: DoScriptText(SAY_RIVE_AGGRO3, m_creature); break; } } - + void KilledUnit(Unit* Victim) { switch(rand()%2) @@ -167,26 +167,26 @@ case 1: DoScriptText(SAY_RIVE_SLAY2, m_creature); break; } } - + void JustDied(Unit* Killer) { DoScriptText(SAY_RIVE_DEATH, m_creature); } - + void UpdateAI(const uint32 diff) { if (!UpdateVictim()) return; - + DoMeleeAttackIfReady(); } }; - + CreatureAI* GetAI_boss_rivendare_naxx(Creature *_Creature) { return new boss_rivendare_naxxAI (_Creature); } - + //thane korthazz #define SAY_KORT_AGGRO -1533051 #define SAY_KORT_TAUNT1 -1533052 @@ -195,21 +195,21 @@ #define SAY_KORT_SPECIAL -1533055 #define SAY_KORT_SLAY -1533056 #define SAY_KORT_DEATH -1533057 - + #define SPELL_MARK_OF_KORTHAZZ 28832 #define SPELL_METEOR 26558 // m_creature->getVictim() auto-area spell but with a core problem - + #define C_SPIRIT_OF_KORTHAZZ 16778 - + struct TRINITY_DLL_DECL boss_thane_korthazzAI : public ScriptedAI { boss_thane_korthazzAI(Creature *c) : ScriptedAI(c) {Reset();} - + uint32 Mark_Timer; uint32 Meteor_Timer; bool ShieldWall1; bool ShieldWall2; - + void Reset() { Mark_Timer = 20000; // First Horsemen Mark is applied at 20 sec. @@ -217,34 +217,34 @@ ShieldWall1 = true; ShieldWall2 = true; } - + void Aggro(Unit *who) { DoScriptText(SAY_KORT_AGGRO, m_creature); } - + void KilledUnit(Unit* Victim) { DoScriptText(SAY_KORT_SLAY, m_creature); } - + void JustDied(Unit* Killer) { DoScriptText(SAY_KORT_DEATH, m_creature); } - + void UpdateAI(const uint32 diff) { if (!UpdateVictim()) return; - + // Mark of Korthazz if (Mark_Timer < diff) { DoCast(m_creature->getVictim(),SPELL_MARK_OF_KORTHAZZ); Mark_Timer = 12000; }else Mark_Timer -= diff; - + // Shield Wall - All 4 horsemen will shield wall at 50% hp and 20% hp for 20 seconds if (ShieldWall1 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50) { @@ -262,23 +262,23 @@ ShieldWall2 = false; } } - + // Meteor if (Meteor_Timer < diff) { DoCast(m_creature->getVictim(),SPELL_METEOR); Meteor_Timer = 20000; // wrong }else Meteor_Timer -= diff; - + DoMeleeAttackIfReady(); } }; - + CreatureAI* GetAI_boss_thane_korthazz(Creature *_Creature) { return new boss_thane_korthazzAI (_Creature); } - + //sir zeliek #define SAY_ZELI_AGGRO -1533058 #define SAY_ZELI_TAUNT1 -1533059 @@ -287,24 +287,24 @@ #define SAY_ZELI_SPECIAL -1533062 #define SAY_ZELI_SLAY -1533063 #define SAY_ZELI_DEATH -1533064 - + #define SPELL_MARK_OF_ZELIEK 28835 #define SPELL_HOLY_WRATH 28883 #define H_SPELL_HOLY_WRATH 57466 #define SPELL_HOLY_BOLT 57376 #define H_SPELL_HOLY_BOLT 57465 - + #define C_SPIRIT_OF_ZELIREK 16777 - + struct TRINITY_DLL_DECL boss_sir_zeliekAI : public ScriptedAI { boss_sir_zeliekAI(Creature *c) : ScriptedAI(c) {Reset();} - + uint32 Mark_Timer; uint32 HolyWrath_Timer; bool ShieldWall1; bool ShieldWall2; - + void Reset() { Mark_Timer = 20000; // First Horsemen Mark is applied at 20 sec. @@ -312,35 +312,35 @@ ShieldWall1 = true; ShieldWall2 = true; } - + void Aggro(Unit *who) { DoScriptText(SAY_ZELI_AGGRO, m_creature); } - + void KilledUnit(Unit* Victim) { DoScriptText(SAY_ZELI_SLAY, m_creature); } - + void JustDied(Unit* Killer) { DoScriptText(SAY_ZELI_DEATH, m_creature); } - + void UpdateAI(const uint32 diff) { //Return since we have no target if (!UpdateVictim()) return; - + // Mark of Zeliek if (Mark_Timer < diff) { DoCast(m_creature->getVictim(),SPELL_MARK_OF_ZELIEK); Mark_Timer = 12000; }else Mark_Timer -= diff; - + // Shield Wall - All 4 horsemen will shield wall at 50% hp and 20% hp for 20 seconds if (ShieldWall1 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50) { @@ -358,42 +358,42 @@ ShieldWall2 = false; } } - + // Holy Wrath if (HolyWrath_Timer < diff) { DoCast(m_creature->getVictim(),SPELL_HOLY_WRATH); HolyWrath_Timer = 12000; }else HolyWrath_Timer -= diff; - + DoMeleeAttackIfReady(); } }; - + CreatureAI* GetAI_boss_sir_zeliek(Creature *_Creature) { return new boss_sir_zeliekAI (_Creature); } - + void AddSC_boss_four_horsemen() { Script *newscript; - + newscript = new Script; newscript->Name = "boss_lady_blaumeux"; newscript->GetAI = &GetAI_boss_lady_blaumeux; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "boss_rivendare_naxx"; newscript->GetAI = &GetAI_boss_rivendare_naxx; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "boss_thane_korthazz"; newscript->GetAI = &GetAI_boss_thane_korthazz; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "boss_sir_zeliek"; newscript->GetAI = &GetAI_boss_sir_zeliek; diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp index 0ccc63fd356..bf939da9572 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp @@ -29,34 +29,34 @@ EndScriptData */ #define SAY_SAPP_DIALOG3 -1533086 #define SAY_SAPP_DIALOG4_LICH -1533087 #define SAY_SAPP_DIALOG5 -1533088 - + //when cat dies #define SAY_CAT_DIED -1533089 - + //when each of the 4 wing bosses dies #define SAY_TAUNT1 -1533090 #define SAY_TAUNT2 -1533091 #define SAY_TAUNT3 -1533092 #define SAY_TAUNT4 -1533093 - + #define SAY_SUMMON_MINIONS -1533105 //start of phase 1 #define SAY_AGGRO1 -1533094 //start of phase 2 #define SAY_AGGRO2 -1533095 #define SAY_AGGRO3 -1533096 - + #define SAY_SLAY1 -1533097 #define SAY_SLAY2 -1533098 #define SAY_DEATH -1533099 - + #define SAY_CHAIN1 -1533100 #define SAY_CHAIN2 -1533101 #define SAY_FROST_BLAST -1533102 - + #define SAY_REQUEST_AID -1533103 //start of phase 3 #define SAY_ANSWER_REQUEST -1533104 //lich king answer - + #define SAY_SPECIAL1_MANA_DET -1533106 #define SAY_SPECIAL3_MANA_DET -1533107 #define SAY_SPECIAL2_DISPELL -1533108 diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp index 77b85659e4e..57dbe53cc0a 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp @@ -36,7 +36,7 @@ EndScriptData */ #define H_SPELL_CRIPPLE 54814 #define SPELL_CURSE_PLAGUEBRINGER 28213 #define H_SPELL_CURSE_PLAGUEBRINGER 54835 -#define SOUND_DEATH 8848 +#define SOUND_DEATH 8848 #define C_PLAGUED_WARRIOR 16984 diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp index dcf044697c3..de1c201cc74 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp @@ -27,19 +27,19 @@ EndScriptData */ #define SAY_STAL_AGGRO -1533023 #define SAY_STAL_SLAY -1533024 #define SAY_STAL_DEATH -1533025 - + #define SPELL_POWERSURGE 28134 - + //Feugen #define SAY_FEUG_AGGRO -1533026 #define SAY_FEUG_SLAY -1533027 #define SAY_FEUG_DEATH -1533028 - + #define SPELL_MANABURN 28135 //both #define SPELL_WARSTOMP 28125 - + //Thaddus #define SAY_GREET -1533029 #define SAY_AGGRO1 -1533030 diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp index e4de175051b..19b4cf86136 100644 --- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp +++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp @@ -336,7 +336,7 @@ bool GOHello_go_manaforge_control_console(Player *player, GameObject* _GO) /*###### ## npc_commander_dawnforge ######*/ - + // The Speech of Dawnforge, Ardonis & Pathaleon #define SAY_COMMANDER_DAWNFORGE_1 -1000128 #define SAY_ARCANIST_ARDONIS_1 -1000129 @@ -352,7 +352,7 @@ bool GOHello_go_manaforge_control_console(Player *player, GameObject* _GO) #define QUEST_INFO_GATHERING 10198 #define SPELL_SUNFURY_DISGUISE 34603 - + // Entries of Arcanist Ardonis, Commander Dawnforge, Pathaleon the Curators Image int CreatureEntry[3][1] = { @@ -375,10 +375,10 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI uint32 PhaseSubphase; uint32 Phase_Timer; bool isEvent; - + float angle_dawnforge; float angle_ardonis; - + void Reset() { playerGUID = 0; @@ -390,7 +390,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI Phase_Timer = 4000; isEvent = false; } - + void Aggro(Unit *who) { } //Select any creature in a grid @@ -402,33 +402,33 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI Cell cell(pair); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - + Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck creature_check(*m_creature, entry, true, range); Trinity::CreatureLastSearcher<Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(m_creature, pCreature, creature_check); - + TypeContainerVisitor<Trinity::CreatureLastSearcher<Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck>, GridTypeMapContainer> creature_searcher(searcher); - + CellLock<GridReadGuard> cell_lock(cell, pair); cell_lock->Visit(cell_lock, creature_searcher,*(m_creature->GetMap())); return pCreature; } - + void JustSummoned(Creature *summoned) { pathaleonGUID = summoned->GetGUID(); } - + // Emote Ardonis and Pathaleon void Turn_to_Pathaleons_Image() { Unit *ardonis = Unit::GetUnit(*m_creature,ardonisGUID); Unit *pathaleon = Unit::GetUnit(*m_creature,pathaleonGUID); Player *player = (Player*)Unit::GetUnit(*m_creature,playerGUID); - + if (!ardonis || !pathaleon || !player) return; - + //Calculate the angle to Pathaleon angle_dawnforge = m_creature->GetAngle(pathaleon->GetPositionX(), pathaleon->GetPositionY()); angle_ardonis = ardonis->GetAngle(pathaleon->GetPositionX(), pathaleon->GetPositionY()); @@ -444,7 +444,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI m_creature->SetStandState(UNIT_STAND_STATE_KNEEL); ardonis->SetStandState(UNIT_STAND_STATE_KNEEL); } - + //Set them back to each other void Turn_to_eachother() { @@ -454,10 +454,10 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI if (!player) return; - + angle_dawnforge = m_creature->GetAngle(ardonis->GetPositionX(), ardonis->GetPositionY()); angle_ardonis = ardonis->GetAngle(m_creature->GetPositionX(), m_creature->GetPositionY()); - + //Turn Dawnforge and update m_creature->SetOrientation(angle_dawnforge); m_creature->SendUpdateToPlayer(player); @@ -470,7 +470,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI ardonis->SetStandState(UNIT_STAND_STATE_STAND); } } - + bool CanStartEvent(Player *player) { if (!isEvent) @@ -481,13 +481,13 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI ardonisGUID = ardonis->GetGUID(); playerGUID = player->GetGUID(); - + isEvent = true; Turn_to_eachother(); return true; } - + debug_log("TSCR: npc_commander_dawnforge event already in progress, need to wait."); return false; } @@ -504,23 +504,23 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI Phase_Timer -= diff; return; } - + Unit *ardonis = Unit::GetUnit(*m_creature,ardonisGUID); Unit *pathaleon = Unit::GetUnit(*m_creature,pathaleonGUID); Player *player = (Player*)Unit::GetUnit(*m_creature,playerGUID); - + if (!ardonis || !player) { Reset(); return; } - + if (Phase > 4 && !pathaleon) { Reset(); return; } - + //Phase 1 Dawnforge say switch (Phase) { @@ -623,12 +623,12 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI } } }; - + CreatureAI* GetAI_npc_commander_dawnforge(Creature* _Creature) { return new npc_commander_dawnforgeAI(_Creature); } - + Creature* SearchDawnforge(Player *source, uint32 entry, float range) { Creature* pCreature = NULL; @@ -637,31 +637,31 @@ Creature* SearchDawnforge(Player *source, uint32 entry, float range) Cell cell(pair); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - + Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck creature_check(*source, entry, true, range); Trinity::CreatureLastSearcher<Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(source, pCreature, creature_check); TypeContainerVisitor<Trinity::CreatureLastSearcher<Trinity::NearestCreatureEntryWithLiveStateInObjectRangeCheck>, GridTypeMapContainer> creature_searcher(searcher); - + CellLock<GridReadGuard> cell_lock(cell, pair); cell_lock->Visit(cell_lock, creature_searcher,*(source->GetMap())); - + return pCreature; } - + bool AreaTrigger_at_commander_dawnforge(Player *player, AreaTriggerEntry *at) { //if player lost aura or not have at all, we should not try start event. if (!player->HasAura(SPELL_SUNFURY_DISGUISE,0)) return false; - + if (player->isAlive() && player->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE) { Creature* Dawnforge = SearchDawnforge(player, CreatureEntry[1][0], 30.0f); if (!Dawnforge) return false; - + if (((npc_commander_dawnforgeAI*)Dawnforge->AI())->CanStartEvent(player)) return true; } @@ -719,7 +719,7 @@ bool GossipHello_npc_professor_dabiri(Player *player, Creature *_Creature) if(player->GetQuestStatus(QUEST_ON_NETHERY_WINGS) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(29778, 1)) player->ADD_GOSSIP_ITEM(0, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - + player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); return true; @@ -852,7 +852,7 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI { Unit* target = Unit::GetUnit((*m_creature), PlayerGUID); - if(target && !Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent) + if(target && !Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent) && ((Player*)target)->GetQuestStatus(10190) == QUEST_STATUS_INCOMPLETE) { DoScriptText(EMOTE_WEAK, m_creature); @@ -919,15 +919,15 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI ((Player*)player)->FailQuest(Q_ALMABTRIEB); } } - + void WaypointReached(uint32 i) { Unit* player = Unit::GetUnit((*m_creature), PlayerGUID); - + if (!player) return; - switch(i) + switch(i) { case 3: //first spawn m_creature->SummonCreature(SPAWN_FIRST, 2449.67, 2183.11, 96.85, 6.20, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); @@ -1031,7 +1031,7 @@ void AddSC_netherstorm() newscript->Name = "npc_commander_dawnforge"; newscript->GetAI = &GetAI_npc_commander_dawnforge; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "at_commander_dawnforge"; newscript->pAreaTrigger = &AreaTrigger_at_commander_dawnforge; diff --git a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp index 7ae10e4abbc..8a0342cb116 100644 --- a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp +++ b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp @@ -25,7 +25,7 @@ EndScriptData */ #define SAY_AGGRO -1249000 #define SAY_KILL -1249001 -#define SAY_PHASE_2_TRANS -1249002 +#define SAY_PHASE_2_TRANS -1249002 #define SAY_PHASE_3_TRANS -1249003 #define EMOTE_BREATH -1249004 @@ -263,7 +263,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI if(random<4){ m_creature->GetMotionMaster()->MovePoint(0, MovementLocations[random][0], MovementLocations[random][1], MovementLocations[random][2]);} } - + void SummonWhelps(uint32 Phase) { if(Phase == 2) diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp index 45e95d1c407..5c9274ca5b9 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp @@ -59,7 +59,7 @@ npc_willixAI(Creature *c) : npc_escortAI(c) {Reset();} case 3: m_creature->HandleEmoteCommand(EMOTE_STATE_POINT); DoScriptText(SAY_POINT, m_creature, player); - break; + break; case 4: m_creature->SummonCreature(ENTRY_BOAR, 2137.66, 1843.98, 48.08, 1.54, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; @@ -149,7 +149,7 @@ CreatureAI* GetAI_npc_willix(Creature *_Creature) thisAI->AddWaypoint(5, 2140.22, 1845.02, 48.32); thisAI->AddWaypoint(6, 2131.5, 1804.29, 46.85); thisAI->AddWaypoint(7, 2096.18, 1789.03, 51.13); - thisAI->AddWaypoint(8, 2074.46, 1780.09, 55.64, 3000); + thisAI->AddWaypoint(8, 2074.46, 1780.09, 55.64, 3000); thisAI->AddWaypoint(9, 2055.12, 1768.67, 58.46, 5000); thisAI->AddWaypoint(10, 2037.83, 1748.62, 60.27); thisAI->AddWaypoint(11, 2037.51, 1728.94, 60.85); @@ -161,7 +161,7 @@ CreatureAI* GetAI_npc_willix(Creature *_Creature) thisAI->AddWaypoint(17, 2123.96, 1732.56, 52.27); thisAI->AddWaypoint(18, 2153.82, 1728.73, 51.92); thisAI->AddWaypoint(19, 2163.49, 1706.33, 54.42); - thisAI->AddWaypoint(20, 2158.75, 1695.98, 55.70); + thisAI->AddWaypoint(20, 2158.75, 1695.98, 55.70); thisAI->AddWaypoint(21, 2142.6, 1680.72, 58.24); thisAI->AddWaypoint(22, 2118.31, 1671.54, 59.21); thisAI->AddWaypoint(23, 2086.02, 1672.04, 61.24); @@ -188,7 +188,7 @@ CreatureAI* GetAI_npc_willix(Creature *_Creature) thisAI->AddWaypoint(44, 1954.87, 1592.02, 82.18); thisAI->AddWaypoint(45, 1948.35, 1571.35, 80.96, 30000); thisAI->AddWaypoint(46, 1947.02, 1566.42, 81.80, 30000); - + return (CreatureAI*)thisAI; } diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp index 4460aee87e8..4d579ede2ca 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp @@ -25,13 +25,13 @@ EndScriptData */ #define SAY_SURPREME2 -1509019 #define SAY_SURPREME3 -1509020 - + #define SAY_RAND_INTRO1 -1509021 #define SAY_RAND_INTRO2 -1509022 #define SAY_RAND_INTRO3 -1509023 #define SAY_RAND_INTRO4 -1509024 //possibly old? #define SAY_AGGRO -1509025 - + #define SAY_SLAY -1509026 #define SAY_DEATH -1509027
\ No newline at end of file diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp index 55ff9978ae9..803b51582c0 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp @@ -25,20 +25,20 @@ EndScriptData */ #define SAY_ANDOROV_INTRO -1509003 #define SAY_ANDOROV_ATTACK -1509004 - + #define SAY_WAVE3 -1509005 #define SAY_WAVE4 -1509006 #define SAY_WAVE5 -1509007 #define SAY_WAVE6 -1509008 #define SAY_WAVE7 -1509009 #define SAY_INTRO -1509010 - + #define SAY_UNK1 -1509011 #define SAY_UNK2 -1509012 #define SAY_UNK3 -1509013 #define SAY_UNK4 -1509014 - + #define SAY_DEAGGRO -1509015 #define SAY_KILLS_ANDOROV -1509016 - + #define SAY_COMPLETE_QUEST -1509017 //Yell when realm complete quest 8743 for world event
\ No newline at end of file diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp index 1710717b370..d168cef3353 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Headless_Horseman SD%Complete: -SDComment: +SDComment: SDCategory: Scarlet Monastery EndScriptData */ @@ -50,8 +50,8 @@ uint32 RandomLaught[] = {11965, 11975, 11976}; //#define SPELL_CONFL_SPEED 22587 //8% increase speed, value 22587 from SPELL_CONFLAGRATION mains that spell? #define SPELL_SUMMON_PUMPKIN 42394 -#define SPELL_WHIRLWIND 43116 -#define SPELL_IMMUNE 42556 +#define SPELL_WHIRLWIND 43116 +#define SPELL_IMMUNE 42556 #define SPELL_BODY_REGEN 42403 #define SPELL_CONFUSE 43105 @@ -60,7 +60,7 @@ uint32 RandomLaught[] = {11965, 11975, 11976}; #define SPELL_HEAD_IS_DEAD 42428 //at killing head, Phase 3 #define SPELL_PUMPKIN_AURA 42280 -#define SPELL_PUMPKIN_AURA_GREEN 42294 +#define SPELL_PUMPKIN_AURA_GREEN 42294 #define SPELL_SQUASH_SOUL 42514 #define SPELL_SPROUTING 42281 #define SPELL_SPROUT_BODY 42285 @@ -69,7 +69,7 @@ uint32 RandomLaught[] = {11965, 11975, 11976}; #define SPELL_RHYME_BIG 42909 //#define SPELL_RHYME_SMALL 42910 #define SPELL_HEAD_SPEAKS 43129 -#define SPELL_HEAD_LANDS 42400 +#define SPELL_HEAD_LANDS 42400 #define SPELL_BODY_FLAME 42074 #define SPELL_HEAD_FLAME 42971 //#define SPELL_ENRAGE_VISUAL 42438 // he uses this spell? @@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI mob_wisp_invisAI(Creature *c) : ScriptedAI(c) { Creaturetype = delay = spell = spell2 = 0; - //that's hack but there are no info about range of this spells in dbc + //that's hack but there are no info about range of this spells in dbc SpellEntry *wisp = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_WISP_BLUE); if (wisp) wisp->rangeIndex = 6; //100 yards @@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI } } - void SpellHit(Unit *caster, const SpellEntry* spell) + void SpellHit(Unit *caster, const SpellEntry* spell) { if (!withbody) return; @@ -310,14 +310,14 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI body->DealDamage(body, body->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); m_creature->setDeathState(JUST_DIED); } else wait -= diff; - } + } } } }; struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI { - boss_headless_horsemanAI(Creature *c) : ScriptedAI(c) + boss_headless_horsemanAI(Creature *c) : ScriptedAI(c) { SpellEntry *confl = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_CONFLAGRATION); if(confl) @@ -415,7 +415,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI if (i != id) return; wp_reached = true; - + switch (id) { case 0: @@ -429,7 +429,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI if(pInstance) pInstance->SetData(GAMEOBJECT_PUMPKIN_SHRINE, 0); //hide gameobject break; - case 19: + case 19: m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_FLYING2);break; case 20: { Phase = 1; @@ -486,10 +486,10 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList::const_iterator i; if(PlayerList.isEmpty()) return NULL; - + std::list<Player*> temp; std::list<Player*>::iterator j; - + for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if((m_creature->IsWithinLOSInMap(i->getSource()) || !checkLoS) && m_creature->getVictim() != i->getSource() && m_creature->IsWithinDistInMap(i->getSource(), range) && i->getSource()->isAlive()) @@ -523,7 +523,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI pInstance->SetData(DATA_HORSEMAN_EVENT, DONE); } - void SpellHit(Unit *caster, const SpellEntry* spell) + void SpellHit(Unit *caster, const SpellEntry* spell) { if (withhead) return; @@ -561,7 +561,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI m_creature->RemoveAllAuras(); m_creature->SetName("Headless Horseman, Unhorsed"); - if (!headGUID) + if (!headGUID) headGUID = DoSpawnCreature(HEAD,rand()%6,rand()%6,0,0,TEMPSUMMON_DEAD_DESPAWN,0)->GetGUID(); Unit* Head = Unit::GetUnit((*m_creature), headGUID); if (Head && Head->isAlive()) @@ -611,7 +611,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI m_creature->GetMotionMaster()->Clear(false); m_creature->GetMotionMaster()->MovePoint(id,FlightPoint[id].x,FlightPoint[id].y,FlightPoint[id].z); } - } + } } break; case 1: diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp index c45f1a143cf..2bfc66f38df 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI void Aggro(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); - DoCast(m_creature,SPELL_RUSHINGCHARGE); + DoCast(m_creature,SPELL_RUSHINGCHARGE); } void KilledUnit(Unit *victim) @@ -167,7 +167,7 @@ CreatureAI* GetAI_mob_scarlet_trainee(Creature* _Creature) for(uint32 i = 0; i < 12; ++i) thisAI->AddWaypoint(i, Location[i][0], Location[i][1], Location[i][2], Wait[i][0]); - + return ((CreatureAI*)thisAI); } diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp index 0db9f283374..0a9eb167f45 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp @@ -13,7 +13,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + /* ScriptData SDName: Instance_Scarlet_Monastery SD%Complete: 50 @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance MograineGUID = 0; WhitemaneGUID = 0; DoorHighInquisitorGUID = 0; - + for(uint8 i = 0; i < ENCOUNTERS; i++) Encounter[i] = NOT_STARTED; } @@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance }break; case DATA_HORSEMAN_EVENT: if (data == DONE) - { + { for(std::set<uint64>::iterator itr = HorsemanAdds.begin(); itr != HorsemanAdds.end(); ++itr) { Creature* add = instance->GetCreatureInMap(*itr); @@ -123,14 +123,14 @@ struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance case DATA_WHITEMANE: return WhitemaneGUID; case DATA_DOOR_WHITEMANE: return DoorHighInquisitorGUID; } - return 0; + return 0; } uint32 GetData(uint32 type) { if (type == TYPE_MOGRAINE_AND_WHITE_EVENT) return Encounter[0]; - + return 0; } }; diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp index 1fe45ed3494..3a7bb39e675 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_jandicebarov SD%Complete: 100 -SDComment: +SDComment: SDCategory: Scholomance EndScriptData */ @@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI { if (Invisible && Invisible_Timer < diff) { - //Become visible again + //Become visible again m_creature->setFaction(14); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID,11073); //Jandice Model @@ -137,7 +137,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI // { // //Cast // DoCast(m_creature->getVictim(),SPELL_ILLUSION); - // + // // //3 Illusion will be summoned // if (Illusioncounter < 3) // { @@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI // Illusion_Timer = 15000; // Illusioncounter=0; // } - // + // // }else Illusion_Timer -= diff; DoMeleeAttackIfReady(); @@ -166,7 +166,7 @@ struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI void Reset() { - Cleave_Timer = 2000 + rand()%6000; + Cleave_Timer = 2000 + rand()%6000; m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } @@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_jandicebarov(Creature *_Creature) diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp index 5ae6ca9a583..ca63a3338f8 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance void HandleGameObject(uint64 guid, uint32 state) { Player *player = GetPlayerInMap(); - + if (!player || !guid) { debug_log("SD2: Instance Shadowfang Keep: HandleGameObject fail"); @@ -92,8 +92,8 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance switch(type) { case TYPE_FREE_NPC: - if(data == DONE) - HandleGameObject(DoorCourtyardGUID,0); + if(data == DONE) + HandleGameObject(DoorCourtyardGUID,0); Encounter[0] = data; break; case TYPE_RETHILGORE: @@ -101,12 +101,12 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance break; case TYPE_FENRUS: if(data == DONE) - HandleGameObject(DoorSorcererGUID,0); + HandleGameObject(DoorSorcererGUID,0); Encounter[2] = data; break; case TYPE_NANDOS: - if(data == DONE) - HandleGameObject(DoorArugalGUID,0); + if(data == DONE) + HandleGameObject(DoorArugalGUID,0); Encounter[3] = data; break; } @@ -117,9 +117,9 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance std::ostringstream saveStream; saveStream << Encounter[0] << " " << Encounter[1] << " " << Encounter[2] << " " << Encounter[3]; - + str_data = saveStream.str(); - + SaveToDB(); OUT_SAVE_INST_DATA_COMPLETE; } @@ -145,7 +145,7 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance { return str_data.c_str(); } - + void Load(const char* in) { if (!in) @@ -153,16 +153,16 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance OUT_LOAD_INST_DATA_FAIL; return; } - + OUT_LOAD_INST_DATA(in); - + std::istringstream loadStream(in); loadStream >> Encounter[0] >> Encounter[1] >> Encounter[2] >> Encounter[3]; - + for(uint8 i = 0; i < ENCOUNTERS; ++i) if (Encounter[i] == IN_PROGRESS) Encounter[i] = NOT_STARTED; - + OUT_LOAD_INST_DATA_COMPLETE; } }; diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp index 471efff8c95..4fa7baa2561 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp @@ -84,7 +84,7 @@ CreatureAI* GetAI_npc_shadowfang_prisoner(Creature *_Creature) bool GossipHello_npc_shadowfang_prisoner(Player *player, Creature *_Creature) { ScriptedInstance* pInstance = ((ScriptedInstance*)_Creature->GetInstanceData()); - + if (!pInstance) return false; diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp index 00722dd82ec..f8e0a5ec6ee 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Doomwalker SD%Complete: 100 -SDComment: +SDComment: SDCategory: Shadowmoon Valley EndScriptData */ diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index bf7e610c237..8db7477ea1e 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -33,7 +33,7 @@ npc_oronok_tornheart npc_overlord_morghor npc_earthmender_wilda mob_torloth_the_magnificent -mob_illidari_spawn +mob_illidari_spawn npc_lord_illidan_stormrage go_crystal_prison npc_enraged_spirit @@ -698,14 +698,14 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI void StartEvent() { m_creature->SetUInt32Value(UNIT_NPC_FLAGS, 0); - m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); + m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); Unit* Illidan = m_creature->SummonCreature(C_ILLIDAN, -5107.83, 602.584, 85.2393, 4.92598, TEMPSUMMON_CORPSE_DESPAWN, 0); IllidanGUID = Illidan->GetGUID(); Illidan->SetVisibility(VISIBILITY_OFF); if(PlayerGUID) { Unit* player = Unit::GetUnit((*m_creature), PlayerGUID); - DoScriptText(OVERLORD_SAY_1, m_creature, player); + DoScriptText(OVERLORD_SAY_1, m_creature, player); } ConversationTimer = 4200; Step = 0; @@ -714,15 +714,15 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI uint32 NextStep(uint32 Step) { - Unit* plr = Unit::GetUnit((*m_creature), PlayerGUID); + Unit* plr = Unit::GetUnit((*m_creature), PlayerGUID); Unit* Illi = Unit::GetUnit((*m_creature), IllidanGUID); switch(Step) { case 0: return 0; break; - case 1: m_creature->GetMotionMaster()->MovePoint(0, -5104.41, 595.297, 85.6838); return 9000; break; - case 2: DoScriptText(OVERLORD_YELL_1, m_creature, plr); return 4500; break; + case 1: m_creature->GetMotionMaster()->MovePoint(0, -5104.41, 595.297, 85.6838); return 9000; break; + case 2: DoScriptText(OVERLORD_YELL_1, m_creature, plr); return 4500; break; case 3: m_creature->SetInFront(plr); return 3200; break; case 4: DoScriptText(OVERLORD_SAY_2, m_creature, plr); return 2000; break; case 5: Illi->SetVisibility(VISIBILITY_ON); @@ -731,17 +731,17 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI Illi->CastSpell(Illi, SPELL_ONE, true); Illi->SetUInt64Value(UNIT_FIELD_TARGET, m_creature->GetGUID()); m_creature->SetUInt64Value(UNIT_FIELD_TARGET, IllidanGUID); - return 2000; break; - case 7: DoScriptText(OVERLORD_YELL_2, m_creature); return 4500; break; - case 8: m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); return 2500; break; - case 9: DoScriptText(OVERLORD_SAY_3, m_creature); return 6500; break; - case 10: DoScriptText(LORD_ILLIDAN_SAY_1, Illi); return 5000; break; + return 2000; break; + case 7: DoScriptText(OVERLORD_YELL_2, m_creature); return 4500; break; + case 8: m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); return 2500; break; + case 9: DoScriptText(OVERLORD_SAY_3, m_creature); return 6500; break; + case 10: DoScriptText(LORD_ILLIDAN_SAY_1, Illi); return 5000; break; case 11: DoScriptText(OVERLORD_SAY_4, m_creature, plr); return 6000; break; - case 12: DoScriptText(LORD_ILLIDAN_SAY_2, Illi); return 5500; break; - case 13: DoScriptText(LORD_ILLIDAN_SAY_3, Illi); return 4000; break; - case 14: Illi->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID); return 1500; break; - case 15: DoScriptText(LORD_ILLIDAN_SAY_4, Illi); return 1500; break; - case 16: + case 12: DoScriptText(LORD_ILLIDAN_SAY_2, Illi); return 5500; break; + case 13: DoScriptText(LORD_ILLIDAN_SAY_3, Illi); return 4000; break; + case 14: Illi->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID); return 1500; break; + case 15: DoScriptText(LORD_ILLIDAN_SAY_4, Illi); return 1500; break; + case 16: if (plr) { Illi->CastSpell(plr, SPELL_TWO, true); @@ -750,38 +750,38 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI return 5000; }else{ ((Player*)plr)->FailQuest(QUEST_LORD_ILLIDAN_STORMRAGE); Step = 30; return 100; - }break; - case 17: DoScriptText(LORD_ILLIDAN_SAY_5, Illi); return 5000; break; - case 18: DoScriptText(LORD_ILLIDAN_SAY_6, Illi); return 5000; break; - case 19: DoScriptText(LORD_ILLIDAN_SAY_7, Illi); return 5000; break; - case 20: + }break; + case 17: DoScriptText(LORD_ILLIDAN_SAY_5, Illi); return 5000; break; + case 18: DoScriptText(LORD_ILLIDAN_SAY_6, Illi); return 5000; break; + case 19: DoScriptText(LORD_ILLIDAN_SAY_7, Illi); return 5000; break; + case 20: Illi->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Illi->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT + MOVEMENTFLAG_LEVITATING); - return 500; break; - case 21: DoScriptText(OVERLORD_SAY_5, m_creature); return 500; break; - case 22: + return 500; break; + case 21: DoScriptText(OVERLORD_SAY_5, m_creature); return 500; break; + case 22: Illi->SetVisibility(VISIBILITY_OFF); - Illi->setDeathState(JUST_DIED); - return 1000; break; - case 23: m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); return 2000; break; + Illi->setDeathState(JUST_DIED); + return 1000; break; + case 23: m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); return 2000; break; case 24: m_creature->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID); return 5000; break; - case 25: DoScriptText(OVERLORD_SAY_6, m_creature); return 2000; break; - case 26: + case 25: DoScriptText(OVERLORD_SAY_6, m_creature); return 2000; break; + case 26: if(plr) - ((Player*)plr)->GroupEventHappens(QUEST_LORD_ILLIDAN_STORMRAGE, m_creature); - return 6000; break; + ((Player*)plr)->GroupEventHappens(QUEST_LORD_ILLIDAN_STORMRAGE, m_creature); + return 6000; break; case 27: { Unit* Yarzill = FindCreature(C_YARZILL, 50, m_creature); if (Yarzill) Yarzill->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID); - return 500; }break; + return 500; }break; case 28: plr->RemoveAurasDueToSpell(SPELL_TWO); plr->RemoveAurasDueToSpell(41519); plr->CastSpell(plr, SPELL_THREE, true); plr->CastSpell(plr, SPELL_FOUR, true); - return 1000; break; + return 1000; break; case 29: { Unit* Yarzill = FindCreature(C_YARZILL, 50, m_creature); @@ -798,9 +798,9 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI { Unit* Yarzill = FindCreature(C_YARZILL, 50, m_creature); if (Yarzill) - Yarzill->CastSpell(plr, 41540, true); + Yarzill->CastSpell(plr, 41540, true); return 1000;}break; - case 32: m_creature->GetMotionMaster()->MovePoint(0, -5085.77, 577.231, 86.6719); return 5000; break; + case 32: m_creature->GetMotionMaster()->MovePoint(0, -5085.77, 577.231, 86.6719); return 5000; break; case 33: Reset(); return 100; break; default : return 9999999; @@ -829,7 +829,7 @@ bool QuestAccept_npc_overlord_morghor(Player *player, Creature *_Creature, const if(_Quest->GetQuestId() == QUEST_LORD_ILLIDAN_STORMRAGE) { ((npc_overlord_morghorAI*)_Creature->AI())->PlayerGUID = player->GetGUID(); - ((npc_overlord_morghorAI*)_Creature->AI())->StartEvent(); + ((npc_overlord_morghorAI*)_Creature->AI())->StartEvent(); return true; } return false; @@ -891,7 +891,7 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI break; case 14: SummonAssassin(); break; case 15: DoScriptText(SAY_PROGRESS3, m_creature, player); break; - case 19: + case 19: switch(rand()%3) { case 0: DoScriptText(SAY_PROGRESS2, m_creature, player); break; @@ -937,7 +937,7 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI } break; case 44: SummonAssassin(); break; - case 50: + case 50: DoScriptText(SAY_END, m_creature, player); ((Player*)player)->GroupEventHappens(QUEST_ESCAPE_FROM_COILSKAR_CISTERN, m_creature); Completed = true; @@ -972,7 +972,7 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) { npc_escortAI::UpdateAI(diff); } @@ -1079,7 +1079,7 @@ static TorlothCinematic TorlothAnim[]= {-1000368, 1, 7000}, {-1000369, 0, 3000}, {NULL, 0, 2000}, // Torloth stand - {-1000370, 0, 1000}, + {-1000370, 0, 1000}, {NULL, 0, 3000}, {NULL, 0, NULL} }; @@ -1091,7 +1091,7 @@ struct Location //Cordinates for Spawns static Location SpawnLocation[]= -{ +{ //Cords used for: {-4615.8556, 1342.2532, 139.9, 1.612},//Illidari Soldier {-4598.9365, 1377.3182, 139.9, 3.917},//Illidari Soldier @@ -1155,7 +1155,7 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI uint64 LordIllidanGUID; uint32 SpellTimer1, SpellTimer2, SpellTimer3; bool Timers; - + void Reset() { LordIllidanGUID = 0; @@ -1164,16 +1164,16 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI void Aggro(Unit* who) {} void JustDied(Unit* slayer); - + void UpdateAI(const uint32 diff) - { + { if(!UpdateVictim()) return; if(!Timers) { if(m_creature->GetEntry() == 22075)//Illidari Soldier - { + { SpellTimer1 = SpawnCast[0].Timer1 + (rand()%4 * 1000); } if(m_creature->GetEntry() == 22074)//Illidari Mind Breaker @@ -1202,7 +1202,7 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI if(m_creature->GetEntry() == 22074) { if(SpellTimer1 < diff) - { + { if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) { if(target->GetTypeId() == TYPEID_PLAYER) @@ -1210,7 +1210,7 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI DoCast(target, SpawnCast[1].SpellId); //Focused Bursts SpellTimer1 = SpawnCast[1].Timer2 + (rand()%5 * 1000); }else SpellTimer1 = 2000; - } + } }else SpellTimer1 -= diff; if(SpellTimer2 < diff) @@ -1261,7 +1261,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI uint64 AggroTargetGUID; bool Timers; - + void Reset() { AnimationTimer = 4000; @@ -1269,18 +1269,18 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI LordIllidanGUID = 0; AggroTargetGUID = 0; Timers = false; - + m_creature->addUnitState(UNIT_STAT_ROOT); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->SetUInt64Value(UNIT_FIELD_TARGET, 0); } void Aggro(Unit* who){} - + void HandleAnimation() { Creature* pCreature = m_creature; - + if(TorlothAnim[AnimationCount].Creature == 1) { pCreature = ((Creature*)Unit::GetUnit(*m_creature, LordIllidanGUID)); @@ -1298,7 +1298,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI { case 0: m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1,8); - break; + break; case 3: m_creature->RemoveFlag(UNIT_FIELD_BYTES_1,8); break; @@ -1346,7 +1346,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI SpellTimer3 = SpawnCast[8].Timer1; Timers = true; } - + if(Timers) { if(SpellTimer1 < diff) @@ -1401,7 +1401,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI { npc_lord_illidan_stormrageAI(Creature* c) : ScriptedAI(c) {Reset();} - + uint64 PlayerGUID; uint32 WaveTimer; @@ -1409,11 +1409,11 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI int8 LiveCount; uint8 WaveCount; - + bool EventStarted; bool Announced; bool Failed; - + void Reset() { PlayerGUID = 0; @@ -1422,7 +1422,7 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI AnnounceTimer = 7000; LiveCount = 0; WaveCount = 0; - + EventStarted = false; Announced = false; Failed = false; @@ -1451,7 +1451,7 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI float O = SpawnLocation[locIndex + i].o; Spawn = m_creature->SummonCreature(WavesInfo[WaveCount].CreatureId, X, Y, Z, O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); ++LiveCount; - + if(Spawn) { Spawn->LoadCreaturesAddon(); @@ -1476,7 +1476,7 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI } if(WaveCount < 3)//1-3 Wave - { + { if(PlayerGUID) { if(Player* pTarget = ((Player*)Unit::GetUnit((*m_creature), PlayerGUID))) @@ -1512,7 +1512,7 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI if(Group *EventGroup = pPlayer->GetGroup()) { Player* GroupMember; - + uint8 GroupMemberCount = 0; uint8 DeadMemberCount = 0; uint8 FailedMemberCount = 0; @@ -1573,9 +1573,9 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI { if(!PlayerGUID || !EventStarted) return; - + if(!LiveCount && WaveCount < 4) - { + { if(!Announced && AnnounceTimer < diff) { DoScriptText(WavesInfo[WaveCount].WaveTextId, m_creature); @@ -1611,7 +1611,7 @@ bool GOQuestAccept_GO_crystal_prison(Player* plr, GameObject* go, Quest const* q if(quest->GetQuestId() == QUEST_BATTLE_OF_THE_CRIMSON_WATCH ) { Unit* Illidan = FindCreature(22083, 50, plr); - + if(Illidan && !(((npc_lord_illidan_stormrageAI*)((Creature*)Illidan)->AI())->EventStarted)) { ((npc_lord_illidan_stormrageAI*)((Creature*)Illidan)->AI())->PlayerGUID = plr->GetGUID(); @@ -1728,10 +1728,10 @@ struct TRINITY_DLL_DECL npc_enraged_spiritAI : public ScriptedAI Summoned = DoSpawnCreature(entry, 0, 0, 1, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); // FIND TOTEM, PROCESS QUEST - if (Summoned) + if (Summoned) { totemOspirits = FindCreature(ENTRY_TOTEM_OF_SPIRITS, RADIUS_TOTEM_OF_SPIRITS, m_creature); - if (totemOspirits) + if (totemOspirits) { Summoned->setFaction(ENRAGED_SOUL_FRIENDLY); Summoned->GetMotionMaster()->MovePoint(0,totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ()); @@ -1823,7 +1823,7 @@ void AddSC_shadowmoon_valley() newscript = new Script; newscript->Name = "npc_lord_illidan_stormrage"; - newscript->GetAI = &GetAI_npc_lord_illidan_stormrage; + newscript->GetAI = &GetAI_npc_lord_illidan_stormrage; newscript->RegisterSelf(); newscript = new Script; @@ -1832,7 +1832,7 @@ void AddSC_shadowmoon_valley() newscript->RegisterSelf(); newscript = new Script; - newscript->Name = "mob_illidari_spawn"; + newscript->Name = "mob_illidari_spawn"; newscript->GetAI = &GetAI_mob_illidari_spawn; newscript->RegisterSelf(); diff --git a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp index eeccfa9ce81..4c560066b85 100644 --- a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp @@ -281,7 +281,7 @@ public: void WaypointReached(uint32 i) { Unit *pTemp = Unit::GetUnit(*m_creature,PlayerGUID); - + if( !pTemp ) return; @@ -408,7 +408,7 @@ CreatureAI* GetAI_npc_kservantAI(Creature *_Creature) kservantAI->AddWaypoint(54, -1850.060669, 5472.610840, 0.857320, 9000); kservantAI->AddWaypoint(55, -1850.060669, 5472.610840, 0.857320, 9000); kservantAI->AddWaypoint(56, -1850.060669, 5472.610840, 0.857320, 4000); - + return (CreatureAI*)kservantAI; } @@ -630,12 +630,12 @@ bool GossipHello_npc_khadgar(Player *player, Creature *creature) { if (creature->isQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - + if(!player->hasQuest(10211)) player->ADD_GOSSIP_ITEM(0, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(9243, creature->GetGUID()); - + return true; } diff --git a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp index 6b6f2a45870..443a9a709c7 100644 --- a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp +++ b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp @@ -31,7 +31,7 @@ EndContentData */ /*### ## npc_highlord_demitrian ###*/ - + #define GOSSIP_DEMITRIAN1 "What do you know of it?" #define GOSSIP_DEMITRIAN2 "I am listening , Demitrian." #define GOSSIP_DEMITRIAN3 "Continue, please." @@ -39,20 +39,20 @@ EndContentData */ #define GOSSIP_DEMITRIAN5 "<Nod>" #define GOSSIP_DEMITRIAN6 "Caught unaware? How?" #define GOSSIP_DEMITRIAN7 "So what did Ragnaros do next?" - + bool GossipHello_npc_highlord_demitrian(Player *player, Creature *_Creature) { if (_Creature->isQuestGiver()) player->PrepareQuestMenu(_Creature->GetGUID()); - + if (player->GetQuestStatus(7785) == QUEST_STATUS_NONE && (player->HasItemCount(18563,1,false) || player->HasItemCount(18564,1,false))) player->ADD_GOSSIP_ITEM(0, GOSSIP_DEMITRIAN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - + player->SEND_GOSSIP_MENU(6812, _Creature->GetGUID()); - return true; + return true; } - + bool GossipSelect_npc_highlord_demitrian(Player *player, Creature *_Creature, uint32 sender, uint32 action) { switch (action) diff --git a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp index 3981c63d092..05890cd67aa 100644 --- a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp +++ b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp @@ -124,15 +124,15 @@ struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI switch(i) { case 1: DoScriptText(SAY_START, m_creature, player);break; - case 13: + case 13: DoScriptText(SAY_LAST, m_creature, player); if(player) ((Player*)player)->GroupEventHappens(QUEST_ESCORTING, m_creature);break; case 14: DoScriptText(SAY_THANKS, m_creature, player);break; - case 15: { + case 15: { Unit* Rane = FindCreature(NPC_RANE, 20, m_creature); if(Rane) - DoScriptText(SAY_RANE, Rane); + DoScriptText(SAY_RANE, Rane); break;} case 16: DoScriptText(SAY_ANSWER, m_creature);break; case 17: DoScriptText(SAY_MOVE_QUINN, m_creature); break; @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI DoScriptText(SAY_QUINN, Quinn); break;} case 26: DoScriptText(SAY_ON_BYE, m_creature, NULL);break; - + } } @@ -171,7 +171,7 @@ bool QuestAccept_npc_deathstalker_erland(Player* player, Creature* creature, Que DoScriptText(SAY_QUESTACCEPT, creature, player); ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID()); } - + return true; } @@ -193,10 +193,10 @@ CreatureAI* GetAI_npc_deathstalker_erlandAI(Creature *_Creature) deathstalker_erlandAI->AddWaypoint(11, 1294.84, 1137.25, 51.75); deathstalker_erlandAI->AddWaypoint(12, 1292.89, 1158.99, 52.65); deathstalker_erlandAI->AddWaypoint(13, 1290.75, 1168.67, 52.56, 1000); //complete quest and say last - deathstalker_erlandAI->AddWaypoint(14, 1287.12, 1203.49, 52.66, 5000); - deathstalker_erlandAI->AddWaypoint(15, 1287.12, 1203.49, 52.66, 4000); - deathstalker_erlandAI->AddWaypoint(16, 1287.12, 1203.49, 52.66, 5000); - deathstalker_erlandAI->AddWaypoint(17, 1287.12, 1203.49, 52.66, 4000); + deathstalker_erlandAI->AddWaypoint(14, 1287.12, 1203.49, 52.66, 5000); + deathstalker_erlandAI->AddWaypoint(15, 1287.12, 1203.49, 52.66, 4000); + deathstalker_erlandAI->AddWaypoint(16, 1287.12, 1203.49, 52.66, 5000); + deathstalker_erlandAI->AddWaypoint(17, 1287.12, 1203.49, 52.66, 4000); deathstalker_erlandAI->AddWaypoint(18, 1290.72, 1207.44, 52.69); deathstalker_erlandAI->AddWaypoint(19, 1297.50, 1207.18, 53.74); deathstalker_erlandAI->AddWaypoint(20, 1301.32, 1220.90, 53.74); diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp index ca2cece45f1..48eb910dd4b 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp @@ -67,7 +67,7 @@ EndScriptData */ #define SPELL_UNHOLY_AURA 17467 #define SPELL_RAISEDEAD 17473 //triggers death pact (17471) - + #define SPELL_RAISE_DEAD1 17475 #define SPELL_RAISE_DEAD2 17476 #define SPELL_RAISE_DEAD3 17477 @@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); Reset(); } - + ScriptedInstance* pInstance; uint32 ShadowBolt_Timer; @@ -127,9 +127,9 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI //ShadowBolt if (ShadowBolt_Timer < diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(m_creature->getVictim(),SPELL_SHADOWBOLT); - + ShadowBolt_Timer = 10000; }else ShadowBolt_Timer -= diff; diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp index e875db75fda..438d7f6501b 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp @@ -36,7 +36,7 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); Reset(); } - + ScriptedInstance* pInstance; uint32 BansheeWail_Timer; @@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI if (BansheeWail_Timer < diff) { if (rand()%100 < 95) - DoCast(m_creature->getVictim(),SPELL_BANSHEEWAIL); + DoCast(m_creature->getVictim(),SPELL_BANSHEEWAIL); //4 seconds until we should cast this again BansheeWail_Timer = 4000; }else BansheeWail_Timer -= diff; @@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_baroness_anastari(Creature *_Creature) { return new boss_baroness_anastariAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp index c2de7bcd965..cdf22d1e166 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: boss_cannon_master_willey SD%Complete: 100 -SDComment: +SDComment: SDCategory: Stratholme EndScriptData */ @@ -197,14 +197,14 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI m_creature->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000); m_creature->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000); break; - } + } //30 seconds until we should cast this again SummonRifleman_Timer = 30000; }else SummonRifleman_Timer -= diff; DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_cannon_master_willey(Creature *_Creature) { return new boss_cannon_master_willeyAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp index aebd8564816..8fa6d385986 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp @@ -26,7 +26,7 @@ EndScriptData */ //Dathrohan spells #define SPELL_CRUSADERSHAMMER 17286 //AOE stun #define SPELL_CRUSADERSTRIKE 17281 -#define SPELL_MINDBLAST 17287 +#define SPELL_MINDBLAST 17287 #define SPELL_HOLYSTRIKE 17284 //weapon dmg +3 #define SPELL_DAZED 1604 @@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID,10545); m_creature->SetFloatValue(OBJECT_FIELD_SCALE_X, 1.00f); - + } void JustDied(Unit* Victim) @@ -295,12 +295,12 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI // MindControl_Timer = 15000; // }else MindControl_Timer -= diff; - //END ELSE TRANSFORMED + //END ELSE TRANSFORMED } DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_dathrohan_balnazzar(Creature *_Creature) { return new boss_dathrohan_balnazzarAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp index a7e96f2fee5..89f1cafcaaa 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Magistrate_Barthilas SD%Complete: 70 -SDComment: +SDComment: SDCategory: Stratholme EndScriptData */ @@ -28,7 +28,7 @@ EndScriptData */ #define SPELL_CROWDPUMMEL 10887 #define SPELL_MIGHTYBLOW 14099 #define SPELL_FURIOUS_ANGER 16791 - + #define MODEL_NORMAL 10433 #define MODEL_HUMAN 3637 @@ -61,11 +61,11 @@ struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI else m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, MODEL_HUMAN); } - + void MoveInLineOfSight(Unit *who) { //nothing to see here yet - + ScriptedAI::MoveInLineOfSight(who); } @@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI FuriousAnger_Timer = 4000; if (AngerCount > 25) return; - + ++AngerCount; m_creature->CastSpell(m_creature,SPELL_FURIOUS_ANGER,false); }else FuriousAnger_Timer -= diff; @@ -110,14 +110,14 @@ struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI //MightyBlow if (MightyBlow_Timer < diff) - { + { DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW); MightyBlow_Timer = 20000; }else MightyBlow_Timer -= diff; DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_magistrate_barthilas(Creature *_Creature) { return new boss_magistrate_barthilasAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp index 3383c0c5720..f980df57c5e 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: boss_maleki_the_pallid SD%Complete: 100 -SDComment: +SDComment: SDCategory: Stratholme EndScriptData */ @@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL boss_maleki_the_pallidAI : public ScriptedAI DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_maleki_the_pallid(Creature *_Creature) { return new boss_maleki_the_pallidAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp index c3de6d074be..57fa122e6c0 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Nerubenkan SD%Complete: 70 -SDComment: +SDComment: SDCategory: Stratholme EndScriptData */ @@ -36,7 +36,7 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); Reset(); } - + ScriptedInstance* pInstance; uint32 EncasingWebs_Timer; @@ -95,16 +95,16 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI //EncasingWebs if (EncasingWebs_Timer < diff) { - + DoCast(m_creature->getVictim(),SPELL_ENCASINGWEBS); - + EncasingWebs_Timer = 30000; }else EncasingWebs_Timer -= diff; //PierceArmor if (PierceArmor_Timer < diff) { - if (rand()%100 < 75) + if (rand()%100 < 75) DoCast(m_creature->getVictim(),SPELL_PIERCEARMOR); PierceArmor_Timer = 35000; @@ -112,21 +112,21 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI //CryptScarabs_Timer if (CryptScarabs_Timer < diff) - { - DoCast(m_creature->getVictim(),SPELL_CRYPT_SCARABS); + { + DoCast(m_creature->getVictim(),SPELL_CRYPT_SCARABS); CryptScarabs_Timer = 20000; }else CryptScarabs_Timer -= diff; //RaiseUndeadScarab if (RaiseUndeadScarab_Timer < diff) - { - RaiseUndeadScarab(m_creature->getVictim()); + { + RaiseUndeadScarab(m_creature->getVictim()); RaiseUndeadScarab_Timer = 16000; }else RaiseUndeadScarab_Timer -= diff; DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_nerubenkan(Creature *_Creature) { return new boss_nerubenkanAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp index 99f8bef9daa..608f999b177 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp @@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI } void JustDied(Unit* Killer) - { + { if(pInstance) { switch(m_creature->GetEntry()) @@ -147,7 +147,7 @@ CreatureAI* GetAI_boss_silver_hand_bossesAI(Creature *_Creature) } /*##### -# +# #####*/ void AddSC_boss_order_of_silver_hand() diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp index e506ff151cc..a5e7fa24957 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: boss_postmaster_malown SD%Complete: 50 -SDComment: +SDComment: SDCategory: Stratholme EndScriptData */ @@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_postmaster_malown(Creature *_Creature) { return new boss_postmaster_malownAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp index 7d98fcda5f4..2f2186f5749 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Ramstein_The_Gorger SD%Complete: 70 -SDComment: +SDComment: SDCategory: Stratholme EndScriptData */ @@ -36,7 +36,7 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI pInstance = (ScriptedInstance*)m_creature->GetInstanceData(); Reset(); } - + ScriptedInstance* pInstance; uint32 Trample_Timer; @@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_ramstein_the_gorger(Creature *_Creature) { return new boss_ramstein_the_gorgerAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp index 28a7028a348..ac3c4c5f666 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: boss_timmy_the_cruel SD%Complete: 100 -SDComment: +SDComment: SDCategory: Stratholme EndScriptData */ @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_timmy_the_cruelAI : public ScriptedAI DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_timmy_the_cruel(Creature *_Creature) { return new boss_timmy_the_cruelAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h b/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h index 810ffdf39b7..e5ab77383d7 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h +++ b/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h @@ -14,7 +14,7 @@ #define DATA_BARON 10 #define DATA_YSIDA_TRIGGER 11 - + #define TYPE_SH_QUEST 20 #define TYPE_SH_CATHELA 21 #define TYPE_SH_GREGOR 22 diff --git a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp index e0efc474f3d..fbabfa7b3f8 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp @@ -38,13 +38,13 @@ EndScriptData */ #define C_CRYSTAL 10415 //three ziggurat crystals #define C_BARON 10440 #define C_YSIDA_TRIGGER 16100 - + #define C_RAMSTEIN 10439 #define C_ABOM_BILE 10416 #define C_ABOM_VENOM 10417 #define C_BLACK_GUARD 10394 #define C_YSIDA 16031 - + #define ENCOUNTERS 6 struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance uint32 BaronRun_Timer; uint32 SlaugtherSquare_Timer; - + uint64 serviceEntranceGUID; uint64 gauntletGate1GUID; uint64 ziggurat1GUID; @@ -68,12 +68,12 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance uint64 portGauntletGUID; uint64 portSlaugtherGUID; uint64 portElderGUID; - + uint64 baronGUID; uint64 ysidaTriggerGUID; std::set<uint64> crystalsGUID; std::set<uint64> abomnationGUID; - + void Initialize() { for(uint8 i = 0; i < ENCOUNTERS; i++) @@ -81,10 +81,10 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance for(uint8 i = 0; i < 5; i++) IsSilverHandDead[5] = false; - + BaronRun_Timer = 0; SlaugtherSquare_Timer = 0; - + serviceEntranceGUID = 0; gauntletGate1GUID = 0; ziggurat1GUID = 0; @@ -95,13 +95,13 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance portGauntletGUID = 0; portSlaugtherGUID = 0; portElderGUID = 0; - + baronGUID = 0; ysidaTriggerGUID = 0; crystalsGUID.clear(); abomnationGUID.clear(); } - + Player* GetPlayerInMap() { Map::PlayerList const& players = instance->GetPlayers(); @@ -114,11 +114,11 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance return plr; } } - + debug_log("SD2: Instance Stratholme: GetPlayerInMap, but PlayerList is empty!"); return NULL; } - + bool StartSlaugtherSquare() { //change to DONE when crystals implemented @@ -128,11 +128,11 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance UpdateGoState(portSlaugtherGUID,0,false); return true; } - + debug_log("SD2: Instance Stratholme: Cannot open slaugther square yet."); return false; } - + //if withRestoreTime true, then newState will be ignored and GO should be restored to original state after 10 seconds void UpdateGoState(uint64 goGuid, uint32 newState, bool withRestoreTime) { @@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance if (!player || !goGuid) return; - + if (GameObject *go = GameObject::GetGameObject(*player, goGuid)) { if (withRestoreTime) @@ -161,7 +161,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance case C_ABOM_VENOM: abomnationGUID.insert(creature->GetGUID()); break; } } - + void OnObjectCreate(GameObject *go) { switch(go->GetEntry()) @@ -293,7 +293,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance } } Encounter[5] = data; - break; + break; case TYPE_SH_AELMAR: IsSilverHandDead[0] = (data) ? true : false; break; @@ -335,7 +335,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance } return 0; } - + uint64 GetData64(uint32 data) { switch(data) @@ -347,7 +347,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance } return 0; } - + void Update(uint32 diff) { if (BaronRun_Timer) @@ -369,7 +369,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance { for(uint8 i = 0; i < 4; i++) p->SummonCreature(C_BLACK_GUARD,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); - + UpdateGoState(ziggurat4GUID,0,false); UpdateGoState(ziggurat5GUID,0,false); debug_log("SD2: Instance Stratholme: Black guard sentries spawned. Opening gates to baron."); diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp index 16597e23f2d..9ab4009a8e7 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp @@ -34,7 +34,7 @@ EndScriptData */ #define YELL_MADR_ICE_BLOCK -1580033 #define YELL_MADR_TRAP -1580034 #define YELL_MADR_DEATH -1580035 - + #define YELL_AGGRO -1580022 #define YELL_KILL1 -1580023 #define YELL_KILL2 -1580024 @@ -44,7 +44,7 @@ EndScriptData */ #define YELL_LOVE3 -1580028 #define YELL_BERSERK -1580029 #define YELL_DEATH -1580030 - + #define SPELL_METEOR_SLASH 45150 #define SPELL_BURN 45141 #define SPELL_STOMP 45185 @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI case 1: DoScriptText(YELL_LOVE2, m_creature); break; case 2: DoScriptText(YELL_LOVE3, m_creature); break; } - + Unit *Target = m_creature->getVictim(); DoCast(Target,SPELL_STOMP); if(Target->HasAura(45151,0)) Target->RemoveAura(45151,0); diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp index 73752fe04f3..a00f1ab1c2e 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp @@ -76,7 +76,7 @@ EndScriptData */ #define SPELL_BLAZE 45235//on main target every 3 secs #define SPELL_FLAME_SEAR 46771 #define SPELL_BLAZE_SUMMON 45236 //187366 GO -#define SPELL_BLAZE_BURN 45246 +#define SPELL_BLAZE_BURN 45246 #define YELL_CANFLAGRATION "Fire to the aid of shadow!" //only if Sacrolash is not dead #define SOUND_CANFLAGRATION 12489 @@ -113,8 +113,8 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI uint32 enrage_timer; - - void Reset() + + void Reset() { InCombat = false; if(pInstance) @@ -139,7 +139,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI shadowblades_timer = 10000; shadownova_timer = 30000; confoundingblow_timer = 25000; - shadowimage_timer = 20000; + shadowimage_timer = 20000; conflagration_timer = 30000; sisterdeath = false; @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI } } - void Aggro(Unit *who) + void Aggro(Unit *who) { DoZoneInCombat(); if(pInstance) @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI DoPlaySoundToSet(m_creature,SOUND_SAC_KILL_1); DoYell(YELL_SAC_KILL_1 ,LANG_UNIVERSAL,NULL); break; - case 1: + case 1: DoPlaySoundToSet(m_creature,SOUND_SAC_KILL_2); DoYell(YELL_SAC_KILL_2 ,LANG_UNIVERSAL,NULL); break; @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI } else { - m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); + m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } } @@ -194,12 +194,12 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI switch(spell->Id) { case SPELL_SHADOW_BLADES: - case SPELL_SHADOW_NOVA: - case SPELL_CONFOUNDING_BLOW: + case SPELL_SHADOW_NOVA: + case SPELL_CONFOUNDING_BLOW: case SPELL_SHADOW_FURY: HandleTouchedSpells(target, SPELL_DARK_TOUCHED); break; - case SPELL_CONFLAGRATION: + case SPELL_CONFLAGRATION: HandleTouchedSpells(target, SPELL_FLAME_TOUCHED); break; } @@ -238,20 +238,20 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) { if(!sisterdeath) { if (pInstance) { - Unit* Temp = NULL; + Unit* Temp = NULL; Temp = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_ALYTHESS)); if (Temp && Temp->isDead()) { DoYell(YELL_SISTER_ALYTHESS_DEAD ,LANG_UNIVERSAL,NULL); DoPlaySoundToSet(m_creature,SOUND_SISTER_ALYTHESS_DEAD); sisterdeath = true; - + m_creature->InterruptSpell(CURRENT_GENERIC_SPELL); DoCast(m_creature,SPELL_EMPOWER); } @@ -298,7 +298,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI } if(confoundingblow_timer < diff) - { + { if (!m_creature->IsNonMeleeSpellCasted(false)) { Unit* target = NULL; @@ -319,7 +319,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI temp->AI()->AttackStart(target); } shadowimage_timer = 20000; - }else shadowimage_timer -=diff; + }else shadowimage_timer -=diff; if(shadowblades_timer < diff) { @@ -340,7 +340,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI }else enrage_timer -= diff; if( m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false)) - { + { //If we are within range melee the target if( m_creature->IsWithinMeleeRange(m_creature->getVictim())) { @@ -381,7 +381,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI uint32 enrage_timer; - void Reset() + void Reset() { InCombat = false; if(pInstance) @@ -413,7 +413,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI IntroYell_Timer = 10000; } } - void Aggro(Unit *who) + void Aggro(Unit *who) { DoZoneInCombat(); if(pInstance) @@ -467,7 +467,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI DoPlaySoundToSet(m_creature,SOUND_ALY_KILL_1); DoYell(YELL_ALY_KILL_1 ,LANG_UNIVERSAL,NULL); break; - case 1: + case 1: DoPlaySoundToSet(m_creature,SOUND_ALY_KILL_2); DoYell(YELL_ALY_KILL_2 ,LANG_UNIVERSAL,NULL); break; @@ -493,13 +493,13 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI switch(spell->Id) { - case SPELL_BLAZE: + case SPELL_BLAZE: target->CastSpell(target,SPELL_BLAZE_SUMMON,true); case SPELL_CONFLAGRATION: - case SPELL_FLAME_SEAR: + case SPELL_FLAME_SEAR: HandleTouchedSpells(target, SPELL_FLAME_TOUCHED); break; - case SPELL_SHADOW_NOVA: + case SPELL_SHADOW_NOVA: HandleTouchedSpells(target, SPELL_DARK_TOUCHED); break; } @@ -546,37 +546,37 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI case 0: DoPlaySoundToSet(m_creature,SOUND_INTRO); return 0; case 1: if(Sacrolash) - Sacrolash->Yell(YELL_INTRO_SAC_1, LANG_UNIVERSAL,NULL); + Sacrolash->Yell(YELL_INTRO_SAC_1, LANG_UNIVERSAL,NULL); return 1000; - case 2: - m_creature->Yell(YELL_INTRO_ALY_2, LANG_UNIVERSAL,NULL); + case 2: + m_creature->Yell(YELL_INTRO_ALY_2, LANG_UNIVERSAL,NULL); return 1000; - case 3: + case 3: if(Sacrolash) - Sacrolash->Yell(YELL_INTRO_SAC_3, LANG_UNIVERSAL,NULL); + Sacrolash->Yell(YELL_INTRO_SAC_3, LANG_UNIVERSAL,NULL); return 2000; - case 4: - m_creature->Yell(YELL_INTRO_ALY_4, LANG_UNIVERSAL,NULL); + case 4: + m_creature->Yell(YELL_INTRO_ALY_4, LANG_UNIVERSAL,NULL); return 1000; case 5: if(Sacrolash) - Sacrolash->Yell(YELL_INTRO_SAC_5, LANG_UNIVERSAL,NULL); + Sacrolash->Yell(YELL_INTRO_SAC_5, LANG_UNIVERSAL,NULL); return 2000; - case 6: - m_creature->Yell(YELL_INTRO_ALY_6, LANG_UNIVERSAL,NULL); + case 6: + m_creature->Yell(YELL_INTRO_ALY_6, LANG_UNIVERSAL,NULL); return 1000; - case 7: + case 7: if(Sacrolash) - Sacrolash->Yell(YELL_INTRO_SAC_7, LANG_UNIVERSAL,NULL); + Sacrolash->Yell(YELL_INTRO_SAC_7, LANG_UNIVERSAL,NULL); return 3000; - case 8: - m_creature->Yell(YELL_INTRO_ALY_8, LANG_UNIVERSAL,NULL); + case 8: + m_creature->Yell(YELL_INTRO_ALY_8, LANG_UNIVERSAL,NULL); return 900000; } return 10000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) { if(IntroStepCounter < 9) { @@ -590,14 +590,14 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI { if (pInstance) { - Unit* Temp = NULL; + Unit* Temp = NULL; Temp = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SACROLASH)); if (Temp && Temp->isDead()) { DoYell(YELL_SISTER_SACROLASH_DEAD ,LANG_UNIVERSAL,NULL); DoPlaySoundToSet(m_creature,SOUND_SISTER_SACROLASH_DEAD); sisterdeath = true; - + m_creature->InterruptSpell(CURRENT_GENERIC_SPELL); DoCast(m_creature,SPELL_EMPOWER); } @@ -613,14 +613,14 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI { if (!m_creature->IsNonMeleeSpellCasted(false)) { - Unit* target = NULL; + Unit* target = NULL; target = SelectUnit(SELECT_TARGET_RANDOM, 0); DoCast(target,SPELL_SHADOW_NOVA); shadownova_timer= 30000+(rand()%5000); } }else shadownova_timer -=diff; } - else + else { if (conflagration_timer < diff) { @@ -631,7 +631,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI target = SelectUnit(SELECT_TARGET_RANDOM, 0); DoCast(target,SPELL_CONFLAGRATION); conflagration_timer = 30000+(rand()%5000); - + if(!sisterdeath) { m_creature->MonsterTextEmote("directs Conflagration at $N",target->GetGUID(),true); @@ -660,7 +660,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI DoCast(m_creature,SPELL_PYROGENICS,true); pyrogenics_timer = 15000; } - }else pyrogenics_timer -= diff; + }else pyrogenics_timer -= diff; if (blaze_timer < diff) { @@ -695,7 +695,7 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI uint32 kill_timer; uint32 darkstrike_timer; - void Reset() + void Reset() { shadowfury_timer = 5000 + (rand()%15000); darkstrike_timer = 3000; @@ -710,7 +710,7 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI switch(spell->Id) { - case SPELL_SHADOW_FURY: + case SPELL_SHADOW_FURY: case SPELL_DARK_STRIKE: if(!target->HasAura(SPELL_DARK_FLAME,0)) { @@ -727,7 +727,7 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) { if(!m_creature->HasAura(SPELL_IMAGE_VISUAL,0)) DoCast(m_creature,SPELL_IMAGE_VISUAL); @@ -745,12 +745,12 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI { DoCast(m_creature,SPELL_SHADOW_FURY); shadowfury_timer = 10000; - }else shadowfury_timer -=diff; - + }else shadowfury_timer -=diff; + if(darkstrike_timer < diff) { if(!m_creature->IsNonMeleeSpellCasted(false)) - { + { //If we are within range melee the target if( m_creature->IsWithinMeleeRange(m_creature->getVictim())) { diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp index eec5e6a9ae2..8afba94fa44 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp @@ -36,7 +36,7 @@ EndScriptData */ #define SPELL_ENCAPSULATE_AOE 45662 // FLIGHT PHASE SPELL #define SPELL_VAPOR_SELECT 45391 // fel to player, force cast 45392, 50000y selete target -#define SPELL_VAPOR_SUMMON 45392 // player summon vapor, radius around caster, 5y, +#define SPELL_VAPOR_SUMMON 45392 // player summon vapor, radius around caster, 5y, #define SPELL_VAPOR_FORCE 45388 // vapor to fel, force cast 45389 #define SPELL_VAPOR_CHANNEL 45389 // fel to vapor, green beam channel #define SPELL_VAPOR_TRIGGER 45411 // linked to 45389, vapor to self, trigger 45410 and 46931 @@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI { boss_felmystAI(Creature *c) : ScriptedAI(c) { - Reset(); + Reset(); // wait for core patch be accepted SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_ENCAPSULATE_EFFECT); @@ -250,7 +250,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI { if(Phase != PHASE_GROUND && damage >= m_creature->GetHealth()) damage = 0; - } + } void EnterPhase(PhaseFelmyst NextPhase) { diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp index abae43e05b6..04c66573e1f 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp @@ -89,7 +89,7 @@ uint32 WildMagic[]= { 44978, 45001, 45002, 45004, 45006, 45010 }; struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI { - boss_kalecgosAI(Creature *c) : ScriptedAI(c) + boss_kalecgosAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); SathGUID = 0; @@ -237,7 +237,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI { - boss_sathrovarrAI(Creature *c) : ScriptedAI(c) + boss_sathrovarrAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); KalecGUID = 0; @@ -348,7 +348,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI void UpdateAI(const uint32 diff) { if (!UpdateVictim()) - return; + return; if(CheckTimer < diff) { @@ -401,7 +401,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI CorruptionStrikeTimer = 13000; }else CorruptionStrikeTimer -= diff; - DoMeleeAttackIfReady(); + DoMeleeAttackIfReady(); } }; @@ -425,7 +425,7 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI } void Reset() - { + { if(pInstance) SathGUID = pInstance->GetData64(DATA_SATHROVARR); @@ -554,7 +554,7 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff) isBanished = true; } } - else + else { DoTextEmote("is unable to find Sath", NULL); EnterEvadeMode(); diff --git a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp index f1eb63b54f5..db1cb4c43a4 100644 --- a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp +++ b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp @@ -384,11 +384,11 @@ bool GossipSelect_npc_stone_watcher_of_norgannon(Player *player, Creature *_Crea struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI { npc_OOX17AI(Creature *c) : npc_escortAI(c) {Reset();} - + void WaypointReached(uint32 i) { Unit* player = Unit::GetUnit((*m_creature), PlayerGUID); - + if (!player) return; @@ -424,11 +424,11 @@ struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI void Aggro(Unit* who) { - switch (rand()%2) + switch (rand()%2) { case 0: DoScriptText(SAY_CHICKEN_AGGRO_1, m_creature); break; case 1: DoScriptText(SAY_CHICKEN_AGGRO_2, m_creature); break; - } + } } void JustSummoned(Creature* summoned) diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp index 28895db340d..85fa16e21be 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp @@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI { DoScriptText(YELL_INTRO1, m_creature); DoCast(m_creature,SPELL_BUBBLE_VISUAL); - + if( pInstance ) { pInstance->SetData(TYPE_HARBINGERSKYRISS,IN_PROGRESS); diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp index da35a86c172..ae355968650 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp @@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance bool IsEncounterInProgress() const { for(uint8 i = 0; i < ENCOUNTERS; i++) - if(Encounter[i]) + if(Encounter[i]) return true; return false; @@ -181,12 +181,12 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance Pod_Omega->UseDoorOrButton(); Encounter[8] = data; break; - + case TYPE_SHIELD_OPEN: if( data == IN_PROGRESS ) if( Wardens_Shield ) Wardens_Shield->UseDoorOrButton(); - break; + break; } } diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp index e00e1c70242..735c54ba61e 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp @@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL mob_treantAI : public ScriptedAI #define TREANT_SPAWN_DIST 50 //50 yards from Warp Splinter's spawn point -float treant_pos[6][3] = +float treant_pos[6][3] = { {24.301233, 427.221100, -27.060635}, {16.795492, 359.678802, -27.355425}, @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI void SummonTreants() { for(int i = 0; i < 6; ++i) - { + { float angle = (M_PI / 3) * i; float X = Treant_Spawn_Pos_X + TREANT_SPAWN_DIST * cos(angle); @@ -166,7 +166,7 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI } } switch(rand()%2) - { + { case 0: DoScriptText(SAY_SUMMON_1, m_creature); break; case 1: DoScriptText(SAY_SUMMON_2, m_creature); break; } @@ -203,21 +203,21 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI if(War_Stomp_Timer < diff) { DoCast(m_creature->getVictim(),WAR_STOMP); - War_Stomp_Timer = 25000 + rand()%15000; + War_Stomp_Timer = 25000 + rand()%15000; }else War_Stomp_Timer -= diff; //Check for Arcane Volley if(Arcane_Volley_Timer < diff) { DoCast(m_creature->getVictim(),ARCANE_VOLLEY); - Arcane_Volley_Timer = 20000 + rand()%15000; + Arcane_Volley_Timer = 20000 + rand()%15000; }else Arcane_Volley_Timer -= diff; //Check for Summon Treants if(Summon_Treants_Timer < diff) { SummonTreants(); - Summon_Treants_Timer = 45000; + Summon_Treants_Timer = 45000; }else Summon_Treants_Timer -= diff; // I check if there is a Treant in Warp Splinter's LOS, so he can eat them diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp index 63942e6ef11..fed536832bf 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ +*/ /* ScriptData SDName: boss_alar @@ -40,7 +40,7 @@ EndScriptData */ #define CREATURE_FLAME_PATCH_ALAR 20602 // Flame Patch - every 30 sec in phase 2 #define SPELL_FLAME_PATCH 35380 // -static float waypoint[6][3] = +static float waypoint[6][3] = { {340.15, 58.65, 17.71}, {388.09, 31.54, 20.18}, @@ -166,9 +166,9 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI m_creature->RemoveAllAuras(); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->AttackStop(); - m_creature->SetUInt64Value(UNIT_FIELD_TARGET, 0); + m_creature->SetUInt64Value(UNIT_FIELD_TARGET, 0); m_creature->SetSpeed(MOVE_RUN, 5.0f); - m_creature->GetMotionMaster()->Clear(); + m_creature->GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->MovePoint(0, waypoint[5][0], waypoint[5][1], waypoint[5][2]); } } @@ -225,7 +225,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI m_creature->CastSpell(m_creature, SPELL_FLAME_QUILLS, true); Platforms_Move_Timer = 1; WaitTimer = 10000; - WaitEvent = WE_DUMMY; + WaitEvent = WE_DUMMY; return; case WE_DIE: m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); @@ -244,7 +244,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI Charge_Timer = 7000; DiveBomb_Timer = 40000+rand()%5000; FlamePatch_Timer = 30000; - Phase1 = false; + Phase1 = false; break; case WE_METEOR: m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, false); @@ -314,7 +314,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI else cur_wp++; WaitEvent = WE_PLATFORM; - } + } else // flame quill { cur_wp = 4; @@ -392,9 +392,9 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI Unit *target = NULL; if(Phase1 && (target = m_creature->SelectNearestTarget(5))) m_creature->AI()->AttackStart(target); - else + else { - m_creature->CastSpell(m_creature, SPELL_FLAME_BUFFET, true); + m_creature->CastSpell(m_creature, SPELL_FLAME_BUFFET, true); m_creature->setAttackTimer(BASE_ATTACK, 1500); } } diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp index 30f9faf34a4..45797e010e6 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp @@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI float Portal_X(float radius) { - if ((rand()%2)==1) + if ((rand()%2)==1) radius = -radius; return (radius * (float)(rand()%100)/100.0f + CENTER_X); @@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI { AppearDelay = false; if (Phase == 2) - { + { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->SetVisibility(VISIBILITY_OFF); } diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp index ee87d6f1c83..57cee769959 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp @@ -45,7 +45,7 @@ EndScriptData */ #define SAY_SUMMON_PHOENIX1 -1550032 #define SAY_SUMMON_PHOENIX2 -1550033 #define SAY_DEATH -1550034 - + //Thaladred the Darkener speech #define SAY_THALADRED_AGGRO -1550035 #define SAY_THALADRED_DEATH -1550036 @@ -76,7 +76,7 @@ EndScriptData */ #define SPELL_WEAPON_SPAWN 41236 //Phase 4 spells -#define SPELL_FIREBALL 36805 +#define SPELL_FIREBALL 36805 #define SPELL_PYROBLAST 36819 #define SPELL_FLAME_STRIKE 36735 #define SPELL_FLAME_STRIKE_VIS 36730 @@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI { if (!who || FakeDeath || m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; - + ScriptedAI::AttackStart(who); } @@ -832,7 +832,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI if (m_creature->getThreatManager().getThreatList().size() >= 2) for (uint32 i = 0; i < 3; i++) { - + Unit* target =SelectUnit(SELECT_TARGET_RANDOM, 1, 70, true); if(!target) target = m_creature->getVictim(); debug_log("TSCR: Kael'Thas mind control not supported."); diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp index 492c0820efb..b92d18ac54e 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp @@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance { case DATA_ALAREVENT: AlarEventPhase = data; Encounters[0] = data; break; case DATA_HIGHASTROMANCERSOLARIANEVENT: Encounters[1] = data; break; - case DATA_VOIDREAVEREVENT: Encounters[2] = data; break; + case DATA_VOIDREAVEREVENT: Encounters[2] = data; break; case DATA_KAELTHASEVENT: KaelthasEventPhase = data; Encounters[3] = data; break; } if(data == DONE) diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp index 2e27edbf2d8..77cf5e77364 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SAY_SLAY1 -1554003 #define SAY_SLAY2 -1554004 #define SAY_DEATH -1554005 - + #define SPELL_STREAM_OF_MACHINE_FLUID 35311 #define SPELL_SAW_BLADE 35318 #define H_SPELL_SAW_BLADE 39192 diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp index 95701f64ca0..de9526d495a 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Gatewatcher_Ironhand SD%Complete: 75 -SDComment: +SDComment: SDCategory: Tempest Keep, The Mechanar EndScriptData */ @@ -41,35 +41,35 @@ EndScriptData */ // Gatewatcher Iron-Hand AI struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI -{ +{ boss_gatewatcher_iron_handAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); Reset(); } - + ScriptedInstance *pInstance; bool HeroicMode; - uint32 Shadow_Power_Timer; + uint32 Shadow_Power_Timer; uint32 Jackhammer_Timer; - uint32 Stream_of_Machine_Fluid_Timer; + uint32 Stream_of_Machine_Fluid_Timer; - void Reset() - { - Shadow_Power_Timer = 25000; + void Reset() + { + Shadow_Power_Timer = 25000; Jackhammer_Timer = 45000; Stream_of_Machine_Fluid_Timer = 55000; - } - void Aggro(Unit *who) - { + } + void Aggro(Unit *who) + { DoScriptText(SAY_AGGRO_1, m_creature); - } + } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) { if (rand()%2) return; @@ -79,34 +79,34 @@ boss_gatewatcher_iron_handAI(Creature *c) : ScriptedAI(c) case 0: DoScriptText(SAY_SLAY_1, m_creature); break; case 1: DoScriptText(SAY_SLAY_2, m_creature); break; } - } + } - void JustDied(Unit* Killer) - { + void JustDied(Unit* Killer) + { DoScriptText(SAY_DEATH_1, m_creature); if (!pInstance) return; - - //TODO: Add door check/open code + + //TODO: Add door check/open code } - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim() ) - return; + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim() ) + return; - //Shadow Power - if(Shadow_Power_Timer < diff) - { + //Shadow Power + if(Shadow_Power_Timer < diff) + { DoCast(m_creature,HeroicMode ? H_SPELL_SHADOW_POWER : SPELL_SHADOW_POWER); - Shadow_Power_Timer = 20000 + rand()%8000; - }else Shadow_Power_Timer -= diff; + Shadow_Power_Timer = 20000 + rand()%8000; + }else Shadow_Power_Timer -= diff; - //Jack Hammer - if(Jackhammer_Timer < diff) - { + //Jack Hammer + if(Jackhammer_Timer < diff) + { //TODO: expect cast this about 5 times in a row (?), announce it by emote only once DoScriptText(EMOTE_HAMMER, m_creature); DoCast(m_creature->getVictim(),HeroicMode ? H_SPELL_JACKHAMMER : SPELL_JACKHAMMER); @@ -119,30 +119,30 @@ boss_gatewatcher_iron_handAI(Creature *c) : ScriptedAI(c) { case 0: DoScriptText(SAY_HAMMER_1, m_creature); break; case 1: DoScriptText(SAY_HAMMER_2, m_creature); break; - } - Jackhammer_Timer = 30000; - }else Jackhammer_Timer -= diff; - - //Stream of Machine Fluid - if(Stream_of_Machine_Fluid_Timer < diff) - { - DoCast(m_creature->getVictim(),SPELL_STREAM_OF_MACHINE_FLUID); - Stream_of_Machine_Fluid_Timer = 35000 + rand()%15000; + } + Jackhammer_Timer = 30000; + }else Jackhammer_Timer -= diff; + + //Stream of Machine Fluid + if(Stream_of_Machine_Fluid_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_STREAM_OF_MACHINE_FLUID); + Stream_of_Machine_Fluid_Timer = 35000 + rand()%15000; }else Stream_of_Machine_Fluid_Timer -= diff; DoMeleeAttackIfReady(); - } -}; + } +}; CreatureAI* GetAI_boss_gatewatcher_iron_hand(Creature *_Creature) -{ +{ return new boss_gatewatcher_iron_handAI (_Creature); -} +} void AddSC_boss_gatewatcher_iron_hand() -{ - Script *newscript; - newscript = new Script; - newscript->Name="boss_gatewatcher_iron_hand"; - newscript->GetAI = &GetAI_boss_gatewatcher_iron_hand; +{ + Script *newscript; + newscript = new Script; + newscript->Name="boss_gatewatcher_iron_hand"; + newscript->GetAI = &GetAI_boss_gatewatcher_iron_hand; newscript->RegisterSelf(); } diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp index 8d815b0f968..31293ca9f56 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp @@ -59,39 +59,39 @@ boss_nethermancer_sepethreaAI(Creature *c) : ScriptedAI(c) uint32 knockback_Timer; uint32 solarburn_Timer; - void Reset() + void Reset() { - frost_attack_Timer = 7000 + rand()%3000; + frost_attack_Timer = 7000 + rand()%3000; arcane_blast_Timer = 12000 + rand()%6000; dragons_breath_Timer = 18000 + rand()%4000; knockback_Timer = 22000 + rand()%6000; solarburn_Timer = 30000; - } + } - void Aggro(Unit *who) - { + void Aggro(Unit *who) + { DoScriptText(SAY_AGGRO, m_creature); - + //Summon two guards, three in heroic uint8 am = (HeroicMode ? 1 : 2); - for(int i = 0; i < am; i++) + for(int i = 0; i < am; i++) { - DoCast(who,SPELL_SUMMON_RAGIN_FLAMES); - } + DoCast(who,SPELL_SUMMON_RAGIN_FLAMES); + } DoScriptText(SAY_SUMMON, m_creature); - } + } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) { switch(rand()%2) { case 0: DoScriptText(SAY_SLAY1, m_creature); break; case 1: DoScriptText(SAY_SLAY2, m_creature); break; - } + } } - void JustDied(Unit* Killer) - { + void JustDied(Unit* Killer) + { DoScriptText(SAY_DEATH, m_creature); if(pInstance) pInstance->SetData(DATA_SEPETHREA_DEATH, 0); @@ -99,28 +99,28 @@ boss_nethermancer_sepethreaAI(Creature *c) : ScriptedAI(c) void UpdateAI(const uint32 diff) { - + //Return since we have no target - if (!UpdateVictim() ) - return; + if (!UpdateVictim() ) + return; - //Frost Attack - if(frost_attack_Timer < diff) - { + //Frost Attack + if(frost_attack_Timer < diff) + { DoCast(m_creature->getVictim(),SPELL_FROST_ATTACK); - frost_attack_Timer = 7000 + rand()%30000; + frost_attack_Timer = 7000 + rand()%30000; }else frost_attack_Timer -= diff; - //Arcane Blast - if(arcane_blast_Timer < diff) - { + //Arcane Blast + if(arcane_blast_Timer < diff) + { DoCast(m_creature->getVictim(), SPELL_ARCANE_BLAST); - arcane_blast_Timer = 15000; + arcane_blast_Timer = 15000; }else arcane_blast_Timer -= diff; - //Dragons Breath - if(dragons_breath_Timer < diff) - { + //Dragons Breath + if(dragons_breath_Timer < diff) + { DoCast(m_creature->getVictim(),SPELL_DRAGONS_BREATH); { if (rand()%2) @@ -132,30 +132,30 @@ boss_nethermancer_sepethreaAI(Creature *c) : ScriptedAI(c) case 1: DoScriptText(SAY_DRAGONS_BREATH_2, m_creature); break; } } - dragons_breath_Timer = 12000 + rand()%10000; - }else dragons_breath_Timer -= diff; - - //Knockback - if(knockback_Timer < diff) - { - DoCast(m_creature->getVictim(),SPELL_KNOCKBACK); - knockback_Timer = 15000 + rand()%10000; + dragons_breath_Timer = 12000 + rand()%10000; + }else dragons_breath_Timer -= diff; + + //Knockback + if(knockback_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_KNOCKBACK); + knockback_Timer = 15000 + rand()%10000; }else knockback_Timer -= diff; - //Solarburn - if(solarburn_Timer < diff) - { - DoCast(m_creature->getVictim(),SPELL_SOLARBURN); - solarburn_Timer = 30000; + //Solarburn + if(solarburn_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_SOLARBURN); + solarburn_Timer = 30000; }else solarburn_Timer -= diff; DoMeleeAttackIfReady(); - } + } }; CreatureAI* GetAI_boss_nethermancer_sepethrea(Creature *_Creature) -{ +{ return new boss_nethermancer_sepethreaAI (_Creature); } @@ -183,7 +183,7 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI bool onlyonce; void Reset() - { + { inferno_Timer = 10000; flame_timer = 500; Check_Timer = 2000; @@ -246,15 +246,15 @@ CreatureAI* GetAI_mob_ragin_flames(Creature *_Creature) return new mob_ragin_flamesAI (_Creature); } void AddSC_boss_nethermancer_sepethrea() -{ - Script *newscript; - newscript = new Script; - newscript->Name="boss_nethermancer_sepethrea"; - newscript->GetAI = &GetAI_boss_nethermancer_sepethrea; +{ + Script *newscript; + newscript = new Script; + newscript->Name="boss_nethermancer_sepethrea"; + newscript->GetAI = &GetAI_boss_nethermancer_sepethrea; newscript->RegisterSelf(); - newscript = new Script; - newscript->Name="mob_ragin_flames"; - newscript->GetAI = &GetAI_mob_ragin_flames; + newscript = new Script; + newscript->Name="mob_ragin_flames"; + newscript->GetAI = &GetAI_mob_ragin_flames; newscript->RegisterSelf(); } diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp index 5bd5af6ee8f..18fe0a6476b 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp @@ -38,7 +38,7 @@ EndScriptData */ #define SPELL_DOMINATION 35280 #define H_SPELL_ARCANE_EXPLOSION 15453 #define SPELL_FRENZY 36992 - + #define SPELL_SUMMON_NETHER_WRAITH_1 35285 //Spells work, but not implemented #define SPELL_SUMMON_NETHER_WRAITH_2 35286 #define SPELL_SUMMON_NETHER_WRAITH_3 35287 @@ -49,89 +49,89 @@ EndScriptData */ #define SPELL_ARCANE_MISSILES 35034 struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI -{ +{ boss_pathaleon_the_calculatorAI(Creature *c) : ScriptedAI(c) - { + { HeroicMode = m_creature->GetMap()->IsHeroic(); Reset(); } - uint32 Summon_Timer; + uint32 Summon_Timer; uint32 ManaTap_Timer; - uint32 ArcaneTorrent_Timer; - uint32 Domination_Timer; - uint32 ArcaneExplosion_Timer; + uint32 ArcaneTorrent_Timer; + uint32 Domination_Timer; + uint32 ArcaneExplosion_Timer; bool HeroicMode; bool Enraged; uint32 Counter; - void Reset() - { - Summon_Timer = 30000; + void Reset() + { + Summon_Timer = 30000; ManaTap_Timer = 12000 + rand()%8000; ArcaneTorrent_Timer = 16000 + rand()%9000; Domination_Timer = 25000 + rand()%15000; ArcaneExplosion_Timer = 8000 + rand()%5000; - + Enraged = false; Counter = 0; - } - void Aggro(Unit *who) - { + } + void Aggro(Unit *who) + { DoScriptText(SAY_AGGRO, m_creature); - } + } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) { switch(rand()%2) { case 0: DoScriptText(SAY_SLAY_1, m_creature); break; case 1: DoScriptText(SAY_SLAY_2, m_creature); break; - } - } + } + } - void JustDied(Unit* Killer) - { + void JustDied(Unit* Killer) + { DoScriptText(SAY_DEATH, m_creature); } - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim() ) - return; - - if(Summon_Timer < diff) - { + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim() ) + return; + + if(Summon_Timer < diff) + { for(int i = 0; i < 3;i++) - { + { Unit* target = NULL; target = SelectUnit(SELECT_TARGET_RANDOM,0); - Creature* Wraith = m_creature->SummonCreature(21062,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + Creature* Wraith = m_creature->SummonCreature(21062,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); if (target && Wraith) Wraith->AI()->AttackStart(target); } - DoScriptText(SAY_SUMMON, m_creature); - Summon_Timer = 30000 + rand()%15000; - }else Summon_Timer -= diff; - - if(ManaTap_Timer < diff) - { - DoCast(m_creature->getVictim(),SPELL_MANA_TAP); - ManaTap_Timer = 14000 + rand()%8000; - }else ManaTap_Timer -= diff; - - if(ArcaneTorrent_Timer < diff) - { - DoCast(m_creature->getVictim(),SPELL_ARCANE_TORRENT); - ArcaneTorrent_Timer = 12000 + rand()%6000; - }else ArcaneTorrent_Timer -= diff; - - if(Domination_Timer < diff) - { + DoScriptText(SAY_SUMMON, m_creature); + Summon_Timer = 30000 + rand()%15000; + }else Summon_Timer -= diff; + + if(ManaTap_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_MANA_TAP); + ManaTap_Timer = 14000 + rand()%8000; + }else ManaTap_Timer -= diff; + + if(ArcaneTorrent_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_ARCANE_TORRENT); + ArcaneTorrent_Timer = 12000 + rand()%6000; + }else ArcaneTorrent_Timer -= diff; + + if(Domination_Timer < diff) + { if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) { switch(rand()%2) @@ -139,22 +139,22 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI case 0: DoScriptText(SAY_DOMINATION_1, m_creature); break; case 1: DoScriptText(SAY_DOMINATION_2, m_creature); break; } - - DoCast(target,SPELL_DOMINATION); + + DoCast(target,SPELL_DOMINATION); } - Domination_Timer = 25000 + rand()%5000; - }else Domination_Timer -= diff; - + Domination_Timer = 25000 + rand()%5000; + }else Domination_Timer -= diff; + //Only casting if Heroic Mode is used if (HeroicMode) { - if(ArcaneExplosion_Timer < diff) - { - DoCast(m_creature->getVictim(),H_SPELL_ARCANE_EXPLOSION); - ArcaneExplosion_Timer = 10000 + rand()%4000; + if(ArcaneExplosion_Timer < diff) + { + DoCast(m_creature->getVictim(),H_SPELL_ARCANE_EXPLOSION); + ArcaneExplosion_Timer = 10000 + rand()%4000; }else ArcaneExplosion_Timer -= diff; } - + if (!Enraged && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 21) { DoCast(m_creature, SPELL_FRENZY); @@ -164,12 +164,12 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI } DoMeleeAttackIfReady(); - } -}; + } +}; CreatureAI* GetAI_boss_pathaleon_the_calculator(Creature *_Creature) -{ +{ return new boss_pathaleon_the_calculatorAI (_Creature); -} +} struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI { @@ -183,7 +183,7 @@ struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI bool Detonation; void Reset() - { + { ArcaneMissiles_Timer = 1000 + rand()%3000; Detonation_Timer = 20000; Die_Timer = 2200; @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI if(ArcaneMissiles_Timer < diff) { if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(target,SPELL_ARCANE_MISSILES); + DoCast(target,SPELL_ARCANE_MISSILES); else DoCast(m_creature->getVictim(),SPELL_ARCANE_MISSILES); @@ -212,11 +212,11 @@ struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI if (!Detonation) { - if(Detonation_Timer < diff) - { - DoCast(m_creature,SPELL_DETONATION); - Detonation = true; - }else Detonation_Timer -= diff; + if(Detonation_Timer < diff) + { + DoCast(m_creature,SPELL_DETONATION); + Detonation = true; + }else Detonation_Timer -= diff; } @@ -240,15 +240,15 @@ CreatureAI* GetAI_mob_nether_wraith(Creature *_Creature) } void AddSC_boss_pathaleon_the_calculator() -{ - Script *newscript; - newscript = new Script; - newscript->Name="boss_pathaleon_the_calculator"; - newscript->GetAI = &GetAI_boss_pathaleon_the_calculator; +{ + Script *newscript; + newscript = new Script; + newscript->Name="boss_pathaleon_the_calculator"; + newscript->GetAI = &GetAI_boss_pathaleon_the_calculator; newscript->RegisterSelf(); - newscript = new Script; - newscript->Name="mob_nether_wraith"; - newscript->GetAI = &GetAI_mob_nether_wraith; + newscript = new Script; + newscript->Name="mob_nether_wraith"; + newscript->GetAI = &GetAI_mob_nether_wraith; newscript->RegisterSelf(); } diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp index 3f720cdfbc8..40e12b66138 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Instance_Mechanar SD%Complete: 100 -SDComment: +SDComment: SDCategory: Mechanar EndScriptData */ @@ -28,19 +28,19 @@ struct TRINITY_DLL_DECL instance_mechanar : public ScriptedInstance { instance_mechanar(Map *map) : ScriptedInstance(map) {Initialize();}; - + bool IsBossDied[1]; void OnCreatureCreate (Creature *creature, uint32 creature_entry) { - } + } void Initialize() { IsBossDied[0] = false; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const { //not active return false; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp index 7932e027355..ede0c649b36 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp @@ -575,7 +575,7 @@ struct TRINITY_DLL_DECL cthunAI : public Scripted_NoMovementAI { if (Player* i_pl = i->getSource()) { - //Play random sound to the zone + //Play random sound to the zone i_pl->SendPlaySound(RANDOM_SOUND_WHISPER, true); } } diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp index 81fe9152bcd..8fe53cc70a1 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Sartura SD%Complete: 95 -SDComment: +SDComment: SDCategory: Temple of Ahn'Qiraj EndScriptData */ @@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI WhirlWind = false; AggroReset = false; - Enraged = false; + Enraged = false; EnragedHard = false; } @@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI DoCast(m_creature, SPELL_ENRAGE); Enraged = true; } - } + } //After 10 minutes hard enrage if (!EnragedHard) @@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI DoMeleeAttackIfReady(); } } -}; +}; struct TRINITY_DLL_DECL mob_sartura_royal_guardAI : public ScriptedAI @@ -172,7 +172,7 @@ struct TRINITY_DLL_DECL mob_sartura_royal_guardAI : public ScriptedAI uint32 AggroReset_Timer; uint32 AggroResetEnd_Timer; uint32 KnockBack_Timer; - + bool WhirlWind; bool AggroReset; @@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL mob_sartura_royal_guardAI : public ScriptedAI AggroReset_Timer = 45000 + rand()%10000; AggroResetEnd_Timer = 5000; KnockBack_Timer = 10000; - + WhirlWind = false; AggroReset = false; diff --git a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp index 4f59befd664..1463c0027ed 100644 --- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp @@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI switch(i) { - case 0: + case 0: { GameObject* Cage = FindGameObject(GO_CAGE, 10, m_creature); if(Cage) @@ -401,10 +401,10 @@ struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI ((Player*)player)->GroupEventHappens(QUEST_EFTW_A, m_creature); else if(((Player*)player)->GetTeam() == HORDE) ((Player*)player)->GroupEventHappens(QUEST_EFTW_H, m_creature); - } Completed = true; + } Completed = true; m_creature->SetInFront(player); break; case 30: m_creature->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; - case 31: DoCast(m_creature, SPELL_CAT); + case 31: DoCast(m_creature, SPELL_CAT); m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break; } } @@ -481,7 +481,7 @@ CreatureAI* GetAI_npc_isla_starmaneAI(Creature *_Creature) thisAI->AddWaypoint(26, -2313.99, 3398.61, -10.40); thisAI->AddWaypoint(27, -2320.85, 3414.49, -11.49); thisAI->AddWaypoint(28, -2338.26, 3426.06, -11.46); - thisAI->AddWaypoint(29, -2342.67, 3439.44, -11.32, 12000);//progress4 + thisAI->AddWaypoint(29, -2342.67, 3439.44, -11.32, 12000);//progress4 thisAI->AddWaypoint(30, -2342.67, 3439.44, -11.32, 7000);//emote bye thisAI->AddWaypoint(31, -2342.67, 3439.44, -11.32, 5000);//cat form thisAI->AddWaypoint(32, -2344.60, 3461.27, -10.44); diff --git a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp index 91b1e0ae3e5..e95f7e7ca5d 100644 --- a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp @@ -52,7 +52,7 @@ npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {Reset();} { case 46: DoScriptText(SAY_AGGRO, m_creature, player); - break; + break; case 47: m_creature->SummonCreature(ENTRY_WYVERN, -5016.45, -935.01, -5.46, 5.36,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); m_creature->SummonCreature(ENTRY_WYVERN, -5001.98, -934.96, -5.55, 3.18,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); @@ -63,13 +63,13 @@ npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {Reset();} if (player && player->GetTypeId() == TYPEID_PLAYER) ((Player*)player)->GroupEventHappens(QUEST_HOMEWARD_BOUND,m_creature); break; - + } } void Reset() { - + } void Aggro(Unit* who) @@ -184,7 +184,7 @@ CreatureAI* GetAI_npc_swiftmountain(Creature *_Creature) thisAI->AddWaypoint(69, -4932.68, -1084.42, -51.00); thisAI->AddWaypoint(70, -4938.3, -1100.41, -50.71, 5000); thisAI->AddWaypoint(71, -4937.34, -1102.87, -49.82); - + return (CreatureAI*)thisAI; } diff --git a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp index 59f9c4faf3e..82cb9ac9dde 100644 --- a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp +++ b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp @@ -93,20 +93,20 @@ bool QuestAccept_npc_calvin_montague(Player* player, Creature* creature, Quest c GameObject* SearchMausoleumGo(Unit *source, uint32 entry, float range) { GameObject* pGo = NULL; - + CellPair pair(Trinity::ComputeCellPair(source->GetPositionX(), source->GetPositionY())); Cell cell(pair); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - + Trinity::NearestGameObjectEntryInObjectRangeCheck go_check(*source, entry, range); Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectEntryInObjectRangeCheck> searcher(source, pGo, go_check); - + TypeContainerVisitor<Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectEntryInObjectRangeCheck>, GridTypeMapContainer> go_searcher(searcher); - + CellLock<GridReadGuard> cell_lock(cell, pair); cell_lock->Visit(cell_lock, go_searcher,*(source->GetMap())); - + return pGo; } @@ -114,14 +114,14 @@ bool GOHello_go_mausoleum_door(Player *player, GameObject* _GO) { if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) return false; - + if (GameObject *trigger = SearchMausoleumGo(player, GO_TRIGGER, 30)) { trigger->SetGoState(1); player->SummonCreature(C_ULAG, 2390.26, 336.47, 40.01, 2.26, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 300000); return false; } - + return false; } @@ -129,14 +129,14 @@ bool GOHello_go_mausoleum_trigger(Player *player, GameObject* _GO) { if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) return false; - + if (GameObject *door = SearchMausoleumGo(player, GO_DOOR, 30)) { _GO->SetGoState(0); door->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); return true; } - + return false; } diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp index 88fc5491802..8859b947eaf 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: boss_archaedas SD%Complete: 100 -SDComment: Archaedas is activated when 3 prople click on his altar. +SDComment: Archaedas is activated when 3 prople click on his altar. Every 10 seconds he will awaken one of his minions along the wall. At 66%, he will awaken the 6 Guardians. At 33%, he will awaken the Vault Walkers @@ -258,7 +258,7 @@ struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI void UpdateAI(const uint32 diff) { - // we're still in the awaken animation + // we're still in the awaken animation if (wakingUp && Awaken_Timer >= 0) { Awaken_Timer -= diff; return; // dont do anything until we are done diff --git a/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp index ca231a6bd12..8f290320107 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp @@ -69,12 +69,12 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance archaedasTempleDoor = go->GetGUID(); break; - case ANCIENT_VAULT_DOOR: + case ANCIENT_VAULT_DOOR: go->SetGoState(1); go->SetUInt32Value(GAMEOBJECT_FLAGS, 33); ancientVaultDoor = go->GetGUID(); break; - } + } } void SetFrozenState(Creature *creature) @@ -236,7 +236,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance ActivateArchaedas (data); } } - + void OnCreatureCreate (Creature *creature, uint32 creature_entry) { diff --git a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp index b3ac3d795c8..50f7bbcf9e4 100644 --- a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp +++ b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp @@ -58,34 +58,34 @@ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI switch (i) { - + case 19: m_creature->SummonCreature(ENTRY_STOMPER, -6391.69, -1730.49, -272.83, 4.96, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_AGGRO1, m_creature, player); + DoScriptText(SAY_AGGRO1, m_creature, player); break; case 28: - DoScriptText(SAY_SEARCH, m_creature, player); + DoScriptText(SAY_SEARCH, m_creature, player); break; case 38: m_creature->SummonCreature(ENTRY_TARLORD, -6370.75, -1382.84, -270.51, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_AGGRO2, m_creature, player); + DoScriptText(SAY_AGGRO2, m_creature, player); break; case 49: m_creature->SummonCreature(ENTRY_TARLORD1, -6324.44, -1181.05, -270.17, 4.34, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_AGGRO3, m_creature, player); + DoScriptText(SAY_AGGRO3, m_creature, player); break; case 55: DoScriptText(SAY_FINISH, m_creature, player); if (player && player->GetTypeId() == TYPEID_PLAYER) ((Player*)player)->GroupEventHappens(QUEST_CHASING_AME,m_creature); break; - + } } void Reset() { - DEMORALIZINGSHOUT_Timer = 5000; + DEMORALIZINGSHOUT_Timer = 5000; } void Aggro(Unit* who) @@ -110,13 +110,13 @@ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI npc_escortAI::UpdateAI(diff); if (!UpdateVictim()) return; - + if (DEMORALIZINGSHOUT_Timer < diff) { DoCast(m_creature->getVictim(),SPELL_DEMORALIZINGSHOUT); DEMORALIZINGSHOUT_Timer = 70000; }else DEMORALIZINGSHOUT_Timer -= diff; - + } }; @@ -126,7 +126,7 @@ bool QuestAccept_npc_ame(Player* player, Creature* creature, Quest const* quest) { ((npc_escortAI*)(creature->AI()))->Start(false, true, false, player->GetGUID()); DoScriptText(SAY_READY, creature, player); - creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); + creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); // Change faction so mobs attack creature->setFaction(113); } @@ -193,7 +193,7 @@ CreatureAI* GetAI_npc_ame(Creature *_Creature) thisAI->AddWaypoint(54, -6308.49, -1179.12, -269.57); thisAI->AddWaypoint(55, -6302.43, -1181.32, -269.328, 5000); thisAI->AddWaypoint(56, -6298.87, -1185.79, -269.278); - + return (CreatureAI*)thisAI; } diff --git a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp index 40faa01a9f0..9abd202dedf 100644 --- a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp +++ b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp @@ -170,7 +170,7 @@ CreatureAI* GetAI_npc_defias_traitor(Creature *_Creature) void AddSC_westfall() { Script *newscript; - + newscript = new Script; newscript->Name="npc_defias_traitor"; newscript->GetAI = &GetAI_npc_defias_traitor; diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp index af364acf9c4..d8af912e2e1 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp @@ -18,7 +18,7 @@ SDName: boss_Akilzon SD%Complete: 75% SDComment: Missing timer for Call Lightning and Sound ID's -SQLUpdate: +SQLUpdate: #Temporary fix for Soaring Eagles EndScriptData */ @@ -109,8 +109,8 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI StormSequenceTimer = 0; isRaining = false; - - SetWeather(WEATHER_STATE_FINE, 0.0f); + + SetWeather(WEATHER_STATE_FINE, 0.0f); } void Aggro(Unit *who) @@ -148,7 +148,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI void DespawnSummons() { - for (uint8 i = 0; i < 8; i++) + for (uint8 i = 0; i < 8; i++) { Unit* bird = Unit::GetUnit(*m_creature,BirdGUIDs[i]); if(bird && bird->isAlive()) @@ -204,12 +204,12 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI { Cloud->CastCustomSpell(*i, 43137, &bp0, NULL, NULL, true, 0, 0, m_creature->GetGUID()); } - } + } // visual float x,y,z; - z = m_creature->GetPositionZ(); + z = m_creature->GetPositionZ(); for(uint8 i = 0; i < 5+rand()%5; ++i) - { + { x = 343+rand()%60; y = 1380+rand()%60; if(Unit *trigger = m_creature->SummonTrigger(x, y, z, 0, 2000)) @@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI if (Cloud) Cloud->CastCustomSpell(trigger, /*43661*/43137, &bp0, NULL, NULL,true, 0, 0, Cloud->GetGUID()); } - } + } } StormCount++; if(StormCount > 10) @@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI m_creature->InterruptNonMeleeSpells(false); CloudGUID = 0; if (Cloud) - Cloud->DealDamage(Cloud, Cloud->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Cloud->DealDamage(Cloud, Cloud->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); SetWeather(WEATHER_STATE_FINE, 0.0f); isRaining = false; } @@ -305,7 +305,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI return; } target->CastSpell(target, 44007, true);//cloud visual - m_creature->CastSpell(target, SPELL_ELECTRICAL_STORM, false);//storm cyclon + visual + m_creature->CastSpell(target, SPELL_ELECTRICAL_STORM, false);//storm cyclon + visual float x,y,z; target->GetPosition(x,y,z); if (target) @@ -330,7 +330,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI StormSequenceTimer = 0; } else ElectricalStorm_Timer -= diff; - if (SummonEagles_Timer < diff) + if (SummonEagles_Timer < diff) { DoYell(SAY_ONSUMMON, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_ONSUMMON); @@ -338,11 +338,11 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI float x, y, z; m_creature->GetPosition(x, y, z); - for (uint8 i = 0; i < 8; i++) + for (uint8 i = 0; i < 8; i++) { Unit* bird = Unit::GetUnit(*m_creature,BirdGUIDs[i]); if(!bird)//they despawned on die - { + { if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) { x = target->GetPositionX() + 10 - rand()%20; @@ -357,7 +357,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI pCreature->AI()->AttackStart(m_creature->getVictim()); BirdGUIDs[i] = pCreature->GetGUID(); } - } + } } SummonEagles_Timer = 999999; } else SummonEagles_Timer -= diff; diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp index b14b0442373..818e87b3ce0 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: boss_Halazzi SD%Complete: 80 -SDComment: +SDComment: SDCategory: Zul'Aman EndScriptData */ @@ -74,7 +74,7 @@ enum PhaseHalazzi struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI { boss_halazziAI(Creature *c) : ScriptedAI(c) - { + { pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); // need to find out what controls totem's spell cooldown @@ -293,7 +293,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI else EnterPhase(PHASE_ENRAGE); } - } + } CheckTimer = 1000; }else CheckTimer -= diff; } diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp index 47e635ece37..c2827ce6701 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Hex_Lord_Malacrass SD%Complete: -SDComment: +SDComment: SDCategory: Zul'Aman EndScriptData */ @@ -464,7 +464,7 @@ struct TRINITY_DLL_DECL boss_thurgAI : public boss_hexlord_addAI if(bloodlust_timer < diff) { std::list<Creature*> templist = DoFindFriendlyMissingBuff(50, SPELL_BLOODLUST); - if(!templist.empty()) + if(!templist.empty()) { if(Unit* target = *(templist.begin())) m_creature->CastSpell(target, SPELL_BLOODLUST, false); @@ -648,7 +648,7 @@ struct TRINITY_DLL_DECL boss_lord_raadanAI : public boss_hexlord_addAI return; if (thunderclap_timer < diff) - { + { m_creature->CastSpell(m_creature->getVictim(),SPELL_THUNDERCLAP, false); thunderclap_timer = 12000; }else thunderclap_timer -= diff; @@ -684,7 +684,7 @@ struct TRINITY_DLL_DECL boss_darkheartAI : public boss_hexlord_addAI return; if (psychicwail_timer < diff) - { + { m_creature->CastSpell(m_creature->getVictim(),SPELL_PSYCHIC_WAIL, false); psychicwail_timer = 12000; }else psychicwail_timer -= diff; @@ -735,7 +735,7 @@ struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI return; if (venomspit_timer < diff) - { + { if(Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0)) m_creature->CastSpell(victim,SPELL_VENOM_SPIT, false); venomspit_timer = 2500; @@ -767,7 +767,7 @@ struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI return; if (volatileinf_timer < diff) - { + { // core bug m_creature->getVictim()->CastSpell(m_creature->getVictim(),SPELL_VOLATILE_INFECTION, false); volatileinf_timer = 12000; @@ -803,7 +803,7 @@ struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI return; if (mightyblow_timer < diff) - { + { m_creature->CastSpell(m_creature->getVictim(),SPELL_MIGHTY_BLOW, false); mightyblow_timer = 12000; } diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp index d330bc151d2..de30c50a628 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Janalai SD%Complete: 100 -SDComment: +SDComment: SDCategory: Zul'Aman EndScriptData */ @@ -46,10 +46,10 @@ EndScriptData */ #define SPELL_HATCH_ALL 43144 #define SPELL_BERSERK 45078 // -- Fire Bob Spells -#define SPELL_FIRE_BOMB_CHANNEL 42621 // last forever +#define SPELL_FIRE_BOMB_CHANNEL 42621 // last forever #define SPELL_FIRE_BOMB_THROW 42628 // throw visual #define SPELL_FIRE_BOMB_DUMMY 42629 // bomb visual -#define SPELL_FIRE_BOMB_DAMAGE 42630 +#define SPELL_FIRE_BOMB_DAMAGE 42630 // --Summons #define MOB_AMANI_HATCHER 23818 @@ -66,12 +66,12 @@ EndScriptData */ const int area_dx = 44; const int area_dy = 51; -float JanalainPos[1][3] = +float JanalainPos[1][3] = { {-33.93, 1149.27, 19} }; -float FireWallCoords[4][4] = +float FireWallCoords[4][4] = { {-10.13, 1149.27, 19, 3.1415}, {-33.93, 1123.90, 19, 0.5*3.1415}, @@ -100,7 +100,7 @@ float hatcherway[2][5][3] = struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI { boss_janalaiAI(Creature *c) : ScriptedAI(c) - { + { pInstance =((ScriptedInstance*)c->GetInstanceData()); Reset(); @@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI bool isFlameBreathing; - uint64 FireBombGUIDs[40]; + uint64 FireBombGUIDs[40]; void Reset() { @@ -166,7 +166,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI void KilledUnit(Unit* victim) { switch(rand()%2) - { + { case 0: DoScriptText(SAY_SLAY_1, m_creature); break; case 1: DoScriptText(SAY_SLAY_2, m_creature); break; } @@ -337,7 +337,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI } if(!UpdateVictim()) - return; + return; //enrage if under 25% hp before 5 min. if(!enraged && m_creature->GetHealth() * 4 < m_creature->GetMaxHealth()) @@ -355,7 +355,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI { DoScriptText(SAY_BERSERK, m_creature); m_creature->CastSpell(m_creature, SPELL_BERSERK, true); - EnrageTimer = 300000; + EnrageTimer = 300000; } }else EnrageTimer -= diff; @@ -393,7 +393,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI if(!noeggs) { - if(100 * m_creature->GetHealth() < 35 * m_creature->GetMaxHealth()) + if(100 * m_creature->GetHealth() < 35 * m_creature->GetMaxHealth()) { DoScriptText(SAY_ALL_EGGS, m_creature); @@ -409,8 +409,8 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI else if(HatcherTimer < diff) { if(HatchAllEggs(0)) - { - DoScriptText(SAY_SUMMON_HATCHER, m_creature); + { + DoScriptText(SAY_SUMMON_HATCHER, m_creature); m_creature->SummonCreature(MOB_AMANI_HATCHER,hatcherway[0][0][0],hatcherway[0][0][1],hatcherway[0][0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); m_creature->SummonCreature(MOB_AMANI_HATCHER,hatcherway[1][0][0],hatcherway[1][0][1],hatcherway[1][0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); HatcherTimer = 90000; @@ -429,10 +429,10 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI ResetTimer = 5000; }else ResetTimer -= diff; - DoMeleeAttackIfReady(); + DoMeleeAttackIfReady(); if(FireBreathTimer < diff) - { + { if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) { m_creature->AttackStop(); @@ -441,9 +441,9 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI m_creature->StopMoving(); isFlameBreathing = true; } - FireBreathTimer = 8000; + FireBreathTimer = 8000; }else FireBreathTimer -= diff; - } + } }; CreatureAI* GetAI_boss_janalaiAI(Creature *_Creature) @@ -480,7 +480,7 @@ CreatureAI* GetAI_mob_jandalai_firebombAI(Creature *_Creature) struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI { mob_amanishi_hatcherAI(Creature *c) : ScriptedAI(c) - { + { pInstance =((ScriptedInstance*)c->GetInstanceData()); Reset(); } @@ -554,12 +554,12 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI HatchNum = 1; WaitTimer = 5000; } - else + else WaitTimer = 1; } void UpdateAI(const uint32 diff) - { + { if(!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS)) { m_creature->SetVisibility(VISIBILITY_OFF); @@ -578,7 +578,7 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI } } else - { + { if(WaitTimer < diff) { if(HatchEggs(HatchNum)) @@ -612,7 +612,7 @@ CreatureAI* GetAI_mob_amanishi_hatcherAI(Creature *_Creature) struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI { mob_hatchlingAI(Creature *c) : ScriptedAI(c) - { + { pInstance =((ScriptedInstance*)c->GetInstanceData()); Reset(); } @@ -675,7 +675,7 @@ struct TRINITY_DLL_DECL mob_eggAI : public ScriptedAI { DoSpawnCreature(MOB_HATCHLING, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000); m_creature->SetDisplayId(11686); - } + } } }; @@ -690,17 +690,17 @@ void AddSC_boss_janalai() newscript = new Script; newscript->Name="boss_janalai"; newscript->GetAI = &GetAI_boss_janalaiAI; - newscript->RegisterSelf(); + newscript->RegisterSelf(); newscript = new Script; newscript->Name="mob_janalai_firebomb"; newscript->GetAI = &GetAI_mob_jandalai_firebombAI; - newscript->RegisterSelf(); + newscript->RegisterSelf(); newscript = new Script; newscript->Name="mob_janalai_hatcher"; newscript->GetAI = &GetAI_mob_amanishi_hatcherAI; - newscript->RegisterSelf(); + newscript->RegisterSelf(); newscript = new Script; newscript->Name="mob_janalai_hatchling"; @@ -710,5 +710,5 @@ void AddSC_boss_janalai() newscript = new Script; newscript->Name="mob_janalai_egg"; newscript->GetAI = &GetAI_mob_eggAI; - newscript->RegisterSelf(); + newscript->RegisterSelf(); } diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp index 82380bc573a..0220523a1e2 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp @@ -26,15 +26,15 @@ EndScriptData */ #include "GridNotifiers.h" //Trash Waves -float NalorakkWay[8][3] = +float NalorakkWay[8][3] = { { 18.569, 1414.512, 11.42},// waypoint 1 {-17.264, 1419.551, 12.62}, {-52.642, 1419.357, 27.31},// waypoint 2 {-69.908, 1419.721, 27.31}, - {-79.929, 1395.958, 27.31}, + {-79.929, 1395.958, 27.31}, {-80.072, 1374.555, 40.87},// waypoint 3 - {-80.072, 1314.398, 40.87}, + {-80.072, 1314.398, 40.87}, {-80.072, 1295.775, 48.60} // waypoint 4 }; @@ -249,7 +249,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - + MoveEvent = false; } break; @@ -269,16 +269,16 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI DoZoneInCombat(); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) { if(pInstance) pInstance->SetData(DATA_NALORAKKEVENT, DONE); DoYell(YELL_DEATH,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature, SOUND_YELL_DEATH); + DoPlaySoundToSet(m_creature, SOUND_YELL_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) { switch(rand()%2) { @@ -289,7 +289,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI case 1: DoYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_YELL_KILL_TWO); - break; + break; } } @@ -329,7 +329,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI inMove = false; return; } - + } } @@ -433,7 +433,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI }else DeafeningRoar_Timer -= diff; } - DoMeleeAttackIfReady(); + DoMeleeAttackIfReady(); } }; diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp index 42aaf0fdf56..d4be29c3557 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_ZulJin SD%Complete: 85% -SDComment: +SDComment: EndScriptData */ #include "precompiled.h" @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI Pillar_Of_Fire_Timer = 7000; ClawTargetGUID = 0; - TankGUID = 0; + TankGUID = 0; Summons.DespawnAll(); @@ -218,14 +218,14 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI pInstance->SetData(DATA_ZULJINEVENT, IN_PROGRESS); DoZoneInCombat(); - + DoYell(YELL_INTRO,LANG_UNIVERSAL,NULL); DoPlaySoundToSet(m_creature, SOUND_INTRO); SpawnAdds(); EnterPhase(0); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) { if(Intro_Timer) return; @@ -239,11 +239,11 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI case 1: DoYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_KILL_TWO); - break; + break; } } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) { if(pInstance) pInstance->SetData(DATA_ZULJINEVENT, DONE); @@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI } Phase = NextPhase; } - + void UpdateAI(const uint32 diff) { if(!TankGUID) @@ -584,7 +584,7 @@ struct TRINITY_DLL_DECL feather_vortexAI : public ScriptedAI void SpellHit(Unit *caster, const SpellEntry *spell) { if(spell->Id == SPELL_ZAP_INFORM) - m_creature->CastSpell(caster, SPELL_ZAP_DAMAGE, true); + m_creature->CastSpell(caster, SPELL_ZAP_DAMAGE, true); } void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp index b510f74bb67..db181edb227 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: instance_zulaman SD%Complete: 80 -SDComment: +SDComment: SDCategory: Zul'Aman EndScriptData */ @@ -46,7 +46,7 @@ static SHostageInfo HostageInfo[] = {23999, 187021, 400, 1414, 74.36, 3.3}, // eagle {24001, 186672, -35, 1134, 18.71, 1.9}, // dragonhawk {24024, 186667, 413, 1117, 6.32, 3.1} // lynx - + }; struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance @@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance RandVendor[i] = NOT_STARTED; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const { for(uint8 i = 0; i < ENCOUNTERS; i++) if(Encounters[i] == IN_PROGRESS) return true; @@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance } void OnCreatureCreate(Creature *creature, uint32 creature_entry) - { + { switch(creature_entry) { case 23578://janalai @@ -292,7 +292,7 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance case DATA_ZULJINEVENT: return Encounters[5]; case DATA_CHESTLOOTED: return ChestLooted; case TYPE_RAND_VENDOR_1: return RandVendor[0]; - case TYPE_RAND_VENDOR_2: return RandVendor[1]; + case TYPE_RAND_VENDOR_2: return RandVendor[1]; default: return 0; } } diff --git a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp index fa8971ffd93..2f6624f9839 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp @@ -39,7 +39,7 @@ EndContentData */ struct TRINITY_DLL_DECL npc_forest_frogAI : public ScriptedAI { npc_forest_frogAI(Creature* c) : ScriptedAI(c) - { + { pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp index 1dcfee08ef6..16344adc5ba 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI Panther = m_creature->SummonCreature(15101,-11532.79980,-1649.6734,41.4800,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if(markedTarget && Panther ) - { + { DoScriptText(SAY_FEAST_PANTHER, m_creature, markedTarget); Panther ->AI()->AttackStart(markedTarget); }else Panther ->AI()->AttackStart(target); diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp index a8d34b65c78..d8eada5662c 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp @@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI //CauseInsanity_Timer /*if (CauseInsanity_Timer < diff) - { + { if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) DoCast(target,SPELL_CAUSEINSANITY); diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp index e8bf5d27611..0d22a980f37 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp @@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); } - + ScriptedInstance *pInstance; uint32 Charge_Timer; @@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (!UpdateVictim()) + if (!UpdateVictim()) return; if( m_creature->getVictim() && m_creature->isAlive()) diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp index 607c9e71224..3be31b32e11 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp @@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI pInstance = (c->GetInstanceData()) ? ((ScriptedInstance*)c->GetInstanceData()) : NULL; Reset(); } - + ScriptedInstance *pInstance; uint32 BrainWashTotem_Timer; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp index 477729f63d8..bccd9c44bf5 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp @@ -124,7 +124,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI } } - void Aggro(Unit *who) + void Aggro(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp index 4f3d8de2262..481784cc04c 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); } - + ScriptedInstance *pInstance; uint32 SpawnStartSpiders_Timer; @@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI if (!Spawned && SpawnStartSpiders_Timer < diff) { DoScriptText(SAY_SPIDER_SPAWN, m_creature); - + Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp index 1e68713fea9..db9ad23858d 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp @@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI } DoMeleeAttackIfReady(); - + } }; diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp index 64ecb56bfd9..721476c5780 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); Reset(); } - + ScriptedInstance *pInstance; uint32 HolyFire_Timer; @@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI } } DoMeleeAttackIfReady(); - + } }; CreatureAI* GetAI_boss_venoxis(Creature *_Creature) diff --git a/src/bindings/scripts/system.cpp b/src/bindings/scripts/system.cpp index f070f81ae76..703fa139bee 100644 --- a/src/bindings/scripts/system.cpp +++ b/src/bindings/scripts/system.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * Thanks to the original authors: MaNGOS <http://getmangos.com/> diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h index 04c95c81687..cf41be4953f 100644 --- a/src/framework/Dynamic/FactoryHolder.h +++ b/src/framework/Dynamic/FactoryHolder.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h index 07859d9fc22..ef61ef38cde 100644 --- a/src/framework/Dynamic/ObjectRegistry.h +++ b/src/framework/Dynamic/ObjectRegistry.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h index 3e1d25cff07..0210f62faf7 100644 --- a/src/framework/GameSystem/Grid.h +++ b/src/framework/GameSystem/Grid.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/GameSystem/GridLoader.h b/src/framework/GameSystem/GridLoader.h index 43a7f1cc43b..df46585c225 100644 --- a/src/framework/GameSystem/GridLoader.h +++ b/src/framework/GameSystem/GridLoader.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/GameSystem/GridRefManager.h b/src/framework/GameSystem/GridRefManager.h index 6a644e087ce..63e5065dc12 100644 --- a/src/framework/GameSystem/GridRefManager.h +++ b/src/framework/GameSystem/GridRefManager.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h index fd3229e46ad..529278ea036 100644 --- a/src/framework/GameSystem/GridReference.h +++ b/src/framework/GameSystem/GridReference.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h index 306e71068cb..6ed87624662 100644 --- a/src/framework/GameSystem/NGrid.h +++ b/src/framework/GameSystem/NGrid.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -67,7 +67,7 @@ class TRINITY_DLL_DECL NGrid public: typedef Grid<ACTIVE_OBJECT, WORLD_OBJECT_TYPES, GRID_OBJECT_TYPES, ThreadModel> GridType; - NGrid(uint32 id, int32 x, int32 y, time_t expiry, bool unload = true) : + NGrid(uint32 id, int32 x, int32 y, time_t expiry, bool unload = true) : i_gridId(id), i_cellstate(GRID_STATE_INVALID), i_x(x), i_y(y), i_GridObjectDataLoaded(false) { i_GridInfo = GridInfo(expiry, unload); diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h index 08e01aa4f12..e4a30103d2d 100644 --- a/src/framework/GameSystem/TypeContainer.h +++ b/src/framework/GameSystem/TypeContainer.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/GameSystem/TypeContainerFunctions.h b/src/framework/GameSystem/TypeContainerFunctions.h index 0ad4a8a4b50..ec005e2218c 100644 --- a/src/framework/GameSystem/TypeContainerFunctions.h +++ b/src/framework/GameSystem/TypeContainerFunctions.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/GameSystem/TypeContainerFunctionsPtr.h b/src/framework/GameSystem/TypeContainerFunctionsPtr.h index 79b9163332a..5f15f6c65a7 100644 --- a/src/framework/GameSystem/TypeContainerFunctionsPtr.h +++ b/src/framework/GameSystem/TypeContainerFunctionsPtr.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h index 92caa770a99..c544afa0f5e 100644 --- a/src/framework/GameSystem/TypeContainerVisitor.h +++ b/src/framework/GameSystem/TypeContainerVisitor.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Network/SocketDefines.h b/src/framework/Network/SocketDefines.h index d331bd8ffbd..e18be535e91 100644 --- a/src/framework/Network/SocketDefines.h +++ b/src/framework/Network/SocketDefines.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Platform/CompilerDefs.h b/src/framework/Platform/CompilerDefs.h index 169d874cd88..2bf7f7872f9 100644 --- a/src/framework/Platform/CompilerDefs.h +++ b/src/framework/Platform/CompilerDefs.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h index a9acb29d887..574793a285d 100644 --- a/src/framework/Platform/Define.h +++ b/src/framework/Platform/Define.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Policies/CreationPolicy.h b/src/framework/Policies/CreationPolicy.h index 7c372c79d83..10ed0109583 100644 --- a/src/framework/Policies/CreationPolicy.h +++ b/src/framework/Policies/CreationPolicy.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Policies/ObjectLifeTime.cpp b/src/framework/Policies/ObjectLifeTime.cpp index 12bdceaae35..55d452f801d 100644 --- a/src/framework/Policies/ObjectLifeTime.cpp +++ b/src/framework/Policies/ObjectLifeTime.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h index 1f659288d9a..0666d7e19a8 100644 --- a/src/framework/Policies/ObjectLifeTime.h +++ b/src/framework/Policies/ObjectLifeTime.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h index 6ea4bc94410..e33a52b2462 100644 --- a/src/framework/Policies/Singleton.h +++ b/src/framework/Policies/Singleton.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Policies/SingletonImp.h b/src/framework/Policies/SingletonImp.h index 05be6ecb72d..386b321c1f1 100644 --- a/src/framework/Policies/SingletonImp.h +++ b/src/framework/Policies/SingletonImp.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Policies/ThreadingModel.h b/src/framework/Policies/ThreadingModel.h index c56b7817084..c482b2f10ad 100644 --- a/src/framework/Policies/ThreadingModel.h +++ b/src/framework/Policies/ThreadingModel.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Utilities/ByteConverter.h b/src/framework/Utilities/ByteConverter.h index 3e45a5e795a..c770be449cb 100644 --- a/src/framework/Utilities/ByteConverter.h +++ b/src/framework/Utilities/ByteConverter.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Utilities/Callback.h b/src/framework/Utilities/Callback.h index f07da09879f..3b8c3e450f3 100644 --- a/src/framework/Utilities/Callback.h +++ b/src/framework/Utilities/Callback.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Utilities/CountedReference/Reference.h b/src/framework/Utilities/CountedReference/Reference.h index 590b81b89c8..7954c437966 100644 --- a/src/framework/Utilities/CountedReference/Reference.h +++ b/src/framework/Utilities/CountedReference/Reference.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Utilities/CountedReference/ReferenceHolder.h b/src/framework/Utilities/CountedReference/ReferenceHolder.h index f256da0570a..03edff4c7cd 100644 --- a/src/framework/Utilities/CountedReference/ReferenceHolder.h +++ b/src/framework/Utilities/CountedReference/ReferenceHolder.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Utilities/CountedReference/ReferenceImpl.h b/src/framework/Utilities/CountedReference/ReferenceImpl.h index 1b0bd288d96..43a01e2bc85 100644 --- a/src/framework/Utilities/CountedReference/ReferenceImpl.h +++ b/src/framework/Utilities/CountedReference/ReferenceImpl.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Utilities/EventProcessor.cpp b/src/framework/Utilities/EventProcessor.cpp index ea8b55b2f8f..d6e74ced42c 100644 --- a/src/framework/Utilities/EventProcessor.cpp +++ b/src/framework/Utilities/EventProcessor.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -70,13 +70,13 @@ void EventProcessor::KillAllEvents(bool force) { EventList::iterator i_old = i; ++i; - + i_old->second->to_Abort = true; i_old->second->Abort(m_time); if(force || i_old->second->IsDeletable()) { delete i_old->second; - + if(!force) // need per-element cleanup m_events.erase (i_old); } diff --git a/src/framework/Utilities/EventProcessor.h b/src/framework/Utilities/EventProcessor.h index 97c594c94d3..ecc7ec608be 100644 --- a/src/framework/Utilities/EventProcessor.h +++ b/src/framework/Utilities/EventProcessor.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -39,7 +39,7 @@ class BasicEvent // return false if event does not want to be deleted // e_time is execution time, p_time is update interval virtual bool Execute(uint64 /*e_time*/, uint32 /*p_time*/) { return true; } - + virtual bool IsDeletable() const { return true; } // this event can be safely deleted virtual void Abort(uint64 /*e_time*/) {} // this method executes when the event is aborted diff --git a/src/framework/Utilities/LinkedList.h b/src/framework/Utilities/LinkedList.h index 008cd0ae1af..22a80f0b9ba 100644 --- a/src/framework/Utilities/LinkedList.h +++ b/src/framework/Utilities/LinkedList.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Utilities/LinkedReference/RefManager.h b/src/framework/Utilities/LinkedReference/RefManager.h index 51502f923c9..bef8b32862c 100644 --- a/src/framework/Utilities/LinkedReference/RefManager.h +++ b/src/framework/Utilities/LinkedReference/RefManager.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Utilities/LinkedReference/Reference.h b/src/framework/Utilities/LinkedReference/Reference.h index 647c34b8c7a..5ca167a3948 100644 --- a/src/framework/Utilities/LinkedReference/Reference.h +++ b/src/framework/Utilities/LinkedReference/Reference.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Utilities/TypeList.h b/src/framework/Utilities/TypeList.h index 4f1c968d6cd..fc9f869aa2b 100644 --- a/src/framework/Utilities/TypeList.h +++ b/src/framework/Utilities/TypeList.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMap.h index 1f9a242dd08..13f9d58619b 100644 --- a/src/framework/Utilities/UnorderedMap.h +++ b/src/framework/Utilities/UnorderedMap.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp index af014b2cf2c..d5d7ee1a59a 100644 --- a/src/game/AccountMgr.cpp +++ b/src/game/AccountMgr.cpp @@ -95,7 +95,7 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid) LoginDatabase.BeginTransaction(); - bool res = + bool res = LoginDatabase.PExecute("DELETE FROM account WHERE id='%d'", accid) && LoginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid='%d'", accid); diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 795d83a0300..4d438f31d52 100644 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -76,7 +76,7 @@ SET(game_STAT_SRCS Creature.h CreatureGroups.cpp CreatureGroups.h - debugcmds.cpp + Debugcmds.cpp DestinationHolder.cpp DestinationHolder.h DestinationHolderImp.h @@ -236,7 +236,7 @@ SET(game_STAT_SRCS TicketHandler.cpp TicketMgr.cpp TicketMgr.h - tools.cpp + Tools.cpp Tools.h TotemAI.cpp TotemAI.h diff --git a/src/game/CellImpl.h b/src/game/CellImpl.h index 76e3f4aaa04..0aea067b32b 100644 --- a/src/game/CellImpl.h +++ b/src/game/CellImpl.h @@ -154,7 +154,7 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi { m.Visit(l, visitor); return; - } + } CellPair begin_cell = standing_cell; CellPair end_cell = standing_cell; diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index e51eb1cc3bb..497c8fd3c2d 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -164,7 +164,7 @@ ChatCommand * ChatHandler::getCommandTable() { "modify", SEC_GAMEMASTER, false, &ChatHandler::HandleWpModifyCommand, "", NULL }, { "event", SEC_GAMEMASTER, false, &ChatHandler::HandleWpEventCommand, "", NULL }, { "unload", SEC_GAMEMASTER, false, &ChatHandler::HandleWpUnLoadPathCommand, "", NULL }, - + { NULL, 0, false, NULL, "", NULL } }; @@ -560,11 +560,11 @@ ChatCommand * ChatHandler::getCommandTable() { "event", SEC_GAMEMASTER, false, NULL, "", eventCommandTable }, { "gobject", SEC_GAMEMASTER, false, NULL, "", gobjectCommandTable }, { "honor", SEC_GAMEMASTER, false, NULL, "", honorCommandTable }, - + //wp commands { "path", SEC_GAMEMASTER, false, NULL, "", wpCommandTable }, { "loadpath", SEC_ADMINISTRATOR, false, &ChatHandler::HandleReloadAllPaths, "", NULL }, - + { "quest", SEC_ADMINISTRATOR, false, NULL, "", questCommandTable }, { "reload", SEC_ADMINISTRATOR, true, NULL, "", reloadCommandTable }, { "list", SEC_ADMINISTRATOR, true, NULL, "", listCommandTable }, @@ -579,7 +579,7 @@ ChatCommand * ChatHandler::getCommandTable() { "aura", SEC_ADMINISTRATOR, false, &ChatHandler::HandleAuraCommand, "", NULL }, { "unaura", SEC_ADMINISTRATOR, false, &ChatHandler::HandleUnAuraCommand, "", NULL }, - { "nameannounce", SEC_MODERATOR, false, &ChatHandler::HandleNameAnnounceCommand, "", NULL }, + { "nameannounce", SEC_MODERATOR, false, &ChatHandler::HandleNameAnnounceCommand, "", NULL }, { "gmnameannounce", SEC_MODERATOR, false, &ChatHandler::HandleGMNameAnnounceCommand, "", NULL }, { "announce", SEC_MODERATOR, true, &ChatHandler::HandleAnnounceCommand, "", NULL }, { "gmannounce", SEC_MODERATOR, true, &ChatHandler::HandleGMAnnounceCommand, "", NULL }, @@ -649,10 +649,10 @@ ChatCommand * ChatHandler::getCommandTable() { "sendmessage", SEC_ADMINISTRATOR, true, &ChatHandler::HandleSendMessageCommand, "", NULL }, { "playall", SEC_ADMINISTRATOR, false, &ChatHandler::HandlePlayAllCommand, "", NULL }, { "repairitems", SEC_GAMEMASTER, false, &ChatHandler::HandleRepairitemsCommand, "", NULL }, - { "freeze", SEC_ADMINISTRATOR, false, &ChatHandler::HandleFreezeCommand, "", NULL }, - { "unfreeze", SEC_ADMINISTRATOR, false, &ChatHandler::HandleUnFreezeCommand, "", NULL }, - { "listfreeze", SEC_ADMINISTRATOR, false, &ChatHandler::HandleListFreezeCommand, "", NULL }, - { "flusharenapoints", SEC_ADMINISTRATOR, false, &ChatHandler::HandleFlushArenaPointsCommand, "", NULL }, + { "freeze", SEC_ADMINISTRATOR, false, &ChatHandler::HandleFreezeCommand, "", NULL }, + { "unfreeze", SEC_ADMINISTRATOR, false, &ChatHandler::HandleUnFreezeCommand, "", NULL }, + { "listfreeze", SEC_ADMINISTRATOR, false, &ChatHandler::HandleListFreezeCommand, "", NULL }, + { "flusharenapoints", SEC_ADMINISTRATOR, false, &ChatHandler::HandleFlushArenaPointsCommand, "", NULL }, { "possess", SEC_ADMINISTRATOR, false, &ChatHandler::HandlePossessCommand, "", NULL }, { "unpossess", SEC_ADMINISTRATOR, false, &ChatHandler::HandleUnPossessCommand, "", NULL }, { "bindsight", SEC_ADMINISTRATOR, false, &ChatHandler::HandleBindSightCommand, "", NULL }, diff --git a/src/game/Chat.h b/src/game/Chat.h index dd7f811d692..8f75ae9ec9b 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -71,6 +71,7 @@ class ChatHandler std::string PGetParseString(int32 entry, ...); int ParseCommands(const char* text); + protected: explicit ChatHandler() : m_session(NULL) {} // for CLI subclass @@ -415,7 +416,7 @@ class ChatHandler bool HandleResetAllCommand(const char * args); - + // GM ticket command handlers bool HandleGMTicketListCommand(const char* args); bool HandleGMTicketListOnlineCommand(const char* args); @@ -438,7 +439,7 @@ class ChatHandler bool HandlePasswordCommand(const char* args); bool HandleLockAccountCommand(const char* args); bool HandleRespawnCommand(const char* args); - + //New Wp Commands bool HandleWpAddCommand(const char* args); bool HandleWpLoadPathCommand(const char* args); @@ -527,7 +528,7 @@ class ChatHandler void SetSentErrorMessage(bool val){ sentErrorMessage = val;}; private: WorldSession * m_session; // != NULL for chat command call and NULL for CLI command - + // common global flag static bool load_command_table; bool sentErrorMessage; diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp index 3dc5c0dae51..8a79dc42397 100644 --- a/src/game/ChatHandler.cpp +++ b/src/game/ChatHandler.cpp @@ -318,7 +318,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data ) Group *group = GetPlayer()->GetGroup(); if(!group || !group->isRaidGroup() || group->isBGGroup()) return; - + WorldPacket data; ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID, lang, "", 0, msg.c_str(),NULL); group->BroadcastPacket(&data); diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 83a4a45f5f5..ca8fd942e76 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -199,10 +199,10 @@ void Creature::RemoveFromWorld() void Creature::SearchFormation() { uint32 lowguid = GetDBTableGUIDLow(); - + if(CreatureGroupMap.find(lowguid) != CreatureGroupMap.end()) { - m_formationID = CreatureGroupMap[lowguid]->leaderGUID; + m_formationID = CreatureGroupMap[lowguid]->leaderGUID; formation_mgr.UpdateCreatureGroup(m_formationID, this); } } @@ -415,7 +415,7 @@ void Creature::Update(uint32 diff) CreatureInfo const *cinfo = GetCreatureInfo(); SelectLevel(cinfo); - + if (m_isDeadByDefault) { setDeathState(JUST_DIED); @@ -1425,7 +1425,7 @@ bool Creature::LoadFromDB(uint32 guid, Map *map) } //We should set first home position, because then AI calls home movement SetHomePosition(data->posX,data->posY,data->posZ,data->orientation); - + m_respawnradius = data->spawndist; m_respawnDelay = data->spawntimesecs; diff --git a/src/game/Creature.h b/src/game/Creature.h index a4ad51b2cdc..8d2adeb687a 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -625,10 +625,10 @@ class TRINITY_DLL_SPEC Creature : public Unit void GetHomePosition(float &x, float &y, float &z, float &ori) { x = mHome_X; y = mHome_Y; z = mHome_Z; ori = mHome_O; } uint32 GetGlobalCooldown() const { return m_GlobalCooldown; } - + uint32 GetWaypointPath(){return m_path_id;} void LoadPath(uint32 pathid) { m_path_id = pathid; } - + uint32 GetCurrentWaypointID(){return m_waypointID;} void UpdateWaypointID(uint32 wpID){m_waypointID = wpID;} @@ -677,7 +677,6 @@ class TRINITY_DLL_SPEC Creature : public Unit bool m_AlreadyCallAssistance; bool m_regenHealth; bool m_AI_locked; - bool m_AI_enabled; bool m_isDeadByDefault; SpellSchoolMask m_meleeDamageSchoolMask; @@ -692,7 +691,7 @@ class TRINITY_DLL_SPEC Creature : public Unit //WaypointMovementGenerator vars uint32 m_waypointID; uint32 m_path_id; - + //Formation var uint32 m_formationID; diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h index d8be71c830b..4e0051c3d0c 100644 --- a/src/game/CreatureAI.h +++ b/src/game/CreatureAI.h @@ -129,7 +129,7 @@ class TRINITY_DLL_SPEC CreatureAI : public UnitAI virtual void SpellHit(Unit*, const SpellEntry*) {} // Called when spell hits a target - virtual void SpellHitTarget(Unit* target, const SpellEntry*) {} + virtual void SpellHitTarget(Unit* target, const SpellEntry*) {} // Called when vitim entered water and creature can not enter water virtual bool canReachByRangeAttack(Unit*) { return false; } diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp index ab19f61537d..8b4205980be 100644 --- a/src/game/CreatureAISelector.cpp +++ b/src/game/CreatureAISelector.cpp @@ -58,7 +58,7 @@ namespace FactorySelector if(!ai_factory) { if( creature->isGuard() ) - ai_factory = ai_registry.GetRegistryItem("GuardAI"); + ai_factory = ai_registry.GetRegistryItem("GuardAI"); else if(creature->isPet() || (creature->isCharmed() && !creature->isPossessed())) ai_factory = ai_registry.GetRegistryItem("PetAI"); else if(creature->isTotem()) diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp index c96c1c0e98a..9c6ffeea57f 100644 --- a/src/game/CreatureGroups.cpp +++ b/src/game/CreatureGroups.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -34,7 +34,7 @@ UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap; void CreatureGroupManager::UpdateCreatureGroup(uint32 group_id, Creature *member) { if(CreatureGroupHolder.find(group_id) != CreatureGroupHolder.end()) - { + { sLog.outDebug("Group found: %u, inserting creature GUID: %u", group_id, member->GetGUIDLow()); CreatureGroupHolder[group_id]->AddMember(member); } @@ -67,10 +67,10 @@ void CreatureGroupManager::LoadCreatureFormations() { //Clear existing map CreatureGroupMap.clear(); - + //Check Integrity of the table QueryResult *result = WorldDatabase.PQuery("SELECT MAX(`leaderGUID`) FROM `creature_formations`"); - + if(!result) { sLog.outErrorDb(" an error occured while loading the table `creature_formations` ( maybe it doesn't exist ?)\n"); @@ -80,7 +80,7 @@ void CreatureGroupManager::LoadCreatureFormations() //Get group data result = WorldDatabase.PQuery("SELECT `leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI` FROM `creature_formations` ORDER BY `leaderGUID`"); - + if(!result) { sLog.outErrorDb("The table `creature_formations` is empty or corrupted"); @@ -90,13 +90,13 @@ void CreatureGroupManager::LoadCreatureFormations() uint32 total_records = result->GetRowCount(), lastLeaderGUID = 0; barGoLink bar( total_records); Field *fields; - + FormationMember *group_member; //Loading data... do { fields = result->Fetch(); - + bar.step(); //Load group member data group_member = new FormationMember; @@ -109,14 +109,14 @@ void CreatureGroupManager::LoadCreatureFormations() group_member->follow_dist = fields[2].GetUInt32(); group_member->follow_angle = fields[3].GetUInt32(); } - + CreatureGroupMap[group_member->memberGUID] = group_member; - + if(lastLeaderGUID != group_member->leaderGUID) lastLeaderGUID = group_member->leaderGUID; - } + } while(result->NextRow()) ; - + sLog.outString(); sLog.outString( ">> Loaded %u creatures in formations", total_records ); sLog.outString(); @@ -127,14 +127,14 @@ void CreatureGroupManager::LoadCreatureFormations() void CreatureGroup::AddMember(Creature *member) { sLog.outDebug("Adding unit GUID: %u.", member->GetGUIDLow()); - + uint64 guid = member->GetGUID(); //We first search creature member if exist if(CreatureGroupMembers.find(guid) != CreatureGroupMembers.end()) return; //Check is that shit is a leader if(member->IsFormationLeader()) - { + { sLog.outDebug("Unit GUID: %u is formation leader. Adding group.", member->GetGUIDLow()); m_leader = member; } @@ -146,7 +146,7 @@ void CreatureGroup::AddMember(Creature *member) void CreatureGroup::RemoveMember(uint64 guid) { if(CreatureGroupMembers.find(guid) != CreatureGroupMembers.end()) - CreatureGroupMembers.erase(guid); + CreatureGroupMembers.erase(guid); } void CreatureGroup::MemberHasAttacked(Creature *member) @@ -165,9 +165,9 @@ void CreatureGroup::MemberHasAttacked(Creature *member) case 1: if(!member->IsFormationLeader()) return; - } + } //Attack if everything is OK - itr->second->AI()->AttackStart(member->getVictim()); + itr->second->AI()->AttackStart(member->getVictim()); } } } @@ -177,31 +177,31 @@ void CreatureGroup::LeaderMovedInEvade() for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); itr++) { if(itr->second && itr->second->isAlive() && !itr->second->isInCombat() && !itr->second->getVictim()) - SetMemberDestination(itr->second); + SetMemberDestination(itr->second); } } - + void CreatureGroup::SetMemberDestination(Creature *member) { if(!member || !m_leader || member->IsFormationLeader()) return; - + float x,y,z; uint32 lowguid = member->GetGUIDLow(); - + UNORDERED_MAP<uint32, FormationMember*>::iterator itr2 = CreatureGroupMap.find(lowguid); - + if(m_leader->GetMotionMaster()->GetDestination(x,y,z) && itr2 != CreatureGroupMap.end()) - { + { float dist, angle, pathangle; - - angle = CreatureGroupMap[lowguid]->follow_angle; - dist = CreatureGroupMap[lowguid]->follow_dist; + + angle = CreatureGroupMap[lowguid]->follow_angle; + dist = CreatureGroupMap[lowguid]->follow_dist; pathangle = atan2(m_leader->GetPositionY()-y, m_leader->GetPositionX()-x); - + x = x+cos(angle+pathangle)*dist; y = y+sin(angle+pathangle)*dist; - + member->GetMotionMaster()->Clear(); if(member->GetDistance(m_leader) < dist+MAX_DESYNC) diff --git a/src/game/CreatureGroups.h b/src/game/CreatureGroups.h index 48bd4916817..0aaf8fd562b 100644 --- a/src/game/CreatureGroups.h +++ b/src/game/CreatureGroups.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -27,9 +27,9 @@ struct FormationMember { - float follow_dist; - float follow_angle; - uint32 memberGUID; + float follow_dist; + float follow_angle; + uint32 memberGUID; uint32 leaderGUID; uint8 groupAI; }; @@ -46,7 +46,7 @@ class CreatureGroup { UNORDERED_MAP<uint64, Creature*>CreatureGroupMembers; Creature *m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D - + public: CreatureGroup() : m_leader(NULL) {} ~CreatureGroup(){sLog.outDebug("Destroying group");} diff --git a/src/game/DestinationHolderImp.h b/src/game/DestinationHolderImp.h index de89297ef99..963e074fff9 100644 --- a/src/game/DestinationHolderImp.h +++ b/src/game/DestinationHolderImp.h @@ -160,13 +160,13 @@ DestinationHolder<TRAVELLER>::UpdateTraveller(TRAVELLER &traveller, uint32 diff, } // Change movement computation to micro movement based on last tick coords, this makes system work // even on multiple floors zones without hugh vmaps usage ;) - + // Take care of underrun of uint32 if (i_totalTravelTime >= i_timeElapsed) i_totalTravelTime -= i_timeElapsed; // Consider only the remaining part else i_totalTravelTime = 0; - + i_timeElapsed = 0; i_fromX = x; // and change origine i_fromY = y; // then I take into account only micro movement diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp index 1e356cd95d3..09856f1233e 100644 --- a/src/game/DynamicObject.cpp +++ b/src/game/DynamicObject.cpp @@ -156,7 +156,7 @@ void DynamicObject::Delay(int32 delaytime) bool DynamicObject::isVisibleForInState(Player const* u, bool inVisibleList) const { - return IsInWorld() && u->IsInWorld() + return IsInWorld() && u->IsInWorld() && (IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false) || GetCasterGUID() == u->GetGUID()); } diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp index 72d7ab1c3eb..c64b653d5e9 100644 --- a/src/game/FleeingMovementGenerator.cpp +++ b/src/game/FleeingMovementGenerator.cpp @@ -53,14 +53,14 @@ template<> bool FleeingMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const { if(i_destinationHolder.HasArrived()) - return false; - - i_destinationHolder.GetDestination(x, y, z); + return false; + + i_destinationHolder.GetDestination(x, y, z); return true; } template<> -bool FleeingMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const +bool FleeingMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const { return false; } diff --git a/src/game/GameEvent.cpp b/src/game/GameEvent.cpp index eea76896053..62f285e25ac 100644 --- a/src/game/GameEvent.cpp +++ b/src/game/GameEvent.cpp @@ -238,7 +238,7 @@ void GameEvent::LoadFromDB() } // load game event saves - // 0 1 2 + // 0 1 2 result = CharacterDatabase.Query("SELECT event_id, state, UNIX_TIMESTAMP(next_start) FROM game_event_save"); count = 0; @@ -624,7 +624,7 @@ void GameEvent::LoadFromDB() } // load conditions of the events - // 0 1 2 3 4 + // 0 1 2 3 4 result = WorldDatabase.Query("SELECT event_id, condition_id, req_num, max_world_state_field, done_world_state_field FROM game_event_condition"); count = 0; @@ -669,7 +669,7 @@ void GameEvent::LoadFromDB() } // load condition saves - // 0 1 2 + // 0 1 2 result = CharacterDatabase.Query("SELECT event_id, condition_id, done FROM game_event_condition_save"); count = 0; @@ -1388,7 +1388,7 @@ void GameEvent::UpdateEventQuests(uint16 event_id, bool Activate) if (Activate) // Add the pair(id,quest) to the multimap CreatureQuestMap.insert(QuestRelations::value_type(itr->first, itr->second)); else - { + { if(!hasCreatureQuestActiveEventExcept(itr->second,event_id)) { // Remove the pair(id,quest) from the multimap @@ -1413,7 +1413,7 @@ void GameEvent::UpdateEventQuests(uint16 event_id, bool Activate) if (Activate) // Add the pair(id,quest) to the multimap GameObjectQuestMap.insert(QuestRelations::value_type(itr->first, itr->second)); else - { + { if(!hasGameObjectQuestActiveEventExcept(itr->second,event_id)) { // Remove the pair(id,quest) from the multimap diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp index d935db70fa4..638de03fe45 100644 --- a/src/game/GridNotifiers.cpp +++ b/src/game/GridNotifiers.cpp @@ -149,7 +149,7 @@ VisibleNotifier::Notify() i_player.SendAurasForTarget((Unit*)(*vItr)); } -void +void Deliverer::Visit(PlayerMapType &m) { for (PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter) @@ -174,7 +174,7 @@ Deliverer::Visit(PlayerMapType &m) } } -void +void Deliverer::Visit(CreatureMapType &m) { for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h index 887855593b1..302312e721a 100644 --- a/src/game/GridNotifiers.h +++ b/src/game/GridNotifiers.h @@ -107,7 +107,7 @@ namespace Trinity void SendPacket(Player* plr); template<class SKIP> void Visit(GridRefManager<SKIP> &) {} }; - + struct TRINITY_DLL_DECL MessageDeliverer : public Deliverer { MessageDeliverer(Player &pl, WorldPacket *msg, bool to_possessor, bool to_self) : Deliverer(pl, msg, to_possessor, to_self) {} @@ -631,7 +631,7 @@ namespace Trinity Unit const* i_funit; float i_range; }; - + class CreatureWithDbGUIDCheck { public: @@ -750,7 +750,7 @@ namespace Trinity class NearestHostileUnitInAttackDistanceCheck { public: - explicit NearestHostileUnitInAttackDistanceCheck(Creature const* creature, float dist = 0) : m_creature(creature) + explicit NearestHostileUnitInAttackDistanceCheck(Creature const* creature, float dist = 0) : m_creature(creature) { m_range = (dist == 0 ? 9999 : dist); m_force = (dist == 0 ? false : true); @@ -926,7 +926,7 @@ namespace Trinity FriendlyMissingBuffInRange(Unit const* obj, float range, uint32 spellid) : i_obj(obj), i_range(range), i_spell(spellid) {} bool operator()(Unit* u) { - if(u->isAlive() && u->isInCombat() && /*!i_obj->IsHostileTo(u)*/ i_obj->IsFriendlyTo(u) && i_obj->IsWithinDistInMap(u, i_range) && + if(u->isAlive() && u->isInCombat() && /*!i_obj->IsHostileTo(u)*/ i_obj->IsFriendlyTo(u) && i_obj->IsWithinDistInMap(u, i_range) && !(u->HasAura(i_spell, 0) || u->HasAura(i_spell, 1) || u->HasAura(i_spell, 2))) { return true; diff --git a/src/game/Group.h b/src/game/Group.h index 1e98cd2905e..d42f6305ee9 100644 --- a/src/game/Group.h +++ b/src/game/Group.h @@ -225,7 +225,7 @@ class TRINITY_DLL_SPEC Group return (mslot1->group==slot2->group); } - + bool HasFreeSlotSubGroup(uint8 subgroup) const { return (m_subGroupsCounts && m_subGroupsCounts[subgroup] < MAXGROUPSIZE); @@ -348,15 +348,15 @@ class TRINITY_DLL_SPEC Group bool _setMainAssistant(const uint64 &guid); void _homebindIfInstance(Player *player); - + void _initRaidSubGroupsCounter() { // Sub group counters initialization if (!m_subGroupsCounts) m_subGroupsCounts = new uint8[MAXRAIDSIZE / MAXGROUPSIZE]; - + memset((void*)m_subGroupsCounts, 0, (MAXRAIDSIZE / MAXGROUPSIZE)*sizeof(uint8)); - + for (member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) ++m_subGroupsCounts[itr->group]; } @@ -380,13 +380,13 @@ class TRINITY_DLL_SPEC Group } return m_memberSlots.end(); } - + void SubGroupCounterIncrease(uint8 subgroup) { if (m_subGroupsCounts) ++m_subGroupsCounts[subgroup]; } - + void SubGroupCounterDecrease(uint8 subgroup) { if (m_subGroupsCounts) diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index 115c1195a83..6bcc4a4d8cc 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -550,7 +550,7 @@ void WorldSession::HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data ) /** error handling **/ if(!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID())) return; - + if (!group->HasFreeSlotSubGroup(groupNr)) return; /********************/ diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp index c2884b56d24..f1a59814d57 100644 --- a/src/game/GuildHandler.cpp +++ b/src/game/GuildHandler.cpp @@ -166,13 +166,13 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket) SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD); return; } - + if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_REMOVE)) { SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS); return; } - + uint64 plGuid; MemberSlot* slot = guild->GetMemberSlot(plName, plGuid); if(!slot) @@ -282,7 +282,7 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket) if(!normalizePlayerName(plName)) return; - + Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId()); if(!guild) { @@ -294,7 +294,7 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket) SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS); return; } - + uint64 plGuid; MemberSlot* slot = guild->GetMemberSlot(plName, plGuid); @@ -309,7 +309,7 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket) SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_NAME_INVALID); return; } - + if(slot->RankId < 2 || (slot->RankId-1) < GetPlayer()->GetRank()) return; @@ -348,13 +348,13 @@ void WorldSession::HandleGuildDemoteOpcode(WorldPacket& recvPacket) SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD); return; } - + if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_DEMOTE)) { SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS); return; } - + uint64 plGuid; MemberSlot* slot = guild->GetMemberSlot(plName, plGuid); @@ -466,15 +466,15 @@ void WorldSession::HandleGuildLeaderOpcode(WorldPacket& recvPacket) if(!normalizePlayerName(name)) return; - + guild = objmgr.GetGuildById(oldLeader->GetGuildId()); - + if (!guild) { SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD); return; } - + if( oldLeader->GetGUID() != guild->GetLeader()) { SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS); @@ -557,13 +557,13 @@ void WorldSession::HandleGuildSetPublicNoteOpcode(WorldPacket& recvPacket) SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD); return; } - + if (!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_EPNOTE)) { SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS); return; } - + uint64 plGuid; MemberSlot* slot = guild->GetMemberSlot(name, plGuid); @@ -603,10 +603,10 @@ void WorldSession::HandleGuildSetOfficerNoteOpcode(WorldPacket& recvPacket) SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS); return; } - + uint64 plGuid; MemberSlot* slot = guild->GetMemberSlot(plName, plGuid); - + if (!slot) { SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S); diff --git a/src/game/Item.cpp b/src/game/Item.cpp index fbc39e7acf5..e8280711143 100644 --- a/src/game/Item.cpp +++ b/src/game/Item.cpp @@ -288,7 +288,7 @@ void Item::UpdateDuration(Player* owner, uint32 diff) } SetUInt32Value(ITEM_FIELD_DURATION, GetUInt32Value(ITEM_FIELD_DURATION) - diff); - SetState(ITEM_CHANGED); // save new time in database + SetState(ITEM_CHANGED, owner); // save new time in database } void Item::SaveToDB() diff --git a/src/game/Item.h b/src/game/Item.h index 5b06e24b9aa..8869f2ac013 100644 --- a/src/game/Item.h +++ b/src/game/Item.h @@ -167,6 +167,8 @@ enum EnchantmentSlot #define MAX_VISIBLE_ITEM_OFFSET 18 // 18 fields per visible item (creator(2) + enchantments(13) + properties(1) + seed(1) + pad(1)) +#define MAX_GEM_SOCKETS 3 // (BONUS_ENCHANTMENT_SLOT-SOCK_ENCHANTMENT_SLOT) + enum EnchantmentOffset { ENCHANTMENT_ID_OFFSET = 0, diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp index 50110c3562d..814cfc674c3 100644 --- a/src/game/ItemHandler.cpp +++ b/src/game/ItemHandler.cpp @@ -1111,55 +1111,80 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) { sLog.outDebug("WORLD: CMSG_SOCKET_GEMS"); - CHECK_PACKET_SIZE(recv_data,8*4); + CHECK_PACKET_SIZE(recv_data,8+8*MAX_GEM_SOCKETS); - uint64 guids[4]; - for(int i = 0; i < 4; i++) - recv_data >> guids[i]; + uint64 item_guid; + uint64 gem_guids[MAX_GEM_SOCKETS]; - if(!guids[0]) + recv_data >> item_guid; + if(!item_guid) return; + for(int i = 0; i < MAX_GEM_SOCKETS; ++i) + recv_data >> gem_guids[i]; + //cheat -> tried to socket same gem multiple times - if((guids[1] && (guids[1] == guids[2] || guids[1] == guids[3])) || (guids[2] && (guids[2] == guids[3]))) + if ((gem_guids[0] && (gem_guids[0] == gem_guids[1] || gem_guids[0] == gem_guids[2])) || + (gem_guids[1] && (gem_guids[1] == gem_guids[2]))) return; - Item *itemTarget = _player->GetItemByGuid(guids[0]); + Item *itemTarget = _player->GetItemByGuid(item_guid); if(!itemTarget) //missing item to socket return; + ItemPrototype const* itemProto = itemTarget->GetProto(); + if(!itemProto) + return; + //this slot is excepted when applying / removing meta gem bonus uint8 slot = itemTarget->IsEquipped() ? itemTarget->GetSlot() : NULL_SLOT; - Item *Gems[3]; - for(int i = 0; i < 3; i++) - Gems[i] = guids[i + 1] ? _player->GetItemByGuid(guids[i + 1]) : NULL; + Item *Gems[MAX_GEM_SOCKETS]; + for(int i = 0; i < MAX_GEM_SOCKETS; ++i) + Gems[i] = gem_guids[i] ? _player->GetItemByGuid(gem_guids[i]) : NULL; - GemPropertiesEntry const *GemProps[3]; - for(int i = 0; i < 3; ++i) //get geminfo from dbc storage - { + GemPropertiesEntry const *GemProps[MAX_GEM_SOCKETS]; + for(int i = 0; i < MAX_GEM_SOCKETS; ++i) //get geminfo from dbc storage GemProps[i] = (Gems[i]) ? sGemPropertiesStore.LookupEntry(Gems[i]->GetProto()->GemProperties) : NULL; - } - for(int i = 0; i < 3; ++i) //check for hack maybe + for(int i = 0; i < MAX_GEM_SOCKETS; ++i) //check for hack maybe { - // tried to put gem in socket where no socket exists / tried to put normal gem in meta socket + if (!GemProps[i]) + continue; + + // tried to put gem in socket where no socket exists (take care about prismatic sockets) + if (!itemProto->Socket[i].Color) + { + // no prismatic socket + if(!itemTarget->GetEnchantmentId(PRISMATIC_ENCHANTMENT_SLOT)) + return; + + // not first not-colored (not normaly used) socket + if(i!=0 && !itemProto->Socket[i-1].Color && (i+1 >= MAX_GEM_SOCKETS || itemProto->Socket[i+1].Color)) + return; + + // ok, this is first not colored socket for item with prismatic socket + } + + // tried to put normal gem in meta socket + if (itemProto->Socket[i].Color == SOCKET_COLOR_META && GemProps[i]->color != SOCKET_COLOR_META) + return; + // tried to put meta gem in normal socket - if( GemProps[i] && ( !itemTarget->GetProto()->Socket[i].Color || - itemTarget->GetProto()->Socket[i].Color == SOCKET_COLOR_META && GemProps[i]->color != SOCKET_COLOR_META || - itemTarget->GetProto()->Socket[i].Color != SOCKET_COLOR_META && GemProps[i]->color == SOCKET_COLOR_META ) ) + if (itemProto->Socket[i].Color != SOCKET_COLOR_META && GemProps[i]->color == SOCKET_COLOR_META) return; } - uint32 GemEnchants[3], OldEnchants[3]; - for(int i = 0; i < 3; ++i) //get new and old enchantments + uint32 GemEnchants[MAX_GEM_SOCKETS]; + uint32 OldEnchants[MAX_GEM_SOCKETS]; + for(int i = 0; i < MAX_GEM_SOCKETS; ++i) //get new and old enchantments { GemEnchants[i] = (GemProps[i]) ? GemProps[i]->spellitemenchantement : 0; OldEnchants[i] = itemTarget->GetEnchantmentId(EnchantmentSlot(SOCK_ENCHANTMENT_SLOT+i)); } // check unique-equipped conditions - for(int i = 0; i < 3; ++i) + for(int i = 0; i < MAX_GEM_SOCKETS; ++i) { if (Gems[i] && (Gems[i]->GetProto()->Flags & ITEM_FLAGS_UNIQUE_EQUIPPED)) { @@ -1174,7 +1199,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) } // continue check for case when attempt add 2 similar unique equipped gems in one item. - for (int j = 0; j < 3; ++j) + for (int j = 0; j < MAX_GEM_SOCKETS; ++j) { if ((i != j) && (Gems[j]) && (Gems[i]->GetProto()->ItemId == Gems[j]->GetProto()->ItemId)) { @@ -1182,7 +1207,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) return; } } - for (int j = 0; j < 3; ++j) + for (int j = 0; j < MAX_GEM_SOCKETS; ++j) { if (OldEnchants[j]) { @@ -1206,20 +1231,20 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) //if a meta gem is being equipped, all information has to be written to the item before testing if the conditions for the gem are met //remove ALL enchants - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot) + for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) _player->ApplyEnchantment(itemTarget,EnchantmentSlot(enchant_slot),false); - for(int i = 0; i < 3; ++i) + for(int i = 0; i < MAX_GEM_SOCKETS; ++i) { if(GemEnchants[i]) { itemTarget->SetEnchantment(EnchantmentSlot(SOCK_ENCHANTMENT_SLOT+i), GemEnchants[i],0,0); - if(Item* guidItem = _player->GetItemByGuid(guids[i + 1])) + if(Item* guidItem = _player->GetItemByGuid(gem_guids[i])) _player->DestroyItem(guidItem->GetBagSlot(), guidItem->GetSlot(), true ); } } - for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot) + for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) _player->ApplyEnchantment(itemTarget,EnchantmentSlot(enchant_slot),true); bool SocketBonusToBeActivated = itemTarget->GemsFitSockets();//current socketbonus state diff --git a/src/game/Language.h b/src/game/Language.h index f38db2e3853..0e97036fb36 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -272,7 +272,7 @@ enum TrinityStrings LANG_COMMAND_WHISPEROFF = 286, LANG_COMMAND_CREATGUIDNOTFOUND = 287, // TICKET STRINGS NEED REWRITE // 288-296 FREE - + // END LANG_COMMAND_SPAWNDIST = 297, LANG_COMMAND_SPAWNTIME = 298, @@ -789,15 +789,15 @@ enum TrinityStrings // Room for more level 3 1123-1199 not used // FREE IDS 1200-9999 - + // Ticket Strings 2000-2029 - LANG_COMMAND_TICKETNEW = 2000, - LANG_COMMAND_TICKETUPDATED = 2001, + LANG_COMMAND_TICKETNEW = 2000, + LANG_COMMAND_TICKETUPDATED = 2001, LANG_COMMAND_TICKETPLAYERABANDON = 2002, LANG_COMMAND_TICKETCLOSED = 2003, LANG_COMMAND_TICKETDELETED = 2004, LANG_COMMAND_TICKETNOTEXIST = 2005, - LANG_COMMAND_TICKETCLOSEFIRST = 2006, + LANG_COMMAND_TICKETCLOSEFIRST = 2006, LANG_COMMAND_TICKETALREADYASSIGNED = 2007, LANG_COMMAND_TICKETRELOAD = 2008, LANG_COMMAND_TICKETSHOWLIST = 2009, @@ -830,7 +830,7 @@ enum TrinityStrings LANG_INSTANCE_NOT_AS_GHOST = 5008, LANG_COMMAND_PLAYED_TO_ALL = 5009, // Room for more Trinity strings 5010-9999 - // Used for GM Announcements + // Used for GM Announcements LANG_GM_BROADCAST = 6613, LANG_GM_NOTIFY = 6614, LANG_GM_ANNOUNCE_COLOR = 6615, diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 49cda43682f..48b2b57355f 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -139,7 +139,7 @@ bool ChatHandler::HandleGMNameAnnounceCommand(const char* args) WorldPacket data; if(!*args) return false; - + sWorld.SendGMText(LANG_GM_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args); return true; } @@ -309,7 +309,7 @@ bool ChatHandler::HandleGMTicketListOnlineCommand(const char* args) { if((*itr)->closed != 0 || !objmgr.GetPlayer((*itr)->playerGuid)) continue; - + std::string gmname; std::stringstream ss; ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, (*itr)->guid); @@ -331,7 +331,7 @@ bool ChatHandler::HandleGMTicketListClosedCommand(const char* args) { if((*itr)->closed == 0) continue; - + std::string gmname; std::stringstream ss; ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, (*itr)->guid); @@ -350,7 +350,7 @@ bool ChatHandler::HandleGMTicketGetByIdCommand(const char* args) { if(!*args) return false; - + uint64 tguid = atoi(args); GM_Ticket *ticket = ticketmgr.GetGMTicket(tguid); if(!ticket) @@ -358,7 +358,7 @@ bool ChatHandler::HandleGMTicketGetByIdCommand(const char* args) SendSysMessage(LANG_COMMAND_TICKETNOTEXIST); return true; } - + std::string gmname; std::stringstream ss; ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, ticket->guid); @@ -381,14 +381,14 @@ bool ChatHandler::HandleGMTicketGetByNameCommand(const char* args) { if(!*args) return false; - + GM_Ticket *ticket = ticketmgr.GetGMTicketByName(args); if(!ticket) { SendSysMessage(LANG_COMMAND_TICKETNOTEXIST); return true; } - + std::string gmname; std::stringstream ss; ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, ticket->guid); @@ -411,7 +411,7 @@ bool ChatHandler::HandleGMTicketCloseByIdCommand(const char* args) { if(!*args) return false; - + uint64 tguid = atoi(args); GM_Ticket *ticket = ticketmgr.GetGMTicket(tguid); if(!ticket || ticket->closed != 0) @@ -487,7 +487,7 @@ bool ChatHandler::HandleGMTicketAssignToCommand(const char* args) PSendSysMessage(LANG_COMMAND_TICKETALREADYASSIGNED, ticket->guid, gmname.c_str()); return true; } - + ticket->assignedToGM = tarGUID; ticketmgr.UpdateGMTicket(ticket); std::stringstream ss; @@ -520,13 +520,13 @@ bool ChatHandler::HandleGMTicketUnAssignCommand(const char* args) std::string gmname; objmgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname); - Player *plr = objmgr.GetPlayer(ticket->assignedToGM); + Player *plr = objmgr.GetPlayer(ticket->assignedToGM); if(plr && plr->IsInWorld() && plr->GetSession()->GetSecurity() > cplr->GetSession()->GetSecurity()) { SendSysMessage(LANG_COMMAND_TICKETUNASSIGNSECURITY); return true; } - + std::stringstream ss; ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, ticket->guid); ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, ticket->name.c_str()); @@ -580,7 +580,7 @@ bool ChatHandler::HandleGMTicketCommentCommand(const char* args) return true; } -bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args) +bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args) { if(!*args) return false; @@ -597,7 +597,7 @@ bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args) SendSysMessage(LANG_COMMAND_TICKETCLOSEFIRST); return true; } - + std::stringstream ss; ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, ticket->guid); ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, ticket->name.c_str()); diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 0755af985da..05e3e3437cb 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -1661,7 +1661,7 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args) if(kickReason) reason = kickReason; if(m_session) - kicker = m_session->GetPlayer()->GetName(); + kicker = m_session->GetPlayer()->GetName(); if(!kickName) { @@ -1672,7 +1672,7 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args) SetSentErrorMessage(true); return false; } - + if(player==m_session->GetPlayer()) { SendSysMessage(LANG_COMMAND_KICKSELF); @@ -1719,7 +1719,7 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args) SetSentErrorMessage(true); return false; } - + if(HasLowerSecurity(player, 0)) { SendSysMessage(LANG_YOURS_SECURITY_IS_LOW); //maybe replacement string for this later on @@ -2214,21 +2214,21 @@ bool ChatHandler::HandleWpAddCommand(const char* args) // optional char* path_number = NULL; uint32 pathid = 0; - + if(*args) path_number = strtok((char*)args, " "); - + uint32 point = 0; Creature* target = getSelectedCreature(); - + if (!path_number) { if(target) pathid = target->GetWaypointPath(); - else + else { QueryResult *result = WorldDatabase.PQuery( "SELECT MAX(id) FROM waypoint_data"); - uint32 maxpathid = result->Fetch()->GetInt32(); + uint32 maxpathid = result->Fetch()->GetInt32(); pathid = maxpathid+1; sLog.outDebug("DEBUG: HandleWpAddCommand - New path started."); PSendSysMessage("%s%s|r", "|cff00ff00", "New path started."); @@ -2236,27 +2236,27 @@ bool ChatHandler::HandleWpAddCommand(const char* args) } else pathid = atoi(path_number); - + // path_id -> ID of the Path // point -> number of the waypoint (if not 0) - + if(!pathid) { sLog.outDebug("DEBUG: HandleWpAddCommand - Current creature haven't loaded path."); PSendSysMessage("%s%s|r", "|cffff33ff", "Current creature haven't loaded path."); return true; } - + sLog.outDebug("DEBUG: HandleWpAddCommand - point == 0"); QueryResult *result = WorldDatabase.PQuery( "SELECT MAX(point) FROM waypoint_data WHERE id = '%u'",pathid); - + if( result ) { point = (*result)[0].GetUInt32(); delete result; } - + Player* player = m_session->GetPlayer(); Map *map = player->GetMap(); @@ -2264,7 +2264,7 @@ bool ChatHandler::HandleWpAddCommand(const char* args) pathid, point+1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); PSendSysMessage("%s%s%u%s%u%s|r", "|cff00ff00", "PathID: |r|cff00ffff", pathid, "|r|cff00ff00: Waypoint |r|cff00ffff", point,"|r|cff00ff00 created. "); - + return true; } // HandleWpAddCommand @@ -2272,29 +2272,29 @@ bool ChatHandler::HandleWpLoadPathCommand(const char *args) { if(!*args) return false; - + // optional char* path_number = NULL; if(*args) path_number = strtok((char*)args, " "); - + uint32 pathid = 0; uint32 guidlow = 0; Creature* target = getSelectedCreature(); - + // Did player provide a path_id? if (!path_number) sLog.outDebug("DEBUG: HandleWpLoadPathCommand - No path number provided"); - + if(!target) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); return false; } - + if(target->GetEntry() == 1) { PSendSysMessage("%s%s|r", "|cffff33ff", "You want to load path to a waypoint? Aren't you?"); @@ -2303,16 +2303,16 @@ bool ChatHandler::HandleWpLoadPathCommand(const char *args) } pathid = atoi(path_number); - + if(!pathid) { PSendSysMessage("%s%s|r", "|cffff33ff", "No vallid path number provided."); return true; } - + guidlow = target->GetGUIDLow(); QueryResult *result = WorldDatabase.PQuery( "SELECT guid FROM creature_addon WHERE guid = '%u'",guidlow); - + if( result ) { WorldDatabase.PExecute("UPDATE creature_addon SET path_id = '%u' WHERE guid = '%u'", pathid, guidlow); @@ -2320,15 +2320,15 @@ bool ChatHandler::HandleWpLoadPathCommand(const char *args) } else WorldDatabase.PExecute("INSERT INTO creature_addon(guid,path_id) VALUES ('%u','%u')", guidlow, pathid); - + WorldDatabase.PExecute("UPDATE creature SET MovementType = '%u' WHERE guid = '%u'", WAYPOINT_MOTION_TYPE, guidlow); - + target->LoadPath(pathid); target->SetDefaultMovementType(WAYPOINT_MOTION_TYPE); target->GetMotionMaster()->Initialize(); target->Say("Path loaded.",0,0); - - return true; + + return true; } @@ -2338,7 +2338,7 @@ if(!*args) return false; uint32 id = atoi(args); - + if(!id) return false; @@ -2385,25 +2385,25 @@ if(!*args) return false; char* show_str = strtok((char*)args, " "); - + std::string show = show_str; - + // Check if( (show != "add") && (show != "mod") && (show != "del") && (show != "listid")) return false; - - + + if(show == "add") { uint32 id = 0; - char* arg_id = strtok(NULL, " "); - + char* arg_id = strtok(NULL, " "); + if(arg_id) uint32 id = atoi(arg_id); - + if(id) { QueryResult *result = WorldDatabase.PQuery( "SELECT `id` FROM waypoint_scripts WHERE guid = %u", id); - + if( !result ) { WorldDatabase.PExecute("INSERT INTO waypoint_scripts(guid)VALUES(%u)", id); @@ -2421,38 +2421,38 @@ if(!*args) id = result->Fetch()->GetUInt32(); WorldDatabase.PExecute("INSERT INTO waypoint_scripts(guid)VALUES(%u)", id+1); PSendSysMessage("%s%s%u|r", "|cff00ff00","Wp Event: New waypoint event added: |r|cff00ffff", id+1); - } - + } + return true; } - - + + if(show == "listid") { uint32 id; char* arg_id = strtok(NULL, " "); - + if(!arg_id) { PSendSysMessage("%s%s|r", "|cff33ffff","Wp Event: You must provide waypoint script id."); return true; } - + id = atoi(arg_id); - + uint32 a2, a3, a4, a5, a6; float a8, a9, a10, a11; char const* a7; - + QueryResult *result = WorldDatabase.PQuery( "SELECT `guid`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o` FROM waypoint_scripts WHERE id = %u", id); - + if( !result ) { PSendSysMessage("%s%s%u|r", "|cff33ffff", "Wp Event: No waypoint scripts found on id: ", id); return true; } - - Field *fields; + + Field *fields; do { @@ -2467,21 +2467,21 @@ if(!*args) a9 = fields[7].GetFloat(); a10 = fields[8].GetFloat(); a11 = fields[9].GetFloat(); - + PSendSysMessage("|cffff33ffid:|r|cff00ffff %u|r|cff00ff00, guid: |r|cff00ffff%u|r|cff00ff00, delay: |r|cff00ffff%u|r|cff00ff00, command: |r|cff00ffff%u|r|cff00ff00, datalong: |r|cff00ffff%u|r|cff00ff00, datalong2: |r|cff00ffff%u|r|cff00ff00, datatext: |r|cff00ffff%s|r|cff00ff00, posx: |r|cff00ffff%f|r|cff00ff00, posy: |r|cff00ffff%f|r|cff00ff00, posz: |r|cff00ffff%f|r|cff00ff00, orientation: |r|cff00ffff%f|r", id, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); }while(result->NextRow()); - + delete result; } - + if(show == "del") { - - char* arg_id = strtok(NULL, " "); + + char* arg_id = strtok(NULL, " "); uint32 id = atoi(arg_id); - + QueryResult *result = WorldDatabase.PQuery( "SELECT `guid` FROM waypoint_scripts WHERE guid = %u", id); - + if( result ) { @@ -2491,21 +2491,21 @@ if(!*args) } else PSendSysMessage("|cffff33ffWp Event: ERROR: you have selected a non existing script: %u|r", id); - + return true; } - - + + if(show == "mod") { char* arg_1 = strtok(NULL," "); - + if(!arg_1) { SendSysMessage("|cffff33ffERROR: Waypoint script guid not present.|r"); return true; } - + uint32 id = atoi(arg_1); if(!id) @@ -2515,15 +2515,15 @@ if(!*args) } char* arg_2 = strtok(NULL," "); - + if(!arg_2) { SendSysMessage("|cffff33ffERROR: No argument present.|r"); return true;} - - + + std::string arg_string = arg_2; - - + + if( (arg_string != "setid") && (arg_string != "delay") && (arg_string != "command") && (arg_string != "datalong") && (arg_string != "datalong2") && (arg_string != "dataint") && (arg_string != "posx") && (arg_string != "posy") && (arg_string != "posz") && (arg_string != "orientation") @@ -2534,7 +2534,7 @@ if( (arg_string != "setid") && (arg_string != "delay") && (arg_string != "comman char* arg_3; std::string arg_str_2 = arg_2; arg_3 = strtok(NULL," "); - + if(!arg_3) {SendSysMessage("|cffff33ffERROR: No additional argument present.|r"); return true;} @@ -2542,13 +2542,13 @@ if(!arg_3) float coord; if(arg_str_2 == "setid") - { + { uint32 newid = atoi(arg_3); PSendSysMessage("%s%s|r|cff00ffff%u|r|cff00ff00%s|r|cff00ffff%u|r","|cff00ff00","Wp Event: Wypoint scipt guid: ", newid," id changed: ", id); WorldDatabase.PExecuteLog("UPDATE waypoint_scripts SET id='%u' WHERE guid='%u'", newid, id); return true; } - else + else { QueryResult *result = WorldDatabase.PQuery("SELECT id FROM waypoint_scripts WHERE guid='%u'",id); @@ -2562,31 +2562,31 @@ float coord; delete result; if(arg_str_2 == "posx") -{ +{ coord = atof(arg_3); WorldDatabase.PExecuteLog("UPDATE waypoint_scripts SET x='%f' WHERE guid='%u'", - coord, id); + coord, id); PSendSysMessage("|cff00ff00Waypoint script:|r|cff00ffff %u|r|cff00ff00 position_x updated.|r", id); return true; }else if(arg_str_2 == "posy") { coord = atof(arg_3); WorldDatabase.PExecuteLog("UPDATE waypoint_scripts SET y='%f' WHERE guid='%u'", - coord, id); + coord, id); PSendSysMessage("|cff00ff00Waypoint script: %u position_y updated.|r", id); return true; } else if(arg_str_2 == "posz") { coord = atof(arg_3); WorldDatabase.PExecuteLog("UPDATE waypoint_scripts SET z='%f' WHERE guid='%u'", - coord, id); + coord, id); PSendSysMessage("|cff00ff00Waypoint script: |r|cff00ffff%u|r|cff00ff00 position_z updated.|r", id); return true; } else if(arg_str_2 == "orientation") { coord = atof(arg_3); WorldDatabase.PExecuteLog("UPDATE waypoint_scripts SET o='%f' WHERE guid='%u'", - coord, id); + coord, id); PSendSysMessage("|cff00ff00Waypoint script: |r|cff00ffff%u|r|cff00ff00 orientation updated.|r", id); return true; } else if(arg_str_2 == "dataint") @@ -2648,7 +2648,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) SendSysMessage("|cffff33ffERROR: You must select a waypoint.|r"); return false; } - + sLog.outDebug("DEBUG: HandleWpModifyCommand - User did select an NPC"); // The visual waypoint Creature* wpCreature = NULL; @@ -2669,7 +2669,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) { QueryResult *result = WorldDatabase.PQuery( "SELECT id, point FROM waypoint_data WHERE wpguid = %u", wpGuid); - + if(!result) { sLog.outDebug("DEBUG: HandleWpModifyCommand - No waypoint found - used 'wpguid'"); @@ -2707,7 +2707,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) // Text is enclosed in "<>", all other arguments not arg_str = strtok((char*)NULL, " "); } - + sLog.outDebug("DEBUG: HandleWpModifyCommand - Parameters parsed - now execute the command"); // Check for argument @@ -2723,7 +2723,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) // wpCreature Creature* wpCreature = NULL; - + if( wpGuid != 0 ) { wpCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(),MAKE_NEW_GUID(wpGuid, VISUAL_WAYPOINT, HIGHGUID_UNIT)); @@ -2808,7 +2808,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) WorldDatabase.PExecuteLog("UPDATE waypoint_data SET %s='%s' WHERE id='%u' AND point='%u'", show_str, text2.c_str(), pathid, point); } - + PSendSysMessage(LANG_WAYPOINT_CHANGED_NO, show_str); return true; } @@ -2830,7 +2830,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) // second arg: GUID (optional, if a creature is selected) char* guid_str = strtok((char*)NULL, " "); sLog.outDebug("DEBUG: HandleWpShowCommand: show_str: %s guid_str: %s", show_str, guid_str); - + uint32 pathid = 0; Creature* target = getSelectedCreature(); @@ -2875,14 +2875,14 @@ bool ChatHandler::HandleWpShowCommand(const char* args) uint32 Maxpoint; sLog.outDebug("DEBUG: HandleWpShowCommand: PathID: %u", pathid); - + //PSendSysMessage("wpshow - show: %s", show); // Show info for the selected waypoint if(show == "info") { - + // Check if the user did specify a visual waypoint if( target->GetEntry() != VISUAL_WAYPOINT ) @@ -2894,16 +2894,16 @@ bool ChatHandler::HandleWpShowCommand(const char* args) QueryResult *result = WorldDatabase.PQuery( "SELECT id, point, delay, move_flag, action, action_chance FROM waypoint_data WHERE wpguid = %u", target->GetGUIDLow()); - + if(!result) { SendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM); - return true; + return true; } - + SendSysMessage("|cff00ffffDEBUG: wp show info:|r"); - + do { Field *fields = result->Fetch(); @@ -2929,19 +2929,19 @@ bool ChatHandler::HandleWpShowCommand(const char* args) if(show == "on") { QueryResult *result = WorldDatabase.PQuery( "SELECT point, position_x,position_y,position_z FROM waypoint_data WHERE id = '%u'", pathid); - + if(!result) { SendSysMessage("|cffff33ffPath no found.|r"); SetSentErrorMessage(true); return false; } - + PSendSysMessage("|cff00ff00DEBUG: wp on, PathID: |cff00ffff%u|r", pathid); - + // Delete all visuals for this NPC QueryResult *result2 = WorldDatabase.PQuery( "SELECT wpguid FROM waypoint_data WHERE id = '%u' and wpguid <> 0", pathid); - + if(result2) { bool hasError = false; @@ -2965,9 +2965,9 @@ bool ChatHandler::HandleWpShowCommand(const char* args) } }while( result2->NextRow() ); - + delete result2; - + if( hasError ) { PSendSysMessage(LANG_WAYPOINT_TOOFAR1); @@ -2998,9 +2998,9 @@ bool ChatHandler::HandleWpShowCommand(const char* args) delete result; return false; } - + wpCreature->Relocate(x, y, z, o); - + if(!wpCreature->IsPositionValid()) { sLog.outError("ERROR: Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",wpCreature->GetGUIDLow(),wpCreature->GetEntry(),wpCreature->GetPositionX(),wpCreature->GetPositionY()); @@ -3017,7 +3017,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells(); wpCreature->LoadFromDB(wpCreature->GetDBTableGUIDLow(),map); map->Add(wpCreature); - + if(target) { wpCreature->SetDisplayId(target->GetDisplayId()); @@ -3076,13 +3076,13 @@ bool ChatHandler::HandleWpShowCommand(const char* args) pCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn()); pCreature->LoadFromDB(pCreature->GetDBTableGUIDLow(), map); map->Add(pCreature); - + if(target) { pCreature->SetDisplayId(target->GetDisplayId()); pCreature->SetFloatValue(OBJECT_FIELD_SCALE_X, 0.5); } - + // Cleanup memory delete result; return true; @@ -3141,13 +3141,13 @@ bool ChatHandler::HandleWpShowCommand(const char* args) pCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn()); pCreature->LoadFromDB(pCreature->GetDBTableGUIDLow(), map); map->Add(pCreature); - + if(target) { pCreature->SetDisplayId(target->GetDisplayId()); pCreature->SetFloatValue(OBJECT_FIELD_SCALE_X, 0.5); } - + // Cleanup memory delete result; return true; @@ -4131,7 +4131,7 @@ bool ChatHandler::HandleCreatePetCommand(const char* args) { Player *player = m_session->GetPlayer(); Creature *creatureTarget = getSelectedCreature(); - + if(!creatureTarget || creatureTarget->isPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER) { PSendSysMessage(LANG_SELECT_CREATURE); @@ -4415,11 +4415,11 @@ bool ChatHandler::HandleNpcAddFormationCommand(const char* args) group_member->follow_dist = sqrtf(pow(chr->GetPositionX() - pCreature->GetPositionX(),int(2))+pow(chr->GetPositionY()-pCreature->GetPositionY(),int(2))); group_member->memberGUID = lowguid; group_member->leaderGUID = leaderGUID; - group_member->groupAI = 0; + group_member->groupAI = 0; CreatureGroupMap[lowguid] = group_member; pCreature->SearchFormation(); - + WorldDatabase.PExecuteLog("INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES ('%u','%u','%f', '%f', '%u')", leaderGUID, lowguid, group_member->follow_dist, group_member->follow_angle, group_member->groupAI); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index ec44bdab7d4..f8c226110af 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -952,7 +952,7 @@ bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg) sLog.outString( "Re-Loading Scripts from `waypoint_scripts`..."); objmgr.LoadWaypointScripts(); - + if(*arg!='a') SendGlobalGMSysMessage("DB table `waypoint_scripts` reloaded."); @@ -1159,7 +1159,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args) }else{ PSendSysMessage(LANG_YOURS_SECURITY_CHANGED, m_session->GetPlayer()->GetName(), gm); } - + LoginDatabase.PExecute("UPDATE account SET gmlevel = '%d' WHERE id = '%u'", gm, targetAccountId); return true; }else @@ -1167,7 +1167,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args) // Check for second parameter if(!arg2) return false; - + // Check for account targetAccountName = arg1; if(!AccountMgr::normilizeString(targetAccountName)) @@ -1176,7 +1176,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args) SetSentErrorMessage(true); return false; } - + // Check for invalid specified GM level. gm = atoi(arg2); if ( (gm < SEC_PLAYER || gm > SEC_ADMINISTRATOR) ) @@ -1185,7 +1185,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args) SetSentErrorMessage(true); return false; } - + targetAccountId = accmgr.GetId(arg1); /// m_session==NULL only for console uint32 plSecurity = m_session ? m_session->GetSecurity() : SEC_CONSOLE; @@ -7086,7 +7086,7 @@ bool ChatHandler::HandleFreezeCommand(const char *args) { player = getSelectedPlayer(); if (player) //prevent crash with creature as target - { + { name = player->GetName(); normalizePlayerName(name); } @@ -7147,7 +7147,7 @@ bool ChatHandler::HandleFreezeCommand(const char *args) if (eff>=TOTAL_SPELL_EFFECTS) continue; if( eff == SPELL_EFFECT_APPLY_AREA_AURA_PARTY || eff == SPELL_EFFECT_APPLY_AURA || - eff == SPELL_EFFECT_PERSISTENT_AREA_AURA || eff == SPELL_EFFECT_APPLY_AREA_AURA_FRIEND || + eff == SPELL_EFFECT_PERSISTENT_AREA_AURA || eff == SPELL_EFFECT_APPLY_AREA_AURA_FRIEND || eff == SPELL_EFFECT_APPLY_AREA_AURA_ENEMY) { Aura *Aur = CreateAura(spellInfo, i, NULL, player); @@ -7171,7 +7171,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args) { player = getSelectedPlayer(); if (player) //prevent crash with creature as target - { + { name = player->GetName(); } } @@ -7203,7 +7203,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args) if (!player) { if (TargetName) - { + { //check for offline players QueryResult *result = CharacterDatabase.PQuery("SELECT characters.guid FROM `characters` WHERE characters.name = '%s'",name.c_str()); if(!result) @@ -7322,7 +7322,7 @@ bool ChatHandler::HandleBindSightCommand(const char* args) Unit* pUnit = getSelectedUnit(); if (!pUnit) return false; - + if (m_session->GetPlayer()->isPossessing()) return false; @@ -7335,7 +7335,7 @@ bool ChatHandler::HandleUnbindSightCommand(const char* args) { if (m_session->GetPlayer()->isPossessing()) return false; - + m_session->GetPlayer()->RemoveFarsightTarget(); return true; } diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp index d93f2e0681d..96072014fa8 100644 --- a/src/game/MotionMaster.cpp +++ b/src/game/MotionMaster.cpp @@ -366,7 +366,7 @@ void MotionMaster::Mutate(MovementGenerator *m, MovementSlot slot) } else if(i_top < slot) { - i_top = slot; + i_top = slot; } m->Initialize(*i_owner); Impl[slot] = m; @@ -400,13 +400,13 @@ void MotionMaster::MovePath(uint32 path_id, bool repeatable) if( !isStatic( curr ) ) delete curr; }*/ - + //i_owner->GetTypeId()==TYPEID_PLAYER ? //Mutate(new WaypointMovementGenerator<Player>(path_id, repeatable)): Mutate(new WaypointMovementGenerator<Creature>(path_id, repeatable), MOTION_SLOT_IDLE); - - DEBUG_LOG("%s (GUID: %u) start moving over path(Id:%u, repeatable: %s)", - i_owner->GetTypeId()==TYPEID_PLAYER ? "Player" : "Creature", + + DEBUG_LOG("%s (GUID: %u) start moving over path(Id:%u, repeatable: %s)", + i_owner->GetTypeId()==TYPEID_PLAYER ? "Player" : "Creature", i_owner->GetGUIDLow(), path_id, repeatable ? "YES" : "NO" ); } diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 3900ab0527d..7310c1ad32f 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1702,7 +1702,7 @@ void WorldObject::GetNearPoint2D(float &x, float &y, float distance2d, float abs void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float searcher_size, float distance2d, float absAngle ) const { GetNearPoint2D(x,y,distance2d+searcher_size,absAngle); - + z = GetPositionZ(); UpdateGroundPositionZ(x,y,z); diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 89af2814dbc..2ae6efc5320 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -223,7 +223,7 @@ void ObjectMgr::LoadPlayerInfoInCache() pPPlayerInfo->unArenaInfoSlot0 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 0 * 6 + 5); pPPlayerInfo->unArenaInfoSlot1 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 1 * 6 + 5); pPPlayerInfo->unArenaInfoSlot2 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 2 * 6 + 5); - + pPPlayerInfo->unClass = (uint32)fields[3].GetUInt32(); m_mPlayerInfoMap[fields[0].GetUInt32()] = pPPlayerInfo; } @@ -1082,7 +1082,7 @@ uint32 ObjectMgr::ChooseDisplayId(uint32 team, const CreatureInfo *cinfo, const if (!data || data->displayid == 0) // use defaults from the template { display_id = cinfo->GetRandomValidModelId(); - } else display_id = data->displayid; // overwritten from creature data + } else display_id = data->displayid; // overwritten from creature data return display_id; } @@ -7921,7 +7921,7 @@ ObjectMgr::ScriptNameMap & GetScriptNames() void ObjectMgr::LoadTransportEvents() { - + QueryResult *result = WorldDatabase.Query("SELECT entry, waypoint_id, event_id FROM transport_events"); if( !result ) @@ -7937,19 +7937,19 @@ void ObjectMgr::LoadTransportEvents() do { bar1.step(); - + Field *fields = result->Fetch(); - + //Load event values uint32 entry = fields[0].GetUInt32(); uint32 waypoint_id = fields[1].GetUInt32(); uint32 event_id = fields[2].GetUInt32(); - + uint32 event_count = (entry*100)+waypoint_id; TransportEventMap[event_count] = event_id; } while(result->NextRow()); - + sLog.outString( "\n>> Loaded %u transport events \n", result->GetRowCount() ); delete result; diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index 580e237712f..4c6a37794f6 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -324,7 +324,7 @@ class ObjectMgr typedef std::vector<std::string> ScriptNameMap; UNORDERED_MAP<uint32, uint32> TransportEventMap; - + Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);} Player* GetPlayer(uint64 guid) const { return ObjectAccessor::FindPlayer(guid); } @@ -538,7 +538,7 @@ class ObjectMgr void LoadEventScripts(); void LoadSpellScripts(); void LoadWaypointScripts(); - + void LoadTransportEvents(); bool LoadTrinityStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value); @@ -616,7 +616,7 @@ class ObjectMgr uint32 GeneratePetNumber(); uint32 GenerateArenaTeamId(); uint32 GenerateGuildId(); - + void LoadPlayerInfoInCache(); PCachePlayerInfo GetPlayerInfoFromCache(uint32 unPlayerGuid) const; CachePlayerInfoMap m_mPlayerInfoMap; diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp index 5359acb7d71..adbe220fbe5 100644 --- a/src/game/OutdoorPvP.cpp +++ b/src/game/OutdoorPvP.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify @@ -26,9 +26,9 @@ #include "Group.h" #include "WorldPacket.h" -OutdoorPvPObjective::OutdoorPvPObjective(OutdoorPvP * pvp) +OutdoorPvPObjective::OutdoorPvPObjective(OutdoorPvP * pvp) : m_PvP(pvp), m_ShiftPhase(0), m_ShiftMaxPhase(0), m_OldPhase(0), -m_State(0), m_OldState(0), m_CapturePoint(0), m_NeutralValue(0), +m_State(0), m_OldState(0), m_CapturePoint(0), m_NeutralValue(0), m_ShiftMaxCaptureSpeed(0), m_CapturePointCreature(0) { } @@ -767,7 +767,7 @@ int32 OutdoorPvPObjective::HandleOpenGo(Player *plr, uint64 guid) std::map<uint64,uint32>::iterator itr = m_ObjectTypes.find(guid); if(itr != m_ObjectTypes.end()) { - return itr->second; + return itr->second; } return -1; } diff --git a/src/game/OutdoorPvP.h b/src/game/OutdoorPvP.h index 55b30c2bcf0..542863a5341 100644 --- a/src/game/OutdoorPvP.h +++ b/src/game/OutdoorPvP.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPEP.cpp b/src/game/OutdoorPvPEP.cpp index d1e895594f1..c403a5dc094 100644 --- a/src/game/OutdoorPvPEP.cpp +++ b/src/game/OutdoorPvPEP.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPEP.h b/src/game/OutdoorPvPEP.h index babaa30d72f..2a6a47827d6 100644 --- a/src/game/OutdoorPvPEP.h +++ b/src/game/OutdoorPvPEP.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPHP.cpp b/src/game/OutdoorPvPHP.cpp index 44ad3532fad..7294db0fb77 100644 --- a/src/game/OutdoorPvPHP.cpp +++ b/src/game/OutdoorPvPHP.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPHP.h b/src/game/OutdoorPvPHP.h index f570cabd349..986e8daee7e 100644 --- a/src/game/OutdoorPvPHP.h +++ b/src/game/OutdoorPvPHP.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPMgr.cpp b/src/game/OutdoorPvPMgr.cpp index 70934c57f24..757cbe82188 100644 --- a/src/game/OutdoorPvPMgr.cpp +++ b/src/game/OutdoorPvPMgr.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPMgr.h b/src/game/OutdoorPvPMgr.h index 9a91add6883..2478acf76f4 100644 --- a/src/game/OutdoorPvPMgr.h +++ b/src/game/OutdoorPvPMgr.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPNA.cpp b/src/game/OutdoorPvPNA.cpp index d17aa297277..c8134944cc1 100644 --- a/src/game/OutdoorPvPNA.cpp +++ b/src/game/OutdoorPvPNA.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify @@ -160,9 +160,9 @@ void OutdoorPvPObjectiveNA::SpawnGOsForTeam(uint32 team) i == NA_ROOST_W || i == NA_ROOST_N || i == NA_ROOST_E || - i == NA_BOMB_WAGON_S || - i == NA_BOMB_WAGON_W || - i == NA_BOMB_WAGON_N || + i == NA_BOMB_WAGON_S || + i == NA_BOMB_WAGON_W || + i == NA_BOMB_WAGON_N || i == NA_BOMB_WAGON_E ) continue; // roosts and bomb wagons are spawned when someone uses the matching destroyed roost AddObject(i,gos[i].entry,gos[i].map,gos[i].x,gos[i].y,gos[i].z,gos[i].o,gos[i].rot0,gos[i].rot1,gos[i].rot2,gos[i].rot3); @@ -244,7 +244,7 @@ void OutdoorPvPObjectiveNA::HandlePlayerLeave(Player *plr) OutdoorPvPObjective::HandlePlayerLeave(plr); } -OutdoorPvPObjectiveNA::OutdoorPvPObjectiveNA(OutdoorPvP *pvp) : +OutdoorPvPObjectiveNA::OutdoorPvPObjectiveNA(OutdoorPvP *pvp) : OutdoorPvPObjective(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFaction(0), m_HalaaState(HALAA_N), m_WyvernStateSouth(0), m_WyvernStateNorth(0), m_WyvernStateWest(0), m_WyvernStateEast(0), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME) @@ -336,7 +336,7 @@ void OutdoorPvPObjectiveNA::FillInitialWorldStates(WorldPacket &data) data << NA_MAP_HALAA_NEU_A << uint32(bool(m_HalaaState & HALAA_N_A)); data << NA_MAP_HALAA_NEU_H << uint32(bool(m_HalaaState & HALAA_N_H)); data << NA_MAP_HALAA_HORDE << uint32(bool(m_HalaaState & HALAA_H)); - data << NA_MAP_HALAA_ALLIANCE << uint32(bool(m_HalaaState & HALAA_A)); + data << NA_MAP_HALAA_ALLIANCE << uint32(bool(m_HalaaState & HALAA_A)); } void OutdoorPvPNA::SendRemoveWorldStates(Player *plr) @@ -368,7 +368,7 @@ void OutdoorPvPNA::SendRemoveWorldStates(Player *plr) plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_A,0); plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_H,0); plr->SendUpdateWorldState(NA_MAP_HALAA_HORDE,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE,0); + plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE,0); } bool OutdoorPvPNA::Update(uint32 diff) @@ -425,7 +425,7 @@ bool OutdoorPvPObjectiveNA::HandleCustomSpell(Player * plr, uint32 spellId, Game uint32 noSpaceForCount = 0; // check space and find places - ItemPosCountVec dest; + ItemPosCountVec dest; int32 count = 10; uint32 itemid = 24538; diff --git a/src/game/OutdoorPvPNA.h b/src/game/OutdoorPvPNA.h index 9bcd4fa5427..e7f157879bc 100644 --- a/src/game/OutdoorPvPNA.h +++ b/src/game/OutdoorPvPNA.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify @@ -77,7 +77,7 @@ enum OutdoorPvPNAWorldStates{ NA_MAP_HALAA_NEU_A = 2676, NA_MAP_HALAA_NEU_H = 2677, NA_MAP_HALAA_HORDE = 2672, - NA_MAP_HALAA_ALLIANCE = 2673 + NA_MAP_HALAA_ALLIANCE = 2673 }; const uint32 FLIGHT_NODES_NUM = 4; @@ -94,8 +94,8 @@ enum ControlGOTypes{ NA_BOMB_WAGON_N = 6, NA_BOMB_WAGON_E = 7, - NA_DESTROYED_ROOST_S = 8, - NA_DESTROYED_ROOST_W = 9, + NA_DESTROYED_ROOST_S = 8, + NA_DESTROYED_ROOST_W = 9, NA_DESTROYED_ROOST_N = 10, NA_DESTROYED_ROOST_E = 11, diff --git a/src/game/OutdoorPvPObjectiveAI.cpp b/src/game/OutdoorPvPObjectiveAI.cpp index 429254b8245..6e6cf8d64e5 100644 --- a/src/game/OutdoorPvPObjectiveAI.cpp +++ b/src/game/OutdoorPvPObjectiveAI.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPObjectiveAI.h b/src/game/OutdoorPvPObjectiveAI.h index c0f963863b4..3395b7e1be5 100644 --- a/src/game/OutdoorPvPObjectiveAI.h +++ b/src/game/OutdoorPvPObjectiveAI.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPSI.cpp b/src/game/OutdoorPvPSI.cpp index 2ba63934c57..9e95c315c7f 100644 --- a/src/game/OutdoorPvPSI.cpp +++ b/src/game/OutdoorPvPSI.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify @@ -204,7 +204,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) return true; if(!go->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,1)) { - delete go; + delete go; } else { @@ -230,7 +230,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) return true; if(!go->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask() ,plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,1)) { - delete go; + delete go; } else { diff --git a/src/game/OutdoorPvPSI.h b/src/game/OutdoorPvPSI.h index 0cdb5b18377..208e35d09a1 100644 --- a/src/game/OutdoorPvPSI.h +++ b/src/game/OutdoorPvPSI.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPTF.cpp b/src/game/OutdoorPvPTF.cpp index 47edec7f8c8..39acc70ba53 100644 --- a/src/game/OutdoorPvPTF.cpp +++ b/src/game/OutdoorPvPTF.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify @@ -269,7 +269,7 @@ bool OutdoorPvPTF::SetupOutdoorPvP() m_IsLocked = false; m_LockTimer = TF_LOCK_TIME; - m_LockTimerUpdate = 0; + m_LockTimerUpdate = 0; hours_left = 6; second_digit = 0; first_digit = 0; diff --git a/src/game/OutdoorPvPZM.cpp b/src/game/OutdoorPvPZM.cpp index dc3921a2c5f..d8ac0de5f7d 100644 --- a/src/game/OutdoorPvPZM.cpp +++ b/src/game/OutdoorPvPZM.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/OutdoorPvPZM.h b/src/game/OutdoorPvPZM.h index 6899308a68e..c99ad69fa22 100644 --- a/src/game/OutdoorPvPZM.h +++ b/src/game/OutdoorPvPZM.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 6bd4b0148ff..8dcea866ef4 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -247,7 +247,7 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool m_charmInfo->GetActionBarEntry(index)->SpellOrAction = atol((*iter).c_str()); // patch for old data where some spells have ACT_DECIDE but should have ACT_CAST - // so overwrite old state + // so overwrite old state SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_charmInfo->GetActionBarEntry(index)->SpellOrAction); if (spellInfo && spellInfo->AttributesEx & SPELL_ATTR_EX_UNAUTOCASTABLE_BY_PET) m_charmInfo->GetActionBarEntry(index)->Type = ACT_ENABLED; } @@ -1674,7 +1674,7 @@ void Pet::ToggleAutocast(uint32 spellid, bool apply) //if(const SpellEntry *tempSpell = GetSpellStore()->LookupEntry(spellid)) // if(tempSpell->EffectImplicitTargetA[0] != TARGET_ALL_AROUND_CASTER // && tempSpell->EffectImplicitTargetA[0] != TARGET_CHAIN_DAMAGE) - // return; + // return; PetSpellMap::const_iterator itr = m_spells.find(spellid); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index fb8121803c6..c3d3ce1b7d4 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -289,7 +289,7 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this) m_divider = 0; m_ExtraFlags = 0; - + // players always accept if(GetSession()->GetSecurity() == SEC_PLAYER) SetAcceptWhispers(true); @@ -1583,13 +1583,13 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati { GetSession()->SendNotification(LANG_NO_ENTER_CHAMPIONS_HALL); return false; - } + } if(mapid == 450 && GetTeam() == ALLIANCE) { GetSession()->SendNotification(LANG_NO_ENTER_HALL_OF_LEGENDS); return false; - } + } // client without expansion support if(GetSession()->Expansion() < mEntry->Expansion()) @@ -8263,7 +8263,7 @@ void Player::SendInitWorldStates(bool forceZone, uint32 forceZoneId) data << uint32(2474) << uint32(50); //: ally / horde slider percentage, 100 for ally, 0 for horde // show only in direct vicinity! data << uint32(2473) << uint32(0); //: ally / horde slider display // show only in direct vicinity! data << uint32(0x9a8) << uint32(0x0); // 20 // show the neutral stadium icon // 2472 - data << uint32(0x9a7) << uint32(0x0); // 21 // show the ally stadium icon // 2471 + data << uint32(0x9a7) << uint32(0x0); // 21 // show the ally stadium icon // 2471 data << uint32(0x9a6) << uint32(0x1); // 22 // show the horde stadium icon // 2470 } } @@ -8356,7 +8356,7 @@ void Player::SendInitWorldStates(bool forceZone, uint32 forceZoneId) data << uint32(0x9e1) << uint32(0x0); // 10 //2529 data << uint32(0x9e0) << uint32(0x0); // 11 data << uint32(0x9df) << uint32(0x0); // 12 - data << uint32(0xa5d) << uint32(0x1); // 13 //2653 + data << uint32(0xa5d) << uint32(0x1); // 13 //2653 data << uint32(0xa5c) << uint32(0x0); // 14 //2652 east beacon neutral data << uint32(0xa5b) << uint32(0x1); // 15 horde data << uint32(0xa5a) << uint32(0x0); // 16 ally @@ -8372,7 +8372,7 @@ void Player::SendInitWorldStates(bool forceZone, uint32 forceZoneId) data << uint32(0xa00) << uint32(0x0); // 26 // 2560 data << uint32(0x9ff) << uint32(0x1); // 27 data << uint32(0x9fe) << uint32(0x0); // 28 - data << uint32(0x9fd) << uint32(0x0); // 29 + data << uint32(0x9fd) << uint32(0x0); // 29 data << uint32(0x9fc) << uint32(0x1); // 30 data << uint32(0x9fb) << uint32(0x0); // 31 data << uint32(0xa62) << uint32(0x0); // 32 // 2658 @@ -12403,6 +12403,9 @@ void Player::ApplyEnchantment(Item *item,EnchantmentSlot slot,bool apply, bool a case ITEM_ENCHANTMENT_TYPE_USE_SPELL: // processed in Player::CastItemUseSpell break; + case ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET: + // nothing do.. + break; default: sLog.outError("Unknown item enchantment (id = %d) display type: %d", enchant_id, enchant_display_type); break; @@ -16053,7 +16056,7 @@ void Player::SaveToDB() // save pet (hunter pet level and experience and all type pets health/mana). if(Pet* pet = GetPet()) pet->SavePetToDB(PET_SAVE_AS_CURRENT); - + //to prevent access to DB we should cache some data, which is used very often /*CachePlayerInfoMap::iterator _iter = objmgr.m_mPlayerInfoMap.find(GetGUIDLow()); if(_iter != objmgr.m_mPlayerInfoMap.end())//skip new players @@ -19807,13 +19810,13 @@ void Player::RemovePossess(bool attack) target->GetMotionMaster()->Clear(); target->GetMotionMaster()->MoveTargetedHome(); } - } + } else { target->GetMotionMaster()->Clear(); target->GetMotionMaster()->MoveTargetedHome(); } - + // Add high amount of threat on the player if(attack) target->AddThreat(this, 1000000.0f); diff --git a/src/game/Player.h b/src/game/Player.h index 7bae06e9224..3e9a7e2553c 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -1061,7 +1061,7 @@ class TRINITY_DLL_SPEC Player : public Unit Item* GetItemByGuid( uint64 guid ) const; Item* GetItemByPos( uint16 pos ) const; Item* GetItemByPos( uint8 bag, uint8 slot ) const; - inline Item* Player::GetUseableItemByPos( uint8 bag, uint8 slot ) const //Does additional check for disarmed weapons + inline Item* GetUseableItemByPos( uint8 bag, uint8 slot ) const //Does additional check for disarmed weapons { if (!CanUseAttackType(GetAttackBySlot(slot))) return NULL; diff --git a/src/game/PointMovementGenerator.cpp b/src/game/PointMovementGenerator.cpp index ab4cf1ed147..bcc25987e56 100644 --- a/src/game/PointMovementGenerator.cpp +++ b/src/game/PointMovementGenerator.cpp @@ -32,7 +32,7 @@ void PointMovementGenerator<T>::Initialize(T &unit) unit.StopMoving(); Traveller<T> traveller(unit); i_destinationHolder.SetDestination(traveller,i_x,i_y,i_z); - + if (unit.GetTypeId() == TYPEID_UNIT && ((Creature*)&unit)->canFly()) unit.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2); } diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp index 76a92c7df70..8d02a57c49c 100644 --- a/src/game/RandomMovementGenerator.cpp +++ b/src/game/RandomMovementGenerator.cpp @@ -30,13 +30,13 @@ #define RUNNING_CHANCE_RANDOMMV 20 //will be "1 / RUNNING_CHANCE_RANDOMMV" template<> -bool +bool RandomMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const { if(i_destinationHolder.HasArrived()) - return false; - - i_destinationHolder.GetDestination(x, y, z); + return false; + + i_destinationHolder.GetDestination(x, y, z); return true; } @@ -65,7 +65,7 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature) nx = X + distanceX; ny = Y + distanceY; - // prevent invalid coordinates generation + // prevent invalid coordinates generation Trinity::NormalizeMapCoord(nx); Trinity::NormalizeMapCoord(ny); @@ -122,9 +122,9 @@ RandomMovementGenerator<Creature>::Initialize(Creature &creature) { if(!creature.isAlive()) return; - + wander_distance = creature.GetRespawnRadius(); - + if (creature.canFly()) creature.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2); else diff --git a/src/game/RandomMovementGenerator.h b/src/game/RandomMovementGenerator.h index f8a324735f0..595b06d9adb 100644 --- a/src/game/RandomMovementGenerator.h +++ b/src/game/RandomMovementGenerator.h @@ -32,7 +32,7 @@ class TRINITY_DLL_SPEC RandomMovementGenerator public: // Wander dist is related on db spawn dist. So what if we wanna set eandom movement on summoned creature?! RandomMovementGenerator(float spawn_dist = 0.0f) : i_nextMoveTime(0), wander_distance(spawn_dist) {} - + void _setRandomLocation(T &); void Initialize(T &); void Finalize(T &); diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 5a9c7202656..9553592c82c 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -685,7 +685,7 @@ enum SpellEffects SPELL_EFFECT_153 = 153, SPELL_EFFECT_154 = 154, SPELL_EFFECT_TITAN_GRIP = 155, - SPELL_EFFECT_ADD_SOCKET = 156, + SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC = 156, SPELL_EFFECT_CREATE_ITEM_2 = 157, SPELL_EFFECT_MILLING = 158, SPELL_EFFECT_ALLOW_RENAME_PET = 159, @@ -829,7 +829,7 @@ enum Targets TARGET_TABLE_X_Y_Z_COORDINATES = 17, // uses in teleport spells and some other //TARGET_DEST_TABLE TARGET_EFFECT_SELECT = 18, // highly depends on the spell effect - TARGET_DEST_CASTER_GROUND = 18, + TARGET_DEST_CASTER_GROUND = 18, TARGET_ALL_PARTY_AROUND_CASTER = 20, TARGET_UNIT_PARTY_CASTER = 20, TARGET_SINGLE_FRIEND = 21, @@ -891,7 +891,7 @@ enum Targets TARGET_UNIT_AREA_SCRIPT = 60, TARGET_AREAEFFECT_PARTY_AND_CLASS = 61, TARGET_UNIT_CLASS_TARGET = 61, - TARGET_TEST = 62, // for a test spell + TARGET_TEST = 62, // for a test spell TARGET_DUELVSPLAYER_COORDINATES = 63, TARGET_DEST_TARGET_ENEMY_UNKNOWN = 63, TARGET_DEST_TARGET_FRONT = 64, diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 6538dc5b87b..aa91ff65ff6 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -574,6 +574,7 @@ void Spell::FillTargetMap() break; /*case SPELL_EFFECT_ENCHANT_ITEM: case SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY: + case SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC: case SPELL_EFFECT_DISENCHANT: case SPELL_EFFECT_PROSPECTING: case SPELL_EFFECT_MILLING: @@ -1045,7 +1046,7 @@ void Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask) return; // Recheck immune (only for delayed spells) - if( m_spellInfo->speed && + if( m_spellInfo->speed && !(m_spellInfo->Attributes & SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY) && (unit->IsImmunedToDamage(GetSpellSchoolMask(m_spellInfo)) || unit->IsImmunedToSpell(m_spellInfo))) @@ -1169,7 +1170,7 @@ void Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask) { if(m_customAttr & SPELL_ATTR_CU_EFFECT_HEAL) m_originalCaster->ProcDamageAndSpell(unit, PROC_FLAG_HEAL, PROC_FLAG_NONE, 0, GetSpellSchoolMask(m_spellInfo), m_spellInfo); - if(m_originalCaster != unit && (m_customAttr & SPELL_ATTR_CU_EFFECT_DAMAGE)) + if(m_originalCaster != unit && (m_customAttr & SPELL_ATTR_CU_EFFECT_DAMAGE)) m_originalCaster->ProcDamageAndSpell(unit, PROC_FLAG_HIT_SPELL, PROC_FLAG_STRUCK_SPELL, 0, GetSpellSchoolMask(m_spellInfo), m_spellInfo); }*/ } @@ -1337,7 +1338,7 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin if(cur->GetDistance(*next) > CHAIN_SPELL_JUMP_RADIUS) break; while(!cur->IsWithinLOSInMap(*next) - || m_spellInfo->DmgClass==SPELL_DAMAGE_CLASS_MELEE + || m_spellInfo->DmgClass==SPELL_DAMAGE_CLASS_MELEE && !m_caster->isInFront(*next, max_range)) { ++next; @@ -1347,7 +1348,7 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin } cur = *next; - tempUnitMap.erase(next); + tempUnitMap.erase(next); } } @@ -1385,7 +1386,7 @@ void Spell::SearchAreaTarget(std::list<Unit*> &TagUnitMap, float radius, const u } Trinity::SpellNotifierCreatureAndPlayer notifier(*this, TagUnitMap, radius, type, TargetType, entry, x, y, z); - if((m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_PLAYERS_ONLY) + if((m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_PLAYERS_ONLY) || TargetType == SPELL_TARGETS_ENTRY && !entry) m_caster->GetMap()->VisitWorld(x, y, radius, notifier); else @@ -1946,7 +1947,7 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) if(m_targets.getUnitTarget()) { TagUnitMap.remove(m_targets.getUnitTarget()); - if(m_spellInfo->Id != 5246) //Intimidating Shout + if(m_spellInfo->Id != 5246) //Intimidating Shout --unMaxTargets; } @@ -1971,7 +1972,7 @@ void Spell::prepare(SpellCastTargets const* targets, Aura* triggeredByAura) m_castItemGUID = m_CastItem->GetGUID(); else m_castItemGUID = 0; - + m_targets = *targets; m_spellState = SPELL_STATE_PREPARING; @@ -2046,7 +2047,7 @@ void Spell::prepare(SpellCastTargets const* targets, Aura* triggeredByAura) if(isSpellBreakStealth(m_spellInfo) ) m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CAST); - if(!m_casttime && !m_spellInfo->StartRecoveryTime + if(!m_casttime && !m_spellInfo->StartRecoveryTime && !m_castItemGUID //item: first cast may destroy item and second cast causes crash && GetCurrentContainer() == CURRENT_GENERIC_SPELL) cast(true); @@ -2054,8 +2055,9 @@ void Spell::prepare(SpellCastTargets const* targets, Aura* triggeredByAura) { m_caster->SetCurrentCastedSpell( this ); m_selfContainer = &(m_caster->m_currentSpells[GetCurrentContainer()]); - SendSpellStart(); } + + SendSpellStart(); } } @@ -2100,14 +2102,14 @@ void Spell::cancel(bool report) // Unsummon summon as possessed creatures on spell cancel for (int i = 0; i < 3; i++) { - if (m_spellInfo->Effect[i] == SPELL_EFFECT_SUMMON && - (m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED || - m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED2 || + if (m_spellInfo->Effect[i] == SPELL_EFFECT_SUMMON && + (m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED || + m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED2 || m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED3)) { // Possession is removed in the UnSummon function if (m_caster->GetCharm()) - ((TemporarySummon*)m_caster->GetCharm())->UnSummon(); + ((TemporarySummon*)m_caster->GetCharm())->UnSummon(); } } @@ -2136,13 +2138,16 @@ void Spell::cast(bool skipCheck) if(m_caster->GetTypeId() != TYPEID_PLAYER && m_targets.getUnitTarget() && m_targets.getUnitTarget() != m_caster) m_caster->SetInFront(m_targets.getUnitTarget()); - castResult = CheckPower(); - if(castResult != 0) + if(!m_IsTriggeredSpell) { - SendCastResult(castResult); - finish(false); - SetExecutedCurrently(false); - return; + castResult = CheckPower(); + if(castResult != 0) + { + SendCastResult(castResult); + finish(false); + SetExecutedCurrently(false); + return; + } } // triggered cast called from Spell::prepare where it was already checked @@ -2197,22 +2202,15 @@ void Spell::cast(bool skipCheck) ((Player*)m_caster)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL, m_spellInfo->Id); } - // CAST SPELL - SendSpellCooldown(); - if(!m_IsTriggeredSpell) { //TakePower(); TakeReagents(); // we must remove reagents before HandleEffects to allow place crafted item in same slot } - if(m_spellState == SPELL_STATE_FINISHED) // stop cast if spell marked as finish somewhere in Take*/FillTargetMap - { - SetExecutedCurrently(false); - return; - } - - SendCastResult(castResult); + // CAST SPELL + SendSpellCooldown(); + //SendCastResult(castResult); SendSpellGo(); // we must send smsg_spell_go packet before m_castItem delete in TakeCastItem()... if(m_customAttr & SPELL_ATTR_CU_DIRECT_DAMAGE) @@ -2257,9 +2255,12 @@ void Spell::cast(bool skipCheck) uint32 auraSpellIdx = (*i)->GetEffIndex(); // Calculate chance at that moment (can be depend for example from combo points) int32 chance = m_caster->CalculateSpellDamage(auraSpellInfo, auraSpellIdx, (*i)->GetBasePoints(),unit); + chance *= (*i)->GetStackAmount(); if(roll_chance_i(chance)) - for (int j=0; j != (*i)->GetStackAmount(); ++j) - m_caster->CastSpell(unit, auraSpellInfo->EffectTriggerSpell[auraSpellIdx], true, NULL, (*i)); + { + if(SpellEntry const *spellInfo = sSpellStore.LookupEntry(auraSpellInfo->EffectTriggerSpell[auraSpellIdx])) + m_TriggerSpells.push_back(spellInfo); + } } } } @@ -3721,7 +3722,7 @@ uint8 Spell::CanCast(bool strict) } //Must be behind the target. - if( m_spellInfo->AttributesEx2 == 0x100000 && (m_spellInfo->AttributesEx & 0x200) == 0x200 && target->HasInArc(M_PI, m_caster) + if( m_spellInfo->AttributesEx2 == 0x100000 && (m_spellInfo->AttributesEx & 0x200) == 0x200 && target->HasInArc(M_PI, m_caster) //Exclusion for Pounce: Facing Limitation was removed in 2.0.1, but it still uses the same, old Ex-Flags && (m_spellInfo->SpellFamilyName != SPELLFAMILY_DRUID || !m_spellInfo->SpellFamilyFlags.IsEqual(0x20000,0,0))) { @@ -5008,6 +5009,7 @@ uint8 Spell::CheckItems() break; } case SPELL_EFFECT_ENCHANT_ITEM: + case SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC: { Item* targetItem = m_targets.getItemTarget(); if(!targetItem) @@ -5746,7 +5748,7 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul m_damage *= m_damageMultipliers[i]; m_damageMultipliers[i] *= multiplier[i]; } - + damageDone += m_damage; } } diff --git a/src/game/Spell.h b/src/game/Spell.h index 7500bc32fd1..c38ebb617ad 100644 --- a/src/game/Spell.h +++ b/src/game/Spell.h @@ -350,6 +350,7 @@ class Spell void EffectRedirectThreat(uint32 i); void EffectActivateRune(uint32 i); void EffectTitanGrip(uint32 i); + void EffectEnchantItemPrismatic(uint32 i); Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 originalCasterGUID = 0, Spell** triggeringContainer = NULL, bool skipCheck = false ); ~Spell(); diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 49a69c11da1..5bab1316d4f 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -366,7 +366,7 @@ m_updated(false), m_isRemovedOnShapeLost(true), m_in_use(false) damage = caster->CalculateSpellDamage(m_spellProto, m_effIndex, m_currentBasePoints, target); else damage = m_currentBasePoints + 1; - } + } m_isPassive = IsPassiveSpell(GetId()); m_positive = IsPositiveEffect(GetId(), m_effIndex); @@ -1313,7 +1313,7 @@ void Aura::TriggerSpell() // // Five Fat Finger Exploding Heart Technique // case 27673: break; // Nitrous Boost - case 27746: + case 27746: { if (caster->GetPower(POWER_MANA) >= 10) { @@ -1621,7 +1621,7 @@ void Aura::TriggerSpell() (*i)->ApplyModifier(true); break; } - } + } }break; // // Dementia // case 41404: break; @@ -2270,7 +2270,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real) if (totem && totem->isTotem()) totem->AddPlayerToVision((Player*)caster); } - } + } else ((Player*)caster)->RemoveFarsightTarget(); return; @@ -3821,7 +3821,7 @@ void Aura::HandleAuraModSchoolImmunity(bool apply, bool Real) { if(apply && m_modifier.m_miscvalue == SPELL_SCHOOL_MASK_NORMAL) m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_UNATTACKABLE); - + m_target->ApplySpellImmune(GetId(),IMMUNITY_SCHOOL,m_modifier.m_miscvalue,apply); if(Real && apply && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY) @@ -5432,7 +5432,7 @@ void Aura::PeriodicTick() break; } case 41337:// aura of anger - { + { Unit::AuraList const& mMod = m_target->GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); for(Unit::AuraList::const_iterator i = mMod.begin(); i != mMod.end(); ++i) { @@ -5443,7 +5443,7 @@ void Aura::PeriodicTick() (*i)->ApplyModifier(true); break; } - } + } m_modifier.m_amount += 100; }break; default: diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 0423e24a4d0..65e198d8af2 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -220,7 +220,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= &Spell::EffectNULL, //153 SPELL_EFFECT_CREATE_PET misc value is creature entry &Spell::EffectNULL, //154 unused &Spell::EffectTitanGrip, //155 SPELL_EFFECT_TITAN_GRIP Allows you to equip two-handed axes, maces and swords in one hand, but you attack $49152s1% slower than normal. - &Spell::EffectNULL, //156 Add Socket + &Spell::EffectEnchantItemPrismatic, //156 SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC &Spell::EffectCreateItem, //157 SPELL_EFFECT_CREATE_ITEM_2 create/learn item/spell for profession &Spell::EffectMilling, //158 SPELL_EFFECT_MILLING milling &Spell::EffectRenamePet //159 SPELL_EFFECT_ALLOW_RENAME_PET allow rename pet once again @@ -684,7 +684,7 @@ void Spell::EffectDummy(uint32 i) if (!creatureTarget || !pGameObj) return; if (!pGameObj->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT), 181574, creatureTarget->GetMap(), creatureTarget->GetPhaseMask(), - creatureTarget->GetPositionX(), creatureTarget->GetPositionY(), creatureTarget->GetPositionZ(), + creatureTarget->GetPositionX(), creatureTarget->GetPositionY(), creatureTarget->GetPositionZ(), creatureTarget->GetOrientation(), 0, 0, 0, 0, 100, 1)) { delete pGameObj; @@ -1319,7 +1319,7 @@ void Spell::EffectDummy(uint32 i) rage+=aura->GetModifier()->m_amount; spell_id = 20647; - int32 bp = damage+int32(rage * m_spellInfo->DmgMultiplier[i] + + bp = damage+int32(rage * m_spellInfo->DmgMultiplier[i] + m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f); m_caster->SetPower(POWER_RAGE,0); break; @@ -3615,7 +3615,7 @@ void Spell::EffectAddFarsight(uint32 i) map->Add(dynObj); map->SwitchGridContainers(dynObj, true); // Needed for forwarding player packets dynObj->setActive(true); // Keep the grid updated even if there are no players in it - + // Need to update visibility of object for client to accept farsight guid ((Player*)m_caster)->UpdateVisibilityOf(dynObj); ((Player*)m_caster)->SetFarsightTarget(dynObj); @@ -3698,7 +3698,7 @@ void Spell::EffectSummonGuardian(uint32 i) } // trigger - if(!m_originalCaster || m_originalCaster->GetTypeId() != TYPEID_PLAYER + if(!m_originalCaster || m_originalCaster->GetTypeId() != TYPEID_PLAYER && !((Creature*)m_originalCaster)->isTotem()/*m_spellInfo->Id == 40276*/) { EffectSummonWild(i); @@ -3888,7 +3888,7 @@ void Spell::EffectTradeSkill(uint32 /*i*/) // ((Player*)unitTarget)->SetSkill(skillid,skillval?skillval:1,skillmax+75); } -void Spell::EffectEnchantItemPerm(uint32 i) +void Spell::EffectEnchantItemPerm(uint32 effect_idx) { if(m_caster->GetTypeId() != TYPEID_PLAYER) return; @@ -3897,9 +3897,10 @@ void Spell::EffectEnchantItemPerm(uint32 i) Player* p_caster = (Player*)m_caster; + // not grow at item use at item case p_caster->UpdateCraftSkill(m_spellInfo->Id); - uint32 enchant_id = m_spellInfo->EffectMiscValue[i]; + uint32 enchant_id = m_spellInfo->EffectMiscValue[effect_idx]; if (!enchant_id) return; @@ -3929,6 +3930,64 @@ void Spell::EffectEnchantItemPerm(uint32 i) item_owner->ApplyEnchantment(itemTarget,PERM_ENCHANTMENT_SLOT,true); } +void Spell::EffectEnchantItemPrismatic(uint32 effect_idx) +{ + if(m_caster->GetTypeId() != TYPEID_PLAYER) + return; + if (!itemTarget) + return; + + Player* p_caster = (Player*)m_caster; + + uint32 enchant_id = m_spellInfo->EffectMiscValue[effect_idx]; + if (!enchant_id) + return; + + SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id); + if(!pEnchant) + return; + + // support only enchantings with add socket in this slot + { + bool add_socket = false; + for(int i = 0; i < 3; ++i) + { + if(pEnchant->type[i]==ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET) + { + add_socket = true; + break; + } + } + if(!add_socket) + { + sLog.outError("Spell::EffectEnchantItemPrismatic: attempt apply enchant spell %u with SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC (%u) but without ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET (u), not suppoted yet.", + m_spellInfo->Id,SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC,ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET); + return; + } + } + + // item can be in trade slot and have owner diff. from caster + Player* item_owner = itemTarget->GetOwner(); + if(!item_owner) + return; + + if(item_owner!=p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE) ) + { + sLog.outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)", + p_caster->GetName(),p_caster->GetSession()->GetAccountId(), + itemTarget->GetProto()->Name1,itemTarget->GetEntry(), + item_owner->GetName(),item_owner->GetSession()->GetAccountId()); + } + + // remove old enchanting before applying new if equipped + item_owner->ApplyEnchantment(itemTarget,PRISMATIC_ENCHANTMENT_SLOT,false); + + itemTarget->SetEnchantment(PRISMATIC_ENCHANTMENT_SLOT, enchant_id, 0, 0); + + // add new enchanting if equipped + item_owner->ApplyEnchantment(itemTarget,PRISMATIC_ENCHANTMENT_SLOT,true); +} + void Spell::EffectEnchantItemTmp(uint32 i) { if(m_caster->GetTypeId() != TYPEID_PLAYER) @@ -4539,7 +4598,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i) if(spell_bonus) spell_bonus = int32(spell_bonus * weapon_total_pct); } - + int32 weaponDamage = m_caster->CalculateDamage(m_attackType, normalized); // Sequence is important diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp index 8bcdd0f54a0..d39c2c68071 100644 --- a/src/game/TargetedMovementGenerator.cpp +++ b/src/game/TargetedMovementGenerator.cpp @@ -59,7 +59,7 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner) float x, y, z; if(!i_offset) { - // to nearest random contact position + // to nearest random contact position i_target->GetRandomContactPoint( &owner, x, y, z, 0, MELEE_RANGE - 0.5f ); } else @@ -101,7 +101,7 @@ TargetedMovementGenerator<T>::Initialize(T &owner) if (owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->canFly()) owner.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2); - + _setTargetLocation(owner); } diff --git a/src/game/TicketHandler.cpp b/src/game/TicketHandler.cpp index 435c6cbbefd..1ce07e80bc2 100644 --- a/src/game/TicketHandler.cpp +++ b/src/game/TicketHandler.cpp @@ -54,7 +54,7 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data ) // get additional data, rarely used recv_data >> ticketText2; - + // assign values ticket->name = GetPlayer()->GetName(); ticket->guid = ticketmgr.GenerateTicketID(); @@ -67,7 +67,7 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data ) // remove ticket by player, shouldn't happen ticketmgr.RemoveGMTicketByPlayer(GetPlayer()->GetGUID(), GetPlayer()->GetGUID()); - + // add ticket ticketmgr.AddGMTicket(ticket, false); @@ -76,15 +76,15 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data ) // Send ticket creation SendPacket(&data); - + sWorld.SendGMText(LANG_COMMAND_TICKETNEW, ticket->name.c_str(), ticket->guid); - + } void WorldSession::HandleGMTicketUpdateOpcode( WorldPacket & recv_data) { // always do a packet check - CHECK_PACKET_SIZE(recv_data,1); + CHECK_PACKET_SIZE(recv_data,1); std::string message = ""; time_t t = time(NULL); @@ -98,7 +98,7 @@ void WorldSession::HandleGMTicketUpdateOpcode( WorldPacket & recv_data) GM_Ticket *ticket = ticketmgr.GetGMTicketByPlayer(GetPlayer()->GetGUID()); // Check if player has a GM Ticket yet - if(!ticket) + if(!ticket) { // Response - error couldnt find existing Ticket data << uint32(1); @@ -133,7 +133,7 @@ void WorldSession::HandleGMTicketDeleteOpcode( WorldPacket & /*recv_data*/) if(ticket) { // Remove Tickets from Player - + // Response - no errors WorldPacket data(SMSG_GMTICKET_DELETETICKET, 4); data << uint32(9); @@ -150,12 +150,12 @@ void WorldSession::HandleGMTicketGetTicketOpcode( WorldPacket & /*recv_data*/) // NO recv_data NO packet size check WorldPacket data(SMSG_GMTICKET_GETTICKET, 400); - + // get Current Ticket GM_Ticket *ticket = ticketmgr.GetGMTicketByPlayer(GetPlayer()->GetGUID()); // check for existing ticket - if(!ticket) + if(!ticket) { data << uint32(10); // send packet @@ -183,8 +183,8 @@ void WorldSession::HandleGMTicketSystemStatusOpcode( WorldPacket & /*recv_data*/ // in case of disactivity, this should be set to (0) data << uint32(1); - - + + // Send Packet SendPacket(&data); } diff --git a/src/game/TicketMgr.cpp b/src/game/TicketMgr.cpp index 588ce7f5f2c..b34e371a252 100644 --- a/src/game/TicketMgr.cpp +++ b/src/game/TicketMgr.cpp @@ -63,7 +63,7 @@ GM_Ticket* TicketMgr::GetGMTicketByName(const char* name) Player *plr = objmgr.GetPlayer(pname.c_str()); if(!plr) return NULL; - + uint64 playerGuid = plr->GetGUID(); for(GmTicketList::iterator i = GM_TicketList.begin(); i != GM_TicketList.end();) @@ -184,7 +184,7 @@ void TicketMgr::SaveGMTicket(GM_Ticket* ticket) CharacterDatabase.BeginTransaction(); CharacterDatabase.Execute(ss.str().c_str()); CharacterDatabase.CommitTransaction(); - + } void TicketMgr::UpdateGMTicket(GM_Ticket *ticket) diff --git a/src/game/TicketMgr.h b/src/game/TicketMgr.h index 9c090f559b0..989acf773e9 100644 --- a/src/game/TicketMgr.h +++ b/src/game/TicketMgr.h @@ -59,13 +59,13 @@ class TicketMgr void RemoveGMTicket(uint64 ticketGuid, uint64 GMguid); void UpdateGMTicket(GM_Ticket *ticket); void SaveGMTicket(GM_Ticket* ticket); - + uint64 GenerateTicketID(); void InitTicketID(); GM_Ticket* GetGMTicket(uint64 ticketGuid); GM_Ticket* GetGMTicketByPlayer(uint64 playerGuid); GM_Ticket* GetGMTicketByName(const char *name); - + protected: uint64 m_ticketid; diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp index b13b7f33375..e10cee2d475 100644 --- a/src/game/Transports.cpp +++ b/src/game/Transports.cpp @@ -555,7 +555,7 @@ void Transport::Update(uint32 /*p_time*/) if ((sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES)==0) sLog.outDetail("%s moved to %f %f %f %d", this->m_name.c_str(), m_curr->second.x, m_curr->second.y, m_curr->second.z, m_curr->second.mapid); - + //Transport Event System CheckForEvent(this->GetEntry(), m_curr->second.id); sLog.outDetail("%s is at wp id: %u", this->m_name.c_str(), m_curr->second.id); diff --git a/src/game/Traveller.h b/src/game/Traveller.h index e81a34097e9..a1bfbb323e3 100644 --- a/src/game/Traveller.h +++ b/src/game/Traveller.h @@ -83,7 +83,7 @@ inline void Traveller<Creature>::MoveTo(float x, float y, float z, uint32 t) if(i_traveller.IsFormationLeader() && !i_traveller.isInCombat() && CreatureGroupHolder.find(i_traveller.GetFormationID()) != CreatureGroupHolder.end()) CreatureGroupHolder[i_traveller.GetFormationID()]->LeaderMovedInEvade(); - + i_traveller.AI_SendMoveToPacket(x, y, z, t, i_traveller.GetUnitMovementFlags(), 0); } diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 0969abd05fd..5fcec4dff84 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -74,7 +74,7 @@ static bool procPrepared = InitTriggerAuraData(); Unit::Unit() : WorldObject(), i_motionMaster(this), m_ThreatManager(this), m_HostilRefManager(this) -, m_IsInNotifyList(false), m_Notified(false) +, m_IsInNotifyList(false), m_Notified(false), m_AI_enabled(false) { m_objectType |= TYPEMASK_UNIT; m_objectTypeId = TYPEID_UNIT; @@ -464,7 +464,7 @@ void Unit::RemoveAurasWithInterruptFlags(uint32 flag, uint32 except) // interrupt channeled spell if(Spell* spell = m_currentSpells[CURRENT_CHANNELED_SPELL]) - if(spell->getState() == SPELL_STATE_CASTING + if(spell->getState() == SPELL_STATE_CASTING && (spell->m_spellInfo->ChannelInterruptFlags & flag) && spell->m_spellInfo->Id != except) InterruptNonMeleeSpells(false); @@ -532,7 +532,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa if( pVictim->GetTypeId()== TYPEID_UNIT && ((Creature *)pVictim)->AI() ) { ((Creature *)pVictim)->AI()->DamageTaken(this, damage); - + // Set tagging if(!pVictim->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_OTHER_TAGGER) && !((Creature*)pVictim)->isPet()) { @@ -550,14 +550,14 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa { if(((Creature*)this)->isPet()) { - ((Creature *)pVictim)->SetLootRecipient(this->GetOwner()); + ((Creature *)pVictim)->SetLootRecipient(this->GetOwner()); ((Creature *)pVictim)->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_OTHER_TAGGER); } break; } } } - } + } if (damagetype != NODAMAGE) { @@ -3034,7 +3034,11 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target) // feral or unarmed skill only for base attack if(attType != BASE_ATTACK && !item ) + { + if(attType == RANGED_ATTACK && getClass() == CLASS_PALADIN) //hammer + return GetMaxSkillValueForLevel(); return 0; + } if(((Player*)this)->IsInFeralForm()) return GetMaxSkillValueForLevel(); // always maximized SKILL_FERAL_COMBAT in fact @@ -4053,7 +4057,7 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode) statue = ((Totem*)caster); // stop caster chanelling state - else if(caster->m_currentSpells[CURRENT_CHANNELED_SPELL] + else if(caster->m_currentSpells[CURRENT_CHANNELED_SPELL] //prevent recurential call && caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->getState() != SPELL_STATE_FINISHED) { @@ -4061,7 +4065,7 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode) { // remove auras only for non-aoe spells or when chanelled aura is removed // because aoe spells don't require aura on target to continue - if (AurSpellInfo->EffectApplyAuraName[Aur->GetEffIndex()]!=SPELL_AURA_PERIODIC_DUMMY + if (AurSpellInfo->EffectApplyAuraName[Aur->GetEffIndex()]!=SPELL_AURA_PERIODIC_DUMMY && AurSpellInfo->EffectApplyAuraName[Aur->GetEffIndex()]!= SPELL_AURA_DUMMY) //don't stop channeling of scripted spells (this is actually a hack) { @@ -7561,8 +7565,8 @@ void Unit::SetCharm(Unit* pet) SetUInt64Value(UNIT_FIELD_CHARM, pet ? pet->GetGUID() : 0); } -void Unit::AddPlayerToVision(Player* plr) -{ +void Unit::AddPlayerToVision(Player* plr) +{ if (m_sharedVision.empty() && GetTypeId() == TYPEID_UNIT) { setActive(true); @@ -7572,9 +7576,9 @@ void Unit::AddPlayerToVision(Player* plr) plr->SetFarsightTarget(this); } -void Unit::RemovePlayerFromVision(Player* plr) -{ - m_sharedVision.remove(plr); +void Unit::RemovePlayerFromVision(Player* plr) +{ + m_sharedVision.remove(plr); if (m_sharedVision.empty() && GetTypeId() == TYPEID_UNIT) { setActive(false); @@ -8499,7 +8503,7 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint CastingTime = damagetype == DOT ? 3500 : 1010; } // Improved Leader of the Pack - else if (spellProto->AttributesEx2 == 536870912 && spellProto->SpellIconID == 312 + else if (spellProto->AttributesEx2 == 536870912 && spellProto->SpellIconID == 312 && spellProto->AttributesEx3 == 33554432) { CastingTime = 0; @@ -9216,7 +9220,7 @@ bool Unit::isAttackableByAOE() const if(!isAlive()) return false; - if(HasFlag(UNIT_FIELD_FLAGS, + if(HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_2)) return false; @@ -9867,7 +9871,7 @@ Unit* Creature::SelectVictim() AI()->EnterEvadeMode(); break; } - return NULL; + return NULL; } // enter in evade mode in other case @@ -12257,7 +12261,7 @@ void Unit::SetCharmedOrPossessedBy(Unit* charmer, bool possess) } } - if(possess) + if(possess) ((Player*)charmer)->PossessSpellInitialize(); else if(charmer->GetTypeId() == TYPEID_PLAYER) ((Player*)charmer)->CharmSpellInitialize(); @@ -12313,7 +12317,7 @@ void Unit::RemoveCharmedOrPossessedBy(Unit *charmer) return; assert(!possess || charmer->GetTypeId() == TYPEID_PLAYER); - + charmer->SetCharm(0); if(possess) { @@ -12417,7 +12421,7 @@ void Unit::GetRaidMember(std::list<Unit*> &nearMembers, float radius) Player* Target = itr->getSource(); // IsHostileTo check duel and controlled by enemy - if( Target && Target != this && Target->isAlive() + if( Target && Target != this && Target->isAlive() && IsWithinDistInMap(Target, radius) && !IsHostileTo(Target) ) nearMembers.push_back(Target); } diff --git a/src/game/Unit.h b/src/game/Unit.h index 829bc6c0c25..bd61171de9b 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1103,7 +1103,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject void DeMorph(); - void SendAttackStart(Unit* pVictim); + void SendAttackStart(Unit* pVictim); void SendAttackStateUpdate(CalcDamageInfo *damageInfo); void SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount); void SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log); @@ -1559,6 +1559,8 @@ class TRINITY_DLL_SPEC Unit : public WorldObject uint32 m_regenTimer; ThreatManager m_ThreatManager; + + bool m_AI_enabled; private: void SendAttackStop(Unit* victim); // only from AttackStop(Unit*) //void SendAttackStart(Unit* pVictim); // only from Unit::AttackStart(Unit*) diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp index d2521779413..e9455269a13 100644 --- a/src/game/WaypointManager.cpp +++ b/src/game/WaypointManager.cpp @@ -57,17 +57,17 @@ void WaypointStore::Load() barGoLink bar( total_records); Field *fields; uint32 last_id = 0; - + do { fields = result->Fetch(); uint32 id = fields[0].GetUInt32(); bar.step(); WaypointData *wp = new WaypointData; - + if(last_id != id) path_data = new WaypointPath; - + float x,y,z; x = fields[2].GetFloat(); y = fields[3].GetFloat(); @@ -84,12 +84,12 @@ void WaypointStore::Load() wp->delay = fields[6].GetUInt32(); wp->event_id = fields[7].GetUInt32(); wp->event_chance = fields[8].GetUInt8(); - + path_data->push_back(wp); - - if(id != last_id) + + if(id != last_id) waypoint_map[id] = path_data; - + last_id = id; } while(result->NextRow()) ; @@ -100,28 +100,28 @@ void WaypointStore::Load() void WaypointStore::UpdatePath(uint32 id) { - + if(waypoint_map.find(id)!= waypoint_map.end()) waypoint_map[id]->clear(); - + QueryResult *result; result = WorldDatabase.PQuery("SELECT `id`,`point`,`position_x`,`position_y`,`position_z`,`move_flag`,`delay`,`action`,`action_chance` FROM `waypoint_data` WHERE id = %u ORDER BY `point`", id); - + if(!result) return; - + WaypointPath* path_data; - + path_data = new WaypointPath; - + Field *fields; - + do { fields = result->Fetch(); uint32 id = fields[0].GetUInt32(); - + WaypointData *wp = new WaypointData; float x,y,z; @@ -140,11 +140,11 @@ void WaypointStore::UpdatePath(uint32 id) wp->delay = fields[6].GetUInt32(); wp->event_id = fields[7].GetUInt32(); wp->event_chance = fields[8].GetUInt8(); - + path_data->push_back(wp); }while (result->NextRow()); - + waypoint_map[id] = path_data; delete result; diff --git a/src/game/WaypointManager.h b/src/game/WaypointManager.h index 2bbb5c0e15e..276caea7b33 100644 --- a/src/game/WaypointManager.h +++ b/src/game/WaypointManager.h @@ -40,19 +40,19 @@ class WaypointStore { private : uint32 records; - + public: void UpdatePath(uint32 id); void Load(); void Free(); - + WaypointPath* GetPath(uint32 id) { if(waypoint_map.find(id) != waypoint_map.end()) return waypoint_map[id]; else return 0; } - + inline uint32 GetRecordsCount() { return records; } }; diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index 97ce5feff43..a5bfb741188 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -53,14 +53,14 @@ template<> bool WaypointMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const { if(i_destinationHolder.HasArrived()) - return false; - - i_destinationHolder.GetDestination(x, y, z); + return false; + + i_destinationHolder.GetDestination(x, y, z); return true; } template<> -bool WaypointMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const +bool WaypointMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const { return false; } @@ -80,13 +80,13 @@ void WaypointMovementGenerator<Creature>::InitTraveller(Creature &unit, const Wa { node.run ? unit.RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE): unit.AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - + unit.SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); unit.SetUInt32Value(UNIT_FIELD_BYTES_1, 0); - + if(unit.canFly()) unit.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2); - + unit.addUnitState(UNIT_STAT_ROAMING); } @@ -133,7 +133,7 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff) if(!path_id) return false; - + // Waypoint movement can be switched on/off // This is quite handy for escort quests and other stuff if(unit.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED)) @@ -161,7 +161,7 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff) StopedByPlayer = false; return true; } - + if(i_currentNode == waypoints->size() - 1) //If that's our last waypoint { if(repeating) //If the movement is repeating @@ -173,7 +173,7 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff) return false; //Clear the waypoint movement } } - else + else i_currentNode++; node = waypoints->at(i_currentNode); @@ -183,20 +183,20 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff) } else { - //Determine waittime + //Determine waittime if(node->delay) i_nextMoveTime.Reset(node->delay); - + if(node->event_id && rand()%100 < node->event_chance) sWorld.ScriptsStart(sWaypointScripts, node->event_id, &unit, NULL); - + MovementInform(unit); unit.UpdateWaypointID(i_currentNode); unit.clearUnitState(UNIT_STAT_MOVING); unit.Relocate(node->x, node->y, node->z); } } - else + else { if(unit.IsStopped() && !i_destinationHolder.HasArrived()) { diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h index d7bacfd1367..7046ca6b5cb 100644 --- a/src/game/WaypointMovementGenerator.h +++ b/src/game/WaypointMovementGenerator.h @@ -53,7 +53,7 @@ class TRINITY_DLL_SPEC PathMovementBase void LoadPath(T &); void ReloadPath(T &); uint32 GetCurrentNode() const { return i_currentNode; } - + protected: uint32 i_currentNode; DestinationHolder< Traveller<T> > i_destinationHolder; @@ -66,9 +66,9 @@ class TRINITY_DLL_SPEC WaypointMovementGenerator : public MovementGeneratorMedium< T, WaypointMovementGenerator<T> >, public PathMovementBase<T> { public: - WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true) : + WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true) : i_nextMoveTime(0), path_id(_path_id), repeating(_repeating), StopedByPlayer(false), node(NULL) {} - + void Initialize(T &); void Finalize(T &); void MovementInform(T &); diff --git a/src/game/World.cpp b/src/game/World.cpp index a860ad52f08..3bce771bec0 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -403,7 +403,7 @@ void World::LoadConfigSettings(bool reload) sLog.outError("World settings reload fail: can't read settings from %s.",sConfig.GetFilename().c_str()); return; } - //TODO Check if config is outdated + //TODO Check if config is outdated } ///- Read the player limit and the Message of the day from the config file @@ -1440,7 +1440,7 @@ void World::SetInitialWorldSettings() //Not sure if this can be moved up in the sequence (with static data loading) as it uses MapManager sLog.outString( "Loading Transports..." ); MapManager::Instance().LoadTransports(); - + sLog.outString( "Loading Transports Events..." ); objmgr.LoadTransportEvents(); @@ -1835,7 +1835,7 @@ void World::ScriptsProcess() for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter) { if((*iter)->GetGUID() == step.sourceGUID) - { + { source = reinterpret_cast<Object*>(*iter); break; } @@ -2385,7 +2385,7 @@ void World::ScriptsProcess() break; } - + case SCRIPT_COMMAND_LOAD_PATH: { if(!source) @@ -2398,18 +2398,18 @@ void World::ScriptsProcess() { sLog.outError("SCRIPT_COMMAND_START_MOVE source mover isn't unit (TypeId: %u), skipping.",source->GetTypeId()); break; - } - + } + if(!WaypointMgr.GetPath(step.script->datalong)) { sLog.outError("SCRIPT_COMMAND_START_MOVE source mover has an invallid path, skipping.", step.script->datalong2); break; } - + dynamic_cast<Unit*>(source)->GetMotionMaster()->MovePath(step.script->datalong, step.script->datalong2); break; } - + case SCRIPT_COMMAND_CALLSCRIPT_TO_UNIT: { if(!step.script->datalong || !step.script->datalong2) @@ -2419,17 +2419,17 @@ void World::ScriptsProcess() } //our target Creature* target = NULL; - + if(source) //using grid searcher { CellPair p(Trinity::ComputeCellPair(((Unit*)source)->GetPositionX(), ((Unit*)source)->GetPositionY())); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; - + //sLog.outDebug("Attempting to find Creature: Db GUID: %i", step.script->datalong); Trinity::CreatureWithDbGUIDCheck target_check(((Unit*)source), step.script->datalong); Trinity::CreatureSearcher<Trinity::CreatureWithDbGUIDCheck> checker(((Unit*)source), target, target_check); - + TypeContainerVisitor<Trinity::CreatureSearcher <Trinity::CreatureWithDbGUIDCheck>, GridTypeMapContainer > unit_checker(checker); CellLock<GridReadGuard> cell_lock(cell, p); cell_lock->Visit(cell_lock, unit_checker, *(((Unit*)source)->GetMap())); @@ -2469,19 +2469,19 @@ void World::ScriptsProcess() sLog.outError("SCRIPT_COMMAND_CALLSCRIPT ERROR: no scriptmap present... ignoring"); break; } - //if no scriptmap present... + //if no scriptmap present... if(!datamap) break; - + uint32 script_id = step.script->datalong2; //delete iter and return it to begin pos(next one) m_scriptSchedule.erase(iter); iter = m_scriptSchedule.begin(); - + ScriptsStart(*datamap, script_id, target, NULL); return; } - + case SCRIPT_COMMAND_PLAYSOUND: { if(!source) diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index d33f13f4fa7..65216b028d5 100644 --- a/src/game/WorldSession.h +++ b/src/game/WorldSession.h @@ -292,7 +292,7 @@ class TRINITY_DLL_SPEC WorldSession void HandleGMTicketDeleteOpcode(WorldPacket& recvPacket); void HandleGMTicketGetTicketOpcode(WorldPacket& recvPacket); void HandleGMTicketSystemStatusOpcode(WorldPacket& recvPacket); - + //void HandleGMSurveySubmit(WorldPacket& recvPacket); void HandleTogglePvP(WorldPacket& recvPacket); diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp index bca7a4b6928..9913c912c70 100644 --- a/src/game/WorldSocket.cpp +++ b/src/game/WorldSocket.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/game/WorldSocket.h b/src/game/WorldSocket.h index 839c9aba28c..15d3ec31e06 100644 --- a/src/game/WorldSocket.h +++ b/src/game/WorldSocket.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/game/WorldSocketMgr.h b/src/game/WorldSocketMgr.h index 68c5e9cf4ab..d7cb627b11c 100644 --- a/src/game/WorldSocketMgr.h +++ b/src/game/WorldSocketMgr.h @@ -36,7 +36,7 @@ class ReactorRunnable; class ACE_Event_Handler; /// Manages all sockets connected to peers and network threads -class WorldSocketMgr +class WorldSocketMgr { public: friend class WorldSocket; @@ -44,32 +44,32 @@ public: /// Start network, listen at address:port . int StartNetwork (ACE_UINT16 port, const char* address); - + /// Stops all network threads, It will wait for all running threads . void StopNetwork (); - + /// Wait untill all network threads have "joined" . void Wait (); - + /// Make this class singleton . static WorldSocketMgr* Instance (); - + private: int OnSocketOpen(WorldSocket* sock); - + int StartReactiveIO(ACE_UINT16 port, const char* address); - -private: + +private: WorldSocketMgr (); virtual ~WorldSocketMgr (); - + ReactorRunnable* m_NetThreads; size_t m_NetThreadsCount; - + int m_SockOutKBuff; int m_SockOutUBuff; bool m_UseNoDelay; - + ACE_Event_Handler* m_Acceptor; }; diff --git a/src/shared/Auth/AuthCrypt.cpp b/src/shared/Auth/AuthCrypt.cpp index 3b6ffa0b725..2d8bd824fd1 100644 --- a/src/shared/Auth/AuthCrypt.cpp +++ b/src/shared/Auth/AuthCrypt.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h index dec59e1d5d3..7a0b0a4d219 100644 --- a/src/shared/Auth/AuthCrypt.h +++ b/src/shared/Auth/AuthCrypt.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp index 96c8e197869..becbe44c0ed 100644 --- a/src/shared/Auth/BigNumber.cpp +++ b/src/shared/Auth/BigNumber.cpp @@ -175,7 +175,7 @@ uint8 *BigNumber::AsByteArray(int minSize) // If we need more bytes than length of BigNumber set the rest to 0 if (length > GetNumBytes()) memset((void*)_array, 0, length); - + BN_bn2bin(_bn, (unsigned char *)_array); std::reverse(_array, _array + length); diff --git a/src/shared/Auth/Hmac.cpp b/src/shared/Auth/Hmac.cpp index 9496caa14d3..5f97ee65cc2 100644 --- a/src/shared/Auth/Hmac.cpp +++ b/src/shared/Auth/Hmac.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Auth/Hmac.h b/src/shared/Auth/Hmac.h index b08c8515791..b8ab30f2dc7 100644 --- a/src/shared/Auth/Hmac.h +++ b/src/shared/Auth/Hmac.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp index 2ce34643e15..f367c2919b3 100644 --- a/src/shared/Auth/Sha1.cpp +++ b/src/shared/Auth/Sha1.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h index d7cf0071440..811ccc2053a 100644 --- a/src/shared/Auth/Sha1.h +++ b/src/shared/Auth/Sha1.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h index 347e2ef0a45..2dd01e8a022 100644 --- a/src/shared/ByteBuffer.h +++ b/src/shared/ByteBuffer.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 006fa284c5d..36d65544d3c 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -1,4 +1,3 @@ - add_subdirectory(vmap) add_subdirectory(Auth) add_subdirectory(Config) diff --git a/src/shared/Common.cpp b/src/shared/Common.cpp index 6728e419136..e70dc8358c2 100644 --- a/src/shared/Common.cpp +++ b/src/shared/Common.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Common.h b/src/shared/Common.h index e7b3e72bb10..1fca98831b2 100644 --- a/src/shared/Common.h +++ b/src/shared/Common.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -25,9 +25,9 @@ // TODO this thingy looks like hack ,but its not, need to // make separate header however, because It makes mess here. #ifdef HAVE_CONFIG_H -// Remove Some things that we will define -// This is in case including another config.h -// before trinity config.h +// Remove Some things that we will define +// This is in case including another config.h +// before trinity config.h #ifdef PACKAGE #undef PACKAGE #endif //PACKAGE diff --git a/src/shared/Config/Config.cpp b/src/shared/Config/Config.cpp index 484b3c5f0e0..b3a3b13d652 100644 --- a/src/shared/Config/Config.cpp +++ b/src/shared/Config/Config.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h index a27777fa6d2..424c369bd92 100644 --- a/src/shared/Config/Config.h +++ b/src/shared/Config/Config.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Config/ConfigEnv.h b/src/shared/Config/ConfigEnv.h index 7058aede10c..6c3a54a45fc 100644 --- a/src/shared/Config/ConfigEnv.h +++ b/src/shared/Config/ConfigEnv.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h index 4840a242401..d041f8fa3b2 100644 --- a/src/shared/Database/DBCStructure.h +++ b/src/shared/Database/DBCStructure.h @@ -1278,14 +1278,14 @@ struct SpellItemEnchantmentEntry uint32 amount[3]; // 5-7 m_effectPointsMin[3] //uint32 amount2[3] // 8-10 m_effectPointsMax[3] uint32 spellid[3]; // 11-13 m_effectArg[3] - char* description[16]; // 14-30 m_name_lang[16] - //uint32 descriptionFlags; // 31 name flags - uint32 aura_id; // 32 m_itemVisual - uint32 slot; // 33 m_flags - uint32 GemID; // 34 m_src_itemID - uint32 EnchantmentCondition; // 35 m_condition_id - //uint32 requiredSkill; // 36 m_requiredSkillID - //uint32 requiredSkillValue; // 37 m_requiredSkillRank + char* description[16]; // 14-29 m_name_lang[16] + //uint32 descriptionFlags; // 30 name flags + uint32 aura_id; // 31 m_itemVisual + uint32 slot; // 32 m_flags + uint32 GemID; // 33 m_src_itemID + uint32 EnchantmentCondition; // 34 m_condition_id + //uint32 requiredSkill; // 35 m_requiredSkillID + //uint32 requiredSkillValue; // 36 m_requiredSkillRank }; struct SpellItemEnchantmentConditionEntry diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp index d67140726e5..5d7f5bf473e 100644 --- a/src/shared/Database/Database.cpp +++ b/src/shared/Database/Database.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h index 8d70ccaa545..beff0fb740a 100644 --- a/src/shared/Database/Database.h +++ b/src/shared/Database/Database.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h index 9aa37d3929b..df1f51adbe7 100644 --- a/src/shared/Database/DatabaseEnv.h +++ b/src/shared/Database/DatabaseEnv.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h index 8e4f3ce47e1..c9a02a0a4a1 100644 --- a/src/shared/Database/DatabaseImpl.h +++ b/src/shared/Database/DatabaseImpl.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp index dd52fcf36f0..7e67861d883 100644 --- a/src/shared/Database/DatabaseMysql.cpp +++ b/src/shared/Database/DatabaseMysql.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h index 3d8b92eb842..6dbaf4a59ab 100644 --- a/src/shared/Database/DatabaseMysql.h +++ b/src/shared/Database/DatabaseMysql.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/DatabasePostgre.cpp b/src/shared/Database/DatabasePostgre.cpp index f576a3cfd18..8f8cf95b429 100644 --- a/src/shared/Database/DatabasePostgre.cpp +++ b/src/shared/Database/DatabasePostgre.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h index 4e9d8f99cc0..9a2aeb84a07 100644 --- a/src/shared/Database/DatabasePostgre.h +++ b/src/shared/Database/DatabasePostgre.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/DatabaseSqlite.cpp b/src/shared/Database/DatabaseSqlite.cpp index 303a118f87a..a3fffd8aa4c 100644 --- a/src/shared/Database/DatabaseSqlite.cpp +++ b/src/shared/Database/DatabaseSqlite.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/DatabaseSqlite.h b/src/shared/Database/DatabaseSqlite.h index 86a9becaf62..a9593989143 100644 --- a/src/shared/Database/DatabaseSqlite.h +++ b/src/shared/Database/DatabaseSqlite.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/Field.cpp b/src/shared/Database/Field.cpp index 97a537fd7fd..18831e23687 100644 --- a/src/shared/Database/Field.cpp +++ b/src/shared/Database/Field.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/Field.h b/src/shared/Database/Field.h index 346cac39e20..a4514c963cd 100644 --- a/src/shared/Database/Field.h +++ b/src/shared/Database/Field.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h index 35530a86337..5f3e66de722 100644 --- a/src/shared/Database/MySQLDelayThread.h +++ b/src/shared/Database/MySQLDelayThread.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/PGSQLDelayThread.h b/src/shared/Database/PGSQLDelayThread.h index 4c7b1c77321..bd6a2bf962d 100644 --- a/src/shared/Database/PGSQLDelayThread.h +++ b/src/shared/Database/PGSQLDelayThread.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h index 82b9a2c5545..0fab7a3633b 100644 --- a/src/shared/Database/QueryResult.h +++ b/src/shared/Database/QueryResult.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/QueryResultMysql.cpp b/src/shared/Database/QueryResultMysql.cpp index a3c358edc1f..8ae59b350d8 100644 --- a/src/shared/Database/QueryResultMysql.cpp +++ b/src/shared/Database/QueryResultMysql.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h index 894bd365ee3..39d2985ad77 100644 --- a/src/shared/Database/QueryResultMysql.h +++ b/src/shared/Database/QueryResultMysql.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/QueryResultPostgre.cpp b/src/shared/Database/QueryResultPostgre.cpp index 05a120df4af..e10905f0feb 100644 --- a/src/shared/Database/QueryResultPostgre.cpp +++ b/src/shared/Database/QueryResultPostgre.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h index dff207dcb09..aa183ab4b96 100644 --- a/src/shared/Database/QueryResultPostgre.h +++ b/src/shared/Database/QueryResultPostgre.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/QueryResultSqlite.cpp b/src/shared/Database/QueryResultSqlite.cpp index 0f3919b9069..9a32e36bc84 100644 --- a/src/shared/Database/QueryResultSqlite.cpp +++ b/src/shared/Database/QueryResultSqlite.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/QueryResultSqlite.h b/src/shared/Database/QueryResultSqlite.h index b88ecb7d249..d3462977e49 100644 --- a/src/shared/Database/QueryResultSqlite.h +++ b/src/shared/Database/QueryResultSqlite.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp index 65fe5340c2a..4d4b883926a 100644 --- a/src/shared/Database/SQLStorage.cpp +++ b/src/shared/Database/SQLStorage.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h index e4d0b3f01d9..f2250410c26 100644 --- a/src/shared/Database/SQLStorage.h +++ b/src/shared/Database/SQLStorage.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/shared/Database/SqlDelayThread.cpp index a91bd12a3c0..a35090adb7e 100644 --- a/src/shared/Database/SqlDelayThread.cpp +++ b/src/shared/Database/SqlDelayThread.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h index 39936d1e203..1fc35741fc5 100644 --- a/src/shared/Database/SqlDelayThread.h +++ b/src/shared/Database/SqlDelayThread.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp index c7148ab086c..233eed1e4cb 100644 --- a/src/shared/Database/SqlOperations.cpp +++ b/src/shared/Database/SqlOperations.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h index 28e854e02e9..b7c84b5d6cf 100644 --- a/src/shared/Database/SqlOperations.h +++ b/src/shared/Database/SqlOperations.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/dbcfile.cpp b/src/shared/Database/dbcfile.cpp index 7fe95f0624e..f0b7e6e3c15 100644 --- a/src/shared/Database/dbcfile.cpp +++ b/src/shared/Database/dbcfile.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Database/dbcfile.h b/src/shared/Database/dbcfile.h index ca12dfb989d..470322326aa 100644 --- a/src/shared/Database/dbcfile.h +++ b/src/shared/Database/dbcfile.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Errors.h b/src/shared/Errors.h index e53d36555ac..a521ae7f3f0 100644 --- a/src/shared/Errors.h +++ b/src/shared/Errors.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp index 61f5fcb4097..2ed66ae3189 100644 --- a/src/shared/Log.cpp +++ b/src/shared/Log.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Log.h b/src/shared/Log.h index f7dce238725..076d660be61 100644 --- a/src/shared/Log.h +++ b/src/shared/Log.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/PacketLog.cpp b/src/shared/PacketLog.cpp index 5af9bd69aed..2fcd6c58b9b 100644 --- a/src/shared/PacketLog.cpp +++ b/src/shared/PacketLog.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/PacketLog.h b/src/shared/PacketLog.h index d914efdcb76..b4313c48624 100644 --- a/src/shared/PacketLog.h +++ b/src/shared/PacketLog.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/ProgressBar.cpp b/src/shared/ProgressBar.cpp index 009aed2e7e2..0108dfec974 100644 --- a/src/shared/ProgressBar.cpp +++ b/src/shared/ProgressBar.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/ProgressBar.h b/src/shared/ProgressBar.h index 855f30a235a..8c551ed65dc 100644 --- a/src/shared/ProgressBar.h +++ b/src/shared/ProgressBar.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/ServiceWin32.cpp b/src/shared/ServiceWin32.cpp index 7ccad749c5f..878656b1d91 100644 --- a/src/shared/ServiceWin32.cpp +++ b/src/shared/ServiceWin32.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/ServiceWin32.h b/src/shared/ServiceWin32.h index 5c668f8e046..762502ccaa7 100644 --- a/src/shared/ServiceWin32.h +++ b/src/shared/ServiceWin32.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/Timer.h b/src/shared/Timer.h index a27f4889049..30f5966afce 100644 --- a/src/shared/Timer.h +++ b/src/shared/Timer.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -50,7 +50,7 @@ inline uint32 getMSTime() inline uint32 getMSTimeDiff(uint32 oldMSTime, uint32 newMSTime) { // getMSTime() have limited data range and this is case when it overflow in this tick - if (oldMSTime > newMSTime) + if (oldMSTime > newMSTime) return (0xFFFFFFFF - oldMSTime) + newMSTime; else return newMSTime - oldMSTime; diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp index 9062fc99624..0d3010c5f04 100644 --- a/src/shared/Util.cpp +++ b/src/shared/Util.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -28,7 +28,7 @@ typedef ZThread::ThreadLocal<MTRand> MTRandTSS; /* NOTE: Not sure if static initialization is ok for TSS objects , - * as I see zthread uses custom implementation of the TSS + * as I see zthread uses custom implementation of the TSS * ,and in the consturctor there is no code ,so I suppose its ok * If its not ok ,change it to use singleton. */ diff --git a/src/shared/Util.h b/src/shared/Util.h index b10e29ef4af..adfbdad620a 100644 --- a/src/shared/Util.h +++ b/src/shared/Util.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -161,7 +161,7 @@ inline bool isEastAsianCharacter(wchar_t wchar) return true; if(wchar >= 0x31F0 && wchar <= 0x31FF) // Katakana Phonetic Ext. return true; - if(wchar >= 0x3400 && wchar <= 0x4DB5) // CJK Ideographs Ext. A + if(wchar >= 0x3400 && wchar <= 0x4DB5) // CJK Ideographs Ext. A return true; if(wchar >= 0x4E00 && wchar <= 0x9FC3) // Unified CJK Ideographs return true; diff --git a/src/shared/WorldPacket.h b/src/shared/WorldPacket.h index 8d3e4fd8cbb..4d30533d2f1 100644 --- a/src/shared/WorldPacket.h +++ b/src/shared/WorldPacket.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index cd1d48dc8b3..a257b588318 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7226" + #define REVISION_NR "7227" #endif // __REVISION_NR_H__ diff --git a/src/shared/vmap/AABSPTree.h b/src/shared/vmap/AABSPTree.h index 9b44470e7d9..5107676d48e 100644 --- a/src/shared/vmap/AABSPTree.h +++ b/src/shared/vmap/AABSPTree.h @@ -1,14 +1,14 @@ /** @file AABSPTree.h - + @maintainer Morgan McGuire, matrix@graphics3d.com - + @created 2004-01-11 @edited 2007-02-16 Copyright 2000-2007, Morgan McGuire. All rights reserved. - + */ #ifndef G3D_AABSPTREE_H @@ -89,7 +89,7 @@ namespace G3D { /** Wraps a pointer value so that it can be treated as the instance itself; - convenient for inserting pointers into a Table but using the + convenient for inserting pointers into a Table but using the object equality instead of pointer equality. */ template<class Type> @@ -136,9 +136,9 @@ namespace G3D { AABSPTree is as powerful as but more general than a Quad Tree, Oct Tree, or KD Tree, but less general than an unconstrained BSP tree (which is much slower to create). - + Internally, objects - are arranged into an axis-aligned BSP-tree according to their + are arranged into an axis-aligned BSP-tree according to their axis-aligned bounds. This increases the cost of insertion to O(log n) but allows fast overlap queries. @@ -158,13 +158,13 @@ namespace G3D { <B>Moving %Set Members</B> <DT>It is important that objects do not move without updating the AABSPTree. If the axis-aligned bounds of an object are about - to change, AABSPTree::remove it before they change and + to change, AABSPTree::remove it before they change and AABSPTree::insert it again afterward. For objects - where the hashCode and == operator are invariant with respect + where the hashCode and == operator are invariant with respect to the 3D position, you can use the AABSPTree::update method as a shortcut to insert/remove an object in one step after it has moved. - + Note: Do not mutate any value once it has been inserted into AABSPTree. Values are copied interally. All AABSPTree iterators convert to pointers to constant @@ -185,9 +185,9 @@ namespace G3D { */ namespace _AABSPTree { - /** Wrapper for a value that includes a cache of its bounds. + /** Wrapper for a value that includes a cache of its bounds. Except for the test value used in a set-query operation, there - is only ever one instance of the handle associated with any + is only ever one instance of the handle associated with any value and the memberTable and Nodes maintain pointers to that heap-allocated value. */ @@ -261,10 +261,10 @@ public: /** Returns the bounds of the sub array. Used by makeNode. */ static AABox computeBounds( - const Array<_AABSPTree::Handle<T>*>& point, + const Array<_AABSPTree::Handle<T>*>& point, int beginIndex, int endIndex) { - + Vector3 lo = Vector3::inf(); Vector3 hi = -lo; @@ -357,8 +357,8 @@ public: /** Location along the specified axis */ float splitLocation; - - /** child[0] contains all values strictly + + /** child[0] contains all values strictly smaller than splitLocation along splitAxis. child[1] contains all values strictly @@ -371,15 +371,15 @@ public: /** Array of values at this node (i.e., values straddling the split plane + all values if - this is a leaf node). + this is a leaf node). This is an array of pointers because that minimizes - data movement during tree building, which accounts + data movement during tree building, which accounts for about 15% of the time cost of tree building. */ Array<_AABSPTree::Handle<T> * > valueArray; - /** For each object in the value array, a copy of its bounds. + /** For each object in the value array, a copy of its bounds. Packing these into an array at the node level instead putting them in the valueArray improves cache coherence, which is about a 3x performance @@ -403,7 +403,7 @@ public: Node(const Node& other) : valueArray(other.valueArray), boundsArray(other.boundsArray) { splitAxis = other.splitAxis; splitLocation = other.splitLocation; - splitBounds = other.splitBounds; + splitBounds = other.splitBounds; for (int i = 0; i < 2; ++i) { child[i] = NULL; } @@ -490,7 +490,7 @@ public: #if 0 /** Stores the locations of the splitting planes (the structure but not the content) - so that the tree can be quickly rebuilt from a previous configuration without + so that the tree can be quickly rebuilt from a previous configuration without calling balance. */ static void serializeStructure(const Node* n, BinaryOutput& bo) { @@ -546,7 +546,7 @@ public: } - /** Appends all members that intersect the box. + /** Appends all members that intersect the box. If useSphere is true, members that pass the box test face a second test against the sphere. */ void getIntersectingMembers( @@ -604,11 +604,11 @@ public: // See if the ray will ever hit this node or its children Vector3 location; bool alreadyInsideBounds = false; - bool rayWillHitBounds = + bool rayWillHitBounds = VMAP::MyCollisionDetection::collisionLocationForMovingPointFixedAABox( ray.origin, ray.direction, splitBounds, location, alreadyInsideBounds); - - bool canHitThisNode = (alreadyInsideBounds || + + bool canHitThisNode = (alreadyInsideBounds || (rayWillHitBounds && ((location - ray.origin).squaredLength() < square(distance)))); return canHitThisNode; @@ -616,20 +616,20 @@ public: template<typename RayCallback> void intersectRay( - const Ray& ray, - RayCallback& intersectCallback, + const Ray& ray, + RayCallback& intersectCallback, float& distance, bool pStopAtFirstHit, bool intersectCallbackIsFast) const { float enterDistance = distance; - + if (! intersects(ray, distance)) { // The ray doesn't hit this node, so it can't hit the children of the node. return; } // Test for intersection against every object at this node. - for (int v = 0; v < valueArray.size(); ++v) { + for (int v = 0; v < valueArray.size(); ++v) { bool canHitThisObject = true; if (! intersectCallbackIsFast) { @@ -637,11 +637,11 @@ public: Vector3 location; const AABox& bounds = boundsArray[v]; bool alreadyInsideBounds = false; - bool rayWillHitBounds = + bool rayWillHitBounds = VMAP::MyCollisionDetection::collisionLocationForMovingPointFixedAABox( ray.origin, ray.direction, bounds, location, alreadyInsideBounds); - canHitThisObject = (alreadyInsideBounds || + canHitThisObject = (alreadyInsideBounds || (rayWillHitBounds && ((location - ray.origin).squaredLength() < square(distance)))); } @@ -656,7 +656,7 @@ public: } // There are three cases to consider next: - // + // // 1. the ray can start on one side of the splitting plane and never enter the other, // 2. the ray can start on one side and enter the other, and // 3. the ray can travel exactly down the splitting plane @@ -666,7 +666,7 @@ public: int secondChild = NONE; if (ray.origin[splitAxis] < splitLocation) { - + // The ray starts on the small side firstChild = 0; @@ -702,7 +702,7 @@ public: } if (ray.direction[splitAxis] != 0) { - // See if there was an intersection before hitting the splitting plane. + // See if there was an intersection before hitting the splitting plane. // If so, there is no need to look on the far side and recursion terminates. float distanceToSplittingPlane = (splitLocation - ray.origin[splitAxis]) / ray.direction[splitAxis]; if (distanceToSplittingPlane > distance) { @@ -724,43 +724,43 @@ public: /** Recursively subdivides the subarray. - + Clears the source array as soon as it is no longer needed. Call assignSplitBounds() on the root node after making a tree. */ Node* makeNode( - Array<_AABSPTree::Handle<T> * >& source, - int valuesPerNode, + Array<_AABSPTree::Handle<T> * >& source, + int valuesPerNode, int numMeanSplits, Array<_AABSPTree::Handle<T> * >& temp) { Node* node = NULL; - + if (source.size() <= valuesPerNode) { // Make a new leaf node node = new Node(source); - + // Set the pointers in the memberTable for (int i = 0; i < source.size(); ++i) { memberTable.set(Member(source[i]), node); } source.clear(); - + } else { // Make a new internal node node = new Node(); - + const AABox bounds = computeBounds(source, 0, source.size() - 1); const Vector3 extent = bounds.high() - bounds.low(); - + Vector3::Axis splitAxis = extent.primaryAxis(); - + float splitLocation; // Arrays for holding the children Array<_AABSPTree::Handle<T> * > lt, gt; - + if (numMeanSplits <= 0) { source.medianPartition(lt, node->valueArray, gt, temp, CenterComparator(splitAxis)); @@ -788,13 +788,13 @@ public: // is swapped in in its place. gt.fastRemove(i); --i; } - } + } if ((node->valueArray.size() > (source.size() / 2)) && (source.size() > 6)) { - // This was a bad partition; we ended up putting the splitting plane right in the middle of most of the - // objects. We could try to split on a different axis, or use a different partition (e.g., the extents mean, - // or geometric mean). This implementation falls back on the extents mean, since that case is already handled + // This was a bad partition; we ended up putting the splitting plane right in the middle of most of the + // objects. We could try to split on a different axis, or use a different partition (e.g., the extents mean, + // or geometric mean). This implementation falls back on the extents mean, since that case is already handled // below. numMeanSplits = 1; } @@ -805,9 +805,9 @@ public: if (numMeanSplits > 0) { // Split along the mean - splitLocation = (bounds.high()[splitAxis] + + splitLocation = (bounds.high()[splitAxis] + bounds.low()[splitAxis]) / 2.0; - + source.partition(NULL, lt, node->valueArray, gt, Comparator(splitAxis, splitLocation)); // The Comparator ensures that elements are strictly on the correct side of the split @@ -817,7 +817,7 @@ public: # if defined(G3D_DEBUG) && defined(VERIFY_TREE) debugAssert(lt.size() + node->valueArray.size() + gt.size() == source.size()); // Verify that all objects ended up on the correct side of the split. - // (i.e., make sure that the Array partition was correct) + // (i.e., make sure that the Array partition was correct) for (int i = 0; i < lt.size(); ++i) { const AABox& bounds = lt[i]->bounds; debugAssert(bounds.high()[splitAxis] < splitLocation); @@ -849,16 +849,16 @@ public: memberTable.set(Member(v), node); } - if (lt.size() > 0) { + if (lt.size() > 0) { node->child[0] = makeNode(lt, valuesPerNode, numMeanSplits - 1, temp); } - + if (gt.size() > 0) { node->child[1] = makeNode(gt, valuesPerNode, numMeanSplits - 1, temp); } - + } - + return node; } @@ -927,7 +927,7 @@ public: */ void clear() { typedef typename Table<_internal::Indirector<_AABSPTree::Handle<T> >, Node* >::Iterator It; - + // Delete all handles stored in the member table It cur = memberTable.begin(); It end = memberTable.end(); @@ -970,7 +970,7 @@ public: // Insert into the node node->valueArray.append(h); node->boundsArray.append(h->bounds); - + // Insert into the node table Member m(h); memberTable.set(m, node); @@ -1022,8 +1022,8 @@ public: /** Removes an object from the set in O(1) time. It is an error to remove members that are not already - present. May unbalance the tree. - + present. May unbalance the tree. + Removing an element never causes a node (split plane) to be removed... nodes are only changed when the tree is rebalanced. This behavior is desirable because it allows the split planes to be serialized, @@ -1075,7 +1075,7 @@ public: on <I>T</I> are independent of the bounds. In that case, you may call update(v) to insert an element for the first time and call update(v) - again every time it moves to keep the tree + again every time it moves to keep the tree up to date. */ void update(const T& value) { @@ -1091,15 +1091,15 @@ public: have moved substantially from their original positions (which unbalances the tree and causes the spatial queries to be slow). - + @param valuesPerNode Maximum number of elements to put at a node. - @param numMeanSplits numMeanSplits = 0 gives a + @param numMeanSplits numMeanSplits = 0 gives a fully axis aligned BSP-tree, where the balance operation attempts to balance the tree so that every splitting plane has an equal number of left - and right children (i.e. it is a <B>median</B> split along that axis). - This tends to maximize average performance. + and right children (i.e. it is a <B>median</B> split along that axis). + This tends to maximize average performance. You can override this behavior by setting a number of <B>mean</B> (average) splits. numMeanSplits = MAX_INT @@ -1126,7 +1126,7 @@ public: } Array<_AABSPTree::Handle<T> * > temp; - // Make a new root. Work with a copy of the value array because + // Make a new root. Work with a copy of the value array because // makeNode clears the source array as it progresses Array<_AABSPTree::Handle<T> * > copy(oldRoot->valueArray); root = makeNode(copy, valuesPerNode, numMeanSplits, temp); @@ -1195,7 +1195,7 @@ protected: public: /** - Returns all members inside the set of planes. + Returns all members inside the set of planes. @param members The results are appended to this array. */ void getIntersectingMembers(const Array<Plane>& plane, Array<T>& members) const { @@ -1221,7 +1221,7 @@ public: */ void getIntersectingMembers(const GCamera::Frustum& frustum, Array<T>& members) const { Array<Plane> plane; - + for (int i = 0; i < frustum.faceArray.size(); ++i) { plane.append(frustum.faceArray[i].plane); } @@ -1260,14 +1260,14 @@ public: // caller uses post increment (which they shouldn't!). Array<Node*> stack; - /** The next index of current->valueArray to return. + /** The next index of current->valueArray to return. Undefined when isEnd is true.*/ int nextValueArrayIndex; BoxIntersectionIterator() : isEnd(true) {} - - BoxIntersectionIterator(const AABox& b, const Node* root) : - isEnd(root == NULL), box(b), + + BoxIntersectionIterator(const AABox& b, const Node* root) : + isEnd(root == NULL), box(b), node(const_cast<Node*>(root)), nextValueArrayIndex(-1) { // We intentionally start at the "-1" index of the current @@ -1290,10 +1290,10 @@ public: } else if (other.isEnd) { return false; } else { - // Two non-end iterators; see if they match. This is kind of + // Two non-end iterators; see if they match. This is kind of // silly; users shouldn't call == on iterators in general unless // one of them is the end iterator. - if ((box != other.box) || (node != other.node) || + if ((box != other.box) || (node != other.node) || (nextValueArrayIndex != other.nextValueArrayIndex) || (stack.length() != other.stack.length())) { return false; @@ -1322,7 +1322,7 @@ public: // Search for the next node if we've exhausted this one while ((! isEnd) && (nextValueArrayIndex >= node->valueArray.length())) { - // If we entered this loop, then the iterator has exhausted the elements at + // If we entered this loop, then the iterator has exhausted the elements at // node (possibly because it just switched to a child node with no members). // This loop continues until it finds a node with members or reaches // the end of the whole intersection search. @@ -1333,7 +1333,7 @@ public: (box.high()[node->splitAxis] > node->splitLocation)) { stack.push(node->child[1]); } - + // If the left child overlaps the box, push it onto the stack for // processing. if ((node->child[0] != NULL) && @@ -1342,7 +1342,7 @@ public: } if (stack.length() > 0) { - // Go on to the next node (which may be either one of the ones we + // Go on to the next node (which may be either one of the ones we // just pushed, or one from farther back the tree). node = stack.pop(); nextValueArrayIndex = 0; @@ -1358,7 +1358,7 @@ public: foundIntersection = true; } else { ++nextValueArrayIndex; - // If we exhaust this node, we'll loop around the master loop + // If we exhaust this node, we'll loop around the master loop // to find a new node. } } @@ -1431,7 +1431,7 @@ public: Invoke a callback for every member along a ray until the closest intersection is found. @param callback either a function or an instance of a class with an overloaded operator() of the form: - + <code>void callback(const Ray& ray, const T& object, float& distance)</code>. If the ray hits the object before travelling distance <code>distance</code>, updates <code>distance</code> with the new distance to the intersection, otherwise leaves it unmodified. A common example is: @@ -1482,12 +1482,12 @@ public: */ template<typename RayCallback> void intersectRay( - const Ray& ray, - RayCallback& intersectCallback, + const Ray& ray, + RayCallback& intersectCallback, float& distance, bool pStopAtFirstHit, bool intersectCallbackIsFast = false) const { - + root->intersectRay(ray, intersectCallback, distance, pStopAtFirstHit, intersectCallbackIsFast); } @@ -1509,7 +1509,7 @@ public: #if 0 /** Stores the locations of the splitting planes (the structure but not the content) - so that the tree can be quickly rebuilt from a previous configuration without + so that the tree can be quickly rebuilt from a previous configuration without calling balance. */ void serializeStructure(BinaryOutput& bo) const { @@ -1593,9 +1593,9 @@ public: /** - C++ STL style iterator method. Returns the first member. + C++ STL style iterator method. Returns the first member. Use preincrement (++entry) to get to the next element (iteration - order is arbitrary). + order is arbitrary). Do not modify the set while iterating. */ Iterator begin() const { diff --git a/src/shared/vmap/BaseModel.cpp b/src/shared/vmap/BaseModel.cpp index f281fdd8f61..bce9c718acd 100644 --- a/src/shared/vmap/BaseModel.cpp +++ b/src/shared/vmap/BaseModel.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -84,11 +84,11 @@ namespace VMAP // See if the ray will ever hit this node or its children Vector3 location; bool alreadyInsideBounds = false; - bool rayWillHitBounds = + bool rayWillHitBounds = MyCollisionDetection::collisionLocationForMovingPointFixedAABox( pRay.origin, pRay.direction, pBox, location, alreadyInsideBounds); - bool canHitThisNode = (alreadyInsideBounds || + bool canHitThisNode = (alreadyInsideBounds || (rayWillHitBounds && ((location - pRay.origin).squaredLength() < (pMaxDist * pMaxDist)))); return canHitThisNode; diff --git a/src/shared/vmap/BaseModel.h b/src/shared/vmap/BaseModel.h index b6d698dd056..42e277634ba 100644 --- a/src/shared/vmap/BaseModel.h +++ b/src/shared/vmap/BaseModel.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/CoordModelMapping.cpp b/src/shared/vmap/CoordModelMapping.cpp index 85ee88e5478..9c7cbe58a6b 100644 --- a/src/shared/vmap/CoordModelMapping.cpp +++ b/src/shared/vmap/CoordModelMapping.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/CoordModelMapping.h b/src/shared/vmap/CoordModelMapping.h index ad63929ed38..10392ca7eaf 100644 --- a/src/shared/vmap/CoordModelMapping.h +++ b/src/shared/vmap/CoordModelMapping.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/DebugCmdLogger.cpp b/src/shared/vmap/DebugCmdLogger.cpp index 87bbd247275..26846fa5783 100644 --- a/src/shared/vmap/DebugCmdLogger.cpp +++ b/src/shared/vmap/DebugCmdLogger.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -25,7 +25,7 @@ using namespace G3D; namespace VMAP { - bool CommandFileRW::appendCmd(const Command& + bool CommandFileRW::appendCmd(const Command& #ifdef _DEBUG pCommand #endif @@ -55,7 +55,7 @@ namespace VMAP //========================================================= - bool CommandFileRW::appendCmds(const Array<Command>& + bool CommandFileRW::appendCmds(const Array<Command>& #ifdef _DEBUG pCmdArray #endif diff --git a/src/shared/vmap/DebugCmdLogger.h b/src/shared/vmap/DebugCmdLogger.h index bc4c59ef195..f0e35d377bf 100644 --- a/src/shared/vmap/DebugCmdLogger.h +++ b/src/shared/vmap/DebugCmdLogger.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/IVMapManager.h b/src/shared/vmap/IVMapManager.h index d26f9be3f4f..49f639b845e 100644 --- a/src/shared/vmap/IVMapManager.h +++ b/src/shared/vmap/IVMapManager.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/ManagedModelContainer.cpp b/src/shared/vmap/ManagedModelContainer.cpp index f9f74e21ad8..34800b3b5f7 100644 --- a/src/shared/vmap/ManagedModelContainer.cpp +++ b/src/shared/vmap/ManagedModelContainer.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/ManagedModelContainer.h b/src/shared/vmap/ManagedModelContainer.h index 3674e04987a..5aa6bfdf1c3 100644 --- a/src/shared/vmap/ManagedModelContainer.h +++ b/src/shared/vmap/ManagedModelContainer.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/ModelContainer.cpp b/src/shared/vmap/ModelContainer.cpp index c5e3a333f50..56d09083677 100644 --- a/src/shared/vmap/ModelContainer.cpp +++ b/src/shared/vmap/ModelContainer.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/ModelContainer.h b/src/shared/vmap/ModelContainer.h index 319c480fff8..f66b11658d6 100644 --- a/src/shared/vmap/ModelContainer.h +++ b/src/shared/vmap/ModelContainer.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/NodeValueAccess.h b/src/shared/vmap/NodeValueAccess.h index 35051f1fbbf..70bd0eeefae 100644 --- a/src/shared/vmap/NodeValueAccess.h +++ b/src/shared/vmap/NodeValueAccess.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/ShortBox.h b/src/shared/vmap/ShortBox.h index 61bd0f97dcd..059e59f47e6 100644 --- a/src/shared/vmap/ShortBox.h +++ b/src/shared/vmap/ShortBox.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/ShortVector.h b/src/shared/vmap/ShortVector.h index 3bf707dff5a..d02e6b4081e 100644 --- a/src/shared/vmap/ShortVector.h +++ b/src/shared/vmap/ShortVector.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/SubModel.cpp b/src/shared/vmap/SubModel.cpp index 02e9865caad..ed586ce6b52 100644 --- a/src/shared/vmap/SubModel.cpp +++ b/src/shared/vmap/SubModel.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/SubModel.h b/src/shared/vmap/SubModel.h index 19d213cc1c0..5a0b0d38be7 100644 --- a/src/shared/vmap/SubModel.h +++ b/src/shared/vmap/SubModel.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/TileAssembler.cpp b/src/shared/vmap/TileAssembler.cpp index d74adae1ecf..e57836a6f9e 100644 --- a/src/shared/vmap/TileAssembler.cpp +++ b/src/shared/vmap/TileAssembler.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/TileAssembler.h b/src/shared/vmap/TileAssembler.h index 5d4efcdf720..cdfd6e1311d 100644 --- a/src/shared/vmap/TileAssembler.h +++ b/src/shared/vmap/TileAssembler.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/TreeNode.cpp b/src/shared/vmap/TreeNode.cpp index 5d285704410..1c0cff7d4b3 100644 --- a/src/shared/vmap/TreeNode.cpp +++ b/src/shared/vmap/TreeNode.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/TreeNode.h b/src/shared/vmap/TreeNode.h index e98e1fe1d29..d30b470b4b3 100644 --- a/src/shared/vmap/TreeNode.h +++ b/src/shared/vmap/TreeNode.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -109,11 +109,11 @@ namespace VMAP // See if the ray will ever hit this node or its children G3D::Vector3 location; bool alreadyInsideBounds = false; - bool rayWillHitBounds = + bool rayWillHitBounds = MyCollisionDetection::collisionLocationForMovingPointFixedAABox( ray.origin, ray.direction, iBounds, location, alreadyInsideBounds); - bool canHitThisNode = (alreadyInsideBounds || + bool canHitThisNode = (alreadyInsideBounds || (rayWillHitBounds && ((location - ray.origin).squaredLength() < (distance*distance)))); return canHitThisNode; @@ -121,8 +121,8 @@ namespace VMAP template<typename RayCallback, typename TNode, typename TValue> void intersectRay( - const G3D::Ray& ray, - RayCallback& intersectCallback, + const G3D::Ray& ray, + RayCallback& intersectCallback, float& distance, const NodeValueAccess<TNode, TValue>& pNodeValueAccess, bool pStopAtFirstHit, @@ -134,7 +134,7 @@ namespace VMAP } // Test for intersection against every object at this node. - for (unsigned int v = iStartPosition; v < (iNumberOfValues+iStartPosition); ++v) { + for (unsigned int v = iStartPosition; v < (iNumberOfValues+iStartPosition); ++v) { const TValue& nodeValue = pNodeValueAccess.getValue(v); bool canHitThisObject = true; if (! intersectCallbackIsFast) { @@ -142,11 +142,11 @@ namespace VMAP G3D::Vector3 location; const G3D::AABox& bounds = nodeValue.getAABoxBounds(); bool alreadyInsideBounds = false; - bool rayWillHitBounds = + bool rayWillHitBounds = MyCollisionDetection::collisionLocationForMovingPointFixedAABox( ray.origin, ray.direction, bounds, location, alreadyInsideBounds); - canHitThisObject = (alreadyInsideBounds || + canHitThisObject = (alreadyInsideBounds || (rayWillHitBounds && ((location - ray.origin).squaredLength() < (distance*distance)))); } @@ -160,7 +160,7 @@ namespace VMAP } // There are three cases to consider next: - // + // // 1. the ray can start on one side of the splitting plane and never enter the other, // 2. the ray can start on one side and enter the other, and // 3. the ray can travel exactly down the splitting plane @@ -205,7 +205,7 @@ namespace VMAP return; } if (ray.direction[iSplitAxis] != 0) { - // See if there was an intersection before hitting the splitting plane. + // See if there was an intersection before hitting the splitting plane. // If so, there is no need to look on the far side and recursion terminates. float distanceToSplittingPlane = (iSplitLocation - ray.origin[iSplitAxis]) / ray.direction[iSplitAxis]; if (distanceToSplittingPlane > distance) { diff --git a/src/shared/vmap/VMapDefinitions.h b/src/shared/vmap/VMapDefinitions.h index 70a42cde054..35c672bd82e 100644 --- a/src/shared/vmap/VMapDefinitions.h +++ b/src/shared/vmap/VMapDefinitions.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/VMapFactory.cpp b/src/shared/vmap/VMapFactory.cpp index 249c0725196..f0a78ba4f1c 100644 --- a/src/shared/vmap/VMapFactory.cpp +++ b/src/shared/vmap/VMapFactory.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/VMapFactory.h b/src/shared/vmap/VMapFactory.h index b451f163d92..738a8a7f4e0 100644 --- a/src/shared/vmap/VMapFactory.h +++ b/src/shared/vmap/VMapFactory.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/VMapManager.cpp b/src/shared/vmap/VMapManager.cpp index a3d6142a122..9cf35b2655d 100644 --- a/src/shared/vmap/VMapManager.cpp +++ b/src/shared/vmap/VMapManager.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/VMapManager.h b/src/shared/vmap/VMapManager.h index c2cabe40281..02e0ec3e179 100644 --- a/src/shared/vmap/VMapManager.h +++ b/src/shared/vmap/VMapManager.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/shared/vmap/VMapTools.h b/src/shared/vmap/VMapTools.h index 1cda2a7bbe4..5253392f867 100644 --- a/src/shared/vmap/VMapTools.h +++ b/src/shared/vmap/VMapTools.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -34,7 +34,7 @@ The collision detection is modified to return true, if we are inside an object. namespace VMAP { - template<class TValue> + template<class TValue> class IntersectionCallBack { public: TValue* closestEntity; diff --git a/src/trinitycore/CliRunnable.h b/src/trinitycore/CliRunnable.h new file mode 100644 index 00000000000..f50cae814bc --- /dev/null +++ b/src/trinitycore/CliRunnable.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/// \addtogroup Trinityd +/// @{ +/// \file + +#ifndef __CLIRUNNABLE_H +#define __CLIRUNNABLE_H + +/// Command Line Interface handling thread +class CliRunnable : public ZThread::Runnable +{ + public: + void run(); +}; +#endif +/// @} diff --git a/src/trinitycore/Master.h b/src/trinitycore/Master.h new file mode 100644 index 00000000000..36d4b29495e --- /dev/null +++ b/src/trinitycore/Master.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/// \addtogroup Trinityd +/// @{ +/// \file + +#ifndef _MASTER_H +#define _MASTER_H + +#include "Common.h" +#include "Policies/Singleton.h" + +/// Start the server +class Master +{ + public: + Master(); + ~Master(); + int Run(); + static volatile uint32 m_masterLoopCounter; + + private: + bool _StartDB(); + + void _HookSignals(); + void _UnhookSignals(); + static void _OnSignal(int s); + + void clearOnlineAccounts(); +}; + +#define sMaster Trinity::Singleton<Master>::Instance() +#endif +/// @} diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp index 97d7e3cff5f..ec4c25a6cf6 100644 --- a/src/trinitycore/WorldRunnable.cpp +++ b/src/trinitycore/WorldRunnable.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/WorldRunnable.h b/src/trinitycore/WorldRunnable.h new file mode 100644 index 00000000000..73a7f17e52f --- /dev/null +++ b/src/trinitycore/WorldRunnable.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/// \addtogroup Trinityd +/// @{ +/// \file + +#ifndef __WORLDRUNNABLE_H +#define __WORLDRUNNABLE_H + +/// Heartbeat thread for the World +class WorldRunnable : public ZThread::Runnable +{ + public: + void run(); +}; +#endif +/// @} diff --git a/src/trinitycore/resource.h b/src/trinitycore/resource.h new file mode 100644 index 00000000000..7dc5cb9ef7b --- /dev/null +++ b/src/trinitycore/resource.h @@ -0,0 +1,15 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by TrinityCore.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/trinityrealm/AuthCodes.h b/src/trinityrealm/AuthCodes.h new file mode 100644 index 00000000000..14a65b89504 --- /dev/null +++ b/src/trinityrealm/AuthCodes.h @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** \file + \ingroup realmd +*/ + +#ifndef _AUTHCODES_H +#define _AUTHCODES_H + +enum eAuthResults +{ + REALM_AUTH_SUCCESS = 0x00, + REALM_AUTH_FAILURE = 0x01, ///< Unable to connect + REALM_AUTH_UNKNOWN1 = 0x02, ///< Unable to connect + REALM_AUTH_ACCOUNT_BANNED = 0x03, ///< This <game> account has been closed and is no longer available for use. Please go to <site>/banned.html for further information. + REALM_AUTH_NO_MATCH = 0x04, ///< The information you have entered is not valid. Please check the spelling of the account name and password. If you need help in retrieving a lost or stolen password, see <site> for more information + REALM_AUTH_UNKNOWN2 = 0x05, ///< The information you have entered is not valid. Please check the spelling of the account name and password. If you need help in retrieving a lost or stolen password, see <site> for more information + REALM_AUTH_ACCOUNT_IN_USE = 0x06, ///< This account is already logged into <game>. Please check the spelling and try again. + REALM_AUTH_PREPAID_TIME_LIMIT = 0x07, ///< You have used up your prepaid time for this account. Please purchase more to continue playing + REALM_AUTH_SERVER_FULL = 0x08, ///< Could not log in to <game> at this time. Please try again later. + REALM_AUTH_WRONG_BUILD_NUMBER = 0x09, ///< Unable to validate game version. This may be caused by file corruption or interference of another program. Please visit <site> for more information and possible solutions to this issue. + REALM_AUTH_UPDATE_CLIENT = 0x0a, ///< Downloading + REALM_AUTH_UNKNOWN3 = 0x0b, ///< Unable to connect + REALM_AUTH_ACCOUNT_FREEZED = 0x0c, ///< This <game> account has been temporarily suspended. Please go to <site>/banned.html for further information + REALM_AUTH_UNKNOWN4 = 0x0d, ///< Unable to connect + REALM_AUTH_UNKNOWN5 = 0x0e, ///< Connected. + REALM_AUTH_PARENTAL_CONTROL = 0x0f ///< Access to this account has been blocked by parental controls. Your settings may be changed in your account preferences at <site> +}; + +enum LoginResult +{ + LOGIN_OK = 0x00, + LOGIN_FAILED = 0x01, + LOGIN_FAILED2 = 0x02, + LOGIN_BANNED = 0x03, + LOGIN_UNKNOWN_ACCOUNT = 0x04, + LOGIN_UNKNOWN_ACCOUNT3 = 0x05, + LOGIN_ALREADYONLINE = 0x06, + LOGIN_NOTIME = 0x07, + LOGIN_DBBUSY = 0x08, + LOGIN_BADVERSION = 0x09, + LOGIN_DOWNLOAD_FILE = 0x0A, + LOGIN_FAILED3 = 0x0B, + LOGIN_SUSPENDED = 0x0C, + LOGIN_FAILED4 = 0x0D, + LOGIN_CONNECTED = 0x0E, + LOGIN_PARENTALCONTROL = 0x0F, + LOGIN_LOCKED_ENFORCED = 0x10, +}; + +// we need to stick to 1 version or half of the stuff will work for someone +// others will not and opposite +// will only support WoW and WoW:TBC 2.4.3 client build 8606... + +#define EXPECTED_TRINITY_CLIENT_BUILD {8606, 0} + +#endif diff --git a/src/trinityrealm/RealmList.cpp b/src/trinityrealm/RealmList.cpp index 490850a3631..6a3d6b47e0f 100644 --- a/src/trinityrealm/RealmList.cpp +++ b/src/trinityrealm/RealmList.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinityrealm/RealmList.h b/src/trinityrealm/RealmList.h new file mode 100644 index 00000000000..842482bb75a --- /dev/null +++ b/src/trinityrealm/RealmList.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/// \addtogroup realmd +/// @{ +/// \file + +#ifndef _REALMLIST_H +#define _REALMLIST_H + +#include "Common.h" + +/// Storage object for a realm +struct Realm +{ + std::string name; + std::string address; + uint8 icon; + uint8 color; + uint8 timezone; + uint32 m_ID; + AccountTypes allowedSecurityLevel; + float populationLevel; +}; + +/// Storage object for the list of realms on the server +class RealmList +{ + public: + typedef std::map<std::string, Realm> RealmMap; + + RealmList(); + ~RealmList() {} + + void Initialize(uint32 updateInterval); + + void UpdateIfNeed(); + + RealmMap::const_iterator begin() const { return m_realms.begin(); } + RealmMap::const_iterator end() const { return m_realms.end(); } + uint32 size() const { return m_realms.size(); } + private: + void UpdateRealms(bool init); + void UpdateRealm( uint32 ID, const std::string& name, const std::string& address, uint32 port, uint8 icon, uint8 color, uint8 timezone, AccountTypes allowedSecurityLevel, float popu); + private: + RealmMap m_realms; ///< Internal map of realms + uint32 m_UpdateInterval; + time_t m_NextUpdateTime; +}; +#endif +/// @} diff --git a/src/trinityrealm/resource.h b/src/trinityrealm/resource.h new file mode 100644 index 00000000000..7dc5cb9ef7b --- /dev/null +++ b/src/trinityrealm/resource.h @@ -0,0 +1,15 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by TrinityCore.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif |