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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.99 by elmex, Tue Jan 13 13:29:57 2009 UTC vs.
Revision 1.110 by root, Mon Oct 12 14:00:59 2009 UTC

  *
  * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and 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 <support@deliantra.net>
  */
 #include <global.h>
  * The # of arrows created also goes up with level, so if a 30th level mage
  * wants LOTS of arrows, and doesn't care what the plus is he could
  * create nonnmagic arrows, or even -1, etc...
  */
 int
-cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)
+cast_create_missile (object *op, object *caster, object *spell, int dir, const char *spellparam)
 {
   int bonus_plus = 0;
   const char *missile_name = "arrow";
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
       return 0;
     }
   object *missile = missile_arch->instance ();
-  if (stringarg)
+  if (spellparam)
     {
       /* If it starts with a letter, presume it is a description */
-      if (isalpha (*stringarg))
+      if (isalpha (*spellparam))
         {
           artifact *al = find_artifactlist (missile->type)->items;
           for (; al; al = al->next)
-            if (!strcasecmp (al->item->name, stringarg))
+            if (!strcasecmp (al->item->name, spellparam))
               break;
           if (!al)
             {
               missile->destroy ();
-              new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg);
+              new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, spellparam);
               return 0;
             }
           if (al->item->slaying)
             {
               missile->destroy ();
-              new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg);
+              new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, spellparam);
               return 0;
             }
           give_artifact_abilities (missile, al->item);
           /* These special arrows cost something extra. Don't have them also be magical -
            * the parsing of having to do both plus and type.
            */
           bonus_plus = 1 + (al->item->value / 5);
           missile_plus = 0;
         }
-      else if (atoi (stringarg) < missile_plus)
+      else if (atoi (spellparam) < missile_plus)
-        missile_plus = atoi (stringarg);
+        missile_plus = atoi (spellparam);
     }
   missile_plus = clamp (missile_plus, -4, 4);
   missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
   return 1;
 }
 /*  allows the choice of what sort of food object to make.
- *  If stringarg is NULL, it will create food dependent on level  --PeterM*/
+ *  If spellparam is NULL, it will create food dependent on level  --PeterM*/
 int
-cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *stringarg)
+cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *spellparam)
 {
   int food_value;
   archetype *at = NULL;
   object *new_op;
   food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob);
-  if (stringarg)
+  if (spellparam)
     {
-      at = find_archetype_by_object_type_name (FOOD, stringarg);
+      at = find_archetype_by_object_type_name (FOOD, spellparam);
       if (at == NULL)
-        at = find_archetype_by_object_type_name (DRINK, stringarg);
+        at = find_archetype_by_object_type_name (DRINK, spellparam);
       if (at == NULL || at->stats.food > food_value)
-        stringarg = NULL;
+        spellparam = NULL;
     }
-  if (!stringarg)
+  if (!spellparam)
     {
       archetype *at_tmp;
       /* We try to find the archetype with the maximum food value.
        * This removes the dependancy of hard coded food values in this
 /* earth to dust spell.  Basically destroys earthwalls in the area.
  */
 int
 cast_earth_to_dust (object *op, object *caster, object *spell_ob)
 {
-  object *tmp, *next;
   int range, i, j, mflags;
   sint16 sx, sy;
   maptile *m;
-  if (op->type != PLAYER)
-    return 0;
   range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
   for (i = -range; i <= range; i++)
     for (j = -range; j <= range; j++)
         mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
         if (mflags & P_OUT_OF_MAP)
           continue;
-        // earth to dust tears down everything that can be teared down
+        // earth to dust tears down everything that can be torn down
-        for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
+        for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next)
           {
             next = tmp->above;
             if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
               hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
           }
       }
 perceive_self (object *op)
 {
   const char *cp = describe_item (op, op);
   archetype *at = archetype::find (ARCH_DEPLETION);
-  dynbuf_text buf;
+  dynbuf_text &buf = msg_dynbuf; buf.clear ();
-  if (player *pl = op->contr)
+  if (!op->is_player ())
+    return 0;
-    if (object *race = archetype::find (op->race))
+  if (object *race = archetype::find (op->race))
-      buf << " - You are a G<male|female> " << &race->name << ".\n";
+    buf << " - You are a G<male|female> " << &race->name << ".\n";
   if (object *god = find_god (determine_god (op)))
     buf << " - You worship " << &god->name << ".\n";
   else
     buf << " - You worship no god.\n";
             break;
           }
       }
-  buf << '\0'; // zero-terminate
+  op->contr->infobox (MSG_CHANNEL ("perceiveself"), buf);
-  new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
   return 1;
 }
 /* This creates magic walls.  Really, it can create most any object,
   return 1;
 }
 int
-dimension_door (object *op, object *caster, object *spob, int dir)
+dimension_door (object *op, object *caster, object *spob, int dir, const char *spellparam)
 {
   uint32 dist, maxdist;
   int mflags;
   maptile *m;
   sint16 sx, sy;
   /* Given the new outdoor maps, can't let players dimension door for
    * ever, so put limits in.
    */
   maxdist = spob->range + SP_level_range_adjust (caster, spob);
-  if (op->contr->count)
+  if (spellparam)
     {
+      int count = atoi (spellparam);
-      if (op->contr->count > maxdist)
+      if (count > maxdist)
         {
           new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!");
           return 0;
         }
-      for (dist = 0; dist < op->contr->count; dist++)
+      for (dist = 0; dist < count; dist++)
         {
           mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);
           if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))
             break;
           if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
             break;
         }
-      if (dist < op->contr->count)
+      if (dist < count)
         {
           new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
-          op->contr->count = 0;
           return 0;
         }
