From f5f75bd04de894ba9f99ca3602a6cfabec0b1096 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 18 Dec 2021 11:32:34 +0100
Subject: [PATCH] Start refactor contrib folder

---
 evennia/contrib/base_systems/README.md                   | 3 +++
 evennia/contrib/{ => base_systems}/awsstorage/README.md  | 0
 .../contrib/{ => base_systems}/awsstorage/__init__.py    | 0
 .../contrib/{ => base_systems}/awsstorage/aws_s3_cdn.py  | 0
 evennia/contrib/{ => base_systems}/awsstorage/tests.py   | 0
 evennia/contrib/{ => base_systems}/building_menu.py      | 0
 evennia/contrib/{ => base_systems}/color_markups.py      | 0
 evennia/contrib/{ => base_systems}/custom_gametime.py    | 0
 evennia/contrib/{ => base_systems}/email_login.py        | 0
 .../contrib/{ => base_systems}/ingame_python/README.md   | 0
 .../{crafting => base_systems/ingame_python}/__init__.py | 0
 .../{ => base_systems}/ingame_python/callbackhandler.py  | 0
 .../contrib/{ => base_systems}/ingame_python/commands.py | 0
 .../{ => base_systems}/ingame_python/eventfuncs.py       | 0
 .../contrib/{ => base_systems}/ingame_python/scripts.py  | 0
 .../contrib/{ => base_systems}/ingame_python/tests.py    | 0
 .../{ => base_systems}/ingame_python/typeclasses.py      | 0
 .../contrib/{ => base_systems}/ingame_python/utils.py    | 0
 evennia/contrib/{ => base_systems}/menu_login.py         | 0
 evennia/contrib/{ => base_systems}/mux_comms_cmds.py     | 0
 evennia/contrib/{ => base_systems}/puzzles.py            | 0
 evennia/contrib/{ => base_systems}/unixcommand.py        | 0
 evennia/contrib/full_systems/README.md                   | 3 +++
 evennia/contrib/{ => full_systems}/evscaperoom/README.md | 0
 .../contrib/{ => full_systems}/evscaperoom/__init__.py   | 0
 .../contrib/{ => full_systems}/evscaperoom/commands.py   | 0
 evennia/contrib/{ => full_systems}/evscaperoom/menu.py   | 0
 .../contrib/{ => full_systems}/evscaperoom/objects.py    | 0
 evennia/contrib/{ => full_systems}/evscaperoom/room.py   | 0
 .../contrib/{ => full_systems}/evscaperoom/scripts.py    | 0
 evennia/contrib/{ => full_systems}/evscaperoom/state.py  | 0
 .../{ => full_systems}/evscaperoom/states/README.md      | 0
 .../evscaperoom/states/state_001_start.py                | 0
 evennia/contrib/{ => full_systems}/evscaperoom/tests.py  | 0
 evennia/contrib/{ => full_systems}/evscaperoom/utils.py  | 0
 evennia/contrib/game_systems/README.md                   | 7 +++++++
 evennia/contrib/{ => game_systems}/barter.py             | 0
 evennia/contrib/{ => game_systems}/clothing.py           | 0
 evennia/contrib/{ => game_systems}/cooldowns.py          | 0
 evennia/contrib/{ => game_systems}/crafting/README.md    | 0
 .../{ingame_python => game_systems/crafting}/__init__.py | 0
 evennia/contrib/{ => game_systems}/crafting/crafting.py  | 0
 .../{ => game_systems}/crafting/example_recipes.py       | 0
 evennia/contrib/{ => game_systems}/crafting/tests.py     | 0
 evennia/contrib/{ => game_systems}/gendersub.py          | 0
 evennia/contrib/{ => game_systems}/mail.py               | 0
 evennia/contrib/{ => game_systems}/multidescer.py        | 0
 evennia/contrib/{ => game_systems}/turnbattle/README.md  | 0
 .../contrib/{ => game_systems}/turnbattle/__init__.py    | 0
 .../contrib/{ => game_systems}/turnbattle/tb_basic.py    | 0
 .../contrib/{ => game_systems}/turnbattle/tb_equip.py    | 0
 .../contrib/{ => game_systems}/turnbattle/tb_items.py    | 0
 .../contrib/{ => game_systems}/turnbattle/tb_magic.py    | 0
 .../contrib/{ => game_systems}/turnbattle/tb_range.py    | 0
 evennia/contrib/grid/README.md                           | 3 +++
 evennia/contrib/{ => grid}/extended_room.py              | 0
 evennia/contrib/{ => grid}/mapbuilder.py                 | 0
 evennia/contrib/{ => grid}/simpledoor.py                 | 0
 evennia/contrib/{ => grid}/slow_exit.py                  | 0
 evennia/contrib/{ => grid}/wilderness.py                 | 0
 evennia/contrib/{ => grid}/xyzgrid/README.md             | 0
 evennia/contrib/{security => grid/xyzgrid}/__init__.py   | 0
 evennia/contrib/{ => grid}/xyzgrid/commands.py           | 0
 evennia/contrib/{ => grid}/xyzgrid/example.py            | 0
 evennia/contrib/{ => grid}/xyzgrid/launchcmd.py          | 0
 evennia/contrib/{ => grid}/xyzgrid/prototypes.py         | 0
 evennia/contrib/{ => grid}/xyzgrid/tests.py              | 4 ++--
 evennia/contrib/{ => grid}/xyzgrid/utils.py              | 0
 evennia/contrib/{ => grid}/xyzgrid/xymap.py              | 0
 evennia/contrib/{ => grid}/xyzgrid/xymap_legend.py       | 0
 evennia/contrib/{ => grid}/xyzgrid/xyzgrid.py            | 0
 evennia/contrib/{ => grid}/xyzgrid/xyzroom.py            | 0
 evennia/contrib/rpg/README.md                            | 9 +++++++++
 evennia/contrib/{ => rpg}/chargen.py                     | 0
 evennia/contrib/{ => rpg}/dice.py                        | 0
 evennia/contrib/{ => rpg}/health_bar.py                  | 0
 evennia/contrib/{ => rpg}/rplanguage.py                  | 0
 evennia/contrib/{ => rpg}/rpsystem.py                    | 0
 evennia/contrib/{ => rpg}/talking_npc.py                 | 0
 evennia/contrib/{ => rpg}/test_traits.py                 | 0
 evennia/contrib/{ => rpg}/traits.py                      | 0
 evennia/contrib/tutorials/README.md                      | 4 ++++
 .../auditing => tutorials/tutorial_examples}/__init__.py | 0
 .../{ => tutorials}/tutorial_examples/bodyfunctions.py   | 0
 .../tutorial_examples/example_batch_cmds.ev              | 0
 .../tutorial_examples/example_batch_code.py              | 0
 .../contrib/{ => tutorials}/tutorial_examples/mirror.py  | 0
 .../{ => tutorials}/tutorial_examples/red_button.py      | 0
 .../contrib/{ => tutorials}/tutorial_examples/tests.py   | 0
 evennia/contrib/{ => tutorials}/tutorial_world/README.md | 0
 .../contrib/{ => tutorials}/tutorial_world/__init__.py   | 0
 evennia/contrib/{ => tutorials}/tutorial_world/build.ev  | 0
 .../contrib/{ => tutorials}/tutorial_world/intro_menu.py | 0
 evennia/contrib/{ => tutorials}/tutorial_world/mob.py    | 0
 .../contrib/{ => tutorials}/tutorial_world/objects.py    | 0
 evennia/contrib/{ => tutorials}/tutorial_world/rooms.py  | 0
 evennia/contrib/utils/README.md                          | 3 +++
 evennia/contrib/{ => utils}/fieldfill.py                 | 0
 evennia/contrib/{ => utils}/random_string_generator.py   | 0
 evennia/contrib/{ => utils}/tree_select.py               | 0
 evennia/{contrib => utils}/security/README.md            | 0
 .../tutorial_examples => utils/security}/__init__.py     | 0
 evennia/{contrib => utils}/security/auditing/README.md   | 0
 .../xyzgrid => utils/security/auditing}/__init__.py      | 0
 evennia/{contrib => utils}/security/auditing/outputs.py  | 0
 evennia/{contrib => utils}/security/auditing/server.py   | 0
 evennia/{contrib => utils}/security/auditing/tests.py    | 0
 107 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 evennia/contrib/base_systems/README.md
 rename evennia/contrib/{ => base_systems}/awsstorage/README.md (100%)
 rename evennia/contrib/{ => base_systems}/awsstorage/__init__.py (100%)
 rename evennia/contrib/{ => base_systems}/awsstorage/aws_s3_cdn.py (100%)
 rename evennia/contrib/{ => base_systems}/awsstorage/tests.py (100%)
 rename evennia/contrib/{ => base_systems}/building_menu.py (100%)
 rename evennia/contrib/{ => base_systems}/color_markups.py (100%)
 rename evennia/contrib/{ => base_systems}/custom_gametime.py (100%)
 rename evennia/contrib/{ => base_systems}/email_login.py (100%)
 rename evennia/contrib/{ => base_systems}/ingame_python/README.md (100%)
 rename evennia/contrib/{crafting => base_systems/ingame_python}/__init__.py (100%)
 rename evennia/contrib/{ => base_systems}/ingame_python/callbackhandler.py (100%)
 rename evennia/contrib/{ => base_systems}/ingame_python/commands.py (100%)
 rename evennia/contrib/{ => base_systems}/ingame_python/eventfuncs.py (100%)
 rename evennia/contrib/{ => base_systems}/ingame_python/scripts.py (100%)
 rename evennia/contrib/{ => base_systems}/ingame_python/tests.py (100%)
 rename evennia/contrib/{ => base_systems}/ingame_python/typeclasses.py (100%)
 rename evennia/contrib/{ => base_systems}/ingame_python/utils.py (100%)
 rename evennia/contrib/{ => base_systems}/menu_login.py (100%)
 rename evennia/contrib/{ => base_systems}/mux_comms_cmds.py (100%)
 rename evennia/contrib/{ => base_systems}/puzzles.py (100%)
 rename evennia/contrib/{ => base_systems}/unixcommand.py (100%)
 create mode 100644 evennia/contrib/full_systems/README.md
 rename evennia/contrib/{ => full_systems}/evscaperoom/README.md (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/__init__.py (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/commands.py (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/menu.py (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/objects.py (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/room.py (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/scripts.py (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/state.py (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/states/README.md (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/states/state_001_start.py (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/tests.py (100%)
 rename evennia/contrib/{ => full_systems}/evscaperoom/utils.py (100%)
 create mode 100644 evennia/contrib/game_systems/README.md
 rename evennia/contrib/{ => game_systems}/barter.py (100%)
 rename evennia/contrib/{ => game_systems}/clothing.py (100%)
 rename evennia/contrib/{ => game_systems}/cooldowns.py (100%)
 rename evennia/contrib/{ => game_systems}/crafting/README.md (100%)
 rename evennia/contrib/{ingame_python => game_systems/crafting}/__init__.py (100%)
 rename evennia/contrib/{ => game_systems}/crafting/crafting.py (100%)
 rename evennia/contrib/{ => game_systems}/crafting/example_recipes.py (100%)
 rename evennia/contrib/{ => game_systems}/crafting/tests.py (100%)
 rename evennia/contrib/{ => game_systems}/gendersub.py (100%)
 rename evennia/contrib/{ => game_systems}/mail.py (100%)
 rename evennia/contrib/{ => game_systems}/multidescer.py (100%)
 rename evennia/contrib/{ => game_systems}/turnbattle/README.md (100%)
 rename evennia/contrib/{ => game_systems}/turnbattle/__init__.py (100%)
 rename evennia/contrib/{ => game_systems}/turnbattle/tb_basic.py (100%)
 rename evennia/contrib/{ => game_systems}/turnbattle/tb_equip.py (100%)
 rename evennia/contrib/{ => game_systems}/turnbattle/tb_items.py (100%)
 rename evennia/contrib/{ => game_systems}/turnbattle/tb_magic.py (100%)
 rename evennia/contrib/{ => game_systems}/turnbattle/tb_range.py (100%)
 create mode 100644 evennia/contrib/grid/README.md
 rename evennia/contrib/{ => grid}/extended_room.py (100%)
 rename evennia/contrib/{ => grid}/mapbuilder.py (100%)
 rename evennia/contrib/{ => grid}/simpledoor.py (100%)
 rename evennia/contrib/{ => grid}/slow_exit.py (100%)
 rename evennia/contrib/{ => grid}/wilderness.py (100%)
 rename evennia/contrib/{ => grid}/xyzgrid/README.md (100%)
 rename evennia/contrib/{security => grid/xyzgrid}/__init__.py (100%)
 rename evennia/contrib/{ => grid}/xyzgrid/commands.py (100%)
 rename evennia/contrib/{ => grid}/xyzgrid/example.py (100%)
 rename evennia/contrib/{ => grid}/xyzgrid/launchcmd.py (100%)
 rename evennia/contrib/{ => grid}/xyzgrid/prototypes.py (100%)
 rename evennia/contrib/{ => grid}/xyzgrid/tests.py (99%)
 rename evennia/contrib/{ => grid}/xyzgrid/utils.py (100%)
 rename evennia/contrib/{ => grid}/xyzgrid/xymap.py (100%)
 rename evennia/contrib/{ => grid}/xyzgrid/xymap_legend.py (100%)
 rename evennia/contrib/{ => grid}/xyzgrid/xyzgrid.py (100%)
 rename evennia/contrib/{ => grid}/xyzgrid/xyzroom.py (100%)
 create mode 100644 evennia/contrib/rpg/README.md
 rename evennia/contrib/{ => rpg}/chargen.py (100%)
 rename evennia/contrib/{ => rpg}/dice.py (100%)
 rename evennia/contrib/{ => rpg}/health_bar.py (100%)
 rename evennia/contrib/{ => rpg}/rplanguage.py (100%)
 rename evennia/contrib/{ => rpg}/rpsystem.py (100%)
 rename evennia/contrib/{ => rpg}/talking_npc.py (100%)
 rename evennia/contrib/{ => rpg}/test_traits.py (100%)
 rename evennia/contrib/{ => rpg}/traits.py (100%)
 create mode 100644 evennia/contrib/tutorials/README.md
 rename evennia/contrib/{security/auditing => tutorials/tutorial_examples}/__init__.py (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_examples/bodyfunctions.py (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_examples/example_batch_cmds.ev (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_examples/example_batch_code.py (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_examples/mirror.py (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_examples/red_button.py (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_examples/tests.py (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_world/README.md (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_world/__init__.py (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_world/build.ev (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_world/intro_menu.py (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_world/mob.py (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_world/objects.py (100%)
 rename evennia/contrib/{ => tutorials}/tutorial_world/rooms.py (100%)
 create mode 100644 evennia/contrib/utils/README.md
 rename evennia/contrib/{ => utils}/fieldfill.py (100%)
 rename evennia/contrib/{ => utils}/random_string_generator.py (100%)
 rename evennia/contrib/{ => utils}/tree_select.py (100%)
 rename evennia/{contrib => utils}/security/README.md (100%)
 rename evennia/{contrib/tutorial_examples => utils/security}/__init__.py (100%)
 rename evennia/{contrib => utils}/security/auditing/README.md (100%)
 rename evennia/{contrib/xyzgrid => utils/security/auditing}/__init__.py (100%)
 rename evennia/{contrib => utils}/security/auditing/outputs.py (100%)
 rename evennia/{contrib => utils}/security/auditing/server.py (100%)
 rename evennia/{contrib => utils}/security/auditing/tests.py (100%)

diff --git a/evennia/contrib/base_systems/README.md b/evennia/contrib/base_systems/README.md
new file mode 100644
index 0000000000..b35b2f5d7c
--- /dev/null
+++ b/evennia/contrib/base_systems/README.md
@@ -0,0 +1,3 @@
+# Base-system contribs
+
+Server/admin-related functionality changes and systems.
diff --git a/evennia/contrib/awsstorage/README.md b/evennia/contrib/base_systems/awsstorage/README.md
similarity index 100%
rename from evennia/contrib/awsstorage/README.md
rename to evennia/contrib/base_systems/awsstorage/README.md
diff --git a/evennia/contrib/awsstorage/__init__.py b/evennia/contrib/base_systems/awsstorage/__init__.py
similarity index 100%
rename from evennia/contrib/awsstorage/__init__.py
rename to evennia/contrib/base_systems/awsstorage/__init__.py
diff --git a/evennia/contrib/awsstorage/aws_s3_cdn.py b/evennia/contrib/base_systems/awsstorage/aws_s3_cdn.py
similarity index 100%
rename from evennia/contrib/awsstorage/aws_s3_cdn.py
rename to evennia/contrib/base_systems/awsstorage/aws_s3_cdn.py
diff --git a/evennia/contrib/awsstorage/tests.py b/evennia/contrib/base_systems/awsstorage/tests.py
similarity index 100%
rename from evennia/contrib/awsstorage/tests.py
rename to evennia/contrib/base_systems/awsstorage/tests.py
diff --git a/evennia/contrib/building_menu.py b/evennia/contrib/base_systems/building_menu.py
similarity index 100%
rename from evennia/contrib/building_menu.py
rename to evennia/contrib/base_systems/building_menu.py
diff --git a/evennia/contrib/color_markups.py b/evennia/contrib/base_systems/color_markups.py
similarity index 100%
rename from evennia/contrib/color_markups.py
rename to evennia/contrib/base_systems/color_markups.py
diff --git a/evennia/contrib/custom_gametime.py b/evennia/contrib/base_systems/custom_gametime.py
similarity index 100%
rename from evennia/contrib/custom_gametime.py
rename to evennia/contrib/base_systems/custom_gametime.py
diff --git a/evennia/contrib/email_login.py b/evennia/contrib/base_systems/email_login.py
similarity index 100%
rename from evennia/contrib/email_login.py
rename to evennia/contrib/base_systems/email_login.py
diff --git a/evennia/contrib/ingame_python/README.md b/evennia/contrib/base_systems/ingame_python/README.md
similarity index 100%
rename from evennia/contrib/ingame_python/README.md
rename to evennia/contrib/base_systems/ingame_python/README.md
diff --git a/evennia/contrib/crafting/__init__.py b/evennia/contrib/base_systems/ingame_python/__init__.py
similarity index 100%
rename from evennia/contrib/crafting/__init__.py
rename to evennia/contrib/base_systems/ingame_python/__init__.py
diff --git a/evennia/contrib/ingame_python/callbackhandler.py b/evennia/contrib/base_systems/ingame_python/callbackhandler.py
similarity index 100%
rename from evennia/contrib/ingame_python/callbackhandler.py
rename to evennia/contrib/base_systems/ingame_python/callbackhandler.py
diff --git a/evennia/contrib/ingame_python/commands.py b/evennia/contrib/base_systems/ingame_python/commands.py
similarity index 100%
rename from evennia/contrib/ingame_python/commands.py
rename to evennia/contrib/base_systems/ingame_python/commands.py
diff --git a/evennia/contrib/ingame_python/eventfuncs.py b/evennia/contrib/base_systems/ingame_python/eventfuncs.py
similarity index 100%
rename from evennia/contrib/ingame_python/eventfuncs.py
rename to evennia/contrib/base_systems/ingame_python/eventfuncs.py
diff --git a/evennia/contrib/ingame_python/scripts.py b/evennia/contrib/base_systems/ingame_python/scripts.py
similarity index 100%
rename from evennia/contrib/ingame_python/scripts.py
rename to evennia/contrib/base_systems/ingame_python/scripts.py
diff --git a/evennia/contrib/ingame_python/tests.py b/evennia/contrib/base_systems/ingame_python/tests.py
similarity index 100%
rename from evennia/contrib/ingame_python/tests.py
rename to evennia/contrib/base_systems/ingame_python/tests.py
diff --git a/evennia/contrib/ingame_python/typeclasses.py b/evennia/contrib/base_systems/ingame_python/typeclasses.py
similarity index 100%
rename from evennia/contrib/ingame_python/typeclasses.py
rename to evennia/contrib/base_systems/ingame_python/typeclasses.py
diff --git a/evennia/contrib/ingame_python/utils.py b/evennia/contrib/base_systems/ingame_python/utils.py
similarity index 100%
rename from evennia/contrib/ingame_python/utils.py
rename to evennia/contrib/base_systems/ingame_python/utils.py
diff --git a/evennia/contrib/menu_login.py b/evennia/contrib/base_systems/menu_login.py
similarity index 100%
rename from evennia/contrib/menu_login.py
rename to evennia/contrib/base_systems/menu_login.py
diff --git a/evennia/contrib/mux_comms_cmds.py b/evennia/contrib/base_systems/mux_comms_cmds.py
similarity index 100%
rename from evennia/contrib/mux_comms_cmds.py
rename to evennia/contrib/base_systems/mux_comms_cmds.py
diff --git a/evennia/contrib/puzzles.py b/evennia/contrib/base_systems/puzzles.py
similarity index 100%
rename from evennia/contrib/puzzles.py
rename to evennia/contrib/base_systems/puzzles.py
diff --git a/evennia/contrib/unixcommand.py b/evennia/contrib/base_systems/unixcommand.py
similarity index 100%
rename from evennia/contrib/unixcommand.py
rename to evennia/contrib/base_systems/unixcommand.py
diff --git a/evennia/contrib/full_systems/README.md b/evennia/contrib/full_systems/README.md
new file mode 100644
index 0000000000..a33487f063
--- /dev/null
+++ b/evennia/contrib/full_systems/README.md
@@ -0,0 +1,3 @@
+# Full system contribs
+
+Contribs implementing a full/complete game engine.
diff --git a/evennia/contrib/evscaperoom/README.md b/evennia/contrib/full_systems/evscaperoom/README.md
similarity index 100%
rename from evennia/contrib/evscaperoom/README.md
rename to evennia/contrib/full_systems/evscaperoom/README.md
diff --git a/evennia/contrib/evscaperoom/__init__.py b/evennia/contrib/full_systems/evscaperoom/__init__.py
similarity index 100%
rename from evennia/contrib/evscaperoom/__init__.py
rename to evennia/contrib/full_systems/evscaperoom/__init__.py
diff --git a/evennia/contrib/evscaperoom/commands.py b/evennia/contrib/full_systems/evscaperoom/commands.py
similarity index 100%
rename from evennia/contrib/evscaperoom/commands.py
rename to evennia/contrib/full_systems/evscaperoom/commands.py
diff --git a/evennia/contrib/evscaperoom/menu.py b/evennia/contrib/full_systems/evscaperoom/menu.py
similarity index 100%
rename from evennia/contrib/evscaperoom/menu.py
rename to evennia/contrib/full_systems/evscaperoom/menu.py
diff --git a/evennia/contrib/evscaperoom/objects.py b/evennia/contrib/full_systems/evscaperoom/objects.py
similarity index 100%
rename from evennia/contrib/evscaperoom/objects.py
rename to evennia/contrib/full_systems/evscaperoom/objects.py
diff --git a/evennia/contrib/evscaperoom/room.py b/evennia/contrib/full_systems/evscaperoom/room.py
similarity index 100%
rename from evennia/contrib/evscaperoom/room.py
rename to evennia/contrib/full_systems/evscaperoom/room.py
diff --git a/evennia/contrib/evscaperoom/scripts.py b/evennia/contrib/full_systems/evscaperoom/scripts.py
similarity index 100%
rename from evennia/contrib/evscaperoom/scripts.py
rename to evennia/contrib/full_systems/evscaperoom/scripts.py
diff --git a/evennia/contrib/evscaperoom/state.py b/evennia/contrib/full_systems/evscaperoom/state.py
similarity index 100%
rename from evennia/contrib/evscaperoom/state.py
rename to evennia/contrib/full_systems/evscaperoom/state.py
diff --git a/evennia/contrib/evscaperoom/states/README.md b/evennia/contrib/full_systems/evscaperoom/states/README.md
similarity index 100%
rename from evennia/contrib/evscaperoom/states/README.md
rename to evennia/contrib/full_systems/evscaperoom/states/README.md
diff --git a/evennia/contrib/evscaperoom/states/state_001_start.py b/evennia/contrib/full_systems/evscaperoom/states/state_001_start.py
similarity index 100%
rename from evennia/contrib/evscaperoom/states/state_001_start.py
rename to evennia/contrib/full_systems/evscaperoom/states/state_001_start.py
diff --git a/evennia/contrib/evscaperoom/tests.py b/evennia/contrib/full_systems/evscaperoom/tests.py
similarity index 100%
rename from evennia/contrib/evscaperoom/tests.py
rename to evennia/contrib/full_systems/evscaperoom/tests.py
diff --git a/evennia/contrib/evscaperoom/utils.py b/evennia/contrib/full_systems/evscaperoom/utils.py
similarity index 100%
rename from evennia/contrib/evscaperoom/utils.py
rename to evennia/contrib/full_systems/evscaperoom/utils.py
diff --git a/evennia/contrib/game_systems/README.md b/evennia/contrib/game_systems/README.md
new file mode 100644
index 0000000000..27ae098a3c
--- /dev/null
+++ b/evennia/contrib/game_systems/README.md
@@ -0,0 +1,7 @@
+# Game-system contribs
+
+Other specific gameplay system, not necessesarily related to roleplay.
+
+Many of these system are commonly used in RPGs, to decide what goes here and in
+the `rpg/` folder, consider if these systems could _theoretically_ be used in a
+non-rpg MMO.
diff --git a/evennia/contrib/barter.py b/evennia/contrib/game_systems/barter.py
similarity index 100%
rename from evennia/contrib/barter.py
rename to evennia/contrib/game_systems/barter.py
diff --git a/evennia/contrib/clothing.py b/evennia/contrib/game_systems/clothing.py
similarity index 100%
rename from evennia/contrib/clothing.py
rename to evennia/contrib/game_systems/clothing.py
diff --git a/evennia/contrib/cooldowns.py b/evennia/contrib/game_systems/cooldowns.py
similarity index 100%
rename from evennia/contrib/cooldowns.py
rename to evennia/contrib/game_systems/cooldowns.py
diff --git a/evennia/contrib/crafting/README.md b/evennia/contrib/game_systems/crafting/README.md
similarity index 100%
rename from evennia/contrib/crafting/README.md
rename to evennia/contrib/game_systems/crafting/README.md
diff --git a/evennia/contrib/ingame_python/__init__.py b/evennia/contrib/game_systems/crafting/__init__.py
similarity index 100%
rename from evennia/contrib/ingame_python/__init__.py
rename to evennia/contrib/game_systems/crafting/__init__.py
diff --git a/evennia/contrib/crafting/crafting.py b/evennia/contrib/game_systems/crafting/crafting.py
similarity index 100%
rename from evennia/contrib/crafting/crafting.py
rename to evennia/contrib/game_systems/crafting/crafting.py
diff --git a/evennia/contrib/crafting/example_recipes.py b/evennia/contrib/game_systems/crafting/example_recipes.py
similarity index 100%
rename from evennia/contrib/crafting/example_recipes.py
rename to evennia/contrib/game_systems/crafting/example_recipes.py
diff --git a/evennia/contrib/crafting/tests.py b/evennia/contrib/game_systems/crafting/tests.py
similarity index 100%
rename from evennia/contrib/crafting/tests.py
rename to evennia/contrib/game_systems/crafting/tests.py
diff --git a/evennia/contrib/gendersub.py b/evennia/contrib/game_systems/gendersub.py
similarity index 100%
rename from evennia/contrib/gendersub.py
rename to evennia/contrib/game_systems/gendersub.py
diff --git a/evennia/contrib/mail.py b/evennia/contrib/game_systems/mail.py
similarity index 100%
rename from evennia/contrib/mail.py
rename to evennia/contrib/game_systems/mail.py
diff --git a/evennia/contrib/multidescer.py b/evennia/contrib/game_systems/multidescer.py
similarity index 100%
rename from evennia/contrib/multidescer.py
rename to evennia/contrib/game_systems/multidescer.py
diff --git a/evennia/contrib/turnbattle/README.md b/evennia/contrib/game_systems/turnbattle/README.md
similarity index 100%
rename from evennia/contrib/turnbattle/README.md
rename to evennia/contrib/game_systems/turnbattle/README.md
diff --git a/evennia/contrib/turnbattle/__init__.py b/evennia/contrib/game_systems/turnbattle/__init__.py
similarity index 100%
rename from evennia/contrib/turnbattle/__init__.py
rename to evennia/contrib/game_systems/turnbattle/__init__.py
diff --git a/evennia/contrib/turnbattle/tb_basic.py b/evennia/contrib/game_systems/turnbattle/tb_basic.py
similarity index 100%
rename from evennia/contrib/turnbattle/tb_basic.py
rename to evennia/contrib/game_systems/turnbattle/tb_basic.py
diff --git a/evennia/contrib/turnbattle/tb_equip.py b/evennia/contrib/game_systems/turnbattle/tb_equip.py
similarity index 100%
rename from evennia/contrib/turnbattle/tb_equip.py
rename to evennia/contrib/game_systems/turnbattle/tb_equip.py
diff --git a/evennia/contrib/turnbattle/tb_items.py b/evennia/contrib/game_systems/turnbattle/tb_items.py
similarity index 100%
rename from evennia/contrib/turnbattle/tb_items.py
rename to evennia/contrib/game_systems/turnbattle/tb_items.py
diff --git a/evennia/contrib/turnbattle/tb_magic.py b/evennia/contrib/game_systems/turnbattle/tb_magic.py
similarity index 100%
rename from evennia/contrib/turnbattle/tb_magic.py
rename to evennia/contrib/game_systems/turnbattle/tb_magic.py
diff --git a/evennia/contrib/turnbattle/tb_range.py b/evennia/contrib/game_systems/turnbattle/tb_range.py
similarity index 100%
rename from evennia/contrib/turnbattle/tb_range.py
rename to evennia/contrib/game_systems/turnbattle/tb_range.py
diff --git a/evennia/contrib/grid/README.md b/evennia/contrib/grid/README.md
new file mode 100644
index 0000000000..d1598c0f53
--- /dev/null
+++ b/evennia/contrib/grid/README.md
@@ -0,0 +1,3 @@
+# Grid contribs
+
+General contribs dealing with the game-world grid, maps and rooms.
diff --git a/evennia/contrib/extended_room.py b/evennia/contrib/grid/extended_room.py
similarity index 100%
rename from evennia/contrib/extended_room.py
rename to evennia/contrib/grid/extended_room.py
diff --git a/evennia/contrib/mapbuilder.py b/evennia/contrib/grid/mapbuilder.py
similarity index 100%
rename from evennia/contrib/mapbuilder.py
rename to evennia/contrib/grid/mapbuilder.py
diff --git a/evennia/contrib/simpledoor.py b/evennia/contrib/grid/simpledoor.py
similarity index 100%
rename from evennia/contrib/simpledoor.py
rename to evennia/contrib/grid/simpledoor.py
diff --git a/evennia/contrib/slow_exit.py b/evennia/contrib/grid/slow_exit.py
similarity index 100%
rename from evennia/contrib/slow_exit.py
rename to evennia/contrib/grid/slow_exit.py
diff --git a/evennia/contrib/wilderness.py b/evennia/contrib/grid/wilderness.py
similarity index 100%
rename from evennia/contrib/wilderness.py
rename to evennia/contrib/grid/wilderness.py
diff --git a/evennia/contrib/xyzgrid/README.md b/evennia/contrib/grid/xyzgrid/README.md
similarity index 100%
rename from evennia/contrib/xyzgrid/README.md
rename to evennia/contrib/grid/xyzgrid/README.md
diff --git a/evennia/contrib/security/__init__.py b/evennia/contrib/grid/xyzgrid/__init__.py
similarity index 100%
rename from evennia/contrib/security/__init__.py
rename to evennia/contrib/grid/xyzgrid/__init__.py
diff --git a/evennia/contrib/xyzgrid/commands.py b/evennia/contrib/grid/xyzgrid/commands.py
similarity index 100%
rename from evennia/contrib/xyzgrid/commands.py
rename to evennia/contrib/grid/xyzgrid/commands.py
diff --git a/evennia/contrib/xyzgrid/example.py b/evennia/contrib/grid/xyzgrid/example.py
similarity index 100%
rename from evennia/contrib/xyzgrid/example.py
rename to evennia/contrib/grid/xyzgrid/example.py
diff --git a/evennia/contrib/xyzgrid/launchcmd.py b/evennia/contrib/grid/xyzgrid/launchcmd.py
similarity index 100%
rename from evennia/contrib/xyzgrid/launchcmd.py
rename to evennia/contrib/grid/xyzgrid/launchcmd.py
diff --git a/evennia/contrib/xyzgrid/prototypes.py b/evennia/contrib/grid/xyzgrid/prototypes.py
similarity index 100%
rename from evennia/contrib/xyzgrid/prototypes.py
rename to evennia/contrib/grid/xyzgrid/prototypes.py
diff --git a/evennia/contrib/xyzgrid/tests.py b/evennia/contrib/grid/xyzgrid/tests.py
similarity index 99%
rename from evennia/contrib/xyzgrid/tests.py
rename to evennia/contrib/grid/xyzgrid/tests.py
index d0ed0cfd78..cf739c0e98 100644
--- a/evennia/contrib/xyzgrid/tests.py
+++ b/evennia/contrib/grid/xyzgrid/tests.py
@@ -852,7 +852,7 @@ class TestMap8(_MapTest):
 
         """
         mapstr = self.map.get_visual_range(coord, dist=dist, mode='nodes',
-                                           target=target, target_path_style=".",
+                                           target=target, target_path_style="",
                                            character='@',
                                            max_size=max_size)
         self.assertEqual(expected, mapstr.replace("||", "|"))
@@ -1016,7 +1016,7 @@ class TestMap11(_MapTest):
 
         """
         mapstr = self.map.get_visual_range(coord, dist=dist, mode='nodes',
-                                           target=target, target_path_style=".",
+                                           target=target, target_path_style="",
                                            character='@',
                                            max_size=max_size)
         self.assertEqual(expected, mapstr)
diff --git a/evennia/contrib/xyzgrid/utils.py b/evennia/contrib/grid/xyzgrid/utils.py
similarity index 100%
rename from evennia/contrib/xyzgrid/utils.py
rename to evennia/contrib/grid/xyzgrid/utils.py
diff --git a/evennia/contrib/xyzgrid/xymap.py b/evennia/contrib/grid/xyzgrid/xymap.py
similarity index 100%
rename from evennia/contrib/xyzgrid/xymap.py
rename to evennia/contrib/grid/xyzgrid/xymap.py
diff --git a/evennia/contrib/xyzgrid/xymap_legend.py b/evennia/contrib/grid/xyzgrid/xymap_legend.py
similarity index 100%
rename from evennia/contrib/xyzgrid/xymap_legend.py
rename to evennia/contrib/grid/xyzgrid/xymap_legend.py
diff --git a/evennia/contrib/xyzgrid/xyzgrid.py b/evennia/contrib/grid/xyzgrid/xyzgrid.py
similarity index 100%
rename from evennia/contrib/xyzgrid/xyzgrid.py
rename to evennia/contrib/grid/xyzgrid/xyzgrid.py
diff --git a/evennia/contrib/xyzgrid/xyzroom.py b/evennia/contrib/grid/xyzgrid/xyzroom.py
similarity index 100%
rename from evennia/contrib/xyzgrid/xyzroom.py
rename to evennia/contrib/grid/xyzgrid/xyzroom.py
diff --git a/evennia/contrib/rpg/README.md b/evennia/contrib/rpg/README.md
new file mode 100644
index 0000000000..7f7a93dc40
--- /dev/null
+++ b/evennia/contrib/rpg/README.md
@@ -0,0 +1,9 @@
+# Rpg contribs
+
+Contribs related to rpg mechanics, rules and roleplay. This is specifically for
+systems that help create a rpg character (chargens), store their stats and rule
+processing, dice rolling and roleplay facilitating.
+
+Generic combat systems and other game-related systems that are commonly used in
+rpgs but could _theoretically_ be used for other MMO-style games use the
+`game_systems` folder.`
diff --git a/evennia/contrib/chargen.py b/evennia/contrib/rpg/chargen.py
similarity index 100%
rename from evennia/contrib/chargen.py
rename to evennia/contrib/rpg/chargen.py
diff --git a/evennia/contrib/dice.py b/evennia/contrib/rpg/dice.py
similarity index 100%
rename from evennia/contrib/dice.py
rename to evennia/contrib/rpg/dice.py
diff --git a/evennia/contrib/health_bar.py b/evennia/contrib/rpg/health_bar.py
similarity index 100%
rename from evennia/contrib/health_bar.py
rename to evennia/contrib/rpg/health_bar.py
diff --git a/evennia/contrib/rplanguage.py b/evennia/contrib/rpg/rplanguage.py
similarity index 100%
rename from evennia/contrib/rplanguage.py
rename to evennia/contrib/rpg/rplanguage.py
diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpg/rpsystem.py
similarity index 100%
rename from evennia/contrib/rpsystem.py
rename to evennia/contrib/rpg/rpsystem.py
diff --git a/evennia/contrib/talking_npc.py b/evennia/contrib/rpg/talking_npc.py
similarity index 100%
rename from evennia/contrib/talking_npc.py
rename to evennia/contrib/rpg/talking_npc.py
diff --git a/evennia/contrib/test_traits.py b/evennia/contrib/rpg/test_traits.py
similarity index 100%
rename from evennia/contrib/test_traits.py
rename to evennia/contrib/rpg/test_traits.py
diff --git a/evennia/contrib/traits.py b/evennia/contrib/rpg/traits.py
similarity index 100%
rename from evennia/contrib/traits.py
rename to evennia/contrib/rpg/traits.py
diff --git a/evennia/contrib/tutorials/README.md b/evennia/contrib/tutorials/README.md
new file mode 100644
index 0000000000..ed098826ad
--- /dev/null
+++ b/evennia/contrib/tutorials/README.md
@@ -0,0 +1,4 @@
+# Tutorial contribs
+
+Resources specifically intended to help learn Evennia or particular concepts.
+Many of these accompany the official documentation.
diff --git a/evennia/contrib/security/auditing/__init__.py b/evennia/contrib/tutorials/tutorial_examples/__init__.py
similarity index 100%
rename from evennia/contrib/security/auditing/__init__.py
rename to evennia/contrib/tutorials/tutorial_examples/__init__.py
diff --git a/evennia/contrib/tutorial_examples/bodyfunctions.py b/evennia/contrib/tutorials/tutorial_examples/bodyfunctions.py
similarity index 100%
rename from evennia/contrib/tutorial_examples/bodyfunctions.py
rename to evennia/contrib/tutorials/tutorial_examples/bodyfunctions.py
diff --git a/evennia/contrib/tutorial_examples/example_batch_cmds.ev b/evennia/contrib/tutorials/tutorial_examples/example_batch_cmds.ev
similarity index 100%
rename from evennia/contrib/tutorial_examples/example_batch_cmds.ev
rename to evennia/contrib/tutorials/tutorial_examples/example_batch_cmds.ev
diff --git a/evennia/contrib/tutorial_examples/example_batch_code.py b/evennia/contrib/tutorials/tutorial_examples/example_batch_code.py
similarity index 100%
rename from evennia/contrib/tutorial_examples/example_batch_code.py
rename to evennia/contrib/tutorials/tutorial_examples/example_batch_code.py
diff --git a/evennia/contrib/tutorial_examples/mirror.py b/evennia/contrib/tutorials/tutorial_examples/mirror.py
similarity index 100%
rename from evennia/contrib/tutorial_examples/mirror.py
rename to evennia/contrib/tutorials/tutorial_examples/mirror.py
diff --git a/evennia/contrib/tutorial_examples/red_button.py b/evennia/contrib/tutorials/tutorial_examples/red_button.py
similarity index 100%
rename from evennia/contrib/tutorial_examples/red_button.py
rename to evennia/contrib/tutorials/tutorial_examples/red_button.py
diff --git a/evennia/contrib/tutorial_examples/tests.py b/evennia/contrib/tutorials/tutorial_examples/tests.py
similarity index 100%
rename from evennia/contrib/tutorial_examples/tests.py
rename to evennia/contrib/tutorials/tutorial_examples/tests.py
diff --git a/evennia/contrib/tutorial_world/README.md b/evennia/contrib/tutorials/tutorial_world/README.md
similarity index 100%
rename from evennia/contrib/tutorial_world/README.md
rename to evennia/contrib/tutorials/tutorial_world/README.md
diff --git a/evennia/contrib/tutorial_world/__init__.py b/evennia/contrib/tutorials/tutorial_world/__init__.py
similarity index 100%
rename from evennia/contrib/tutorial_world/__init__.py
rename to evennia/contrib/tutorials/tutorial_world/__init__.py
diff --git a/evennia/contrib/tutorial_world/build.ev b/evennia/contrib/tutorials/tutorial_world/build.ev
similarity index 100%
rename from evennia/contrib/tutorial_world/build.ev
rename to evennia/contrib/tutorials/tutorial_world/build.ev
diff --git a/evennia/contrib/tutorial_world/intro_menu.py b/evennia/contrib/tutorials/tutorial_world/intro_menu.py
similarity index 100%
rename from evennia/contrib/tutorial_world/intro_menu.py
rename to evennia/contrib/tutorials/tutorial_world/intro_menu.py
diff --git a/evennia/contrib/tutorial_world/mob.py b/evennia/contrib/tutorials/tutorial_world/mob.py
similarity index 100%
rename from evennia/contrib/tutorial_world/mob.py
rename to evennia/contrib/tutorials/tutorial_world/mob.py
diff --git a/evennia/contrib/tutorial_world/objects.py b/evennia/contrib/tutorials/tutorial_world/objects.py
similarity index 100%
rename from evennia/contrib/tutorial_world/objects.py
rename to evennia/contrib/tutorials/tutorial_world/objects.py
diff --git a/evennia/contrib/tutorial_world/rooms.py b/evennia/contrib/tutorials/tutorial_world/rooms.py
similarity index 100%
rename from evennia/contrib/tutorial_world/rooms.py
rename to evennia/contrib/tutorials/tutorial_world/rooms.py
diff --git a/evennia/contrib/utils/README.md b/evennia/contrib/utils/README.md
new file mode 100644
index 0000000000..d30dbbcb64
--- /dev/null
+++ b/evennia/contrib/utils/README.md
@@ -0,0 +1,3 @@
+# Utility contribs
+
+Various utilities to plug in and use anywhere.
diff --git a/evennia/contrib/fieldfill.py b/evennia/contrib/utils/fieldfill.py
similarity index 100%
rename from evennia/contrib/fieldfill.py
rename to evennia/contrib/utils/fieldfill.py
diff --git a/evennia/contrib/random_string_generator.py b/evennia/contrib/utils/random_string_generator.py
similarity index 100%
rename from evennia/contrib/random_string_generator.py
rename to evennia/contrib/utils/random_string_generator.py
diff --git a/evennia/contrib/tree_select.py b/evennia/contrib/utils/tree_select.py
similarity index 100%
rename from evennia/contrib/tree_select.py
rename to evennia/contrib/utils/tree_select.py
diff --git a/evennia/contrib/security/README.md b/evennia/utils/security/README.md
similarity index 100%
rename from evennia/contrib/security/README.md
rename to evennia/utils/security/README.md
diff --git a/evennia/contrib/tutorial_examples/__init__.py b/evennia/utils/security/__init__.py
similarity index 100%
rename from evennia/contrib/tutorial_examples/__init__.py
rename to evennia/utils/security/__init__.py
diff --git a/evennia/contrib/security/auditing/README.md b/evennia/utils/security/auditing/README.md
similarity index 100%
rename from evennia/contrib/security/auditing/README.md
rename to evennia/utils/security/auditing/README.md
diff --git a/evennia/contrib/xyzgrid/__init__.py b/evennia/utils/security/auditing/__init__.py
similarity index 100%
rename from evennia/contrib/xyzgrid/__init__.py
rename to evennia/utils/security/auditing/__init__.py
diff --git a/evennia/contrib/security/auditing/outputs.py b/evennia/utils/security/auditing/outputs.py
similarity index 100%
rename from evennia/contrib/security/auditing/outputs.py
rename to evennia/utils/security/auditing/outputs.py
diff --git a/evennia/contrib/security/auditing/server.py b/evennia/utils/security/auditing/server.py
similarity index 100%
rename from evennia/contrib/security/auditing/server.py
rename to evennia/utils/security/auditing/server.py
diff --git a/evennia/contrib/security/auditing/tests.py b/evennia/utils/security/auditing/tests.py
similarity index 100%
rename from evennia/contrib/security/auditing/tests.py
rename to evennia/utils/security/auditing/tests.py