[ViewVC] Diff of: cvs/deliantra/server/server/spell

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.60 by root, Sun Sep 2 05:18:52 2007 UTC vs.
Revision 1.70 by root, Sun May 4 18:24:11 2008 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra 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 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * 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, see <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <spells.h>
 #include <object.h>
     dest->skill = spob->skill;
   else
     dest->skill = caster->skill;
 }
-/* init_spells: This should really be called check_spells, as that
- * is what it does.  It goes through the spells looking for any
- * obvious errors.  This was most useful in debugging when re-doing
- * all the spells to catch simple errors.  To use it all the time
- * will result in it spitting out messages that aren't really errors.
- */
-void
-init_spells (void)
-{
-#ifdef SPELL_DEBUG
-  static int init_spells_done = 0;
-  int i;
-  archetype *at;
-  if (init_spells_done)
-    return;
-  LOG (llevDebug, "Checking spells...\n");
-  for_all_archetypes (at)
-    {
-      if (at->type == SPELL)
-        {
-          if (at->skill)
-            {
-              for (i = 1; i < NUM_SKILLS; i++)
-                if (!strcmp (skill_names[i], at->skill))
-                  break;
-              if (i == NUM_SKILLS)
-                {
-                  LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->skill);
-                }
-            }
-          /* other_arch is already checked for in the loader */
-        }
-    }
-  i = 0;
-  while (spell_mapping[i])
-    {
-      if (!archetype::find (spell_mapping[i]))
-        {
-          LOG (llevError, "Unable to find spell mapping %s (%i)\n", spell_mapping[i], i);
-        }
-      i++;
-    }
-  LOG (llevDebug, "Checking spells completed.\n");
-#endif
-}
-/* Dumps all the spells - now also dumps skill associated with the spell.
- * not sure what this would be used for, as the data seems pretty
- * minimal, but easy enough to keep around.
- */
-void
-dump_spells ()
-{
-  for_all_archetypes (at)
-    if (at->type == SPELL)
-      fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->object::name,
-               &at->archname, at->other_arch ? &at->other_arch->archname : "<nil>", &at->skill, at->level);
-}
 /* pretty basic function - basically just takes
  * an object, sets the x,y, and calls insert_ob_in_map
  */
 void
 spell_effect (object *spob, int x, int y, maptile *map, object *originator)
  * Returns modified level.
  */
 int
 min_casting_level (object *caster, object *spell)
 {
-  int new_level;
   if (caster->path_denied & spell->path_attuned)
     return 1;
-  new_level = spell->level
+  int new_level = spell->level
-    + (caster->path_repelled & spell->path_attuned ? +2 : 0)
+    + (caster->path_repelled & spell->path_attuned ? +8 : 0)
-    + (caster->path_attuned  & spell->path_attuned ? -2 : 0);
+    + (caster->path_attuned  & spell->path_attuned ? -8 : 0);
   return max (1, new_level);
 }
 /* This function returns the effective level the spell
 int
 caster_level (object *caster, object *spell)
 {
   int level = caster->level;
-  /* If this is a player, try to find the matching skill */
+  /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
-  if (caster->type == PLAYER && spell->skill)
+  if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
+    {
+      object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
+      int sk_level = skill ? skill->level : 1;
+      level = min (level, sk_level + level / 10 + 1);
+    }
+  else if (caster->type == PLAYER && spell->skill) /* If this is a player, try to find the matching skill */
     for (int i = 0; i < NUM_SKILLS; i++)
       if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
         {
           level = caster->contr->last_skill_ob[i]->level;
           break;
         }
-  /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
-  if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
-    {
-      object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
-      int sk_level = skill ? skill->level : 1;
-      level = MIN (level, sk_level + level / 10 + 1);
-    }
   /* Got valid caster level.  Now adjust for attunement */
