Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/Entities/Unit/Unit.cpp src/server/scripts/Commands/cs_reload.cpp
This commit is contained in:
commit
cc28161670
17 files changed
+64
-68
No files matched your search
@@ -228,13 +228,13 @@ class boss_ick : public CreatureScript
|
||||
case EVENT_TOXIC_WASTE:
|
||||
if (Creature* krick = GetKrick())
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
krick->CastSpell(target, SPELL_TOXIC_WASTE, false);
|
||||
krick->CastSpell(target, SPELL_TOXIC_WASTE, TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE);
|
||||
events.ScheduleEvent(EVENT_TOXIC_WASTE, urand(7000, 10000));
|
||||
break;
|
||||
case EVENT_SHADOW_BOLT:
|
||||
if (Creature* krick = GetKrick())
|
||||
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
|
||||
krick->CastSpell(target, SPELL_SHADOW_BOLT, false);
|
||||
krick->CastSpell(target, SPELL_SHADOW_BOLT, TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE);
|
||||
events.ScheduleEvent(EVENT_SHADOW_BOLT, 15000);
|
||||
return;
|
||||
case EVENT_MIGHTY_KICK:
|
||||
|
||||
@@ -782,10 +782,13 @@ struct violet_hold_trashAI : public npc_escortAI
|
||||
|
||||
void JustDied(Unit* /*killer*/)
|
||||
{
|
||||
if (Creature* portal = Unit::GetCreature((*me), instance->GetData64(DATA_TELEPORTATION_PORTAL)))
|
||||
CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI, portal->AI())->SummonedMobDied(me);
|
||||
if (instance)
|
||||
{
|
||||
if (Creature* portal = Unit::GetCreature((*me), instance->GetData64(DATA_TELEPORTATION_PORTAL)))
|
||||
CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI, portal->AI())->SummonedMobDied(me);
|
||||
|
||||
instance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE, 1);
|
||||
}
|
||||
}
|
||||
|
||||
void CreatureStartAttackDoor()
|
||||
|
||||
@@ -839,19 +839,10 @@ public:
|
||||
return 1500;
|
||||
break;
|
||||
case 16:
|
||||
if (player)
|
||||
{
|
||||
Illi->CastSpell(player, SPELL_TWO, true);
|
||||
player->RemoveAurasDueToSpell(SPELL_THREE);
|
||||
player->RemoveAurasDueToSpell(SPELL_FOUR);
|
||||
return 5000;
|
||||
}
|
||||
else
|
||||
{
|
||||
player->FailQuest(QUEST_LORD_ILLIDAN_STORMRAGE);
|
||||
Step = 30;
|
||||
return 100;
|
||||
}
|
||||
Illi->CastSpell(player, SPELL_TWO, true);
|
||||
player->RemoveAurasDueToSpell(SPELL_THREE);
|
||||
player->RemoveAurasDueToSpell(SPELL_FOUR);
|
||||
return 5000;
|
||||
break;
|
||||
case 17:
|
||||
DoScriptText(LORD_ILLIDAN_SAY_5, Illi);
|
||||
@@ -1871,8 +1862,8 @@ public:
|
||||
|
||||
enum ZuluhedChains
|
||||
{
|
||||
QUEST_ZULUHED = 10866,
|
||||
NPC_KARYNAKU = 22112,
|
||||
QUEST_ZULUHED = 10866,
|
||||
NPC_KARYNAKU = 22112,
|
||||
};
|
||||
|
||||
class spell_unlocking_zuluheds_chains : public SpellScriptLoader
|
||||
@@ -1884,18 +1875,21 @@ class spell_unlocking_zuluheds_chains : public SpellScriptLoader
|
||||
{
|
||||
PrepareSpellScript(spell_unlocking_zuluheds_chains_SpellScript);
|
||||
|
||||
void HandleOnCast()
|
||||
bool Load()
|
||||
{
|
||||
// FIXME: Hackish solution, a better way to reward killcredit should be found
|
||||
if (Unit* caster = GetCaster())
|
||||
if(Player* player = caster->ToPlayer())
|
||||
if (player->GetQuestStatus(QUEST_ZULUHED) == QUEST_STATUS_INCOMPLETE)
|
||||
player->CastedCreatureOrGO(NPC_KARYNAKU, MAKE_NEW_GUID(0, NPC_KARYNAKU, HIGHGUID_UNIT), 0);
|
||||
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
|
||||
}
|
||||
|
||||
void HandleAfterHit()
|
||||
{
|
||||
Player* caster = GetCaster()->ToPlayer();
|
||||
if (caster->GetQuestStatus(QUEST_ZULUHED) == QUEST_STATUS_INCOMPLETE)
|
||||
caster->KilledMonsterCredit(NPC_KARYNAKU, 0);
|
||||
}
|
||||
|
||||
void Register()
|
||||
{
|
||||
OnCast += SpellCastFn(spell_unlocking_zuluheds_chains_SpellScript::HandleOnCast);
|
||||
AfterHit += SpellHitFn(spell_unlocking_zuluheds_chains_SpellScript::HandleAfterHit);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user