[ViewVC] Diff of: cvs/deliantra/server/common/living.C

Comparing deliantra/server/common/living.C (file contents):
Revision 1.50 by root, Sat May 12 18:14:47 2007 UTC vs.
Revision 1.60 by root, Fri May 18 01:01:01 2007 UTC

 change_attr_value (living *stats, int attr, sint8 value)
 {
   stats->stat (attr) += value;
 }
-sint8 &
-living::stat (int index)
-{
-  switch (index)
-    {
-      case STR: return Str;
-      case DEX: return Dex;
-      case CON: return Con;
-      case INT: return Int;
-      case WIS: return Wis;
-      case POW: return Pow;
-      case CHA: return Cha;
-    }
-  LOG (llevError | logBacktrace, "living.stat() called with out-of-range stat index");
-  static sint8 dummy;
-  return dummy;
-}
-sint8
-living::stat (int index) const
-{
-  switch (index)
-    {
-      case STR: return Str;
-      case DEX: return Dex;
-      case CON: return Con;
-      case INT: return Int;
-      case WIS: return Wis;
-      case POW: return Pow;
-      case CHA: return Cha;
-    }
-  LOG (llevError | logBacktrace, "living.stat() called with out-of-range stat index");
-  static sint8 dummy;
-  return dummy;
-}
 /*
  * Ensures that all stats (str/dex/con/wis/cha/int) are within the
  * 1-30 stat limit.
  */
 void
  * that gives them that ability.
  */
 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;
   /* 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
   if (op->type == PLAYER)
     {
       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 = op->contr->orig_stats.stat (j);
+              int ostat = op->contr->orig_stats.stat (j);
-              i = tmp->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
                * that adjust that stat by more than one point, so we need
                * to allow for that.
           /* This section of code ups the characters normal stats also.  I am not
            * sure if this is strictly necessary, being that fix_player probably
            * recalculates this anyway.
            */
