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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.101 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.115 by root, Sat Apr 10 05:12:57 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  */
 void
 spell_effect (object *spob, int x, int y, maptile *map, object *originator)
 {
   if (spob->other_arch)
-    map->insert (arch_to_object (spob->other_arch), x, y, originator);
+    map->insert (spob->other_arch->instance (), x, y, originator);
 }
 static int
 attuned_bonus (object *caster, object *spell, int level)
 {
   int sp, grace, level = casting_level (caster, spell);
   if (settings.spellpoint_level_depend == TRUE)
     {
       if (spell->stats.sp && spell->stats.maxsp)
-        {
-          sp = (int) (spell->stats.sp * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxsp)));
+        sp = spell->stats.sp * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxsp));
-        }
       else
         sp = spell->stats.sp;
       sp *= (int) PATH_SP_MULT (caster, spell);
       if (!sp && spell->stats.sp)
         sp = 1;
       if (spell->stats.grace && spell->stats.maxgrace)
-        {
-          grace = (int) (spell->stats.grace * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxgrace)));
+        grace = spell->stats.grace * (1.0 + max (0, float (level - spell->level) / spell->stats.maxgrace));
-        }
       else
         grace = spell->stats.grace;
-      grace *= (int) PATH_SP_MULT (caster, spell);
+      grace *= PATH_SP_MULT (caster, spell);
       if (spell->stats.grace && !grace)
         grace = 1;
     }
   else
     {
       if (spell->stats.grace && !grace)
         grace = 1;
     }
   if (flags == SPELL_HIGHEST)
-    return MAX (sp, grace);
+    return max (sp, grace);
   else if (flags == SPELL_GRACE)
     return grace;
   else if (flags == SPELL_MANA)
     return sp;
   else
  ****************************************************************************/
 void
 regenerate_rod (object *rod)
 {
   if (rod->stats.hp < rod->stats.maxhp)
-    rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
+    rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 20);
 }
 void
 drain_rod_charge (object *rod)
 {
        * insert multipart monsters properly
        */
       //TODO: use expand_tail + ...
       while (at != NULL)
         {
-          tmp = arch_to_object (at);
+          tmp = at->instance ();
           tmp->x = op->x + freearr_x[dir] + at->x;
           tmp->y = op->y + freearr_y[dir] + at->y;
           tmp->map = op->map;
           if (head)
             {
     {
       LOG (llevError, "cast_party_spell: empty other arch\n");
       return 0;
     }
-  object *spell = arch_to_object (spell_ob->other_arch);
+  object *spell = spell_ob->other_arch->instance ();
   /* Always cast spell on caster */
   int success = cast_spell (op, caster, dir, spell, spellparam);
   if (!op->contr || !op->contr->party)
 int
 cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
 {
   const char *godname;
   int success = 0;
-  object *skill = NULL;
   if (!spell_ob)
     {
       LOG (llevError, "cast_spell: null spell object passed\n");
       return 0;
     {
       new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you.");
       return 0;
     }
+  object *skill = 0;
   /* if it is a player casting the spell, and they are really casting it
    * (vs it coming from a wand, scroll, or whatever else), do some
    * checks.  We let monsters do special things - eg, they
-   * don't need the skill, bypass level checks, etc. The monster function
+   * don't need the SKILL, BYpass level checks, etc. The monster function
    * should take care of that.
    * Remove the wiz check here and move it further down - some spells
    * need to have the right skill pointer passed, so we need to
    * at least process that code.
    */
         {
           skill = find_skill_by_name (op, spell_ob->skill);
           if (!skill)
             {
-              op->failmsg (format ("You need the skill %s to cast %s! "
+              op->failmsgf ("You need the %s skill to cast %s! "
-                                   "H<You either need to learn the skill via a skill scroll "
+                            "H<You either need to learn the skill via a skill scroll "
-                                   "or you need to wear a talisman or holy symbol.>",
+                            "or you need to wear a talisman, holy symbol or another skill tool.>",
-                                   &spell_ob->skill, &spell_ob->name));
+                            &spell_ob->skill, &spell_ob->name);
-               return 0;
+              return 0;
             }
           const char *msg = "";
           int caster_level = skill->level;
               msg = " (repelled)";
             }
           if (spell_ob->level > caster_level)
             {
-              op->failmsg (format ("You lack enough skill to cast that spell! "
+              op->failmsgf ("You lack enough skill to cast that spell! "
-                                   "H<Your effective cast level is %d%s, but level %d is required.>",
+                            "H<Your effective cast level is %d%s, but level %d is required.>",
-                                   caster_level, msg, spell_ob->level));
+                            caster_level, msg, spell_ob->level);
               if (!op->is_wiz ())
                 return 0;
             }
         }
                   10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
                 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
               else
                 {
                   prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
-                  op->failmsg (format ("%s ignores your prayer.", godname));
+                  op->failmsgf ("%s ignores your prayer.", godname);
                   return 0;
                 }
             }
           /* player/monster is trying to cast the spell.  might fumble it */
           if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
-              (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
+              (spell_ob->level / (float) max (1, op->level) * cleric_chance[op->stats.Wis]))
             {
               op->contr->play_sound (sound_find ("fumble_spell"));
               op->failmsg ("You fumble the prayer.");
               op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
    * doing.
    */
   if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST))      // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
     {
+      op->speed_left -= 2 * op->speed; // freeze for two ticks, so we don't flood
       op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
       return 0;
     }
   if ((spell_ob->type == SPELL)
     {
       if (op->type != PLAYER)
         return 0;
       if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
-        op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
+        op->failmsgf ("This ground is unholy! %s ignores you.", godname);
       else if (object *item = op->contr->ranged_ob)
         {
           if (item->type == SPELL)
             op->failmsg ("Something blocks your spellcasting.");
           else if (item->type == SCROLL)
    * the player any time.
    * Ignore casting time for firewalls
    */
   if (caster == op && caster->type != FIREWALL)
     {
-      op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
+      op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
       /* Other portions of the code may also decrement the speed of the player, so
        * put a lower limit so that the player isn't stuck here too long
        */
-      if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
+      if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed)
-        op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
+        op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
     }
   else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
-    op->speed_left -= 2 * FABS (op->speed);
+    op->speed_left -= 2 * op->speed;
   if (op->type == PLAYER && op == caster)
     {
       op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
       op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
    * object requires.
    */
   if (op != caster && !skill && caster->skill)
     {
       skill = find_skill_by_name (op, caster->skill);
       if (!skill)
         {
-          op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
+          op->failmsgf ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster));
           return 0;
         }
-      op->change_skill (skill);      /* needed for proper exp credit */
     }
   if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam)))
     return RESULT_INT (0);
