Manual tweaks for the git history merge.

7 files changed, 61 insertions, 147 deletions

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 4e0e37ab..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "client-data"]
-	path = client-data
-	url = git://github.com/themanaworld/tmwa-client-data.git
-[submodule "tools"]
-	path = tools
-	url = git://github.com/themanaworld/tmw-tools.git
diff --git a/.mailmap b/.mailmap
index 9d753f39..b182d06f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,32 +1,74 @@
-Jesusaves <jesusalva@themanaworld.org> Jesusaves <cpntb1@ymail.com>
-Jesusaves <jesusalva@themanaworld.org> Jonatas L. Nogueira <cpntb1@ymail.com>
+Akko Teru <none@null.nil> Teru <9bi at [comc]ast dot net>
 Alige <aligetmw@hotmail.fr> Alige <gauvain.dauchy@free.fr>
 Alige <aligetmw@hotmail.fr> Alige <alige@debian>
-Reid <reidyaro@gmail.com> Reid Yaro <reidyaro@gmail.com>
-Reid <reidyaro@gmail.com> Reid <reid@Chlian>
-Reid <reidyaro@gmail.com> Reid Yaro <reid@Julie>
-Reid <reidyaro@gmail.com> Reid <reid@IdeaPad.(none)>
-gumi <git@gumi.ca> gumi <mekolat@users.noreply.github.com>
+Alige <aligetmw@hotmail.fr> ali-g Ali-G <gauvain.dauchy@free.fr>
+Alige <aligetmw@hotmail.fr> Ali-G <gauvain@devil.(none)>
+Alige <aligetmw@hotmail.fr> alige Ali-G <aligetmw@hotmail.fr>
+Ben Longbons <b.r.longbons@gmail.com> o11c <b.r.longbons@gmail.com>
+Bjørn Lindeijer <bjorn@lindeijer.nl> Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
+Bjørn Lindeijer <bjorn@lindeijer.nl> Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
+Cassy1 <cassy.tmw@gmail.com> Cassy <cassy.tmw@gmail.com>
+Chuck Miller <shadowmil@gmail.com> Charles Miller <shadowmil@gmail.com>
+Coffee <coffee@coffee-EP45-UD3L.(none)> coffee <coffee@coffee-EP45-UD3L.(none)>
+Coffee <coffee@coffee-EP45-UD3L.(none)> Coffee <coffee@coffee-ep45-ud3l.(none)>
+Coffee <coffee@coffee-EP45-UD3L.(none)> cafe <cafe@cafe-EP45-UD3L.(none)>
+Darky <dark_mage.87@mail.ru> Dark_Mage <dark_mage.87@mail.ru>
+Darky <dark_mage.87@mail.ru> Darky <developer@Pirat.(none)>
+Darky <dark_mage.87@mail.ru> Darky <rf_online@mail.ru>
+Darky <dark_mage.87@mail.ru> Developer <developer@Pirat.(none)>
+David Gay <oddshocks@riseup.net> David Gay <oddshocks@gmail.com>
+Dennis Friis <peavey@inspircd.org> Dennis Friis <peavey@placid.dk>
+Dennis Friis <peavey@inspircd.org> peavey <peavey@inspircd.org>
+Enchilado <crunchy@crunchy-Satellite-L300.(none)> crunchy <crunchy@crunchy-Satellite-L300.(none)>
+Enchilado <crunchy@crunchy-Satellite-L300.(none)> Enchilado <crunchy@crunchy-satellite-l300.(none)>
+Enchilado <crunchy@crunchy-Satellite-L300.(none)> Enchilado <pheonixvania@gmail.com>
+Enchilado <crunchy@crunchy-Satellite-L300.(none)> enchilado <www.e.sayers@gmail.com>
+Fate <fate-tmw@googlemail.com> Fate <fate@kino.cs.colorado.edu>
+Fate <fate-tmw@googlemail.com> Fate <fate.tmw@googlemail.com>
+Freeyorp <Freeyorp101@hotmail.com> Freeyorp <freeyorp101@hotmail.com>
+Freeyorp <Freeyorp101@hotmail.com> Freeyorp <Freeyorp101@NOSPAM@hotmail.com>
+Freeyorp <Freeyorp101@hotmail.com> Freeyorp <TheFreeYorp+github@gmail.com>
+<git@gumi.ca> <mekolat@users.noreply.github.com>
+<git@gumi.ca> <mekolat@gmail.com>
+gumi <git@gumi.ca> meko <git@gumi.ca>
+gumi <git@gumi.ca> mekolat <git@gumi.ca>
 Hal9000 <miglietta.francesco@gmail.com> Hal9OOO <miglietta.francesco@gmail.com>
 Hal9000 <miglietta.francesco@gmail.com> Hal9OOO (Francesco Miglietta) <miglietta.francesco@gmail.com>
 Hal9000 <miglietta.francesco@gmail.com> epoc <epoc@hal9000.(none)>
 Hal9000 <miglietta.francesco@gmail.com> <epoc@halthink.(none)>
