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

http://bugs.eressea.de/view.php?id=1855 

fixing delayed-action potions.
This commit is contained in:
Enno Rehling 2011-06-04 11:20:04 -07:00
parent ac9d987bcd
commit 05aba860f0
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/tests/e3a.lua
View File

@ -662,3 +662,33 @@ function test_cannot_walk_into_ocean()
assert_equal(1, u.region.x) assert_equal(1, u.region.x)
end end
function test_p2()
local f = faction.create("noreply@eressea.de", "human", "de")
local r = region.create(0, 0, "plain")
local u = unit.create(f, r, 1)
r:set_resource("tree", 0)
u:clear_orders()
u:add_order("BENUTZE 'Wasser des Lebens'")
u:add_item("p2", 1)
u:add_item("log", 20)
process_orders()
assert_equal(5, r:get_resource("tree"))
end
function test_p2_move()
-- http://bugs.eressea.de/view.php?id=1855
local f = faction.create("noreply@eressea.de", "human", "de")
local r = region.create(0, 0, "plain")
region.create(1, 0, "plain")
local u = unit.create(f, r, 1)
r:set_resource("tree", 0)
u:clear_orders()
u:add_order("BENUTZE 'Wasser des Lebens'")
u:add_order("NACH OST")
u:add_item("horse", 1)
u:add_item("p2", 1)
u:add_item("log", 1)
process_orders()
assert_equal(1, u.region.x)
assert_equal(1, r:get_resource("tree"))
end

1
src/bindings.c
View File

@ -60,6 +60,7 @@ static int fix_familiars(struct lua_State *L)
char buffer[64]; char buffer[64];
ql_free(mage->spells); ql_free(mage->spells);
mage->spells = 0;
snprintf(buffer, sizeof(buffer), "%s_familiar", u->race->_name[0]); snprintf(buffer, sizeof(buffer), "%s_familiar", u->race->_name[0]);
eq = get_equipment(buffer); eq = get_equipment(buffer);