re-enable silver weight

Conflicts:
	scripts/tests/e3/rules.lua
	scripts/tests/faction.lua

res/core/common/items.xml

@@ -2,7 +2,7 @@
 <resources>
 
   <resource name="money">
-    <item weight="0"/>
+    <item weight="1"/>
   </resource>
 
   <resource name="ao_healing" appearance="amulet">

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,11 +771,26 @@ 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)
+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")
+  local u1 = unit.create(f, r, 1)
+  local u2 = unit.create(f, r, 1)
+  local mine = building.create(r, "mine")
+  mine.size = 2
+  u1:add_item("money", 500)
+  u1.building = mine
+  u2.building = mine
+  u1:clear_orders()
+  u2:clear_orders()
+-- Test that Bezahle nicht is working
+  u1:add_order("Bezahle nicht")
+  process_orders()
+  assert_equal(500, u1:get_item("money"))
+  u1:clear_orders()
+-- Test that bug fix 0001976 is working 
+-- Bezahle nicht is not working
+  u2:add_order("Bezahle nicht")
+  process_orders()
+  assert_equal(0, u1:get_item("money"))
 end

scripts/tests/faction.lua

@@ -11,6 +11,7 @@ function setup()
     eressea.config.reset()
     assert(eressea.config.parse(conf)==0)
     f = faction.create("faction@eressea.de", "human", "de")
+    assert(f~=nil)
 end
 
 function test_faction_flags()