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

Adamant + Rüstung

This commit is contained in:
Enno Rehling 2008-05-30 15:28:20 +00:00
parent ecc147425b
commit ae68d8fd79
10 changed files with 86 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/gamecode/xmlreport.c
View File

@ -237,4 +237,3 @@ xmlreport_cleanup(void)
iconv_close(utf8);
#endif
}

3
src/res/eressea.xml
View File

@ -70,8 +70,7 @@
<param name="hunger.long" value="1"/>
<param name="rules.check_overload" value="0"/>
</game>
<xi:include href="eressea/de/strings.xml"/>
<xi:include href="eressea/en/strings.xml"/>
<xi:include href="eressea/strings.xml"/>
<xi:include href="eressea/races.xml"/>
<xi:include href="eressea/items.xml"/>
<xi:include href="eressea/artrewards.xml"/>

11
src/res/eressea/en/strings.xml
View File

@ -1,11 +0,0 @@
<strings>
<string name="newbie_info_2">
<text locale="en">If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of inactive players in Eressea.</text>
</string>
<string name="newbie_info_3">
<text locale="en">With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER.</text>
</string>
<string name="defaultorder">
<text locale="en">WORK</text>
</string>
</strings>

49
src/res/eressea/items.xml
View File

@ -149,37 +149,6 @@
<item cursed="yes" notlost="yes" weight="0" />
</resource>
<resource name="greatbow">
<item weight="100">
<construction skill="weaponsmithing" minskill="5" reqsize="1">
<modifier function="mod_elves_only"/>
<requirement type="mallorn" quantity="2"/>
</construction>
<weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.0">
<damage type="rider" value="2d6+4"/>
<damage type="footman" value="2d6+4"/>
<modifier type="missile_target" value="2"/>
<modifier type="damage" value="1">
<race name="elf"/>
</modifier>
</weapon>
</item>
</resource>
<resource name="halberd">
<item weight="200">
<construction skill="weaponsmithing" minskill="3" reqsize="1">
<requirement type="log" quantity="2"/>
<requirement type="iron" quantity="1"/>
</construction>
<weapon cut="true" skill="polearm" offmod="-1" defmod="2" magres="0.0">
<damage type="rider" value="2d6+3"/>
<damage type="footman" value="2d6+3"/>
<modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
</weapon>
</item>
</resource>
<!-- christmas items: start -->
<resource name="almond">
<item weight="0"/>
@ -195,4 +164,22 @@
</resource>
<!-- christmas items: end -->
<resource name="diamond" limited="yes">
<item weight="200" score="200">
<construction skill="mining" minskill="8" reqsize="1"/>
</item>
<resourcelimit>
<guard flag="mining"/>
</resourcelimit>
</resource>
<resource name="diamondplate">
<item weight="100" score="2000">
<construction skill="armorer" minskill="10" reqsize="1">
<requirement type="diamond" quantity="3"/>
</construction>
<armor ac="7" penalty="0.1"/>
</item>
</resource>
</resources>

33
src/res/eressea/de/strings.xml → src/res/eressea/strings.xml
View File

@ -197,6 +197,7 @@
<string name="newbie_info_2">
<text locale="de">Die ersten beiden Züge mußt du abgeben, sonst wird deine
Partei sofort wieder gelöscht, um Karteileichen zu vermeiden.</text>
<text locale="en">If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of inactive players in Eressea.</text>
</string>
<string name="newbie_info_3">
<text locale="de">Mit der ersten Auswertung bekommst du einen
@ -204,9 +205,11 @@
http://eressea-pbem.de/download.html benutzen kannst. Wenn du ihn
weiterhin bekommen willst, gib einer deiner Einheiten den Befehl OPTION
COMPUTER.</text>
<text locale="en">With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER.</text>
</string>
<string name="defaultorder">
<text locale="de">ARBEITE</text>
<text locale="en">WORK</text>
</string>
<string name="temple">
<text locale="de">Tempel</text>
@ -355,16 +358,22 @@
</string>
<!-- igjarjuk queste end -->
<string name="diamond">
<text locale="de">Adamant</text>
<text locale="en">adamantium</text>
</string>
<string name="diamond_p">
<text locale="de">Adamant</text>
<text locale="en">adamantium</text>
</string>
<string name="diamondplate">
<text locale="de">Adamantrüstung</text>
<text locale="en">adamantium plate</text>
</string>
<string name="diamondplate_p">
<text locale="de">Adamantrüstungen</text>
<text locale="en">adamantium plates</text>
</string>
</strings>

