Merge [SD2]

r1313 Implement new class SystemMgr for storage and management of script data.
      Move database load to new class and instead use functions in class to retrieve data from storage.

--HG--
branch : trunk

6 files changed, 362 insertions, 294 deletions

diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 84215e01a0c..29744ccec9a 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -9,6 +9,7 @@
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "../system/ScriptLoader.h"
+#include "../system/system.h"
 
 #define _FULLVERSION "TrinityScript"
 
@@ -19,26 +20,8 @@
 int num_sc_scripts;
 Script *m_scripts[MAX_SCRIPTS];
 
-DatabaseType TScriptDB;
 Config TScriptConfig;
 
-// String text additional data, used in TextMap
-struct StringTextData
-{
-    uint32 SoundId;
-    uint8  Type;
-    uint32 Language;
-    uint32 Emote;
-};
-
-#define TEXT_SOURCE_RANGE   -1000000                        //the amount of entries each text source has available
-
-// Text Maps
-UNORDERED_MAP<int32, StringTextData> TextMap;
-
-// Waypoint map (escorts)
-UNORDERED_MAP<uint32, std::vector<PointMovement> > PointMovementMap;
-
 void FillSpellSummary();
 void LoadOverridenSQLData();
 void LoadOverridenDBCData();
@@ -56,228 +39,21 @@ void LoadDatabase()
 
     //Initialize connection to DB
     if (!dbstring.empty() && TScriptDB.Initialize(dbstring.c_str()))
