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

http://eressea.upb.de/mantis/view.php?id=720 

Boote koennen nicht auf Gletscher landen

Schlafende Eisberge wurden als Gletscher angezeigt, aber von Schiffen nicht so behandelt.
This commit is contained in:
Enno Rehling 2005-10-16 21:41:44 +00:00
parent 114b40d85c
commit 2d86eff74f
4 changed files with 68 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/kernel/terrain.c
View File

@ -243,7 +243,7 @@ const terraindata_t terrain[] = {
},
/* T_ICEBERG_SLEEP */
{
"glacier", 'i',
"iceberg_sleep", 'i',
NULL,
"auf den Gletscher von %s",
1, /* Steine pro Runde */

3
src/res/de/strings.xml
View File

@ -507,6 +507,9 @@
<string name="glacier">
<text locale="de">Gletscher</text>
</string>
<string name="iceberg_sleep">
<text locale="de">Gletscher</text>
</string>
<string name="firewall">
<text locale="de">Feuerwand</text>
</string>

3
src/res/en/strings.xml
View File

@ -112,6 +112,9 @@
<string name="glacier">
<text locale="en">glacier</text>
</string>
<string name="iceberg_sleep">
<text locale="en">glacier</text>
</string>
<string name="grassland">
<text locale="en">steppe</text>
</string>

122
src/res/ships.xml
View File

@ -1,70 +1,70 @@
<?xml version="1.0"?>
<ships>
<ship name="trireme" range="7" storm="1.00" damage="1.00" cabins="20000" cargo="200000" cptskill="4" minskill="1" sumskill="120" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="sk_shipcraft" minskill="4" maxsize="200" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
</ship>
<ship name="trireme" range="7" storm="1.00" damage="1.00" cabins="20000" cargo="200000" cptskill="4" minskill="1" sumskill="120" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="sk_shipcraft" minskill="4" maxsize="200" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
</ship>
<ship name="caravel" range="5" storm="1.00" damage="1.00" cabins="30000" cargo="300000" cptskill="3" minskill="1" sumskill="30" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="sk_shipcraft" minskill="3" maxsize="250" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
</ship>
<ship name="caravel" range="5" storm="1.00" damage="1.00" cabins="30000" cargo="300000" cptskill="3" minskill="1" sumskill="30" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="sk_shipcraft" minskill="3" maxsize="250" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
</ship>
<ship name="dragonship" range="5" storm="1.00" damage="1.00" cabins="10000" cargo="100000" cptskill="2" minskill="1" sumskill="50" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="sk_shipcraft" minskill="2" maxsize="100" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
</ship>
<ship name="dragonship" range="5" storm="1.00" damage="1.00" cabins="10000" cargo="100000" cptskill="2" minskill="1" sumskill="50" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="sk_shipcraft" minskill="2" maxsize="100" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
</ship>
<ship name="longboat" range="3" storm="1.00" damage="1.00" cabins="5000" cargo="50000" cptskill="1" minskill="1" sumskill="10" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="sk_shipcraft" minskill="1" maxsize="50" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
</ship>
<ship name="longboat" range="3" storm="1.00" damage="1.00" cabins="5000" cargo="50000" cptskill="1" minskill="1" sumskill="10" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<construction skill="sk_shipcraft" minskill="1" maxsize="50" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
</ship>
<ship name="balloon" range="2" storm="1.00" damage="1.00" cabins="500" cargo="5000" cptskill="6" minskill="6" sumskill="6" opensea="yes" fly="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<coast terrain="swamp"/>
<coast terrain="desert"/>
<coast terrain="highland"/>
<coast terrain="mountain"/>
<coast terrain="glacier"/>
<coast terrain="grassland"/>
<coast terrain="volcano"/>
<coast terrain="activevolcano"/>
<coast terrain="glacier"/>
<coast terrain="iceberg"/>
<construction skill="sk_shipcraft" minskill="100" maxsize="5" reqsize="1">
</construction>
</ship>
<ship name="balloon" range="2" storm="1.00" damage="1.00" cabins="500" cargo="5000" cptskill="6" minskill="6" sumskill="6" opensea="yes" fly="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<coast terrain="swamp"/>
<coast terrain="desert"/>
<coast terrain="highland"/>
<coast terrain="mountain"/>
<coast terrain="glacier"/>
<coast terrain="grassland"/>
<coast terrain="volcano"/>
<coast terrain="activevolcano"/>
<coast terrain="iceberg_sleep"/>
<coast terrain="iceberg"/>
<construction skill="sk_shipcraft" minskill="100" maxsize="5" reqsize="1">
</construction>
</ship>
<ship name="boat" range="2" storm="1.00" damage="1.00" cabins="500" cargo="5000" cptskill="1" minskill="1" sumskill="2" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<coast terrain="swamp"/>
<coast terrain="desert"/>
<coast terrain="highland"/>
<coast terrain="mountain"/>
<coast terrain="glacier"/>
<coast terrain="grassland"/>
<coast terrain="volcano"/>
<coast terrain="activevolcano"/>
<coast terrain="glacier"/>
<coast terrain="iceberg"/>
<construction skill="sk_shipcraft" minskill="1" maxsize="5" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
</ship>
<ship name="boat" range="2" storm="1.00" damage="1.00" cabins="500" cargo="5000" cptskill="1" minskill="1" sumskill="2" opensea="yes">
<coast terrain="ocean"/>
<coast terrain="plain"/>
<coast terrain="swamp"/>
<coast terrain="desert"/>
<coast terrain="highland"/>
<coast terrain="mountain"/>
<coast terrain="glacier"/>
<coast terrain="grassland"/>
<coast terrain="volcano"/>
<coast terrain="activevolcano"/>
<coast terrain="iceberg_sleep"/>
<coast terrain="iceberg"/>
<construction skill="sk_shipcraft" minskill="1" maxsize="5" reqsize="1">
<requirement type="log" quantity="1"/>
</construction>
</ship>
</ships>