-      op->contr->count = 0;
       /* Remove code that puts player on random space on maps.  IMO,
        * a lot of maps probably have areas the player should not get to,
        * but may not be marked as NO_MAGIC (as they may be bounded
        * by such squares).  Also, there are probably treasure rooms and
   "You don't feel any more powerful."
   "You are no easier to look at.",
 };
 int
+change_ability_duration (object *spell, object *caster)
+{
+  return spell->duration + SP_level_duration_adjust (caster, spell) * 50;
+}
+int
 cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
 {
   object *force = 0;
   int i;
               break;
             }
           else if (spell_ob->race && spell_ob->race == tmp2->name)
             {
               if (!silent)
-                new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);
+                new_draw_info_format (NDI_UNIQUE, 0, op,
+                                      "You can not cast %s while %s is in effect",
+                                      &spell_ob->name, &tmp2->name_pl);
               return 0;
             }
         }
     }
+  int duration = change_ability_duration (spell_ob, caster);
-  if (!force)
+  if (force)
-    {
-      force = get_archetype (FORCE_NAME);
-      force->subtype = FORCE_CHANGE_ABILITY;
-      if (spell_ob->race)
-        force->name = spell_ob->race;
-      else
-        force->name = spell_ob->name;
-      force->name_pl = spell_ob->name;
-      new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
-    }
+    {
-  else
-    {
-      int duration;
-      duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
       if (duration > force->duration)
         {
           force->duration = duration;
           new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
         }
         new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
       return 1;
     }
-  force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
+  new_draw_info_format (NDI_UNIQUE, 0, op,
+                        "You create an aura of magical force. H<The effect will last for about %.10g seconds.>",
+                        TICK2TIME (duration));
+  force = get_archetype (FORCE_NAME);
+  force->subtype = FORCE_CHANGE_ABILITY;
+  force->duration = duration;
+  if (spell_ob->race)
+    force->name = spell_ob->race;
+  else
+    force->name = spell_ob->name;
+  force->name_pl = spell_ob->name;
   force->speed = 1.0;
   force->speed_left = -1.0;
   SET_FLAG (force, FLAG_APPLIED);
   /* Now start processing the effects.  First, protections */
  * items.
  */
 int
 remove_curse (object *op, object *caster, object *spell)
 {
-  object *tmp;
   int success = 0, was_one = 0;
-  for (tmp = op->inv; tmp; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
     if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
         ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
          (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
       {
         was_one++;
 /* Identifies objects in the players inventory/on the ground */
 int
 cast_identify (object *op, object *caster, object *spell)
 {
-  dynbuf_text buf;
   object *tmp;
+  dynbuf_text &buf = msg_dynbuf; buf.clear ();
-  int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
+  int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
-  if (num_ident < 1)
-    num_ident = 1;
   for (tmp = op->inv; tmp; tmp = tmp->below)
     {
       if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
         {
               if (tmp->msg)
                 buf << "The item has a story:\r" << tmp->msg << "\n\n";
             }
-          num_ident--;
-          if (!num_ident)
+          if (!--num_ident)
             break;
         }
     }
   /* If all the power of the spell has been used up, don't go and identify
                 if (tmp->msg)
                   buf << "The item has a story:\r" << tmp->msg << "\n\n";
               }
-            num_ident--;
-            if (!num_ident)
+            if (!--num_ident)
               break;
           }
     }
   if (buf.empty ())
       for (tmp = last; tmp; tmp = tmp->below)
         {
           /* show invisible */
           if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&
               /* Might there be other objects that we can make visible? */
-              (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||
+              (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER)
-                                  (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ))
+                                   || (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ))
                                    || tmp->type == CF_HANDLE
-                                   || tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE
+                                   || tmp->type == TRAPDOOR
+                                   || tmp->type == EXIT
+                                   || tmp->type == HOLE
+                                   || tmp->type == BUTTON
-                                   || tmp->type == BUTTON || tmp->type == TELEPORTER
+                                   || tmp->type == TELEPORTER
+                                   || tmp->type == GATE
-                                   || tmp->type == GATE || tmp->type == LOCKED_DOOR
+                                   || tmp->type == LOCKED_DOOR
-                                   || tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN
+                                   || tmp->type == WEAPON
+                                   || tmp->type == ALTAR
+                                   || tmp->type == SIGN
-                                   || tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY
+                                   || tmp->type == TRIGGER_PEDESTAL
-                                   || tmp->type == TREASURE || tmp->type == BOOK || tmp->type == HOLY_ALTAR)))
+                                   || tmp->type == SPECIAL_KEY
+                                   || tmp->type == TREASURE
+                                   || tmp->type == BOOK
+                                   || tmp->type == HOLY_ALTAR
+                                   || tmp->type == CONTAINER)))
             {
               if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
                 {
                   tmp->invisible = 0;
                   done_one = 1;
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Write what?");
       return 0;
     }
-  if (strcasestr_local (msg, "endmsg"))
+  if (!msg_is_safe (msg))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?");
-      LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg);
+      LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg);
       return 0;
     }
   if (!spell->other_arch)
     return 0;

Diff Legend

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

Comparing deliantra/server/server/spell_effect.C (file contents): Revision 1.99 by elmex, Tue Jan 13 13:29:57 2009 UTC vs. Revision 1.110 by root, Mon Oct 12 14:00:59 2009 UTC

Diff Legend

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.99 by elmex, Tue Jan 13 13:29:57 2009 UTC vs.
Revision 1.110 by root, Mon Oct 12 14:00:59 2009 UTC