diff --git a/src/common/kernel/race.c b/src/common/kernel/race.c index d34c8d9c3..1101239cc 100644 --- a/src/common/kernel/race.c +++ b/src/common/kernel/race.c @@ -155,7 +155,7 @@ const struct race_syn race_synonyms[] = { /* required for old_race, do not change order! */ 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", "young dragon", "dragon", "wyrm", "ent", "catdragon", "dracoid", "special", "spell", diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index 7109f85bb..cf700f8d4 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -22,7 +22,7 @@ #define REMOVENMRTIMEOUT 1 #define HUNGER_DISABLES_LONGORDERS 1 #define REDUCED_PEASANTGROWTH 0 -#define RACE_ADJUSTMENTS 0 +#define RACE_ADJUSTMENTS 1 #define SKILLPOINTS 1 #define TEACHDIFFERENCE 1 diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index 2056b36b1..73584c49b 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -2623,20 +2623,26 @@ orc_conversion(void) { faction *f; unit *u; + region *r; for(f=factions; f; f=f->next) { if(f->race == new_race[RC_ORC]) { 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]) { /* convert to either uruk or snotling */ if(effskill(u, SK_MAGIC) >= 1 || effskill(u, SK_ALCHEMY) >= 1 || get_item(u, I_CHASTITY_BELT) >= u->number) { u->race = new_race[RC_URUK]; + u->irace = new_race[RC_URUK]; } else { u->race = new_race[RC_SNOTLING]; + u->irace = new_race[RC_SNOTLING]; } } } diff --git a/src/res/de/messages.xml b/src/res/de/messages.xml index d4b461868..8e3bacca2 100644 --- a/src/res/de/messages.xml +++ b/src/res/de/messages.xml @@ -4562,8 +4562,8 @@ - "$unit($spy) gelang es Informationen über $unit(target) herauszubekommen: ${report}." - "$unit($spy) managed to gather Information about $unit(target): ${report}." + "$unit($spy) gelang es Informationen über $unit(target) herauszubekommen: '$report'." + "$unit($spy) managed to gather Information about $unit(target): '$report'." diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml index 3945bb3f2..61bd95625 100644 --- a/src/res/de/strings.xml +++ b/src/res/de/strings.xml @@ -3143,6 +3143,40 @@ Ork orc + + + Snotling + snotling + + + Snotlinge + snotlings + + + Snotlingen + snotlings + + + Snotling + snotling + + + + Ork + orc + + + Orks + orcs + + + Orks + orcs + + + Ork + orc + Snotling