+jak1 <jak1@germantmw.de> jak1 <jak89_1@ftb4u.de>
+jak1 <mike.wollmann@gmail.com> Mike <mikewollmann@gmail.com>
+Jarrett Thomas-Huxley <fotherjarrett@gmail.com> fother <fotherjarrett@gmail.com>
+Jessica Tölke <jtoelke@mail.upb.de> jtoelke <jtoelke@gmx.de>
+Jesusaves <jesusalva@themanaworld.org> Jesusaves <cpntb1@ymail.com>
+Jesusaves <jesusalva@themanaworld.org> Jonatas L. Nogueira <cpntb1@ymail.com>
+Joseph Greene <fluffyanddeadly999@gmail.com> Pihro <fluffyanddeadly999@gmail.com>
+Kurt Kuschinski <hocus@themanaworld.org> Hocus <hocus@themanaworld.org>
+Kurt Kuschinski <hocus@themanaworld.org> Kurt Kuschinski <kurt.kuschinski@gmail.com>
+Ledmitz <ledmitz@gmail.com> Ledmitz <smoothshifter@tuta.io>
+meways <mewaysID@yahoo.com> Meway <meway@meway.dyndns.org>
+meways <mewaysID@yahoo.com> meways <mewaysid@yahoo.com>
 Micksha <ms-shaman@gmx.de> Micksha <Micksha@users.noreply.github.com>
-omatt <m.vuoso@laposte.net> omattornot <m.vuoso@laposte.net>
-omatt <m.vuoso@laposte.net> omatt <m.vuoso@laposte.net>
-gumi <git@gumi.ca> mekolat <mekolat@users.noreply.github.com>
-wushin <pasekei@gmail.com> Wushin <pasekei@gmail.com>
+Mikko <mikko.devel@gmail.com> Mikko <mikko@debian>
 Monwarez <monwarez@gmail.com> Thibault Payet <monwarez@gmail.com>
 Monwarez <monwarez@gmail.com> User Monwarez <monwarez@gmail.com>
+Monwarez <monwarez@gmail.com> monwarez <monwarez@users.noreply.github.com>
+omatt <m.vuoso@laposte.net> omattornot <m.vuoso@laposte.net>
+omatt <m.vuoso@laposte.net> omatt <m.vuoso@laposte.net>
+Reid <reidyaro@gmail.com> Reid Yaro <reidyaro@gmail.com>
+Reid <reidyaro@gmail.com> Reid <reid@Chlian>
+Reid <reidyaro@gmail.com> Reid Yaro <reid@Julie>
+Reid <reidyaro@gmail.com> Reid <reid@IdeaPad.(none)>
+remoitnane <remoit(DOT)nane(AT)gmail(DOT)com> No Name <remoit(DOT)nane(AT)gmail(DOT)com>
+remoitnane <remoit(DOT)nane(AT)gmail(DOT)com> remoitnane <remoit(dot)nane(at)gmail(dot)com>
+Saweres <onshine20@gmail.com> root <root@saweres.localdomain>
+Stefan Dombrowski <stefan@uni-bonn.de> Stefan Dombrowski <sdo451@gmail.com>
+The Kandiman <thekandiman@gmail.com> The Kandiman <kandiman@kandiman.(none)>
+The Kandiman <thekandiman@gmail.com> TheKandiman <thekandiman@gmail.com>
 Vasily_Makarov <danilka.pro@gmail.com> Dan Sagunov <danilka.pro@gmail.com>
 Vasily_Makarov <danilka.pro@gmail.com> Dan Sagunov <dan@archdemon.(none)>
 Vasily_Makarov <danilka.pro@gmail.com> dan <dan@dan-P41-ES3G.(none)>
 Vasily_Makarov <danilka.pro@gmail.com> Vasily <danilka.pro@gmail.com>
