--- deliantra/server/common/living.C 2007/05/22 10:49:57 1.63 +++ deliantra/server/common/living.C 2008/12/04 01:07:34 1.91 @@ -1,29 +1,27 @@ /* - * CrossFire, A Multiplayer game + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen * - * This program is free software; you can redistribute it and/or modify + * Deliantra is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at + * along with this program. If not, see . + * + * The authors can be reached via e-mail to */ #include -#include /* Handy little macro that adds exp and keeps it within bounds. Since * we are now using 64 bit values, I'm not all concerned about overflow issues @@ -283,21 +281,24 @@ int change_abil (object *op, object *tmp) { - int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0; + int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1; + int success = 0; char message[MAX_BUF]; int potion_max = 0; - /* remember what object was like before it was changed. note that - * refop is a local copy of op only to be used for detecting changes - * found by update_stats. refop is not a real object - */ - object_copy refop = *op; + // keep some stats for comparison purposes + object::flags_t prev_flag = op->flag; + MoveType prev_move_type = op->move_type; + sint16 prev_resist [NROFATTACKS]; // clumsy + assert (sizeof (prev_resist) == sizeof (op->resist)); + memcpy (prev_resist, op->resist, sizeof (prev_resist)); if (op->type == PLAYER) { if (tmp->type == POTION) { potion_max = 1; + for (int j = 0; j < NUM_STATS; j++) { int ostat = op->contr->orig_stats.stat (j); @@ -306,15 +307,14 @@ /* nstat is what the stat will be after use of the potion */ int nstat = flag * i + ostat; - /* Do some bounds checking. While I don't think any - * potions do so right now, there is the potential for potions + /* Do some bounds checking. There is the potential for potions * that adjust that stat by more than one point, so we need * to allow for that. */ if (nstat < 1 && i * flag < 0) nstat = 1; - else if (nstat > 20 + op->arch->clone.stats.stat (j)) - nstat = 20 + op->arch->clone.stats.stat (j); + else if (nstat > 20 + op->arch->stats.stat (j)) + nstat = 20 + op->arch->stats.stat (j); if (nstat != ostat) { @@ -369,19 +369,19 @@ DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red."); } - if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE)) + if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE]) { success = 1; DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore."); } - if (QUERY_FLAG (op, FLAG_REFL_MISSILE) != QUERY_FLAG (&refop, FLAG_REFL_MISSILE)) + if (op->flag [FLAG_REFL_MISSILE] != prev_flag [FLAG_REFL_MISSILE]) { success = 1; DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away."); } - if (QUERY_FLAG (op, FLAG_REFL_SPELL) != QUERY_FLAG (&refop, FLAG_REFL_SPELL)) + if (op->flag [FLAG_REFL_SPELL] != prev_flag [FLAG_REFL_SPELL]) { success = 1; DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow."); @@ -393,7 +393,7 @@ * can be misleading (a little higher could be miscontrued from * from fly high) */ - if (tmp->move_type && op->move_type != refop.move_type) + if (tmp->move_type && op->move_type != prev_move_type) { success = 1; @@ -402,7 +402,7 @@ */ if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH)) { - DIFF_MSG (flag, "You start to float in the air!.", "You float down to the ground."); + DIFF_MSG (flag, "You start to float in the air!", "You float down to the ground."); } if (tmp->move_type & MOVE_FLY_HIGH) @@ -424,8 +424,8 @@ /* becoming UNDEAD... a special treatment for this flag. Only those not * originally undead may change their status */ - if (!QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) - if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) + if (!op->arch->flag [FLAG_UNDEAD]) + if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD]) { success = 1; if (flag > 0) @@ -435,18 +435,18 @@ } else { - op->race = op->arch->clone.race; + op->race = op->arch->race; new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); } } - if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) + if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH]) { success = 1; DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily."); } - if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS)) + if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS]) { success = 1; DIFF_MSG (flag, "You become transparent.", "You can see yourself."); @@ -455,12 +455,12 @@ /* blinded you can tell if more blinded since blinded player has minimal * vision */ - if (QUERY_FLAG (tmp, FLAG_BLIND)) + if (tmp->flag [FLAG_BLIND]) { success = 1; if (flag > 0) { - if (QUERY_FLAG (op, FLAG_WIZ)) + if (op->flag [FLAG_WIZ]) new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded."); else { @@ -472,7 +472,7 @@ } else { - if (QUERY_FLAG (op, FLAG_WIZ)) + if (op->flag [FLAG_WIZ]) new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again."); else { @@ -484,7 +484,7 @@ } } - if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) != QUERY_FLAG (&refop, FLAG_SEE_IN_DARK)) + if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK]) { success = 1; if (op->type == PLAYER) @@ -492,12 +492,12 @@ DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark."); } - if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS)) + if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS]) { success = 1; if (flag > 0) { - if (QUERY_FLAG (op, FLAG_WIZ)) + if (op->flag [FLAG_WIZ]) new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer."); else { @@ -508,7 +508,7 @@ } else { - if (QUERY_FLAG (op, FLAG_WIZ)) + if (op->flag [FLAG_WIZ]) new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus."); else { @@ -556,29 +556,26 @@ if (i == ATNR_PHYSICAL) continue; /* Don't display about armour */ - if (op->resist[i] != refop.resist[i]) + if (op->resist [i] != prev_resist [i]) { success = 1; - if (op->resist[i] > refop.resist[i]) - sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]); + + if (op->resist [i] > prev_resist [i]) + sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]); else - sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]); + sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]); new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message); } } if (!potion_max) - { - for (int j = 0; j < NUM_STATS; j++) + for (int j = 0; j < NUM_STATS; j++) + if (int i = tmp->stats.stat (j)) { - if (int i = tmp->stats.stat (j)) - { - success = 1; - DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); - } + success = 1; + DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); } - } return success; } @@ -687,7 +684,7 @@ { for (int i = 0; i < NUM_STATS; ++i) { - sint8 v = arch->clone.stats.stat (i); + sint8 v = arch->stats.stat (i); stats.stat (i) -= v; contr->orig_stats.stat (i) -= v; } @@ -701,12 +698,52 @@ { for (int i = 0; i < NUM_STATS; ++i) { - sint8 v = arch->clone.stats.stat (i); + sint8 v = arch->stats.stat (i); stats.stat (i) += v; contr->orig_stats.stat (i) += v; } } +/* These are the items that currently can change digestion, regeneration, + * spell point recovery and mana point recovery. Seems sort of an arbitary + * list, but other items store other info into stats array. + */ +static struct digest_types : std::bitset +{ + digest_types () + { + set (WEAPON); + set (BOW); + set (ARMOUR); + set (HELMET); + set (SHIELD); + set (RING); + set (BOOTS); + set (GLOVES); + set (AMULET); + set (GIRDLE); + set (BRACERS); + set (CLOAK); + set (DISEASE); + set (FORCE); + set (SKILL); + } +} digest_types; + +static struct copy_flags : object::flags_t +{ + copy_flags () + { + set (FLAG_LIFESAVE); + set (FLAG_REFL_SPELL); + set (FLAG_REFL_MISSILE); + set (FLAG_STEALTH); + set (FLAG_XRAYS); + set (FLAG_BLIND); + set (FLAG_SEE_IN_DARK); + } +} copy_flags; + /* * Updates all abilities given by applied objects in the inventory * of the given object. Note: This function works for both monsters @@ -720,19 +757,19 @@ void object::update_stats () { - int i, j; - float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; + float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1; int weapon_weight = 0, weapon_speed = 0; int best_wc = 0, best_ac = 0, wc = 0, ac = 0; int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; object *grace_obj = NULL, *mana_obj = NULL, *tmp; float old_speed = speed; + int stat_sum [NUM_STATS]; /* First task is to clear all the values back to their original values */ if (type == PLAYER) { - for (i = 0; i < NUM_STATS; i++) - stats.stat (i) = contr->orig_stats.stat (i); + for (int i = 0; i < NUM_STATS; i++) + stat_sum [i] = contr->orig_stats.stat (i); if (settings.spell_encumbrance == TRUE) contr->encumbrance = 0; @@ -762,25 +799,25 @@ CLEAR_FLAG (this, FLAG_STEALTH); CLEAR_FLAG (this, FLAG_BLIND); - if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); - if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); - if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); - if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); - - path_attuned = arch->clone.path_attuned; - path_repelled = arch->clone.path_repelled; - path_denied = arch->clone.path_denied; - glow_radius = arch->clone.glow_radius; - move_type = arch->clone.move_type; + if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); + if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); + if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); + if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); + + path_attuned = arch->path_attuned; + path_repelled = arch->path_repelled; + path_denied = arch->path_denied; + glow_radius = arch->glow_radius; + move_type = arch->move_type; chosen_skill = 0; /* initializing resistances from the values in player/monster's * archetype clone */ - memcpy (&resist, &arch->clone.resist, sizeof (resist)); + memcpy (&resist, &arch->resist, sizeof (resist)); - for (i = 0; i < NROFATTACKS; i++) + for (int i = 0; i < NROFATTACKS; i++) { if (resist[i] > 0) prot[i] = resist[i], vuln[i] = 0; @@ -790,8 +827,8 @@ potion_resist[i] = 0; } - wc = arch->clone.stats.wc; - stats.dam = arch->clone.stats.dam; + wc = arch->stats.wc; + stats.dam = arch->stats.dam; /* for players which cannot use armour, they gain AC -1 per 3 levels, * plus a small amount of physical resist, those poor suckers. ;) @@ -802,26 +839,20 @@ */ if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) { - ac = MAX (-10, arch->clone.stats.ac - level / 3); + ac = max (-10, arch->stats.ac - level / 3); prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; } else - ac = arch->clone.stats.ac; + ac = arch->stats.ac; - stats.luck = arch->clone.stats.luck; - speed = arch->clone.speed; + stats.luck = arch->stats.luck; + speed = arch->speed; /* OK - we've reset most all the objects attributes to sane values. * now go through and make adjustments for what the player has equipped. */ for (tmp = inv; tmp; tmp = tmp->below) { - /* See note in map.c:update_position about making this additive - * since light sources are never applied, need to put check here. - */ - if (tmp->glow_radius > glow_radius) - glow_radius = tmp->glow_radius; - /* This happens because apply_potion calls change_abil with the potion * applied so we can tell the player what changed. But change_abil * then calls this function. @@ -829,6 +860,11 @@ if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) continue; + /* See note in map.c:update_position about making this additive + * since light sources are never applied, need to put check here. + */ + glow_radius = max (glow_radius, tmp->glow_radius); + /* For some things, we don't care what is equipped */ if (tmp->type == SKILL) { @@ -850,7 +886,7 @@ } } - /* Container objects are not meant to adjust a players, but other applied + /* Container objects are not meant to adjust players, but other applied * objects need to make adjustments. * This block should handle all player specific changes * The check for Praying is a bit of a hack - god given bonuses are put @@ -867,6 +903,8 @@ { if (type == PLAYER) { + contr->item_power += tmp->item_power; + if (tmp == contr->combat_ob || tmp == contr->ranged_ob) if (tmp != current_weapon && (tmp->type != SKILL || tmp->subtype != SK_PRAYING) @@ -874,28 +912,17 @@ && !tmp->flag [FLAG_DAMNED]) continue; - for (i = 0; i < NUM_STATS; i++) - change_attr_value (&stats, i, tmp->stats.stat (i)); + for (int i = 0; i < NUM_STATS; i++) + stat_sum [i] = stat_sum [i] + tmp->stats.stat (i); - /* These are the items that currently can change digestion, regeneration, - * spell point recovery and mana point recovery. Seems sort of an arbitary - * list, but other items store other info into stats array. - */ - if (tmp->type == WEAPON || tmp->type == BOW || - tmp->type == ARMOUR || tmp->type == HELMET || - tmp->type == SHIELD || tmp->type == RING || - tmp->type == BOOTS || tmp->type == GLOVES || - tmp->type == AMULET || tmp->type == GIRDLE || - tmp->type == BRACERS || tmp->type == CLOAK || - tmp->type == DISEASE || tmp->type == FORCE || - tmp->type == SKILL) + if (digest_types [tmp->type]) { contr->digestion += tmp->stats.food; contr->gen_hp += tmp->stats.hp; - contr->gen_sp += tmp->stats.sp; + if (tmp->type != BOW) // ugly exception for bows + contr->gen_sp += tmp->stats.sp; contr->gen_grace += tmp->stats.grace; contr->gen_sp_armour += tmp->gen_sp_armour; - contr->item_power += tmp->item_power; } } /* if this is a player */ else @@ -906,25 +933,21 @@ /* Update slots used for items */ if (QUERY_FLAG (tmp, FLAG_APPLIED)) - for (i = 0; i < NUM_BODY_LOCATIONS; i++) + for (int i = 0; i < NUM_BODY_LOCATIONS; i++) slot[i].used += tmp->slot[i].info; if (tmp->type == SYMPTOM) - { - speed_reduce_from_disease = tmp->last_sp / 100.f; + speed_reduce_from_disease = + min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f); - if (speed_reduce_from_disease == 0) - speed_reduce_from_disease = 1; - } - - /* Pos. and neg. protections are counted seperate (-> pro/vuln). + /* Pos. and neg. protections are counted separate (-> pro/vuln). * (Negative protections are calculated exactly like positive.) * Resistance from potions are treated special as well. If there's * more than one potion-effect, the bigger prot.-value is taken. */ if (tmp->type != POTION) { - for (i = 0; i < NROFATTACKS; i++) + for (int i = 0; i < NROFATTACKS; i++) { /* Potential for cursed potions, in which case we just can use * a straight MAX, as potion_resist is initialised to zero. @@ -932,7 +955,7 @@ if (tmp->type == POTION_EFFECT) { if (potion_resist[i]) - potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); + potion_resist[i] = max (potion_resist[i], tmp->resist[i]); else potion_resist[i] = tmp->resist[i]; } @@ -954,15 +977,9 @@ stats.luck += tmp->stats.luck; } - if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); - if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL); - if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE); - if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH); - if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS); - if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND); - if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK); + flag |= tmp->flag & copy_flags; - if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD)) + if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD)) SET_FLAG (this, FLAG_UNDEAD); if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) @@ -1127,13 +1144,14 @@ if (tmp->stats.ac) ac -= (tmp->stats.ac + tmp->magic); - if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max) - max = ARMOUR_SPEED (tmp) / 10.f; + if (ARMOUR_SPEED (tmp)) + max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); break; } /* switch tmp->type */ } /* item is equipped */ } /* for loop of items */ + fprintf (stderr, "gr %s %d\n", &name, glow_radius);//D /* We've gone through all the objects the player has equipped. For many things, we * have generated intermediate values which we now need to assign. @@ -1145,7 +1163,7 @@ * If there is a cursed (and no uncursed) potion in effect, we take * 'total resistance = vulnerability from cursed potion'. */ - for (i = 0; i < NROFATTACKS; i++) + for (int i = 0; i < NROFATTACKS; i++) { resist[i] = prot[i] - vuln[i]; @@ -1153,9 +1171,15 @@ resist[i] = potion_resist[i]; } - /* Figure out the players sp/mana/hp totals. */ if (type == PLAYER) { + // clamp various player stats + for (int i = 0; i < NUM_STATS; ++i) + stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT); + + contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION); + + /* Figure out the players sp/mana/hp totals. */ int pl_level; check_stat_bounds (&(stats)); @@ -1167,23 +1191,21 @@ /* You basically get half a con bonus/level. But we do take into account rounding, * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. */ - for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++) + stats.maxhp = 0; + for (int i = 1; i <= min (10, pl_level); i++) { - j = contr->levhp[i] + con_bonus[stats.Con] / 2; + int j = contr->levhp[i] + con_bonus[stats.Con] / 2; if (i % 2 && con_bonus[stats.Con] % 2) - { - if (con_bonus[stats.Con] > 0) - j++; - else - j--; - } + if (con_bonus[stats.Con] > 0) + j++; + else + j--; stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */ } - for (i = 11; i <= level; i++) - stats.maxhp += 2; + stats.maxhp += 2 * max (0, level - 10); if (stats.hp > stats.maxhp) stats.hp = stats.maxhp; @@ -1206,9 +1228,9 @@ stats.maxsp = 1; else { - sp_tmp = 0.f; + float sp_tmp = 0.f; - for (i = 1; i <= mana_obj->level && i <= 10; i++) + for (int i = 1; i <= min (10, mana_obj->level); i++) { float stmp; @@ -1218,21 +1240,14 @@ else stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f; - if (stmp < 1.f) - stmp = 1.f; - - sp_tmp += stmp; + sp_tmp += max (1.f, stmp); } - stats.maxsp = (sint16)sp_tmp; - - for (i = 11; i <= mana_obj->level; i++) - stats.maxsp += 2; + stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10); } /* Characters can get their sp supercharged via rune of transferrance */ - if (stats.sp > stats.maxsp * 2) - stats.sp = stats.maxsp * 2; + stats.sp = min (stats.sp, stats.maxsp * 2); /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */ if (!grace_obj || !grace_obj->level || type != PLAYER) @@ -1247,8 +1262,9 @@ * becomes big jumps when the sums of the bonuses jump to the next * step of 8 - with floats, even fractional ones are useful. */ - sp_tmp = 0.f; - for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) + float sp_tmp = 0.f; + + for (int i = 1; i <= min (10, grace_obj->level); i++) { float grace_tmp = 0.f; @@ -1258,17 +1274,11 @@ else grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f; - if (grace_tmp < 1.f) - grace_tmp = 1.f; - - sp_tmp += grace_tmp; + sp_tmp += max (1.f, grace_tmp); } - stats.maxgrace = (sint16)sp_tmp; - - /* two grace points per level after 11 */ - for (i = 11; i <= grace_obj->level; i++) - stats.maxgrace += 2; + /* two grace points per level after 10 */ + stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10); } /* No limit on grace vs maxgrace */ @@ -1298,7 +1308,7 @@ { wc -= wc_obj->level + thaco_bonus[stats.Str]; - for (i = 1; i < wc_obj->level; i++) + for (int i = 1; i < wc_obj->level; i++) { /* additional wc every 6 levels */ if (!(i % 6)) @@ -1323,7 +1333,7 @@ speed -= 1; if (attacktype == 0) - attacktype = arch->clone.attacktype; + attacktype = arch->attacktype; } /* End if player */ if (added_speed >= 0) @@ -1332,8 +1342,7 @@ speed /= 1.f - added_speed; /* Max is determined by armour */ - if (speed > max) - speed = max; + speed = min (speed, max_speed); if (type == PLAYER) { @@ -1342,20 +1351,22 @@ * weight limit, then player suffers a speed reduction based on how * much above he is, and what is max carry is */ - f = (carrying / 1000) - max_carry[stats.Str]; - if (f > 0) + float f = (carrying / 1000) - max_carry[stats.Str]; + if (f > 0.f) speed = speed / (1.f + f / max_carry[stats.Str]); } speed += bonus_speed / 10.f; /* Not affected by limits */ + speed *= speed_reduce_from_disease; /* Put a lower limit on speed. Note with this speed, you move once every - * 100 ticks or so. This amounts to once every 12 seconds of realtime. + * 25 ticks or so. This amounts to once every 3 seconds of realtime. */ - speed = speed * speed_reduce_from_disease; + if (speed < 0.04f && type == PLAYER) + speed = 0.04f; - if (speed < 0.01f && type == PLAYER) - speed = 0.01f; + if (speed != old_speed) + set_speed (speed); if (type == PLAYER) { @@ -1380,8 +1391,8 @@ } /* I want to limit the power of small monsters with big weapons: */ - if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3) - stats.dam = arch->clone.stats.dam * 3; + if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3) + stats.dam = arch->stats.dam * 3; stats.wc = clamp (wc, MIN_WC, MAX_WC); stats.ac = clamp (ac, MIN_AC, MAX_AC); @@ -1397,9 +1408,6 @@ else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) move_type &= ~MOVE_WALK; - if (speed != old_speed) - set_speed (speed); - /* It is quite possible that a player's spell costing might have changed, * so we will check that now. */ @@ -1437,11 +1445,6 @@ * set the new dragon name after gaining levels or * changing ability focus (later this can be extended to * eventually change the player's face and animation) - * - * Note that the title is written to 'own_title' in the - * player struct. This should be changed to 'ext_title' - * as soon as clients support this! - * Please, anyone, write support for 'ext_title'. */ void set_dragon_name (object *pl, const object *abil, const object *skin) @@ -1469,29 +1472,17 @@ if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) atnr = abil->stats.exp; - level = (int) (level / 5.); - /* now set the new title */ - if (pl->contr != NULL) + if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); + else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]); + else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]); + else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]); + else { - if (level == 0) - sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); - else if (level == 1) - sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); - else if (level == 2) - sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); - else if (level == 3) - sprintf (pl->contr->title, "%s dragon", attacks[atnr]); - else - { - /* special titles for extra high resistance! */ - if (skin->resist[atnr] > 80) - sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); - else if (skin->resist[atnr] > 50) - sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); - else - sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); - } + /* special titles for extra high resistance! */ + if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); + else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]); + else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]); } strcpy (pl->contr->own_title, ""); @@ -1511,14 +1502,11 @@ char buf[MAX_BUF]; /* tmp. string buffer */ /* now grab the 'dragon_ability'-forces from the player's inventory */ - shstr_cmp dragon_ability_force ("dragon_ability_force"); - shstr_cmp dragon_skin_force ("dragon_skin_force"); - for (tmp = who->inv; tmp; tmp = tmp->below) if (tmp->type == FORCE) - if (tmp->arch->name == dragon_ability_force) + if (tmp->arch->archname == shstr_dragon_ability_force) abil = tmp; - else if (tmp->arch->name == dragon_skin_force) + else if (tmp->arch->archname == shstr_dragon_skin_force) skin = tmp; /* if the force is missing -> bail out */ @@ -1571,7 +1559,7 @@ skill_obj = get_archetype_by_skill_name (skill_name, SKILL); if (!skill_obj) { - LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); + LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name); return NULL; } @@ -1581,14 +1569,10 @@ CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); skill_obj->stats.exp = 0; skill_obj->level = 1; - insert_ob_in_ob (skill_obj, op); + op->insert (skill_obj); if (player *pl = op->contr) - { - pl->last_skill_ob [skill_obj->subtype] = skill_obj; - if (pl->ns) - pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous - } + pl->link_skills (); return skill_obj; } @@ -1604,12 +1588,15 @@ player_lvl_adj (object *who, object *op) { char buf[MAX_BUF]; + bool changed = false; if (!op) /* when rolling stats */ op = who; - if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) + while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) { + changed = true; + op->level++; if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who)) @@ -1623,37 +1610,44 @@ who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1; } - who->update_stats (); if (op->level > 1) { if (op->type != PLAYER) - sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); + { + who->contr->play_sound (sound_find ("skill_up")); + sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); + } else - sprintf (buf, "You are now level %d.", op->level); + { + who->contr->play_sound (sound_find ("level_up")); + sprintf (buf, "You are now level %d.", op->level); + } if (who) new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); } - - player_lvl_adj (who, op); /* To increase more levels */ } - else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) + + while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) { + changed = true; + op->level--; - who->update_stats (); if (op->type != PLAYER) { sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); } - - player_lvl_adj (who, op); /* To decrease more levels */ } - /* check if the spell data has changed */ - esrv_update_stats (who->contr); - esrv_update_spells (who->contr); + if (changed) + { + who->update_stats (); + esrv_update_stats (who->contr); + /* check if the spell data has changed */ + esrv_update_spells (who->contr); + } } /* @@ -1707,7 +1701,7 @@ static void add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) { - object *skill_obj = NULL; + object *skill_obj; sint64 limit, exp_to_add; int i; @@ -1720,29 +1714,22 @@ * chosen_skill. This means we don't need to search through * the players inventory. */ + skill_obj = 0; + if (skill_name) { - if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) - skill_obj = op->chosen_skill; - else + skill_obj = op->contr->find_skill (skill_name); + + /* Player doesn't have the skill. Check to see what to do, and give + * it to the player if necessary + */ + if (!skill_obj) { - for (i = 0; i < NUM_SKILLS; i++) - if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name)) - { - skill_obj = op->contr->last_skill_ob[i]; - break; - } + if (flag == SK_EXP_NONE) + return; - /* Player doesn't have the skill. Check to see what to do, and give - * it to the player if necessary - */ - if (!skill_obj) - { - if (flag == SK_EXP_NONE) - return; - else if (flag == SK_EXP_ADD_SKILL) - give_skill_by_name (op, skill_name); - } + if (flag == SK_EXP_ADD_SKILL) + skill_obj = give_skill_by_name (op, skill_name); } } @@ -1819,7 +1806,6 @@ return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); } - /* Subtracts experience from player. * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we * only subtract from the matching skill. Otherwise, @@ -1842,7 +1828,7 @@ for (tmp = op->inv; tmp; tmp = tmp->below) if (tmp->type == SKILL && tmp->stats.exp) { - if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) + if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill)) { del_exp = check_exp_loss (tmp, exp); tmp->stats.exp -= del_exp;