Changeset 41

Timestamp:

11/19/08 13:27:02 (17 years ago)

Author:

yumileroy

Message:

[svn] * Random changes/fixes...
* Some fixes to MangChat?, more coming.
* Cleaning up scripting part and preparing to merge it into the core.

Original author: XTZGZoReX
Date: 2008-10-12 17:35:16-05:00

Location:

trunk/src

Files:

• bindings/scripts/How to install.txt (deleted)
• bindings/scripts/LICENSE.txt (deleted)
• bindings/scripts/Makefile.am (modified) (2 diffs)
• bindings/scripts/README (moved) (moved from trunk/src/bindings/scripts/README.TXT) (1 diff, 1 prop)
• bindings/scripts/ScriptMgr.cpp (modified) (3 diffs)
• bindings/scripts/VCProjToLinuxMake.exe (deleted)
• bindings/scripts/docs/How to install.txt (deleted)
• bindings/scripts/docs/LICENSE.txt (deleted)
• bindings/scripts/docs/ToDo.txt (deleted)
• bindings/scripts/patches/MaNGOS-r4106-ScriptDev2.patch (deleted)
• bindings/scripts/patches/MaNGOS-r4203-ScriptDev2.patch (deleted)
• bindings/scripts/patches/MaNGOS-r4241-ScriptDev2.patch (deleted)
• bindings/scripts/patches/MaNGOS-r4798-ScriptDev2.patch (deleted)
• bindings/scripts/patches/MaNGOS-r5049-Scriptdev2.patch (deleted)
• bindings/scripts/patches/MaNGOS-r6491-Scriptdev2.patch (deleted)
• bindings/scripts/patches/MaNGOS-r6657-Scriptdev2.patch (deleted)
• bindings/scripts/trinityscript.conf.dist (deleted)
• game/IRCConf.cpp (modified) (4 diffs)
• game/World.cpp (modified) (2 diffs)
• trinitycore/CliRunnable.cpp (modified) (2 diffs)
• trinitycore/RASocket.cpp (modified) (2 diffs)
• trinitycore/trinitycore.conf.dist (modified) (3 diffs)

trunk/src/bindings/scripts/Makefile.am

@@ -33 +33 @@
 -I$(top_srcdir)/src/game \
 -I$(srcdir)/include \
-$(TRINI_INCLUDES) \
--D_TRINITY_SCRIPT_CONFIG='"$(sysconfdir)/trinityscript.conf"'
+$(TRINI_INCLUDES)
 
 libtrinityscript_la_SOURCES = \
@@ -399 +398 @@
 
 ## Additional files to install
-sysconf_DATA = \
-        trinityscript.conf.dist
-
-EXTRA_DIST =  \
-        trinityscript.conf.dist
+## sysconf_DATA = 
+
+## EXTRA_DIST = 
 
 ## Prevend overwrite of the config file, if its already installed

trunk/src/bindings/scripts/README

@@ +1 @@
+= Trinity Core -- Implementing scripts =
+
 To compile this properly, you need to get the scripts from:
 
 http://svn.assembla.com/svn/trinityscripts
 
-and get them in a "scripts" folder inside this folder
-
+Simply put them in a folder called "scripts" in this folder.

trunk/src/bindings/scripts/ScriptMgr.cpp

@@ -13 +13 @@
 #define _FULLVERSION "TrinityScript"
 
-#ifndef _TSCRIPTCONFVERSION
-# define _TSCRIPTCONFVERSION 2008100201
-#endif //_TSCRIPTCONFVERSION
-
 #ifndef _TRINITY_SCRIPT_CONFIG
-# define _TRINITY_SCRIPT_CONFIG  "trinityscript.conf"
-#endif //_TRINITY_SCRIPT_CONFIG
+# define _TRINITY_SCRIPT_CONFIG  "trinitycore.conf"
+#endif _TRINITY_SCRIPT_CONFIG
 
 //*** Global data ***
@@ -597 +593 @@
     char const* dbstring = NULL;
 
-    if( !TScriptConfig.GetString("TScriptDatabaseInfo", &dbstring) )
-    {
-        error_log("TSCR: Missing Trinity Script database info from configuration file. Load database aborted.");
+    if( !TScriptConfig.GetString("WorldDatabaseInfo", &dbstring) )
+    {
+        error_log("TSCR: Missing world database info from configuration file. Load database aborted.");
         return;
     }
@@ -1214 +1210 @@
     }
     else outstring_log("TSCR: Using configuration file %s",_TRINITY_SCRIPT_CONFIG);
