From ded2714f89267e10b99ba725353afefe37b71645 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Fri, 10 Oct 2008 12:19:38 -0500 Subject: [PATCH] [svn] * Changing text in various files to make it more Trinity Core-like, as well as fixing the grammar and understandability in certain files. * Adding INSTALL file to root with Linux instructions. * Renaming mangos.sql to world.sql until we figure another world database name (if we actually do, world seems fine to me). * Updating config files with Trinity text instead of MaNGOS text. --HG-- branch : trunk --- AUTHORS | 2 +- INSTALL | 51 +++++++++ NEWS | 108 +----------------- README | 51 ++++----- README.txt | 5 - THANKS | 18 +-- contrib/extractor/README.linux | 13 +-- ...he MoPaQ File Format.txt => MoPaQ_0.9.txt} | 0 ...he_MoPaQ_File_Format.txt => MoPaQ_1.0.txt} | 0 sql/Makefile.am | 4 +- sql/tools/README | 10 +- sql/{mangos.sql => world.sql} | 0 src/trinitycore/trinitycore.conf.dist | 39 ++++--- src/trinityrealm/trinityrealm.conf.dist | 14 +-- 14 files changed, 122 insertions(+), 193 deletions(-) create mode 100644 INSTALL delete mode 100644 README.txt rename contrib/vmap_extractor_v2/doc/{The MoPaQ File Format.txt => MoPaQ_0.9.txt} (100%) rename contrib/vmap_extractor_v2/doc/{The_MoPaQ_File_Format.txt => MoPaQ_1.0.txt} (100%) rename sql/{mangos.sql => world.sql} (100%) diff --git a/AUTHORS b/AUTHORS index 72936186406aa..480a09f913c89 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,7 +5,7 @@ exchanged with contributors for your particular package. This information is very useful for registering the copyright of your package. The file might have an introductory blurb similar to this one: - Authors of PACKAGE + Authors of Trinity Core The following contributions warranted legal paper exchanges with [the Free Software Foundation | Your Name]. diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000000000..7a2f7e2ff66e7 --- /dev/null +++ b/INSTALL @@ -0,0 +1,51 @@ +Installing Trinity Core is fairly simple on a Linux machine, assuming +you have all required applications + +The most important ones are: + + * make + * automake + * autoconf + * gcc + +After that, you can simply run these commands: + + * autoreconf --install --force + * ./configure + +The configure script will tell you if you miss any libraries, and +if so, which ones. You can then download them from your preferred +package provider (apt-get, emerge, yum, and the alikes). + +When you have all required packages, be sure to properly configure +your build of Trinity Core: + + * ./configure --help + +That command will tell you which config options are available. For +the most part, the following should be used: + + * --enable-cli + * --enable-ra + * --with-mysql + * --prefix=/home/trinitycore + * --datadir=/home/trinitycore/dat + * --sysconfdir=/home/trinitycore/etc + +Of course, replace the paths in prefix, datadir, and sysconfdir +with the directories you wish to install Trinity Core to. The +datadir is where maps, DBCs, and SQLs are stored. The sysconfdir +is where configuration files are stored. + +When you've configured your build, simply run: + + * make + +And finally, to install Trinity Core: + + * make install + +Done! Trinity Core should now be installed. Now you will need to +apply database updates where necessary. Furthermore, you must +configure your installation by editing the config files in the +sysconfdir. \ No newline at end of file diff --git a/NEWS b/NEWS index 421c0e68c7f29..c6f862d5206bc 100644 --- a/NEWS +++ b/NEWS @@ -1,107 +1,9 @@ -= MaNGOS -- History of visible changes = += Trinity Core -- History of visible changes = -Copyright (c) 2005-2008 MaNGOS project +Copyright (C) Trinity Core (http://www.trinitycore.org) See the COPYING file for copying conditions. -Visit our project website for documentation, and more: -http://www.mangosproject.org/ - -Visit our forums for support: -http://www.mangosproject.org/forum/ - -Please submit bug reports at: -http://www.mangosproject.org/trac/ - -Version 0.12 - * Under discussion. - * Upgrade to client version 2.4.3 (build 8606). - -Version 0.11 - * Lots of improvements in the spell system. - * Now use Mersenne Twister random number generator. - * MySQL client libs updated to 5.0.56. - * Upgrade to client version 2.4.2 (build 8278). - -Version 0.10 - * master looter lot mode, - * FFA PvP zones and FFA PvP server type support, - * Guild Banks, - * unique equipped items support, including gems, - * talent inspecting, - * PostgreSql support, - * sockets library updated to v.2.2.9 version, - * 64-bit binaries building at Windows, - * Upgrade to client version 2.3.0 (build 7561). - -Version 0.9 - * recipes discovery system support, - * more auras, effects, spells, and talents working, - * players queue at login support, - * mangosd/realmd as Windows services support, - * autogeneration mangosd/realmd crash reports (Windows only), - * Visual Studio 2008 Express and Pro support, - * division Mangos DataBase to MangosDB(WorldDB) and CharactersDB. - * Upgrade to client version 2.2.3 (build 7359). - -Version 0.8 - * battleground support, - * gender specific creatures, - * game objects triggering more scripts, - * more auras, effects, spells, and talents working, - * dungeon specific data, - * localization support for data, - * vmaps for line of sight handling, - * build support for OpenBSD and FreeBSD, - * Upgrade to client version 2.1.3 (build 6898). - -Version 0.7, Codename "Eye of the Storm" - * Full rewrite of the GNU autotools based build system, in order to - smooth and clean up the build process. - * Full rewrite of the Windows build system, allowing MaNGOS to be built - from Visual C++ 2003 Toolkit, Visual C++ 2003, Visual C++ 2005. - * Upgrade to client version 2.0.12 (build 6546). - -Version 0.6, Codename "Black Dragonflight" - * MaNGOS development moved to http://sourceforge.net/projects/mangos/ - * A lots of speed improvements to data handling and data transfer have been - completed. - * Mail, auction house, profession, creature, and game object systems have seen - a lot of improvements and can be considered feature complete. Some minor bugs - still are left. - * Rest system has been finished. - * Initial pet stable support has been added. - * PvP and duel system have seen lots of improvements - * Guilds are not just a myth anymore. Coming closer to full guild support. - * Taxi and transport system is close to a fully working system. - * A lot more has been added. - -Version 0.5, Codename "Stable Master" - * Core stability improvements, lots of threading and memory usage related - bugs have been resolved. - * MySQL Database backend has been cleaned up. - * Proper support for game clients of version 1.10.2 has been added. - * Support for auras, pets, spells, talents, totems, etc. has been added - or improved. - * Cross-platform issues have been resolved, MaNGOS should now build on - more platforms, including FreeBSD. - -Version 0.1, Codename "Lightbringer" - * AI system - * Grid system - * Lots a game features working. - * Lovely optimizations for the beloved server. - -Version 0.0.3, Codename "Mango Carpet" - * Interim release, not gone public. - -Version 0.0.2, Codename "Library" - * Most data conversions working. - * Database cleanup. - * More features working. - * Many bugs fixed. - -Version 0.0.1, Codename "Endeavour" - * Data converter added. - * Build system improvements. - * Bug fixing and code cleaning. +Please visit the Trinity Core website for bug reports, patch +submissions, suggestions, and support: +http://www.trinitycore.org/ \ No newline at end of file diff --git a/README b/README index 1e50c0337e0fc..6472f18abd8d2 100644 --- a/README +++ b/README @@ -1,8 +1,8 @@ -= MaNGOS -- README = += Trinity Core -- General information = -Copyright (C) 2005-2008 MaNGOS project +Copyright (C) Trinity Core (http://www.trinitycore.org) - MaNGOS is free software; you can redistribute it and/or modify + Trinity Core is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -16,42 +16,35 @@ Copyright (C) 2005-2008 MaNGOS project along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - In addition, as a special exception, the MaNGOS project - gives permission to link the code of its release of MaNGOS with the - OpenSSL project's "OpenSSL" library (or with modified versions of it - that use the same license as the "OpenSSL" library), and distribute + In addition, as a special exception, the Trinity Core project + gives permission to link the code of its release of Trinity Core with + the OpenSSL project's "OpenSSL" library (or with modified versions of + it that use the same license as the "OpenSSL" library), and distribute the linked executables. You must obey the GNU General Public License in all respects for all of the code used other than "OpenSSL". If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. -Comments are welcome. +Trinity Core is a World of Warcraft game server emulator. It is derived +from MaNGOS, the Massive Network Game Object Server, and is based on the +code of that project. - - theluda +For further information on the Trinity Core project, please visit our +project website at http://www.trinitycore.org. -== Welcome to MaNGOS == +API documentation can be obtained by running the "make doc" command inside +the doc directory. -MaNGOS (the Massive Network Game Object Server) is an Open Source reference -implementation for a MMORPG server system. Please see the file COPYING for -license details. +SQL files to create the database can be found in the sql directory. Files +to update your database from an older revision/version can be found in the +sql/updates directory. -For further information on the MaNGOS project, please visit our project web -site at +See the INSTALL file for installation instructions under Linux. -Documenation on various development related topics can be found in the doc/ -subdirectory, including Doxygen-generated API documentation. +If you are using the SVN (unstable) version of Trinity Core, run this +command prior to building: -The required SQL files for creating the database backend are included in the -sql/ subdirectory. In case you are upgrading from an older MaNGOS release, -make sure you as well take a look at the SQL files in the sql/updates/ sub- -directory. +autoreconf --install --force -In order to build and install MaNGOS under Linux, follow the instructions -described in the INSTALL file. - -In case you have checked out MaNGOS from the SubVersion repository, please run - -$ autoreconf --install --force - -prior to building, as you may otherwise not be able to run a build. +You can then continue to build the source. \ No newline at end of file diff --git a/README.txt b/README.txt deleted file mode 100644 index c93ca33f78023..0000000000000 --- a/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -This is a Subversion repository; use the 'svnadmin' tool to examine -it. Do not add, delete, or modify files here unless you know how -to avoid corrupting the repository. - -Visit http://subversion.tigris.org/ for more information. diff --git a/THANKS b/THANKS index e3b5c4607c993..d85971a2b207c 100644 --- a/THANKS +++ b/THANKS @@ -6,21 +6,15 @@ the contributor's name, while the right column gives the last known good email address for this contributor. This list should be introduced with a wording similar to this one: - MaNGOS THANKS file + Trinity Core THANKS file - MaNGOS has originally been written by Team Python and WoW Daemon Team. Many - people further contributed to MaNGOS by reporting problems, suggesting various - improvements or submitting actual code. - - Here is a list of these people. Help me keep it complete and exempt of errors. + Trinity Core is a derivation/rewrite of MaNGOS, which was originally written + by Team Python and the WoW Daemon Team. Many people further helped Trinity Core + by submitting bug reports, code patches, and suggestions. Special thanks should also go out to the WowwoW team. We have gained help from them many times in the creation of this project. Keep up the good work guys. - Thanks should also go out to the Ludmilla team, who are also providing the - community with a great server. We have not gained too much help from them, - but we have recieved some. - The easiest policy with this file is to thank everyone who contributes to the project, without judging the value of the contribution. @@ -32,6 +26,4 @@ paper exchanges. You can also decide to send some kind of special greeting when you initially add a name to your `THANKS' file. The mere presense of a name in `THANKS' is -then a flag to you that the initial greeting has been sent. - -TBD +then a flag to you that the initial greeting has been sent. \ No newline at end of file diff --git a/contrib/extractor/README.linux b/contrib/extractor/README.linux index e1ebdb8bb2e5a..c28fd42257d87 100644 --- a/contrib/extractor/README.linux +++ b/contrib/extractor/README.linux @@ -1,13 +1,10 @@ -Linux instructions ------------------- += Trinity Core -- Linux instructions for extractor = + +Copyright (C) Trinity Core (http://www.trinitycore.org) 1. Configure and build MaNGOS. -2. cd contrib/map_extractor/libmpq/ +2. cd contrib/extractor/libmpq/ 3. make 4. cd .. 5. make -6. run ad - -if there are any problems create folder named .deps in contrib/map_extractor/ -it is old bug from first extractor and i am too lasy to fix it :) - +6. run ad \ No newline at end of file diff --git a/contrib/vmap_extractor_v2/doc/The MoPaQ File Format.txt b/contrib/vmap_extractor_v2/doc/MoPaQ_0.9.txt similarity index 100% rename from contrib/vmap_extractor_v2/doc/The MoPaQ File Format.txt rename to contrib/vmap_extractor_v2/doc/MoPaQ_0.9.txt diff --git a/contrib/vmap_extractor_v2/doc/The_MoPaQ_File_Format.txt b/contrib/vmap_extractor_v2/doc/MoPaQ_1.0.txt similarity index 100% rename from contrib/vmap_extractor_v2/doc/The_MoPaQ_File_Format.txt rename to contrib/vmap_extractor_v2/doc/MoPaQ_1.0.txt diff --git a/sql/Makefile.am b/sql/Makefile.am index 782e9b61d21d4..f433e8fd2b619 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -28,7 +28,7 @@ pkgdatadir = $(datadir)/mangos/sql ## Files to be installed # Install basic SQL files to datadir pkgdata_DATA = \ - mangos.sql \ + world.sql \ realmd.sql \ characters.sql \ create_mysql.sql \ @@ -40,5 +40,5 @@ EXTRA_DIST = \ create_mysql.sql \ drop_mysql.sql \ characters.sql \ - mangos.sql \ + world.sql \ realmd.sql diff --git a/sql/tools/README b/sql/tools/README index de60305cece2b..83558cda7f0b1 100644 --- a/sql/tools/README +++ b/sql/tools/README @@ -1,10 +1,8 @@ -= MaNGOS -- README = += Trinity Core -- Database cleanup tools = -Copyright (c) 2005-2008 MaNGOS +Copyright (C) Trinity Core (http://www.trinitycore.org) See the COPYING file for copying conditions. -== Database tools == -This folder contains SQL files which can be used for cleanup DB from corrupted or outdated data in safe way. -This tools must be used _only_ when mangos server stopped. -But you can safely use its any times while server shutdown. +These tools can be used to clean a corrupted database. They +should only be used when the sevrer is CLOSED. \ No newline at end of file diff --git a/sql/mangos.sql b/sql/world.sql similarity index 100% rename from sql/mangos.sql rename to sql/world.sql diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 2c94b21b3ed54..918f850372413 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -1,6 +1,6 @@ -##################################### -# MaNGOS Configuration file # -##################################### +########################################## +# Trinity Core worldd configuration file # +########################################## ConfVersion=2008080101 ################################################################################################################### @@ -12,7 +12,7 @@ ConfVersion=2008080101 # DataDir # Data directory setting. # Important: DataDir needs to be quoted, as it is a string which may contain space characters. -# Example: "@prefix@/share/mangos" +# Example: "@prefix@/share/trinitycore" # # LogsDir # Logs directory setting. @@ -45,9 +45,9 @@ ConfVersion=2008080101 RealmID = 1 DataDir = "." LogsDir = "" -LoginDatabaseInfo = "127.0.0.1;3306;root;mangos;realmd" -WorldDatabaseInfo = "127.0.0.1;3306;root;mangos;mangos" -CharacterDatabaseInfo = "127.0.0.1;3306;root;mangos;characters" +LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;realmd" +WorldDatabaseInfo = "127.0.0.1;3306;trinity;trinity;world" +CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters" MaxPingTime = 30 WorldServerPort = 8085 BindIP = "0.0.0.0" @@ -206,7 +206,7 @@ AddonChannel = 1 # # LogFile # Logfile name -# Default: "Server.log" +# Default: "server.log" # "" - Empty name disable creating log file # # LogTimestamp @@ -232,11 +232,11 @@ AddonChannel = 1 # # DBErrorLogFile # Log file of DB errors detected at server run -# Default: "DBErrors.log" +# Default: "db_errors.log" # # CharLogFile # Character operations logfile name -# Default: "Char.log" +# Default: "characters.log" # "" - Empty name disable creating log file # # CharLogTimestamp @@ -253,7 +253,8 @@ AddonChannel = 1 # # GmLogFile # Log file of gm commands -# Default: "" (Disable) +# Default: "gm_commands.log" +# "" - Empty name for disable # # GmLogTimestamp # Logfile with timestamp of server start in name @@ -262,7 +263,7 @@ AddonChannel = 1 # # RaLogFile # Log file of RA commands -# Default: "Ra.log" +# Default: "ra_commands.log" # "" - Empty name for disable # # LogColors @@ -278,20 +279,20 @@ LogSQL = 1 PidFile = "" LogLevel = 3 LogTime = 0 -LogFile = "Server.log" +LogFile = "server.log" LogTimestamp = 0 LogFileLevel = 0 LogFilter_TransportMoves = 1 LogFilter_CreatureMoves = 1 LogFilter_VisibilityChanges = 1 WorldLogFile = "world.log" -DBErrorLogFile = "DBErrors.log" -CharLogFile = "Char.log" +DBErrorLogFile = "db_errors.log" +CharLogFile = "characters.log" CharLogTimestamp = 0 CharLogDump = 0 -GmLogFile = "" +GmLogFile = "gm_commands.log" GmLogTimestamp = 0 -RaLogFile = "" +RaLogFile = "ra_commands.log" LogColors = "" ################################################################################################################### @@ -494,7 +495,7 @@ LogColors = "" # 1 (true) # # BeepAtStart -# Beep at mangosd start finished (mostly work only at Unix/Linux systems) +# Beep at core start finished (mostly work only at Unix/Linux systems) # Default: 1 (true) # 0 (false) # @@ -535,7 +536,7 @@ MailDeliveryDelay = 3600 SkillChance.Prospecting = 0 Event.Announce = 0 BeepAtStart = 1 -Motd = "Welcome to the Massive Network Game Object Server." +Motd = "Welcome to a Trinity Core server." ################################################################################################################### # PLAYER INTERACTION diff --git a/src/trinityrealm/trinityrealm.conf.dist b/src/trinityrealm/trinityrealm.conf.dist index da62747a8bd7c..cd154951fd16c 100644 --- a/src/trinityrealm/trinityrealm.conf.dist +++ b/src/trinityrealm/trinityrealm.conf.dist @@ -1,6 +1,6 @@ -############################################ -# MaNGOS realmd configuration file # -############################################ +########################################## +# Trinity Core realmd configuration file # +########################################## ConfVersion=2007062001 ################################################################################################################### @@ -46,7 +46,7 @@ ConfVersion=2007062001 # # LogFile # Logfile name -# Default: "Realmd.log" +# Default: "realmd.log" # "" - empty name disable creating log file # # LogTimestamp @@ -96,7 +96,7 @@ ConfVersion=2007062001 # ################################################################################################################### -LoginDatabaseInfo = "127.0.0.1;3306;root;mangos;realmd" +LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;realmd" LogsDir = "" MaxPingTime = 30 RealmServerPort = 3724 @@ -104,7 +104,7 @@ BindIP = "0.0.0.0" PidFile = "" LogLevel = 0 LogTime = 0 -LogFile = "Realmd.log" +LogFile = "realmd.log" LogTimestamp = 0 LogFileLevel = 0 LogColors = "" @@ -113,4 +113,4 @@ ProcessPriority = 1 RealmsStateUpdateDelay = 20 WrongPass.MaxCount = 0 WrongPass.BanTime = 600 -WrongPass.BanType = 0 +WrongPass.BanType = 0 \ No newline at end of file