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

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-04-22 21:50:43 +08:00
parent 10bd872f2d f380e8f625
commit c010742289
21 changed files with 1499 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
View File

@@ -19,6 +19,8 @@
#include "Player.h"
#include "ScriptedCreature.h"
#include "ScriptedGossip.h"
#include "SpellScript.h"
#include "SpellScriptLoader.h"
#include "hyjal.h"
enum Spells
@@ -327,6 +329,26 @@ public:
};
// 31538 - Cannibalize (Heal)
class spell_cannibalize_heal : public SpellScript
{
PrepareSpellScript(spell_cannibalize_heal);
void HandleHeal(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
{
uint32 heal = caster->CountPctFromMaxHealth(7);
SetHitHeal(heal);
}
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_cannibalize_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
}
};
struct npc_hyjal_ground_trash : public ScriptedAI
{
npc_hyjal_ground_trash(Creature* creature) : ScriptedAI(creature)
@@ -704,4 +726,5 @@ void AddSC_hyjal()
RegisterHyjalAI(npc_hyjal_ground_trash);
RegisterHyjalAI(npc_hyjal_gargoyle);
RegisterHyjalAI(npc_hyjal_frost_wyrm);
RegisterSpellScript(spell_cannibalize_heal);
}

51
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
View File

@@ -38,6 +38,7 @@ enum Spells
SPELL_PSYCHIC_SCREAM = 34322,
SPELL_VOID_BOLT = 39329,
SPELL_TRUE_BEAM = 33365,
SPELL_TELEPORT_START_POSITION = 33244,
};
enum Misc
@@ -55,6 +56,9 @@ enum Misc
#define CENTER_Z 17.9608f
#define CENTER_O 1.06421f
#define PORTAL_Z 17.005f
#define START_POSITION_X 432.74f
#define START_POSITION_Y -373.645f
#define START_POSITION_Z 18.0138f
struct boss_high_astromancer_solarian : public BossAI
{
@@ -146,11 +150,30 @@ struct boss_high_astromancer_solarian : public BossAI
}).Schedule(52100ms, [this](TaskContext context)
{
me->SetReactState(REACT_PASSIVE);
Talk(SAY_SUMMON);
me->RemoveAllAuras();
me->SetModelVisible(false);
scheduler.DelayAll(21s);
scheduler.Schedule(6s, [this](TaskContext)
scheduler.DelayAll(22s);
// blink to room center in this line using SPELL_TELEPORT_START_POSITION and START_POSITION_X, START_POSITION_Y, START_POSITION_Z
scheduler.Schedule(1s, [this](TaskContext)
{
for (uint8 i = 0; i < 3; ++i)
{
float o = rand_norm() * 2 * M_PI;
if (i == 0)
{
me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, CENTER_X + cos(o)*INNER_PORTAL_RADIUS, CENTER_Y + std::sin(o)*INNER_PORTAL_RADIUS, CENTER_Z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000);
}
else
{
me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, CENTER_X + cos(o)*OUTER_PORTAL_RADIUS, CENTER_Y + std::sin(o)*OUTER_PORTAL_RADIUS, PORTAL_Z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000);
}
}
}).Schedule(2s, [this](TaskContext)
{
Talk(SAY_SUMMON);
}).Schedule(3s, [this](TaskContext)
{
me->RemoveAllAuras();
me->SetModelVisible(false);
}).Schedule(7s, [this](TaskContext)
{
summons.DoForAllSummons([&](WorldObject* summon)
{
@@ -171,7 +194,7 @@ struct boss_high_astromancer_solarian : public BossAI
}
}
});
}).Schedule(20s, [this](TaskContext)
}).Schedule(23s, [this](TaskContext)
{
me->SetReactState(REACT_AGGRESSIVE);
summons.DoForAllSummons([&](WorldObject* summon)
@@ -194,20 +217,7 @@ struct boss_high_astromancer_solarian : public BossAI
}
});
});
for (uint8 i = 0; i < 3; ++i)
{
float o = rand_norm() * 2 * M_PI;
if (i == 0)
{
me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, CENTER_X + cos(o)*INNER_PORTAL_RADIUS, CENTER_Y + std::sin(o)*INNER_PORTAL_RADIUS, CENTER_Z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 26000);
}
else
{
me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, CENTER_X + cos(o)*OUTER_PORTAL_RADIUS, CENTER_Y + std::sin(o)*OUTER_PORTAL_RADIUS, PORTAL_Z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 26000);
}
}
context.Repeat(67500ms, 71200ms);
context.Repeat(87500ms, 91200ms);
});
}
@@ -280,4 +290,3 @@ void AddSC_boss_high_astromancer_solarian()
RegisterSpellScript(spell_astromancer_wrath_of_the_astromancer);
RegisterSpellScript(spell_astromancer_solarian_transform);
}

8
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
View File

@@ -472,11 +472,11 @@ struct boss_kaelthas : public BossAI
{
DoCastRandomTarget(SPELL_FLAME_STRIKE, 0, 100.0f);
}, 30250ms, 50650ms);
ScheduleTimedEvent(20000ms, [&]
ScheduleTimedEvent(71000ms, [&]
{
Talk(SAY_SUMMON_PHOENIX);
DoCastSelf(SPELL_PHOENIX);
}, 31450ms, 66550ms);
}, 61450ms, 96550ms);
ScheduleTimedEvent(5s, [&]
{
scheduler.DelayAll(30s);
@@ -735,11 +735,11 @@ struct boss_kaelthas : public BossAI
{
DoCastRandomTarget(SPELL_FLAME_STRIKE, 0, 100.0f);
}, 30250ms, 50650ms);
ScheduleTimedEvent(30000ms, [&]
ScheduleTimedEvent(50000ms, [&]
{
Talk(SAY_SUMMON_PHOENIX);
DoCastSelf(SPELL_PHOENIX);
}, 31450ms, 66550ms);
}, 35450ms, 41550ms);
//sequence
ScheduleTimedEvent(20s, 23s, [&]
{

13
src/server/scripts/Pet/pet_priest.cpp
View File

@@ -40,12 +40,15 @@ struct npc_pet_pri_lightwell : public TotemAI
void InitializeAI() override
{
if (Unit* owner = me->ToTempSummon()->GetSummonerUnit())
if (TempSummon* tempSummon = me->ToTempSummon())
{
uint32 hp = uint32(owner->GetMaxHealth() * 0.3f);
me->SetMaxHealth(hp);
me->SetHealth(hp);
me->SetLevel(owner->GetLevel());
if (Unit* owner = tempSummon->GetSummonerUnit())
{
uint32 hp = uint32(owner->GetMaxHealth() * 0.3f);
me->SetMaxHealth(hp);
me->SetHealth(hp);
me->SetLevel(owner->GetLevel());
}
}
me->CastSpell(me, SPELL_PRIEST_LIGHTWELL_CHARGES, false); // Spell for Lightwell Charges