Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
This commit is contained in:
commit
d237134d90
42 files changed
+349
-154
No files matched your search
@@ -1129,7 +1129,12 @@ public:
|
||||
|
||||
uint16 drunkMod = drunklevel * 0xFFFF / 100;
|
||||
|
||||
handler->GetSession()->GetPlayer()->SetDrunkValue(drunkMod);
|
||||
Player* target = handler->getSelectedPlayer();
|
||||
if (!target)
|
||||
target = handler->GetSession()->GetPlayer();
|
||||
|
||||
if (target)
|
||||
target->SetDrunkValue(drunkMod);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -341,7 +341,7 @@ class boss_sindragosa : public CreatureScript
|
||||
{
|
||||
if (uint32 spellId = sSpellMgr->GetSpellIdForDifficulty(_isThirdPhase ? SPELL_FROST_BREATH_P2 : SPELL_FROST_BREATH_P1, me))
|
||||
{
|
||||
if (player->GetQuestStatus(QUEST_FROST_INFUSION) != QUEST_STATUS_REWARDED && spellId == spell->Id)
|
||||
if (player->GetQuestStatus(QUEST_FROST_INFUSION) == QUEST_STATUS_INCOMPLETE && spellId == spell->Id)
|
||||
{
|
||||
if (Item* shadowsEdge = player->GetWeaponForAttack(BASE_ATTACK, true))
|
||||
{
|
||||
|
||||
@@ -289,6 +289,7 @@ public:
|
||||
void JustDied(Unit* /*killer*/)
|
||||
{
|
||||
_JustDied();
|
||||
DoCast(me, SPELL_DEATH_SPELL, true); // we cast the spell as triggered or the summon effect does not occur
|
||||
}
|
||||
|
||||
void LeaveCombat()
|
||||
|
||||
@@ -144,8 +144,8 @@ public:
|
||||
void JustDied(Unit* /*killer*/)
|
||||
{
|
||||
_JustDied();
|
||||
|
||||
Talk(SAY_DEATH);
|
||||
DoCast(me, SPELL_DEATH_SPELL, true); // we cast the spell as triggered or the summon effect does not occur
|
||||
}
|
||||
private:
|
||||
bool firstCoreEnergize;
|
||||
|
||||
@@ -50,6 +50,12 @@ enum Drakes
|
||||
NPC_ETERNOS = 27659
|
||||
};
|
||||
|
||||
enum Says
|
||||
{
|
||||
SAY_VAROS = 0,
|
||||
SAY_UROM = 1
|
||||
};
|
||||
|
||||
class npc_oculus_drake : public CreatureScript
|
||||
{
|
||||
public:
|
||||
@@ -174,7 +180,38 @@ public:
|
||||
|
||||
};
|
||||
|
||||
class npc_image_belgaristrasz : public CreatureScript
|
||||
{
|
||||
public:
|
||||
npc_image_belgaristrasz() : CreatureScript("npc_image_belgaristrasz") { }
|
||||
|
||||
struct npc_image_belgaristraszAI : public ScriptedAI
|
||||
{
|
||||
npc_image_belgaristraszAI(Creature* creature) : ScriptedAI(creature) {}
|
||||
|
||||
void IsSummonedBy(Unit* summoner)
|
||||
{
|
||||
if (summoner->GetEntry() == NPC_VAROS)
|
||||
{
|
||||
Talk(SAY_VAROS);
|
||||
me->DespawnOrUnsummon(60000);
|
||||
}
|
||||
if (summoner->GetEntry() == NPC_UROM)
|
||||
{
|
||||
Talk(SAY_UROM);
|
||||
me->DespawnOrUnsummon(60000);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const
|
||||
{
|
||||
return new npc_image_belgaristraszAI(creature);
|
||||
}
|
||||
};
|
||||
|
||||
void AddSC_oculus()
|
||||
{
|
||||
new npc_oculus_drake();
|
||||
new npc_image_belgaristrasz();
|
||||
}
|
||||
@@ -71,6 +71,7 @@ enum OculusWorldStates
|
||||
|
||||
enum OculusSpells
|
||||
{
|
||||
SPELL_CENTRIFUGE_SHIELD = 50053
|
||||
SPELL_CENTRIFUGE_SHIELD = 50053,
|
||||
SPELL_DEATH_SPELL = 50415
|
||||
};
|
||||
#endif
|
||||
@@ -526,7 +526,7 @@ class boss_freya : public CreatureScript
|
||||
{
|
||||
uint8 n = 0;
|
||||
|
||||
// Handling recieved data
|
||||
// Handling received data
|
||||
for (uint8 i = 0; i < 5; ++i) // We have created "instances" for keeping informations about last 6 death lashers - needed because of respawning
|
||||
{
|
||||
deforestation[i][0] = deforestation[(i + 1)][0]; // Time
|
||||
|
||||
Reference in new issue
Block a user