+  // temporaroly replace chosen_skill by skill, we assume skill *could* be applied,
+  // at least temporarily, which might not be true due to slot restrictions, but hey
+  // invoke requires it basically.
+  object *chosen_skill = op->chosen_skill;
+  op->chosen_skill = skill;
   switch (spell_ob->subtype)
     {
       /* The order of case statements is same as the order they show up
        * in spells.h.
         break;
       case SP_MOVING_BALL:
         if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
           {
-            op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
+            op->failmsgf ("You lack the proper attunement to cast %s!", &spell_ob->name);
             success = 0;
           }
         else
           success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
         break;
         break;
       default:
         LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
     }
+  // restore chosen_skill
+  op->chosen_skill = chosen_skill;
   op->play_sound (
      success
         ? spell_ob->sound
              ? spell_ob->sound
         move_aura (op);
         break;
     }
 }
-/* this checks to see if something special should happen if
- * something runs into the object.
- */
-static void
-check_spell_effect (object *op)
-{
-  switch (op->subtype)
-    {
-      case SP_BOLT:
-        move_bolt (op);
-        return;
-      case SP_BULLET:
-        check_bullet (op);
-        return;
-    }
-}
 /* This is called by move_apply. Basically, if someone
  * moves onto a spell effect and the walk_on or fly_on flags
  * are set, this is called. This should only be called for
  * objects of the appropriate type.
  */
 apply_spell_effect (object *spell, object *victim)
 {
   switch (spell->subtype)
     {
       case SP_CONE:
-        if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->speed && spell->attacktype)
+        if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->has_active_speed () && spell->attacktype)
           hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
         break;
       case SP_MAGIC_MISSILE:
         if (QUERY_FLAG (victim, FLAG_ALIVE))
         break;
       case SP_MOVING_BALL:
         if (QUERY_FLAG (victim, FLAG_ALIVE))
           hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
-        else if (victim->materialname)
+        else if (victim->material != MATERIAL_NULL)
           save_throw_object (victim, spell->attacktype, spell);
         break;
     }
 }

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.101 by root, Fri Nov 6 13:03:34 2009 UTC vs. Revision 1.115 by root, Sat Apr 10 05:12:57 2010 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.101 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.115 by root, Sat Apr 10 05:12:57 2010 UTC