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

Comparing deliantra/server/server/alchemy.C (file contents):
Revision 1.20 by root, Mon Feb 5 02:07:40 2007 UTC vs.
Revision 1.31 by root, Mon Sep 29 10:20:48 2008 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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
+ * 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 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 <support@deliantra.net>
  */
 /* March 96 - Laid down original code. -b.t. thomas@astro.psu.edu */
 #include <global.h>
   /* this should be passed to this fctn, not effiecent cpu use this way */
   int batches = abs (nbatches);
   /* is the cauldron the right type? */
-  if (rp->cauldron != cauldron->arch->name)
+  if (rp->cauldron != cauldron->arch->archname)
     {
       new_draw_info (NDI_UNIQUE, 0, caster, "You are not using the proper" " facilities for this formula.");
       return 0;
     }
             break;
         }
       if (!tmp)
         {                       /* failure--no code found */
-          new_draw_info (NDI_UNIQUE, 0, caster, "You know the ingredients," " but not the technique.  Go learn how to do this recipe.");
+          new_draw_info (NDI_UNIQUE, 0, caster, "You know the ingredients, but not the technique. Go learn how to do this recipe.");
           return 0;
         }
     }
 #ifdef EXTREME_ALCHEMY_DEBUG
   if ((item = make_item_from_recipe (cauldron, rp)) != NULL)
     {
       remove_contents (cauldron->inv, item);
       /* Recalc carrying of the cauldron, in case recipe did not conserve mass */
-      sum_weight (cauldron);
+      cauldron->update_weight ();
       /* adj lvl, nrof on caster level */
       adjust_product (item, ability, rp->yield ? (rp->yield * batches) : batches);
       if (!item->env && (item = insert_ob_in_ob (item, cauldron)) == NULL)
         {
           new_draw_info (NDI_UNIQUE, 0, caster, "Nothing happened.");
       {
         size_t i;
         for (i = 0; i < rp->arch_names; i++)
           {
-            if (item->arch->name == rp->arch_name[i])
+            if (item->arch->archname == rp->arch_name[i])
               {
                 *rp_arch_index = i;
                 break;
               }
           }
       if (rndm (0, 2))
         {                       /* slag created */
           object *tmp = cauldron->inv;
           int weight = 0;
-          uint16 material = M_STONE;
-          while (tmp)
-            {                   /* slag has coadded ingredient properties */
-              weight += tmp->weight;
-              if (!(material & tmp->material))
-                material |= tmp->material;
-              tmp = tmp->below;
-            }
           tmp = get_archetype ("rock");
           tmp->weight = weight;
           tmp->value = 0;
-          tmp->material = material;
           tmp->materialname = "stone";
           tmp->name = "slag";
           tmp->name_pl = "slags";
           item = insert_ob_in_ob (tmp, cauldron);
           CLEAR_FLAG (tmp, FLAG_CAN_ROLL);
           CLEAR_FLAG (tmp, FLAG_NO_PICK);
           tmp->move_block = 0;
         }
       remove_contents (cauldron->inv, item);
       new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s.", &cauldron->name, cauldron_sound ());
       return;
     }
   else if (level < 40)
             }
           while (rndm (0, 2));
         }
       return;
     }
   if (level == 40)
     {                           /* MAKE RANDOM RECIPE */
       recipelist *fl;
       int numb = numb_ob_inside (cauldron);
       if (fl && (rp = get_random_recipe (fl)))
         /* even though random, don't grant user any EXP for it */
         (void) attempt_recipe (op, cauldron, 1, rp, -1);
       else
         alchemy_failure_effect (op, cauldron, rp, level - 1);
-      return;
     }
   else if (level < 45)
     {                           /* INFURIATE NPC's */
       /* this is kind of kludgy I know... */
       cauldron->enemy = op;
       npc_call_help (cauldron);
       cauldron->enemy = NULL;
       alchemy_failure_effect (op, cauldron, rp, level - 5);
-      return;
     }
   else if (level < 50)
     {                           /* MINOR EXPLOSION/FIREBALL */
       object *tmp;
             tmp->stats.hp = random_roll (1, level, op, PREFER_LOW) / 10 + 2;
             new_draw_info_format (NDI_UNIQUE, 0, op, "The %s erupts in flame!", &cauldron->name);
             break;
         }
