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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.51 by root, Thu Apr 19 16:36:00 2007 UTC vs.
Revision 1.74 by root, Mon Apr 21 23:35:24 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>
  */
 /* TREASURE_DEBUG does some checking on the treasurelists after loading.
  * It is useful for finding bugs in the treasures file.  Since it only
  * slows the startup some (and not actual game play), it is by default
 //#define TREASURE_VERBOSE
 #include <global.h>
 #include <treasure.h>
-#include <funcpoint.h>
 #include <loader.h>
 extern char *spell_mapping[];
 static treasurelist *first_treasurelist;
   f.next ();
   for (;;)
     {
-      coroapi::cede_to_tick_every (10);
+      coroapi::cede_to_tick ();
       switch (f.kw)
         {
           case KW_arch:
-            t->item = archetype::get (f.get_str ());
+            t->item = archetype::find (f.get_str ());
+            if (!t->item)
+              {
+                f.parse_warn ("treasure references unknown archetype");
+                t->item = archetype::empty;
+              }
             break;
           case KW_list:           f.get (t->name);                break;
           case KW_change_name:    f.get (t->change_arch.name);    break;
           case KW_change_title:   f.get (t->change_arch.title);   break;
             t->next = read_treasure (f);
             return t;
           default:
             if (!f.parse_error ("treasurelist", t->name))
-              return 0;
+              goto error;
             return t;
         }
       f.next ();
     }
+  // not reached
+error:
+  delete t;
+  return 0;
 }
 /*
  * Each treasure is parsed with the help of load_treasure().
  */
   /* This is a one of the many items on the list should be generated.
    * Add up the chance total, and check to make sure the yes & no
    * fields of the treasures are not being used.
    */
-  tl->total_chance = 0;
   if (one)
     {
       for (treasure *t = tl->items; t; t = t->next)
         {
           if (t->next_yes || t->next_no)
             {
-              LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
+              LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
               LOG (llevError, "  the next_yes or next_no field is set\n");
             }
           tl->total_chance += t->chance;
         }
  * start with equipment, but only their abilities).
  */
 static void
 put_treasure (object *op, object *creator, int flags)
 {
+  if (flags & GT_ENVIRONMENT)
+    {
-  /* Bit of a hack - spells should never be put onto the map.  The entire
+      /* Bit of a hack - spells should never be put onto the map.  The entire
-   * treasure stuff is a problem - there is no clear idea of knowing
+       * treasure stuff is a problem - there is no clear idea of knowing
-   * this is the original object, or if this is an object that should be created
+       * this is the original object, or if this is an object that should be created
-   * by another object.
+       * by another object.
-   */
+       */
-  if (flags & GT_ENVIRONMENT && op->type != SPELL)
+      //TODO: flag such as objects... as such (no drop, anybody?)
-    {
+      if (op->type == SPELL)
+        {
+          op->destroy ();
+          return;
+        }
+      op->expand_tail ();
-      if (ob_blocked (op, creator->map, creator->x, creator->y))
+      if (op->blocked (creator->map, creator->x, creator->y))
         op->destroy ();
       else
         {
           SET_FLAG (op, FLAG_OBJ_ORIGINAL);
           op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
             else
               LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
         }
       else
         {
-          if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
+          if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
             {
               object *tmp = arch_to_object (t->item);
               if (t->nrof && tmp->nrof <= 1)
                 tmp->nrof = rndm (t->nrof) + 1;
             create_treasure (tl, op, flag, difficulty, tries);
         }
       else if (t->nrof)
         create_one_treasure (tl, op, flag, difficulty, tries);
     }
-  else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
+  else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
     {
       if (object *tmp = arch_to_object (t->item))
         {
           if (t->nrof && tmp->nrof <= 1)
             tmp->nrof = rndm (t->nrof) + 1;
           fix_generated_item (tmp, op, difficulty, t->magic, flag);
           change_treasure (t, tmp);
           put_treasure (tmp, op, flag);
         }
     }
+}
+void
+object::create_treasure (treasurelist *tl, int flags)
+{
+  ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
 }
 /* This calls the appropriate treasure creation function.  tries is passed
  * to determine how many list transitions or attempts to create treasure
  * have been made.  It is really in place to prevent infinite loops with
   if (tries++ > 100)
     {
       LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
       return;
+    }
+  if (op->flag [FLAG_TREASURE_ENV])
+    {
+      // do not generate items when there already is something above the object
+      if (op->flag [FLAG_IS_FLOOR] && op->above)
+        return;
+      flag |= GT_ENVIRONMENT;
     }
   if (tl->total_chance)
     create_one_treasure (tl, op, flag, difficulty, tries);
   else
  *        Removed multiplicator, too many high-level items were generated on low-difficulty maps.
  */
 int
 level_for_item (const object *op, int difficulty)
 {
-  int olevel = 0;
   if (!op->inv)
     {
       LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
       return 0;
     }
-  olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));
+  int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
   if (olevel <= 0)
-    olevel = rndm (1, MIN (op->inv->level, 1));
+    olevel = rndm (1, op->inv->level);
-  if (olevel > MAXLEVEL)
+  return min (olevel, MAXLEVEL);
-    olevel = MAXLEVEL;
-  return olevel;
 }
 /*
  * Based upon the specified difficulty and upon the difftomagic_list array,
  * a random magical bonus is returned.  This is used when determine
   op->magic = magic;
   if (op->arch)
     {
       if (op->type == ARMOUR)
-        ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;
+        ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
       if (magic < 0 && !(rndm (3)))        /* You can't just check the weight always */
         magic = (-magic);
