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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.52 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.65 by root, Wed Aug 1 00:26:04 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 <object.h>
 #include <living.h>
       return 0;
     }
   if (!(random_roll (0, 3, op, PREFER_HIGH)))
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));
-      play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE);
+      op->play_sound (sound_find ("ob_explode"));
       esrv_del_item (op->contr, wand->count);
       wand->destroy ();
       tmp = get_archetype ("fireball");
       tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
     ncharges = 1;
   wand->stats.food += ncharges;
   new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
-  if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE))
+  if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE))
     {
       SET_FLAG (wand, FLAG_ANIMATE);
-      wand->set_speed (wand->arch->clone.speed);
+      wand->set_speed (wand->arch->speed);
     }
   return 1;
 }
  * great a plus, the default is used.
  * 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)
 {
   int missile_plus = 0, bonus_plus = 0;
   const char *missile_name;
   if (stringarg)
     {
       at = find_archetype_by_object_type_name (FOOD, stringarg);
       if (at == NULL)
         at = find_archetype_by_object_type_name (DRINK, stringarg);
-      if (at == NULL || at->clone.stats.food > food_value)
+      if (at == NULL || at->stats.food > food_value)
         stringarg = NULL;
     }
   if (!stringarg)
     {
        * We don't use flesh types because the weight values of those need
        * to be altered from the donor.
        */
       /* We assume the food items don't have multiple parts */
-      for (at_tmp = first_archetype; at_tmp != NULL; at_tmp = at_tmp->next)
+      for_all_archetypes (at_tmp)
         {
-          if (at_tmp->clone.type == FOOD || at_tmp->clone.type == DRINK)
+          if (at_tmp->type == FOOD || at_tmp->type == DRINK)
             {
               /* Basically, if the food value is something that is creatable
                * under the limits of the spell and it is higher than
                * the item we have now, take it instead.
                */
-              if (at_tmp->clone.stats.food <= food_value && (!at || at_tmp->clone.stats.food > at->clone.stats.food))
+              if (at_tmp->stats.food <= food_value
+                  && (!at
+                      || at_tmp->stats.food > at->stats.food
+                      || (at_tmp->stats.food == at->stats.food
+                          && at_tmp->weight < at->weight)))
                 at = at_tmp;
             }
         }
     }
   /* Pretty unlikely (there are some very low food items), but you never
    * know
    */
   if (!at)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");
       return 0;
     }
