From 491f6f2cb324a6769e343c7298dc84ff1e40efc1 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 7 Mar 2015 13:56:31 +0100 Subject: [PATCH] re-enable silver weight --- res/core/common/items.xml | 2 +- scripts/tests/e3/rules.lua | 13 ++----------- scripts/tests/faction.lua | 1 + 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/res/core/common/items.xml b/res/core/common/items.xml index 9508653e7..c8910e695 100644 --- a/res/core/common/items.xml +++ b/res/core/common/items.xml @@ -2,7 +2,7 @@ - + diff --git a/scripts/tests/e3/rules.lua b/scripts/tests/e3/rules.lua index ca6206419..62bbd8758 100644 --- a/scripts/tests/e3/rules.lua +++ b/scripts/tests/e3/rules.lua @@ -712,7 +712,7 @@ function test_golem_use_four_iron() assert_equal(4, u1:get_item("towershield")) end -function skip_test_silver_weight_stops_movement() +function test_silver_weight_stops_movement() local r1 = region.create(1, 1, "plain") local r2 = region.create(2, 1, "plain") region.create(3, 1, "plain") @@ -729,7 +729,7 @@ function skip_test_silver_weight_stops_movement() assert_equal(r2, u1.region) end -function skip_test_silver_weight_stops_ship() +function test_silver_weight_stops_ship() local r1 = region.create(1, 1, "ocean") local r2 = region.create(2, 1, "ocean") region.create(3, 1, "ocean") @@ -771,15 +771,6 @@ function test_building_owner_can_enter_ship() assert_equal(null, u1.building, "owner of the building can not go into a ship") end -function test_weightless_silver() - local r1 = region.create(1, 2, "plain") - local f1 = faction.create("noreply@eressea.de", "human", "de") - local u1 = unit.create(f1, r1, 1) - assert_equal(1000, u1.weight) - u1:add_item("money", 540) - assert_equal(1000, u1.weight) -end - function test_only_building_owner_can_set_not_paid() local r = region.create(0, 0, "plain") local f = faction.create("noreply@eressea.de", "human", "de") diff --git a/scripts/tests/faction.lua b/scripts/tests/faction.lua index a6265cde9..89387f777 100644 --- a/scripts/tests/faction.lua +++ b/scripts/tests/faction.lua @@ -6,6 +6,7 @@ local f function setup() f = faction.create("faction@eressea.de", "human", "de") + assert(f~=nil) end function test_faction_flags()