nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2023-04-05 11:49:27 -06:00
committed by GitHub
parent ed4e0ffbda 98e071157a
commit 43778acb9a
6 changed files with 105 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/sql/updates/db_world/2023_04_05_00.sql Normal file
View File

@@ -0,0 +1,4 @@
-- DB update 2023_04_04_14 -> 2023_04_05_00
--
-- Removes strange rows from creature_template_spell
DELETE FROM `creature_template_spell` WHERE `CreatureID`=290;

6
data/sql/updates/db_world/2023_04_05_01.sql Normal file
View File

@@ -0,0 +1,6 @@
-- DB update 2023_04_05_00 -> 2023_04_05_01
--
UPDATE `creature_template` SET `AIName` = '' WHERE `entry` = 22930;
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 22930) AND (`source_type` = 0);

4
data/sql/updates/db_world/2023_04_05_02.sql Normal file
View File

@@ -0,0 +1,4 @@
-- DB update 2023_04_05_01 -> 2023_04_05_02
--
-- Remove Pollution from Water Barrels (gameobject 3658)
DELETE FROM `gameobject_loot_template` WHERE `Entry`=2502 AND `Item` IN (851, 852, 853, 854, 858, 1196, 1197, 1198, 2207, 2455, 4765, 4766, 4777, 4778);

16
data/sql/updates/db_world/2023_04_05_03.sql Normal file
View File

@@ -0,0 +1,16 @@
-- DB update 2023_04_05_02 -> 2023_04_05_03
-- Ferra loot update
DELETE FROM `creature_loot_template` WHERE (`Entry` = 14308) AND (`Item` IN (4500, 5759, 7909, 7910, 8146, 11414, 11415, 24016, 24018, 24020, 24033));
INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
(14308, 4500, 0, 0.125, 0, 1, 0, 1, 1, 'Ferra - Thorium Lockbox'),
(14308, 5759, 0, 1, 0, 1, 0, 1, 1, 'Ferra - Traveler\'s Backpack'),
(14308, 8146, 0, 5, 0, 1, 0, 1, 1, 'Ferra - Wicked Claw'),
(14308, 11414, 0, 65, 0, 1, 0, 1, 1, 'Ferra - Grizzled Mane'),
(14308, 11415, 0, 27, 0, 1, 0, 1, 1, 'Ferra - Mixed Berries'),
(14308, 7909, 0, 1, 0, 1, 2, 1, 1, 'Ferra - Aquamarine'),
(14308, 7910, 0, 0.5, 0, 1, 2, 1, 1, 'Ferra - Star Ruby'),
(14308, 24016, 24016, 2, 0, 1, 1, 1, 1, 'Ferra - (ReferenceTable)'),
(14308, 24018, 24018, 1.5, 0, 1, 1, 1, 1, 'Ferra - (ReferenceTable)'),
(14308, 24020, 24020, 1, 0, 1, 1, 1, 1, 'Ferra - (ReferenceTable)'),
(14308, 24033, 24033, 0.75, 0, 1, 1, 1, 1, 'Ferra - (ReferenceTable)');

2
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
View File

