--- deliantra/server/common/living.C 2007/03/14 04:12:27 1.35 +++ deliantra/server/common/living.C 2007/11/08 19:43:23 1.80 @@ -1,25 +1,24 @@ /* - * CrossFire, A Multiplayer game for X-windows + * 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 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 @@ -235,112 +234,27 @@ }; /* - * sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on - * what attr is (STR to POW). - */ -void -set_attr_value (living *stats, int attr, sint8 value) -{ - switch (attr) - { - case STR: - stats->Str = value; - break; - case DEX: - stats->Dex = value; - break; - case CON: - stats->Con = value; - break; - case WIS: - stats->Wis = value; - break; - case POW: - stats->Pow = value; - break; - case CHA: - stats->Cha = value; - break; - case INT: - stats->Int = value; - break; - } -} - -/* * Like set_attr_value(), but instead the value (which can be negative) * is added to the specified stat. */ void change_attr_value (living *stats, int attr, sint8 value) { - if (value == 0) - return; - - switch (attr) - { - case STR: - stats->Str += value; - break; - case DEX: - stats->Dex += value; - break; - case CON: - stats->Con += value; - break; - case WIS: - stats->Wis += value; - break; - case POW: - stats->Pow += value; - break; - case CHA: - stats->Cha += value; - break; - case INT: - stats->Int += value; - break; - default: - LOG (llevError, "Invalid attribute in change_attr_value: %d\n", attr); - } -} - -/* - * returns the specified stat. See also set_attr_value(). - */ - -sint8 -get_attr_value (const living *stats, int attr) -{ - switch (attr) - { - case STR: return stats->Str; - case DEX: return stats->Dex; - case CON: return stats->Con; - case WIS: return stats->Wis; - case CHA: return stats->Cha; - case INT: return stats->Int; - case POW: return stats->Pow; - } - - return 0; + stats->stat (attr) += value; } /* * Ensures that all stats (str/dex/con/wis/cha/int) are within the * 1-30 stat limit. */ - void check_stat_bounds (living *stats) { - int i, v; - - for (i = 0; i < NUM_STATS; i++) - if ((v = get_attr_value (stats, i)) > MAX_STAT) - set_attr_value (stats, i, MAX_STAT); - else if (v < MIN_STAT) - set_attr_value (stats, i, MIN_STAT); + for (int i = 0; i < NUM_STATS; i++) + { + sint8 &v = stats->stat (i); + v = clamp (v, MIN_STAT, MAX_STAT); + } } #define ORIG_S(xyz,abc) (op->contr->orig_stats.abc) @@ -359,7 +273,7 @@ * It is the calling functions responsibilty to check to see if the object * can be applied or not. * The main purpose of calling this function is the messages that are - * displayed - fix_player should really always be called after this when + * displayed - update_stats should really always be called after this when * removing an object - that is because it is impossible to know if some object * is the only source of an attacktype or spell attunement, so this function * will clear the bits, but the player may still have some other object @@ -368,7 +282,7 @@ int change_abil (object *op, object *tmp) { - int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, i, j, success = 0; + int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0; char message[MAX_BUF]; int potion_max = 0; @@ -383,15 +297,13 @@ if (tmp->type == POTION) { potion_max = 1; - for (j = 0; j < NUM_STATS; j++) + for (int j = 0; j < NUM_STATS; j++) { - int nstat, ostat; - - ostat = get_attr_value (&(op->contr->orig_stats), j); - i = get_attr_value (&(tmp->stats), j); + int ostat = op->contr->orig_stats.stat (j); + int i = tmp->stats.stat (j); /* nstat is what the stat will be after use of the potion */ - nstat = flag * i + ostat; + 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 @@ -400,14 +312,12 @@ */ if (nstat < 1 && i * flag < 0) nstat = 1; - else if (nstat > 20 + get_attr_value (&(op->arch->clone.stats), j)) - { - nstat = 20 + get_attr_value (&(op->arch->clone.stats), j); - } + else if (nstat > 20 + op->arch->stats.stat (j)) + nstat = 20 + op->arch->stats.stat (j); if (nstat != ostat) { - set_attr_value (&(op->contr->orig_stats), j, nstat); + op->contr->orig_stats.stat (j) = nstat; potion_max = 0; } else if (i) @@ -421,35 +331,35 @@ * sure if this is strictly necessary, being that fix_player probably * recalculates this anyway. */ - for (j = 0; j < NUM_STATS; j++) - change_attr_value (&(op->stats), j, flag * get_attr_value (&(tmp->stats), j)); + for (int j = 0; j < NUM_STATS; j++) + change_attr_value (&op->stats, j, flag * tmp->stats.stat (j)); - check_stat_bounds (&(op->stats)); + check_stat_bounds (&op->stats); } /* end of potion handling code */ } - /* reset attributes that fix_player doesn't reset since it doesn't search + /* reset attributes that update_stats doesn't reset since it doesn't search * everything to set */ if (flag == -1) { - op->attacktype &= ~tmp->attacktype; - op->path_attuned &= ~tmp->path_attuned; + op->attacktype &= ~tmp->attacktype; + op->path_attuned &= ~tmp->path_attuned; op->path_repelled &= ~tmp->path_repelled; - op->path_denied &= ~tmp->path_denied; + op->path_denied &= ~tmp->path_denied; /* Presuming here that creatures only have move_type, * and not the other move_ fields. */ - op->move_type &= ~tmp->move_type; + op->move_type &= ~tmp->move_type; } /* call fix_player since op object could have whatever attribute due - * to multiple items. if fix_player always has to be called after + * to multiple items. if update_stats always has to be called after * change_ability then might as well call it from here */ op->update_stats (); - /* Fix player won't add the bows ability to the player, so don't + /* update_stats won't add the bows ability to the player, so don't * print out message if this is a bow. */ if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW) @@ -499,9 +409,10 @@ /* double conditional - second case covers if you have move_fly_low - * in that case, you don't actually land */ - DIFF_MSG (flag, "You soar into the air air!.", + DIFF_MSG (flag, "You soar into the air!", (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground.")); } + if (tmp->move_type & MOVE_SWIM) DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming"); @@ -512,7 +423,7 @@ /* 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->arch, FLAG_UNDEAD)) if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) { success = 1; @@ -523,7 +434,7 @@ } else { - op->race = op->arch->clone.race; + op->race = op->arch->race; new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); } } @@ -639,7 +550,7 @@ } /* Messages for changed resistance */ - for (i = 0; i < NROFATTACKS; i++) + for (int i = 0; i < NROFATTACKS; i++) { if (i == ATNR_PHYSICAL) continue; /* Don't display about armour */ @@ -658,9 +569,9 @@ if (!potion_max) { - for (j = 0; j < NUM_STATS; j++) + for (int j = 0; j < NUM_STATS; j++) { - if ((i = get_attr_value (&(tmp->stats), j)) != 0) + if (int i = tmp->stats.stat (j)) { success = 1; DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); @@ -675,7 +586,6 @@ * Stat draining by Vick 930307 * (Feeling evil, I made it work as well now. -Frank 8) */ - void object::drain_stat () { @@ -774,21 +684,12 @@ void object::remove_statbonus () { - stats.Str -= arch->clone.stats.Str; - stats.Dex -= arch->clone.stats.Dex; - stats.Con -= arch->clone.stats.Con; - stats.Wis -= arch->clone.stats.Wis; - stats.Pow -= arch->clone.stats.Pow; - stats.Cha -= arch->clone.stats.Cha; - stats.Int -= arch->clone.stats.Int; - - contr->orig_stats.Str -= arch->clone.stats.Str; - contr->orig_stats.Dex -= arch->clone.stats.Dex; - contr->orig_stats.Con -= arch->clone.stats.Con; - contr->orig_stats.Wis -= arch->clone.stats.Wis; - contr->orig_stats.Pow -= arch->clone.stats.Pow; - contr->orig_stats.Cha -= arch->clone.stats.Cha; - contr->orig_stats.Int -= arch->clone.stats.Int; + for (int i = 0; i < NUM_STATS; ++i) + { + sint8 v = arch->stats.stat (i); + stats.stat (i) -= v; + contr->orig_stats.stat (i) -= v; + } } /* @@ -797,74 +698,96 @@ void object::add_statbonus () { - stats.Str += arch->clone.stats.Str; - stats.Dex += arch->clone.stats.Dex; - stats.Con += arch->clone.stats.Con; - stats.Wis += arch->clone.stats.Wis; - stats.Pow += arch->clone.stats.Pow; - stats.Cha += arch->clone.stats.Cha; - stats.Int += arch->clone.stats.Int; - - contr->orig_stats.Str += arch->clone.stats.Str; - contr->orig_stats.Dex += arch->clone.stats.Dex; - contr->orig_stats.Con += arch->clone.stats.Con; - contr->orig_stats.Wis += arch->clone.stats.Wis; - contr->orig_stats.Pow += arch->clone.stats.Pow; - contr->orig_stats.Cha += arch->clone.stats.Cha; - contr->orig_stats.Int += arch->clone.stats.Int; + for (int i = 0; i < NUM_STATS; ++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 * and players; the "player" in the name is purely an archaic inheritance. * This functions starts from base values (archetype or player object) * and then adjusts them according to what the player has equipped. + * + * July 95 - inserted stuff to handle new skills/exp system - b.t. + * spell system split, grace points now added to system --peterm */ - -/* July 95 - inserted stuff to handle new skills/exp system - b.t. - spell system split, grace points now added to system --peterm - */ - 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, *wc_obj = NULL, *tmp; + 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++) - set_attr_value (&(stats), i, get_attr_value (&(contr->orig_stats), 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; attacktype = 0; - contr->digestion = 0; - contr->gen_hp = 0; - contr->gen_sp = 0; - contr->gen_grace = 0; - contr->gen_sp_armour = 10; - contr->item_power = 0; - /* Don't clobber all the range_ values. range_golem otherwise - * gets reset for no good reason, and we don't want to reset - * range_magic (what spell is readied). These three below - * well get filled in based on what the player has equipped. - */ - contr->ranges[range_bow] = NULL; - contr->ranges[range_misc] = NULL; - contr->ranges[range_skill] = NULL; + contr->digestion = 0; + contr->gen_hp = 0; + contr->gen_sp = 0; + contr->gen_grace = 0; + contr->gen_sp_armour = 10; + contr->item_power = 0; } - memcpy (body_used, body_info, sizeof (body_info)); + for (int i = NUM_BODY_LOCATIONS; i--; ) + slot[i].used = slot[i].info; slaying = 0; @@ -878,34 +801,36 @@ 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; - chosen_skill = NULL; + 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; else vuln[i] = -(resist[i]), prot[i] = 0; + 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. ;) @@ -916,33 +841,33 @@ */ 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 chagned. But change_abil + * applied so we can tell the player what changed. But change_abil * then calls this function. */ 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. + */ + if (tmp->glow_radius > glow_radius) + glow_radius = tmp->glow_radius; + /* For some things, we don't care what is equipped */ if (tmp->type == SKILL) { @@ -973,53 +898,49 @@ * because the skill shouldn't count against body positions being used * up, etc. */ - if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) || - (tmp->type == SKILL && tmp->subtype == SK_PRAYING)) + if ((tmp->flag [FLAG_APPLIED] + && tmp->type != CONTAINER + && tmp->type != CLOSE_CON) + || (tmp->type == SKILL + && tmp->subtype == SK_PRAYING)) { if (type == PLAYER) { - if (tmp->type == BOW) - contr->ranges[range_bow] = tmp; + contr->item_power += tmp->item_power; - if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) - contr->ranges[range_misc] = tmp; + if (tmp == contr->combat_ob || tmp == contr->ranged_ob) + if (tmp != current_weapon + && (tmp->type != SKILL || tmp->subtype != SK_PRAYING) + && !tmp->flag [FLAG_CURSED] + && !tmp->flag [FLAG_DAMNED]) + continue; - for (i = 0; i < NUM_STATS; i++) - change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), 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 == 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; 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 + { + if (tmp->type == WEAPON) + current_weapon = tmp; + } /* Update slots used for items */ if (QUERY_FLAG (tmp, FLAG_APPLIED)) - for (i = 0; i < NUM_BODY_LOCATIONS; i++) - body_used[i] += tmp->body_info[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.0; - if (speed_reduce_from_disease == 0) - speed_reduce_from_disease = 1; - } + speed_reduce_from_disease = + min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f); /* Pos. and neg. protections are counted seperate (-> pro/vuln). * (Negative protections are calculated exactly like positive.) @@ -1028,7 +949,7 @@ */ 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. @@ -1036,7 +957,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]; } @@ -1048,24 +969,19 @@ } /* There may be other things that should not adjust the attacktype */ - if (tmp->type != BOW && tmp->type != SYMPTOM) - attacktype |= tmp->attacktype; + if (tmp->type != SYMPTOM) + { + attacktype |= tmp->attacktype; + path_attuned |= tmp->path_attuned; + path_repelled |= tmp->path_repelled; + path_denied |= tmp->path_denied; + move_type |= tmp->move_type; + stats.luck += tmp->stats.luck; + } - path_attuned |= tmp->path_attuned; - path_repelled |= tmp->path_repelled; - path_denied |= tmp->path_denied; - stats.luck += tmp->stats.luck; - move_type |= tmp->move_type; - - 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)) @@ -1078,69 +994,71 @@ { if (tmp->stats.exp > 0) { - added_speed += (float) tmp->stats.exp / 3.0; - bonus_speed += 1.0 + (float) tmp->stats.exp / 3.0; + added_speed += tmp->stats.exp / 3.f; + bonus_speed += tmp->stats.exp / 3.f + 1.f; } else - added_speed += (float) tmp->stats.exp; + added_speed += tmp->stats.exp; } switch (tmp->type) { +#if 0 + case WAND: + case ROD: + case HORN: + if (type != PLAYER || current_weapon == tmp) + chosen_skill = tmp; + break; +#endif + /* skills modifying the character -b.t. */ /* for all skills and skill granting objects */ case SKILL: - if (!QUERY_FLAG (tmp, FLAG_APPLIED)) - break; - - if (IS_COMBAT_SKILL (tmp->subtype)) - wc_obj = tmp; - - if (chosen_skill) - LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); - - chosen_skill = tmp; - - if (tmp->stats.dam > 0) - { /* skill is a 'weapon' */ - if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) - weapon_speed = (int) WEAPON_SPEED (tmp); - - if (weapon_speed < 0) - weapon_speed = 0; + { + if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY) + break; - weapon_weight = tmp->weight; - stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9)); + if (chosen_skill) + { + LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n", + &name, &chosen_skill->name, &tmp->name); - if (tmp->magic) - stats.dam += tmp->magic; - } + tmp->flag [FLAG_APPLIED] = false; + update_stats (); + return; + } + else + chosen_skill = tmp; - if (tmp->stats.wc) - wc -= (tmp->stats.wc + tmp->magic); + if (tmp->stats.dam > 0) + { /* skill is a 'weapon' */ + if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) + weapon_speed = WEAPON_SPEED (tmp); - if (tmp->slaying != NULL) - slaying = tmp->slaying; + if (weapon_speed < 0) + weapon_speed = 0; - if (tmp->stats.ac) - ac -= (tmp->stats.ac + tmp->magic); + weapon_weight = tmp->weight; + stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9; - if (settings.spell_encumbrance == TRUE && type == PLAYER) - contr->encumbrance += (int) 3 *tmp->weight / 1000; + if (tmp->magic) + stats.dam += tmp->magic; + } - if (type == PLAYER) - contr->ranges[range_skill] = this; + if (tmp->stats.wc) + wc -= tmp->stats.wc + tmp->magic; - break; + if (tmp->slaying) + slaying = tmp->slaying; - case SKILL_TOOL: - if (chosen_skill) - LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); + if (tmp->stats.ac) + ac -= tmp->stats.ac + tmp->magic; - chosen_skill = tmp; + if (settings.spell_encumbrance == TRUE && type == PLAYER) + contr->encumbrance += (int) 3 *tmp->weight / 1000; + } - if (type == PLAYER) - contr->ranges[range_skill] = this; break; case SHIELD: @@ -1154,43 +1072,49 @@ case GLOVES: case CLOAK: if (tmp->stats.wc) - wc -= (tmp->stats.wc + tmp->magic); + wc -= tmp->stats.wc + tmp->magic; if (tmp->stats.dam) - stats.dam += (tmp->stats.dam + tmp->magic); + stats.dam += tmp->stats.dam + tmp->magic; if (tmp->stats.ac) - ac -= (tmp->stats.ac + tmp->magic); + ac -= tmp->stats.ac + tmp->magic; break; + case BOW: case WEAPON: - wc -= (tmp->stats.wc + tmp->magic); + if (type != PLAYER || current_weapon == tmp) + { + wc -= tmp->stats.wc + tmp->magic; - if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) - ac -= tmp->stats.ac + tmp->magic; + if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) + ac -= tmp->stats.ac + tmp->magic; - stats.dam += (tmp->stats.dam + tmp->magic); - weapon_weight = tmp->weight; - weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; - - if (weapon_speed < 0) - weapon_speed = 0; - - slaying = tmp->slaying; - /* If there is desire that two handed weapons should do - * extra strength damage, this is where the code should - * go. - */ - current_weapon = tmp; - if (settings.spell_encumbrance == TRUE && type == PLAYER) - contr->encumbrance += (int) 3 *tmp->weight / 1000; + stats.dam += tmp->stats.dam + tmp->magic; + weapon_weight = tmp->weight; + weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; + + if (weapon_speed < 0) + weapon_speed = 0; + + slaying = tmp->slaying; + + /* If there is desire that two handed weapons should do + * extra strength damage, this is where the code should + * go. + */ + + if (type == PLAYER) + if (settings.spell_encumbrance) + contr->encumbrance += tmp->weight * 3 / 1000; + } break; case ARMOUR: /* Only the best of these three are used: */ if (settings.spell_encumbrance == TRUE && type == PLAYER) - contr->encumbrance += (int) tmp->weight / 1000; + contr->encumbrance += tmp->weight / 1000; case BRACERS: case FORCE: @@ -1222,8 +1146,8 @@ if (tmp->stats.ac) ac -= (tmp->stats.ac + tmp->magic); - if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max) - max = ARMOUR_SPEED (tmp) / 10.0; + if (ARMOUR_SPEED (tmp)) + max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); break; } /* switch tmp->type */ @@ -1240,7 +1164,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]; @@ -1248,9 +1172,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)); @@ -1262,23 +1192,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; @@ -1301,32 +1229,26 @@ stats.maxsp = 1; else { - sp_tmp = 0.0; + 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; /* Got some extra bonus at first level */ if (i < 2) - stmp = contr->levsp[i] + ((2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 6.0); + stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f; else - stmp = (float) contr->levsp[i] + (2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 12.0; + stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f; - if (stmp < 1.0) - stmp = 1.0; - - sp_tmp += stmp; + sp_tmp += max (1.f, stmp); } - stats.maxsp = (int) 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) @@ -1341,31 +1263,25 @@ * 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.0; - 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.0; + float grace_tmp = 0.f; /* Got some extra bonus at first level */ if (i < 2) - grace_tmp = contr->levgrace[i] + (((float) grace_bonus[stats.Pow] + - 2.0 * (float) grace_bonus[stats.Wis]) / 6.0); + grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f; else - grace_tmp = (float) contr->levgrace[i] - + ((float) grace_bonus[stats.Pow] + 2.0 * (float) grace_bonus[stats.Wis]) / 12.0; + grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f; - if (grace_tmp < 1.0) - grace_tmp = 1.0; - - sp_tmp += grace_tmp; + sp_tmp += max (1.f, grace_tmp); } - stats.maxgrace = (int) 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 */ if (contr->braced) @@ -1387,46 +1303,47 @@ * to make up for the change. Note that I left the * monster bonus the same as before. -b.t. */ + object *wc_obj = chosen_skill; - if (type == PLAYER && wc_obj && wc_obj->level > 1) + if (contr && wc_obj && wc_obj->level > 1) { - wc -= (wc_obj->level + thaco_bonus[stats.Str]); - for (i = 1; i < wc_obj->level; i++) + wc -= wc_obj->level + thaco_bonus[stats.Str]; + + for (int i = 1; i < wc_obj->level; i++) { - /* addtional wc every 6 levels */ + /* additional wc every 6 levels */ if (!(i % 6)) wc--; - /* addtional dam every 4 levels. */ - if (!(i % 4) && (dam_bonus[stats.Str] >= 0)) - stats.dam += (1 + (dam_bonus[stats.Str] / 5)); + + /* additional dam every 4 levels. */ + if (!(i % 4) && dam_bonus[stats.Str] >= 0) + stats.dam += 1 + dam_bonus[stats.Str] / 5; } } else - wc -= (level + thaco_bonus[stats.Str]); + wc -= level + thaco_bonus[stats.Str]; stats.dam += dam_bonus[stats.Str]; if (stats.dam < 1) stats.dam = 1; - speed = 1.0 + speed_bonus[stats.Dex]; + speed = 1.f + speed_bonus[stats.Dex]; if (settings.search_items && contr->search_str[0]) speed -= 1; if (attacktype == 0) - attacktype = arch->clone.attacktype; - + attacktype = arch->attacktype; } /* End if player */ if (added_speed >= 0) - speed += added_speed / 10.0; + speed += added_speed / 10.f; else /* Something wrong here...: */ - speed /= (float) (1.0 - added_speed); + speed /= 1.f - added_speed; /* Max is determined by armour */ - if (speed > max) - speed = max; + speed = min (speed, max_speed); if (type == PLAYER) { @@ -1435,64 +1352,51 @@ * 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) - speed = speed / (1.0 + f / max_carry[stats.Str]); + 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.0; /* Not affected by limits */ + 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.01 && type == PLAYER) - speed = 0.01; + if (speed != old_speed) + set_speed (speed); if (type == PLAYER) { - float M, W, s, D, K, S, M2; - /* (This formula was made by vidarl@ifi.uio.no) * Note that we never used these values again - basically * all of these could be subbed into one big equation, but * that would just be a real pain to read. */ - M = (max_carry[stats.Str] - 121) / 121.0; - M2 = max_carry[stats.Str] / 100.0; - W = weapon_weight / 20000.0; - s = 2 - weapon_speed / 10.0; - D = (stats.Dex - 14) / 14.0; - K = 1 + M / 3.0 - W / (3 * M2) + speed / 5.0 + D / 2.0; - K *= (4 + level) / (float) (6 + level) * 1.2; - if (K <= 0) - K = 0.01; - S = speed / (K * s); - contr->weapon_sp = S; + float M = (max_carry[stats.Str] - 121) / 121.f; + float M2 = max_carry[stats.Str] / 100.f; + float W = weapon_weight / 20000.f; + float s = (20 - weapon_speed) / 10.f; + float D = (stats.Dex - 14) / 14.f; + float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f; + + K *= (4 + level) * 1.2f / (6 + level); + + if (K <= 0.01f) + K = 0.01f; + + contr->weapon_sp = K * s * .5f; //TODO: balance the .5 } /* I want to limit the power of small monsters with big weapons: */ - if (type != PLAYER && arch != NULL && 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; - /* Prevent overflows of wc - best you can get is ABS(120) - this - * should be more than enough - remember, AC is also in 8 bits, - * so its value is the same. - */ - if (wc > 120) - wc = 120; - else if (wc < -120) - wc = -120; - - stats.wc = wc; - - if (ac > 120) - ac = 120; - else if (ac < -120) - ac = -120; - - stats.ac = ac; + stats.wc = clamp (wc, MIN_WC, MAX_WC); + stats.ac = clamp (ac, MIN_AC, MAX_AC); /* if for some reason the creature doesn't have any move type, * give them walking as a default. @@ -1505,9 +1409,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. */ @@ -1532,8 +1433,13 @@ int allowed_class (const object *op) { - return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 && - op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0; + return op->stats.Dex > 0 + && op->stats.Str > 0 + && op->stats.Con > 0 + && op->stats.Int > 0 + && op->stats.Wis > 0 + && op->stats.Pow > 0 + && op->stats.Cha > 0; } /* @@ -1575,7 +1481,7 @@ level = (int) (level / 5.); /* now set the new title */ - if (pl->contr != NULL) + if (pl->contr) { if (level == 0) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); @@ -1614,14 +1520,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 */ @@ -1677,6 +1580,7 @@ LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); return NULL; } + /* clear the flag - exp goes into this bucket, but player * still doesn't know it. */ @@ -1685,17 +1589,16 @@ skill_obj->level = 1; insert_ob_in_ob (skill_obj, op); - if (op->contr) + if (player *pl = op->contr) { - op->contr->last_skill_ob [skill_obj->subtype] = skill_obj; - if (op->contr->ns) - op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous + 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 } return skill_obj; } - /* player_lvl_adj() - for the new exp system. we are concerned with * whether the player gets more hp, sp and new levels. * Note this this function should only be called for players. Monstes @@ -1707,15 +1610,18 @@ 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 != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who)) + if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who)) dragon_level_gain (who); /* Only roll these if it is the player (who) that gained the level */ @@ -1726,33 +1632,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); + } } /* @@ -1765,6 +1682,7 @@ { if (level > settings.max_level) return (sint64) (expmul * levels[settings.max_level]); + return (sint64) (expmul * levels[level]); } @@ -1811,11 +1729,11 @@ /* prevents some forms of abuse. */ if (op->contr->braced) - exp = exp / 5; + exp /= 5; /* Try to find the matching skill. * We do a shortcut/time saving mechanism first - see if it matches - * chosen_skill. This means we don't need to search through + * chosen_skill. This means we don't need to search through * the players inventory. */ if (skill_name) @@ -1977,7 +1895,6 @@ void change_exp (object *op, sint64 exp, const char *skill_name, int flag) { - #ifdef EXP_DEBUG LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp); #endif @@ -2036,7 +1953,6 @@ * settings death_penalty_percentage and death_penalty_levels, and by the * amount of permenent experience, whichever gives the lowest loss. */ - void apply_death_exp_penalty (object *op) { @@ -2068,6 +1984,7 @@ percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; + if (level_loss < 0) level_loss = 0; loss = check_exp_loss (op, MIN (level_loss, percentage_loss));