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

on a hunch, checking that number of mages is correct. Also, removing invalid familiars.

Browse source
This commit is contained in:
Enno Rehling 2006-04-09 18:10:57 +00:00
parent 64ca5c666e
commit 2f8e9e2053
3 changed files with 1104 additions and 1074 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/common/kernel/eressea.c
View file

@ -504,6 +504,19 @@ static attrib_type at_npcfaction = {
ATF_UNIQUE
};
int
max_magicians(const faction * f)
{
int m = MAXMAGICIANS;
if ((a = a_find(f->attribs, &at_maxmagicians)) != NULL) {
m = a->data.i;
}
if (f->race == new_race[RC_ELF]) ++m;
#ifdef KARMA_MODULE
m += fspecial(f, FS_MAGOCRACY) * 2;
#endif /* KARMA_MODULE */
}
int
max_skill(faction * f, skill_t sk)
{
@ -523,15 +536,7 @@ max_skill(faction * f, skill_t sk)
}
switch (sk) {
case SK_MAGIC:
if((a = a_find(f->attribs, &at_maxmagicians)) != NULL) {
m = a->data.i;
} else {
m = MAXMAGICIANS;
}
if (f->race == new_race[RC_ELF]) m += 1;
#ifdef KARMA_MODULE
m += fspecial(f, FS_MAGOCRACY) * 2;
#endif /* KARMA_MODULE */
m = max_magicians(f);
break;
case SK_ALCHEMY:
m = MAXALCHEMISTS;

2
src/common/kernel/magic.c
View file

@ -2150,7 +2150,9 @@ remove_familiar(unit *mage)
attrib *an;
skillmod_data *smd;
if (a!=NULL) {
a_remove(&mage->attribs, a);
}
a = a_find(mage->attribs, &at_skillmod);
while (a && a->type==&at_skillmod) {
an = a->next;

31
src/eressea/korrektur.c
View file

@ -826,6 +826,27 @@ check_dissolve(void)
}
}
static int
check_mages(void)
{
faction * f;
for (f=factions;f!=NULL;f=f->next) {
if (f->no!=MONSTER_FACTION) {
unit * u;
int mages = 0;
int maxmages = max_skill(f, SK_MAGIC);
for (u = f->units;u!=NULL;u=u->nextF) {
if (is_mage(u) && !is_familiar(u)) ++mages;
}
if (mages>maxmages) {
log_error(("faction %s has %d of max %d magicians.\n",
factionid(u->faction), mages, maxmages));
}
}
}
}
static int
fix_familiars(void)
{
@ -843,15 +864,16 @@ fix_familiars(void)
char fname[64];
if (mage==0) {
log_error(("%s is a %s familiar with no mage for faction %s\n",
log_error(("%s was a %s familiar with no mage for faction %s\n",
unitid(u), racename(lang, u, u->race),
factionid(u->faction)));
a_remove(&u->attribs, a);
} else if (!is_mage(mage)) {
log_error(("%s is a %s familiar, but %s is not a mage for faction %s\n",
log_error(("%s was a %s familiar, but %s is not a mage for faction %s\n",
unitid(u), racename(lang, u, u->race), unitid(mage),
factionid(u->faction)));
}
if (has_skill(u, SK_MAGIC) && !is_mage(u)) {
a_remove(&u->attribs, a);
} else if (has_skill(u, SK_MAGIC) && !is_mage(u)) {
log_error(("%s is a familiar with magic skill, but did not have a mage-attribute\n",
unitid(u)));
create_mage(u, M_GRAU);
@ -1022,6 +1044,7 @@ korrektur(void)
fix_demands();
fix_otherfaction();
fix_familiars();
check_mages();
do_once("tfrs", &fix_resources);
/* trade_orders(); */