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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.53 by root, Sat May 12 19:07:21 2007 UTC vs.
Revision 1.68 by root, Sun Jul 1 05:00:17 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;
     }
 }
   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)
     {
   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;
   /* 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   ||
           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 (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 += tmp->stats.dam * (1 + (chosen_skill->level / 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;
           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;
+        attacktype = arch->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)
+  if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
-    stats.dam = arch->clone.stats.dam * 3;
+    stats.dam = arch->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
   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 == dragon_ability_force)
         abil = tmp;
-      else if (tmp->arch->name == dragon_skin_force)
+      else if (tmp->arch->archname == dragon_skin_force)
         skin = tmp;
   /* if the force is missing -> bail out */
   if (abil == NULL)
     return;
   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.53 by root, Sat May 12 19:07:21 2007 UTC vs. Revision 1.68 by root, Sun Jul 1 05:00:17 2007 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.53 by root, Sat May 12 19:07:21 2007 UTC vs.
Revision 1.68 by root, Sun Jul 1 05:00:17 2007 UTC