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

bug 2197: fix E3 potion text.

This commit is contained in:
Enno Rehling 2017-12-26 16:09:15 +01:00
parent 8e823c9403
commit 28252fda7b
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/e3a/strings.xml
View File

@ -282,4 +282,11 @@
</string> </string>
</namespace> </namespace>
<namespace name="potion">
<string name="p2">
<text locale="en">The "Water of Life" allows living trees to be created from logs. A Knotroot and Elvendear are heated until one can just still keep one's finger in. This is then poured into a jar and allowed to cool slowly. The extract is sufficient for five trees to be grown from logs.</text>
<text locale="de">Das 'Wasser des Lebens' ist in der Lage, aus gefällten Baumstämmen wieder lebende Bäume zu machen. Dazu wird ein knotiger Saugwurz zusammen mit einem Elfenlieb erwärmt, so dass man gerade noch den Finger reinhalten kann. Dies gieße man in ein Gefäß und lasse es langsam abkühlen. Der Extrakt reicht um aus fünf Holzstämmen neue Bäume wachsen zu lassen.</text>
</string>
</namespace>
</strings> </strings>

1
scripts/tests/e2/items.lua
View File

@ -13,7 +13,6 @@ end
function test_water_of_life() function test_water_of_life()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
r.name = "Fountain of Life"
r:set_flag(1, false) -- no mallorn r:set_flag(1, false) -- no mallorn
local f = faction.create("human") local f = faction.create("human")
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)

6
scripts/tests/e3/items.lua
View File

@ -10,16 +10,16 @@ end
function test_water_of_life() function test_water_of_life()
local r = region.create(0, 0, "plain") local r = region.create(0, 0, "plain")
r.name = "Fountain of Life"
r:set_flag(1, false) -- no mallorn r:set_flag(1, false) -- no mallorn
local f = faction.create("human") local f = faction.create("human")
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
local trees = r:get_resource('tree') local trees = r:get_resource('tree')
u:add_item('p2', 1) u:add_item('p2', 2)
u:add_item('log', 10) u:add_item('log', 10)
u:add_order("BENUTZE 1 'Wasser des Lebens'") u:add_order("BENUTZE 1 'Wasser des Lebens'")
u:add_order("ZEIGE 'Wasser des Lebens'")
process_orders() process_orders()
assert_equal(0, u:get_item('p2')) assert_equal(1, u:get_item('p2'))
assert_equal(5, u:get_item('log')) assert_equal(5, u:get_item('log'))
process_orders() process_orders()
assert_equal(trees+5, r:get_resource('tree')) assert_equal(trees+5, r:get_resource('tree'))