Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re-enable silver weight

This commit is contained in:
Enno Rehling 2015-03-07 13:56:31 +01:00
parent 02e43d2772
commit 491f6f2cb3
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/core/common/items.xml
View File

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

13
scripts/tests/e3/rules.lua
View File

@ -712,7 +712,7 @@ function test_golem_use_four_iron()
assert_equal(4, u1:get_item("towershield")) assert_equal(4, u1:get_item("towershield"))
end end
function skip_test_silver_weight_stops_movement() function test_silver_weight_stops_movement()
local r1 = region.create(1, 1, "plain") local r1 = region.create(1, 1, "plain")
local r2 = region.create(2, 1, "plain") local r2 = region.create(2, 1, "plain")
region.create(3, 1, "plain") region.create(3, 1, "plain")
@ -729,7 +729,7 @@ function skip_test_silver_weight_stops_movement()
assert_equal(r2, u1.region) assert_equal(r2, u1.region)
end end
function skip_test_silver_weight_stops_ship() function test_silver_weight_stops_ship()
local r1 = region.create(1, 1, "ocean") local r1 = region.create(1, 1, "ocean")
local r2 = region.create(2, 1, "ocean") local r2 = region.create(2, 1, "ocean")
region.create(3, 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") assert_equal(null, u1.building, "owner of the building can not go into a ship")
end 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() function test_only_building_owner_can_set_not_paid()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
local f = faction.create("noreply@eressea.de", "human", "de") local f = faction.create("noreply@eressea.de", "human", "de")

1
scripts/tests/faction.lua
View File

@ -6,6 +6,7 @@ local f
function setup() function setup()
f = faction.create("faction@eressea.de", "human", "de") f = faction.create("faction@eressea.de", "human", "de")
assert(f~=nil)
end end
function test_faction_flags() function test_faction_flags()