-      op->insert_at (cauldron);
+      tmp->insert_at (cauldron);
-      return;
     }
   else if (level < 60)
     {                           /* CREATE MONSTER */
       new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s.", &cauldron->name, cauldron_sound ());
       remove_contents (cauldron->inv, NULL);
-      return;
     }
   else if (level < 80)
     {                           /* MAJOR FIRE */
       object *fb = get_archetype (SP_MED_FIREBALL);
       remove_contents (cauldron->inv, NULL);
       fire_arch_from_position (cauldron, cauldron, cauldron->x, cauldron->y, 0, fb);
-      fb->destroy ();
+      fb->destroy (true);
       new_draw_info_format (NDI_UNIQUE, 0, op, "The %s erupts in flame!", &cauldron->name);
-      return;
     }
   else if (level < 100)
     {                           /* WHAMMY the CAULDRON */
       if (!QUERY_FLAG (cauldron, FLAG_CURSED))
         SET_FLAG (cauldron, FLAG_CURSED);
       else
         cauldron->magic--;
       cauldron->magic -= random_roll (0, 4, op, PREFER_LOW);
       if (rndm (0, 1))
         {
           remove_contents (cauldron->inv, NULL);
           new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s turns darker then makes a gulping sound!", &cauldron->name);
         }
       else
         new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s becomes darker.", &cauldron->name);
-      return;
     }
   else if (level < 110)
     {                           /* SUMMON EVIL MONSTERS */
       object *tmp = get_random_mon (level / 5);
       remove_contents (cauldron->inv, NULL);
       if (!tmp)
         alchemy_failure_effect (op, cauldron, rp, level);
-      else if (summon_hostile_monsters (cauldron, random_roll (1, 10, op, PREFER_LOW), tmp->arch->name))
+      else if (summon_hostile_monsters (cauldron, random_roll (1, 10, op, PREFER_LOW), tmp->arch->archname))
         new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s and then pours forth monsters!", &cauldron->name, cauldron_sound ());
-      return;
     }
   else if (level < 150)
     {                           /* COMBO EFFECT */
       int roll = rndm (1, 3);
       while (roll)
         {
           alchemy_failure_effect (op, cauldron, rp, level - 39);
           roll--;
         }
-      return;
     }
   else if (level == 151)
     {                           /* CREATE RANDOM ARTIFACT */
       object *tmp;
             {
               remove_contents (cauldron->inv, tmp);
               new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s.", &cauldron->name, cauldron_sound ());
             }
         }
-      return;
     }
   else
     {                           /* MANA STORM - watch out!! */
       object *tmp = get_archetype (LOOSE_MANA);
       new_draw_info (NDI_UNIQUE, 0, op, "You unwisely release potent forces!");
       remove_contents (cauldron->inv, NULL);
       cast_magic_storm (op, tmp, level);
-      return;
     }
 }
 /*
  * All but object "save_item" are elimentated from
  * the container list. Note we have to becareful to remove the inventories
  * of objects in the cauldron inventory (ex icecube has stuff in it).
  */
 void
 remove_contents (object *first_ob, object *save_item)
 {
+  // this cries for a cleaner rewrite, removing save_item first possibly
   object *next, *tmp = first_ob;
   while (tmp)
     {
       next = tmp->below;
         }
       if (tmp->inv)
         remove_contents (tmp->inv, NULL);
-      tmp->destroy ();
+      tmp->destroy (true);
       tmp = next;
     }
 }
 /**
  *"Danger" level, will determine how bad the backfire
  * could be if the user fails to concoct a recipe properly. Factors include
  * the number of ingredients, the length of the name of each ingredient,
  * the user's effective level, the user's Int and the enchantment on the
  * mixing device (aka "cauldron"). Higher values of 'danger' indicate more
  * danger. Note that we assume that we have had the caster ready the alchemy
  * skill *before* this routine is called. (no longer auto-readies that skill)
  * -b.t.
  */
 int
 calc_alch_danger (object *caster, object *cauldron, recipe *rp)
 {
   object *item;
   char name[MAX_BUF];
   int danger = 0, nrofi = 0;
   /* Knowing alchemy skill reduces yer risk */
   danger -= caster->chosen_skill ? caster->chosen_skill->level : caster->level;
+  if (!caster->chosen_skill)
+    LOG (llevError | logBacktrace, "calc_alch_danger called without a chosen skill, caster %s, cauldron %s\n",
+         caster->debug_desc (), cauldron->debug_desc ());
   /* better cauldrons reduce risk */
   danger -= cauldron->magic;
   /* Higher Int, lower the risk */
       if (item->title)
         sprintf (name, "%s %s", &item->name, &item->title);
       danger += (strtoint (name) / 1000) + 3;
       nrofi++;
     }
   if (rp == NULL)
     danger += 110;
   else
     danger += rp->diff * 3;
 #endif
   return danger;
 }
 /**
  * Determines if ingredients in a container match the
  * proper ingredients for a recipe.
  *
  * rp is the recipe to check
  * cauldron is the container that holds the ingredients
   LOG (llevDebug, "looking for formula %d:\n", formula);
 #endif
   result = NULL;
   recipes_matching = 0;
   transmute_found = 0;
-  for (rp = fl->items; rp != NULL; rp = rp->next)
+  for (rp = fl->items; rp; rp = rp->next)
     {
       /* check if recipe matches at all */
       if (formula % rp->index != 0)
         {
 #ifdef EXTREME_ALCHEMY_DEBUG

Diff Legend

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

Comparing deliantra/server/server/alchemy.C (file contents): Revision 1.20 by root, Mon Feb 5 02:07:40 2007 UTC vs. Revision 1.31 by root, Mon Sep 29 10:20:48 2008 UTC

Diff Legend

Comparing deliantra/server/server/alchemy.C (file contents):
Revision 1.20 by root, Mon Feb 5 02:07:40 2007 UTC vs.
Revision 1.31 by root, Mon Sep 29 10:20:48 2008 UTC