-
-    //Check config file version
-    if (TScriptConfig.GetIntDefault("ConfVersion", 0) != _TSCRIPTCONFVERSION)
-        error_log("TSCR: Configuration file version doesn't match expected version. Some config variables may be wrong or missing.");
 
     //Locale

trunk/src/game/IRCConf.cpp

@@ -26 +26 @@
         int ConfCnt = 0;
     sIRC._chan_count = 0;
-    if(MCConfig.GetIntDefault("irc.active", 1) == 1)
+    if(MCConfig.GetIntDefault("irc.active", 0) == 1)
         sIRC.Active = true;
     else
         sIRC.Active = false;
-    sIRC._Host = MCConfig.GetStringDefault("irc.host", "irc.freenode.net");
+    sIRC._Host = MCConfig.GetStringDefault("irc.host", "irc.rizon.net");
     if(sIRC._Host.size() > 0)
         ConfCnt++;
     sIRC._Mver = MCConfig.GetStringDefault("irc.mver", "Version 1.6.5");
         sIRC._Port = MCConfig.GetIntDefault("irc.port", 6667);
-    sIRC._User = MCConfig.GetStringDefault("irc.user", "MangChat");
-    sIRC._Pass = MCConfig.GetStringDefault("irc.pass", "MyDumbPass");
-    sIRC._Nick = MCConfig.GetStringDefault("irc.nick", "MangChat");
+    sIRC._User = MCConfig.GetStringDefault("irc.user", "TC");
+    sIRC._Pass = MCConfig.GetStringDefault("irc.pass", "");
+    sIRC._Nick = MCConfig.GetStringDefault("irc.nick", "TrinityCoreBot");
     sIRC._Auth = MCConfig.GetIntDefault("irc.auth", 0);
-        sIRC._Auth_Nick = MCConfig.GetStringDefault("irc.auth.nick", "AuthNick");
+        sIRC._Auth_Nick = MCConfig.GetStringDefault("irc.auth.nick", "TrinityCoreBot");
     sIRC._ICC = MCConfig.GetStringDefault("irc.icc", "001");
     sIRC._defchan = MCConfig.GetStringDefault("irc.defchan", "lobby");
@@ -45 +45 @@
     sIRC._wct = MCConfig.GetIntDefault("irc.wct", 30000);
         sIRC.ajoin = MCConfig.GetIntDefault("irc.ajoin", 1);
-    sIRC.ajchan = MCConfig.GetStringDefault("irc.ajchan", "world");
+    sIRC.ajchan = MCConfig.GetStringDefault("irc.ajchan", "World");
     sIRC.onlrslt = MCConfig.GetIntDefault("irc.online.result", 10);
     sIRC.BOTMASK = MCConfig.GetIntDefault("Botmask", 0);
-    sIRC.logfile = MCConfig.GetStringDefault("irc.logfile.prefix", "IRC_");
+    sIRC.logfile = MCConfig.GetStringDefault("irc.logfile.prefix", "irc_");
         for(int i = 1; i < MAX_CONF_CHANNELS;i++)
     {
@@ -63 +63 @@
         }
     }
-    sIRC.JoinMsg = MCConfig.GetStringDefault("irc.joinmsg", "Whhaaazzzzaaaa, MangChat $Ver Baby!!");
-    sIRC.RstMsg  = MCConfig.GetStringDefault("irc.rstmsg", "MangChat Is Restarting, I Will Be Right Back!");
-    sIRC.kikmsg = MCConfig.GetStringDefault("irc.kickmsg", "Do Not Kick Me Again, Severe Actions Will Be Taken!");
+    sIRC.JoinMsg = MCConfig.GetStringDefault("irc.joinmsg", "Trinity Core running. Command trigger is $Trigger.");
+    sIRC.RstMsg  = MCConfig.GetStringDefault("irc.rstmsg", "Trinity Core is restarting...");
+    sIRC.kikmsg = MCConfig.GetStringDefault("irc.kickmsg", "Do not kick me.");
     // IRC LINES
     sIRC.ILINES[WOW_IRC] = MCConfig.GetStringDefault("chat.wow_irc", "\003<WoW>[\002$Name($Level)\002\003] $Msg");
