From 7437ebb36a5eb2c7a13ba911884b629163e5470d Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 29 Jan 2017 10:45:22 +0100
Subject: [PATCH 1/5] WIP: make all spell configuration use spellref. does not
 pass tests.

---
 src/kernel/xmlreader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c
index 36fe2d7f8..cad8780c7 100644
--- a/src/kernel/xmlreader.c
+++ b/src/kernel/xmlreader.c
@@ -2088,9 +2088,9 @@ void register_xmlreader(void)
     xml_register_callback(parse_buildings);       /* requires resources */
     xml_register_callback(parse_ships);   /* requires terrains */
     xml_register_callback(parse_races);   /* requires spells */
-    xml_register_callback(parse_spells);  /* requires resources */
     xml_register_callback(parse_spellbooks);  /* requires spells */
     xml_register_callback(parse_equipment);       /* requires spells */
+    xml_register_callback(parse_spells);  /* requires resources */
     xml_register_callback(parse_calendar);
 }
 #endif

From b08b1544f4a4c89e851df41eee1025036b5ce0af Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 2 Feb 2017 16:55:07 +0100
Subject: [PATCH 2/5] snotling is not a player race

---
 res/eressea/races.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/eressea/races.xml b/res/eressea/races.xml
index 7c3a5ab0c..e31283fc3 100644
--- a/res/eressea/races.xml
+++ b/res/eressea/races.xml
@@ -1150,7 +1150,7 @@
     <attack type="6" spell="fiery_dragonbreath" level="3" />
     <attack type="8" damage="1d10"/>
   </race>
-  <race name="snotling" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="snotling" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="no" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="1"/>

From 784a934c47c8c9c47f671fb69c736e5d24f8b44b Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 2 Feb 2017 19:17:01 +0100
Subject: [PATCH 3/5] Fix snotling XML (no recruiting).

---
 clibs                  | 2 +-
 res/eressea/races.xml  | 5 +++--
 src/kernel/xmlreader.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/clibs b/clibs
index f91ef37f0..27c8b3202 160000
--- a/clibs
+++ b/clibs
@@ -1 +1 @@
-Subproject commit f91ef37f08c5244bf616f1836c0aa9caaf36805c
+Subproject commit 27c8b3202b52766465743c3324fc0b52c5ba4b11
diff --git a/res/eressea/races.xml b/res/eressea/races.xml
index e31283fc3..2ef5950c9 100644
--- a/res/eressea/races.xml
+++ b/res/eressea/races.xml
@@ -1150,7 +1150,9 @@
     <attack type="6" spell="fiery_dragonbreath" level="3" />
     <attack type="8" damage="1d10"/>
   </race>
-  <race name="snotling" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="no" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+
+  <race name="snotling" magres="-0.050000" maxaura="1.000000" regaura="1.000000" 
+  maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="no" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="1"/>
@@ -1180,7 +1182,6 @@
     <familiar race="wolf"/>
     <familiar race="demon"/>
   </race>
-
   <race name="elf" magres="0.100000" maxaura="1.000000" regaura="1.250000" recruitcost="130" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c
index f9d0912da..35a682649 100644
--- a/src/kernel/xmlreader.c
+++ b/src/kernel/xmlreader.c
@@ -2074,11 +2074,11 @@ void register_xmlreader(void)
     xml_register_callback(parse_rules);
 
     xml_register_callback(parse_buildings);       /* requires resources */
+    xml_register_callback(parse_spells);  /* requires resources */
     xml_register_callback(parse_ships);   /* requires terrains */
     xml_register_callback(parse_races);   /* requires spells */
     xml_register_callback(parse_spellbooks);  /* requires spells */
     xml_register_callback(parse_equipment);       /* requires spells */
-    xml_register_callback(parse_spells);  /* requires resources */
     xml_register_callback(parse_calendar);
 }
 #endif

From e9a5a79c652aa7f63584c1f77b5ab0c525216670 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 2 Feb 2017 19:28:46 +0100
Subject: [PATCH 4/5] make my visual studio debugging experience the same as
 before (-r is like -c)

---
 src/main.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main.c b/src/main.c
index a3bcdb866..9bfd1448f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -186,14 +186,11 @@ static int parse_args(int argc, char **argv, int *exitcode)
         else {
             const char *arg;
             switch (argi[1]) {
+            case 'r':
             case 'c':
                 i = get_arg(argc, argv, 2, i, &arg, 0);
                 config_set("config.path", arg);
                 break;
-            case 'r':
-                i = get_arg(argc, argv, 2, i, &arg, 0);
-                config_set("config.rules", arg);
-                break;
             case 'f':
                 i = get_arg(argc, argv, 2, i, &luafile, 0);
                 break;

From 9f3f1bf41df000a24621404fca3513fd2ccf2357 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 2 Feb 2017 19:30:29 +0100
Subject: [PATCH 5/5] fix runtests.bat experience (doh!)

---
 src/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main.c b/src/main.c
index 9bfd1448f..a3bcdb866 100644
--- a/src/main.c
+++ b/src/main.c
@@ -186,11 +186,14 @@ static int parse_args(int argc, char **argv, int *exitcode)
         else {
             const char *arg;
             switch (argi[1]) {
-            case 'r':
             case 'c':
                 i = get_arg(argc, argv, 2, i, &arg, 0);
                 config_set("config.path", arg);
                 break;
+            case 'r':
+                i = get_arg(argc, argv, 2, i, &arg, 0);
+                config_set("config.rules", arg);
+                break;
             case 'f':
                 i = get_arg(argc, argv, 2, i, &luafile, 0);
                 break;