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

- Fixes

This commit is contained in:
Christian Schlittchen 2002-02-10 20:20:16 +00:00
parent 7f01f8db4b
commit 2a76e58542
5 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ const struct race_syn race_synonyms[] = {
/* required for old_race, do not change order! */ /* required for old_race, do not change order! */
static const char * oldracenames[MAXRACES] = { static const char * oldracenames[MAXRACES] = {
"dwarf", "elf", "orc", "goblin", "human", "troll", "demon", "insect", "halfling", "cat", "aquarian", "uruk" "snotling" "dwarf", "elf", "orc", "goblin", "human", "troll", "demon", "insect", "halfling", "cat", "aquarian", "uruk", "snotling",
"undead", "illusion", "undead", "illusion",
"young dragon", "dragon", "wyrm", "ent", "catdragon", "dracoid", "young dragon", "dragon", "wyrm", "ent", "catdragon", "dracoid",
"special", "spell", "special", "spell",

2
src/common/settings-eressea.h
View File

@ -22,7 +22,7 @@
#define REMOVENMRTIMEOUT 1 #define REMOVENMRTIMEOUT 1
#define HUNGER_DISABLES_LONGORDERS 1 #define HUNGER_DISABLES_LONGORDERS 1
#define REDUCED_PEASANTGROWTH 0 #define REDUCED_PEASANTGROWTH 0
#define RACE_ADJUSTMENTS 0 #define RACE_ADJUSTMENTS 1
#define SKILLPOINTS 1 #define SKILLPOINTS 1
#define TEACHDIFFERENCE 1 #define TEACHDIFFERENCE 1

8
src/eressea/korrektur.c
View File

@ -2623,20 +2623,26 @@ orc_conversion(void)
{ {
faction *f; faction *f;
unit *u; unit *u;
region *r;
for(f=factions; f; f=f->next) { for(f=factions; f; f=f->next) {
if(f->race == new_race[RC_ORC]) { if(f->race == new_race[RC_ORC]) {
f->race = new_race[RC_URUK]; f->race = new_race[RC_URUK];
} }
for(u=f->units; u; u=u->next) { }
for(r=regions; r; r=r->next) {
for(u=r->units; u; u=u->next) {
if(u->race == new_race[RC_ORC]) { if(u->race == new_race[RC_ORC]) {
/* convert to either uruk or snotling */ /* convert to either uruk or snotling */
if(effskill(u, SK_MAGIC) >= 1 if(effskill(u, SK_MAGIC) >= 1
|| effskill(u, SK_ALCHEMY) >= 1 || effskill(u, SK_ALCHEMY) >= 1
|| 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];
u->irace = new_race[RC_URUK];
} else { } else {
u->race = new_race[RC_SNOTLING]; u->race = new_race[RC_SNOTLING];
u->irace = new_race[RC_SNOTLING];
} }
} }
} }

4
src/res/de/messages.xml
View File

@ -4562,8 +4562,8 @@
<arg name="target" type="unit"></arg> <arg name="target" type="unit"></arg>
<arg name="report" type="string"></arg> <arg name="report" type="string"></arg>
</type> </type>
<text locale="de">"$unit($spy) gelang es Informationen über $unit(target) herauszubekommen: ${report}."</text> <text locale="de">"$unit($spy) gelang es Informationen über $unit(target) herauszubekommen: '$report'."</text>
<text locale="en">"$unit($spy) managed to gather Information about $unit(target): ${report}."</text> <text locale="en">"$unit($spy) managed to gather Information about $unit(target): '$report'."</text>
</message> </message>
<message name="spyfail" section="events"> <message name="spyfail" section="events">

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

@ -3143,6 +3143,40 @@
<text locale="de">Ork</text> <text locale="de">Ork</text>
<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="uruk">
<text locale="de">Ork</text>
<text locale="en">orc</text>
</string>
<string name="uruk_p">
<text locale="de">Orks</text>
<text locale="en">orcs</text>
</string>
<string name="uruk_d">
<text locale="de">Orks</text>
<text locale="en">orcs</text>
</string>
<string name="uruk_x">
<text locale="de">Ork</text>
<text locale="en">orc</text>
</string>
<string name="snotling"> <string name="snotling">
<text locale="de">Snotling</text> <text locale="de">Snotling</text>