From 55f561e75a168fd467ec2864a320292dc9347c92 Mon Sep 17 00:00:00 2001 From: Rat Date: Fri, 17 Apr 2009 13:02:32 +0200 Subject: *fix enemy counter/timer reset bug in hyjal --HG-- branch : trunk --- .../scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src') 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 d144423ccca..0467bfce594 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 @@ -387,15 +387,20 @@ void hyjalAI::Reset() //Initialize spells memset(Spell, 0, sizeof(Spell)); - //Reset World States - UpdateWorldState(WORLD_STATE_WAVES, 0); - UpdateWorldState(WORLD_STATE_ENEMY, 0); - UpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); + //Reset Instance Data for trash count if(pInstance) - pInstance->SetData(DATA_RESET_TRASH_COUNT, 0); - else error_log(ERROR_INST_DATA); + { + if((!pInstance->GetData(DATA_ALLIANCE_RETREAT) && m_creature->GetEntry() == JAINA) || (pInstance->GetData(DATA_ALLIANCE_RETREAT) && m_creature->GetEntry() == THRALL)) + { + //Reset World States + UpdateWorldState(WORLD_STATE_WAVES, 0); + UpdateWorldState(WORLD_STATE_ENEMY, 0); + UpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); + pInstance->SetData(DATA_RESET_TRASH_COUNT, 0); + } + }else error_log(ERROR_INST_DATA); //Visibility DoHide = true; -- cgit v1.2.3 From e4c0f52127d6032c3098b87fe07acf1aa6f6a117 Mon Sep 17 00:00:00 2001 From: Rat Date: Fri, 17 Apr 2009 13:14:21 +0200 Subject: *some fixes to Kael'thas (tk:eye) - fixed event reset bug - fixed 'combat bug' after boss is killed - use SummonList to handle all summons - fixed possible crashpoint todo: find a way to reset event if raid wiped --HG-- branch : trunk --- .../zone/tempest_keep/the_eye/boss_kaelthas.cpp | 52 ++++++---------------- 1 file changed, 14 insertions(+), 38 deletions(-) (limited to 'src') 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 d36f520491a..91087528088 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 @@ -179,6 +179,7 @@ struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI void Reset() { + m_creature->SetNoCallAssistance(true); FakeDeath = false; DelayRes_Timer = 0; DelayRes_Target = 0; @@ -268,7 +269,7 @@ struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI //Kael'thas AI struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI { - boss_kaelthasAI(Creature *c) : ScriptedAI(c) + boss_kaelthasAI(Creature *c) : ScriptedAI(c), summons(m_creature) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); AdvisorGuid[0] = 0; @@ -303,6 +304,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI uint64 AdvisorGuid[4]; uint64 WeaponGuid[7]; + SummonList summons; void DeleteLegs() { @@ -322,42 +324,12 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI i_pl->DestroyItemCount(30318, 1, true); i_pl->DestroyItemCount(30319, 1, true); i_pl->DestroyItemCount(30320, 1, true); - } - if(pInstance) { - for(uint32 i = 0; i < 7; i++) { - Creature* weapon = (Creature*)(Unit::GetUnit((*m_creature), WeaponGuid[i]));; - delete weapon; - } - } - } - - void CleanPhoenix() - { - CellPair pair(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); - Cell cell(pair); - cell.data.Part.reserved = ALL_DISTRICT; - cell.SetNoCreate(); - - std::list PhoenixList; - - Trinity::AllCreaturesOfEntryInRange check(m_creature, PHOENIX, 50); - Trinity::CreatureListSearcher searcher(PhoenixList, check); - TypeContainerVisitor, GridTypeMapContainer> visitor(searcher); - - CellLock cell_lock(cell, pair); - cell_lock->Visit(cell_lock, visitor, *(m_creature->GetMap())); - - if(!PhoenixList.empty()) - { - for(std::list::iterator itr = PhoenixList.begin(); itr != PhoenixList.end(); ++itr) - { - (*itr)->RemoveFromWorld(); - } - } + } } void Reset() { + m_creature->SetNoCallAssistance(true); Fireball_Timer = 5000+rand()%10000; ArcaneDisruption_Timer = 45000; MindControl_Timer = 40000; @@ -379,7 +351,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI PrepareAdvisors(); DeleteLegs(); - CleanPhoenix(); + summons.DespawnAll(); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -466,8 +438,11 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); summoned->AI()->AttackStart(target); } + summons.Summon(summoned); } + void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} + void JustDied(Unit* Killer) { m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -476,6 +451,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI DoScriptText(SAY_DEATH, m_creature); DeleteLegs(); + summons.DespawnAll(); if(pInstance) pInstance->SetData(DATA_KAELTHASEVENT, DONE); @@ -483,10 +459,10 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI Creature *pCreature; for(uint8 i = 0; i < 4; ++i) { - pCreature = (Creature*)(Unit::GetUnit((*m_creature), AdvisorGuid[i])); + pCreature = (Unit::GetCreature((*m_creature), AdvisorGuid[i])); if(pCreature) { - pCreature->DealDamage(pCreature, pCreature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + pCreature->setDeathState(JUST_DIED); } } } @@ -955,7 +931,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end();i++) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); - if(pUnit) + if(pUnit && pUnit->GetTypeId() == TYPEID_PLAYER) { m_creature->CastSpell(pUnit, SPELL_KNOCKBACK, true); //Gravity lapse - needs an exception in Spell system to work @@ -989,7 +965,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end();i++) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); - if(pUnit) + if(pUnit && pUnit->GetTypeId() == TYPEID_PLAYER) { //Using packet workaround WorldPacket data(12); -- cgit v1.2.3 From bb5b040411733257fb8a2ce72fc56f72d36a2e10 Mon Sep 17 00:00:00 2001 From: Rat Date: Fri, 17 Apr 2009 15:45:08 +0200 Subject: *Kael'thas (tk:eye) - corretly despawn all phoenix - enable phoenix's fly mode - spawn eggs on the ground even if bird died mid-air - small code realignment and cleanup --HG-- branch : trunk --- .../zone/tempest_keep/the_eye/boss_kaelthas.cpp | 212 +++++++++++---------- 1 file changed, 114 insertions(+), 98 deletions(-) (limited to 'src') 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 91087528088..e53d688acde 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 @@ -147,6 +147,7 @@ float KaelthasWeapons[7][5] = #define TIME_PHASE_3_4 120000 #define KAEL_VISIBLE_RANGE 50.0f +#define ROOM_BASE_Z 49.0f //Base AI for Advisors struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI @@ -1386,109 +1387,124 @@ struct TRINITY_DLL_DECL mob_kael_flamestrikeAI : public ScriptedAI //Phoenix AI struct TRINITY_DLL_DECL mob_phoenix_tkAI : public ScriptedAI { - mob_phoenix_tkAI(Creature *c) : ScriptedAI(c) {} - - uint32 Cycle_Timer; - uint8 SummonEgg; - - void Reset() - { - Cycle_Timer = 2000; - SummonEgg = 0; - m_creature->CastSpell(m_creature,SPELL_BURN,true); - } - - void Aggro(Unit *who) { } - - void DamageTaken(Unit* pKiller, uint32 &damage) - { - if(m_creature->GetHealth() < damage && SummonEgg < 2){ - damage = 0; - SummonEgg = 1; - } - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if(SummonEgg < 2){ - if (Cycle_Timer < diff) - { - //spell Burn should possible do this, but it doesn't, so do this for now. - uint32 dmg = urand(4500,5500); - if (m_creature->GetHealth() > dmg) - m_creature->SetHealth(uint32(m_creature->GetHealth()-dmg)); - Cycle_Timer = 2000; - }else Cycle_Timer -= diff; - }else { - if(Cycle_Timer < diff){ - m_creature->SummonCreature(PHOENIX_EGG,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),m_creature->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,16000); - m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - m_creature->RemoveCorpse(); - }else Cycle_Timer -= diff; - } - - if(SummonEgg == 1){ //hack die animation - m_creature->RemoveAllAuras(); - DoStartNoMovement(m_creature->getVictim()); - m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, PLAYER_STATE_DEAD); - SummonEgg = 2; - Cycle_Timer = 1000; - } - if(SummonEgg < 2)DoMeleeAttackIfReady(); - } + mob_phoenix_tkAI(Creature *c) : ScriptedAI(c) + { + pInstance = ((ScriptedInstance*)c->GetInstanceData()); + } + + ScriptedInstance* pInstance; + uint32 Cycle_Timer; + bool egg; + + void JustDied(Unit *victim) + { + if(egg) + { + float x,y,z; + m_creature->GetPosition(x,y,z); + z = m_creature->GetMap()->GetVmapHeight(x,y,z,true); + if(z == INVALID_HEIGHT) + z = ROOM_BASE_Z; + m_creature->SummonCreature(PHOENIX_EGG,x,y,z,m_creature->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,16000); + m_creature->RemoveCorpse(); + } + } + + + void Reset() + { + m_creature->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT + MOVEMENTFLAG_LEVITATING);//birds can fly! :) + egg = true; + Cycle_Timer = 2000; + m_creature->CastSpell(m_creature,SPELL_BURN,true); + } + + void Aggro(Unit *who) { } + + void DamageTaken(Unit* pKiller, uint32 &damage) + { + + } + + void UpdateAI(const uint32 diff) + { + if (Cycle_Timer < diff) + { + if(pInstance)//check for boss reset + { + Creature* Kael = Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_KAELTHAS)); + if (Kael && Kael->getThreatManager().getThreatList().empty()) + { + egg = false; + m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Cycle_Timer = 2000; + return; + } + } + //spell Burn should possible do this, but it doesn't, so do this for now. + uint32 dmg = urand(4500,5500); + if (m_creature->GetHealth() > dmg) + m_creature->SetHealth(uint32(m_creature->GetHealth()-dmg)); + else//kill itt + m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Cycle_Timer = 2000; + }else Cycle_Timer -= diff; + + if (!UpdateVictim()) + return; + DoMeleeAttackIfReady(); + } }; //Phoenix Egg AI struct TRINITY_DLL_DECL mob_phoenix_egg_tkAI : public ScriptedAI { - mob_phoenix_egg_tkAI(Creature *c) : ScriptedAI(c) {} - - uint32 Rebirth_Timer; - bool summoned; - - void Reset(){ - Rebirth_Timer = 15000; - summoned = false; - } - - //ignore any - void MoveInLineOfSight(Unit* who) { return; } - - void AttackStart(Unit* who) - { - if (m_creature->Attack(who, false)) - { - if (!InCombat) - { - InCombat = true; - Aggro(who); - } - DoStartNoMovement(who); - } - } - - void Aggro(Unit *who) { } - - void JustSummoned(Creature* summoned) - { - summoned->AddThreat(m_creature->getVictim(), 0.0f); - summoned->CastSpell(summoned,SPELL_REBIRTH,false); - } - - void UpdateAI(const uint32 diff) - { - if (Rebirth_Timer < diff) - { - if(!summoned){ - Creature* Phoenix = m_creature->SummonCreature(PHOENIX,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),m_creature->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,5000); - summoned = true; - } - m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - }else Rebirth_Timer -= diff; - } + mob_phoenix_egg_tkAI(Creature *c) : ScriptedAI(c) {} + + uint32 Rebirth_Timer; + bool summoned; + + void Reset(){ + Rebirth_Timer = 15000; + summoned = false; + } + + //ignore any + void MoveInLineOfSight(Unit* who) { return; } + + void AttackStart(Unit* who) + { + if (m_creature->Attack(who, false)) + { + if (!InCombat) + { + InCombat = true; + Aggro(who); + } + DoStartNoMovement(who); + } + } + + void Aggro(Unit *who) { } + + void JustSummoned(Creature* summoned) + { + summoned->AddThreat(m_creature->getVictim(), 0.0f); + summoned->CastSpell(summoned,SPELL_REBIRTH,false); + } + + void UpdateAI(const uint32 diff) + { + if (Rebirth_Timer < diff) + { + if(!summoned) + { + Creature* Phoenix = m_creature->SummonCreature(PHOENIX,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),m_creature->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,5000); + summoned = true; + } + m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + }else Rebirth_Timer -= diff; + } }; CreatureAI* GetAI_boss_kaelthas(Creature *_Creature) -- cgit v1.2.3 From 59b6a13aa22138dfb0e4071374fbd4f6cb52c3a0 Mon Sep 17 00:00:00 2001 From: Rat Date: Fri, 17 Apr 2009 16:46:56 +0200 Subject: *fix Kael'thas' no-reset bug --HG-- branch : trunk --- .../scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src') 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 e53d688acde..ed83a32fff6 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 @@ -386,7 +386,6 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI AdvisorGuid[1] = pInstance->GetData64(DATA_LORDSANGUINAR); AdvisorGuid[2] = pInstance->GetData64(DATA_GRANDASTROMANCERCAPERNIAN); AdvisorGuid[3] = pInstance->GetData64(DATA_MASTERENGINEERTELONICUS); - m_creature->addUnitState(UNIT_STAT_STUNNED); if(!AdvisorGuid[0] || !AdvisorGuid[1] || !AdvisorGuid[2] || !AdvisorGuid[3]) { @@ -499,6 +498,15 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI void UpdateAI(const uint32 diff) { + + if(pInstance && Phase) + { + if(pInstance->GetData(DATA_KAELTHASEVENT) == IN_PROGRESS && m_creature->getThreatManager().getThreatList().empty()) + { + EnterEvadeMode(); + return; + } + } //Phase 1 switch (Phase) { @@ -741,7 +749,6 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - m_creature->clearUnitState(UNIT_STAT_STUNNED); AttackStart(target); } Phase_Timer = 30000; -- cgit v1.2.3 From 3fff87960a568b9da3c5afe1387831757cbcf58f Mon Sep 17 00:00:00 2001 From: Rat Date: Fri, 17 Apr 2009 16:59:39 +0200 Subject: *reset Kael's threat when he enters the fight --HG-- branch : trunk --- src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') 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 ed83a32fff6..ae19cedf75a 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 @@ -749,6 +749,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) { + DoResetThreat();//only healers will be at top threat, so reset(not delete) all players's threat when Kael comes to fight AttackStart(target); } Phase_Timer = 30000; -- cgit v1.2.3 From 5af68845951e8ceb032d766c8162e3ee1f04769f Mon Sep 17 00:00:00 2001 From: Bagsac Date: Fri, 17 Apr 2009 20:44:23 +0200 Subject: Added placeholders for sunwell --HG-- branch : trunk --- src/bindings/scripts/CMakeLists.txt | 3 +++ src/bindings/scripts/ScriptMgr.cpp | 6 ++++++ src/bindings/scripts/VC71/71ScriptDev2.vcproj | 12 +++++++++++ src/bindings/scripts/VC80/80ScriptDev2.vcproj | 12 +++++++++++ src/bindings/scripts/VC90/90ScriptDev2.vcproj | 12 +++++++++++ .../zone/sunwell_plateau/boss_kiljaeden.cpp | 25 ++++++++++++++++++++++ .../scripts/zone/sunwell_plateau/boss_muru.cpp | 25 ++++++++++++++++++++++ .../zone/sunwell_plateau/sunwell_plateau.cpp | 25 ++++++++++++++++++++++ 8 files changed, 120 insertions(+) create mode 100644 src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp create mode 100644 src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp create mode 100644 src/bindings/scripts/scripts/zone/sunwell_plateau/sunwell_plateau.cpp (limited to 'src') diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index efee966da48..dadb2d76985 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -303,10 +303,13 @@ SET(trinityscript_LIB_SRCS scripts/zone/stratholme/def_stratholme.h scripts/zone/stratholme/instance_stratholme.cpp scripts/zone/stratholme/stratholme.cpp + scripts/zone/sunwell_plateau/boss_kiljaeden.cpp + scripts/zone/sunwell_plateau/boss_muru.cpp scripts/zone/sunwell_plateau/boss_eredar_twins.cpp scripts/zone/sunwell_plateau/boss_felmyst.cpp scripts/zone/sunwell_plateau/boss_brutallus.cpp scripts/zone/sunwell_plateau/boss_kalecgos.cpp + scripts/zone/sunwell_plateau/sunwell_plateau.cpp scripts/zone/sunwell_plateau/def_sunwell_plateau.h scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp scripts/zone/tanaris/tanaris.cpp diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index b176c763f1f..8ab29f769f0 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -505,6 +505,9 @@ extern void AddSC_boss_kalecgos(); extern void AddSC_boss_brutallus(); extern void AddSC_boss_felmyst(); extern void AddSC_boss_eredar_twins(); +extern void AddSC_boss_muru(); +extern void AddSC_boss_kiljaeden(); +extern void AddSC_sunwell_plateau(); //Tanaris extern void AddSC_tanaris(); @@ -1823,6 +1826,9 @@ void ScriptsInit() AddSC_boss_brutallus(); AddSC_boss_felmyst(); AddSC_boss_eredar_twins(); + AddSC_boss_muru(); + AddSC_boss_kiljaeden(); + AddSC_sunwell_plateau(); //Tanaris AddSC_tanaris(); diff --git a/src/bindings/scripts/VC71/71ScriptDev2.vcproj b/src/bindings/scripts/VC71/71ScriptDev2.vcproj index 57ee9dad9f3..e92d43e61c2 100644 --- a/src/bindings/scripts/VC71/71ScriptDev2.vcproj +++ b/src/bindings/scripts/VC71/71ScriptDev2.vcproj @@ -2113,6 +2113,18 @@ RelativePath="..\scripts\zone\sunwell_plateau\boss_kalecgos.cpp" > + + + + + + diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj index a2fcfb26af0..fcec093ee91 100644 --- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj +++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj @@ -2290,6 +2290,18 @@ RelativePath="..\scripts\zone\sunwell_plateau\boss_kalecgos.cpp" > + + + + + + diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj index 8e8c9b58ca4..7cf04d191ed 100644 --- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj +++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj @@ -2283,6 +2283,18 @@ RelativePath="..\scripts\zone\sunwell_plateau\boss_kalecgos.cpp" > + + + + + + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp new file mode 100644 index 00000000000..394db5faa04 --- /dev/null +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp @@ -0,0 +1,25 @@ +/* Copyright (C) 2009 Trinity + * 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 + */ + +/* ScriptData +SDName: Boss_Kiljaeden +SD%Complete: 0 +SDComment: Placeholer +SDCategory: Sunwell_Plateau +EndScriptData */ + +void AddSC_boss_kiljaeden() +{}; diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp new file mode 100644 index 00000000000..fe6f123ebcc --- /dev/null +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp @@ -0,0 +1,25 @@ +/* Copyright (C) 2009 Trinity + * 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 + */ + +/* ScriptData +SDName: Boss_Muru +SD%Complete: 0 +SDComment: Placeholer +SDCategory: Sunwell_Plateau +EndScriptData */ + +void AddSC_boss_muru() +{}; diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/sunwell_plateau.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/sunwell_plateau.cpp new file mode 100644 index 00000000000..57b4cee1648 --- /dev/null +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/sunwell_plateau.cpp @@ -0,0 +1,25 @@ +/* Copyright (C) 2009 Trinity + * 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 + */ + +/* ScriptData +SDName: sunwell_plateau +SD%Complete: 0 +SDComment: Placeholer +SDCategory: Sunwell_Plateau +EndScriptData */ + +void AddSC_sunwell_plateau() +{}; \ No newline at end of file -- cgit v1.2.3 From c688548c2c64764b16cd571321d0d72ed83eb1b4 Mon Sep 17 00:00:00 2001 From: megamage Date: Fri, 17 Apr 2009 15:26:14 -0500 Subject: *Change a eventai action number in case of conflicts with mangos. --HG-- branch : trunk --- src/bindings/scripts/scripts/creature/mob_event_ai.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.h b/src/bindings/scripts/scripts/creature/mob_event_ai.h index 7b00d9d7942..8182717d5d4 100644 --- a/src/bindings/scripts/scripts/creature/mob_event_ai.h +++ b/src/bindings/scripts/scripts/creature/mob_event_ai.h @@ -76,11 +76,11 @@ enum Action_Types ACTION_T_UPDATE_TEMPLATE = 36, //Entry, Team ACTION_T_DIE = 37, //No Params ACTION_T_ZONE_COMBAT_PULSE = 38, //No Params - ACTION_T_SUMMON_GO = 39, //GameObjectID, DespawnTime in ms - ACTION_T_SET_ACTIVE = 101, //Apply - ACTION_T_SET_AGGRESSIVE = 102, //Apply - ACTION_T_ATTACK_START_PULSE = 103, //Distance + ACTION_T_SET_ACTIVE = 101, //Apply + ACTION_T_SET_AGGRESSIVE = 102, //Apply + ACTION_T_ATTACK_START_PULSE = 103, //Distance + ACTION_T_SUMMON_GO = 104, //GameObjectID, DespawnTime in ms ACTION_T_END, }; -- cgit v1.2.3