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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.53 by root, Sat Apr 21 16:56:30 2007 UTC vs.
Revision 1.70 by root, Wed Apr 2 11:13:52 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 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
   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 ());
   /* 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->deactivate_recursive ();
+        {
+          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;
  * 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.
       else
         {
           for (i = 0; i < depth; i++)
             fprintf (logfile, "  ");
-          if (t->item && t->item->clone.type == FLESH)
+          if (t->item && t->item->type == FLESH)
-            fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
+            fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
           else
-            fprintf (logfile, "%s\n", &t->item->clone.name);
+            fprintf (logfile, "%s\n", &t->item->object::name);
         }
       if (t->next_yes)
         {
           for (i = 0; i < depth; i++)
   int found;
   found = 0;
   fprintf (logfile, "\n");
-  for (at = first_archetype; at != NULL; at = at->next)
+  for_all_archetypes (at)
-    if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
+    if (!strcasecmp (at->object::name, name) && at->title == NULL)
       {
-        fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
+        fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
-        if (at->clone.randomitems != NULL)
+        if (at->randomitems != NULL)
-          dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
+          dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
         else
           fprintf (logfile, "(nothing)\n");
         fprintf (logfile, "\n");
         found++;
   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;
         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
        */

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.53 by root, Sat Apr 21 16:56:30 2007 UTC vs. Revision 1.70 by root, Wed Apr 2 11:13:52 2008 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.53 by root, Sat Apr 21 16:56:30 2007 UTC vs.
Revision 1.70 by root, Wed Apr 2 11:13:52 2008 UTC