31
src/res/resources.xml
View File

@ -329,6 +329,37 @@
</item>
</resource>
<resource name="greatbow">
<item weight="100">
<construction skill="weaponsmithing" minskill="5" reqsize="1">
<modifier function="mod_elves_only"/>
<requirement type="mallorn" quantity="2"/>
</construction>
<weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.0">
<damage type="rider" value="2d6+4"/>
<damage type="footman" value="2d6+4"/>
<modifier type="missile_target" value="2"/>
<modifier type="damage" value="1">
<race name="elf"/>
</modifier>
</weapon>
</item>
</resource>
<resource name="halberd">
<item weight="200">
<construction skill="weaponsmithing" minskill="3" reqsize="1">
<requirement type="log" quantity="2"/>
<requirement type="iron" quantity="1"/>
</construction>
<weapon cut="true" skill="polearm" offmod="-1" defmod="2" magres="0.0">
<damage type="rider" value="2d6+3"/>
<damage type="footman" value="2d6+3"/>
<modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
</weapon>
</item>
</resource>
<resource name="peasant" pooled="false">
<function name="change" value="lua_changeresource"/>
<function name="get" value="lua_getresource"/>

5
src/res/tutorial.xml
View File

@ -63,11 +63,8 @@
<param name="hunger.long" value="1"></param>
<param name="MaxAge" value="8"></param>
</game>
<xi:include href="tutorial/de/strings.xml"/>
<xi:include href="tutorial/en/strings.xml"/>
<xi:include href="tutorial/strings.xml"/>
<xi:include href="eressea/races.xml"/>
<xi:include href="eressea/items.xml"/>
<xi:include href="eressea/dungeons.xml"/>
<strings>
<string name="mailto">
<text locale="en">tutorial@eressea.de</text>

10
src/res/tutorial/en/strings.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<strings>
<comment> report newbie info</comment>
<string name="newbie_info_2">
<text locale="en">If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of zombie players in Eressea.</text>
</string>
<string name="newbie_info_3">
<text locale="en">With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER.</text>
</string>
</strings>

2
src/res/tutorial/de/strings.xml → src/res/tutorial/strings.xml
View File

@ -2,9 +2,11 @@
<strings>
<string name="newbie_info_2">
<text locale="de">Die ersten beiden Züge mußt du abgeben, sonst wird deine Partei sofort wieder gelöscht, um Karteileichen zu vermeiden.</text>
<text locale="en">If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of zombie players in Eressea.</text>
</string>
<string name="newbie_info_3">
<text locale="de">Mit der ersten Auswertung bekommst du einen Computerreport, den du mit vielen der Tools auf http://eressea-pbem.de/download.html benutzen kannst. Wenn du ihn weiterhin bekommen willst, gib einer deiner Einheiten den Befehl OPTION COMPUTER.</text>
<text locale="en">With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER.</text>
</string>
<string name="defaultorder">
<text locale="de">ARBEITE</text>

17
src/scripts/run-tests.lua
View File

@ -51,8 +51,11 @@ function test_free()
end
function test_hse()
read_game("50", "text")
write_game("50.dat", "binary")
read_game("50.dat", "binary")
f = get_faction(atoi36("8h7f"))
f.options = f.options + 8192
init_reports()
write_report(f)
end
function test_realloc()
@ -79,7 +82,11 @@ function test_md5()
read_game("571.dat", "binary")
-- read_orders("orders.571")
run_turn()
-- write_game("572.txt", "text")
local i = test.rng_int()
print(i)
write_game("572.txt." .. i, "text")
-- 648583167
io.stdin:read("*line")
end
function test_287()
@ -93,9 +100,9 @@ run_scripts()
-- test_free()
-- test_bmark()
-- test_realloc()
-- test_hse()
test_hse()
-- test_md5()
test_287()
-- test_287()
-- io.stdin:read("*line")
-- text: 50.574
-- bin0: 19.547