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

- Fix 'schlägt mit Katapult' 

- Detaillierte Kampfmeldungen ausgeschaltet: Zu viele irritierende/falsche
        Texte.
This commit is contained in:
Christian Schlittchen 2002-03-16 14:13:22 +00:00
parent fed21e8d06
commit a00bf6c361
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/kernel/battle.c
View File

@ -1711,16 +1711,15 @@ attack_message(const troop at, const troop dt, const weapon * wp, int dist)
return smallbuf; return smallbuf;
} }
if (dist > 1) { if (dist > 1 || wp->type->itype == olditemtype[I_CATAPULT]) {
sprintf(smallbuf, "%s schießt mit %s auf %s", sprintf(smallbuf, "%s schießt mit %s auf %s",
a_unit, a_unit,
locale_string(default_locale, resourcename(wp->type->itype->rtype, GR_INDEFINITE_ARTICLE)), d_unit); locale_string(default_locale, resourcename(wp->type->itype->rtype, GR_INDEFINITE_ARTICLE)), d_unit);
return smallbuf; } else {
}
sprintf(smallbuf, "%s schlägt mit %s nach %s", sprintf(smallbuf, "%s schlägt mit %s nach %s",
a_unit, a_unit,
locale_string(default_locale, resourcename(wp->type->itype->rtype, GR_INDEFINITE_ARTICLE)), d_unit); locale_string(default_locale, resourcename(wp->type->itype->rtype, GR_INDEFINITE_ARTICLE)), d_unit);
}
return smallbuf; return smallbuf;
} }
@ -3610,11 +3609,16 @@ do_battle(void)
fighter *fig = *fi; fighter *fig = *fi;
b->dh += fig->unit->number; b->dh += fig->unit->number;
} }
#if 0
if (b->dh <= 30) { if (b->dh <= 30) {
b->small = true; b->small = true;
} else { } else {
b->small = false; b->small = false;
} }
#else
b->small = false;
#endif
for (;battle_report(b) && b->turn<=COMBAT_TURNS;++b->turn) { for (;battle_report(b) && b->turn<=COMBAT_TURNS;++b->turn) {
char lbuf[256]; char lbuf[256];

4
src/common/kernel/building.c
View File

@ -642,13 +642,13 @@ static requirement inn_req[] = {
}; };
static const construction inn_bld = { static const construction inn_bld = {
SK_BUILDING, 2, /* skill, minskill */ SK_BUILDING, 2, /* skill, minskill */
10, 10, inn_req, /* maxsize, reqsize, required for size */ -1, 10, inn_req, /* maxsize, reqsize, required for size */
NULL /* improvement */ NULL /* improvement */
}; };
building_type bt_inn = { building_type bt_inn = {
"inn", /* _name */ "inn", /* _name */
BFL_NONE, /* flags */ BFL_NONE, /* flags */
1, 10, -1, /* capac/size, maxcapac, maxsize */ 1, -1, -1, /* capac/size, maxcapac, maxsize */
inn_keep, /* maintenance */ inn_keep, /* maintenance */
&inn_bld, /* construction */ &inn_bld, /* construction */
NULL /* name() */ NULL /* name() */