-  food_value /= at->clone.stats.food;
+  food_value /= at->stats.food;
   new_op = arch_to_object (at);
   new_op->nrof = food_value;
   new_op->value = 0;
   if (new_op->nrof < 1)
   if (!dir)
     {
       examine_monster (op, op);
       return 1;
     }
   maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
   for (r = 1; r < maxrange; r++)
     {
       sint16 x = op->x + r * freearr_x[dir], y = op->y + r * freearr_y[dir];
                 examine_monster (op, tmp);
                 return 1;
               }
         }
     }
   new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing.");
   return 1;
 }
 /* This checks to see if 'pl' is invisible to 'mon'.
  * does race check, undead check, etc
  * Returns TRUE if mon can't see pl, false
  * otherwise.  This doesn't check range, walls, etc.  It
 }
 int
 perceive_self (object *op)
 {
-  char buf[MAX_BUF];
   const char *cp = describe_item (op, op);
   archetype *at = archetype::find (ARCH_DEPLETION);
-  object *tmp;
-  int i;
+  dynbuf_text buf;
+  if (player *pl = op->contr)
+    if (object *race = archetype::find (op->race))
+      buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n";
-  tmp = find_god (determine_god (op));
+  if (object *god = find_god (determine_god (op)))
-  if (tmp)
+    buf << "You worship " << &god->name << ".\n";
-    new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s", &tmp->name);
   else
-    new_draw_info (NDI_UNIQUE, 0, op, "You worship no god");
+    buf << "You worship no god.\n";
-  tmp = present_arch_in_ob (at, op);
+  object *tmp = present_arch_in_ob (at, op);
   if (*cp == '\0' && tmp == NULL)
-    new_draw_info (NDI_UNIQUE, 0, op, "You feel very mundane");
+    buf << "You feel very mundane. ";
   else
     {
-      new_draw_info (NDI_UNIQUE, 0, op, "You have:");
+      buf << "You have: " << cp << ".\n";
-      new_draw_info (NDI_UNIQUE, 0, op, cp);
       if (tmp)
-        for (i = 0; i < NUM_STATS; i++)
+        for (int i = 0; i < NUM_STATS; i++)
           if (tmp->stats.stat (i) < 0)
-            new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is depleted by %d", statname[i], -tmp->stats.stat (i));
+            buf.printf ("Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
     }
   if (is_dragon_pl (op))
-    {
-      /* now grab the 'dragon_ability'-force from the player's inventory */
+    /* now grab the 'dragon_ability'-force from the player's inventory */
-      for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
+    for (tmp = op->inv; tmp; tmp = tmp->below)
-        {
+      {
-          if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force"))
+        if (tmp->type == FORCE && !strcmp (tmp->arch->archname, "dragon_ability_force"))
-            {
+          {
-              if (tmp->stats.exp == 0)
+            if (tmp->stats.exp == 0)
-                sprintf (buf, "Your metabolism isn't focused on anything.");
+              buf << "Your metabolism isn't focused on anything.\n";
-              else
+            else
-                sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]);
+              buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
-              new_draw_info (NDI_UNIQUE, 0, op, buf);
-              break;
+            break;
-            }
+          }
-        }
+      }
-    }
-  return 1;
+  buf << '\0'; // zero-terminate
-}
-/* int cast_create_town_portal (object *op, object *caster, int dir)
+  new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
- *
- * This function cast the spell of town portal for op
- *
- * The spell operates in two passes. During the first one a place
- * is marked as a destination for the portal. During the second one,
- * 2 portals are created, one in the position the player cast it and
- * one in the destination place. The portal are synchronized and 2 forces
- * are inserted in the player to destruct the portal next time player
- * creates a new portal pair.
- * This spell has a side effect that it allows people to meet each other
- * in a permanent, private,  appartements by making a town portal from it
- * to the town or another public place. So, check if the map is unique and if
- * so return an error
- *
- * Code by Tchize (david.delbecq@usa.net)
- */
-int
-cast_create_town_portal (object *op, object *caster, object *spell, int dir)
-{
-  object *dummy, *force, *old_force;
-  archetype *perm_portal;
-  char portal_name[1024], portal_message[1024];
-  maptile *exitmap;
-  int op_level;
-  /* The first thing to do is to check if we have a marked destination
-   * dummy is used to make a check inventory for the force
-   */
-  dummy = arch_to_object (spell->other_arch);
-  if (dummy == NULL)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
-      LOG (llevError, "object::create failed (force in cast_create_town_portal for %s!\n", &op->name);
-      return 0;
-    }
-  force = check_inv_recursive (op, dummy);
-  if (force == NULL)
-    {
-      /* Here we know there is no destination marked up.
-       * We have 2 things to do:
-       * 1. Mark the destination in the player inventory.
-       * 2. Let the player know it worked.
-       */
-      dummy->name = op->map->path;
-      EXIT_X (dummy) = op->x;
-      EXIT_Y (dummy) = op->y;
-      insert_ob_in_ob (dummy, op);
-      new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You fix this place in your mind. You feel you are able to come here from anywhere.");
-      return 1;
-    }
-  dummy->destroy ();
-  /* Here we know where the town portal should go to
-   * We should kill any existing portal associated with the player.
-   * Than we should create the 2 portals.
-   * For each of them, we need:
-   *    - To create the portal with the name of the player+destination map
-   *    - set the owner of the town portal
-   *    - To mark the position of the portal in the player's inventory
-   *      for easier destruction.
-   *
-   *  The mark works has follow:
-   *   slaying: Existing town portal
-   *   hp, sp : x & y of the associated portal
-   *   name   : name of the portal
-   *   race   : map the portal is in
-   */
-  /* First step: killing existing town portals */
-  dummy = get_archetype (spell->race);
-  if (dummy == NULL)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
-      LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
-      return 0;
-    }
-  perm_portal = archetype::find (spell->slaying);
-  /* To kill a town portal, we go trough the player's inventory,
-   * for each marked portal in player's inventory,
-   *   -We try load the associated map (if impossible, consider the portal destructed)
-   *   -We find any portal in the specified location.
-   *      If it has the good name, we destruct it.
-   *   -We destruct the force indicating that portal.
-   */
-  while ((old_force = check_inv_recursive (op, dummy)))
-    {
-      exitmap = maptile::find_sync (old_force->race, op->map);
-      if (exitmap)
-        {
-          exitmap->load_sync ();
-          int exitx = EXIT_X (old_force);
-          int exity = EXIT_Y (old_force);
-          for (object *tmp = present_arch (perm_portal, exitmap, exitx, exity); tmp; tmp = tmp->above)
-            {
-              if (tmp->name == old_force->name)
-                {
-                  tmp->destroy ();
-                  break;
-                }
-            }
-        }
-      old_force->destroy ();
-    }
-  dummy->destroy ();
-  /* Creating the portals.
-   * The very first thing to do is to ensure
-   * access to the destination map.
-   * If we can't, don't fizzle. Simply warn player.
-   * This ensure player pays his mana for the spell
-   * because HE is responsible of forgotting.
-   * 'force' is the destination of the town portal, which we got
-   * from the players inventory above.
-   */
-  /* Ensure exit map is loaded */
-  exitmap = maptile::find_sync (force->name);
-  /* If we were unable to load (ex. random map deleted), warn player */
-  if (!exitmap)
-    {
-      new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens. You can't remember where to go!?");
-      force->destroy ();
-      return 1;
-    }
-  exitmap->load_sync ();
-  op_level = caster_level (caster, spell);
-  if (op_level < 15)
-    snprintf (portal_message, 1024,
-              "The air moves around you and a huge smell of ammonia surounds you as you pass through %s's tiny portal. Pouah!\n",
-              &op->name);
-  else if (op_level < 30)
-    snprintf (portal_message, 1024,
-              "%s's portal smells of ozone. You do a lot of movements and finally pass through the small hole in the air\n", &op->name);
-  else if (op_level < 60)
-    snprintf (portal_message, 1024, "A shining door opens in the air in front of you, showing you the path to another place.\n");
-  else
-    snprintf (portal_message, 1024, "As you walk through %s's portal, flowers come out from the ground around you. You feel awed.\n",
-              &op->name);
-  /* Create a portal in front of player
-   * dummy contain the portal and
-   * force contain the track to kill it later
-   */
-  snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
-  dummy = get_archetype (spell->slaying);       /*The portal */
-  if (dummy == NULL)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
-      LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
-      return 0;
-    }
-  EXIT_PATH (dummy) = force->name;
-  EXIT_X (dummy) = EXIT_X (force);
-  EXIT_Y (dummy) = EXIT_Y (force);
-  dummy->name = dummy->name_pl = portal_name;
-  dummy->msg = portal_message;
-  dummy->race = op->name;       /*Save the owner of the portal */
-  cast_create_obj (op, caster, dummy, 0);
-  /* Now we need to to create a town portal marker inside the player
-   * object, so on future castings, we can know that he has an active
-   * town portal.
-   */
-  object *tmp = get_archetype (spell->race);
-  if (!tmp)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
-      LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
-      return 0;
-    }
-  tmp->race = op->map->path;
-  tmp->name = portal_name;
-  EXIT_X (tmp) = dummy->x;
-  EXIT_Y (tmp) = dummy->y;
-  op->insert (tmp);
-  /* Create a portal in the destination map
-   * dummy contain the portal and
-   * force the track to kill it later
-   * the 'force' variable still contains the 'reminder' of
-   * where this portal goes to.
-   */
-  snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
-  dummy = get_archetype (spell->slaying);       /*The portal */
-  if (dummy == NULL)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
-      LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
-      return 0;
-    }
-  EXIT_PATH (dummy) = op->map->path;
-  EXIT_X (dummy) = op->x;
-  EXIT_Y (dummy) = op->y;
-  dummy->name = dummy->name_pl = portal_name;
-  dummy->msg = portal_message;
-  dummy->race = op->name;       /*Save the owner of the portal */
-  exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
-  /* Now we create another town portal marker that
-   * points back to the one we just made
-   */
-  tmp = get_archetype (spell->race);
-  if (tmp == NULL)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
-      LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
-      return 0;
-    }
-  tmp->race = force->name;
-  tmp->name = portal_name;
-  EXIT_X (tmp) = dummy->x;
-  EXIT_Y (tmp) = dummy->y;
-  insert_ob_in_ob (tmp, op);
-  /* Describe the player what happened
-   */
-  new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home.");
-  force->destroy ();
   return 1;
 }
 /* This creates magic walls.  Really, it can create most any object,
       new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
       return 0;
     }
   /* If this is a spellcasting wall, need to insert the spell object */