@@ -77 +77 @@
     sIRC._MCA = MCConfig.GetIntDefault("irc.maxattempt", 10);
     sIRC._autojoinkick = MCConfig.GetIntDefault("irc.autojoin_kick", 1);
-    sIRC._cmd_prefx = MCConfig.GetStringDefault("irc.command_prefix", ".");
+    sIRC._cmd_prefx = MCConfig.GetStringDefault("irc.command_prefix", "-");
         
         sIRC._op_gm = MCConfig.GetIntDefault("irc.op_gm_login", 0);

trunk/src/game/World.cpp

@@ -607 +607 @@
         uint32 val = sConfig.GetIntDefault("MaxPlayerLevel", 60);
         if(val!=m_configs[CONFIG_MAX_PLAYER_LEVEL])
-            sLog.outError("MaxPlayerLevel option can't be changed at mangosd.conf reload, using current value (%u).",m_configs[CONFIG_MAX_PLAYER_LEVEL]);
+            sLog.outError("MaxPlayerLevel option can't be changed at config reload, using current value (%u).",m_configs[CONFIG_MAX_PLAYER_LEVEL]);
     }
     else
@@ -2507 +2507 @@
     }
     // print the console message here so it looks right
-    p_zprintf("Trinity Core> ");
+    p_zprintf("TC> ");
 }
 

trunk/src/trinitycore/CliRunnable.cpp

@@ -897 +897 @@
     }
     if (!bSuccess)
-        zprintf("mangos>");
+        zprintf("TC>");
 }
 
@@ -1239 +1239 @@
     // print this here the first time
     // later it will be printed after command queue updates
-    printf("mangos>");
+    printf("TC>");
 
     ///- As long as the World is running (no World::m_stopEvent), get the command line and handle it

trunk/src/trinitycore/RASocket.cpp

@@ -205 +205 @@
                         Sendf("+Logged in.\r\n");
                         sLog.outRALog("User %s has logged in.\n",szLogin.c_str());
-                        Sendf("mangos>");
+                        Sendf("TC>");
                     }
                     else
@@ -224 +224 @@
                 }
                 else
-                    Sendf("mangos>");
+                    Sendf("TC>");
                 break;
                 ///</ul>

trunk/src/trinitycore/trinitycore.conf.dist

@@ -52 +52 @@
 WorldServerPort = 8085
 BindIP = "0.0.0.0"
+
+###################################################################################################################
+# SCRIPTING SETTINGS
+#
+# TScriptDatabaseInfo
+#     Database connection settings for the wor
+#          .;somenumber;username;password;database - use named pipes at Windows
+#                Named pipes: mySQL required adding "enable-named-pipe" to [mysqld] section my.ini
+#          .;/path/to/unix_socket;username;password;database - use Unix sockets at Unix/Linux
+#                Unix sockets: experimental, not tested
+#
+# Locale
+#     Setting for current (DBC) locale to use
+#
+# EventAI Error reporting
+# 0 - Only startup (Default)
+# 1 - Startup errors and Runtime event errors
+# 2 - Startup errors, Runtime event errors, and Creation errors
+###################################################################################################################
+
+Locale = 0
+EAIErrorLevel = 2
 
 ###################################################################################################################
@@ -1352 +1374 @@
 irc.auto.announce = 30
 irc.autojoin_kick = 1
-irc.command_prefix = "."
+irc.command_prefix = "-"
 irc.joinmsg = "Trinity Core running. Command trigger is $Trigger."
 irc.rstmsg  = "Trinity Core is restarting..."
@@ -1363 +1385 @@
 irc.op_gm_level = 3
 irc.ajoin = 1
-irc.ajchan = "world"
+irc.ajchan = "World"
 irc.online.result = 30
-chat.wow_irc = "<WoW>$Name [$Level]: $Msg"
-chat.irc_wow = "<IRC>$Name: $Msg"
+chat.wow_irc = "-WoW-$Name [$Level]: $Msg"
+chat.irc_wow = "-IRC-$Name: $Msg"
 chat.join_wow = "[$GM] $Name has joined IRC."
 chat.leave_wow = "[$GM] $Name has left IRC."