nchebrov/mod-learn-spells
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-learn-spells.git synced 2026-01-13 00:58:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Config Errors

Browse Source
This commit is contained in:
Carey Brooks
2021-03-01 13:27:59 -06:00
parent 3538cdb9cb
commit 2711418bb3
2 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -1,7 +1,4 @@
CU_SET_PATH("CMAKE_MOD_LEARNSPELLS_DIR" "${CMAKE_CURRENT_LIST_DIR}")
AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/mod_learnspells.cpp") AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/mod_learnspells.cpp")
AC_ADD_SCRIPT_LOADER("LearnAllSpells" "${CMAKE_CURRENT_LIST_DIR}/src/loader.h") AC_ADD_SCRIPT_LOADER("LearnAllSpells" "${CMAKE_CURRENT_LIST_DIR}/src/loader.h")
CU_ADD_HOOK(AFTER_WORLDSERVER_CMAKE "${CMAKE_CURRENT_LIST_DIR}/src/cmake/after_ws_install.cmake") AC_ADD_CONFIG_FILE("${CMAKE_CURRENT_LIST_DIR}/conf/mod_learnspells.conf.dist")

63
src/mod_learnspells.cpp
View File

@@ -5,7 +5,23 @@
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "SpellInfo.h" #include "SpellInfo.h"
uint32 MaxLevel; static bool learnlpells_announce;
static bool learnspells_enable;
static bool learnspells_onfirstlogin;
static uint32 learnspells_maxlevel;
class LearnAllSpellseBeforeConfigLoad : public WorldScript {
public:
LearnAllSpellseBeforeConfigLoad() : WorldScript("LearnAllSpellseBeforeConfigLoad") { }
void OnBeforeConfigLoad(bool /*reload*/) override {
learnlpells_announce = sConfigMgr->GetBoolDefault("LearnSpells.Announce", 1);
learnspells_enable = sConfigMgr->GetBoolDefault("LearnSpells.Enable", 1);
learnspells_onfirstlogin = sConfigMgr->GetBoolDefault("LearnSpells.OnFirstLogin", 0);
learnspells_maxlevel = sConfigMgr->GetIntDefault("learnspells_maxlevel", 80);
}
};
class LearnSpellsOnLevelUp : public PlayerScript class LearnSpellsOnLevelUp : public PlayerScript
{ {
@@ -16,29 +32,22 @@ class LearnSpellsOnLevelUp : public PlayerScript
void OnLogin(Player* player) override void OnLogin(Player* player) override
{ {
if (sConfigMgr->GetBoolDefault("LearnSpells.Enable", true)) if (learnspells_enable && learnlpells_announce){
{ ChatHandler(player->GetSession()).SendSysMessage("This server is running the |cff4CFF00LearnAllSpells |rmodule.");
if (sConfigMgr->GetBoolDefault("LearnSpells.Announce", true))
{
ChatHandler(player->GetSession()).SendSysMessage("This server is running the |cff4CFF00LearnAllSpells |rmodule.");
}
} }
} }
void OnFirstLogin(Player* player) override void OnFirstLogin(Player* player) override
{ {
if (sConfigMgr->GetBoolDefault("LearnSpells.LearnAllOnFirstLogin", false)) if (learnspells_onfirstlogin){
{
LearnSpellsForNewLevel(player, 1); LearnSpellsForNewLevel(player, 1);
} }
} }
void OnLevelChanged(Player* player, uint8 oldLevel) override void OnLevelChanged(Player* player, uint8 oldLevel) override
{ {
if (sConfigMgr->GetBoolDefault("LearnSpells.Enable", true)) if (sConfigMgr->GetBoolDefault("LearnSpells.Enable", true)){
{ if (player->getLevel() <= learnspells_maxlevel){
if (player->getLevel() <= MaxLevel)
{
if (oldLevel < player->getLevel()) if (oldLevel < player->getLevel())
LearnSpellsForNewLevel(player, oldLevel); LearnSpellsForNewLevel(player, oldLevel);
} }
@@ -319,34 +328,8 @@ class LearnSpellsOnLevelUp : public PlayerScript
} }
}; };
class LearnAllSpellsWorld : public WorldScript
{
public:
LearnAllSpellsWorld() : WorldScript("LearnAllSpellsWorld")
{
}
void OnBeforeConfigLoad(bool reload) override
{
if (!reload)
{
std::string conf_path = _CONF_DIR;
std::string cfg_file = conf_path + "/mod_learnspells.conf";
#ifdef WIN32
cfg_file = "mod_learnspells.conf";
#endif
std::string cfg_def_file = cfg_file + ".dist";
sConfigMgr->LoadMore(cfg_def_file.c_str());
sConfigMgr->LoadMore(cfg_file.c_str());
MaxLevel = sConfigMgr->GetIntDefault("MaxLevel", 80);
}
}
};
void AddLearnAllSpellsScripts() void AddLearnAllSpellsScripts()
{ {
new LearnAllSpellsWorld(); new LearnAllSpellseBeforeConfigLoad();
new LearnSpellsOnLevelUp(); new LearnSpellsOnLevelUp();
} }