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

disable silver weight for the initial rollout of version 3.4 

two weeks after launch, revert this commit
This commit is contained in:
Enno Rehling 2015-01-29 16:56:21 +01:00
parent c7b28e7b39
commit 7527e6e903
2 changed files with 12 additions and 3 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="1"/> <item weight="0"/>
</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 test_silver_weight_stops_movement() function skip_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 test_silver_weight_stops_movement()
assert_equal(r2, u1.region) assert_equal(r2, u1.region)
end end
function test_silver_weight_stops_ship() function skip_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")
@ -770,3 +770,12 @@ function test_building_owner_can_enter_ship()
assert_equal(s1, u1.ship) assert_equal(s1, u1.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