--- deliantra/server/include/treasure.h 2007/01/15 21:06:19 1.11 +++ deliantra/server/include/treasure.h 2007/05/28 21:15:56 1.18 @@ -1,25 +1,25 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen * - * This program 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 - * (at your option) any later version. + * 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 (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 - * GNU General Public License for more details. + * 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 - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at crossfire@schmorp.de + * You should have received a copy of the GNU General Public License along + * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The authors can be reached via e-mail to */ /* @@ -44,16 +44,15 @@ /* * Flags to generate_treasures(): */ - enum { - GT_ENVIRONMENT = 0x0001, - GT_INVISIBLE = 0x0002, - GT_STARTEQUIP = 0x0004, - GT_APPLY = 0x0008, - GT_ONLY_GOOD = 0x0010, - GT_UPDATE_INV = 0x0020, - GT_MINIMAL = 0x0040 /* Do minimal adjustments */ + GT_ENVIRONMENT = 0x0001, // put treasure at objetc, not into object + GT_INVISIBLE = 0x0002, + GT_STARTEQUIP = 0x0004, + GT_APPLY = 0x0008, + GT_ONLY_GOOD = 0x0010, + GT_UPDATE_INV = 0x0020, + GT_MINIMAL = 0x0040, // Do minimal adjustments }; /* when a treasure got cloned from archlist, we want perhaps change some default @@ -78,10 +77,9 @@ * to get generated standard treasure when an archetype of that type * is generated (from a generator) */ - struct treasure : zero_initialised { - struct archetype *item; /* Which item this link can be */ + struct archetype *item; /* Which item this link can be */ shstr name; /* If non null, name of list to use instead */ treasure *next; /* Next treasure-item in a linked list */ @@ -90,13 +88,17 @@ treasure *next_no; /* If this item was not generated, */ /* then continue here */ struct _change_arch change_arch; /* override default arch values if set in treasure list */ - uint8 chance; /* Percent chance for this item */ - uint8 magic; /* Max magic bonus to item */ + uint16 chance; /* Percent chance for this item */ /* If the entry is a list transition, * 'magic' contains the difficulty * required to go to the new list */ uint16 nrof; /* random 1 to nrof items are generated */ + uint8 magic; /* Max magic bonus to item */ + + treasure () + : chance (100) + { } }; struct treasurelist : zero_initialised @@ -109,6 +111,15 @@ */ treasurelist *next; /* Next treasure-item in linked list */ treasure *items; /* Items in this list, linked */ + + void create (object *op, int flag, int difficulty); + + static treasurelist *read (object_thawer &f); + static treasurelist *get (const char *name); // find or create + static treasurelist *find (const char *name); }; +void create_treasure (treasurelist *t, object *op, int flag, int difficulty, int tries = 0); + #endif +