fixed compile issues for first compile and updated conf to remove duplicates

This commit is contained in:
2024-09-02 00:37:11 -04:00
parent ef206b6a0d
commit d98a0345d7
8 changed files with 23 additions and 30 deletions

View File

@@ -53,17 +53,17 @@ MythicPlus.Legendary.DungeonBossSpell = 2.25
MythicPlus.Legendary.DungeonBossArmor = 3.25
MythicPlus.Legendary.DungeonBossLevel = 87
MythicPlus.Legendary.DungeonHealth = 3.25
MythicPlus.Legendary.DungeonMelee = 3.25
MythicPlus.Legendary.DungeonSpell = 3.25
MythicPlus.Legendary.DungeonArmor = 3.25
MythicPlus.Legendary.DungeonAvgLevel = 87
MythicPlus.Ascendant.DungeonHealth = 3.25
MythicPlus.Ascendant.DungeonMelee = 3.25
MythicPlus.Ascendant.DungeonSpell = 3.25
MythicPlus.Ascendant.DungeonArmor = 3.25
MythicPlus.Ascendant.DungeonAvgLevel = 87
MythicPlus.Legendary.DugeonBossHealth = 3.25
MythicPlus.Legendary.DugeonBossMelee = 3.25
MythicPlus.Legendary.DugeonBossSpell = 3.25
MythicPlus.Legendary.DugeonBossArmor = 3.25
MythicPlus.Legendary.DugeonBossLevel = 90
MythicPlus.Ascendant.DugeonBossHealth = 3.25
MythicPlus.Ascendant.DugeonBossMelee = 3.25
MythicPlus.Ascendant.DugeonBossSpell = 3.25
MythicPlus.Ascendant.DugeonBossArmor = 3.25
MythicPlus.Ascendant.DugeonBossLevel = 90
##########################################################
#

View File

@@ -88,17 +88,17 @@ public:
return true;
}
static bool HandleMythic(ChatHandler* handler, const std::vector<std::string>& args)
static bool HandleMythic(ChatHandler* handler, const std::vector<std::string>& /*args*/)
{
return HandleSetDifficulty(handler, std::vector<std::string>{"mythic"});
}
static bool HandleLegendary(ChatHandler* handler, const std::vector<std::string>& args)
static bool HandleLegendary(ChatHandler* handler, const std::vector<std::string>& /*args*/)
{
return HandleSetDifficulty(handler, std::vector<std::string>{"legendary"});
}
static bool HandleAscendant(ChatHandler* handler, const std::vector<std::string>& args)
static bool HandleAscendant(ChatHandler* handler, const std::vector<std::string>& /*args*/)
{
return HandleSetDifficulty(handler, std::vector<std::string>{"ascendant"});
}

View File

@@ -19,9 +19,7 @@ class MythicPlus_GroupScript : public GroupScript
return;
}
MpDataStore* mpds = MpDataStore::getInstance();
GroupData gd = { group, MP_DIFFICULTY_NORMAL };
mpds->AddGroupData(group->GetGUID(), gd);
// sMpDataStore->AddGroupData(group->GetGUID(), gd);
}
void OnDisband(Group* group) override {
@@ -29,8 +27,8 @@ class MythicPlus_GroupScript : public GroupScript
return;
}
MpDataStore* mpds = MpDataStore::getInstance();
mpds->RemoveGroupData(group->GetGUID());
// MpDataStore* mpds = MpDataStore::instance();
// mpds->RemoveGroupData(group->GetGUID());
}
};
@@ -38,4 +36,4 @@ void Add_MP_GroupScripts()
{
MpLogger::debug("Add_MP_GroupScripts()");
new MythicPlus_GroupScript();
}
}

View File

@@ -24,6 +24,7 @@ void MpDataStore::AddGroupData(Group *group, int8 difficulty) {
CharacterDatabase.Execute("REPLACE INTO group_difficulty (guid, difficulty) VALUES ({},{}) ", guid.GetCounter(), difficulty);
}
// This clears out any group data from memory and the database
void MpDataStore::RemoveGroupData(Group *group) {
MpLogger::debug("RemoveGroupData for group {}", group->GetGUID().GetCounter());
groupData->erase(group->GetGUID());

View File

@@ -1,16 +1,6 @@
#include "MythicPlus.h"
#include "MapMgr.h"
MythicPlus::MythicPlus()
{
}
MythicPlus::~MythicPlus()
{
}
bool MythicPlus::IsMapEligible(Map* map)
{
if (!Enabled) {

View File

@@ -2,6 +2,7 @@
#define MYTHICPLUS_H
#include "Define.h"
#include "Map.h"
#include <map>
#include <string>

View File

@@ -13,7 +13,6 @@ void Add_MP_WorldScripts();
void Addmod_mythic_plusScripts()
{
LOG_DEBUG("module.MythicPlus", "[MythicPlus] Initializing scripts.");
Add_MP_AllCreatureScripts();
Add_MP_AllMapScripts();
Add_MP_CommandScripts();

View File

@@ -32,3 +32,7 @@ public:
}
};
void Add_MP_UnitScripts()
{
new MythicPlus_UnitScript();
}