From a65a176ba0c33d7b58fd88a3fab675aa33f40707 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 1 Jun 2012 17:40:25 -0700
Subject: [PATCH] rename the example world. It is now called "Arda" (another
 Tolkien name)

---
 game/eressea.ini                              |  2 +-
 game/setup.lua                                | 10 +++++-----
 res/{catalog-example.xml => catalog-arda.xml} |  2 +-
 res/{config-example.xml => config-arda.xml}   | 12 ++++++------
 scripts/{example => arda}/main.lua            |  0
 scripts/arda/modules.lua                      | 10 ++++++++++
 scripts/{example => arda}/rules.lua           |  0
 scripts/example/modules.lua                   | 10 ----------
 8 files changed, 23 insertions(+), 23 deletions(-)
 rename res/{catalog-example.xml => catalog-arda.xml} (87%)
 rename res/{config-example.xml => config-arda.xml} (91%)
 rename scripts/{example => arda}/main.lua (100%)
 create mode 100644 scripts/arda/modules.lua
 rename scripts/{example => arda}/rules.lua (100%)
 delete mode 100644 scripts/example/modules.lua

diff --git a/game/eressea.ini b/game/eressea.ini
index 8ff5504ac..e26b01e36 100644
--- a/game/eressea.ini
+++ b/game/eressea.ini
@@ -9,7 +9,7 @@ memcheck = 0
 locales = de,en
 
 [config]
-game = example
+game = arda
 source_dir = ../..
 maxnmrs = 10
 
diff --git a/game/setup.lua b/game/setup.lua
index ebe6928ad..edbaaa63b 100644
--- a/game/setup.lua
+++ b/game/setup.lua
@@ -1,15 +1,15 @@
 local srcpath = config.source_dir
-local respath = srcpath .. '/example/res'
+local respath = srcpath .. '/server/res'
 local paths = {
-  'example/scripts/?.lua',
-  'shared/scripts/?.lua',
-  'external/lunit/?.lua'
+  'server/scripts/?.lua',
+  'core/scripts/?.lua',
+--  'external/lunit/?.lua'
 }
 
 for idx, path in pairs(paths) do
   package.path = srcpath .. '/' .. path .. ';' .. package.path
 end
 
-read_xml(respath..'/config-example.xml', respath..'/catalog-example.xml')
+read_xml(respath..'/config-arda.xml', respath..'/catalog-arda.xml')
 
 require "init"
diff --git a/res/catalog-example.xml b/res/catalog-arda.xml
similarity index 87%
rename from res/catalog-example.xml
rename to res/catalog-arda.xml
index 7cdc8196f..b94eb340f 100644
--- a/res/catalog-example.xml
+++ b/res/catalog-arda.xml
@@ -6,5 +6,5 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
     <rewriteURI
         uriStartString="eressea:///core/"
-        rewritePrefix="../../shared/res/" />
+        rewritePrefix="../../core/res/" />
 </catalog>
diff --git a/res/config-example.xml b/res/config-arda.xml
similarity index 91%
rename from res/config-example.xml
rename to res/config-arda.xml
index 06c58ea62..32a837740 100644
--- a/res/config-example.xml
+++ b/res/config-arda.xml
@@ -89,18 +89,18 @@
 
   <strings>
     <string name="mailto">
-      <text locale="de">eressea-server@example.com</text>
-      <text locale="en">eressea-server@example.com</text>
+      <text locale="de">arda-server@example.com</text>
+      <text locale="en">arda-server@example.com</text>
     </string>
     <string name="newbie_info_1">
       <text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
-        ERESSEA BEFEHLE an eressea-server@example.com zu senden.</text>
+        ERESSEA BEFEHLE an arda-server@example.com zu senden.</text>
       <text locale="en">Remember to send your orders to
-        eressea-server@example.com with the subject ERESSEA ORDERS.</text>
+        arda-server@example.com with the subject ERESSEA ORDERS.</text>
     </string>
     <string name="mailcmd">
-      <text locale="de">ERESSEA BEFEHLE</text>
-      <text locale="en">ERESSEA ORDERS</text>
+      <text locale="de">ARDA BEFEHLE</text>
+      <text locale="en">ARDA ORDERS</text>
     </string>
     <string name="defaultorder">
       <text locale="de">ARBEITEN</text>
diff --git a/scripts/example/main.lua b/scripts/arda/main.lua
similarity index 100%
rename from scripts/example/main.lua
rename to scripts/arda/main.lua
diff --git a/scripts/arda/modules.lua b/scripts/arda/modules.lua
new file mode 100644
index 000000000..76f419647
--- /dev/null
+++ b/scripts/arda/modules.lua
@@ -0,0 +1,10 @@
+require "spells"
+require "arda.rules"
+
+local srcpath = config.source_dir
+tests = {
+  srcpath .. '/core/scripts/tests/spells.lua', 
+  srcpath .. '/core/scripts/tests/common.lua', 
+  srcpath .. '/core/scripts/tests/bson.lua',
+  srcpath .. '/arda/scripts/tests/rules.lua', 
+}
diff --git a/scripts/example/rules.lua b/scripts/arda/rules.lua
similarity index 100%
rename from scripts/example/rules.lua
rename to scripts/arda/rules.lua
diff --git a/scripts/example/modules.lua b/scripts/example/modules.lua
deleted file mode 100644
index f3ed5ed94..000000000
--- a/scripts/example/modules.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-require "spells"
-require "example.rules"
-
-local srcpath = config.source_dir
-tests = {
-  srcpath .. '/shared/scripts/tests/spells.lua', 
-  srcpath .. '/shared/scripts/tests/common.lua', 
-  srcpath .. '/shared/scripts/tests/bson.lua', 
-  srcpath .. '/example/scripts/tests/rules.lua', 
-}