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

bugfix xmastrees

Browse source
This commit is contained in:
Enno Rehling 2007-04-04 19:25:40 +00:00
parent e5bd9e8199
commit 85e9803acf
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/res/messages.xml
View file

@ -2691,8 +2691,8 @@
<arg name="faction" type="int"/> <arg name="faction" type="int"/>
<arg name="password" type="string"/> <arg name="password" type="string"/>
</type> </type>
<text locale="de">"ERESSEA $atoi36($faction) \"${password}\" - Deine Befehle hatten ein falsches Passwort."</text> <text locale="de">"ERESSEA $int36($faction) \"${password}\" - Deine Befehle hatten ein falsches Passwort."</text>
<text locale="en">"ERESSEA $atoi36($faction) \"${password}\" - Your orders had the wrong password."</text> <text locale="en">"ERESSEA $int36($faction) \"${password}\" - Your orders had the wrong password."</text>
</message> </message>
<message name="changepasswd" section="events"> <message name="changepasswd" section="events">
<type> <type>
@ -5533,8 +5533,8 @@
<arg name="target" type="unit"/> <arg name="target" type="unit"/>
<arg name="race" type="race"/> <arg name="race" type="race"/>
</type> </type>
<text locale="de">"$unit($mage) läßt $unit($target) als $race($race,$unit.number($target)) erscheinen."</text> <text locale="de">"$unit($mage) läßt $unit($target) als $race($race,$unit.size($target)) erscheinen."</text>
<text locale="en">"$unit($mage) makes $unit($target) appear as $race($race,$unit.number($target))."</text> <text locale="en">"$unit($mage) makes $unit($target) appear as $race($race,$unit.size($target))."</text>
</message> </message>
<message name="magicresistance_effect" section="events"> <message name="magicresistance_effect" section="events">

6
src/scripts/eressea/xmas2006.lua
View file

@ -9,12 +9,14 @@ function use_xmastree(u, amount)
end end
function update_xmas2006() function update_xmas2006()
if get_season() == "winter" then season = get_season()
if season == "calendar::winter" then
print("it is " .. season .. ", the christmas trees do their magic")
msg = message("xmastree_effect") msg = message("xmastree_effect")
for r in regions() do for r in regions() do
if r:get_key("xm06") then if r:get_key("xm06") then
trees = r:get_resource("tree") trees = r:get_resource("tree")
if trees>0 then if trees*0.1>1 then
r:set_resource("tree", trees * 1.1) r:set_resource("tree", trees * 1.1)
msg:send_region(r) msg:send_region(r)
end end