Merge branch 'master' of github.com:TrinityCore/TrinityCore

This commit is contained in:
jackpoz committed 2013-12-29 16:27:25 +01:00
commit e016ef3dbd
11 files changed
+131 -107

No files matched your search

+3
View File
@@ -1382,7 +1382,10 @@ public:
}
else
{
Position pos;
transport->GetPosition(&pos);
handler->PSendSysMessage("Transport %s is %s", transport->GetName().c_str(), transport->GetGoState() == GO_STATE_READY ? "stopped" : "moving");
handler->PSendSysMessage("Transport position: %s", pos.ToString().c_str());
return true;
}
@@ -23,11 +23,11 @@
enum Spells
{
SPELL_SNAPKICK = 15618,
SPELL_CLEAVE = 15579,
SPELL_CLEAVE = 15284,
SPELL_UPPERCUT = 10966,
SPELL_MORTALSTRIKE = 16856,
SPELL_PUMMEL = 15615,
SPELL_THROWAXE = 16075,
SPELL_THROWAXE = 16075
};
enum Events
@@ -37,7 +37,7 @@ enum Events
EVENT_UPPERCUT = 3,
EVENT_MORTAL_STRIKE = 4,
EVENT_PUMMEL = 5,
EVENT_THROW_AXE = 6,
EVENT_THROW_AXE = 6
};
class boss_warmaster_voone : public CreatureScript
@@ -45,11 +45,6 @@ class boss_warmaster_voone : public CreatureScript
public:
boss_warmaster_voone() : CreatureScript("boss_warmaster_voone") { }
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new boss_warmastervooneAI(creature);
}
struct boss_warmastervooneAI : public BossAI
{
boss_warmastervooneAI(Creature* creature) : BossAI(creature, DATA_WARMASTER_VOONE) { }
@@ -119,6 +114,10 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new boss_warmastervooneAI(creature);
}
};
void AddSC_boss_warmastervoone()