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 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-04-10 23:50:39 +08:00
parent f0be01a5d7 4199cb8ce0
commit 65cb23b56a
7 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/sql/updates/db_world/2024_04_07_00.sql Normal file
View File

@@ -0,0 +1,4 @@
-- DB update 2024_04_03_01 -> 2024_04_07_00
--
DELETE FROM `creature_loot_template` WHERE `Entry` = 17968 AND `Item` = 190068;
UPDATE `creature_loot_template` SET `MaxCount` = 3 WHERE `Entry` = 17968 AND `Item` = 34068;

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

@@ -70,7 +70,10 @@ enum Spells
SPELL_FROST_BREATH = 31688,
// Fel Stalker
SPELL_MANA_BURN = 31729
SPELL_MANA_BURN = 31729,
// Misc
SPELL_DEATH_AND_DECAY = 31258
};
enum Talk
@@ -98,7 +101,10 @@ public:
}
struct hyjalJainaAI : public ScriptedAI
{
hyjalJainaAI(Creature* creature) : ScriptedAI(creature) { }
hyjalJainaAI(Creature* creature) : ScriptedAI(creature)
{
me->ApplySpellImmune(SPELL_DEATH_AND_DECAY, IMMUNITY_ID, SPELL_DEATH_AND_DECAY, true);
}
void Reset() override
{

2
src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
View File

@@ -40,7 +40,7 @@ enum AhnKahetCreatures
NPC_ELDER_NADOX = 29309,
NPC_PRINCE_TALDARAM = 29308,
NPC_JEDOGA_SHADOWSEEKER = 29310,
NPC_HERALD_JOLAZJ = 29311,
NPC_HERALD_VOLAZJ = 29311,
NPC_AMANITAR = 30258,
// Teldaram and Jedoga encounter related
NPC_JEDOGA_CONTROLLER = 30181,

2
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
View File

@@ -73,7 +73,7 @@ enum Yells
struct boss_elder_nadox : public BossAI
{
boss_elder_nadox(Creature* creature) : BossAI(creature, DATA_PRINCE_TALDARAM),
boss_elder_nadox(Creature* creature) : BossAI(creature, DATA_ELDER_NADOX),
guardianSummoned(false),
respectYourElders(true)
{

4
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
View File

@@ -641,7 +641,7 @@ struct npc_twilight_volunteer : public ScriptedAI
}
else if (id == POINT_RITUAL)
{
if (Creature* jedoga = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(DATA_JEDOGA_SHADOWSEEKER)))
if (Creature* jedoga = pInstance->GetCreature(DATA_JEDOGA_SHADOWSEEKER))
{
jedoga->AI()->Talk(SAY_SACRIFICE_2);
jedoga->CastSpell(nullptr, SPELL_SACRIFICE_BEAM); /// @todo: Visual is not working. (cosmetic)
@@ -665,7 +665,7 @@ struct npc_twilight_volunteer : public ScriptedAI
me->SetWalk(true);
me->GetMotionMaster()->MovePoint(POINT_RITUAL, JedogaPosition[2], false);
if (Creature* jedoga = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(DATA_JEDOGA_SHADOWSEEKER)))
if (Creature* jedoga = pInstance->GetCreature(DATA_JEDOGA_SHADOWSEEKER))
{
if (Creature* ritualTrigger = jedoga->SummonCreature(NPC_JEDOGA_CONTROLLER, JedogaPosition[2], TEMPSUMMON_TIMED_DESPAWN, 15000))
{

8
src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
View File

@@ -24,8 +24,12 @@
ObjectData const creatureData[] =
{
{ NPC_PRINCE_TALDARAM, DATA_PRINCE_TALDARAM },
{ 0, 0 }
{ NPC_PRINCE_TALDARAM, DATA_PRINCE_TALDARAM },
{ NPC_JEDOGA_SHADOWSEEKER, DATA_JEDOGA_SHADOWSEEKER },
{ NPC_ELDER_NADOX, DATA_ELDER_NADOX },
{ NPC_HERALD_VOLAZJ, DATA_HERALD_VOLAZJ },
{ NPC_AMANITAR, DATA_AMANITAR },
{ 0, 0 }
};
DoorData const doorData[] =

2
src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
View File

@@ -45,7 +45,7 @@ DoorData const doorData[] =
BossBoundaryData const boundaries =
{
{ DATA_REAVER, new CircleBoundary(Position(432.741809f, 371.859589f), 105.052554f) },
{ DATA_REAVER, new CircleBoundary(Position(432.741809f, 371.8595890f), 115.0f) },
{ DATA_ALAR, new CircleBoundary(Position(331.000000f, -2.38000000f), 108.29246f) },
{ DATA_ASTROMANCER, new CircleBoundary(Position(432.869202f, -374.213806f), 103.74374f) }
};