src/res/de/strings.xml

@@ -6734,6 +6734,14 @@
     <text locale="en">stones</text>
   </string>
 
+  <string name="rm_horse">
+    <text locale="de">Pferde</text>
+    <text locale="en">horses</text>
+  </string>
+  <string name="rm_peasant">
+    <text locale="de">Bauern</text>
+    <text locale="en">peasants</text>
+  </string>
   <string name="rm_laen">
     <text locale="de">Laen</text>
     <text locale="en">laen</text>
@@ -6749,7 +6757,7 @@
     <text locale="en">mallorn saplings</text>
   </string>
 
-  <string name="rm_trees">
+  <string name="rm_tree">
     <text locale="de">Bäume</text>
     <text locale="en">trees</text>
   </string>

src/res/eressea/items-hse.xml

@@ -6,38 +6,6 @@
     <item notlost="yes" weight="0"/>
   </resource>
 
-  <resource name="greatbow">
-    <function name="change" value="changeitem"/>
-    <item weight="100">
-      <construction skill="weaponsmithing" minskill="5" reqsize="1">
-        <modifier function="mod_elves_only"/>
-        <requirement type="mallorn" quantity="2"/>
-      </construction>
-      <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.0">
-        <damage type="rider" value="2d6+4"/>
-        <damage type="footman" value="2d6+4"/>
-        <modifier type="missile_target" value="2"/>
-        <modifier type="damage" value="1">
-          <race name="elf"/>
-        </modifier>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="halberd">
-    <item weight="200">
-      <construction skill="weaponsmithing" minskill="3" reqsize="1">
-        <requirement type="log" quantity="2"/>
-        <requirement type="iron" quantity="1"/>
-      </construction>
-      <weapon cut="true" skill="polearm" offmod="-1" defmod="2" magres="0.0">
-        <damage type="rider" value="2d6+3"/>
-        <damage type="footman" value="2d6+3"/>
-        <modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
-      </weapon>
-    </item>
-  </resource>
-
 <!-- HSE items -->
   <resource name="studypotion">
     <item weight="0">

src/scripts/run-tests.lua

@@ -50,6 +50,70 @@ function test_free()
 	free_game()
 end
 
+function test_reorder()
+  r = terraform(0, 0, "plain")
+  f = add_faction("enno@ix.de", "orc", "de")
+  s1 = add_ship(r, "boat")
+  s1.size = 1
+  s2 = add_ship(r, "boat")
+  s2.size = 2
+  s3 = add_ship(r, "boat")
+  s3.size = 3
+  b1 = add_building(r, "portal")
+  b1.size = 1
+  b2 = add_building(r, "portal")
+  b2.size = 2
+  b3 = add_building(r, "portal")
+  b3.size = 3
+  u = add_unit(f, r)
+  u.number = 1
+  u.name = "a"
+  u = add_unit(f, r)
+  u.number = 1
+  u.name = "b"
+  u.ship = s3
+  u = add_unit(f, r)
+  u.number = 1
+  u.name = "c"
+  u.building = b1
+  u = add_unit(f, r)
+  u.number = 1
+  u.name = "d"
+  u.ship = s2
+  u = add_unit(f, r)
+  u.name = "e"
+  u.number = 1
+  u.building = b1
+  u = add_unit(f, r)
+  u.name = "f"
+  u.number = 1
+  u.building = b3
+  u = add_unit(f, r)
+  u.name = "g"
+  u.number = 1
+  u.ship = s2
+  u = add_unit(f, r)
+  u.name = "h"
+  u.number = 1
+  u.building = b2
+  u = add_unit(f, r)
+  u.name = "i"
+  u.number = 1
+  u = add_unit(f, r)
+  u.name = "j"
+  u.number = 1
+  u.building = b1
+  u = add_unit(f, r)
+  u.name = "k"
+  u.number = 1
+  u.ship = s1
+  test.reorder_units(r)
+  for u in r.units do
+    print(u, u.building, u.ship)
+  end
+  io.stdin:read("*line")
+end
+
 function test_hse()
   read_game("50.dat", "binary")
   f = get_faction(atoi36("8h7f"))
@@ -138,8 +202,9 @@ run_scripts()
 -- test_free()
 -- test_bmark()
 -- test_realloc()
--- test_hse()
-test_tunnels()
+test_hse()
+-- test_reorder()
+-- test_tunnels()
 -- test_md5()
 -- test_287()
 -- io.stdin:read("*line")

src/scripts/samples.lua

@@ -49,7 +49,7 @@ function test_movement()
   -- schiffe zum abtreiben:
   ships = {}
   for i = 1, 100 do
-    ships[i] = add_ship("boat", ocean)
+    ships[i] = add_ship(ocean, "boat")
   end
 
   astra = mkunit(orcs, r0, 1)
@@ -62,7 +62,7 @@ function test_movement()
 
   watch = mkunit(orcs, w2, 1)
 
-  ship = add_ship("boat", ocean)
+  ship = add_ship(ocean, "boat")
   cptn = mkunit(aqua, ocean, 1)
   cptn.ship = ship
   cptn:add_order("NACH O")
@@ -77,7 +77,7 @@ function test_movement()
   swim:add_order("BENENNE EINHEIT Landungstruppe")
 
   -- ein schiff im landesinneren
-  ship = add_ship("boat", r0)
+  ship = add_ship(r0, "boat")
   sail = mkunit(aqua, r0, 1)
   sail.ship = ship