-  if (tmp->other_arch && tmp->other_arch->clone.type == SPELL)
+  if (tmp->other_arch && tmp->other_arch->type == SPELL)
     insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
   /*  This code causes the wall to extend some distance in
    * each direction, or until an obstruction is encountered.
    * posblocked and negblocked help determine how far the
         {
           object *tmp2 = tmp->clone ();
           m->insert (tmp2, x, y, op);
           /* If this is a spellcasting wall, need to insert the spell object */
-          if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
+          if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
             tmp2->insert (arch_to_object (tmp2->other_arch));
         }
       else
         posblocked = 1;
           ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
         {
           object *tmp2 = tmp->clone ();
           m->insert (tmp2, x, y, op);
-          if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
+          if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
             tmp2->insert (arch_to_object (tmp2->other_arch));
         }
       else
         negblocked = 1;
     }
     }
   return success;
 }
 /* This is used for the spells that gain stats.  There are no spells
  * right now that icnrease wis/int/pow on a temp basis, so no
  * good comments for those.
  */
 static const char *const no_gain_msgs[NUM_STATS] = {
   "You grow no stronger.",
   "You grow no more agile.",
   "You don't feel any healthier.",
-  "no wis",
+  "You didn't grow any more intelligent.",
+  "You do not feel any wiser.",
+  "You don't feel any more powerful."
   "You are no easier to look at.",
-  "no int",
-  "no pow"
 };
 int
 cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
 {
         }
       else
         {
           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;
   force->speed = 1.0;
   force->speed_left = -1.0;
   SET_FLAG (force, FLAG_APPLIED);
           force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob);
           if (force->resist[i] > 100)
             force->resist[i] = 100;
         }
     }
   if (spell_ob->stats.hp)
     force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob);
   if (tmp->type == PLAYER)
     {
   force->attacktype = spell_ob->attacktype;
   insert_ob_in_ob (force, tmp);
   change_abil (tmp, force);     /* Mostly to display any messages */
   tmp->update_stats ();
   return 1;
 }
 /* This used to be part of cast_change_ability, but it really didn't make
  * a lot of sense, since most of the values it derives are from the god
  * of the caster.
  */
 int
 cast_bless (object *op, object *caster, object *spell_ob, int dir)
 {
   int i;
   object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp;
   object *weapon, *tmp;
   char buf[MAX_BUF];
   int a, i;
   sint16 x, y;
   maptile *m;
-  materialtype_t *mt;
   if (!spell->other_arch)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
       LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);
   x = op->x + freearr_x[dir];
   y = op->y + freearr_y[dir];
   /* if there's no place to put the golem, abort */
   if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) ||
