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

name vereinheitlicht

This commit is contained in:
Katja Zedel 2002-02-10 20:02:23 +00:00
parent 2383de1f8d
commit 7f01f8db4b
6 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/gamecode/economy.c
View File

@ -548,7 +548,7 @@ givemen(int n, unit * u, unit * u2, const char * cmd)
} else if (u == u2) { } else if (u == u2) {
error = 10; error = 10;
#if RACE_ADJUSTMENTS #if RACE_ADJUSTMENTS
} else if (u->race == new_race[RC_URUK] || u->race == new_race[RC_SNOT]) { } else if (u->race == new_race[RC_URUK] || u->race == new_race[RC_SNOTLING]) {
/* Uruks/Snotlings können nicht an Bauern übergeben werden. */ /* Uruks/Snotlings können nicht an Bauern übergeben werden. */
error = 307; error = 307;
#endif #endif

2
src/common/gamecode/study.c
View File

@ -474,7 +474,7 @@ learn(void)
continue; continue;
} }
/* snotlings können Talente nur bis T8 lernen */ /* snotlings können Talente nur bis T8 lernen */
if (u->race == new_race[RC_SNOT]){ if (u->race == new_race[RC_SNOTLING]){
if (get_level(u, i) >= 8){ if (get_level(u, i) >= 8){
cmistake(u, findorder(u, u->thisorder), 308, MSG_EVENT); cmistake(u, findorder(u, u->thisorder), 308, MSG_EVENT);
continue; continue;

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

@ -2764,7 +2764,7 @@ wage(const region *r, const unit *u, boolean img)
if (b) esize = buildingeffsize(b, img); if (b) esize = buildingeffsize(b, img);
if (u) { if (u) {
wage = wagetable[esize][u->race == new_race[RC_ORC] || u->race == new_race[RC_SNOT] || u->race == new_race[RC_URUK]]; wage = wagetable[esize][u->race == new_race[RC_ORC] || u->race == new_race[RC_SNOTLING] || u->race == new_race[RC_URUK]];
if (fspecial(u->faction, FS_URBAN)) { if (fspecial(u->faction, FS_URBAN)) {
wage += wagetable[esize][3]; wage += wagetable[esize][3];
} }

2
src/common/kernel/eressea.h
View File

@ -617,7 +617,7 @@ enum {
RC_CAT, RC_CAT,
RC_AQUARIAN, RC_AQUARIAN,
RC_URUK, RC_URUK,
RC_SNOT, RC_SNOTLING,
RC_UNDEAD, /* 12 - Untoter */ RC_UNDEAD, /* 12 - Untoter */
RC_ILLUSION, RC_ILLUSION,

2
src/eressea/korrektur.c
View File

@ -2636,7 +2636,7 @@ orc_conversion(void)
|| get_item(u, I_CHASTITY_BELT) >= u->number) { || get_item(u, I_CHASTITY_BELT) >= u->number) {
u->race = new_race[RC_URUK]; u->race = new_race[RC_URUK];
} else { } else {
u->race = new_race[RC_SNOT]; u->race = new_race[RC_SNOTLING];
} }
} }
} }

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

@ -3144,6 +3144,23 @@
<text locale="en">orc</text> <text locale="en">orc</text>
</string> </string>
<string name="snotling">
<text locale="de">Snotling</text>
<text locale="en">snotling</text>
</string>
<string name="snotling_p">
<text locale="de">Snotlinge</text>
<text locale="en">snotlings</text>
</string>
<string name="snotling_d">
<text locale="de">Snotlingen</text>
<text locale="en">snotlings</text>
</string>
<string name="snotling_x">
<text locale="de">Snotling</text>
<text locale="en">snotling</text>
</string>
<string name="elf"> <string name="elf">
<text locale="de">Elf</text> <text locale="de">Elf</text>
<text locale="en">elf</text> <text locale="en">elf</text>