Merge branch 'develop'

res/e3a/races.xml

@@ -40,7 +40,7 @@
     <skill name="magic" modifier="-99"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="dolphin" default="yes"/>
+    <familiar race="dolphin"/>
     <familiar race="giantturtle"/>
   </race>
 
@@ -67,7 +67,7 @@
     <skill name="unarmed" modifier="-99"/>
     <skill name="weaponsmithing" modifier="2"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="wolf" default="yes"/>
+    <familiar race="wolf"/>
     <familiar race="ghost"/>
   </race>
 
@@ -95,7 +95,7 @@
     <skill name="magic" modifier="-99"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="eagle" default="yes"/>
+    <familiar race="eagle"/>
     <familiar race="imp"/>
   </race>
   
@@ -116,7 +116,7 @@
     <skill name="weaponsmithing" modifier="1"/>
     <attack type="1" damage="1d5"/>
     <attack type="5"/>
-    <familiar race="imp" default="yes"/>
+    <familiar race="imp"/>
     <familiar race="ghost"/>
   </race>
 
@@ -138,7 +138,7 @@
     <skill name="training" modifier="2"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="nymph" default="yes"/>
+    <familiar race="nymph"/>
     <familiar race="unicorn"/>
   </race>
 
@@ -160,7 +160,7 @@
     <skill name="training" modifier="-1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5+3"/>
-    <familiar race="tunnelworm" default="yes"/>
+    <familiar race="tunnelworm"/>
     <familiar race="rat"/>
   </race>
 
@@ -186,7 +186,7 @@
     <skill name="weaponsmithing" modifier="2"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="lynx" default="yes"/>
+    <familiar race="lynx"/>
     <familiar race="songdragon"/>
   </race>
 

res/eressea/races.xml

@@ -19,7 +19,7 @@
     <skill name="sailing" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="wolf" default="yes"/>
+    <familiar race="wolf"/>
     <familiar race="dreamcat"/>
     <familiar race="owl"/>
     <familiar race="owl"/>
@@ -748,7 +748,7 @@
     <skill name="roadwork" modifier="-1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="giantturtle" default="yes"/>
+    <familiar race="giantturtle"/>
     <familiar race="dolphin"/>
     <familiar race="giantturtle"/>
     <familiar race="dolphin"/>
@@ -773,7 +773,7 @@
     <skill name="taxation" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="lynx" default="yes"/>
+    <familiar race="lynx"/>
     <familiar race="dreamcat"/>
     <familiar race="lynx"/>
     <familiar race="songdragon"/>
@@ -805,7 +805,7 @@
     <skill name="taxation" modifier="-1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="owl" default="yes"/>
+    <familiar race="owl"/>
     <familiar race="rat"/>
     <familiar race="eagle"/>
     <familiar race="songdragon"/>
@@ -833,7 +833,7 @@
     <skill name="perception" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="ghost" default="yes"/>
+    <familiar race="ghost"/>
     <familiar race="rat"/>
     <familiar race="owl"/>
     <familiar race="rat"/>
@@ -863,7 +863,7 @@
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
     <attack type="5"/>
-    <familiar race="imp" default="yes"/>
+    <familiar race="imp"/>
     <familiar race="imp"/>
     <familiar race="ghost"/>
     <familiar race="rat"/>
@@ -893,7 +893,7 @@
     <skill name="taxation" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5+3"/>
-    <familiar race="tunnelworm" default="yes"/>
+    <familiar race="tunnelworm"/>
     <familiar race="rat"/>
     <familiar race="rat"/>
     <familiar race="eagle"/>
@@ -917,7 +917,7 @@
     <skill name="cartmaking" modifier="-1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="rat" default="yes"/>
+    <familiar race="rat"/>
     <familiar race="songdragon"/>
     <familiar race="imp"/>
     <familiar race="rat"/>
@@ -1108,7 +1108,7 @@
     <skill name="taxation" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="goblin" default="yes"/>
+    <familiar race="goblin"/>
     <familiar race="ghost"/>
     <familiar race="imp"/>
     <familiar race="rat"/>
@@ -1134,7 +1134,7 @@
     <skill name="perception" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="lynx" default="yes"/>
+    <familiar race="lynx"/>
     <familiar race="fairy"/>
     <familiar race="owl"/>
     <familiar race="nymph"/>
@@ -1165,7 +1165,7 @@
     <skill name="taxation" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="tunnelworm" default="yes"/>
+    <familiar race="tunnelworm"/>
     <familiar race="eagle"/>
     <familiar race="owl"/>
     <familiar race="lynx"/>
@@ -1195,7 +1195,7 @@
     <skill name="taxation" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="goblin" default="yes"/>