-Akko Teru <none@null.nil> Teru <9bi at [comc]ast dot net>
-jak1 <jak1@germantmw.de> jak1 <jak89_1@ftb4u.de>
-Kurt Kuschinski <hocus@themanaworld.org> Hocus <hocus@themanaworld.org>
-Kurt Kuschinski <hocus@themanaworld.org> Kurt Kuschinski <kurt.kuschinski@gmail.com>
-Saweres <onshine20@gmail.com> root <root@saweres.localdomain>
-Mikko <mikko.devel@gmail.com> Mikko <mikko@debian>
-Ledmitz <ledmitz@gmail.com> Ledmitz <smoothshifter@tuta.io>
-
+WildX <wildx@evolonline.org> WildX001 <wildx@evolonline.org>
+Wombat <hpwombat@yahoo.com> brokendoor <brokendoor@brokendoor-desktop.(none)>
+wushin <pasekei@gmail.com> Wushin <pasekei@gmail.com>
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a2cea500..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-sudo: false
-dist: trusty
-language: c
-compiler: clang
-
-addons:
-  apt:
-    packages:
-    - zlibc
-
-env:
-  - UPDATE_DIR=../../../public UPDATE_HTTP=none
-
-script:
-  - mkdir public
-  - make updates
-  - make news
-  - cp -v world/map/news.txt public/
-  - cp -v world/map/news.html public/
-  - cp -v world/map/news.rss public/
-  - cp -v world/map/news.json public/
-  - echo '<title>static update server</title><a href="TMW.zip">TMW.zip</a><br><a href="TMW-music.zip">TMW-music.zip</a><br><a href="news.txt">news.txt</a><br><a href="resources.xml">resources.xml</a>' > public/index.html
-
-deploy:
-  provider: pages
-  skip-cleanup: true
-  github-token: $GITHUB_TOKEN  # Set in travis-ci.org dashboard, marked secure
-  keep-history: false
-  local-dir: public
-  target-branch: gh-pages
-  on:
-    branch: stable
diff --git a/conf/.gitignore b/conf/.gitignore
deleted file mode 100644
index 2c43e911..00000000
--- a/conf/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*_local.conf
diff --git a/conf/monitor_athena.conf b/conf/monitor_athena.conf
deleted file mode 100644
index 68fe65f6..00000000
--- a/conf/monitor_athena.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-// Athena Monitor configuration file.
-
-//////////////////////////////////////////////////////////////////////
-// Some notes about the existence of this file:
-//
-// tmwa-monitor is unused in its current form, but plans are
-// to resurrect it in *some* form. See below for what we do use.
-// However, an alternative possibility would be to just install config
-// files to integrate with some existing daemon-monitoring tool.
-//
-// THAT SAID, blindly restarting a server that exited in an unknown
-// way is a really great way to get unrecoverable savefile corruption.
-// For this reason, we only auto-restart the map server, which only
-// persists some unimportant global variables such as high scores.
-// Besides, the other servers are stable enough that they rarely crash.
-//
-// This monitor names three "server"s, but they are just arbitrary.
-// This is not enough for the case of multiple worlds,
-// and is too much for the case of worlds running as different users.
-//
-// Currently the server variables are pointing to local shell scripts
-// (which are themselves deprecated and print a flashing message),
-// which is necessary because the actual servers need to be run inside
-// the appropriate dir to read conf and read/write savefiles from/to
-// the correct location. This will get better once savefiles get put
-// in $localstatedir (i.e. /var), but it's not yet known how that
-// should interact with multiple worlds running at the same time.
-//
-// Likely, however, this will depend on the ability to pass a config
-// file as an argument to the servers.
-//
-// The workdir setting would make a lot more sense if this file was
-// installed in $sysconfdir (i.e. /etc) by tmwa's `make install`,
-// which is still planned but hasn't happened yet, but makes *less*
-// sense if the servers install their config there.
-//
-// And regardless, we need to allow per-server workdirs, including
-// multiple instances, and possible pre/post scripts and exit/signal
-// status handlers. But all that seems complicated, leading back to
-// "shouldn't we just use an existing daemon manager?".
-//
-// Alternatively, we could act like an XDG application, which is
-// admittedly somewhat odd if you're a daemon, but would at least
-// clarify what happens if you run the servers as a user (which we
-// do always. When an init script is written, it should run as
-// somebody other than root!).
-//
-//////////////////////////////////////////////////////////////////////
-//
-// What we actually use instead of tmwa-monitor:
-//
-// On the main server, we run a tmux session, with one window
-// for each server and for each bot. The servers are run directly
-// from inside the appropriate directory.
-//
-// The test server is like the main server without bots, but instead
-// of running `tmwa-map` directly, we use the tmwa-map-wrapper script
-// from tools/, which restarts the server whenever it exits and merges
-// tagged patches from github, except that it does no merges if the
-// server exited too quickly after the restart.
-//
-// On local dev machines, we usually use the `./run-all` script from
-// this repo.
-//
-//////////////////////////////////////////////////////////////////////
-
-
-// Binary to use with message "forked login server".
-login_server: ./login-server
-
-// Binary to use with message "forked char server".
-char_server: ./char-server
-
-// Binary to use with message "forked map server".
-map_server: ./map-server
-
-// Directory in which to run the servers.
-// If never set, dynamically computed as $HOME/tmwserver
-//workdir: /path/to/tmwa-server-data
-
-// local settings for this nonserver in this file
-import: conf/monitor_local.conf
diff --git a/conf/monitor_local.conf.example b/conf/monitor_local.conf.example
deleted file mode 100644
index 32d168db..00000000
--- a/conf/monitor_local.conf.example
+++ /dev/null
@@ -1 +0,0 @@
-// Athena Monitor local configuration file.
diff --git a/conf/tmwa-monitor.conf b/conf/tmwa-monitor.conf
deleted file mode 100644
index db630d47..00000000
--- a/conf/tmwa-monitor.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-// Master config file for The Mana World Athena (monitor component)
-// This file is used since version 14.x.y, but major changes in 15.x.y
-
-// tmwa-monitor is deprecated, see comments in the below file
-
-monitor_conf: conf/monitor_athena.conf