--- deliantra/server/common/living.C 2010/03/28 16:41:45 1.112 +++ deliantra/server/common/living.C 2010/04/06 21:11:48 1.117 @@ -523,29 +523,33 @@ DIFF_MSG (flag * tmp->stats.luck, "You feel more lucky.", "You feel less lucky."); } - if (tmp->stats.hp && op->type == PLAYER) + if (digest_types [tmp->type]) { - success = 1; - DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!"); - } + if (tmp->stats.hp && op->type == PLAYER) + { + success = 1; + DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!"); + } - if (tmp->stats.sp && op->type == PLAYER && tmp->type != SKILL) - { - success = 1; - DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane."); - } + if (tmp->stats.sp && op->type == PLAYER + && tmp->type != SKILL && tmp->type != BOW) + { + success = 1; + DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane."); + } - /* for the future when artifacts set this -b.t. */ - if (tmp->stats.grace && op->type == PLAYER) - { - success = 1; - DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy."); - } + /* for the future when artifacts set this -b.t. */ + if (tmp->stats.grace && op->type == PLAYER) + { + success = 1; + DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy."); + } - if (tmp->stats.food && op->type == PLAYER) - { - success = 1; - DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up."); + if (tmp->stats.food && op->type == PLAYER) + { + success = 1; + DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up."); + } } /* Messages for changed resistance */ @@ -702,32 +706,6 @@ } } -/* 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 () @@ -812,8 +790,6 @@ glow_radius = arch->glow_radius; move_type = arch->move_type; - object *chosen_skill = 0; - /* initializing resistances from the values in player/monster's * archetype clone */ @@ -822,11 +798,11 @@ for (int i = 0; i < NROFATTACKS; i++) { if (resist[i] > 0) - prot[i] = resist[i], vuln[i] = 0; + prot[i] = resist[i], vuln[i] = 0; else - vuln[i] = -(resist[i]), prot[i] = 0; + vuln[i] = -resist[i], prot[i] = 0; - potion_resist[i] = 0; + potion_resist[i] = -1000; } wc = arch->stats.wc; @@ -850,6 +826,8 @@ stats.luck = arch->stats.luck; speed = arch->speed; + chosen_skill = 0; + /* OK - we've reset most all the objects attributes to sane values. * now go through and make adjustments for what the player has equipped. */ @@ -903,13 +881,6 @@ { 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) - && !tmp->flag [FLAG_CURSED] - && !tmp->flag [FLAG_DAMNED]) - continue; - for (int i = 0; i < NUM_STATS; i++) stat_sum [i] += tmp->stats.stat (i); @@ -930,7 +901,7 @@ } /* Update slots used for items */ - if (tmp->flag [FLAG_APPLIED]) + if (tmp->flag [FLAG_APPLIED]) // exclude praying... for (int i = 0; i < NUM_BODY_LOCATIONS; i++) slot[i].used += tmp->slot[i].info; @@ -944,16 +915,7 @@ */ if (tmp->type == POTION_EFFECT) 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. - // TODO: this is askign for a magic marker optimisation - */ - if (potion_resist[i]) - max_it (potion_resist[i], tmp->resist[i]); - else - potion_resist[i] = tmp->resist[i]; - } + max_it (potion_resist[i], tmp->resist[i]); else if (tmp->type != POTION) for (int i = 0; i < NROFATTACKS; i++) if (tmp->resist[i] > 0) @@ -977,6 +939,7 @@ if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD)) SET_FLAG (this, FLAG_UNDEAD); + //TODO: copy_flags? if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) { SET_FLAG (this, FLAG_MAKE_INVIS); @@ -996,11 +959,10 @@ switch (tmp->type) { - /* skills modifying the character -b.t. */ - /* for all skills and skill granting objects */ case SKILL: { - if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY) + // some skills will end up here without counting as "applied" + if (!tmp->flag [FLAG_APPLIED] || skill_flags [tmp->subtype] & SF_AUTARK) break; if (chosen_skill) @@ -1012,16 +974,13 @@ update_stats (); return; } - else - chosen_skill = tmp; + + chosen_skill = tmp; if (tmp->stats.dam > 0) { /* skill is a 'weapon' */ if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) - weapon_speed = WEAPON_SPEED (tmp); - - if (weapon_speed < 0) - weapon_speed = 0; + weapon_speed = max (0, WEAPON_SPEED (tmp)); weapon_weight = tmp->weight; stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9; @@ -1070,40 +1029,32 @@ case WAND: case ROD: case HORN: - case SKILL_TOOL: - if (type != PLAYER) - chosen_skill = find_skill_by_name (this, tmp->skill); break; case BOW: case WEAPON: - if (type != PLAYER || current_weapon == tmp) - { - chosen_skill = find_skill_by_name (this, tmp->skill); + wc -= tmp->stats.wc + tmp->magic; - wc -= tmp->stats.wc + 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 = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; - - if (weapon_speed < 0) - weapon_speed = 0; + if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) + ac -= tmp->stats.ac + tmp->magic; - slaying = tmp->slaying; + 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 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; - } + if (type == PLAYER) + if (settings.spell_encumbrance) + contr->encumbrance += tmp->weight * 3 / 1000; break; @@ -1149,10 +1100,7 @@ } /* item is equipped */ } /* for loop of items */ - if (type != PLAYER) - this->chosen_skill = chosen_skill; - - glow_radius = min (glow_radius, MAX_LIGHT_RADIUS); + min_it (glow_radius, MAX_LIGHT_RADIUS); /* 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. @@ -1168,7 +1116,8 @@ { resist[i] = prot[i] - vuln[i]; - if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) + if (potion_resist[i] != -1000 + && (potion_resist[i] < 0 || potion_resist[i] > resist[i])) resist[i] = potion_resist[i]; }