-        outstring_log("TSCR: TrinityScript database: %s",dbstring.c_str());
-    else
-    {
-        error_log("TSCR: Unable to connect to Database. Load database aborted.");
-        return;
-    }
-
-    //***Preform all DB queries here***
-    QueryResult *result;
-
-    //Get Version information
-    result = TScriptDB.PQuery("SELECT script_version FROM version LIMIT 1");
-
-    if (result)
-    {
-        Field *fields = result->Fetch();
-        outstring_log("TSCR: Database version is: %s", fields[0].GetString());
-        outstring_log("");
-        delete result;
-
-    }else
     {
-        error_log("TSCR: Missing `version.script_version` information.");
+        outstring_log("TSCR: TrinityScript database at %s initialized", dbstring.c_str());
         outstring_log("");
-    }
-
-    // Drop Existing Text Map, only done once and we are ready to add data from multiple sources.
-    TextMap.clear();
-
-    // Load Script Text
-    outstring_log("TSCR: Loading Script Texts...");
-    LoadTrinityStrings(TScriptDB,"script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2));
-
-    // Gather Additional data from Script Texts
-    result = TScriptDB.PQuery("SELECT entry, sound, type, language, emote FROM script_texts");
-
-    outstring_log("TSCR: Loading Script Texts additional data...");
-    if (result)
-    {
-        barGoLink bar(result->GetRowCount());
-        uint32 count = 0;
 
-        do
-        {
-            bar.step();
-            Field* fields = result->Fetch();
-            StringTextData temp;
-
-            int32 i             = fields[0].GetInt32();
-            temp.SoundId        = fields[1].GetInt32();
-            temp.Type           = fields[2].GetInt32();
-            temp.Language       = fields[3].GetInt32();
-            temp.Emote          = fields[4].GetInt32();
-
-            if (i >= 0)
-            {
-                error_db_log("TSCR: Entry %i in table `script_texts` is not a negative value.",i);
-                continue;
-            }
-
-            if (i > TEXT_SOURCE_RANGE || i <= TEXT_SOURCE_RANGE*2)
-            {
-                error_db_log("TSCR: Entry %i in table `script_texts` is out of accepted entry range for table.",i);
-                continue;
-            }
-
-            if (temp.SoundId)
-            {
-                if (!GetSoundEntriesStore()->LookupEntry(temp.SoundId))
-                    error_db_log("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.",i, temp.SoundId);
-            }
-
-            if (!GetLanguageDescByID(temp.Language))
-                error_db_log("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.",i, temp.Language);
-
-            if (temp.Type > CHAT_TYPE_ZONE_YELL)
-                error_db_log("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.",i, temp.Type);
-
-            TextMap[i] = temp;
-            ++count;
-        } while (result->NextRow());
-
-        delete result;
-
-        outstring_log("");
-        outstring_log(">> TSCR: Loaded %u additional Script Texts data.", count);
-    }else
-    {
-        barGoLink bar(1);
-        bar.step();
-        outstring_log("");
-        outstring_log(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
-    }
-
-    // Load Custom Text
-    outstring_log("TSCR: Loading Custom Texts...");
-    LoadTrinityStrings(TScriptDB,"custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3));
-
-    // Gather Additional data from Custom Texts
-    result = TScriptDB.PQuery("SELECT entry, sound, type, language, emote FROM custom_texts");
-
-    outstring_log("TSCR: Loading Custom Texts additional data...");
-    if (result)
-    {
-        barGoLink bar(result->GetRowCount());
-        uint32 count = 0;
-
-        do
-        {
-            bar.step();
-            Field* fields = result->Fetch();
-            StringTextData temp;
-
-            int32 i             = fields[0].GetInt32();
-            temp.SoundId        = fields[1].GetInt32();
-            temp.Type           = fields[2].GetInt32();
-            temp.Language       = fields[3].GetInt32();
-            temp.Emote          = fields[4].GetInt32();
-
-            if (i >= 0)
-            {
-                error_db_log("TSCR: Entry %i in table `custom_texts` is not a negative value.",i);
-                continue;
-            }
-
-            if (i > TEXT_SOURCE_RANGE*2 || i <= TEXT_SOURCE_RANGE*3)
-            {
-                error_db_log("TSCR: Entry %i in table `custom_texts` is out of accepted entry range for table.",i);
-                continue;
-            }
-
-            if (temp.SoundId)
-            {
-                if (!GetSoundEntriesStore()->LookupEntry(temp.SoundId))
-                    error_db_log("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.",i, temp.SoundId);
-            }
-
-            if (!GetLanguageDescByID(temp.Language))
-                error_db_log("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.",i, temp.Language);
-
-            if (temp.Type > CHAT_TYPE_ZONE_YELL)
-                error_db_log("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.",i, temp.Type);
-
-            TextMap[i] = temp;
-            ++count;
-        } while (result->NextRow());
-
-        delete result;
-
-        outstring_log("");
-        outstring_log(">> Loaded %u additional Custom Texts data.", count);
-    }else
-    {
-        barGoLink bar(1);
-        bar.step();
-        outstring_log("");
-        outstring_log(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
-    }
-
-    // Drop Existing Waypoint list
-    PointMovementMap.clear();
-    uint64 uiCreatureCount = 0;
-
-    // Load Waypoints
-    result = TScriptDB.PQuery("SELECT COUNT(entry) FROM script_waypoint GROUP BY entry");
-    if (result)
-    {
-        uiCreatureCount = result->GetRowCount();
-        delete result;
-    }
-
-    outstring_log("TSCR: Loading Script Waypoints for %u creature(s)...", uiCreatureCount);
-
-    result = TScriptDB.PQuery("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");
-
-    if (result)
-    {
-        barGoLink bar(result->GetRowCount());
-        uint32 uiNodeCount = 0;
-
-        do
-        {
-            bar.step();
-            Field* pFields = result->Fetch();
-            PointMovement pTemp;
-
-            pTemp.m_uiCreatureEntry  = pFields[0].GetUInt32();
-            uint32 uiCreatureEntry   = pTemp.m_uiCreatureEntry;
-            pTemp.m_uiPointId        = pFields[1].GetUInt32();
-            pTemp.m_fX               = pFields[2].GetFloat();
-            pTemp.m_fY               = pFields[3].GetFloat();
-            pTemp.m_fZ               = pFields[4].GetFloat();
-            pTemp.m_uiWaitTime       = pFields[5].GetUInt32();
-
-            CreatureInfo const* pCInfo = GetCreatureTemplateStore(pTemp.m_uiCreatureEntry);
-            if (!pCInfo)
-            {
-                error_db_log("TSCR: DB table script_waypoint has waypoint for non-existant creature entry %u", pTemp.m_uiCreatureEntry);
-                continue;
-            }
-
-            if (!pCInfo->ScriptID)
-                error_db_log("TSCR: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", pTemp.m_uiCreatureEntry);
-
-            PointMovementMap[uiCreatureEntry].push_back(pTemp);
-            ++uiNodeCount;
-        } while (result->NextRow());
-
-        delete result;
-
-        outstring_log("");
-        outstring_log(">> Loaded %u Script Waypoint nodes.", uiNodeCount);
+        pSystemMgr.LoadVersion();
+        pSystemMgr.LoadScriptTexts();
+        pSystemMgr.LoadScriptTextsCustom();
+        pSystemMgr.LoadScriptWaypoints();
     }
     else
     {
-        barGoLink bar(1);
-        bar.step();
-        outstring_log("");
-        outstring_log(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");
+        error_log("TSCR: Unable to connect to Database. Load database aborted.");
+        return;
     }
 
-    //Free database thread and resources
     TScriptDB.HaltDelayThread();
 
 }
@@ -303,8 +79,6 @@ void ScriptsFree()
 TRINITY_DLL_EXPORT
 void ScriptsInit(char const* cfg_file = "trinitycore.conf")
 {
-    bool CanLoadDB = true;
-
     //Trinity Script startup
     outstring_log(" _____     _       _ _         ____            _       _");
     outstring_log("|_   _| __(_)_ __ (_) |_ _   _/ ___|  ___ _ __(_)_ __ | |_ ");
@@ -317,17 +91,14 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
 
     //Get configuration file
     if (!TScriptConfig.SetSource(cfg_file))
-    {
-        CanLoadDB = false;
         error_log("TSCR: Unable to open configuration file. Database will be unaccessible. Configuration values will use default.");
-    }
-    else outstring_log("TSCR: Using configuration file %s",cfg_file);
+    else
+        outstring_log("TSCR: Using configuration file %s",cfg_file);
 
     outstring_log("");
 
-    //Load database (must be called after TScriptConfig.SetSource). In case it failed, no need to even try load.
-    if (CanLoadDB)
-        LoadDatabase();
+    //Load database (must be called after SD2Config.SetSource).
+    LoadDatabase();
 
     outstring_log("TSCR: Loading C++ scripts");
     barGoLink bar(1);
@@ -352,78 +123,78 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
 //*********************************
 //*** Functions used globally ***
 
-void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target)
+void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
 {
     if (!pSource)
     {
-        error_log("TSCR: DoScriptText entry %i, invalid Source pointer.",textEntry);
+        error_log("TSCR: DoScriptText entry %i, invalid Source pointer.", iTextEntry);
         return;
     }
 
-    if (textEntry >= 0)
+    if (iTextEntry >= 0)
     {
-        error_log("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.",pSource->GetEntry(),pSource->GetTypeId(),pSource->GetGUIDLow(),textEntry);
+        error_log("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
         return;
     }
 
-    UNORDERED_MAP<int32, StringTextData>::iterator i = TextMap.find(textEntry);
+    const StringTextData* pData = pSystemMgr.GetTextData(iTextEntry);
 
-    if (i == TextMap.end())
+    if (!pData)
     {
-        error_log("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) could not find text entry %i.",pSource->GetEntry(),pSource->GetTypeId(),pSource->GetGUIDLow(),textEntry);
+        error_log("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) could not find text entry %i.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
         return;
     }
 
-    debug_log("TSCR: DoScriptText: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u",textEntry,(*i).second.SoundId,(*i).second.Type,(*i).second.Language,(*i).second.Emote);
+    debug_log("TSCR: DoScriptText: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u", iTextEntry, pData->uiSoundId, pData->uiType, pData->uiLanguage, pData->uiEmote);
 
-    if((*i).second.SoundId)
+    if(pData->uiSoundId)
     {
-        if(GetSoundEntriesStore()->LookupEntry((*i).second.SoundId))
+        if(GetSoundEntriesStore()->LookupEntry(pData->uiSoundId))
         {
-            pSource->SendPlaySound((*i).second.SoundId, false);
+            pSource->SendPlaySound(pData->uiSoundId, false);
         }
         else
-            error_log("TSCR: DoScriptText entry %i tried to process invalid sound id %u.",textEntry,(*i).second.SoundId);
+            error_log("TSCR: DoScriptText entry %i tried to process invalid sound id %u.", iTextEntry, pData->uiSoundId);
     }
 
-    if((*i).second.Emote)
+    if(pData->uiEmote)
     {
         if (pSource->GetTypeId() == TYPEID_UNIT || pSource->GetTypeId() == TYPEID_PLAYER)
-        {
-            ((Unit*)pSource)->HandleEmoteCommand((*i).second.Emote);
-        }
+            ((Unit*)pSource)->HandleEmoteCommand(pData->uiEmote);
         else
-            error_log("TSCR: DoScriptText entry %i tried to process emote for invalid TypeId (%u).",textEntry, pSource->GetTypeId());
+            error_log("TSCR: DoScriptText entry %i tried to process emote for invalid TypeId (%u).", iTextEntry, pSource->GetTypeId());
     }
 
-    switch((*i).second.Type)
+    switch(pData->uiType)
     {
         case CHAT_TYPE_SAY:
-            pSource->MonsterSay(textEntry, (*i).second.Language, target ? target->GetGUID() : 0);
+            pSource->MonsterSay(iTextEntry, pData->uiLanguage, pTarget ? pTarget->GetGUID() : 0);
             break;
         case CHAT_TYPE_YELL:
-            pSource->MonsterYell(textEntry, (*i).second.Language, target ? target->GetGUID() : 0);
+            pSource->MonsterYell(iTextEntry, pData->uiLanguage, pTarget ? pTarget->GetGUID() : 0);
             break;
         case CHAT_TYPE_TEXT_EMOTE:
-            pSource->MonsterTextEmote(textEntry, target ? target->GetGUID() : 0);
+            pSource->MonsterTextEmote(iTextEntry, pTarget ? pTarget->GetGUID() : 0);
             break;
         case CHAT_TYPE_BOSS_EMOTE:
-            pSource->MonsterTextEmote(textEntry, target ? target->GetGUID() : 0, true);
+            pSource->MonsterTextEmote(iTextEntry, pTarget ? pTarget->GetGUID() : 0, true);
             break;
         case CHAT_TYPE_WHISPER:
             {
-                if (target && target->GetTypeId() == TYPEID_PLAYER)
-                    pSource->MonsterWhisper(textEntry, target->GetGUID());
-                else error_log("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", textEntry);
+                if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
+                    pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID());
+                else
+                    error_log("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry);
             }break;
         case CHAT_TYPE_BOSS_WHISPER:
             {
-                if (target && target->GetTypeId() == TYPEID_PLAYER)
-                    pSource->MonsterWhisper(textEntry, target->GetGUID(), true);
-                else error_log("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", textEntry);
+                if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
+                    pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID(), true);
+                else
+                    error_log("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry);
             }break;
         case CHAT_TYPE_ZONE_YELL:
-            pSource->MonsterYellToZone(textEntry, (*i).second.Language, target ? target->GetGUID() : 0);
+            pSource->MonsterYellToZone(iTextEntry, pData->uiLanguage, pTarget ? pTarget->GetGUID() : 0);
             break;
     }
 }
@@ -454,6 +225,7 @@ char const* ScriptsVersion()
 {
     return "Default Trinity scripting library";
 }
+
 TRINITY_DLL_EXPORT
 bool GossipHello (Player * pPlayer, Creature* pCreature)
 {
diff --git a/src/bindings/scripts/base/escort_ai.cpp b/src/bindings/scripts/base/escort_ai.cpp
index 3f4c8601f90..f4979487d31 100644
--- a/src/bindings/scripts/base/escort_ai.cpp
+++ b/src/bindings/scripts/base/escort_ai.cpp
@@ -11,6 +11,7 @@ EndScriptData */
 
 #include "precompiled.h"
 #include "escort_ai.h"
+#include "../system/system.h"
 
 enum
 {
@@ -18,8 +19,6 @@ enum
     POINT_HOME          = 0xFFFFFE
 };
 
-extern std::list<PointMovement> PointMovementList;
-
 void npc_escortAI::AttackStart(Unit* pWho)
 {
     if (!pWho)
@@ -218,6 +217,11 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
             m_uiPlayerCheckTimer -= uiDiff;
     }
 
+    UpdateEscortAI(uiDiff);
+}
+
+void npc_escortAI::UpdateEscortAI(const uint32 uiDiff)
+{
     if (CanMelee && UpdateVictim())
         DoMeleeAttackIfReady();
 }
@@ -308,17 +312,17 @@ void npc_escortAI::AddWaypoint(uint32 id, float x, float y, float z, uint32 Wait
 
 void npc_escortAI::FillPointMovementListForCreature()
 {
-    UNORDERED_MAP<uint32, std::vector<PointMovement> >::iterator pPointsEntries = PointMovementMap.find(m_creature->GetEntry());
+    std::vector<ScriptPointMove> const &pPointsEntries = pSystemMgr.GetPointMoveList(m_creature->GetEntry());
 
-    if (pPointsEntries != PointMovementMap.end())
-    {
-        std::vector<PointMovement>::iterator itr;
+    if (pPointsEntries.empty())
+        return;
 
-        for (itr = pPointsEntries->second.begin(); itr != pPointsEntries->second.end(); ++itr)
-        {
-            Escort_Waypoint pPoint(itr->m_uiPointId,itr->m_fX,itr->m_fY,itr->m_fZ,itr->m_uiWaitTime);
-            WaypointList.push_back(pPoint);
-        }
+    std::vector<ScriptPointMove>::const_iterator itr;
+
+    for (itr = pPointsEntries.begin(); itr != pPointsEntries.end(); ++itr)
+    {
+        Escort_Waypoint pPoint(itr->uiPointId, itr->fX, itr->fY, itr->fZ, itr->uiWaitTime);
+        WaypointList.push_back(pPoint);
     }
 }
 
diff --git a/src/bindings/scripts/base/escort_ai.h b/src/bindings/scripts/base/escort_ai.h
index 8ce82eb370a..5d27aebfec6 100644
--- a/src/bindings/scripts/base/escort_ai.h
+++ b/src/bindings/scripts/base/escort_ai.h
@@ -7,8 +7,6 @@
 
 #define DEFAULT_MAX_PLAYER_DISTANCE 50
 
-extern UNORDERED_MAP<uint32, std::vector<PointMovement> > PointMovementMap;
-
 struct Escort_Waypoint
 {
     Escort_Waypoint(uint32 _id, float _x, float _y, float _z, uint32 _w)
@@ -50,7 +48,8 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI
 
         void EnterEvadeMode();
 
-        void UpdateAI(const uint32);
+        void UpdateAI(const uint32);                        //the "internal" update, calls UpdateEscortAI()
+        virtual void UpdateEscortAI(const uint32);          //used when it's needed to add code in update (abilities, scripted events, etc)
 
         void MovementInform(uint32, uint32);
 
diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h
index b0a885643fc..6baac76a8dd 100644
--- a/src/bindings/scripts/include/sc_creature.h
+++ b/src/bindings/scripts/include/sc_creature.h
@@ -41,16 +41,6 @@ class SummonList : private std::list<uint64>
         Creature *m_creature;
 };
 
-struct PointMovement
-{
-    uint32 m_uiCreatureEntry;
-    uint32 m_uiPointId;
-    float m_fX;
-    float m_fY;
-    float m_fZ;
-    uint32 m_uiWaitTime;
-};
-
 struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
 {
     explicit ScriptedAI(Creature* creature);
diff --git a/src/bindings/scripts/system/system.cpp b/src/bindings/scripts/system/system.cpp
index ab62e530681..4ed51825262 100644
--- a/src/bindings/scripts/system/system.cpp
+++ b/src/bindings/scripts/system/system.cpp
@@ -19,4 +19,237 @@
  */
 
 #include "precompiled.h"
+#include "system.h"
+#include "ProgressBar.h"
+#include "ObjectMgr.h"
+#include "Database/DatabaseEnv.h"
 
+DatabaseType TScriptDB;
+
+SystemMgr::SystemMgr()
+{
+}
+
+SystemMgr& SystemMgr::Instance()
+{
+    static SystemMgr pSysMgr;
+    return pSysMgr;
+}
+
+void SystemMgr::LoadVersion()
+{
+    //Get Version information
+    QueryResult* pResult = TScriptDB.PQuery("SELECT script_version FROM version LIMIT 1");
+
+    if (pResult)
+    {
+        Field* pFields = pResult->Fetch();
+
+        outstring_log("TSCR: Database version is: %s", pFields[0].GetString());
+        outstring_log("");
+    }
+    else
+    {
+        error_log("TSCR: Missing `version`.`script_version` information.");
+        outstring_log("");
+    }
+}
+
+void SystemMgr::LoadScriptTexts()
+{
+    outstring_log("TSCR: Loading Script Texts...");
+    LoadTrinityStrings(TScriptDB,"script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2));
+
+    QueryResult* pResult = TScriptDB.PQuery("SELECT entry, sound, type, language, emote FROM script_texts");
+
+    outstring_log("TSCR: Loading Script Texts additional data...");
+
+    if (pResult)
+    {
+        barGoLink bar(pResult->GetRowCount());
+        uint32 uiCount = 0;
+
+        do
+        {
+            bar.step();
+            Field* pFields = pResult->Fetch();
+            StringTextData pTemp;
+
+            int32 iId           = pFields[0].GetInt32();
+            pTemp.uiSoundId     = pFields[1].GetUInt32();
+            pTemp.uiType        = pFields[2].GetUInt32();
+            pTemp.uiLanguage    = pFields[3].GetUInt32();
+            pTemp.uiEmote       = pFields[4].GetUInt32();
+
+            if (iId >= 0)
+            {
+                error_db_log("TSCR: Entry %i in table `script_texts` is not a negative value.", iId);
+                continue;
+            }
+
+            if (iId > TEXT_SOURCE_RANGE || iId <= TEXT_SOURCE_RANGE*2)
+            {
+                error_db_log("TSCR: Entry %i in table `script_texts` is out of accepted entry range for table.", iId);
+                continue;
+            }
+
+            if (pTemp.uiSoundId)
+            {
+                if (!GetSoundEntriesStore()->LookupEntry(pTemp.uiSoundId))
+                    error_db_log("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
+            }
+
+            if (!GetLanguageDescByID(pTemp.uiLanguage))
+                error_db_log("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
+
+            if (pTemp.uiType > CHAT_TYPE_ZONE_YELL)
+                error_db_log("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
+
+            m_mTextDataMap[iId] = pTemp;
+            ++uiCount;
+        } while (pResult->NextRow());
+
+        outstring_log("");
+        outstring_log(">> Loaded %u additional Script Texts data.", uiCount);
+    }
+    else
+    {
+        barGoLink bar(1);
+        bar.step();
+        outstring_log("");
+        outstring_log(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
+    }
+}
+
+void SystemMgr::LoadScriptTextsCustom()
+{
+    outstring_log("TSCR: Loading Custom Texts...");
+    LoadTrinityStrings(TScriptDB,"custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3));
+
+    QueryResult* pResult = TScriptDB.PQuery("SELECT entry, sound, type, language, emote FROM custom_texts");
+
+    outstring_log("TSCR: Loading Custom Texts additional data...");
+
+    if (pResult)
+    {
+        barGoLink bar(pResult->GetRowCount());
+        uint32 uiCount = 0;
+
+        do
+        {
+            bar.step();
+            Field* pFields = pResult->Fetch();
+            StringTextData pTemp;
+
+            int32 iId              = pFields[0].GetInt32();
+            pTemp.uiSoundId        = pFields[1].GetUInt32();
+            pTemp.uiType           = pFields[2].GetUInt32();
+            pTemp.uiLanguage       = pFields[3].GetUInt32();
+            pTemp.uiEmote          = pFields[4].GetUInt32();
+
+            if (iId >= 0)
+            {
+                error_db_log("TSCR: Entry %i in table `custom_texts` is not a negative value.", iId);
+                continue;
+            }
+
+            if (iId > TEXT_SOURCE_RANGE*2 || iId <= TEXT_SOURCE_RANGE*3)
+            {
+                error_db_log("TSCR: Entry %i in table `custom_texts` is out of accepted entry range for table.", iId);
+                continue;
+            }
+
+            if (pTemp.uiSoundId)
+            {
+                if (!GetSoundEntriesStore()->LookupEntry(pTemp.uiSoundId))
+                    error_db_log("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
+            }
+
+            if (!GetLanguageDescByID(pTemp.uiLanguage))
+                error_db_log("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
+
+            if (pTemp.uiType > CHAT_TYPE_ZONE_YELL)
+                error_db_log("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
+
+            m_mTextDataMap[iId] = pTemp;
+            ++uiCount;
+        } while (pResult->NextRow());
+
+        outstring_log("");
+        outstring_log(">> Loaded %u additional Custom Texts data.", uiCount);
+    }
+    else
+    {
+        barGoLink bar(1);
+        bar.step();
+        outstring_log("");
+        outstring_log(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
+    }
+}
+
+void SystemMgr::LoadScriptWaypoints()
+{
+    // Drop Existing Waypoint list
+    m_mPointMoveMap.clear();
+
+    uint64 uiCreatureCount = 0;
+
+    // Load Waypoints
+    QueryResult* pResult = TScriptDB.PQuery("SELECT COUNT(entry) FROM script_waypoint GROUP BY entry");
+    if (pResult)
+    {
+        uiCreatureCount = pResult->GetRowCount();
+        delete pResult;
+    }
+
+    outstring_log("TSCR: Loading Script Waypoints for %u creature(s)...", uiCreatureCount);
+
+    pResult = TScriptDB.PQuery("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");
+
+    if (pResult)
+    {
+        barGoLink bar(pResult->GetRowCount());
+        uint32 uiNodeCount = 0;
+
+        do
+        {
+            bar.step();
+            Field* pFields = pResult->Fetch();
+            ScriptPointMove pTemp;
+
+            pTemp.uiCreatureEntry   = pFields[0].GetUInt32();
+            uint32 uiEntry          = pTemp.uiCreatureEntry;
+            pTemp.uiPointId         = pFields[1].GetUInt32();
+            pTemp.fX                = pFields[2].GetFloat();
+            pTemp.fY                = pFields[3].GetFloat();
+            pTemp.fZ                = pFields[4].GetFloat();
+            pTemp.uiWaitTime        = pFields[5].GetUInt32();
+
+            CreatureInfo const* pCInfo = GetCreatureTemplateStore(pTemp.uiCreatureEntry);
+
+            if (!pCInfo)
+            {
+                error_db_log("TSCR: DB table script_waypoint has waypoint for non-existant creature entry %u", pTemp.uiCreatureEntry);
+                continue;
+            }
+
+            if (!pCInfo->ScriptID)
+                error_db_log("TSCR: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", pTemp.uiCreatureEntry);
+
+            m_mPointMoveMap[uiEntry].push_back(pTemp);
+            ++uiNodeCount;
+        } while (pResult->NextRow());
+
+        delete pResult;
+
+        outstring_log("");
+        outstring_log(">> Loaded %u Script Waypoint nodes.", uiNodeCount);
+    }
+    else
+    {
+        barGoLink bar(1);
+        bar.step();
+        outstring_log("");
+        outstring_log(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");
+    }
+}
diff --git a/src/bindings/scripts/system/system.h b/src/bindings/scripts/system/system.h
index 886f31355a9..a9d35b6f3f0 100644
--- a/src/bindings/scripts/system/system.h
+++ b/src/bindings/scripts/system/system.h
@@ -5,4 +5,74 @@
 #ifndef SC_SYSTEM_H
 #define SC_SYSTEM_H
 
+extern DatabaseType TScriptDB;
+
+#define TEXT_SOURCE_RANGE -1000000                          //the amount of entries each text source has available
+
+struct ScriptPointMove
+{
+    uint32 uiCreatureEntry;
+    uint32 uiPointId;
+    float  fX;
+    float  fY;
+    float  fZ;
+    uint32 uiWaitTime;
+};
+
+struct StringTextData
+{
+    uint32 uiSoundId;
+    uint8  uiType;
+    uint32 uiLanguage;
+    uint32 uiEmote;
+};
+
+#define pSystemMgr SystemMgr::Instance()
+
+class SystemMgr
+{
+    public:
+        SystemMgr();
+        ~SystemMgr() {}
+
+        static SystemMgr& Instance();
+
+        //Maps and lists
+        typedef UNORDERED_MAP<int32, StringTextData> TextDataMap;
+        typedef UNORDERED_MAP<uint32, std::vector<ScriptPointMove> > PointMoveMap;
+
+        //Database
+        void LoadVersion();
+        void LoadScriptTexts();
+        void LoadScriptTextsCustom();
+        void LoadScriptWaypoints();
+
+        //Retrive from storage
+        StringTextData const* GetTextData(int32 uiTextId) const
+        {
+            TextDataMap::const_iterator itr = m_mTextDataMap.find(uiTextId);
+
+            if (itr == m_mTextDataMap.end())
+                return NULL;
+
+            return &itr->second;
+        }
+
+        std::vector<ScriptPointMove> const &GetPointMoveList(uint32 uiCreatureEntry) const
+        {
+            static std::vector<ScriptPointMove> vEmpty;
+
+            PointMoveMap::const_iterator itr = m_mPointMoveMap.find(uiCreatureEntry);
+
+            if (itr == m_mPointMoveMap.end())
+                return vEmpty;
+
+            return itr->second;
+        }
+
+    protected:
+        TextDataMap     m_mTextDataMap;                     //additional data for text strings
+        PointMoveMap    m_mPointMoveMap;                    //coordinates for waypoints
+};
+
 #endif