@@ -1447,7 +1447,7 @@ public:
bool CheckRequiredBosses(uint32 bossId, Player const* player) const override
{
if (player->GetSession()->GetSecurity() >= SEC_MODERATOR)
if (player->GetSession() && player->GetSession()->GetSecurity() >= SEC_MODERATOR)
{
return true;
}

192
src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
View File

@@ -45,142 +45,98 @@ enum Spells
enum Misc
{
NPC_HARBINGER_SKYRISS_66 = 21466,
EVENT_SUMMON_IMAGE1 = 1,
EVENT_SUMMON_IMAGE2 = 2,
EVENT_SPELL_MIND_REND = 3,
EVENT_SPELL_FEAR = 4,
EVENT_SPELL_DOMINATION = 5,
EVENT_SPELL_MANA_BURN = 6
NPC_HARBINGER_SKYRISS_66 = 21466
};
class boss_harbinger_skyriss : public CreatureScript
struct boss_harbinger_skyriss : public BossAI
{
public:
boss_harbinger_skyriss() : CreatureScript("boss_harbinger_skyriss") { }
struct boss_harbinger_skyrissAI : public ScriptedAI
boss_harbinger_skyriss(Creature* creature) : BossAI(creature, DATA_WARDEN_MELLICHAR)
{
boss_harbinger_skyrissAI(Creature* creature) : ScriptedAI(creature), summons(me)
scheduler.SetValidator([this]
{
instance = creature->GetInstanceScript();
}
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
InstanceScript* instance;
SummonList summons;
EventMap events;
void Reset() override
{
_Reset();
me->SetImmuneToAll(false);
void Reset() override
ScheduleHealthCheckEvent(66, [&] {
Talk(SAY_IMAGE);
DoCastSelf(SPELL_66_ILLUSION, true);
});
ScheduleHealthCheckEvent(33, [&] {
Talk(SAY_IMAGE);
DoCastSelf(SPELL_33_ILLUSION, true);
});
}
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
me->SetInCombatWithZone();
scheduler.Schedule(10s, [this](TaskContext context)
{
events.Reset();
summons.DespawnAll();
me->SetImmuneToAll(false);
}
void JustEngagedWith(Unit* /*who*/) override
DoCastRandomTarget(SPELL_MIND_REND, 0, 50.0f);
context.Repeat(10s);
}).Schedule(15s, [this](TaskContext context)
{
Talk(SAY_AGGRO);
me->SetInCombatWithZone();
events.ScheduleEvent(EVENT_SUMMON_IMAGE1, 1000);
events.ScheduleEvent(EVENT_SUMMON_IMAGE2, 1000);
events.ScheduleEvent(EVENT_SPELL_MIND_REND, 10000);
events.ScheduleEvent(EVENT_SPELL_FEAR, 15000);
events.ScheduleEvent(EVENT_SPELL_DOMINATION, 30000);
if (IsHeroic())
events.ScheduleEvent(EVENT_SPELL_MANA_BURN, 25000);
}
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
summons.DespawnAll();
}
void JustSummoned(Creature* summon) override
{
summon->SetHealth(summon->CountPctFromMaxHealth(summon->GetEntry() == NPC_HARBINGER_SKYRISS_66 ? 66 : 33));
summons.Summon(summon);
summon->SetInCombatWithZone();
me->UpdatePosition(*summon, true);
me->SendMovementFlagUpdate();
}
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_KILL);
}
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
switch (events.ExecuteEvent())
if (DoCastRandomTarget(SPELL_FEAR, 1, 20.0f) == SPELL_CAST_OK)
{
case EVENT_SUMMON_IMAGE1:
if (HealthBelowPct(67))
{
Talk(SAY_IMAGE);
me->CastSpell(me, SPELL_66_ILLUSION, false);
break;
}
events.ScheduleEvent(EVENT_SUMMON_IMAGE1, 1000);
break;
case EVENT_SUMMON_IMAGE2:
if (HealthBelowPct(34))
{
Talk(SAY_IMAGE);
me->CastSpell(me, SPELL_33_ILLUSION, false);
break;
}
events.ScheduleEvent(EVENT_SUMMON_IMAGE2, 1000);
break;
case EVENT_SPELL_MIND_REND:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f))
me->CastSpell(target, SPELL_MIND_REND, false);
events.ScheduleEvent(EVENT_SPELL_MIND_REND, 10000);
break;
case EVENT_SPELL_FEAR:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 20.0f))
{
Talk(SAY_FEAR);
me->CastSpell(target, SPELL_FEAR, false);
}
events.ScheduleEvent(EVENT_SPELL_FEAR, 25000);
break;
case EVENT_SPELL_DOMINATION:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 30.0f))
{
Talk(SAY_MIND);
me->CastSpell(target, SPELL_DOMINATION, false);
}
events.ScheduleEvent(EVENT_SPELL_DOMINATION, 30000);
break;
case EVENT_SPELL_MANA_BURN:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false)))
me->CastSpell(target, SPELL_MANA_BURN, false);
events.ScheduleEvent(EVENT_SPELL_MANA_BURN, 30000);
break;
Talk(SAY_FEAR);
}
context.Repeat(25s);
}).Schedule(30s, [this](TaskContext context)
{
if (DoCastRandomTarget(SPELL_DOMINATION, 1, 30.0f) == SPELL_CAST_OK)
{
Talk(SAY_MIND);
}
context.Repeat();
});
DoMeleeAttackIfReady();
if (IsHeroic())
{
scheduler.Schedule(25s, [this](TaskContext context)
{
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false)))
{
DoCast(target, SPELL_MANA_BURN);
}
context.Repeat(30s);
});
}
};
}
CreatureAI* GetAI(Creature* creature) const override
void JustDied(Unit* /*killer*/) override
{
return GetArcatrazAI<boss_harbinger_skyrissAI>(creature);
_JustDied();
Talk(SAY_DEATH);
}
void JustSummoned(Creature* summon) override
{
summon->SetHealth(summon->CountPctFromMaxHealth(summon->GetEntry() == NPC_HARBINGER_SKYRISS_66 ? 66 : 33));
me->UpdatePosition(*summon, true);
me->SendMovementFlagUpdate();
BossAI::JustSummoned(summon);
}
void KilledUnit(Unit* victim) override
{
if (victim->IsPlayer())
{
Talk(SAY_KILL);
}
}
};
void AddSC_boss_harbinger_skyriss()
{
new boss_harbinger_skyriss();
RegisterArcatrazCreatureAI(boss_harbinger_skyriss);
}