| … | |
… | |
| 864 | || (tmp->type == SKILL |
864 | || (tmp->type == SKILL |
| 865 | && tmp->subtype == SK_PRAYING)) |
865 | && tmp->subtype == SK_PRAYING)) |
| 866 | { |
866 | { |
| 867 | if (type == PLAYER) |
867 | if (type == PLAYER) |
| 868 | { |
868 | { |
|
|
869 | contr->item_power += tmp->item_power; |
|
|
870 | |
| 869 | if (tmp == contr->combat_ob || tmp == contr->ranged_ob) |
871 | if (tmp == contr->combat_ob || tmp == contr->ranged_ob) |
| 870 | if (tmp != current_weapon |
872 | if (tmp != current_weapon |
| 871 | && (tmp->type != SKILL || tmp->subtype != SK_PRAYING) |
873 | && (tmp->type != SKILL || tmp->subtype != SK_PRAYING) |
| 872 | && !tmp->flag [FLAG_CURSED] |
874 | && !tmp->flag [FLAG_CURSED] |
| 873 | && !tmp->flag [FLAG_DAMNED]) |
875 | && !tmp->flag [FLAG_DAMNED]) |
| … | |
… | |
| 887 | tmp->type == AMULET || tmp->type == GIRDLE || |
889 | tmp->type == AMULET || tmp->type == GIRDLE || |
| 888 | tmp->type == BRACERS || tmp->type == CLOAK || |
890 | tmp->type == BRACERS || tmp->type == CLOAK || |
| 889 | tmp->type == DISEASE || tmp->type == FORCE || |
891 | tmp->type == DISEASE || tmp->type == FORCE || |
| 890 | tmp->type == SKILL) |
892 | tmp->type == SKILL) |
| 891 | { |
893 | { |
| 892 | contr->digestion += tmp->stats.food; |
894 | contr->digestion = clamp (int (contr->digestion) + tmp->stats.food, MIN_DIGESTION, MAX_DIGESTION); |
| 893 | contr->gen_hp += tmp->stats.hp; |
895 | contr->gen_hp += tmp->stats.hp; |
| 894 | contr->gen_sp += tmp->stats.sp; |
896 | contr->gen_sp += tmp->stats.sp; |
| 895 | contr->gen_grace += tmp->stats.grace; |
897 | contr->gen_grace += tmp->stats.grace; |
| 896 | contr->gen_sp_armour += tmp->gen_sp_armour; |
898 | contr->gen_sp_armour += tmp->gen_sp_armour; |
| 897 | contr->item_power += tmp->item_power; |
|
|
| 898 | } |
899 | } |
| 899 | } /* if this is a player */ |
900 | } /* if this is a player */ |
| 900 | else |
901 | else |
| 901 | { |
902 | { |
| 902 | if (tmp->type == WEAPON) |
903 | if (tmp->type == WEAPON) |
| … | |
… | |
| 1508 | object *skin = NULL; /* pointer to dragon skin force */ |
1509 | object *skin = NULL; /* pointer to dragon skin force */ |
| 1509 | object *tmp = NULL; /* tmp. object */ |
1510 | object *tmp = NULL; /* tmp. object */ |
| 1510 | char buf[MAX_BUF]; /* tmp. string buffer */ |
1511 | char buf[MAX_BUF]; /* tmp. string buffer */ |
| 1511 | |
1512 | |
| 1512 | /* now grab the 'dragon_ability'-forces from the player's inventory */ |
1513 | /* now grab the 'dragon_ability'-forces from the player's inventory */ |
| 1513 | shstr_cmp dragon_ability_force ("dragon_ability_force"); |
|
|
| 1514 | shstr_cmp dragon_skin_force ("dragon_skin_force"); |
|
|
| 1515 | |
|
|
| 1516 | for (tmp = who->inv; tmp; tmp = tmp->below) |
1514 | for (tmp = who->inv; tmp; tmp = tmp->below) |
| 1517 | if (tmp->type == FORCE) |
1515 | if (tmp->type == FORCE) |
| 1518 | if (tmp->arch->archname == dragon_ability_force) |
1516 | if (tmp->arch->archname == shstr_dragon_ability_force) |
| 1519 | abil = tmp; |
1517 | abil = tmp; |
| 1520 | else if (tmp->arch->archname == dragon_skin_force) |
1518 | else if (tmp->arch->archname == shstr_dragon_skin_force) |
| 1521 | skin = tmp; |
1519 | skin = tmp; |
| 1522 | |
1520 | |
| 1523 | /* if the force is missing -> bail out */ |
1521 | /* if the force is missing -> bail out */ |
| 1524 | if (abil == NULL) |
1522 | if (abil == NULL) |
| 1525 | return; |
1523 | return; |