-  level += caster->path_repelled & spell->path_attuned ? -2 : 0;
+  level += caster->path_repelled & spell->path_attuned ? -8 : 0;
-  level += caster->path_attuned  & spell->path_attuned ? +2 : 0;
+  level += caster->path_attuned  & spell->path_attuned ? +8 : 0;
   /* Always make this at least 1.  If this is zero, we get divide by zero
    * errors in various places.
    */
   return max (level, 1);
   else
     {
       sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
       if (spell->stats.sp && !sp)
         sp = 1;
       grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
       if (spell->stats.grace && !grace)
         grace = 1;
     }
   if (flags == SPELL_HIGHEST)
     return MAX (sp, grace);
   else if (flags == SPELL_GRACE)
     return grace;
   else if (flags == SPELL_MANA)
       LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
       return 0;
     }
 }
 /* SP_level_dam_adjust: Returns adjusted damage based on the caster.
  * spob is the spell we are adjusting.
  */
 int
 SP_level_dam_adjust (object *caster, object *spob)
 {
+  if (!spob->dam_modifier)
+    return 0;
   int level = caster_level (caster, spob);
-  int adj = level - min_casting_level (caster, spob);
+  return max (0, level - min_casting_level (caster, spob)) / spob->dam_modifier;
-  if (adj < 0)
-    adj = 0;
-  if (spob->dam_modifier)
-    adj /= spob->dam_modifier;
-  else
-    adj = 0;
-  return adj;
 }
 /* Adjust the strength of the spell based on level.
  * This is basically the same as SP_level_dam_adjust above,
  * but instead looks at the level_modifier value.
  */
 int
 SP_level_duration_adjust (object *caster, object *spob)
 {
+  if (!spob->duration_modifier)
+    return 0;
   int level = caster_level (caster, spob);
-  int adj = level - min_casting_level (caster, spob);
+  return max (0, level - min_casting_level (caster, spob)) / spob->duration_modifier;
-  if (adj < 0)
-    adj = 0;
-  if (spob->duration_modifier)
-    adj /= spob->duration_modifier;
-  else
-    adj = 0;
-  return adj;
 }
 /* Adjust the strength of the spell based on level.
  * This is basically the same as SP_level_dam_adjust above,
  * but instead looks at the level_modifier value.
  */
 int
 SP_level_range_adjust (object *caster, object *spob)
 {
+  if (!spob->range_modifier)
+    return 0;
   int level = caster_level (caster, spob);
-  int adj = level - min_casting_level (caster, spob);
+  return (level - min_casting_level (caster, spob)) / spob->range_modifier;
-  if (adj < 0)
-    adj = 0;
-  if (spob->range_modifier)
-    adj /= spob->range_modifier;
-  else
-    adj = 0;
-  return adj;
 }
 /* Checks to see if player knows the spell.  If the name is the same
  * as an existing spell, we presume they know it.
  * returns 1 if they know the spell, 0 if they don't.
       /*
        * Combine similar spell effects into one spell effect. Needed for
        * performance reasons with meteor swarm and the like, but also for
        * playability reasons.
        */
-      if (tmp->arch == op->arch
+      if (tmp->arch == op->arch /* no harm if not comparing by name here */
           && tmp->type == op->type
           && tmp->subtype == op->subtype
           && tmp->owner == op->owner
           && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
         {
         create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
       insert_ob_in_map (head, op->map, op, 0);
       /* thought it'd be cool to insert a burnout, too. */
-      op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
+      op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
     }
 }
 /* peterm:  function which summons hostile monsters and
  * places them in nearby squares.
         {
           skill = find_skill_by_name (op, spell_ob->skill);
           if (!skill)
             {
-              op->failmsg (format ("You need the skill %s to cast %s!", &spell_ob->skill, &spell_ob->name));
+              op->failmsg (format ("You need the skill %s to cast %s! "
+                                   "H<You either need to learn the skill via a skill scroll "
+                                   "or you need to wear a talisman or holy symbol.>",
+                                   &spell_ob->skill, &spell_ob->name));
               return 0;
             }
+          int casting_level = min_casting_level (op, spell_ob);
-          if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ))
+          if (casting_level > cast_level && !QUERY_FLAG (op, FLAG_WIZ))
             {
-              op->failmsg ("You lack enough skill to cast that spell!");
+              op->failmsg (format ("You lack enough skill to cast that spell! "
+                                   "H<Your cast level is %d, but level %d is required. Maybe you are repelled?>",
+                                   cast_level, casting_level));
               return 0;
             }
         }
       /* If the caster is the wiz, they don't ever fail, and don't have
       default:
         LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
     }
-  op->play_sound (success ? spell_ob->sound : sound_find ("fumble_spell"));
+  op->play_sound (
+     success
+        ? spell_ob->sound
+             ? spell_ob->sound
+             : sound_find ("spell_success")
+        : sound_find ("fumble_spell")
+  );
   return success;
 }
 /* This is called from time.c/process_object(). That function

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.60 by root, Sun Sep 2 05:18:52 2007 UTC vs. Revision 1.70 by root, Sun May 4 18:24:11 2008 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.60 by root, Sun Sep 2 05:18:52 2007 UTC vs.
Revision 1.70 by root, Sun May 4 18:24:11 2008 UTC