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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.54 by root, Sat May 12 19:30:18 2007 UTC vs.
Revision 1.64 by root, Sat May 26 15:44:02 2007 UTC

   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)
     {
   /* 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.
        */
       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)
         {
           /* Want to take the highest skill here. */
               && 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   ||
 #endif
                 /* skills modifying the character -b.t. */
                 /* for all skills and skill granting objects */
               case SKILL:
-                if (!QUERY_FLAG (tmp, FLAG_APPLIED))
+                {
+                  if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
-                  break;
+                    break;
-                if (IS_COMBAT_SKILL (tmp->subtype))
-                  wc_obj = tmp;
-                if (chosen_skill)
+                  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);
+                      tmp->flag [FLAG_APPLIED] = false;
+                      update_stats ();
+                      return;
+                    }
+                  else
-                chosen_skill = tmp;
+                    chosen_skill = tmp;
-                if (tmp->stats.dam > 0)
+                  if (tmp->stats.dam > 0)
-                  {             /* skill is a 'weapon' */
+                    {             /* skill is a 'weapon' */
-                    if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
+                      if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
-                      weapon_speed = WEAPON_SPEED (tmp);
+                        weapon_speed = WEAPON_SPEED (tmp);
-                    if (weapon_speed < 0)
+                      if (weapon_speed < 0)
-                      weapon_speed = 0;
+                        weapon_speed = 0;
-                    weapon_weight = tmp->weight;
+                      weapon_weight = tmp->weight;
-                    stats.dam += 1 + (chosen_skill->level * tmp->stats.dam / 9);
+                      stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
-                    if (tmp->magic)
+                      if (tmp->magic)
-                      stats.dam += tmp->magic;
+                        stats.dam += tmp->magic;
-                  }
+                    }
-                if (tmp->stats.wc)
+                  if (tmp->stats.wc)
-                  wc -= tmp->stats.wc + tmp->magic;
+                    wc -= tmp->stats.wc + tmp->magic;
-                if (tmp->slaying)
+                  if (tmp->slaying)
-                  slaying = tmp->slaying;
+                    slaying = tmp->slaying;
-                if (tmp->stats.ac)
+                  if (tmp->stats.ac)
-                  ac -= tmp->stats.ac + tmp->magic;
+                    ac -= tmp->stats.ac + tmp->magic;
-                if (settings.spell_encumbrance == TRUE && type == PLAYER)
+                  if (settings.spell_encumbrance == TRUE && type == PLAYER)
-                  contr->encumbrance += (int) 3 *tmp->weight / 1000;
+                    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;
        * 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 (contr && wc_obj && wc_obj->level > 1)
         {
           wc -= wc_obj->level + thaco_bonus[stats.Str];
       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 = K * s * .5f; //TODO: balance the .5
-      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 (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.54 by root, Sat May 12 19:30:18 2007 UTC vs. Revision 1.64 by root, Sat May 26 15:44:02 2007 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.54 by root, Sat May 12 19:30:18 2007 UTC vs.
Revision 1.64 by root, Sat May 26 15:44:02 2007 UTC