-      ((spell->other_arch->clone.move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->clone.move_type))
+      ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
       return 0;
     }
   if (!weapon)
     {
       new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
       return 0;
     }
-  if (spell->race && strcmp (weapon->arch->name, spell->race))
+  if (spell->race && strcmp (weapon->arch->archname, spell->race))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
       return 0;
     }
   if (weapon->type != WEAPON)
   /* attacktype */
   if (!tmp->attacktype)
     tmp->attacktype = AT_PHYSICAL;
-  mt = NULL;
-  if (op->materialname != NULL)
-    mt = name_to_material (op->materialname);
+  if (materialtype_t *mt = name_to_material (op->materialname))
-  if (mt != NULL)
     {
       for (i = 0; i < NROFATTACKS; i++)
         tmp->resist[i] = 50 - (mt->save[i] * 5);
       a = mt->save[0];
     }
     {
       for (i = 0; i < NROFATTACKS; i++)
         tmp->resist[i] = 5;
       a = 10;
     }
   /* Set weapon's immunity */
   tmp->resist[ATNR_CONFUSION] = 100;
   tmp->resist[ATNR_POISON] = 100;
   tmp->resist[ATNR_SLOW] = 100;
   tmp->resist[ATNR_PARALYZE] = 100;
   /* Improve weapon's armour value according to best save vs. physical of its material */
   if (a > 14)
     a = 14;
   tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
   /* Determine golem's speed */
   tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));

Diff Legend

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

Comparing deliantra/server/server/spell_effect.C (file contents): Revision 1.52 by root, Thu May 17 14:14:55 2007 UTC vs. Revision 1.65 by root, Wed Aug 1 00:26:04 2007 UTC

Diff Legend

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.52 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.65 by root, Wed Aug 1 00:26:04 2007 UTC