diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml
index 71ce47fbd..8f1f735f4 100644
--- a/src/res/de/strings.xml
+++ b/src/res/de/strings.xml
@@ -6734,6 +6734,14 @@
stones
+
+ Pferde
+ horses
+
+
+ Bauern
+ peasants
+
Laen
laen
@@ -6749,7 +6757,7 @@
mallorn saplings
-
+
Bäume
trees
diff --git a/src/res/eressea/items-hse.xml b/src/res/eressea/items-hse.xml
index d99263d7b..b09a76c6c 100644
--- a/src/res/eressea/items-hse.xml
+++ b/src/res/eressea/items-hse.xml
@@ -6,38 +6,6 @@
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/scripts/run-tests.lua b/src/scripts/run-tests.lua
index 7295e164c..a129d0593 100644
--- a/src/scripts/run-tests.lua
+++ b/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")
diff --git a/src/scripts/samples.lua b/src/scripts/samples.lua
index 5eea565de..c4e8a7c41 100644
--- a/src/scripts/samples.lua
+++ b/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