ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/living.C
(Generate patch)

Comparing deliantra/server/common/living.C (file contents):
Revision 1.68 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.73 by root, Tue Jul 31 18:08:58 2007 UTC

… …
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;
… …
1601 */ 1599 */
1602void 1600void
1603player_lvl_adj (object *who, object *op) 1601player_lvl_adj (object *who, object *op)
1604{ 1602{
1605 char buf[MAX_BUF]; 1603 char buf[MAX_BUF];
1604 bool changed = false;
1606 1605
1607 if (!op) /* when rolling stats */ 1606 if (!op) /* when rolling stats */
1608 op = who; 1607 op = who;
1609 1608
1610 if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) 1609 while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1611 { 1610 {
1611 changed = true;
1612
1612 op->level++; 1613 op->level++;
1613 1614
1614 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1615 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))
1615 dragon_level_gain (who); 1616 dragon_level_gain (who);
1616 1617
… …
1620 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1; 1621 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1621 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH); 1622 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1622 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1; 1623 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1623 } 1624 }
1624 1625
1625 who->update_stats ();
1626 if (op->level > 1) 1626 if (op->level > 1)
1627 { 1627 {
1628 if (op->type != PLAYER) 1628 if (op->type != PLAYER)
1629 {
1630 who->contr->play_sound (sound_find ("skill_up"));
1629 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1631 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1632 }
1630 else 1633 else
1634 {
1635 who->contr->play_sound (sound_find ("level_up"));
1631 sprintf (buf, "You are now level %d.", op->level); 1636 sprintf (buf, "You are now level %d.", op->level);
1637 }
1632 1638
1633 if (who) 1639 if (who)
1634 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1640 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1635 } 1641 }
1636
1637 player_lvl_adj (who, op); /* To increase more levels */
1638 } 1642 }
1643
1639 else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) 1644 while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1640 { 1645 {
1646 changed = true;
1647
1641 op->level--; 1648 op->level--;
1642 who->update_stats ();
1643 1649
1644 if (op->type != PLAYER) 1650 if (op->type != PLAYER)
1645 { 1651 {
1646 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1652 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1647 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1653 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1648 } 1654 }
1655 }
1649 1656
1650 player_lvl_adj (who, op); /* To decrease more levels */ 1657 if (changed)
1651 } 1658 {
1652 1659 who->update_stats ();
1660 esrv_update_stats (who->contr);
1653 /* check if the spell data has changed */ 1661 /* check if the spell data has changed */
1654 esrv_update_stats (who->contr);
1655 esrv_update_spells (who->contr); 1662 esrv_update_spells (who->contr);
1663 }
1656} 1664}
1657 1665
1658/* 1666/*
1659 * Returns how much experience is needed for a player to become 1667 * Returns how much experience is needed for a player to become
1660 * the given level. level should really never exceed max_level 1668 * the given level. level should really never exceed max_level

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines