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

Merge pull request #786 from ennorehling/master 

bugfixes turn 1080
This commit is contained in:
Enno Rehling 2018-06-10 10:44:15 +02:00 committed by GitHub
parent 719bc37a60 6d61b837cf
commit eb4a13cd76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/tests/e2/e2features.lua
View File

@ -491,8 +491,29 @@ function test_dwarf_mining()
local f = faction.create('dwarf')
local r = region.create(0, 0, 'plain')
local u = unit.create(f, r)
u.name = 'Xolgrim'
u:set_skill('mining', 2)
assert_equal(2, u:get_skill('mining'))
assert_equal(4, u:eff_skill('mining'))
end
function test_buy_sell()
local f = faction.create('human')
local r = region.create(0, 0, 'plain')
local u = unit.create(f, r)
local lux = r.luxury
local b = building.create(r, 'castle')
b.size = 10
u:set_skill('trade', 1)
item = 'silk'
name = 'Seide'
if lux == 'silk' then
item = 'balm'
name = 'Balsam'
end
u:add_item(item, 5)
u:add_order('VERKAUFE 1 ' .. name)
assert_equal(0, u:get_item('money'))
process_orders()
assert_equal(4, u:get_item(item))
assert_not_equal(0, u:get_item('money'))
end

4
src/exparse.c
View File

@ -818,7 +818,9 @@ static void start_resources(parseinfo *pi, const XML_Char *el, const XML_Char **
handle_requirement(pi, el, attr);
}
else if (xml_strcmp(el, "luxury") == 0) {
rtype->ltype = new_luxurytype(itype, 0);
int price = atoi(attr_get(attr, "price"));
assert(price > 0);
rtype->ltype = new_luxurytype(itype, price);
}
else if (xml_strcmp(el, "potion") == 0) {
int i, level = 0;