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

fix(Core/DungeonFinder): Seasonal bosses are available only via Dunge… (#8056)

Browse Source 
* fix(Core/DungeonFinder): Seasonal bosses are available only via Dungeon Finder tool.

Fixes #7889

* Update.

* Buildfix.

* Missing.
This commit is contained in:
UltraNix
2021-10-14 13:22:37 +02:00
committed by GitHub
parent 01d3747efd
commit b8345a2f98
8 changed files with 88 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/game/AI/CoreAI/GameObjectAI.h
View File

@@ -59,6 +59,7 @@ public:
virtual void OnStateChanged(uint32 /*state*/, Unit* /*unit*/) {}
virtual void EventInform(uint32 /*eventId*/) {}
virtual void SpellHit(Unit* /*unit*/, const SpellInfo* /*spellInfo*/) {}
virtual bool CanBeSeen(Player const* /*seer*/) { return true; }
};
class NullGameObjectAI : public GameObjectAI

8
src/server/game/DungeonFinding/LFGMgr.cpp
View File

@@ -2655,13 +2655,13 @@ namespace lfg
{
switch (dungeonId)
{
case 285: // The Headless Horseman
case LFG_DUNGEON_HEADLESS_HORSEMAN:
return IsHolidayActive(HOLIDAY_HALLOWS_END);
case 286: // The Frost Lord Ahune
case LFG_DUNGEON_FROST_LORD_AHUNE:
return IsHolidayActive(HOLIDAY_FIRE_FESTIVAL);
case 287: // Coren Direbrew
case LFG_DUNGEON_COREN_DIREBREW:
return IsHolidayActive(HOLIDAY_BREWFEST);
case 288: // The Crown Chemical Co.
case LFG_DUNGEON_CROWN_CHEMICAL_CO:
return IsHolidayActive(HOLIDAY_LOVE_IS_IN_THE_AIR);
}
return false;

8
src/server/game/DungeonFinding/LFGMgr.h
View File

@@ -140,6 +140,14 @@ namespace lfg
LFG_UPDATE_FLAG_BINDED = 0x80
};
enum LfgSeasonalDungeons
{
LFG_DUNGEON_HEADLESS_HORSEMAN = 285,
LFG_DUNGEON_FROST_LORD_AHUNE = 286,
LFG_DUNGEON_COREN_DIREBREW = 287,
LFG_DUNGEON_CROWN_CHEMICAL_CO = 288
};
struct RBEntryInfo
{
RBEntryInfo() {}

6
src/server/game/Entities/Object/Object.cpp
View File

@@ -23,6 +23,7 @@
#include "Creature.h"
#include "DynamicTree.h"
#include "DynamicVisibility.h"
#include "GameObjectAI.h"
#include "GridNotifiers.h"
#include "Log.h"
#include "MapMgr.h"
@@ -1673,6 +1674,11 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
if (cObj->IsAIEnabled && this->ToPlayer() && !cObj->AI()->CanBeSeen(this->ToPlayer()))
return false;
// Gameobject scripts
if (GameObject const* goObj = obj->ToGameObject())
if (this->ToPlayer() && !goObj->AI()->CanBeSeen(this->ToPlayer()))
return false;
// pussywizard: arena spectator
if (obj->GetTypeId() == TYPEID_PLAYER)
if (((const Player*)obj)->IsSpectator() && ((const Player*)obj)->FindMap()->IsBattleArena())

11
src/server/scripts/Events/brewfest.cpp
View File

@@ -1753,6 +1753,17 @@ public:
}
}
bool CanBeSeen(Player const* player) override
{
if (player->IsGameMaster())
{
return true;
}
Group const* group = player->GetGroup();
return group && sLFGMgr->GetDungeon(group->GetGUID()) == lfg::LFG_DUNGEON_COREN_DIREBREW;
}
void Reset() override
{
_events.Reset();

24
src/server/scripts/Events/hallows_end.cpp
View File

@@ -16,6 +16,7 @@
*/
#include "CellImpl.h"
#include "GameObjectAI.h"
#include "GossipDef.h"
#include "GridNotifiers.h"
#include "Group.h"
@@ -987,7 +988,7 @@ public:
Map::PlayerList const& players = me->GetMap()->GetPlayers();
if (!players.isEmpty() && players.begin()->GetSource() && players.begin()->GetSource()->GetGroup())
sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), 285, me->FindMap());
sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), lfg::LFG_DUNGEON_HEADLESS_HORSEMAN, me->FindMap());
}
void KilledUnit(Unit* /*who*/) override
@@ -1428,6 +1429,27 @@ public:
return true;
}
struct go_loosely_turned_soilAI : public GameObjectAI
{
go_loosely_turned_soilAI(GameObject* gameObject) : GameObjectAI(gameObject) { }
bool CanBeSeen(Player const* player) override
{
if (player->IsGameMaster())
{
return true;
}
Group const* group = player->GetGroup();
return group && sLFGMgr->GetDungeon(group->GetGUID()) == lfg::LFG_DUNGEON_HEADLESS_HORSEMAN;
}
};
GameObjectAI* GetAI(GameObject* go) const override
{
return new go_loosely_turned_soilAI(go);
}
};
void AddSC_event_hallows_end_scripts()

24
src/server/scripts/Events/love_in_air.cpp
View File

@@ -345,6 +345,17 @@ public:
EventMap events;
uint32 speachTimer;
bool CanBeSeen(Player const* player) override
{
if (player->IsGameMaster())
{
return true;
}
Group const* group = player->GetGroup();
return group && sLFGMgr->GetDungeon(group->GetGUID()) == lfg::LFG_DUNGEON_CROWN_CHEMICAL_CO;
}
void Reset() override
{
speachTimer = 0;
@@ -366,7 +377,7 @@ public:
me->AI()->Talk(SAY_HUMMEL_5);
Map::PlayerList const& players = me->GetMap()->GetPlayers();
if (!players.isEmpty() && players.begin()->GetSource() && players.begin()->GetSource()->GetGroup())
sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), 288, me->FindMap());
sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), lfg::LFG_DUNGEON_CROWN_CHEMICAL_CO, me->FindMap());
}
void JustSummoned(Creature* cr) override
@@ -481,6 +492,17 @@ public:
EventMap events;
bool CanBeSeen(Player const* player) override
{
if (player->IsGameMaster())
{
return true;
}
Group const* group = player->GetGroup();
return group && sLFGMgr->GetDungeon(group->GetGUID()) == lfg::LFG_DUNGEON_CROWN_CHEMICAL_CO;
}
void Reset() override
{
}

13
src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
View File

@@ -105,6 +105,17 @@ public:
SummonList summons;
ObjectGuid InvokerGUID;
bool CanBeSeen(Player const* player) override
{
if (player->IsGameMaster())
{
return true;
}
Group const* group = player->GetGroup();
return group && sLFGMgr->GetDungeon(group->GetGUID()) == lfg::LFG_DUNGEON_FROST_LORD_AHUNE;
}
void StartPhase1()
{
me->CastSpell(me, SPELL_AHUNES_SHIELD, true);
@@ -300,7 +311,7 @@ public:
if (player->GetGroup() && !finished)
{
finished = true;
sLFGMgr->FinishDungeon(player->GetGroup()->GetGUID(), 286, me->FindMap());
sLFGMgr->FinishDungeon(player->GetGroup()->GetGUID(), lfg::LFG_DUNGEON_FROST_LORD_AHUNE, me->FindMap());
}
}
}