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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.59 by root, Thu May 17 00:33:29 2007 UTC vs.
Revision 1.71 by elmex, Sat Jul 21 14:37:25 2007 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 #include <global.h>
 #include <funcpoint.h>
                * 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))
+              else if (nstat > 20 + op->arch->stats.stat (j))
-                nstat = 20 + op->arch->clone.stats.stat (j);
+                nstat = 20 + op->arch->stats.stat (j);
               if (nstat != ostat)
                 {
                   op->contr->orig_stats.stat (j) = nstat;
                   potion_max = 0;
     }
   /* 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;
         if (flag > 0)
           {
             op->race = "undead";
             new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");
           }
         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))
 void
 object::remove_statbonus ()
 {
   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;
     }
 }
 void
 object::add_statbonus ()
 {
   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;
     }
 }
   CLEAR_FLAG (this, FLAG_LIFESAVE);
   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, 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, 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, FLAG_UNDEAD      )) CLEAR_FLAG (this, FLAG_UNDEAD);
-  if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
+  if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
-  path_attuned  = arch->clone.path_attuned;
+  path_attuned  = arch->path_attuned;
-  path_repelled = arch->clone.path_repelled;
+  path_repelled = arch->path_repelled;
-  path_denied   = arch->clone.path_denied;
+  path_denied   = arch->path_denied;
-  glow_radius   = arch->clone.glow_radius;
+  glow_radius   = arch->glow_radius;
-  move_type     = arch->clone.move_type;
+  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++)
     {
       if (resist[i] > 0)
         prot[i] = resist[i], vuln[i] = 0;
         vuln[i] = -(resist[i]), prot[i] = 0;
       potion_resist[i] = 0;
     }
-  wc = arch->clone.stats.wc;
+  wc = arch->stats.wc;
-  stats.dam = arch->clone.stats.dam;
+  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. ;)
    * the fact that maxlevel is factored in could be considered sort of bogus -
    * we should probably give them some bonus and cap it off - otherwise,
    * basically, if a server updates its max level, these playes may find
    * that their protection from physical goes down
    */
   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;
+  stats.luck = arch->stats.luck;
-  speed = arch->clone.speed;
+  speed = arch->speed;
+  sint16 digestion = 0; // a local var to add digestion
   /* 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->type == SKILL
               && tmp->subtype == SK_PRAYING))
         {
           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)
                     && !tmp->flag [FLAG_CURSED]
                     && !tmp->flag [FLAG_DAMNED])
                   tmp->type == AMULET  || tmp->type == GIRDLE ||
                   tmp->type == BRACERS || tmp->type == CLOAK  ||
                   tmp->type == DISEASE || tmp->type == FORCE  ||
                   tmp->type == SKILL)
                 {
-                  contr->digestion     += tmp->stats.food;
+                  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)
           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);
-          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))
             {
               SET_FLAG (this, FLAG_MAKE_INVIS);
 #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 (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 SHIELD:
                 if (settings.spell_encumbrance == TRUE && type == PLAYER)
                 break;
             }                   /* switch tmp->type */
         }                       /* item is equipped */
     }                           /* for loop of items */
+  // now clamp digestion to our limits
+  contr->digestion = clamp (digestion, MIN_DIGESTION, MAX_DIGESTION);
   /* 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.
    */
   /* 'total resistance = total protections - total vulnerabilities'.
       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.f;
   else                          /* Something wrong here...: */
       K *= (4 + level) * 1.2f / (6 + level);
       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)
+  if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
-    stats.dam = arch->clone.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);
   /* if for some reason the creature doesn't have any move type,
   object *skin = NULL;          /* pointer to dragon skin force */
   object *tmp = NULL;           /* tmp. object */
   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 */
   if (abil == NULL)
     return;

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.59 by root, Thu May 17 00:33:29 2007 UTC vs. Revision 1.71 by elmex, Sat Jul 21 14:37:25 2007 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.59 by root, Thu May 17 00:33:29 2007 UTC vs.
Revision 1.71 by elmex, Sat Jul 21 14:37:25 2007 UTC