-          for (j = 0; j < NUM_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);
         }                       /* 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->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)
     {
       success = 1;
       if (tmp->move_type & MOVE_FLY_HIGH)
         {
           /* 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");
       success = 1;
       DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
     }
   /* 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 */
       if (op->resist[i] != refop.resist[i])
         }
     }
   if (!potion_max)
     {
-      for (j = 0; j < NUM_STATS; j++)
+      for (int j = 0; j < NUM_STATS; j++)
         {
-          if ((i = tmp->stats.stat (j)))
+          if (int i = tmp->stats.stat (j))
             {
               success = 1;
               DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
             }
         }
  * Subtracts stat-bonuses given by the class which the player has chosen.
  */
 void
 object::remove_statbonus ()
 {
-  stats.Str -= arch->clone.stats.Str;
+  for (int i = 0; i < NUM_STATS; ++i)
-  stats.Dex -= arch->clone.stats.Dex;
+    {
-  stats.Con -= arch->clone.stats.Con;
+      sint8 v = arch->clone.stats.stat (i);
-  stats.Wis -= arch->clone.stats.Wis;
+      stats.stat (i)             -= v;
-  stats.Pow -= arch->clone.stats.Pow;
+      contr->orig_stats.stat (i) -= v;
-  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;
 }
 /*
  * Adds stat-bonuses given by the class which the player has chosen.
  */
 void
 object::add_statbonus ()
 {
-  stats.Str += arch->clone.stats.Str;
+  for (int i = 0; i < NUM_STATS; ++i)
-  stats.Dex += arch->clone.stats.Dex;
+    {
-  stats.Con += arch->clone.stats.Con;
+      sint8 v = arch->clone.stats.stat (i);
-  stats.Wis += arch->clone.stats.Wis;
+      stats.stat (i)             += v;
-  stats.Pow += arch->clone.stats.Pow;
+      contr->orig_stats.stat (i) += v;
-  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;
 }
 /*
  * Updates all abilities given by applied objects in the inventory
  * of the given object.  Note: This function works for both monsters
   int i, j;
   float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, 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;
   /* First task is to clear all the values back to their original values */
   if (type == PLAYER)
     {
               && tmp->subtype == SK_PRAYING))
         {
           if (type == PLAYER)
             {
               if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
+                if (tmp != current_weapon
-                if (tmp != current_weapon && (tmp->type != SKILL || tmp->subtype != SK_PRAYING))
+                    && (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, tmp->stats.stat (i));
-              /* these are the items that currently can change digestion, regeneration,
+              /* These are the items that currently can change digestion, regeneration,
-               * spell point recovery and mana point recovery.  Seems sort of an arbitary
+               * 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   ||
                     vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
                 }
             }
           /* There may be other things that should not adjust the attacktype */
-          if ((tmp->type != WEAPON && tmp->type != BOW && tmp->type != SYMPTOM)
+          if (tmp->type != SYMPTOM)
-              || current_weapon == tmp)
             {
               attacktype    |= tmp->attacktype;
               path_attuned  |= tmp->path_attuned;
               path_repelled |= tmp->path_repelled;
               path_denied   |= tmp->path_denied;
                 /* 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);
+                  LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
+                       &name, &chosen_skill->name, &tmp->name);
                 chosen_skill = tmp;
                 if (tmp->stats.dam > 0)
                   {             /* skill is a 'weapon' */
                     if (weapon_speed < 0)
                       weapon_speed = 0;
                     weapon_weight = tmp->weight;
-                    stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9));
+                    stats.dam += 1 + (chosen_skill->level * tmp->stats.dam / 9);
                     if (tmp->magic)
                       stats.dam += tmp->magic;
                   }
                   ac -= tmp->stats.ac + tmp->magic;
                 if (settings.spell_encumbrance == TRUE && type == PLAYER)
                   contr->encumbrance += (int) 3 *tmp->weight / 1000;
-                break;
-              case SKILL_TOOL:
-                if (chosen_skill)
-                  LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
-                chosen_skill = tmp;
                 break;
               case SHIELD:
                 if (settings.spell_encumbrance == TRUE && type == PLAYER)
                   contr->encumbrance += (int) tmp->weight / 2000;
           stats.maxsp = (sint16)sp_tmp;
           for (i = 11; i <= mana_obj->level; i++)
             stats.maxsp += 2;
         }
       /* Characters can get their sp supercharged via rune of transferrance */
       if (stats.sp > stats.maxsp * 2)
         stats.sp = stats.maxsp * 2;
       /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
           /* two grace points per level after 11 */
           for (i = 11; i <= grace_obj->level; i++)
             stats.maxgrace += 2;
         }
       /* No limit on grace vs maxgrace */
       if (contr->braced)
         {
           ac += 2;
        * improvement every level, now its fighterlevel/5. So
        * we give the player a bonus here in wc and dam
        * 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++)
             {
-              /* addtional wc every 6 levels */
+              /* additional wc every 6 levels */
               if (!(i % 6))
                 wc--;
-              /* addtional dam every 4 levels. */
+              /* additional dam every 4 levels. */
               if (!(i % 4) && dam_bonus[stats.Str] >= 0)
                 stats.dam += 1 + dam_bonus[stats.Str] / 5;
             }
         }
       else
       if (settings.search_items && contr->search_str[0])
         speed -= 1;
       if (attacktype == 0)
         attacktype = arch->clone.attacktype;
     }                           /* End if player */
   if (added_speed >= 0)
     speed += added_speed / 10.f;
   else                          /* Something wrong here...: */
        * that would just be a real pain to read.
        */
       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 = 2 - weapon_speed / 10.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);
+      K *= (4 + level) * 1.2f / (6 + level);
-      if (K <= 0.f)
+      if (K <= 0.01f)
         K = 0.01f;
       float S = speed / (K * s);
       contr->weapon_sp = S;
   /* 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;
-  /* Prevent overflows of wc - best you can get is ABS(120) - this
+  stats.wc = clamp (wc, MIN_WC, MAX_WC);
-   * should be more than enough - remember, AC is also in 8 bits,
+  stats.ac = clamp (ac, MIN_AC, MAX_AC);
-   * 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;
   /* if for some reason the creature doesn't have any move type,
    * give them walking as a default.
    * The second case is a special case - to more closely mimic the
    * old behaviour - if your flying, your not walking - just
   if (!skill_obj)
     {
       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.
    */
   CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
   skill_obj->stats.exp = 0;
   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;
+      pl->last_skill_ob [skill_obj->subtype] = skill_obj;
-      if (op->contr->ns)
+      if (pl->ns)
-        op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
+        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
  * don't really gain levels
   if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
     {
       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 */
       if (op == who && (who->level < 11) && who->type == PLAYER)
         {
         {
           if (op->type != PLAYER)
             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);
           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))
     {
       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);
         player_lvl_adj (op, tmp);
       }
   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));
   op->stats.exp -= loss;

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.50 by root, Sat May 12 18:14:47 2007 UTC vs. Revision 1.60 by root, Fri May 18 01:01:01 2007 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.50 by root, Sat May 12 18:14:47 2007 UTC vs.
Revision 1.60 by root, Fri May 18 01:01:01 2007 UTC