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

http://eressea.upb.de/mantis/view.php?id=458 

Kapazität von Einhörnern
This commit is contained in:
Enno Rehling 2005-03-07 22:55:56 +00:00
parent 5094c5ea2a
commit 4256511b0a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1495,6 +1495,7 @@ init_olditems(void)
switch (i) { switch (i) {
case I_HORSE: case I_HORSE:
case I_UNICORN:
itype->capacity = HORSECAPACITY; itype->capacity = HORSECAPACITY;
itype->give = give_horses; itype->give = give_horses;
break; break;

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

@ -235,7 +235,7 @@ static int
ridingcapacity(unit * u) ridingcapacity(unit * u)
{ {
int n; int n;
int wagen, pferde; int wagen, pferde, unicorns;
n = 0; n = 0;
@ -243,13 +243,15 @@ ridingcapacity(unit * u)
* tragen nichts (siehe walkingcapacity). Ein Wagen zählt nur, wenn er * tragen nichts (siehe walkingcapacity). Ein Wagen zählt nur, wenn er
* von zwei Pferden gezogen wird */ * von zwei Pferden gezogen wird */
pferde = min(get_item(u, I_HORSE), effskill(u, SK_RIDING) * u->number * 2); unicorns = get_item(u, I_UNICORN);
if(fval(u->race, RCF_HORSE)) pferde += u->number; pferde = get_item(u, I_HORSE);
pferde = min(pferde, effskill(u, SK_RIDING) * u->number * 2);
if (fval(u->race, RCF_HORSE)) pferde += u->number;
/* maximal diese Pferde können zum Ziehen benutzt werden */ /* maximal diese Pferde können zum Ziehen benutzt werden */
wagen = min(pferde / HORSESNEEDED, get_item(u, I_WAGON)); wagen = min(pferde / HORSESNEEDED, get_item(u, I_WAGON));
n = wagen * WAGONCAPACITY + pferde * HORSECAPACITY; n = wagen * WAGONCAPACITY + (pferde + unicorns) * HORSECAPACITY;
return n; return n;
} }
@ -262,6 +264,7 @@ walkingcapacity(const struct unit * u)
* die Leute tragen */ * die Leute tragen */
pferde = get_item(u, I_HORSE); pferde = get_item(u, I_HORSE);
unicorns = get_item(u, I_UNICORN);
if (fval(u->race, RCF_HORSE)) { if (fval(u->race, RCF_HORSE)) {
pferde += u->number; pferde += u->number;
personen = 0; personen = 0;
@ -292,6 +295,7 @@ walkingcapacity(const struct unit * u)
} }
n += pferde * HORSECAPACITY; n += pferde * HORSECAPACITY;
n += unicorns * HORSECAPACITY;
n += personen * personcapacity(u); n += personen * personcapacity(u);
/* Goliathwasser */ /* Goliathwasser */
tmp = get_effect(u, oldpotiontype[P_STRONG]); tmp = get_effect(u, oldpotiontype[P_STRONG]);
@ -355,7 +359,7 @@ canfly(unit *u)
{ {
if (get_movement(&u->attribs, MV_CANNOTMOVE)) return false; if (get_movement(&u->attribs, MV_CANNOTMOVE)) return false;
if(get_item(u, I_HORSE)) return false; if(get_item(u, I_HORSE) || get_item(u, I_UNICORN)) return false;
if(get_item(u, I_PEGASUS) >= u->number && effskill(u, SK_RIDING) >= 4) if(get_item(u, I_PEGASUS) >= u->number && effskill(u, SK_RIDING) >= 4)
return true; return true;
@ -373,6 +377,7 @@ canswim(unit *u)
if (get_movement(&u->attribs, MV_CANNOTMOVE)) return false; if (get_movement(&u->attribs, MV_CANNOTMOVE)) return false;
if (get_item(u, I_HORSE)) return false; if (get_item(u, I_HORSE)) return false;
if (get_item(u, I_UNICORN)) return false;
if (get_item(u, I_DOLPHIN) >= u->number && effskill(u, SK_RIDING) >= 4) if (get_item(u, I_DOLPHIN) >= u->number && effskill(u, SK_RIDING) >= 4)
return true; return true;