Sicherheitscheck in Kampfroutine

Neue Prefixes Eis und Flammen
This commit is contained in:
Enno Rehling 2002-01-21 00:31:43 +00:00
parent e64d9a8221
commit 153dcc0a55
5 changed files with 146 additions and 134 deletions

View File

@ -1905,7 +1905,7 @@ attack(battle *b, troop ta, const att *a)
ta.fighter->action_counter++; ta.fighter->action_counter++;
} }
if (hits(ta, td, wp)) { if (wp && hits(ta, td, wp)) {
const char * d; const char * d;
if (wp == NULL) d = au->race->def_damage; if (wp == NULL) d = au->race->def_damage;
else if (riding(ta)) d = wp->type->damage[1]; else if (riding(ta)) d = wp->type->damage[1];

View File

@ -137,6 +137,8 @@ const char *race_prefixes[] = {
"prefix_Frost", "prefix_Frost",
"prefix_Finster", "prefix_Finster",
"prefix_Duester", "prefix_Duester",
"prefix_flame",
"prefix_ice",
NULL NULL
}; };

View File

@ -251,126 +251,6 @@
<text locale="en">autumn</text> <text locale="en">autumn</text>
</message> </message>
<message name="prefix_Dunkel">
<text locale="de">Dunkel</text>
<text locale="en">dark </text>
</message>
<message name="prefix_Licht">
<text locale="de">Licht</text>
<text locale="en">light </text>
</message>
<message name="prefix_Klein">
<text locale="de">Klein</text>
<text locale="en">gully </text>
</message>
<message name="prefix_Hoch">
<text locale="de">Hoch</text>
<text locale="en">high </text>
</message>
<message name="prefix_Huegel">
<text locale="de">Hügel</text>
<text locale="en">hill </text>
</message>
<message name="prefix_Berg">
<text locale="de">Berg</text>
<text locale="en">mountain </text>
</message>
<message name="prefix_Wald">
<text locale="de">Wald</text>
<text locale="en">wood </text>
</message>
<message name="prefix_Sumpf">
<text locale="de">Sumpf</text>
<text locale="en">swamp </text>
</message>
<message name="prefix_Schnee">
<text locale="de">Schnee</text>
<text locale="en">snow </text>
</message>
<message name="prefix_Sonnen">
<text locale="de">Sonnen</text>
<text locale="en">sun </text>
</message>
<message name="prefix_Mond">
<text locale="de">Mond</text>
<text locale="en">moon </text>
</message>
<message name="prefix_See">
<text locale="de">See</text>
<text locale="en">sea </text>
</message>
<message name="prefix_Tal">
<text locale="de">Tal</text>
<text locale="en">valley </text>
</message>
<message name="prefix_Schatten">
<text locale="de">Schatten</text>
<text locale="en">shadow </text>
</message>
<message name="prefix_Hoehlen">
<text locale="de">Höhlen</text>
<text locale="en">cave </text>
</message>
<message name="prefix_Blut">
<text locale="de">Blut</text>
<text locale="en">blood </text>
</message>
<message name="prefix_Wild">
<text locale="de">Wild</text>
<text locale="en">wild </text>
</message>
<message name="prefix_Chaos">
<text locale="de">Chaos</text>
<text locale="en">chaos </text>
</message>
<message name="prefix_Nacht">
<text locale="de">Nacht</text>
<text locale="en">night </text>
</message>
<message name="prefix_Nebel">
<text locale="de">Nebel</text>
<text locale="en">mist </text>
</message>
<message name="prefix_Grau">
<text locale="de">Grau</text>
<text locale="en">grey </text>
</message>
<message name="prefix_Frost">
<text locale="de">Frost</text>
<text locale="en">cold </text>
</message>
<message name="prefix_Finster">
<text locale="de">Finster</text>
<text locale="en">gloom </text>
</message>
<message name="prefix_Duester">
<text locale="de">Düster</text>
<text locale="en">black </text>
</message>
<message name="nr_template"> <message name="nr_template">
<text locale="de">Vorlage für den nächsten Zug:</text> <text locale="de">Vorlage für den nächsten Zug:</text>
<text locale="en">Template for the next turn:</text> <text locale="en">Template for the next turn:</text>

View File

@ -5,6 +5,136 @@
</comment> </comment>
<strings> <strings>
<string name="prefix_Dunkel">
<text locale="de">Dunkel</text>
<text locale="en">dark </text>
</string>
<string name="prefix_Licht">
<text locale="de">Licht</text>
<text locale="en">light </text>
</string>
<string name="prefix_flame">
<text locale="de">Flammen</text>
<text locale="en">flame</text>
</string>
<string name="prefix_ice">
<text locale="de">Eis</text>
<text locale="en">ice</text>
</string>
<string name="prefix_Klein">
<text locale="de">Klein</text>
<text locale="en">gully </text>
</string>
<string name="prefix_Hoch">
<text locale="de">Hoch</text>
<text locale="en">high </text>
</string>
<string name="prefix_Huegel">
<text locale="de">Hügel</text>
<text locale="en">hill </text>
</string>
<string name="prefix_Berg">
<text locale="de">Berg</text>
<text locale="en">mountain </text>
</string>
<string name="prefix_Wald">
<text locale="de">Wald</text>
<text locale="en">wood </text>
</string>
<string name="prefix_Sumpf">
<text locale="de">Sumpf</text>
<text locale="en">swamp </text>
</string>
<string name="prefix_Schnee">
<text locale="de">Schnee</text>
<text locale="en">snow </text>
</string>
<string name="prefix_Sonnen">
<text locale="de">Sonnen</text>
<text locale="en">sun </text>
</string>
<string name="prefix_Mond">
<text locale="de">Mond</text>
<text locale="en">moon </text>
</string>
<string name="prefix_See">
<text locale="de">See</text>
<text locale="en">sea </text>
</string>
<string name="prefix_Tal">
<text locale="de">Tal</text>
<text locale="en">valley </text>
</string>
<string name="prefix_Schatten">
<text locale="de">Schatten</text>
<text locale="en">shadow </text>
</string>
<string name="prefix_Hoehlen">
<text locale="de">Höhlen</text>
<text locale="en">cave </text>
</string>
<string name="prefix_Blut">
<text locale="de">Blut</text>
<text locale="en">blood </text>
</string>
<string name="prefix_Wild">
<text locale="de">Wild</text>
<text locale="en">wild </text>
</string>
<string name="prefix_Chaos">
<text locale="de">Chaos</text>
<text locale="en">chaos </text>
</string>
<string name="prefix_Nacht">
<text locale="de">Nacht</text>
<text locale="en">night </text>
</string>
<string name="prefix_Nebel">
<text locale="de">Nebel</text>
<text locale="en">mist </text>
</string>
<string name="prefix_Grau">
<text locale="de">Grau</text>
<text locale="en">grey </text>
</string>
<string name="prefix_Frost">
<text locale="de">Frost</text>
<text locale="en">cold </text>
</string>
<string name="prefix_Finster">
<text locale="de">Finster</text>
<text locale="en">gloom </text>
</string>
<string name="prefix_Duester">
<text locale="de">Düster</text>
<text locale="en">black </text>
</string>
<comment>Küsten</comment> <comment>Küsten</comment>
<string name="Nordwestküste"> <string name="Nordwestküste">
<text locale="de">Nordwestküste</text> <text locale="de">Nordwestküste</text>