From 7527e6e90372fe78cf0b0f615c68f8059c82758a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 29 Jan 2015 16:56:21 +0100 Subject: [PATCH] disable silver weight for the initial rollout of version 3.4 two weeks after launch, revert this commit --- res/core/common/items.xml | 2 +- scripts/tests/e3/rules.lua | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/res/core/common/items.xml b/res/core/common/items.xml index c8910e695..9508653e7 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 57c19522d..193551ea9 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 test_silver_weight_stops_movement() +function skip_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 test_silver_weight_stops_movement() assert_equal(r2, u1.region) end -function test_silver_weight_stops_ship() +function skip_test_silver_weight_stops_ship() local r1 = region.create(1, 1, "ocean") local r2 = region.create(2, 1, "ocean") region.create(3, 1, "ocean") @@ -770,3 +770,12 @@ function test_building_owner_can_enter_ship() assert_equal(s1, u1.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