-      op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;
+      op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
     }
   else
     {
       if (op->type == ARMOUR)
         ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
         case 2:
         case 3:
         case 4:
         case 5:
         case 6:
-          set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));
+          op->stats.stat (r) += bonus;
           break;
         case 7:
           op->stats.dam += bonus;
           break;
                      ARG_INT (flags)))
     return;
   if (!(flags & GT_MINIMAL))
     {
-      if (op->arch == crown_arch)
+      if (IS_ARCH (op->arch, crown))
         {
           set_magic (difficulty, op, max_magic, flags);
           num_enchantments = calc_item_power (op, 1);
           generate_artifact (op, difficulty);
         }
           num_enchantments = calc_item_power (op, 1);
           if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
               || op->type == HORN
-              || difficulty >= settings.max_level)       /* high difficulties always generate an artifact,
+              || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
-                                                                                                                                 * used for shop_floors or treasures */
             generate_artifact (op, difficulty);
         }
       /* Object was made an artifact.  Calculate its item_power rating.
        * the item_power in the object is what the artfiact adds.
     {
       if (op->type == POTION)
         /* Handle healing and magic power potions */
         if (op->stats.sp && !op->randomitems)
           {
-            object *tmp;
-            tmp = get_archetype (spell_mapping[op->stats.sp]);
+            object *tmp = get_archetype (spell_mapping [op->stats.sp]);
             insert_ob_in_ob (tmp, op);
             op->stats.sp = 0;
           }
     }
   else if (!op->title)          /* Only modify object if not special */
                 SET_FLAG (op, FLAG_CURSED);
               break;
             }
           case AMULET:
-            if (op->arch == amulet_arch)
+            if (IS_ARCH (op->arch, amulet))
               op->value *= 5;   /* Since it's not just decoration */
           case RING:
-            if (op->arch == NULL)
+            if (!op->arch) // wtf? schmorp
               {
                 op->destroy ();
                 op = 0;
                 break;
               }