+    <familiar race="goblin"/>
     <familiar race="ghost"/>
     <familiar race="imp"/>
     <familiar race="rat"/>

res/races/aquarian.xml

@@ -10,7 +10,7 @@
     <skill name="roadwork" modifier="-1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="giantturtle" default="yes"/>
+    <familiar race="giantturtle"/>
     <familiar race="dolphin"/>
     <familiar race="giantturtle"/>
     <familiar race="dolphin"/>

res/races/cat.xml

@@ -17,7 +17,7 @@
     <skill name="taxation" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="lynx" default="yes"/>
+    <familiar race="lynx"/>
     <familiar race="dreamcat"/>
     <familiar race="lynx"/>
     <familiar race="songdragon"/>

res/races/demon.xml

@@ -27,7 +27,7 @@ recruitethereal="yes" equipment="yes" healing="1.5">
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
     <attack type="5"/>
-    <familiar race="imp" default="yes"/>
+    <familiar race="imp"/>
     <familiar race="imp"/>
     <familiar race="ghost"/>
     <familiar race="rat"/>

res/races/dwarf.xml

@@ -23,7 +23,7 @@
     <skill name="taxation" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="tunnelworm" default="yes"/>
+    <familiar race="tunnelworm"/>
     <familiar race="eagle"/>
     <familiar race="owl"/>
     <familiar race="lynx"/>

res/races/elf.xml

@@ -18,7 +18,7 @@
     <skill name="perception" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="lynx" default="yes"/>
+    <familiar race="lynx"/>
     <familiar race="fairy"/>
     <familiar race="owl"/>
     <familiar race="nymph"/>

res/races/goblin-3.xml

@@ -21,7 +21,7 @@ getitem="yes" equipment="yes" healing="2.0">
   <skill name="unarmed" modifier="-99"/>
   <skill name="weaponsmithing" modifier="-1"/>
   <attack type="1" damage="1d5"/>
-  <familiar race="rat" default="yes"/>
+  <familiar race="rat"/>
   <familiar race="imp"/>
 </race>
 </races>

res/races/goblin.xml

@@ -21,7 +21,7 @@ healing="2.0">
     <skill name="cartmaking" modifier="-1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="rat" default="yes"/>
+    <familiar race="rat"/>
     <familiar race="songdragon"/>
     <familiar race="imp"/>
     <familiar race="rat"/>

res/races/halfling.xml

@@ -24,7 +24,7 @@
     <skill name="taxation" modifier="-1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="owl" default="yes"/>
+    <familiar race="owl"/>
     <familiar race="rat"/>
     <familiar race="eagle"/>
     <familiar race="songdragon"/>

res/races/human.xml

@@ -7,7 +7,7 @@
     <skill name="sailing" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="wolf" default="yes"/>
+    <familiar race="wolf"/>
     <familiar race="dreamcat"/>
     <familiar race="owl"/>
     <familiar race="owl"/>

res/races/insect.xml

@@ -20,7 +20,7 @@
     <skill name="perception" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="ghost" default="yes"/>
+    <familiar race="ghost"/>
     <familiar race="rat"/>
     <familiar race="owl"/>
     <familiar race="rat"/>

res/races/orc.xml

@@ -22,7 +22,7 @@
     <skill name="taxation" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="goblin" default="yes"/>
+    <familiar race="goblin"/>
     <familiar race="ghost"/>
     <familiar race="imp"/>
     <familiar race="rat"/>

res/races/troll.xml

@@ -27,7 +27,7 @@ healing="1.5">
     <skill name="taxation" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5+3"/>
-    <familiar race="tunnelworm" default="yes"/>
+    <familiar race="tunnelworm"/>
     <familiar race="rat"/>
     <familiar race="rat"/>
     <familiar race="eagle"/>

scripts/tests/e3/buildings.lua

@@ -41,6 +41,11 @@ function test_build_watch()
     u:add_order("MACHE Wache")
     process_orders()
     assert_not_nil(u.building)
+    if 5 ~= u.building.size then
+        for k,v in f.messages do
+            print(v)
+        end
+    end
     assert_equal(5, u.building.size)
 
     u:set_skill("building", 2)

src/xmlreader.c

@@ -1461,13 +1461,7 @@ static int parse_races(xmlDocPtr doc)
                         assert(propValue != NULL);
                         frc = rc_get_or_create((const char *)propValue);
                         frc->flags |= RCF_FAMILIAR;
-                        if (xml_bvalue(node, "default", false)) {
+                        rc->familiars[k] = frc;
-                            rc->familiars[k] = rc->familiars[0];
-                            rc->familiars[0] = frc;
-                        }
-                        else {
-                            rc->familiars[k] = frc;
-                        }
                         xmlFree(propValue);
                     }
                     else {