rendered paste bodyIn [4144] 2 changes required ScriptDev2 update:
1) (simple) Unit::SummonCreature lost mapid parameter (it must be always equal mapid of summoner.
2) SpellEntry coping and modifing code deprecated and unsupported in core
EffectBasePoints field modifications (only values modified officially in spell templates called sometime at spell procc events) allowed modified using
new Unit::CastCustomSpell functions.
Any other fields modifications in SpellEntry is hacks and not summorted. I comment out this code parts in suggested patch.
If some spells really have wrong values in SpellEntry fields (and new field values must be used everywhere) then original SpellEntry fields must be modified.
const_cast<SpellEntry*>(spellInfo)->EffectRadius = expr. This is clear hack but will work. (Please, not ask me about any problems with described hack coding ;) )
Now patch:
[code]Index: ScriptMgr.cpp
===================================================================
--- ScriptMgr.cpp (revision 78)
+++ ScriptMgr.cpp (working copy)
@@ -1132,7 +1132,7 @@
Creature* ScriptedAI::DoSpawnCreature(uint32 id, float x, float y, float z, float angle, TempSummonType t, uint32 despawntime)
{
- return m_creature->SummonCreature(id,m_creature->GetMapId(),m_creature->GetPositionX() + x,m_creature->GetPositionY() + y,m_creature->GetPositionZ() + z, angle,t,despawntime);
+ return m_creature->SummonCreature(id,m_creature->GetPositionX() + x,m_creature->GetPositionY() + y,m_creature->GetPositionZ() + z, angle,t,despawntime);
}
Unit* ScriptedAI::SelectUnit(SelectAggroTarget target, uint32 position)
Index: scripts/item/item_test.cpp
===================================================================
--- scripts/item/item_test.cpp (revision 78)
+++ scripts/item/item_test.cpp (working copy)
@@ -19,10 +19,9 @@
bool ItemUse_item_test(Player *player, Item* _Item)
{
- SpellEntry i =(*GetSpellStore()->LookupEntry(32739));
- i.EffectBasePoints[0] = 50000;
- i.DurationIndex = 20;
- player->CastSpell(player,&i ,true);
+ int32 basePoints0 = 50000;
+ //i.DurationIndex = 20; If this required then must be used spellmod
+ player->CastCustomSpell(player,32739,&basePoints0, NULL, NULL, true);
//player->GetSession()->SendShowBank( player->GetGUID() );
return true;
}
Index: scripts/item/nether_wraith_beacon.cpp
===================================================================
--- scripts/item/nether_wraith_beacon.cpp (revision 78)
+++ scripts/item/nether_wraith_beacon.cpp (working copy)
@@ -22,8 +22,8 @@
if (player->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE)
{
Creature *Nether;
- Nether = player->SummonCreature(22408,530,player->GetPositionX() ,player->GetPositionY()+20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
- Nether = player->SummonCreature(22408,530,player->GetPositionX() ,player->GetPositionY()-20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
+ Nether = player->SummonCreature(22408,player->GetPositionX() ,player->GetPositionY()+20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
+ Nether = player->SummonCreature(22408,player->GetPositionX() ,player->GetPositionY()-20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
if (Nether)
((CreatureAI*)Nether->AI())->AttackStart(player);
}
Index: scripts/zone/blackrock_spire/boss_halycon.cpp
===================================================================
--- scripts/zone/blackrock_spire/boss_halycon.cpp (revision 78)
+++ scripts/zone/blackrock_spire/boss_halycon.cpp (working copy)
@@ -115,7 +115,7 @@
if ( !Summoned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 25 )
{
//Cast
- m_creature->SummonCreature(10268,229,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,300000);
+ m_creature->SummonCreature(10268,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,300000);
Summoned = true;
}
Index: scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp
===================================================================
--- scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp (revision 78)
+++ scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp (working copy)
@@ -147,8 +147,8 @@
{
//Cast
- m_creature->SummonCreature(9216,229,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,300000);
- m_creature->SummonCreature(9268,229,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,300000);
+ m_creature->SummonCreature(9216,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,300000);
+ m_creature->SummonCreature(9268,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,300000);
Summoned = true;
}
Index: scripts/zone/blackwing_lair/npc_victor_nefarius.cpp
===================================================================
--- scripts/zone/blackwing_lair/npc_victor_nefarius.cpp (revision 78)
+++ scripts/zone/blackwing_lair/npc_victor_nefarius.cpp (working copy)
@@ -265,7 +265,7 @@
SpawnedAdds++;
//Spawn creature and force it to start attacking a random target
- Spawned = m_creature->SummonCreature(CreatureID,469,ADD_X1,ADD_Y1,ADD_Z1,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
+ Spawned = m_creature->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target && Spawned)
{
@@ -282,7 +282,7 @@
target = NULL;
Spawned = NULL;
- Spawned = m_creature->SummonCreature(CreatureID,469,ADD_X2,ADD_Y2,ADD_Z2,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
+ Spawned = m_creature->SummonCreature(CreatureID,ADD_X2,ADD_Y2,ADD_Z2,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target && Spawned)
{
@@ -311,7 +311,7 @@
m_creature->addUnitState(UNIT_STAT_FLEEING);
//Spawn nef and have him attack a random target
- Nefarian = m_creature->SummonCreature(CREATURE_NEFARIAN,469,NEF_X,NEF_Y,NEF_Z,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000);
+ Nefarian = m_creature->SummonCreature(CREATURE_NEFARIAN,NEF_X,NEF_Y,NEF_Z,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000);
target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target && Nefarian)
Index: scripts/zone/gruuls_lair/boss_gruul.cpp
===================================================================
--- scripts/zone/gruuls_lair/boss_gruul.cpp (revision 78)
+++ scripts/zone/gruuls_lair/boss_gruul.cpp (working copy)
@@ -141,10 +141,13 @@
{
//Modify reverberation to cast on all creatures within 200 yards
//On official a dummy spell does this but we don't have that luxury
- SpellEntry i =(*GetSpellStore()->LookupEntry(SPELL_REVERBERATION));
- i.EffectRadiusIndex[0] = 22; //Index 22 = 200 yard radius
- i.rangeIndex = 13; // Index 13 = 50,000 yard range
- m_creature->CastSpell(m_creature->getVictim(),&i ,true);
+
+ // This hack now not supported by core
+ //SpellEntry i =(*GetSpellStore()->LookupEntry(SPELL_REVERBERATION));
+ //i.EffectRadiusIndex[0] = 22; //Index 22 = 200 yard radius
+ //i.rangeIndex = 13; // Index 13 = 50,000 yard range
+ //m_creature->CastSpell(m_creature->getVictim(),&i ,true);
+ m_creature->CastSpell(m_creature->getVictim(),SPELL_REVERBERATION,true);
Reverberation_Timer = 45000;
}else Reverberation_Timer -= diff;
@@ -167,27 +170,31 @@
switch(GroundSlamPhase)
{
case 0:
- m_creature->m_canMove = false;
- IsInGroundSlam= true;
+ {
+ m_creature->m_canMove = false;
+ IsInGroundSlam= true;
- // **Ground Slam Knockback**
- // Using 24199 (knockback 350) as a base we will create the AoE knockback
- // Note that on official this isn't actually a knock back but a directed pull twoard other players with a knockback mixed in
- // That is currently impossible though so this should do fine
+ // **Ground Slam Knockback**
+ // Using 24199 (knockback 350) as a base we will create the AoE knockback
+ // Note that on official this isn't actually a knock back but a directed pull twoard other players with a knockback mixed in
+ // That is currently impossible though so this should do fine
- SpellEntry spell;
- spell =(*GetSpellStore()->LookupEntry(24199));
- spell.EffectRadiusIndex[0] = 22; //Index 22 = 200 yard radius
- spell.rangeIndex = 13; // Index 13 = 50,000 yard range
- spell.EffectAmplitude[0] = 75;
- //spell.EffectImplicitTargetA[0] = TARGET_ALL_ENEMY_IN_AREA;
- //spell.EffectImplicitTargetB[0] = TARGET_ALL_ENEMY_IN_AREA;
- m_creature->CastSpell(m_creature->getVictim(),&spell ,true);
+ // This hack now not supported by core
+ //SpellEntry spell;
+ //spell =(*GetSpellStore()->LookupEntry(24199));
+ //spell.EffectRadiusIndex[0] = 22; //Index 22 = 200 yard radius
+ //spell.rangeIndex = 13; // Index 13 = 50,000 yard range
+ //spell.EffectAmplitude[0] = 75;
+ //spell.EffectImplicitTargetA[0] = TARGET_ALL_ENEMY_IN_AREA;
+ //spell.EffectImplicitTargetB[0] = TARGET_ALL_ENEMY_IN_AREA;
+ //m_creature->CastSpell(m_creature->getVictim(),&spell ,true);
+ m_creature->CastSpell(m_creature->getVictim(),24199,true);
- // Seconds before next phase
- GroundSlam_Timer =2000;
- GroundSlamPhase++;
- break;
+ // Seconds before next phase
+ GroundSlam_Timer =2000;
+ GroundSlamPhase++;
+ break;
+ }
// Gronn Lord's Grasp
case 1:
@@ -220,72 +227,81 @@
// Stoned
case 11:
- // ** Stoned **
- // This spell works fine except that it needs a radius
- // So lets give it one
+ {
+ // ** Stoned **
+ // This spell works fine except that it needs a radius
+ // So lets give it one
- //SpellEntry
- spell =(*GetSpellStore()->LookupEntry(SPELL_STONED));
- spell.EffectRadiusIndex[0] = 22; //Index 22 = 200 yard radius
- spell.rangeIndex = 13; // Index 13 = 50,000 yard range
- spell.EffectImplicitTargetA[0] = 22;
- spell.EffectImplicitTargetB[0] = 22;
- m_creature->CastSpell(m_creature->getVictim(),&spell ,true);
+ // This hack now not supported by core
+ //SpellEntry spell;
+ //spell =(*GetSpellStore()->LookupEntry(SPELL_STONED));
+ //spell.EffectRadiusIndex[0] = 22; //Index 22 = 200 yard radius
+ //spell.rangeIndex = 13; // Index 13 = 50,000 yard range
+ //spell.EffectImplicitTargetA[0] = 22;
+ //spell.EffectImplicitTargetB[0] = 22;
+ //m_creature->CastSpell(m_creature->getVictim(),&spell ,true);
+ m_creature->CastSpell(m_creature->getVictim(),SPELL_STONED,true);
- // Seconds before next phase
- GroundSlam_Timer =8000;
- GroundSlamPhase++;
- break;
+ // Seconds before next phase
+ GroundSlam_Timer =8000;
+ GroundSlamPhase++;
+ break;
+ }
// Shatter
case 12:
- // ** Shatter **
- // There is absolutly no spell associated with Shatter
- // So we'll make one from a shatter that does 9000 dmg
- // We'll make this spell so it dispels stun and then
- // Does 2000 damage to all players within a 20 yard radius
- // That isn't quite how it works on official but close enough
-
- //Cast the dummy spell so boss mods work correctly
- DoCast(m_creature,33654);
+ {
+ // ** Shatter **
+ // There is absolutly no spell associated with Shatter
+ // So we'll make one from a shatter that does 9000 dmg
+ // We'll make this spell so it dispels stun and then
+ // Does 2000 damage to all players within a 20 yard radius
+ // That isn't quite how it works on official but close enough
- //Here is the spell we'll have players cast
- //SpellEntry
- spell =(*GetSpellStore()->LookupEntry(33671));
- spell.rangeIndex = 0; // Index 0 = self only
- spell.EffectAmplitude[0] = 2000;
+ //Cast the dummy spell so boss mods work correctly
+ DoCast(m_creature,33654);
- std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
- std::list<HostilReference*>::iterator i = m_threatlist.begin();
+ //Here is the spell we'll have players cast
- //If you have to do a loop over all units in threat list do it this way
- for (i = m_threatlist.begin(); i!= m_threatlist.end();++i)
- {
- Unit* pCastUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
- if (pCastUnit)
+ // This hack now not supported by core
+ //SpellEntry spell;
+ //spell =(*GetSpellStore()->LookupEntry(33671));
+ //spell.rangeIndex = 0; // Index 0 = self only
+ //spell.EffectAmplitude[0] = 2000;
+
+ std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
+ std::list<HostilReference*>::iterator i = m_threatlist.begin();
+
+ //If you have to do a loop over all units in threat list do it this way
+ for (i = m_threatlist.begin(); i!= m_threatlist.end();++i)
{
- //Force player to cast 22890 -- Dispels all slowing and stun effects
- pCastUnit->CastSpell(pCastUnit,22890,true);
+ Unit* pCastUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
+ if (pCastUnit)
+ {
+ //Force player to cast 22890 -- Dispels all slowing and stun effects
+ pCastUnit->CastSpell(pCastUnit,22890,true);
- //Force player to cast the AoE dmg spell
- pCastUnit->CastSpell(pCastUnit,&spell ,true);
+ //Force player to cast the AoE dmg spell
+ //pCastUnit->CastSpell(pCastUnit,&spell ,true);
+ pCastUnit->CastSpell(pCastUnit,33671,true);
- //as shatter doesnt cancel stoned aura we need to do it by hand
- pCastUnit->RemoveAurasDueToSpell(SPELL_STONED);
+ //as shatter doesnt cancel stoned aura we need to do it by hand
+ pCastUnit->RemoveAurasDueToSpell(SPELL_STONED);
+ }
}
+
+ //Allow movement
+ m_creature->m_canMove = true;
+
+ // resets everything
+ IsInGroundSlam= false;
+ GroundSlam_Timer =120000;
+ GroundSlamPhase =0;
+ HurtfulStrike_Timer= 8000;
+ Reverberation_Timer = 45000;
+ CaveIn_Timer =35000;
+ break;
}
-
- //Allow movement
- m_creature->m_canMove = true;
-
- // resets everything
- IsInGroundSlam= false;
- GroundSlam_Timer =120000;
- GroundSlamPhase =0;
- HurtfulStrike_Timer= 8000;
- Reverberation_Timer = 45000;
- CaveIn_Timer =35000;
- break;
}
}else GroundSlam_Timer -= diff;
Index: scripts/zone/karazhan/boss_prince_malchezaar.cpp
===================================================================
--- scripts/zone/karazhan/boss_prince_malchezaar.cpp (revision 78)
+++ scripts/zone/karazhan/boss_prince_malchezaar.cpp (working copy)
@@ -300,82 +300,81 @@
void SummonInfernalKarazhan()
{
- uint32 MapID = 532; // MapID for Karazhan Instance
Invisible = NULL;
Infernal = NULL;
switch(rand()%19)
{
case 0:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX1, ADDY1, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX1, ADDY1, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX1, ADDY1, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX1, ADDY1, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 1:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX2, ADDY2, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX2, ADDY2, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX2, ADDY2, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX2, ADDY2, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 2:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX3, ADDY4, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX3, ADDY4, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX3, ADDY4, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX3, ADDY4, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 3:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX5, ADDY5, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX5, ADDY5, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX5, ADDY5, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX5, ADDY5, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 4:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX6, ADDY6, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX6, ADDY6, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX6, ADDY6, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX6, ADDY6, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 5:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX7, ADDY7, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX7, ADDY7, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX7, ADDY7, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX7, ADDY7, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 6:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX8, ADDY8, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX8, ADDY8, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX8, ADDY8, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX8, ADDY8, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 7:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX9, ADDY9, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX9, ADDY9, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX9, ADDY9, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX9, ADDY9, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 8:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX10, ADDY10, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX10, ADDY10, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX10, ADDY10, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX10, ADDY10, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 9:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX11, ADDY11, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX11, ADDY11, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX11, ADDY11, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX11, ADDY11, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 10:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX12, ADDY12, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX12, ADDY12, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX12, ADDY12, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX12, ADDY12, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 12:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX13, ADDY13, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX13, ADDY13, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX13, ADDY13, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX13, ADDY13, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 13:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX14, ADDY14, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX14, ADDY14, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX14, ADDY14, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX14, ADDY14, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 14:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX15, ADDY15, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX15, ADDY15, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX15, ADDY15, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX15, ADDY15, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 15:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX16, ADDY16, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX16, ADDY16, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX16, ADDY16, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX16, ADDY16, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 16:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX17, ADDY17, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX17, ADDY17, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX17, ADDY17, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX17, ADDY17, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 17:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX18, ADDY18, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX18, ADDY18, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX18, ADDY18, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX18, ADDY18, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
case 18:
- Invisible = m_creature->SummonCreature(12999, MapID, ADDX19, ADDY19, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, ADDX19, ADDY19, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, ADDX19, ADDY19, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, ADDX19, ADDY19, ADDZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
break;
}
@@ -396,7 +395,6 @@
{
if(m_creature->GetMapId() != 532)
{
- uint32 MapID = m_creature->GetMapId();
uint32 PosX = m_creature->GetPositionX();
uint32 PosY = m_creature->GetPositionY();
uint32 PosZ = m_creature->GetPositionZ();
@@ -407,8 +405,8 @@
Invisible = NULL;
Infernal = NULL;
- Invisible = m_creature->SummonCreature(12999, MapID, LocX, LocY, PosZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
- Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, MapID, LocX, LocY, PosZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Invisible = m_creature->SummonCreature(12999, LocX, LocY, PosZ, 0, TEMPSUMMON_TIMED_DESPAWN, 4000);
+ Infernal = m_creature->SummonCreature(NETHERSPITE_INFERNAL, LocX, LocY, PosZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
if (Invisible)
{
@@ -449,7 +447,7 @@
uint32 PosY = m_creature->GetPositionY();
uint32 PosZ = m_creature->GetPositionZ();
- Axe = m_creature->SummonCreature(17650, MapID, PosX, PosY, PosZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
+ Axe = m_creature->SummonCreature(17650, PosX, PosY, PosZ, 0, TEMPSUMMON_TIMED_DESPAWN, 180000);
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
if(Axe && target)
Index: scripts/zone/naxxramas/boss_kelthuzad.cpp
===================================================================
--- scripts/zone/naxxramas/boss_kelthuzad.cpp (revision 78)
+++ scripts/zone/naxxramas/boss_kelthuzad.cpp (working copy)
@@ -486,42 +486,42 @@
switch(rand()%6)
{
case 0:
- GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,NAXXRAMAS_MAP,ADDX_LEFT_FAR,ADDY_LEFT_FAR,ADDZ_LEFT_FAR,ADDO_LEFT_FAR,TEMPSUMMON_CORPSE_DESPAWN,10);
+ GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,ADDX_LEFT_FAR,ADDY_LEFT_FAR,ADDZ_LEFT_FAR,ADDO_LEFT_FAR,TEMPSUMMON_CORPSE_DESPAWN,10);
//Setting walk position
Walk_Pos_X = WALKX_LEFT_FAR;
Walk_Pos_Y = WALKY_LEFT_FAR;
Walk_Pos_Z = WALKZ_LEFT_FAR;
break;
case 1:
- GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,NAXXRAMAS_MAP,ADDX_LEFT_MIDDLE,ADDY_LEFT_MIDDLE,ADDZ_LEFT_MIDDLE,ADDO_LEFT_MIDDLE,TEMPSUMMON_CORPSE_DESPAWN,10);
+ GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,ADDX_LEFT_MIDDLE,ADDY_LEFT_MIDDLE,ADDZ_LEFT_MIDDLE,ADDO_LEFT_MIDDLE,TEMPSUMMON_CORPSE_DESPAWN,10);
//Start moving guardian towards the center of the room
Walk_Pos_X = WALKX_LEFT_MIDDLE;
Walk_Pos_Y = WALKY_LEFT_MIDDLE;
Walk_Pos_Z = WALKZ_LEFT_MIDDLE;
break;
case 2:
- GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,NAXXRAMAS_MAP,ADDX_LEFT_NEAR,ADDY_LEFT_NEAR,ADDZ_LEFT_NEAR,ADDO_LEFT_NEAR,TEMPSUMMON_CORPSE_DESPAWN,10);
+ GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,ADDX_LEFT_NEAR,ADDY_LEFT_NEAR,ADDZ_LEFT_NEAR,ADDO_LEFT_NEAR,TEMPSUMMON_CORPSE_DESPAWN,10);
//Start moving guardian towards the center of the room
Walk_Pos_X = WALKX_LEFT_NEAR;
Walk_Pos_Y = WALKY_LEFT_NEAR;
Walk_Pos_Z = WALKZ_LEFT_NEAR;
break;
case 3:
- GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,NAXXRAMAS_MAP,ADDX_RIGHT_FAR,ADDY_RIGHT_FAR,ADDZ_RIGHT_FAR,ADDO_RIGHT_FAR,TEMPSUMMON_CORPSE_DESPAWN,10);
+ GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,ADDX_RIGHT_FAR,ADDY_RIGHT_FAR,ADDZ_RIGHT_FAR,ADDO_RIGHT_FAR,TEMPSUMMON_CORPSE_DESPAWN,10);
//Start moving guardian towards the center of the room
Walk_Pos_X = WALKX_RIGHT_FAR;
Walk_Pos_Y = WALKY_RIGHT_FAR;
Walk_Pos_Z = WALKZ_RIGHT_FAR;
break;
case 4:
- GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,NAXXRAMAS_MAP,ADDX_RIGHT_MIDDLE,ADDY_RIGHT_MIDDLE,ADDZ_RIGHT_MIDDLE,ADDO_RIGHT_MIDDLE,TEMPSUMMON_CORPSE_DESPAWN,10);
+ GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,ADDX_RIGHT_MIDDLE,ADDY_RIGHT_MIDDLE,ADDZ_RIGHT_MIDDLE,ADDO_RIGHT_MIDDLE,TEMPSUMMON_CORPSE_DESPAWN,10);
//Start moving guardian towards the center of the room
Walk_Pos_X = WALKX_RIGHT_MIDDLE;
Walk_Pos_Y = WALKY_RIGHT_MIDDLE;
Walk_Pos_Z = WALKZ_RIGHT_MIDDLE;
break;
case 5:
- GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,NAXXRAMAS_MAP,ADDX_RIGHT_NEAR,ADDY_RIGHT_NEAR,ADDZ_RIGHT_NEAR,ADDO_RIGHT_NEAR,TEMPSUMMON_CORPSE_DESPAWN,10);
+ GuardiansOfIcecrown[GuardiansOfIcecrown_Count] = m_creature->SummonCreature(16441,ADDX_RIGHT_NEAR,ADDY_RIGHT_NEAR,ADDZ_RIGHT_NEAR,ADDO_RIGHT_NEAR,TEMPSUMMON_CORPSE_DESPAWN,10);
//Start moving guardian towards the center of the room
Walk_Pos_X = WALKX_RIGHT_NEAR;
Walk_Pos_Y = WALKY_RIGHT_NEAR;
Index: scripts/zone/stratholme/boss_baron_rivendare.cpp
===================================================================
--- scripts/zone/stratholme/boss_baron_rivendare.cpp (revision 78)
+++ scripts/zone/stratholme/boss_baron_rivendare.cpp (working copy)
@@ -230,17 +230,17 @@
// }else RaiseDead_Timer -= diff;
//SummonSkeletons
- //Creature* Unit::SummonCreature(uint32 id, uint32 mapid, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime);
+ //Creature* Unit::SummonCreature(uint32 id, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime);
if (SummonSkeletons_Timer < diff)
{
//Cast
- m_creature->SummonCreature(11197,329,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,29000);
- m_creature->SummonCreature(11197,329,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,29000);
- m_creature->SummonCreature(11197,329,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,29000);
- m_creature->SummonCreature(11197,329,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,29000);
- m_creature->SummonCreature(11197,329,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,29000);
- m_creature->SummonCreature(11197,329,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ m_creature->SummonCreature(11197,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ m_creature->SummonCreature(11197,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ m_creature->SummonCreature(11197,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ m_creature->SummonCreature(11197,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ m_creature->SummonCreature(11197,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,29000);
+ m_creature->SummonCreature(11197,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,29000);
//34 seconds until we should cast this again
SummonSkeletons_Timer = 40000;
Index: scripts/zone/stratholme/boss_cannon_master_willey.cpp
===================================================================
--- scripts/zone/stratholme/boss_cannon_master_willey.cpp (revision 78)
+++ scripts/zone/stratholme/boss_cannon_master_willey.cpp (working copy)
@@ -95,13 +95,13 @@
void JustDied(Unit* Victim)
{
- m_creature->SummonCreature(11054,329,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
}
void AttackStart(Unit *who)
@@ -185,49 +185,49 @@
switch (rand()%9)
{
case 0:
- m_creature->SummonCreature(11054,329,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
break;
case 1:
- m_creature->SummonCreature(11054,329,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
break;
case 2:
- m_creature->SummonCreature(11054,329,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
break;
case 3:
- m_creature->SummonCreature(11054,329,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
break;
case 4:
- m_creature->SummonCreature(11054,329,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
break;
case 5:
- m_creature->SummonCreature(11054,329,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
break;
case 6:
- m_creature->SummonCreature(11054,329,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
break;
case 7:
- m_creature->SummonCreature(11054,329,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
break;
case 8:
- m_creature->SummonCreature(11054,329,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(11054,329,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ 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
Index: scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp
===================================================================
--- scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp (revision 78)
+++ scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp (working copy)
@@ -103,14 +103,14 @@
void JustDied(Unit* Victim)
{
- m_creature->SummonCreature(10698,329,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,329,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,329,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,329,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,329,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,329,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,329,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
- m_creature->SummonCreature(10698,329,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(10698,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(10698,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(10698,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(10698,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(10698,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(10698,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(10698,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000);
+ m_creature->SummonCreature(10698,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000);
}
void AttackStart(Unit *who)
Index: scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp
===================================================================
--- scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (revision 78)
+++ scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (working copy)
@@ -212,7 +212,7 @@
Unit* Spawned = NULL;
//Spawn claw tentacle on the random target
- Spawned = m_creature->SummonCreature(MOB_CLAW_TENTACLE,target->GetMapId(),target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
+ Spawned = m_creature->SummonCreature(MOB_CLAW_TENTACLE,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000);
if (Spawned)
Spawned->AddThreat(target,1.0f);
@@ -230,7 +230,7 @@
Unit* Spawned = NULL;
//1
- Spawned = m_creature->SummonCreature(MOB_EYE_TENTACLE,m_creature->GetMapId(),m_creature->GetPositionX()+10,m_creature->GetPositionY()-10,m_creature->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
+ Spawned = m_creature->SummonCreature(MOB_EYE_TENTACLE,m_creature->GetPositionX()+10,m_creature->GetPositionY()-10,m_creature->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,80000);
if (Spawned)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
[/code]