-            if (op->arch != ring_arch && op->arch != amulet_arch)       /* It's a special artifact! */
+            if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet))       /* It's a special artifact! */
               break;
             if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
               SET_FLAG (op, FLAG_CURSED);
  * Allocate and return the pointer to an empty artifactlist structure.
  */
 static artifactlist *
 get_empty_artifactlist (void)
 {
-  return salloc0 <artifactlist> ();
+  return salloc0<artifactlist> ();
 }
 /*
  * Allocate and return the pointer to an empty artifact structure.
  */
 static artifact *
 get_empty_artifact (void)
 {
-  return salloc0 <artifact> ();
+  return salloc0<artifact> ();
 }
 /*
  * Searches the artifact lists and returns one that has the same type
  * of objects on it.
   for (artifactlist *al = first_artifactlist; al; al = al->next)
     if (al->type == type)
       return al;
   return 0;
-}
-/*
- * For debugging purposes.  Dumps all tables.
- */
-void
-dump_artifacts (void)
-{
-  artifactlist *al;
-  artifact *art;
-  linked_char *next;
-  fprintf (logfile, "\n");
-  for (al = first_artifactlist; al != NULL; al = al->next)
-    {
-      fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
-      for (art = al->items; art != NULL; art = art->next)
-        {
-          fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
-          if (art->allowed != NULL)
-            {
-              fprintf (logfile, "\tallowed combinations:");
-              for (next = art->allowed; next != NULL; next = next->next)
-                fprintf (logfile, "%s,", &next->name);
-              fprintf (logfile, "\n");
-            }
-        }
-    }
-  fprintf (logfile, "\n");
-}
-/*
- * For debugging purposes.  Dumps all treasures recursively (see below).
- */
-void
-dump_monster_treasure_rec (const char *name, treasure *t, int depth)
-{
-  treasurelist *tl;
-  int i;
-  if (depth > 100)
-    return;
-  while (t)
-    {
-      if (t->name)
-        {
-          for (i = 0; i < depth; i++)
-            fprintf (logfile, "  ");
-          fprintf (logfile, "{   (list: %s)\n", &t->name);
-          tl = treasurelist::find (t->name);
-          if (tl)
-            dump_monster_treasure_rec (name, tl->items, depth + 2);
-          for (i = 0; i < depth; i++)
-            fprintf (logfile, "  ");
-          fprintf (logfile, "}   (end of list: %s)\n", &t->name);
-        }
-      else
-        {
-          for (i = 0; i < depth; i++)
-            fprintf (logfile, "  ");
-          if (t->item && t->item->clone.type == FLESH)
-            fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
-          else
-            fprintf (logfile, "%s\n", &t->item->clone.name);
-        }
-      if (t->next_yes)
-        {
-          for (i = 0; i < depth; i++)
-            fprintf (logfile, "  ");
-          fprintf (logfile, " (if yes)\n");
-          dump_monster_treasure_rec (name, t->next_yes, depth + 1);
-        }
-      if (t->next_no)
-        {
-          for (i = 0; i < depth; i++)
-            fprintf (logfile, "  ");
-          fprintf (logfile, " (if no)\n");
-          dump_monster_treasure_rec (name, t->next_no, depth + 1);
-        }
-      t = t->next;
-    }
-}
-/*
- * For debugging purposes.  Dumps all treasures for a given monster.
- * Created originally by Raphael Quinet for debugging the alchemy code.
- */
-void
-dump_monster_treasure (const char *name)
-{
-  archetype *at;
-  int found;
-  found = 0;
-  fprintf (logfile, "\n");
-  for (at = first_archetype; at != NULL; at = at->next)
-    if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
-      {
-        fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
-        if (at->clone.randomitems != NULL)
-          dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
-        else
-          fprintf (logfile, "(nothing)\n");
-        fprintf (logfile, "\n");
-        found++;
-      }
-  if (found == 0)
-    fprintf (logfile, "No objects have the name %s!\n\n", name);
 }
 /*
  * Builds up the lists of artifacts from the file in the libdir.
  */
   sprintf (filename, "%s/artifacts", settings.datadir);
   object_thawer f (filename);
   if (!f)
     return;
-  f.next ();
   for (;;)
     {
       switch (f.kw)
         {
 #endif
       op->face = change->face;
     }
   for (i = 0; i < NUM_STATS; i++)
-    change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));
+    change_attr_value (&(op->stats), i, change->stats.stat (i));
   op->attacktype |= change->attacktype;
   op->path_attuned |= change->path_attuned;
   op->path_repelled |= change->path_repelled;
   op->path_denied |= change->path_denied;
   if (change->msg)
     op->msg = change->msg;
 }
 static int
-legal_artifact_combination (object *op, artifact * art)
+legal_artifact_combination (object *op, artifact *art)
 {
   int neg, success = 0;
   linked_char *tmp;
   const char *name;
-  if (art->allowed == (linked_char *) NULL)
+  if (!art->allowed)
     return 1;                   /* Ie, "all" */
   for (tmp = art->allowed; tmp; tmp = tmp->next)
     {
 #ifdef TREASURE_VERBOSE
       LOG (llevDebug, "legal_art: %s\n", &tmp->name);
 #endif
         name = tmp->name + 1, neg = 1;
       else
         name = tmp->name, neg = 0;
       /* If we match name, then return the opposite of 'neg' */
-      if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name)))
+      if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
         return !neg;
       /* Set success as true, since if the match was an inverse, it means
        * everything is allowed except what we match
        */
       else if (neg)
         success = 1;
     }
   return success;
 }
 /*
  * Fixes the given object, giving it the abilities and titles

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.51 by root, Thu Apr 19 16:36:00 2007 UTC vs. Revision 1.74 by root, Mon Apr 21 23:35:24 2008 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.51 by root, Thu Apr 19 16:36:00 2007 UTC vs.
Revision 1.74 by root, Mon Apr 21 23:35:24 2008 UTC