Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch
This commit is contained in:
1 parent
2251d1bfae
commit
e954498560
94 files changed
+976
-951
No files matched your search
@@ -22,6 +22,7 @@ Comment: All achievement related commands
|
||||
Category: commandscripts
|
||||
EndScriptData */
|
||||
|
||||
#include "AchievementMgr.h"
|
||||
#include "Chat.h"
|
||||
#include "Language.h"
|
||||
#include "Player.h"
|
||||
@@ -69,7 +70,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
if (AchievementEntry const* achievementEntry = sAchievementStore.LookupEntry(achievementId))
|
||||
if (AchievementEntry const* achievementEntry = sAchievementMgr->GetAchievement(achievementId))
|
||||
target->CompletedAchievement(achievementEntry);
|
||||
|
||||
return true;
|
||||
|
||||
@@ -22,8 +22,9 @@ Comment: All disable related commands
|
||||
Category: commandscripts
|
||||
EndScriptData */
|
||||
|
||||
#include "Chat.h"
|
||||
#include "DisableMgr.h"
|
||||
#include "AchievementMgr.h"
|
||||
#include "Chat.h"
|
||||
#include "Language.h"
|
||||
#include "ObjectMgr.h"
|
||||
#include "OutdoorPvP.h"
|
||||
@@ -140,7 +141,7 @@ public:
|
||||
}
|
||||
case DISABLE_TYPE_ACHIEVEMENT_CRITERIA:
|
||||
{
|
||||
if (!sAchievementCriteriaStore.LookupEntry(entry))
|
||||
if (!sAchievementMgr->GetAchievementCriteria(entry))
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_NO_ACHIEVEMENT_CRITERIA_FOUND);
|
||||
handler->SetSentErrorMessage(true);
|
||||
|
||||
@@ -226,7 +226,6 @@ public:
|
||||
|
||||
if (text)
|
||||
CreatureAI::Talk(text);
|
||||
|
||||
}
|
||||
|
||||
void PrepareEncounter()
|
||||
|
||||
@@ -178,7 +178,7 @@ public:
|
||||
{
|
||||
if (!instance)
|
||||
return;
|
||||
|
||||
|
||||
instance->SetData(DATA_KAELTHAS_EVENT, IN_PROGRESS);
|
||||
}
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ public:
|
||||
HandleGameObject(SelinEncounterDoorGUID, false);
|
||||
else if (data == NOT_STARTED)
|
||||
HandleGameObject(SelinEncounterDoorGUID, true);
|
||||
|
||||
|
||||
Encounter[0] = data;
|
||||
break;
|
||||
case DATA_VEXALLUS_EVENT:
|
||||
@@ -184,7 +184,7 @@ public:
|
||||
StatuesState = data;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
SaveToDB();
|
||||
}
|
||||
|
||||
@@ -245,7 +245,7 @@ public:
|
||||
OUT_SAVE_INST_DATA_COMPLETE;
|
||||
return saveStream.str();
|
||||
}
|
||||
|
||||
|
||||
void Load(const char* str)
|
||||
{
|
||||
if (!str)
|
||||
@@ -257,7 +257,7 @@ public:
|
||||
OUT_LOAD_INST_DATA(str);
|
||||
|
||||
std::istringstream loadStream(str);
|
||||
|
||||
|
||||
for (uint32 i = 0; i < MAX_ENCOUNTER; ++i)
|
||||
{
|
||||
uint32 tmpState;
|
||||
@@ -272,7 +272,7 @@ public:
|
||||
|
||||
OUT_LOAD_INST_DATA_COMPLETE;
|
||||
}
|
||||
|
||||
|
||||
uint64 GetData64(uint32 identifier) const
|
||||
{
|
||||
switch (identifier)
|
||||
|
||||
@@ -141,7 +141,7 @@ public:
|
||||
++speechCounter;
|
||||
DoCastAOE(SPELL_THREAT_PULSE, true);
|
||||
|
||||
} else
|
||||
} else
|
||||
speechTimer -= diff;
|
||||
|
||||
return;
|
||||
|
||||
@@ -34,7 +34,7 @@ EndScriptData */
|
||||
//this texts are already used by 3975 and 3976
|
||||
enum Says
|
||||
{
|
||||
SAY_LOST_HEAD = 0,
|
||||
SAY_LOST_HEAD = 0,
|
||||
SAY_PLAYER_DEATH = 1,
|
||||
|
||||
SAY_ENTRANCE = 0,
|
||||
|
||||
@@ -54,7 +54,7 @@ enum Spells
|
||||
AURA_SPECTRAL_REALM = 46021,
|
||||
AURA_SPECTRAL_INVISIBILITY = 44801,
|
||||
AURA_DEMONIC_VISUAL = 44800,
|
||||
|
||||
|
||||
SPELL_SPECTRAL_BLAST = 44869,
|
||||
SPELL_TELEPORT_SPECTRAL = 46019,
|
||||
SPELL_ARCANE_BUFFET = 45018,
|
||||
|
||||
@@ -34,7 +34,7 @@ EndScriptData */
|
||||
enum Yells
|
||||
{
|
||||
SAY_KJ_OFFCOMBAT = 0,
|
||||
|
||||
|
||||
SAY_KALECGOS_ENCOURAGE = 0,
|
||||
SAY_KALECGOS_READY1 = 1,
|
||||
SAY_KALECGOS_READY2 = 2,
|
||||
|
||||
@@ -26,6 +26,7 @@ EndScriptData */
|
||||
/* ContentData
|
||||
EndContentData */
|
||||
|
||||
#include "AchievementMgr.h"
|
||||
#include "ScriptMgr.h"
|
||||
#include "ScriptedCreature.h"
|
||||
#include "ScriptedGossip.h"
|
||||
@@ -318,7 +319,7 @@ public:
|
||||
eventTimer = 3000;
|
||||
if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX)))
|
||||
{
|
||||
AchievementEntry const* AchievWC = sAchievementStore.LookupEntry(ACHIEVEMENT_WAILING_CAVERNS);
|
||||
AchievementEntry const* AchievWC = sAchievementMgr->GetAchievement(ACHIEVEMENT_WAILING_CAVERNS);
|
||||
if (AchievWC)
|
||||
{
|
||||
Map* map = me->GetMap();
|
||||
|
||||
@@ -48,16 +48,6 @@ enum Spells
|
||||
#define SPELL_PERMAFROST_HELPER RAID_MODE<uint32>(68786, 70336)
|
||||
#define SPELL_FORGE_BLADE_HELPER RAID_MODE<uint32>(68774, 70334)
|
||||
|
||||
enum Events
|
||||
{
|
||||
EVENT_THROW_SARONITE = 1,
|
||||
EVENT_CHILLING_WAVE = 2,
|
||||
EVENT_DEEP_FREEZE = 3,
|
||||
EVENT_JUMP = 4,
|
||||
EVENT_FORGING = 5,
|
||||
EVENT_RESUME_ATTACK = 6,
|
||||
};
|
||||
|
||||
enum Phases
|
||||
{
|
||||
PHASE_ONE = 1,
|
||||
@@ -82,6 +72,15 @@ Position const southForgePos = {639.257f, -210.1198f, 529.015f, 0.523599f};
|
||||
|
||||
class boss_garfrost : public CreatureScript
|
||||
{
|
||||
enum Events
|
||||
{
|
||||
EVENT_THROW_SARONITE = 1,
|
||||
EVENT_CHILLING_WAVE = 2,
|
||||
EVENT_DEEP_FREEZE = 3,
|
||||
EVENT_JUMP = 4,
|
||||
EVENT_FORGING = 5,
|
||||
EVENT_RESUME_ATTACK = 6,
|
||||
};
|
||||
public:
|
||||
boss_garfrost() : CreatureScript("boss_garfrost") { }
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "AchievementMgr.h"
|
||||
#include "ScriptMgr.h"
|
||||
#include "ScriptedCreature.h"
|
||||
#include "naxxramas.h"
|
||||
@@ -156,7 +157,7 @@ public:
|
||||
CheckPlayersFrostResist();
|
||||
if (CanTheHundredClub)
|
||||
{
|
||||
AchievementEntry const* AchievTheHundredClub = sAchievementStore.LookupEntry(ACHIEVEMENT_THE_HUNDRED_CLUB);
|
||||
AchievementEntry const* AchievTheHundredClub = sAchievementMgr->GetAchievement(ACHIEVEMENT_THE_HUNDRED_CLUB);
|
||||
if (AchievTheHundredClub)
|
||||
{
|
||||
if (map && map->IsDungeon())
|
||||
|
||||
@@ -23,6 +23,7 @@ SDComment: Event should be pretty close minus a few visual flaws
|
||||
SDCategory: Halls of Lightning
|
||||
EndScriptData */
|
||||
|
||||
#include "AchievementMgr.h"
|
||||
#include "ScriptMgr.h"
|
||||
#include "ScriptedCreature.h"
|
||||
#include "halls_of_lightning.h"
|
||||
@@ -155,7 +156,7 @@ public:
|
||||
|
||||
if (IsHeroic() && GolemsShattered < 5)
|
||||
{
|
||||
AchievementEntry const* AchievShatterResistant = sAchievementStore.LookupEntry(ACHIEVEMENT_SHATTER_RESISTANT);
|
||||
AchievementEntry const* AchievShatterResistant = sAchievementMgr->GetAchievement(ACHIEVEMENT_SHATTER_RESISTANT);
|
||||
if (AchievShatterResistant)
|
||||
{
|
||||
Map* map = me->GetMap();
|
||||
|
||||
Reference in new issue
Block a user