diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp index 1ff40cea71..903c7ccd6a 100644 --- a/src/server/scripts/World/achievement_scripts.cpp +++ b/src/server/scripts/World/achievement_scripts.cpp @@ -21,6 +21,8 @@ #include "Player.h" #include "Creature.h" +namespace AchievementScripts +{ class achievement_arena_kills : public AchievementCriteriaScript { public: @@ -107,9 +109,11 @@ class achievement_killed_exp_or_honor_target : public AchievementCriteriaScript return target && player->isHonorOrXPTarget(target); } }; +} void AddSC_achievement_scripts() { + using namespace AchievementScripts; new achievement_arena_kills("achievement_arena_2v2_kills", ARENA_TYPE_2v2); new achievement_arena_kills("achievement_arena_3v3_kills", ARENA_TYPE_3v3); new achievement_arena_kills("achievement_arena_5v5_kills", ARENA_TYPE_5v5); diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp index 345384c63b..f7fe2e2658 100644 --- a/src/server/scripts/World/action_ip_logger.cpp +++ b/src/server/scripts/World/action_ip_logger.cpp @@ -20,6 +20,8 @@ #include "Player.h" #include "WorldSession.h" +namespace ActionIpLogger +{ enum IPLoggingTypes { @@ -305,10 +307,11 @@ public: return; } }; - +} void AddSC_action_ip_logger() { + using namespace ActionIpLogger; new AccountActionIpLogger(); new CharacterActionIpLogger(); new CharacterDeleteActionIpLogger(); diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 4e4019bbe2..253feff0f8 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -44,6 +44,8 @@ EndContentData */ #include "ScriptedCreature.h" #include "TemporarySummon.h" +namespace AreatriggerScripts +{ /*###### ## at_coilfang_waterfall ######*/ @@ -464,9 +466,11 @@ public: return true; } }; +} void AddSC_areatrigger_scripts() { + using namespace AreatriggerScripts; new AreaTrigger_at_coilfang_waterfall(); new AreaTrigger_at_legion_teleporter(); new AreaTrigger_at_stormwright_shelf(); diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index c2e8c7ba0f..7148fe5897 100644 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -22,6 +22,8 @@ #include "Log.h" #include "Player.h" +namespace ChatLog +{ class ChatLogScript : public PlayerScript { public: @@ -152,8 +154,10 @@ class ChatLogScript : public PlayerScript } } }; +} void AddSC_chat_log() { + using namespace ChatLog; new ChatLogScript(); } diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp index c9c500d046..577031fca3 100644 --- a/src/server/scripts/World/duel_reset.cpp +++ b/src/server/scripts/World/duel_reset.cpp @@ -24,6 +24,8 @@ #include "SpellMgr.h" #include "World.h" +namespace DuelReset +{ class DuelResetScript : public PlayerScript { public: @@ -108,8 +110,10 @@ class DuelResetScript : public PlayerScript pet->GetSpellHistory()->ResetAllCooldowns(); } }; +} void AddSC_duel_reset() { + using namespace DuelReset; new DuelResetScript(); } diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 3cd4e6e2b4..479fc074e3 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -59,6 +59,9 @@ EndContentData */ #include "TemporarySummon.h" #include "WorldSession.h" +namespace GoScripts +{ + /*###### ## go_cat_figurine ######*/ @@ -1941,9 +1944,11 @@ struct go_cauldron_of_battle : public GameObjectAI } } }; +} void AddSC_go_scripts() { + using namespace GoScripts; new go_cat_figurine(); new go_barov_journal(); new go_gilded_brazier(); diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index cc9ccb373a..8ea9353e25 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -36,6 +36,9 @@ EndContentData */ #include "ScriptedCreature.h" #include "SpellInfo.h" +namespace Guards +{ + enum GuardGeneric { GENERIC_CREATURE_COOLDOWN = 5000, @@ -409,9 +412,11 @@ public: return new guard_shattrath_aldorAI(creature); } }; +} void AddSC_guards() { + using namespace Guards; new guard_generic(); new guard_shattrath_aldor(); new guard_shattrath_scryer(); diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 16fb9eee40..8786cb2a70 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -38,6 +38,9 @@ EndContentData */ #include "SpellMgr.h" #include "TemporarySummon.h" +namespace ItemScripts +{ + /*##### # item_only_for_flight #####*/ @@ -409,9 +412,11 @@ class item_generic_limit_chance_above_60 : public ItemScript return true; } }; +} void AddSC_item_scripts() { + using namespace ItemScripts; new item_only_for_flight(); new item_nether_wraith_beacon(); new item_gor_dreks_ointment(); diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 36e5941c16..fccd6f48a5 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -21,6 +21,9 @@ #include "SpellInfo.h" #include "SpellMgr.h" +namespace MobGenericCreature +{ + class trigger_periodic : public CreatureScript { public: @@ -56,8 +59,10 @@ public: return new trigger_periodicAI(creature); } }; +} void AddSC_generic_creature() { + using namespace MobGenericCreature; new trigger_periodic(); } diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 63502b7e0e..5c547eea19 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -30,6 +30,9 @@ EndScriptData */ #include "Player.h" #include "WorldSession.h" +namespace NpcInnkeeper +{ + enum Spells { SPELL_TRICK_OR_TREATED = 24755, @@ -38,18 +41,18 @@ enum Spells #define LOCALE_TRICK_OR_TREAT_0 "Trick or Treat!" #define LOCALE_TRICK_OR_TREAT_2 "Des bonbons ou des blagues!" -#define LOCALE_TRICK_OR_TREAT_3 "Süßes oder Saures!" -#define LOCALE_TRICK_OR_TREAT_6 "¡Truco o trato!" +#define LOCALE_TRICK_OR_TREAT_3 "Süßes oder Saures!" +#define LOCALE_TRICK_OR_TREAT_6 "¡Truco o trato!" #define LOCALE_INNKEEPER_0 "Make this inn my home." #define LOCALE_INNKEEPER_2 "Faites de cette auberge votre foyer." -#define LOCALE_INNKEEPER_3 "Ich möchte dieses Gasthaus zu meinem Heimatort machen." +#define LOCALE_INNKEEPER_3 "Ich möchte dieses Gasthaus zu meinem Heimatort machen." #define LOCALE_INNKEEPER_6 "Fija tu hogar en esta taberna." #define LOCALE_VENDOR_0 "I want to browse your goods." #define LOCALE_VENDOR_2 "Je voudrais regarder vos articles." #define LOCALE_VENDOR_3 "Ich sehe mich nur mal um." -#define LOCALE_VENDOR_6 "Quiero ver tus mercancías." +#define LOCALE_VENDOR_6 "Quiero ver tus mercancías." class npc_innkeeper : public CreatureScript { @@ -162,8 +165,10 @@ class npc_innkeeper : public CreatureScript return new npc_innkeeperAI(creature); } }; +} void AddSC_npc_innkeeper() { + using namespace NpcInnkeeper; new npc_innkeeper(); } diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 1f51252c25..f70ec2352d 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -32,6 +32,9 @@ EndScriptData */ #include "SpellMgr.h" #include "WorldSession.h" +namespace NpcProfessions +{ + /* A few notes for future developement: - It's possible blacksmithing still require some tweaks and adjustments due to the way we _have_ to use reputation. @@ -1085,9 +1088,11 @@ enum MultiProfessionTrainer GOSSIP_MENU_LEATHERWORKING = 12198, GOSSIP_MENU_TAILORING = 12199 }; +} void AddSC_npc_professions() { + using namespace NpcProfessions; new npc_prof_blacksmith(); new npc_engineering_tele_trinket(); new npc_prof_leather(); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 96bbd979c9..b9909ea794 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -38,6 +38,9 @@ #include "Vehicle.h" #include "World.h" +namespace NpcSpecial +{ + /*######## # npc_air_force_bots #########*/ @@ -3142,9 +3145,11 @@ private: EventMap _events; bool _hit; }; +} void AddSC_npcs_special() { + using namespace NpcSpecial; new npc_air_force_bots(); new npc_chicken_cluck(); new npc_dancing_flames();