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

improved familiar race selection.

Browse source
This commit is contained in:
Enno Rehling 2012-05-09 10:42:11 -07:00
parent 2c28ea1c41
commit 4f0bdca3ba
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/spells/spells.c
View file

@ -449,11 +449,17 @@ report_effect(region * r, unit * mage, message * seen, message * unseen)
static const race *select_familiar(const race * magerace, magic_t magiegebiet) static const race *select_familiar(const race * magerace, magic_t magiegebiet)
{ {
const race *retval = NULL; const race *retval = 0;
int rnd = rng_int() % 100; int rnd = rng_int() % 100;
assert(magerace->familiars[0]); assert(magerace->familiars[0]);
if (rnd < 3) { if (rnd >= 70) {
retval = magerace->familiars[magiegebiet];
} else {
retval = magerace->familiars[0];
}
if (!retval || rnd < 3) {
race_list *familiarraces = get_familiarraces(); race_list *familiarraces = get_familiarraces();
unsigned int maxlen = listlen(familiarraces); unsigned int maxlen = listlen(familiarraces);
if (maxlen > 0) { if (maxlen > 0) {
@ -464,12 +470,14 @@ static const race *select_familiar(const race * magerace, magic_t magiegebiet)
} }
retval = rclist->data; retval = rclist->data;
} }
} else if (rnd < 70) {
retval = magerace->familiars[0];
} else {
retval = magerace->familiars[magiegebiet];
} }
if (!retval) {
retval = magerace->familiars[0];
}
if (!retval) {
log_error(("select_familiar: No familiar (not even a default) defined for %s.\n", magerace->_name[0]));
}
return retval; return retval;
} }
@ -502,7 +510,7 @@ static int sp_summon_familiar(castorder * co)
unit *mage = co->magician.u; unit *mage = co->magician.u;
int cast_level = co->level; int cast_level = co->level;
const race *rc; const race *rc;
skill_t sk; int sk;
int dh, dh1, bytes; int dh, dh1, bytes;
direction_t d; direction_t d;
message *msg; message *msg;
@ -552,7 +560,7 @@ static int sp_summon_familiar(castorder * co)
dh = 0; dh = 0;
dh1 = 0; dh1 = 0;
for (sk = 0; sk < MAXSKILLS; sk++) { for (sk = 0; sk < MAXSKILLS; ++sk) {
if (skill_enabled[sk] && rc->bonus[sk] > -5) if (skill_enabled[sk] && rc->bonus[sk] > -5)
dh++; dh++;
} }
@ -574,7 +582,7 @@ static int sp_summon_familiar(castorder * co)
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();
} }
bytes = bytes =
(int)strlcpy(bufp, (const char *)skillname(sk, mage->faction->locale), (int)strlcpy(bufp, (const char *)skillname((skill_t)sk, mage->faction->locale),
size); size);
if (wrptr(&bufp, &size, bytes) != 0) if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();