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

Bergwächter nur in Bergen und Gletschern, steht in der Beschreibung.

This commit is contained in:
Enno Rehling 2005-04-17 18:24:25 +00:00
parent afa1c2a804
commit 6b69cd9560
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1159,7 +1159,7 @@ entership(unit * u, ship * sh, struct order * ord, boolean lasttry)
getshipweight(sh, &sweight, &scabins); getshipweight(sh, &sweight, &scabins);
sweight += weight(u); sweight += weight(u);
scabins += u->number; scabins += u->number;
sweight = (sweight/100) * 100; /* Silberreste abrunden */ sweight = ((sweight+99) / 100) * 100; /* Silberreste aufrunden */
if (sweight > mweight || scabins > mcabins) { if (sweight > mweight || scabins > mcabins) {
if (lasttry) cmistake(u, ord, 34, MSG_MOVE); if (lasttry) cmistake(u, ord, 34, MSG_MOVE);

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

@ -433,7 +433,7 @@ cansail(const region * r, ship * sh)
if (sh->type->construction && sh->size!=sh->type->construction->maxsize) if (sh->type->construction && sh->size!=sh->type->construction->maxsize)
return false; return false;
getshipweight(sh, &n, &p); getshipweight(sh, &n, &p);
n = (n/100) * 100; /* Silberreste abrunden */ n = ((n+99)/100) * 100; /* Silberreste aufrunden */
if( is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) { if( is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) {
if (sh->type->cargo>500*100) if (sh->type->cargo>500*100)

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

@ -368,7 +368,6 @@ oldfamiliars(unit * familiar)
set_level(familiar, SK_MAGIC, 1); set_level(familiar, SK_MAGIC, 1);
set_level(familiar, SK_MINING, 1); set_level(familiar, SK_MINING, 1);
set_level(familiar, SK_LUMBERJACK, 1); set_level(familiar, SK_LUMBERJACK, 1);
set_level(familiar, SK_ROAD_BUILDING, 1);
set_level(familiar, SK_AUSDAUER, 1); set_level(familiar, SK_AUSDAUER, 1);
m = create_mage(familiar, M_GRAU); m = create_mage(familiar, M_GRAU);
break; break;

5
src/common/kernel/spell.c
View File

@ -2278,6 +2278,11 @@ sp_ironkeeper(castorder *co)
unit *mage = (unit *)co->magician; unit *mage = (unit *)co->magician;
int cast_level = co->level; int cast_level = co->level;
if (rterrain(r) != T_MOUNTAIN && rterrain(r) != T_GLACIER) {
report_failure(mage, co->order);
return 0;
}
keeper = create_unit(r, mage->faction, 1, new_race[RC_IRONKEEPER], 0, "Bergwächter", mage); keeper = create_unit(r, mage->faction, 1, new_race[RC_IRONKEEPER], 0, "Bergwächter", mage);
/*keeper->age = cast_level + 2;*/ /*keeper->age = cast_level + 2;*/