Skip to content

fix codestyle, sql and add enabled hook lists for performance improvement #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sudlud merged 3 commits into from
Mar 2, 2025
Merged

fix codestyle, sql and add enabled hook lists for performance improvement #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
632f321
update sql collation to utf8mb4
sudlud Mar 2, 2025
3a7831c
fix sql flag manipulation and use variable instead of hard coded value
sudlud Mar 2, 2025
8c5d41f
fix codestyle and add enabled hook lists for performance improvement
sudlud Mar 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/sql/db-characters/base/morphsummon_ddl.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `mod_morphsummon_felguard_weapon` (
`PlayerGUIDLow` int(10) unsigned NOT NULL,
`FelguardItemID` int(10) unsigned NOT NULL COMMENT 'Item ID for Felguard virtual item slot 0',
PRIMARY KEY (`PlayerGUIDLow`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='mod-morphsummon; used for custom Felguard weapons';
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='mod-morphsummon; used for custom Felguard weapons';
2 changes: 1 addition & 1 deletion data/sql/db-world/base/morphsummon.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionTex
DELETE FROM `creature_template_model` where `CreatureID` = @ENTRY;
INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES (@ENTRY, 0, @MODELID, 1, 1, 12340);

UPDATE `creature_template` SET `npcflag`=1 WHERE `entry`=601072;
UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=@ENTRY;
71 changes: 13 additions & 58 deletions src/morphsummon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
*/

#include "ScriptMgr.h"
#include "Player.h"
#include "Unit.h"
#include "Chat.h"
#include "Config.h"
#include "Pet.h"
#include "ScriptedGossip.h"
#include "Player.h"
#include "ScriptedCreature.h"
#include "ScriptedGossip.h"
#include "ScriptMgr.h"
#include "SpellAuras.h"
#include "Unit.h"

std::map<std::string, uint32> warlock_imp;
std::map<std::string, uint32> warlock_voidwalker;
Expand Down Expand Up @@ -79,17 +79,18 @@ enum MorphSummonEvents
class MorphSummonPlayerScript : public PlayerScript
{
public:
MorphSummonPlayerScript() : PlayerScript("MorphSummonPlayerScript") {}
MorphSummonPlayerScript() : PlayerScript("MorphSummonPlayerScript", {
PLAYERHOOK_ON_LOGIN,
PLAYERHOOK_ON_AFTER_GUARDIAN_INIT_STATS_FOR_LEVEL
}) {}

void OnLogin(Player* player) override
void OnPlayerLogin(Player* player) override
{
if (morphSummonAnnounce)
{
ChatHandler(player->GetSession()).SendSysMessage("This server is running the |cff4CFF00MorphSummon |rmodule.");
}
}

void OnAfterGuardianInitStatsForLevel(Player* player, Guardian* guardian) override
void OnPlayerAfterGuardianInitStatsForLevel(Player* player, Guardian* guardian) override
{
if (Pet* pet = guardian->ToPet())
{
Expand Down Expand Up @@ -126,9 +127,7 @@ class MorphSummonCreatureScript : public CreatureScript
ClearGossipMenuFor(player);

if (action == MORPH_MAIN_MENU)
{
return CreateMainMenu(player, creature);
}

if (action == MORPH_CLOSE_MENU)
{
Expand All @@ -137,71 +136,39 @@ class MorphSummonCreatureScript : public CreatureScript
}

if (action >= MORPH_PAGE_START_WARLOCK_IMP && action < MORPH_PAGE_START_WARLOCK_VOIDWALKER)
{
AddGossip(player, action, warlock_imp, MORPH_PAGE_START_WARLOCK_IMP);
}
else if (action >= MORPH_PAGE_START_WARLOCK_VOIDWALKER && action < MORPH_PAGE_START_WARLOCK_SUCCUBUS)
{
AddGossip(player, action, warlock_voidwalker, MORPH_PAGE_START_WARLOCK_VOIDWALKER);
}
else if (action >= MORPH_PAGE_START_WARLOCK_SUCCUBUS && action < MORPH_PAGE_START_WARLOCK_FELHUNTER)
{
AddGossip(player, action, warlock_succubus, MORPH_PAGE_START_WARLOCK_SUCCUBUS);
}
else if (action >= MORPH_PAGE_START_WARLOCK_FELHUNTER && action < MORPH_PAGE_START_WARLOCK_FELGUARD)
{
AddGossip(player, action, warlock_felhunter, MORPH_PAGE_START_WARLOCK_FELHUNTER);
}
else if (action >= MORPH_PAGE_START_WARLOCK_FELGUARD && action < MORPH_PAGE_START_DEATH_KNIGHT_GHOUL)
{
AddGossip(player, action, warlock_felguard, MORPH_PAGE_START_WARLOCK_FELGUARD);
}
else if (action >= MORPH_PAGE_START_DEATH_KNIGHT_GHOUL && action < MORPH_PAGE_START_MAGE_WATER_ELEMENTAL)
{
AddGossip(player, action, death_knight_ghoul, MORPH_PAGE_START_DEATH_KNIGHT_GHOUL);
}
else if (action >= MORPH_PAGE_START_MAGE_WATER_ELEMENTAL && action < MORPH_PAGE_START_FELGUARD_WEAPON)
{
AddGossip(player, action, mage_water_elemental, MORPH_PAGE_START_MAGE_WATER_ELEMENTAL);
}
else if (action >= MORPH_PAGE_START_FELGUARD_WEAPON && action < MORPH_PAGE_MAX)
{
AddGossip(player, action, felguard_weapon, MORPH_PAGE_START_FELGUARD_WEAPON);
}
else if (action >= MORPH_PAGE_MAX)
{
if (sender >= MORPH_PAGE_START_WARLOCK_IMP && sender < MORPH_PAGE_START_WARLOCK_VOIDWALKER)
{
Polymorph(player, action, sender, MORPH_PAGE_START_WARLOCK_IMP, MORPH_PAGE_START_WARLOCK_VOIDWALKER, SUMMON_IMP, warlock_imp, true);
}
else if (sender >= MORPH_PAGE_START_WARLOCK_VOIDWALKER && sender < MORPH_PAGE_START_WARLOCK_SUCCUBUS)
{
Polymorph(player, action, sender, MORPH_PAGE_START_WARLOCK_VOIDWALKER, MORPH_PAGE_START_WARLOCK_SUCCUBUS, SUMMON_VOIDWALKER, warlock_voidwalker, true);
}
else if (sender >= MORPH_PAGE_START_WARLOCK_SUCCUBUS && sender < MORPH_PAGE_START_WARLOCK_FELHUNTER)
{
Polymorph(player, action, sender, MORPH_PAGE_START_WARLOCK_SUCCUBUS, MORPH_PAGE_START_WARLOCK_FELHUNTER, SUMMON_SUCCUBUS, warlock_succubus, true);
}
else if (sender >= MORPH_PAGE_START_WARLOCK_FELHUNTER && sender < MORPH_PAGE_START_WARLOCK_FELGUARD)
{
Polymorph(player, action, sender, MORPH_PAGE_START_WARLOCK_FELHUNTER, MORPH_PAGE_START_WARLOCK_FELGUARD, SUMMON_FELHUNTER, warlock_felhunter, true);
}
else if (sender >= MORPH_PAGE_START_WARLOCK_FELGUARD && sender < MORPH_PAGE_START_DEATH_KNIGHT_GHOUL)
{
Polymorph(player, action, sender, MORPH_PAGE_START_WARLOCK_FELGUARD, MORPH_PAGE_START_DEATH_KNIGHT_GHOUL, SUMMON_FELGUARD, warlock_felguard, true);
}
else if (sender >= MORPH_PAGE_START_DEATH_KNIGHT_GHOUL && sender < MORPH_PAGE_START_MAGE_WATER_ELEMENTAL)
{
Polymorph(player, action, sender, MORPH_PAGE_START_DEATH_KNIGHT_GHOUL, MORPH_PAGE_START_MAGE_WATER_ELEMENTAL, RAISE_DEAD, death_knight_ghoul, true);
}
else if (sender >= MORPH_PAGE_START_MAGE_WATER_ELEMENTAL && sender < MORPH_PAGE_START_FELGUARD_WEAPON)
{
Polymorph(player, action, sender, MORPH_PAGE_START_MAGE_WATER_ELEMENTAL, MORPH_PAGE_START_FELGUARD_WEAPON, SUMMON_WATER_ELEMENTAL, mage_water_elemental, true);
}
else if (sender >= MORPH_PAGE_START_FELGUARD_WEAPON && sender < MORPH_PAGE_MAX)
{
Polymorph(player, action, sender, MORPH_PAGE_START_FELGUARD_WEAPON, MORPH_PAGE_MAX, SUMMON_FELGUARD, felguard_weapon, false);
}
}

SendGossipMenuFor(player, MORPH_GOSSIP_TEXT_CHOICE, creature->GetGUID());
Expand Down Expand Up @@ -264,9 +231,7 @@ class MorphSummonCreatureScript : public CreatureScript
if (minion->GetUInt32Value(UNIT_CREATED_BY_SPELL) == SUMMON_WATER_ELEMENTAL)
{
if (!mage_water_elemental.empty())
{
AddGossipItemFor(player, MORPH_GOSSIP_MENU_HELLO, MORPH_GOSSIP_OPTION_POLYMORPH, GOSSIP_SENDER_MAIN, MORPH_PAGE_START_MAGE_WATER_ELEMENTAL);
}
}
}
}
Expand Down Expand Up @@ -306,14 +271,10 @@ class MorphSummonCreatureScript : public CreatureScript
AddGossipItemFor(player, MORPH_GOSSIP_MENU_HELLO, MORPH_GOSSIP_OPTION_POLYMORPH, GOSSIP_SENDER_MAIN, MORPH_PAGE_START_WARLOCK_FELGUARD);

if (!felguard_weapon.empty())
{
AddGossipItemFor(player, MORPH_GOSSIP_MENU_HELLO, MORPH_GOSSIP_OPTION_FELGUARD_WEAPON, GOSSIP_SENDER_MAIN, MORPH_PAGE_START_FELGUARD_WEAPON);
}
}
else if (!felguard_weapon.empty())
{
AddGossipItemFor(player, MORPH_GOSSIP_MENU_HELLO, MORPH_GOSSIP_OPTION_FELGUARD_WEAPON, GOSSIP_SENDER_MAIN, MORPH_PAGE_START_FELGUARD_WEAPON);
}
else
sorry = true;
break;
Expand All @@ -328,9 +289,7 @@ class MorphSummonCreatureScript : public CreatureScript
}
}
else
{
sorry = true;
}
}

if (sorry)
Expand Down Expand Up @@ -374,13 +333,9 @@ class MorphSummonCreatureScript : public CreatureScript
Minion* minion = player->GetFirstMinion();

if (pet != nullptr)
{
petOrMinion = pet;
}
else if (minion != nullptr)
{
petOrMinion = minion;
}

if (petOrMinion != nullptr)
{
Expand Down Expand Up @@ -422,7 +377,9 @@ class MorphSummonCreatureScript : public CreatureScript
class MorphSummonWorldScript : public WorldScript
{
public:
MorphSummonWorldScript() : WorldScript("MorphSummonWorldScript") {}
MorphSummonWorldScript() : WorldScript("MorphSummonWorldScript", {
WORLDHOOK_ON_BEFORE_CONFIG_LOAD
}) {}

void OnBeforeConfigLoad(bool /*reload*/) override
{
Expand Down Expand Up @@ -484,9 +441,7 @@ class MorphSummonWorldScript : public WorldScript
while (std::getline(modelsStringStream, delimitedValue, ','))
{
if (count % 2 == 0)
{
modelName = delimitedValue;
}
else
{
uint32 modelId = atoi(delimitedValue.c_str());
Expand Down