ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/treasure.C
(Generate patch)

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.16 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.114 by root, Tue Jan 3 11:25:31 2012 UTC

1
2/* 1/*
3 * static char *rcs_treasure_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 * "$Id: treasure.C,v 1.16 2006/09/10 16:00:23 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
12 7 *
13 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
14 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
15 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
16 (at your option) any later version. 11 * option) any later version.
17 12 *
18 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details. 16 * GNU General Public License for more details.
22 17 *
23 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
24 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
26 21 *
27 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <support@deliantra.net>
28*/ 23 */
29
30#define ALLOWED_COMBINATION
31 24
32/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
33 * It is useful for finding bugs in the treasures file. Since it only 26 * It is useful for finding bugs in the treasures file. Since it only
34 * slows the startup some (and not actual game play), it is by default 27 * slows the startup some (and not actual game play), it is by default
35 * left on 28 * left on
36 */ 29 */
37#define TREASURE_DEBUG 30#define TREASURE_DEBUG
38 31
39/* TREASURE_VERBOSE enables copious output concerning artifact generation */ 32/* TREASURE_VERBOSE enables copious output concerning artifact generation */
40 33
41/* #define TREASURE_VERBOSE */ 34//#define TREASURE_VERBOSE
42 35
43#include <global.h> 36#include <global.h>
44#include <treasure.h> 37#include <treasure.h>
45#include <funcpoint.h>
46#include <loader.h>
47 38
39extern char *spell_mapping[];
40
41static treasurelist *first_treasurelist;
48 42
49static void change_treasure (treasure *t, object *op); /* overrule default values */ 43static void change_treasure (treasure *t, object *op); /* overrule default values */
50extern char *spell_mapping[];
51 44
52/* 45typedef std::tr1::unordered_map<
53 * Initialize global archtype pointers: 46 const char *,
54 */ 47 treasurelist *,
48 str_hash,
49 str_equal,
50 slice_allocator< std::pair<const char *const, treasurelist *> >
51> tl_map_t;
55 52
56void 53static tl_map_t tl_map;
57init_archetype_pointers ()
58{
59 int prev_warn = warn_archetypes;
60 54
61 warn_archetypes = 1; 55//TODO: class method
62 if (ring_arch == NULL) 56static void free_treasurestruct (treasure *t); // bleh desu
63 ring_arch = find_archetype ("ring"); 57static void
64 if (amulet_arch == NULL) 58clear (treasurelist *tl)
65 amulet_arch = find_archetype ("amulet"); 59{
66 if (staff_arch == NULL) 60 if (tl->items)
67 staff_arch = find_archetype ("staff"); 61 {
68 if (crown_arch == NULL) 62 free_treasurestruct (tl->items);
69 crown_arch = find_archetype ("crown"); 63 tl->items = 0;
70 warn_archetypes = prev_warn; 64 }
71}
72 65
73/* 66 tl->total_chance = 0;
74 * Allocate and return the pointer to an empty treasurelist structure. 67}
75 */
76 68
69/*
70 * Searches for the given treasurelist
71 */
77static treasurelist * 72treasurelist *
78get_empty_treasurelist (void) 73treasurelist::find (const char *name)
79{ 74{
75 if (!name)
76 return 0;
77
78 auto (i, tl_map.find (name));
79
80 if (i == tl_map.end ())
81 return 0;
82
83 return i->second;
84}
85
86/*
87 * Searches for the given treasurelist in the globally linked list
88 * of treasurelists which has been built by load_treasures().
89 */
90treasurelist *
91treasurelist::get (const char *name)
92{
93 treasurelist *tl = find (name);
94
95 if (!tl)
96 {
80 return new treasurelist; 97 tl = new treasurelist;
81}
82 98
83/* 99 tl->name = name;
84 * Allocate and return the pointer to an empty treasure structure. 100 tl->next = first_treasurelist;
85 */ 101 first_treasurelist = tl;
86//TODO: make this a constructor
87static treasure *
88get_empty_treasure (void)
89{
90 treasure *t = new treasure;
91 102
92 t->chance = 100; 103 tl_map.insert (std::make_pair (tl->name, tl));
104 }
93 105
94 return t; 106 return tl;
95} 107}
108
109#ifdef TREASURE_DEBUG
110/* recursived checks the linked list. Treasurelist is passed only
111 * so that the treasure name can be printed out
112 */
113static void
114check_treasurelist (const treasure *t, const treasurelist * tl)
115{
116 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
117 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
118
119 if (t->next)
120 check_treasurelist (t->next, tl);
121
122 if (t->next_yes)
123 check_treasurelist (t->next_yes, tl);
124
125 if (t->next_no)
126 check_treasurelist (t->next_no, tl);
127}
128#endif
96 129
97/* 130/*
98 * Reads the lib/treasure file from disk, and parses the contents 131 * Reads the lib/treasure file from disk, and parses the contents
99 * into an internal treasure structure (very linked lists) 132 * into an internal treasure structure (very linked lists)
100 */ 133 */
101
102static treasure * 134static treasure *
103load_treasure (FILE * fp, int *line) 135read_treasure (object_thawer &f)
104{ 136{
105 char buf[MAX_BUF], *cp, variable[MAX_BUF];
106 treasure *t = get_empty_treasure (); 137 treasure *t = new treasure;
107 int value;
108 138
109 nroftreasures++; 139 f.next ();
110 while (fgets (buf, MAX_BUF, fp) != NULL)
111 {
112 (*line)++;
113 140
114 if (*buf == '#') 141 for (;;)
115 continue; 142 {
116 if ((cp = strchr (buf, '\n')) != NULL) 143 coroapi::cede_to_tick ();
117 *cp = '\0';
118 cp = buf;
119 while (isspace (*cp)) /* Skip blanks */
120 cp++;
121 144
122 if (sscanf (cp, "arch %s", variable)) 145 switch (f.kw)
123 {
124 if ((t->item = find_archetype (variable)) == NULL)
125 LOG (llevError, "Treasure lacks archetype: %s\n", variable);
126 } 146 {
127 else if (sscanf (cp, "list %s", variable)) 147 case KW_arch:
128 t->name = variable; 148 t->item = archetype::find (f.get_str ());
129 else if (sscanf (cp, "change_name %s", variable)) 149
130 t->change_arch.name = variable; 150 if (!t->item)
131 else if (sscanf (cp, "change_title %s", variable))
132 t->change_arch.title = variable;
133 else if (sscanf (cp, "change_slaying %s", variable))
134 t->change_arch.slaying = variable;
135 else if (sscanf (cp, "chance %d", &value))
136 t->chance = (uint8) value;
137 else if (sscanf (cp, "nrof %d", &value))
138 t->nrof = (uint16) value;
139 else if (sscanf (cp, "magic %d", &value))
140 t->magic = (uint8) value;
141 else if (!strcmp (cp, "yes"))
142 t->next_yes = load_treasure (fp, line);
143 else if (!strcmp (cp, "no"))
144 t->next_no = load_treasure (fp, line);
145 else if (!strcmp (cp, "end"))
146 return t;
147 else if (!strcmp (cp, "more"))
148 { 151 {
149 t->next = load_treasure (fp, line); 152 f.parse_warn ("treasure references unknown archetype");
153 t->item = archetype::empty;
154 }
155
156 break;
157
158 case KW_list: f.get (t->name); break;
159 case KW_change_name: f.get (t->change_arch.name); break;
160 case KW_change_title: f.get (t->change_arch.title); break;
161 case KW_change_slaying: f.get (t->change_arch.slaying); break;
162 case KW_chance: f.get (t->chance); break;
163 case KW_nrof: f.get (t->nrof); break;
164 case KW_magic: f.get (t->magic); break;
165
166 case KW_yes: t->next_yes = read_treasure (f); continue;
167 case KW_no: t->next_no = read_treasure (f); continue;
168
169 case KW_end:
170 f.next ();
150 return t; 171 return t;
172
173 case KW_more:
174 t->next = read_treasure (f);
175 return t;
176
177 default:
178 if (!f.parse_error ("treasurelist", t->name))
179 goto error;
180
181 return t;
151 } 182 }
152 else 183
153 LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line); 184 f.next ();
154 } 185 }
155 LOG (llevError, "treasure lacks 'end'.\n"); 186
187 // not reached
188
189error:
190 delete t;
156 return t; 191 return 0;
157} 192}
158 193
159#ifdef TREASURE_DEBUG
160
161/* recursived checks the linked list. Treasurelist is passed only
162 * so that the treasure name can be printed out
163 */
164static void
165check_treasurelist (const treasure *t, const treasurelist * tl)
166{
167 if (t->item == NULL && t->name == NULL)
168 LOG (llevError, "Treasurelist %s has element with no name or archetype\n", &tl->name);
169 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
170 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
171 /* find_treasurelist will print out its own error message */
172 if (t->name && *t->name)
173 (void) find_treasurelist (t->name);
174 if (t->next)
175 check_treasurelist (t->next, tl);
176 if (t->next_yes)
177 check_treasurelist (t->next_yes, tl);
178 if (t->next_no)
179 check_treasurelist (t->next_no, tl);
180}
181#endif
182
183/* 194/*
184 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
185 * Each treasure is parsed with the help of load_treasure(). 195 * Each treasure is parsed with the help of load_treasure().
186 */ 196 */
187 197treasurelist *
188void 198treasurelist::read (object_thawer &f)
189load_treasures (void)
190{ 199{
191 FILE *fp; 200 assert (f.kw == KW_treasure || f.kw == KW_treasureone);
192 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
193 treasurelist *previous = NULL;
194 treasure *t;
195 int comp, line = 0;
196 201
197 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 202 bool one = f.kw == KW_treasureone;
198 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 203 treasurelist *tl = treasurelist::get (f.get_str ());
199 { 204 clear (tl);
200 LOG (llevError, "Can't open treasure file.\n"); 205 tl->items = read_treasure (f);
206 if (!tl->items)
201 return; 207 return 0;
202 }
203 while (fgets (buf, MAX_BUF, fp) != NULL)
204 {
205 line++;
206 if (*buf == '#')
207 continue;
208 208
209 if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name))
210 {
211 treasurelist *tl = get_empty_treasurelist ();
212
213 tl->name = name;
214 if (previous == NULL)
215 first_treasurelist = tl;
216 else
217 previous->next = tl;
218 previous = tl;
219 tl->items = load_treasure (fp, &line);
220
221 /* This is a one of the many items on the list should be generated. 209 /* This is a one of the many items on the list should be generated.
222 * Add up the chance total, and check to make sure the yes & no 210 * Add up the chance total, and check to make sure the yes & no
223 * fields of the treasures are not being used. 211 * fields of the treasures are not being used.
224 */ 212 */
225 if (!strncmp (buf, "treasureone", 11)) 213 if (one)
214 {
215 for (treasure *t = tl->items; t; t = t->next)
216 {
217 if (t->next_yes || t->next_no)
226 { 218 {
227 for (t = tl->items; t != NULL; t = t->next)
228 {
229#ifdef TREASURE_DEBUG
230 if (t->next_yes || t->next_no)
231 {
232 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 219 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
233 LOG (llevError, " the next_yes or next_no field is set\n"); 220 LOG (llevError, " the next_yes or next_no field is set\n");
234 }
235#endif
236 tl->total_chance += t->chance;
237 }
238 } 221 }
239 }
240 else
241 LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
242 }
243 close_and_delete (fp, comp);
244 222
245#ifdef TREASURE_DEBUG 223 tl->total_chance += t->chance;
246 /* Perform some checks on how valid the treasure data actually is. 224 }
247 * verify that list transitions work (ie, the list that it is supposed 225 }
248 * to transition to exists). Also, verify that at least the name
249 * or archetype is set for each treasure element.
250 */
251 for (previous = first_treasurelist; previous != NULL; previous = previous->next)
252 check_treasurelist (previous->items, previous);
253#endif
254}
255 226
256/*
257 * Searches for the given treasurelist in the globally linked list
258 * of treasurelists which has been built by load_treasures().
259 */
260
261treasurelist *
262find_treasurelist (const char *name)
263{
264 /* Special cases - randomitems of NULL is to override default. If
265 * first_treasurelist is null, it means we are on the first pass of
266 * of loading archetypes, so for now, just return - second pass will
267 * init these values.
268 */
269 if (!name)
270 return 0;
271
272 if (const char *tmp = shstr::find (name))
273 for (treasurelist * tl = first_treasurelist; tl != 0; tl = tl->next)
274 if (tmp == tl->name)
275 return tl;
276
277 if (first_treasurelist)
278 LOG (llevError, "Couldn't find treasurelist %s\n", name);
279
280 return 0; 227 return tl;
281} 228}
282
283 229
284/* 230/*
285 * Generates the objects specified by the given treasure. 231 * Generates the objects specified by the given treasure.
286 * It goes recursively through the rest of the linked list. 232 * It goes recursively through the rest of the linked list.
287 * If there is a certain percental chance for a treasure to be generated, 233 * If there is a certain percental chance for a treasure to be generated,
… …
290 * being generated. 236 * being generated.
291 * If flag is GT_INVISIBLE, only invisible objects are generated (ie, only 237 * If flag is GT_INVISIBLE, only invisible objects are generated (ie, only
292 * abilities. This is used by summon spells, thus no summoned monsters 238 * abilities. This is used by summon spells, thus no summoned monsters
293 * start with equipment, but only their abilities). 239 * start with equipment, but only their abilities).
294 */ 240 */
295
296
297static void 241static void
298put_treasure (object *op, object *creator, int flags) 242put_treasure (object *op, object *creator, int flags)
299{ 243{
300 object *tmp; 244 if (flags & GT_ENVIRONMENT)
301 245 {
302 /* Bit of a hack - spells should never be put onto the map. The entire 246 /* Bit of a hack - spells should never be put onto the map. The entire
303 * treasure stuff is a problem - there is no clear idea of knowing 247 * treasure stuff is a problem - there is no clear idea of knowing
304 * this is the original object, or if this is an object that should be created 248 * this is the original object, or if this is an object that should be created
305 * by another object. 249 * by another object.
306 */ 250 */
307 if (flags & GT_ENVIRONMENT && op->type != SPELL) 251 //TODO: flag such as objects... as such (no drop, anybody?)
308 { 252 if (op->type == SPELL)
309 op->x = creator->x; 253 {
310 op->y = creator->y; 254 op->destroy ();
311 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 255 return;
256 }
257
258 op->expand_tail ();
259
260 if (!creator->is_on_map ()
261 || (op->weight && op->blocked (creator->map, creator->x, creator->y)))
262 op->destroy ();
263 else
264 {
265 op->flag [FLAG_OBJ_ORIGINAL] = true;
312 insert_ob_in_map (op, creator->map, op, INS_NO_MERGE | INS_NO_WALK_ON); 266 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
267 }
313 } 268 }
314 else 269 else
315 { 270 {
316 op = insert_ob_in_ob (op, creator); 271 op = creator->insert (op);
272
317 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 273 if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
318 monster_check_apply (creator, op); 274 monster_check_apply (creator, op);
319 if ((flags & GT_UPDATE_INV) && (tmp = is_player_inv (creator)) != NULL)
320 esrv_send_item (tmp, op);
321 } 275 }
322} 276}
323 277
324/* if there are change_xxx commands in the treasure, we include the changes 278/* if there are change_xxx commands in the treasure, we include the changes
325 * in the generated object 279 * in the generated object
… …
339 293
340 if (t->change_arch.slaying) 294 if (t->change_arch.slaying)
341 op->slaying = t->change_arch.slaying; 295 op->slaying = t->change_arch.slaying;
342} 296}
343 297
344void 298static void
345create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) 299create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
346{ 300{
347 object *tmp;
348
349 if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance) 301 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
350 { 302 {
351 if (t->name) 303 if (t->name)
352 { 304 {
353 if (strcmp (t->name, "NONE") && difficulty >= t->magic) 305 if (difficulty >= t->magic)
306 if (treasurelist *tl = treasurelist::find (t->name))
354 create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries); 307 create_treasure (tl, op, flag, difficulty, tries);
308 else
309 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
355 } 310 }
356 else 311 else
357 { 312 {
358 if (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)) 313 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
359 { 314 {
360 tmp = arch_to_object (t->item); 315 object *tmp = t->item->instance ();
316
361 if (t->nrof && tmp->nrof <= 1) 317 if (t->nrof && tmp->nrof <= 1)
362 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 318 tmp->nrof = rndm (t->nrof) + 1;
319
363 fix_generated_item (tmp, op, difficulty, t->magic, flag); 320 fix_generated_item (tmp, op, difficulty, t->magic, flag);
364 change_treasure (t, tmp); 321 change_treasure (t, tmp);
365 put_treasure (tmp, op, flag); 322 put_treasure (tmp, op, flag);
366 } 323 }
367 } 324 }
368 325
369 if (t->next_yes != NULL) 326 if (t->next_yes)
370 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 327 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
371 } 328 }
372 else if (t->next_no != NULL) 329 else if (t->next_no)
373 create_all_treasures (t->next_no, op, flag, difficulty, tries); 330 create_all_treasures (t->next_no, op, flag, difficulty, tries);
374 331
375 if (t->next != NULL) 332 if (t->next)
376 create_all_treasures (t->next, op, flag, difficulty, tries); 333 create_all_treasures (t->next, op, flag, difficulty, tries);
377} 334}
378 335
379void 336static void
380create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries) 337create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
381{ 338{
382 int value = RANDOM () % tl->total_chance; 339 int value = rndm (tl->total_chance);
383 treasure *t; 340 treasure *t;
384 341
385 if (tries++ > 100) 342 if (tries++ > 100)
386 { 343 {
387 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); 344 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
388 return; 345 return;
389 } 346 }
390 347
391 for (t = tl->items; t != NULL; t = t->next) 348 for (t = tl->items; t; t = t->next)
392 { 349 {
393 value -= t->chance; 350 value -= t->chance;
394 351
395 if (value < 0) 352 if (value < 0)
396 break; 353 break;
397 } 354 }
398 355
399 if (!t || value >= 0) 356 if (!t || value >= 0)
400 {
401 LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n"); 357 cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
402 abort ();
403 return;
404 }
405 358
406 if (t->name) 359 if (t->name)
407 { 360 {
408 if (!strcmp (t->name, "NONE"))
409 return;
410
411 if (difficulty >= t->magic) 361 if (difficulty >= t->magic)
362 {
363 treasurelist *tl = treasurelist::find (t->name);
364 if (tl)
412 create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries); 365 create_treasure (tl, op, flag, difficulty, tries);
366 }
413 else if (t->nrof) 367 else if (t->nrof)
414 create_one_treasure (tl, op, flag, difficulty, tries); 368 create_one_treasure (tl, op, flag, difficulty, tries);
415
416 return;
417 } 369 }
418
419 if ((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE) 370 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
420 { 371 {
421 object *tmp = arch_to_object (t->item); 372 if (object *tmp = t->item->instance ())
422 373 {
423 if (!tmp)
424 return;
425
426 if (t->nrof && tmp->nrof <= 1) 374 if (t->nrof && tmp->nrof <= 1)
427 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 375 tmp->nrof = rndm (t->nrof) + 1;
428 376
429 fix_generated_item (tmp, op, difficulty, t->magic, flag); 377 fix_generated_item (tmp, op, difficulty, t->magic, flag);
430 change_treasure (t, tmp); 378 change_treasure (t, tmp);
431 put_treasure (tmp, op, flag); 379 put_treasure (tmp, op, flag);
380 }
432 } 381 }
382}
383
384void
385object::create_treasure (treasurelist *tl, int flags)
386{
387 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
433} 388}
434 389
435/* This calls the appropriate treasure creation function. tries is passed 390/* This calls the appropriate treasure creation function. tries is passed
436 * to determine how many list transitions or attempts to create treasure 391 * to determine how many list transitions or attempts to create treasure
437 * have been made. It is really in place to prevent infinite loops with 392 * have been made. It is really in place to prevent infinite loops with
438 * list transitions, or so that excessively good treasure will not be 393 * list transitions, or so that excessively good treasure will not be
439 * created on weak maps, because it will exceed the number of allowed tries 394 * created on weak maps, because it will exceed the number of allowed tries
440 * to do that. 395 * to do that.
441 */ 396 */
442void 397void
443create_treasure (treasurelist * t, object *op, int flag, int difficulty, int tries) 398create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
444{ 399{
400 // empty treasurelists are legal
401 if (!tl->items)
402 return;
445 403
446 if (tries++ > 100) 404 if (tries++ > 100)
447 { 405 {
448 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 406 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
449 return; 407 return;
450 } 408 }
409
410 if (op->flag [FLAG_TREASURE_ENV])
411 {
412 // do not generate items when there already is something above the object
413 if (op->flag [FLAG_IS_FLOOR] && op->above)
414 return;
415
416 flag |= GT_ENVIRONMENT;
417 }
418
451 if (t->total_chance) 419 if (tl->total_chance)
452 create_one_treasure (t, op, flag, difficulty, tries); 420 create_one_treasure (tl, op, flag, difficulty, tries);
453 else 421 else
454 create_all_treasures (t->items, op, flag, difficulty, tries); 422 create_all_treasures (tl->items, op, flag, difficulty, tries);
455} 423}
456 424
457/* This is similar to the old generate treasure function. However, 425/* This is similar to the old generate treasure function. However,
458 * it instead takes a treasurelist. It is really just a wrapper around 426 * it instead takes a treasurelist. It is really just a wrapper around
459 * create_treasure. We create a dummy object that the treasure gets 427 * create_treasure. We create a dummy object that the treasure gets
460 * inserted into, and then return that treausre 428 * inserted into, and then return that treausre
461 */ 429 */
462object * 430object *
463generate_treasure (treasurelist * t, int difficulty) 431generate_treasure (treasurelist *tl, int difficulty)
464{ 432{
465 object *ob = get_object (), *tmp; 433 difficulty = clamp (difficulty, 1, settings.max_level);
466 434
435 object *ob = object::create ();
436
467 create_treasure (t, ob, 0, difficulty, 0); 437 create_treasure (tl, ob, 0, difficulty, 0);
468 438
469 /* Don't want to free the object we are about to return */ 439 /* Don't want to free the object we are about to return */
470 tmp = ob->inv; 440 object *tmp = ob->inv;
471 if (tmp != NULL) 441 if (tmp)
472 remove_ob (tmp); 442 tmp->remove ();
443
473 if (ob->inv) 444 if (ob->inv)
474 {
475 LOG (llevError, "In generate treasure, created multiple objects.\n"); 445 LOG (llevError, "In generate treasure, created multiple objects.\n");
476 } 446
477 free_object (ob); 447 ob->destroy ();
448
478 return tmp; 449 return tmp;
479} 450}
480 451
481/* 452/*
482 * This is a new way of calculating the chance for an item to have 453 * This is a new way of calculating the chance for an item to have
… …
484 * The array has two arguments, the difficulty of the level, and the 455 * The array has two arguments, the difficulty of the level, and the
485 * magical bonus "wanted". 456 * magical bonus "wanted".
486 */ 457 */
487 458
488static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 459static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
489
490/*chance of magic difficulty*/ 460// chance of magic difficulty
491
492/* +0 +1 +2 +3 +4 */ 461// +0 +1 +2 +3 +4
493 {95, 2, 2, 1, 0}, /*1 */ 462 {95, 2, 2, 1, 0}, // 1
494 {92, 5, 2, 1, 0}, /*2 */ 463 {92, 5, 2, 1, 0}, // 2
495 {85, 10, 4, 1, 0}, /*3 */ 464 {85, 10, 4, 1, 0}, // 3
496 {80, 14, 4, 2, 0}, /*4 */ 465 {80, 14, 4, 2, 0}, // 4
497 {75, 17, 5, 2, 1}, /*5 */ 466 {75, 17, 5, 2, 1}, // 5
498 {70, 18, 8, 3, 1}, /*6 */ 467 {70, 18, 8, 3, 1}, // 6
499 {65, 21, 10, 3, 1}, /*7 */ 468 {65, 21, 10, 3, 1}, // 7
500 {60, 22, 12, 4, 2}, /*8 */ 469 {60, 22, 12, 4, 2}, // 8
501 {55, 25, 14, 4, 2}, /*9 */ 470 {55, 25, 14, 4, 2}, // 9
502 {50, 27, 16, 5, 2}, /*10 */ 471 {50, 27, 16, 5, 2}, // 10
503 {45, 28, 18, 6, 3}, /*11 */ 472 {45, 28, 18, 6, 3}, // 11
504 {42, 28, 20, 7, 3}, /*12 */ 473 {42, 28, 20, 7, 3}, // 12
505 {40, 27, 21, 8, 4}, /*13 */ 474 {40, 27, 21, 8, 4}, // 13
506 {38, 25, 22, 10, 5}, /*14 */ 475 {38, 25, 22, 10, 5}, // 14
507 {36, 23, 23, 12, 6}, /*15 */ 476 {36, 23, 23, 12, 6}, // 15
508 {33, 21, 24, 14, 8}, /*16 */ 477 {33, 21, 24, 14, 8}, // 16
509 {31, 19, 25, 16, 9}, /*17 */ 478 {31, 19, 25, 16, 9}, // 17
510 {27, 15, 30, 18, 10}, /*18 */ 479 {27, 15, 30, 18, 10}, // 18
511 {20, 12, 30, 25, 13}, /*19 */ 480 {20, 12, 30, 25, 13}, // 19
512 {15, 10, 28, 30, 17}, /*20 */ 481 {15, 10, 28, 30, 17}, // 20
513 {13, 9, 27, 28, 23}, /*21 */ 482 {13, 9, 27, 28, 23}, // 21
514 {10, 8, 25, 28, 29}, /*22 */ 483 {10, 8, 25, 28, 29}, // 22
515 {8, 7, 23, 26, 36}, /*23 */ 484 { 8, 7, 23, 26, 36}, // 23
516 {6, 6, 20, 22, 46}, /*24 */ 485 { 6, 6, 20, 22, 46}, // 24
517 {4, 5, 17, 18, 56}, /*25 */ 486 { 4, 5, 17, 18, 56}, // 25
518 {2, 4, 12, 14, 68}, /*26 */ 487 { 2, 4, 12, 14, 68}, // 26
519 {0, 3, 7, 10, 80}, /*27 */ 488 { 0, 3, 7, 10, 80}, // 27
520 {0, 0, 3, 7, 90}, /*28 */ 489 { 0, 0, 3, 7, 90}, // 28
521 {0, 0, 0, 3, 97}, /*29 */ 490 { 0, 0, 0, 3, 97}, // 29
522 {0, 0, 0, 0, 100}, /*30 */ 491 { 0, 0, 0, 0, 100}, // 30
523 {0, 0, 0, 0, 100}, /*31 */ 492 { 0, 0, 0, 0, 100}, // 31
524}; 493};
525
526 494
527/* calculate the appropriate level for wands staves and scrolls. 495/* calculate the appropriate level for wands staves and scrolls.
528 * This code presumes that op has had its spell object created (in op->inv) 496 * This code presumes that op has had its spell object created (in op->inv)
529 * 497 *
530 * elmex Wed Aug 9 17:44:59 CEST 2006: 498 * elmex Wed Aug 9 17:44:59 CEST 2006:
531 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 499 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
532 */ 500 */
533 501static int
534int
535level_for_item (const object *op, int difficulty) 502level_for_item (const object *op, int difficulty)
536{ 503{
537 int olevel = 0;
538
539 if (!op->inv) 504 if (!op->inv)
540 { 505 {
541 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); 506 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
542 return 0; 507 return 0;
543 } 508 }
544 509
545 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 510 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
546 511
547 if (olevel <= 0) 512 if (olevel <= 0)
548 olevel = rndm (1, MIN (op->inv->level, 1)); 513 olevel = rndm (1, op->inv->level);
549 514
550 if (olevel > MAXLEVEL) 515 return min (olevel, MAXLEVEL_TREASURE);
551 olevel = MAXLEVEL;
552
553 return olevel;
554} 516}
555 517
556/* 518/*
557 * Based upon the specified difficulty and upon the difftomagic_list array, 519 * Based upon the specified difficulty and upon the difftomagic_list array,
558 * a random magical bonus is returned. This is used when determine 520 * a random magical bonus is returned. This is used when determine
… …
561 * elmex Thu Aug 10 18:45:44 CEST 2006: 523 * elmex Thu Aug 10 18:45:44 CEST 2006:
562 * Scaling difficulty by max_level, as difficulty is a level and not some 524 * Scaling difficulty by max_level, as difficulty is a level and not some
563 * weird integer between 1-31. 525 * weird integer between 1-31.
564 * 526 *
565 */ 527 */
566 528static int
567int
568magic_from_difficulty (int difficulty) 529magic_from_difficulty (int difficulty)
569{ 530{
570 int percent = 0, magic = 0;
571 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 531 int scaled_diff = lerp (difficulty, 0, settings.max_level, 0, DIFFLEVELS - 1);
532 scaled_diff = clamp (scaled_diff, 0, DIFFLEVELS - 1);
572 533
573 scaled_diff--; 534 int percent = rndm (100);
535 int magic;
574 536
575 if (scaled_diff < 0)
576 scaled_diff = 0;
577
578 if (scaled_diff >= DIFFLEVELS)
579 scaled_diff = DIFFLEVELS - 1;
580
581 percent = RANDOM () % 100;
582
583 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 537 for (magic = 0; magic <= MAXMAGIC; magic++)
584 { 538 {
585 percent -= difftomagic_list[scaled_diff][magic]; 539 percent -= difftomagic_list[scaled_diff][magic];
586 540
587 if (percent < 0) 541 if (percent < 0)
588 break; 542 break;
589 } 543 }
590 544
591 if (magic == (MAXMAGIC + 1)) 545 if (magic > MAXMAGIC)
592 { 546 {
593 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); 547 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
594 magic = 0; 548 magic = 0;
595 } 549 }
596 550
597 magic = (RANDOM () % 3) ? magic : -magic; 551 magic = (rndm (3)) ? magic : -magic;
598 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */ 552 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
599 553
600 return magic; 554 return magic;
601} 555}
602 556
… …
604 * Sets magical bonus in an object, and recalculates the effect on 558 * Sets magical bonus in an object, and recalculates the effect on
605 * the armour variable, and the effect on speed of armour. 559 * the armour variable, and the effect on speed of armour.
606 * This function doesn't work properly, should add use of archetypes 560 * This function doesn't work properly, should add use of archetypes
607 * to make it truly absolute. 561 * to make it truly absolute.
608 */ 562 */
609
610void 563void
611set_abs_magic (object *op, int magic) 564set_abs_magic (object *op, int magic)
612{ 565{
613 if (!magic) 566 if (!magic)
614 return; 567 return;
615 568
616 op->magic = magic; 569 op->magic = magic;
617 if (op->arch) 570 if (op->arch)
618 { 571 {
619 if (op->type == ARMOUR) 572 if (op->type == ARMOUR)
620 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 573 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
621 574
622 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 575 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
623 magic = (-magic); 576 magic = (-magic);
577
624 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 578 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
625 } 579 }
626 else 580 else
627 { 581 {
628 if (op->type == ARMOUR) 582 if (op->type == ARMOUR)
629 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 583 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
584
630 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 585 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
631 magic = (-magic); 586 magic = (-magic);
587
632 op->weight = (op->weight * (100 - magic * 10)) / 100; 588 op->weight = (op->weight * (100 - magic * 10)) / 100;
633 } 589 }
634} 590}
635 591
636/* 592/*
… …
639 */ 595 */
640 596
641static void 597static void
642set_magic (int difficulty, object *op, int max_magic, int flags) 598set_magic (int difficulty, object *op, int max_magic, int flags)
643{ 599{
644 int i;
645
646 i = magic_from_difficulty (difficulty); 600 int i = magic_from_difficulty (difficulty);
601
647 if ((flags & GT_ONLY_GOOD) && i < 0) 602 if ((flags & GT_ONLY_GOOD) && i < 0)
648 i = -i; 603 i = -i;
604
649 if (i > max_magic) 605 i = min (i, max_magic);
650 i = max_magic; 606
651 set_abs_magic (op, i); 607 set_abs_magic (op, i);
652 if (i < 0) 608 if (i < 0)
653 SET_FLAG (op, FLAG_CURSED); 609 op->set_flag (FLAG_CURSED);
654} 610}
655 611
656/* 612/*
657 * Randomly adds one magical ability to the given object. 613 * Randomly adds one magical ability to the given object.
658 * Modified for Partial Resistance in many ways: 614 * Modified for Partial Resistance in many ways:
659 * 1) Since rings can have multiple bonuses, if the same bonus 615 * 1) Since rings can have multiple bonuses, if the same bonus
660 * is rolled again, increase it - the bonuses now stack with 616 * is rolled again, increase it - the bonuses now stack with
661 * other bonuses previously rolled and ones the item might natively have. 617 * other bonuses previously rolled and ones the item might natively have.
662 * 2) Add code to deal with new PR method. 618 * 2) Add code to deal with new PR method.
663 */ 619 */
664 620static void
665void
666set_ring_bonus (object *op, int bonus) 621set_ring_bonus (object *op, int bonus)
667{ 622{
668
669 int r = RANDOM () % (bonus > 0 ? 25 : 11); 623 int r = rndm (bonus > 0 ? 25 : 11);
670 624
671 if (op->type == AMULET) 625 if (op->type == AMULET)
672 { 626 if (!rndm (21))
673 if (!(RANDOM () % 21)) 627 r = 20 + rndm (2);
674 r = 20 + RANDOM () % 2; 628 else if (rndm (2))
629 r = 10;
675 else 630 else
676 { 631 r = 11 + rndm (9);
677 if (RANDOM () & 2)
678 r = 10;
679 else
680 r = 11 + RANDOM () % 9;
681 }
682 }
683 632
684 switch (r) 633 switch (r)
685 { 634 {
686 /* Redone by MSW 2000-11-26 to have much less code. Also, 635 /* Redone by MSW 2000-11-26 to have much less code. Also,
687 * bonuses and penalties will stack and add to existing values. 636 * bonuses and penalties will stack and add to existing values.
688 * of the item. 637 * of the item.
689 */ 638 */
690 case 0: 639 case 0:
691 case 1: 640 case 1:
692 case 2: 641 case 2:
693 case 3: 642 case 3:
694 case 4: 643 case 4:
695 case 5: 644 case 5:
696 case 6: 645 case 6:
697 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 646 op->stats.stat (r) += bonus;
698 break; 647 break;
699 648
700 case 7: 649 case 7:
701 op->stats.dam += bonus; 650 op->stats.dam += bonus;
702 break; 651 break;
… …
722 case 16: 671 case 16:
723 case 17: 672 case 17:
724 case 18: 673 case 18:
725 case 19: 674 case 19:
726 { 675 {
727 int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table; 676 int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
728 677
729 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */ 678 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
730 val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b; 679 val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
731 680
732 /* Cursed items need to have higher negative values to equal out with 681 /* Cursed items need to have higher negative values to equal out with
733 * positive values for how protections work out. Put another 682 * positive values for how protections work out. Put another
734 * little random element in since that they don't always end up with 683 * little random element in since that they don't always end up with
735 * even values. 684 * even values.
736 */ 685 */
737 if (bonus < 0) 686 if (bonus < 0)
738 val = 2 * -val - RANDOM () % b; 687 val = 2 * -val - rndm (b);
739 if (val > 35) 688
740 val = 35; /* Upper limit */ 689 val = min (35, val); /* Upper limit */
690
741 b = 0; 691 b = 0;
692
742 while (op->resist[resist_table[resist]] != 0 && b < 4) 693 while (op->resist[resist_table[resist]] != 0 && b < 4)
743 {
744 resist = RANDOM () % num_resist_table; 694 resist = rndm (num_resist_table);
745 } 695
746 if (b == 4) 696 if (b == 4)
747 return; /* Not able to find a free resistance */ 697 return; /* Not able to find a free resistance */
698
748 op->resist[resist_table[resist]] = val; 699 op->resist[resist_table[resist]] = val;
749 /* We should probably do something more clever here to adjust value 700 /* We should probably do something more clever here to adjust value
750 * based on how good a resistance we gave. 701 * based on how good a resistance we gave.
751 */ 702 */
752 break; 703 break;
753 } 704 }
754 case 20: 705 case 20:
755 if (op->type == AMULET) 706 if (op->type == AMULET)
756 { 707 {
757 SET_FLAG (op, FLAG_REFL_SPELL); 708 op->set_flag (FLAG_REFL_SPELL);
758 op->value *= 11; 709 op->value *= 11;
759 } 710 }
760 else 711 else
761 { 712 {
762 op->stats.hp = 1; /* regenerate hit points */ 713 op->stats.hp = 1; /* regenerate hit points */
… …
765 break; 716 break;
766 717
767 case 21: 718 case 21:
768 if (op->type == AMULET) 719 if (op->type == AMULET)
769 { 720 {
770 SET_FLAG (op, FLAG_REFL_MISSILE); 721 op->set_flag (FLAG_REFL_MISSILE);
771 op->value *= 9; 722 op->value *= 9;
772 } 723 }
773 else 724 else
774 { 725 {
775 op->stats.sp = 1; /* regenerate spell points */ 726 op->stats.sp = 1; /* regenerate spell points */
… …
777 } 728 }
778 break; 729 break;
779 730
780 case 22: 731 case 22:
781 op->stats.exp += bonus; /* Speed! */ 732 op->stats.exp += bonus; /* Speed! */
782 op->value = (op->value * 2) / 3; 733 op->value = op->value * 2 / 3;
783 break; 734 break;
784 } 735 }
736
785 if (bonus > 0) 737 if (bonus > 0)
786 op->value *= 2 * bonus; 738 op->value = 2 * op->value * bonus;
787 else 739 else
788 op->value = -(op->value * 2 * bonus) / 3; 740 op->value = -2 * op->value * bonus / 3;
789} 741}
790 742
791/* 743/*
792 * get_magic(diff) will return a random number between 0 and 4. 744 * get_magic(diff) will return a random number between 0 and 4.
793 * diff can be any value above 2. The higher the diff-variable, the 745 * diff can be any value above 2. The higher the diff-variable, the
794 * higher is the chance of returning a low number. 746 * higher is the chance of returning a low number.
795 * It is only used in fix_generated_treasure() to set bonuses on 747 * It is only used in fix_generated_treasure() to set bonuses on
796 * rings and amulets. 748 * rings and amulets.
797 * Another scheme is used to calculate the magic of weapons and armours. 749 * Another scheme is used to calculate the magic of weapons and armours.
798 */ 750 */
799 751static int
800int
801get_magic (int diff) 752get_magic (int diff)
802{ 753{
803 int i; 754 diff = min (3, diff);
804 755
805 if (diff < 3)
806 diff = 3;
807 for (i = 0; i < 4; i++) 756 for (int i = 0; i < 4; i++)
808 if (RANDOM () % diff) 757 if (rndm (diff))
809 return i; 758 return i;
759
810 return 4; 760 return 4;
811} 761}
812 762
763/* special_potion() - so that old potion code is still done right. */
764static int
765special_potion (object *op)
766{
767 if (op->attacktype)
768 return 1;
769
770 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
771 return 1;
772
773 for (int i = 0; i < NROFATTACKS; i++)
774 if (op->resist[i])
775 return 1;
776
777 return 0;
778}
779
780static double
781value_factor_from_spell_item (object *spell, object *item)
782{
783 double factor =
784 pow ((spell->value > 0 ? spell->value : 1)
785 * spell->level, 1.5);
786
787 if (item) // this if for: wands/staffs/rods:
788 {
789 /* Old crossfire comment ahead:
790 * Add 50 to both level an divisor to keep prices a little more
791 * reasonable. Otherwise, a high level version of a low level
792 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
793 * 10 time multiplier). This way, the value are a bit more reasonable.
794 */
795
796 factor *= item->level + 50;
797 factor /= item->inv->level + 50;
798 }
799
800 return factor;
801}
802
813#define DICE2 (get_magic(2)==2?2:1) 803#define DICE2 (get_magic(2) == 2 ? 2 : 1)
814#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3) 804#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
815 805
816/* 806/*
817 * fix_generated_item(): This is called after an item is generated, in 807 * fix_generated_item(): This is called after an item is generated, in
818 * order to set it up right. This produced magical bonuses, puts spells 808 * order to set it up right. This produced magical bonuses, puts spells
819 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 809 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
… …
833 * value. 823 * value.
834 * GT_MINIMAL: Does minimal processing on the object - just enough to make it 824 * GT_MINIMAL: Does minimal processing on the object - just enough to make it
835 * a working object - don't change magic, value, etc, but set it material 825 * a working object - don't change magic, value, etc, but set it material
836 * type as appropriate, for objects that need spell objects, set those, etc 826 * type as appropriate, for objects that need spell objects, set those, etc
837 */ 827 */
838
839void 828void
840fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) 829fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
841{ 830{
842 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; 831 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
843 832
… …
848 save_item_power = op->item_power; 837 save_item_power = op->item_power;
849 op->item_power = 0; 838 op->item_power = 0;
850 839
851 if (op->randomitems && op->type != SPELL) 840 if (op->randomitems && op->type != SPELL)
852 { 841 {
853 create_treasure (op->randomitems, op, flags, difficulty, 0); 842 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
854 if (!op->inv)
855 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
856
857 /* So the treasure doesn't get created again */ 843 /* So the treasure doesn't get created again */
858 op->randomitems = NULL; 844 op->randomitems = 0;
859 } 845 }
860 846
861 if (difficulty < 1) 847 max_it (difficulty, 1);
862 difficulty = 1; 848
849 if (INVOKE_OBJECT (ADD_BONUS, op,
850 ARG_OBJECT (creator != op ? creator : 0),
851 ARG_INT (difficulty), ARG_INT (max_magic),
852 ARG_INT (flags)))
853 return;
863 854
864 if (!(flags & GT_MINIMAL)) 855 if (!(flags & GT_MINIMAL))
865 { 856 {
866 if (op->arch == crown_arch) 857 if (IS_ARCH (op->arch, crown))
867 { 858 {
868 set_magic (difficulty, op, max_magic, flags); 859 set_magic (difficulty, op, max_magic, flags);
869 num_enchantments = calc_item_power (op, 1); 860 num_enchantments = calc_item_power (op, 1);
870 generate_artifact (op, difficulty); 861 generate_artifact (op, difficulty);
871 } 862 }
… …
874 if (!op->magic && max_magic) 865 if (!op->magic && max_magic)
875 set_magic (difficulty, op, max_magic, flags); 866 set_magic (difficulty, op, max_magic, flags);
876 867
877 num_enchantments = calc_item_power (op, 1); 868 num_enchantments = calc_item_power (op, 1);
878 869
879 if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 870 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
880 * used for shop_floors or treasures */ 871 || op->type == HORN
872 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
881 generate_artifact (op, difficulty); 873 generate_artifact (op, difficulty);
882 } 874 }
883 875
884 /* Object was made an artifact. Calculate its item_power rating. 876 /* Object was made an artifact. Calculate its item_power rating.
885 * the item_power in the object is what the artfiact adds. 877 * the item_power in the object is what the artfiact adds.
… …
919 * again below */ 911 * again below */
920 } 912 }
921 } 913 }
922 914
923 /* materialtype modifications. Note we allow this on artifacts. */ 915 /* materialtype modifications. Note we allow this on artifacts. */
924 set_materialname (op, difficulty, NULL); 916 select_material (op, difficulty);
925 917
926 if (flags & GT_MINIMAL) 918 if (flags & GT_MINIMAL)
927 { 919 {
928 if (op->type == POTION) 920 if (op->type == POTION)
929 /* Handle healing and magic power potions */ 921 /* Handle healing and magic power potions */
930 if (op->stats.sp && !op->randomitems) 922 if (op->stats.sp && !op->randomitems)
931 { 923 {
932 object *tmp;
933
934 tmp = get_archetype (spell_mapping[op->stats.sp]); 924 object *tmp = archetype::get (spell_mapping [op->stats.sp]);
935 insert_ob_in_ob (tmp, op); 925 insert_ob_in_ob (tmp, op);
936 op->stats.sp = 0; 926 op->stats.sp = 0;
937 } 927 }
938 } 928 }
939 else if (!op->title) /* Only modify object if not special */ 929 else if (!op->title) /* Only modify object if not special */
… …
942 case WEAPON: 932 case WEAPON:
943 case ARMOUR: 933 case ARMOUR:
944 case SHIELD: 934 case SHIELD:
945 case HELMET: 935 case HELMET:
946 case CLOAK: 936 case CLOAK:
947 if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4)) 937 if (op->flag [FLAG_CURSED] && !(rndm (4)))
948 set_ring_bonus (op, -DICE2); 938 set_ring_bonus (op, -DICE2);
949 break; 939 break;
950 940
951 case BRACERS: 941 case BRACERS:
952 if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))) 942 if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
953 { 943 {
954 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 944 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
955 if (!QUERY_FLAG (op, FLAG_CURSED)) 945 if (!op->flag [FLAG_CURSED])
956 op->value *= 3; 946 op->value *= 3;
957 } 947 }
958 break; 948 break;
959 949
960 case POTION: 950 case POTION:
… …
962 int too_many_tries = 0, is_special = 0; 952 int too_many_tries = 0, is_special = 0;
963 953
964 /* Handle healing and magic power potions */ 954 /* Handle healing and magic power potions */
965 if (op->stats.sp && !op->randomitems) 955 if (op->stats.sp && !op->randomitems)
966 { 956 {
967 object *tmp;
968
969 tmp = get_archetype (spell_mapping[op->stats.sp]); 957 object *tmp = archetype::get (spell_mapping[op->stats.sp]);
970 insert_ob_in_ob (tmp, op); 958 insert_ob_in_ob (tmp, op);
971 op->stats.sp = 0; 959 op->stats.sp = 0;
972 } 960 }
973 961
974 while (!(is_special = special_potion (op)) && !op->inv) 962 while (!(is_special = special_potion (op)) && !op->inv)
… …
982 * since the value set on those is already correct. 970 * since the value set on those is already correct.
983 */ 971 */
984 if (op->inv && op->randomitems) 972 if (op->inv && op->randomitems)
985 { 973 {
986 /* value multiplier is same as for scrolls */ 974 /* value multiplier is same as for scrolls */
987 op->value = (op->value * op->inv->value); 975 op->value *= op->inv->value;
988 op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty; 976 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
989 } 977 }
990 else 978 else
991 { 979 {
992 op->name = "potion"; 980 op->name = shstr_potion;
993 op->name_pl = "potions"; 981 op->name_pl = shstr_potions;
994 } 982 }
995 983
996 if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2) 984 if (!(flags & GT_ONLY_GOOD) && rndm (2))
997 SET_FLAG (op, FLAG_CURSED); 985 op->set_flag (FLAG_CURSED);
986
998 break; 987 break;
999 } 988 }
1000 989
1001 case AMULET: 990 case AMULET:
1002 if (op->arch == amulet_arch) 991 if (IS_ARCH (op->arch, amulet))
1003 op->value *= 5; /* Since it's not just decoration */ 992 op->value *= 5; /* Since it's not just decoration */
1004 993
1005 case RING: 994 case RING:
1006 if (op->arch == NULL)
1007 {
1008 remove_ob (op);
1009 free_object (op);
1010 op = NULL;
1011 break;
1012 }
1013
1014 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 995 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
1015 break; 996 break;
1016 997
1017 if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3)) 998 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1018 SET_FLAG (op, FLAG_CURSED); 999 op->set_flag (FLAG_CURSED);
1019 1000
1020 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 1001 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
1021 1002
1022 if (op->type != RING) /* Amulets have only one ability */ 1003 if (op->type != RING) /* Amulets have only one ability */
1023 break; 1004 break;
1024 1005
1025 if (!(RANDOM () % 4)) 1006 if (!rndm (4))
1026 { 1007 {
1027 int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1008 int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1028 1009
1029 if (d > 0) 1010 if (d > 0)
1030 op->value *= 3; 1011 op->value *= 3;
1031 1012
1032 set_ring_bonus (op, d); 1013 set_ring_bonus (op, d);
1033 1014
1034 if (!(RANDOM () % 4)) 1015 if (!rndm (4))
1035 { 1016 {
1036 int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1017 int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1037 1018
1038 if (d > 0) 1019 if (d > 0)
1039 op->value *= 5; 1020 op->value *= 5;
1021
1040 set_ring_bonus (op, d); 1022 set_ring_bonus (op, d);
1041 } 1023 }
1042 } 1024 }
1043 1025
1044 if (GET_ANIM_ID (op)) 1026 if (op->animation_id)
1045 SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op))); 1027 op->set_anim_frame (rndm (op->anim_frames ()));
1046 1028
1047 break; 1029 break;
1048 1030
1049 case BOOK: 1031 case BOOK:
1050 /* Is it an empty book?, if yes lets make a special· 1032 /* Is it an empty book?, if yes lets make a special·
1051 * msg for it, and tailor its properties based on the· 1033 * msg for it, and tailor its properties based on the·
1052 * creator and/or map level we found it on. 1034 * creator and/or map level we found it on.
1053 */ 1035 */
1054 if (!op->msg && RANDOM () % 10) 1036 if (!op->msg && rndm (10))
1055 { 1037 {
1056 /* set the book level properly */ 1038 /* set the book level properly */
1057 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1039 if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1058 { 1040 {
1059 if (op->map && op->map->difficulty) 1041 if (op->map && op->map->difficulty)
1060 op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1; 1042 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1061 else 1043 else
1062 op->level = RANDOM () % 20 + 1; 1044 op->level = rndm (20) + 1;
1063 } 1045 }
1064 else 1046 else
1065 op->level = RANDOM () % creator->level; 1047 op->level = rndm (creator->level);
1066 1048
1067 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1049 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1068 /* books w/ info are worth more! */ 1050 /* books w/ info are worth more! */
1069 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1051 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1070 /* creator related stuff */
1071
1072 /* for library, chained books. Note that some monsters have no_pick
1073 * set - we don't want to set no pick in that case.
1074 */
1075 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1076 SET_FLAG (op, FLAG_NO_PICK);
1077 if (creator->slaying && !op->slaying) /* for check_inv floors */
1078 op->slaying = creator->slaying;
1079 1052
1080 /* add exp so reading it gives xp (once) */ 1053 /* add exp so reading it gives xp (once) */
1081 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10; 1054 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1082 } 1055 }
1056
1057 /* creator related stuff */
1058
1059 /* for library, chained books. Note that some monsters have no_pick
1060 * set - we don't want to set no pick in that case.
1061 */
1062 if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
1063 op->set_flag (FLAG_NO_PICK);
1064 if (creator->slaying && !op->slaying) /* for check_inv floors */
1065 op->slaying = creator->slaying;
1083 break; 1066 break;
1084 1067
1085 case SPELLBOOK: 1068 case SPELLBOOK:
1086 op->value = op->value * op->inv->value; 1069 op->value *= value_factor_from_spell_item (op->inv, 0);
1070
1087 /* add exp so learning gives xp */ 1071 /* add exp so learning gives xp */
1088 op->level = op->inv->level; 1072 op->level = op->inv->level;
1089 op->stats.exp = op->value; 1073 op->stats.exp = op->value;
1090 break; 1074 break;
1091 1075
… …
1095 * and reset nrof. 1079 * and reset nrof.
1096 */ 1080 */
1097 op->stats.food = op->inv->nrof; 1081 op->stats.food = op->inv->nrof;
1098 op->nrof = 1; 1082 op->nrof = 1;
1099 /* If the spell changes by level, choose a random level 1083 /* If the spell changes by level, choose a random level
1100 * for it, and adjust price. If the spell doesn't 1084 * for it.
1101 * change by level, just set the wand to the level of
1102 * the spell, and value calculation is simpler.
1103 */ 1085 */
1104 if (op->inv->duration_modifier || op->inv->dam_modifier || op->inv->range_modifier) 1086 if (op->inv->duration_modifier
1105 { 1087 || op->inv->dam_modifier
1088 || op->inv->range_modifier)
1106 op->level = level_for_item (op, difficulty); 1089 op->level = level_for_item (op, difficulty);
1107 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1108 }
1109 else 1090 else
1110 {
1111 op->level = op->inv->level; 1091 op->level = op->inv->level;
1112 op->value = op->value * op->inv->value; 1092
1113 } 1093 op->value *= value_factor_from_spell_item (op->inv, op);
1114 break; 1094 break;
1115 1095
1116 case ROD: 1096 case ROD:
1117 op->level = level_for_item (op, difficulty); 1097 op->level = level_for_item (op, difficulty);
1118 /* Add 50 to both level an divisor to keep prices a little more 1098 op->value *= value_factor_from_spell_item (op->inv, op);
1119 * reasonable. Otherwise, a high level version of a low level 1099
1120 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1121 * 10 time multiplier). This way, the value are a bit more reasonable.
1122 */
1123 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1124 /* maxhp is used to denote how many 'charges' the rod holds before */ 1100 /* maxhp is used to denote how many 'charges' the rod holds before */
1125 if (op->stats.maxhp) 1101 if (op->stats.maxhp)
1126 op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace); 1102 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1127 else 1103 else
1128 op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace); 1104 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1129 1105
1130 op->stats.hp = op->stats.maxhp; 1106 op->stats.hp = op->stats.maxhp;
1131 break; 1107 break;
1132 1108
1133 case SCROLL: 1109 case SCROLL:
1134 op->level = level_for_item (op, difficulty); 1110 op->level = level_for_item (op, difficulty);
1135 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1111 op->value *= value_factor_from_spell_item (op->inv, op);
1136 1112
1137 /* add exp so reading them properly gives xp */ 1113 /* add exp so reading them properly gives xp */
1138 op->stats.exp = op->value / 5; 1114 op->stats.exp = op->value / 5;
1139 op->nrof = op->inv->nrof; 1115 op->nrof = op->inv->nrof;
1140 break; 1116 break;
… …
1148 break; 1124 break;
1149 } /* switch type */ 1125 } /* switch type */
1150 1126
1151 if (flags & GT_STARTEQUIP) 1127 if (flags & GT_STARTEQUIP)
1152 { 1128 {
1153 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN)) 1129 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1154 SET_FLAG (op, FLAG_STARTEQUIP); 1130 op->set_flag (FLAG_STARTEQUIP);
1155 else if (op->type != MONEY) 1131 else if (op->type != MONEY)
1156 op->value = 0; 1132 op->value = 0;
1157 } 1133 }
1158 1134
1159 if (!(flags & GT_ENVIRONMENT)) 1135 if (!(flags & GT_ENVIRONMENT))
… …
1169 */ 1145 */
1170 1146
1171/* 1147/*
1172 * Allocate and return the pointer to an empty artifactlist structure. 1148 * Allocate and return the pointer to an empty artifactlist structure.
1173 */ 1149 */
1174
1175static artifactlist * 1150static artifactlist *
1176get_empty_artifactlist (void) 1151get_empty_artifactlist ()
1177{ 1152{
1178 artifactlist *tl = (artifactlist *) malloc (sizeof (artifactlist)); 1153 return salloc0<artifactlist> ();
1179
1180 if (tl == NULL)
1181 fatal (OUT_OF_MEMORY);
1182 tl->next = NULL;
1183 tl->items = NULL;
1184 tl->total_chance = 0;
1185 return tl;
1186} 1154}
1187 1155
1188/* 1156/*
1189 * Allocate and return the pointer to an empty artifact structure. 1157 * Allocate and return the pointer to an empty artifact structure.
1190 */ 1158 */
1191
1192static artifact * 1159static artifact *
1193get_empty_artifact (void) 1160get_empty_artifact ()
1194{ 1161{
1195 artifact *t = (artifact *) malloc (sizeof (artifact)); 1162 return salloc0<artifact> ();
1196
1197 if (t == NULL)
1198 fatal (OUT_OF_MEMORY);
1199 t->item = NULL;
1200 t->next = NULL;
1201 t->chance = 0;
1202 t->difficulty = 0;
1203 t->allowed = NULL;
1204 return t;
1205} 1163}
1206 1164
1207/* 1165/*
1208 * Searches the artifact lists and returns one that has the same type 1166 * Searches the artifact lists and returns one that has the same type
1209 * of objects on it. 1167 * of objects on it.
1210 */ 1168 */
1211
1212artifactlist * 1169artifactlist *
1213find_artifactlist (int type) 1170find_artifactlist (int type)
1214{ 1171{
1215 artifactlist *al;
1216
1217 for (al = first_artifactlist; al != NULL; al = al->next) 1172 for (artifactlist *al = first_artifactlist; al; al = al->next)
1218 if (al->type == type) 1173 if (al->type == type)
1219 return al; 1174 return al;
1175
1220 return NULL; 1176 return 0;
1221} 1177}
1222 1178
1223/* 1179/*
1224 * For debugging purposes. Dumps all tables. 1180 * Builds up the lists of artifacts from the file in the libdir.
1225 */ 1181 */
1226
1227void 1182void
1228dump_artifacts (void)
1229{
1230 artifactlist *al;
1231 artifact *art;
1232 linked_char *next;
1233
1234 fprintf (logfile, "\n");
1235 for (al = first_artifactlist; al != NULL; al = al->next)
1236 {
1237 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1238 for (art = al->items; art != NULL; art = art->next)
1239 {
1240 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1241 if (art->allowed != NULL)
1242 {
1243 fprintf (logfile, "\tAllowed combinations:");
1244 for (next = art->allowed; next != NULL; next = next->next)
1245 fprintf (logfile, "%s,", &next->name);
1246 fprintf (logfile, "\n");
1247 }
1248 }
1249 }
1250 fprintf (logfile, "\n");
1251}
1252
1253/*
1254 * For debugging purposes. Dumps all treasures recursively (see below).
1255 */
1256void
1257dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1258{
1259 treasurelist *tl;
1260 int i;
1261
1262 if (depth > 100)
1263 return;
1264 while (t != NULL)
1265 {
1266 if (t->name != NULL)
1267 {
1268 for (i = 0; i < depth; i++)
1269 fprintf (logfile, " ");
1270 fprintf (logfile, "{ (list: %s)\n", &t->name);
1271 tl = find_treasurelist (t->name);
1272 dump_monster_treasure_rec (name, tl->items, depth + 2);
1273 for (i = 0; i < depth; i++)
1274 fprintf (logfile, " ");
1275 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1276 }
1277 else
1278 {
1279 for (i = 0; i < depth; i++)
1280 fprintf (logfile, " ");
1281 if (t->item->clone.type == FLESH)
1282 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1283 else
1284 fprintf (logfile, "%s\n", &t->item->clone.name);
1285 }
1286 if (t->next_yes != NULL)
1287 {
1288 for (i = 0; i < depth; i++)
1289 fprintf (logfile, " ");
1290 fprintf (logfile, " (if yes)\n");
1291 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1292 }
1293 if (t->next_no != NULL)
1294 {
1295 for (i = 0; i < depth; i++)
1296 fprintf (logfile, " ");
1297 fprintf (logfile, " (if no)\n");
1298 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1299 }
1300 t = t->next;
1301 }
1302}
1303
1304/*
1305 * For debugging purposes. Dumps all treasures for a given monster.
1306 * Created originally by Raphael Quinet for debugging the alchemy code.
1307 */
1308
1309void
1310dump_monster_treasure (const char *name)
1311{
1312 archetype *at;
1313 int found;
1314
1315 found = 0;
1316 fprintf (logfile, "\n");
1317 for (at = first_archetype; at != NULL; at = at->next)
1318 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1319 {
1320 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1321 if (at->clone.randomitems != NULL)
1322 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1323 else
1324 fprintf (logfile, "(nothing)\n");
1325 fprintf (logfile, "\n");
1326 found++;
1327 }
1328 if (found == 0)
1329 fprintf (logfile, "No objects have the name %s!\n\n", name);
1330}
1331
1332/*
1333 * Builds up the lists of artifacts from the file in the libdir.
1334 */
1335
1336void
1337init_artifacts (void) 1183init_artifacts ()
1338{ 1184{
1339 static int has_been_inited = 0; 1185 static int has_been_inited = 0;
1340 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;
1341 artifact *art = NULL; 1186 artifact *art = NULL;
1342 linked_char *tmp;
1343 int value;
1344 artifactlist *al; 1187 artifactlist *al;
1345 1188
1346 if (has_been_inited) 1189 if (has_been_inited)
1347 return; 1190 return;
1348 else 1191 else
1349 has_been_inited = 1; 1192 has_been_inited = 1;
1350 1193
1351 sprintf (filename, "%s/artifacts", settings.datadir); 1194 object_thawer f (settings.datadir, "artifacts");
1352 object_thawer thawer (filename);
1353 1195
1354 if (!thawer) 1196 if (!f)
1355 return; 1197 return;
1356 1198
1357 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1199 for (;;)
1358 { 1200 {
1359 if (*buf == '#') 1201 switch (f.kw)
1360 continue;
1361 if ((cp = strchr (buf, '\n')) != NULL)
1362 *cp = '\0';
1363 cp = buf;
1364 while (*cp == ' ') /* Skip blanks */
1365 cp++;
1366 if (*cp == '\0')
1367 continue;
1368
1369 if (!strncmp (cp, "Allowed", 7))
1370 { 1202 {
1203 case KW_allowed:
1371 if (art == NULL) 1204 if (!art)
1205 art = get_empty_artifact ();
1206
1372 { 1207 {
1373 art = get_empty_artifact (); 1208 if (!strcmp (f.get_str (), "all"))
1374 nrofartifacts++; 1209 break;
1210
1211 const char *cp = f.get_str ();
1212 char *next;
1213 do
1214 {
1215 if ((next = (char *)strchr (cp, ',')))
1216 *next++ = '\0';
1217
1218 linked_char *tmp = new linked_char;
1219
1220 tmp->name = cp;
1221 tmp->next = art->allowed;
1222 art->allowed = tmp;
1223 }
1224 while ((cp = next));
1375 } 1225 }
1376 cp = strchr (cp, ' ') + 1; 1226 break;
1377 if (!strcmp (cp, "all")) 1227
1228 case KW_chance:
1229 f.get (art->chance);
1230 break;
1231
1232 case KW_difficulty:
1233 f.get (art->difficulty);
1234 break;
1235
1236 case KW_object:
1237 {
1238 art->item = object::create ();
1239 f.get (art->item->name);
1240 f.next ();
1241
1242 if (!art->item->parse_kv (f))
1243 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1244
1245 al = find_artifactlist (art->item->type);
1246
1247 if (!al)
1248 {
1249 al = get_empty_artifactlist ();
1250 al->type = art->item->type;
1251 al->next = first_artifactlist;
1252 first_artifactlist = al;
1253 }
1254
1255 art->next = al->items;
1256 al->items = art;
1257 art = 0;
1258 }
1378 continue; 1259 continue;
1379 1260
1380 do 1261 case KW_EOF:
1262 goto done;
1263
1264 default:
1265 if (!f.parse_error ("artifacts file"))
1266 cleanup ("artifacts file required");
1381 { 1267 break;
1382 nrofallowedstr++;
1383 if ((next = strchr (cp, ',')) != NULL)
1384 *(next++) = '\0';
1385 tmp = new linked_char;
1386
1387 tmp->name = cp;
1388 tmp->next = art->allowed;
1389 art->allowed = tmp;
1390 }
1391 while ((cp = next) != NULL);
1392 }
1393 else if (sscanf (cp, "chance %d", &value))
1394 art->chance = (uint16) value;
1395 else if (sscanf (cp, "difficulty %d", &value))
1396 art->difficulty = (uint8) value;
1397 else if (!strncmp (cp, "Object", 6))
1398 { 1268 }
1399 art->item = get_object ();
1400 1269
1401 if (!load_object (thawer, art->item, 0)) 1270 f.next ();
1402 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1403
1404 art->item->name = strchr (cp, ' ') + 1;
1405 al = find_artifactlist (art->item->type);
1406 if (al == NULL)
1407 {
1408 al = get_empty_artifactlist ();
1409 al->type = art->item->type;
1410 al->next = first_artifactlist;
1411 first_artifactlist = al;
1412 }
1413 art->next = al->items;
1414 al->items = art;
1415 art = NULL;
1416 }
1417 else
1418 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1419 } 1271 }
1420 1272
1273done:
1421 for (al = first_artifactlist; al != NULL; al = al->next) 1274 for (al = first_artifactlist; al; al = al->next)
1422 { 1275 {
1276 al->total_chance = 0;
1277
1423 for (art = al->items; art != NULL; art = art->next) 1278 for (art = al->items; art; art = art->next)
1424 { 1279 {
1425 if (!art->chance) 1280 if (!art->chance)
1426 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1281 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1427 else 1282 else
1428 al->total_chance += art->chance; 1283 al->total_chance += art->chance;
1429 } 1284 }
1430#if 0 1285#if 0
1431 LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance); 1286 LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance);
1432#endif 1287#endif
1433 } 1288 }
1434
1435 LOG (llevDebug, "done.\n");
1436} 1289}
1437
1438 1290
1439/* 1291/*
1440 * Used in artifact generation. The bonuses of the first object 1292 * Used in artifact generation. The bonuses of the first object
1441 * is modified by the bonuses of the second object. 1293 * is modified by the bonuses of the second object.
1442 */ 1294 */
1443
1444void 1295void
1445add_abilities (object *op, object *change) 1296add_abilities (object *op, object *change)
1446{ 1297{
1447 int i, tmp;
1448
1449 if (change->face != blank_face) 1298 if (change->face != blank_face)
1450 {
1451#ifdef TREASURE_VERBOSE
1452 LOG (llevDebug, "FACE: %d\n", change->face->number);
1453#endif
1454 op->face = change->face; 1299 op->face = change->face;
1455 }
1456 1300
1457 for (i = 0; i < NUM_STATS; i++) 1301 for (int i = 0; i < NUM_STATS; i++)
1458 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1302 change_attr_value (&(op->stats), i, change->stats.stat (i));
1459 1303
1460 op->attacktype |= change->attacktype; 1304 op->attacktype |= change->attacktype;
1461 op->path_attuned |= change->path_attuned; 1305 op->path_attuned |= change->path_attuned;
1462 op->path_repelled |= change->path_repelled; 1306 op->path_repelled |= change->path_repelled;
1463 op->path_denied |= change->path_denied; 1307 op->path_denied |= change->path_denied;
1464 op->move_type |= change->move_type; 1308 op->move_type |= change->move_type;
1465 op->stats.luck += change->stats.luck; 1309 op->stats.luck += change->stats.luck;
1466 1310
1467 if (QUERY_FLAG (change, FLAG_CURSED)) 1311 static const struct copyflags : object::flags_t
1468 SET_FLAG (op, FLAG_CURSED); 1312 {
1469 if (QUERY_FLAG (change, FLAG_DAMNED)) 1313 copyflags ()
1470 SET_FLAG (op, FLAG_DAMNED); 1314 {
1471 if ((QUERY_FLAG (change, FLAG_CURSED) || QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0) 1315 set (FLAG_CURSED);
1316 set (FLAG_DAMNED);
1317 set (FLAG_LIFESAVE);
1318 set (FLAG_REFL_SPELL);
1319 set (FLAG_STEALTH);
1320 set (FLAG_XRAYS);
1321 set (FLAG_BLIND);
1322 set (FLAG_SEE_IN_DARK);
1323 set (FLAG_REFL_MISSILE);
1324 set (FLAG_MAKE_INVIS);
1325 }
1326 } copyflags;
1327
1328 // we might want to just copy, but or'ing is what the original code did
1329 op->flag |= change->flag & copyflags;
1330
1331 if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1472 set_abs_magic (op, -op->magic); 1332 set_abs_magic (op, -op->magic);
1473 1333
1474 if (QUERY_FLAG (change, FLAG_LIFESAVE)) 1334 if (change->flag [FLAG_STAND_STILL])
1475 SET_FLAG (op, FLAG_LIFESAVE);
1476 if (QUERY_FLAG (change, FLAG_REFL_SPELL))
1477 SET_FLAG (op, FLAG_REFL_SPELL);
1478 if (QUERY_FLAG (change, FLAG_STEALTH))
1479 SET_FLAG (op, FLAG_STEALTH);
1480 if (QUERY_FLAG (change, FLAG_XRAYS))
1481 SET_FLAG (op, FLAG_XRAYS);
1482 if (QUERY_FLAG (change, FLAG_BLIND))
1483 SET_FLAG (op, FLAG_BLIND);
1484 if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))
1485 SET_FLAG (op, FLAG_SEE_IN_DARK);
1486 if (QUERY_FLAG (change, FLAG_REFL_MISSILE))
1487 SET_FLAG (op, FLAG_REFL_MISSILE);
1488 if (QUERY_FLAG (change, FLAG_MAKE_INVIS))
1489 SET_FLAG (op, FLAG_MAKE_INVIS);
1490
1491 if (QUERY_FLAG (change, FLAG_STAND_STILL))
1492 { 1335 {
1493 CLEAR_FLAG (op, FLAG_ANIMATE); 1336 op->clr_flag (FLAG_ANIMATE);
1337
1494 /* so artifacts will join */ 1338 /* so artifacts will join */
1495 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1339 if (!op->flag [FLAG_ALIVE])
1496 op->speed = 0.0; 1340 op->speed = 0.;
1497 1341
1498 update_ob_speed (op); 1342 op->set_speed (op->speed);
1499 } 1343 }
1500 1344
1501 if (change->nrof) 1345 if (change->nrof)
1502 op->nrof = RANDOM () % ((int) change->nrof) + 1; 1346 op->nrof = rndm (change->nrof) + 1;
1503 1347
1504 op->stats.exp += change->stats.exp; /* Speed modifier */ 1348 op->stats.exp += change->stats.exp; /* Speed modifier */
1505 op->stats.wc += change->stats.wc; 1349 op->stats.wc += change->stats.wc;
1506 op->stats.ac += change->stats.ac; 1350 op->stats.ac += change->stats.ac;
1507 1351
1508 if (change->other_arch) 1352 if (change->other_arch)
1509 { 1353 {
1510 /* Basically, for horns & potions, the other_arch field is the spell 1354 /* Basically, for horns & potions, the other_arch field is the spell
1511 * to cast. So convert that to into a spell and put it into 1355 * to cast. So convert that to into a spell and put it into
1512 * this object. 1356 * this object.
1513 */ 1357 */
1514 if (op->type == HORN || op->type == POTION) 1358 if (op->type == HORN || op->type == POTION)
1515 { 1359 {
1516 object *tmp_obj;
1517
1518 /* Remove any spells this object currently has in it */ 1360 /* Remove any spells this object currently has in it */
1519 while (op->inv) 1361 op->destroy_inv (false);
1520 {
1521 tmp_obj = op->inv;
1522 remove_ob (tmp_obj);
1523 free_object (tmp_obj);
1524 }
1525 1362
1526 tmp_obj = arch_to_object (change->other_arch); 1363 object *tmp = change->other_arch->instance ();
1527 insert_ob_in_ob (tmp_obj, op); 1364 insert_ob_in_ob (tmp, op);
1528 } 1365 }
1366
1529 /* No harm setting this for potions/horns */ 1367 /* No harm setting this for potions/horns */
1530 op->other_arch = change->other_arch; 1368 op->other_arch = change->other_arch;
1531 } 1369 }
1532 1370
1533 if (change->stats.hp < 0) 1371 if (change->stats.hp < 0)
… …
1549 op->stats.maxsp = -change->stats.maxsp; 1387 op->stats.maxsp = -change->stats.maxsp;
1550 else 1388 else
1551 op->stats.maxsp += change->stats.maxsp; 1389 op->stats.maxsp += change->stats.maxsp;
1552 1390
1553 if (change->stats.food < 0) 1391 if (change->stats.food < 0)
1554 op->stats.food = -(change->stats.food); 1392 op->stats.food = -change->stats.food;
1555 else 1393 else
1556 op->stats.food += change->stats.food; 1394 op->stats.food += change->stats.food;
1557 1395
1558 if (change->level < 0) 1396 if (change->level < 0)
1559 op->level = -(change->level); 1397 op->level = -change->level;
1560 else 1398 else
1561 op->level += change->level; 1399 op->level += change->level;
1562 1400
1563 if (change->gen_sp_armour < 0) 1401 if (change->gen_sp_armour < 0)
1564 op->gen_sp_armour = -(change->gen_sp_armour); 1402 op->gen_sp_armour = -change->gen_sp_armour;
1565 else 1403 else
1566 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1404 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1567 1405
1568 op->item_power = change->item_power; 1406 op->item_power = change->item_power;
1569 1407
1570 for (i = 0; i < NROFATTACKS; i++) 1408 for (int i = 0; i < NROFATTACKS; i++)
1571 {
1572 if (change->resist[i])
1573 {
1574 op->resist[i] += change->resist[i]; 1409 op->resist[i] += change->resist[i];
1575 }
1576 }
1577 1410
1578 if (change->stats.dam) 1411 if (change->stats.dam)
1579 { 1412 {
1580 if (change->stats.dam < 0) 1413 if (change->stats.dam < 0)
1581 op->stats.dam = (-change->stats.dam); 1414 op->stats.dam = -change->stats.dam;
1582 else if (op->stats.dam) 1415 else if (op->stats.dam)
1583 { 1416 {
1584 tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10); 1417 int tmp = op->stats.dam * change->stats.dam / 10;
1418
1585 if (tmp == op->stats.dam) 1419 if (tmp == op->stats.dam)
1586 { 1420 {
1587 if (change->stats.dam < 10) 1421 if (change->stats.dam < 10)
1588 op->stats.dam--; 1422 op->stats.dam--;
1589 else 1423 else
… …
1595 } 1429 }
1596 1430
1597 if (change->weight) 1431 if (change->weight)
1598 { 1432 {
1599 if (change->weight < 0) 1433 if (change->weight < 0)
1600 op->weight = (-change->weight); 1434 op->weight = -change->weight;
1601 else 1435 else
1602 op->weight = (op->weight * (change->weight)) / 100; 1436 op->weight = op->weight * change->weight / 100;
1603 } 1437 }
1604 1438
1605 if (change->last_sp) 1439 if (change->last_sp)
1606 { 1440 {
1607 if (change->last_sp < 0) 1441 if (change->last_sp < 0)
1608 op->last_sp = (-change->last_sp); 1442 op->last_sp = -change->last_sp;
1609 else 1443 else
1610 op->last_sp = (signed char) (((int) op->last_sp * (int) change->last_sp) / (int) 100); 1444 op->last_sp = op->last_sp * (int)change->last_sp / 100;
1611 } 1445 }
1612 1446
1613 if (change->gen_sp_armour) 1447 if (change->gen_sp_armour)
1614 { 1448 {
1615 if (change->gen_sp_armour < 0) 1449 if (change->gen_sp_armour < 0)
1616 op->gen_sp_armour = (-change->gen_sp_armour); 1450 op->gen_sp_armour = -change->gen_sp_armour;
1617 else 1451 else
1618 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1452 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1619 } 1453 }
1620 1454
1621 op->value *= change->value; 1455 op->value *= change->value;
1622 1456
1623 if (change->material) 1457 if (change->materials)
1458 op->materials = change->materials;
1459
1460 if (change->material != MATERIAL_NULL)
1624 op->material = change->material; 1461 op->material = change->material;
1625
1626 if (change->materialname)
1627 op->materialname = change->materialname;
1628 1462
1629 if (change->slaying) 1463 if (change->slaying)
1630 op->slaying = change->slaying; 1464 op->slaying = change->slaying;
1631 1465
1632 if (change->race) 1466 if (change->race)
… …
1635 if (change->msg) 1469 if (change->msg)
1636 op->msg = change->msg; 1470 op->msg = change->msg;
1637} 1471}
1638 1472
1639static int 1473static int
1640legal_artifact_combination (object *op, artifact * art) 1474legal_artifact_combination (object *op, artifact *art)
1641{ 1475{
1642 int neg, success = 0; 1476 int neg, success = 0;
1643 linked_char *tmp; 1477 linked_char *tmp;
1644 const char *name; 1478 const char *name;
1645 1479
1646 if (art->allowed == (linked_char *) NULL) 1480 if (!art->allowed)
1647 return 1; /* Ie, "all" */ 1481 return 1; /* Ie, "all" */
1482
1648 for (tmp = art->allowed; tmp; tmp = tmp->next) 1483 for (tmp = art->allowed; tmp; tmp = tmp->next)
1649 { 1484 {
1650#ifdef TREASURE_VERBOSE 1485#ifdef TREASURE_VERBOSE
1651 LOG (llevDebug, "legal_art: %s\n", tmp->name); 1486 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1652#endif 1487#endif
1653 if (*tmp->name == '!') 1488 if (*tmp->name == '!')
1654 name = tmp->name + 1, neg = 1; 1489 name = tmp->name + 1, neg = 1;
1655 else 1490 else
1656 name = tmp->name, neg = 0; 1491 name = tmp->name, neg = 0;
1657 1492
1658 /* If we match name, then return the opposite of 'neg' */ 1493 /* If we match name, then return the opposite of 'neg' */
1659 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1494 if (!strcmp (name, op->arch->archname))
1660 return !neg; 1495 return !neg;
1661 1496
1662 /* Set success as true, since if the match was an inverse, it means 1497 /* Set success as true, since if the match was an inverse, it means
1663 * everything is allowed except what we match 1498 * everything is allowed except what we match
1664 */ 1499 */
1665 else if (neg) 1500 else if (neg)
1666 success = 1; 1501 success = 1;
1667 } 1502 }
1503
1668 return success; 1504 return success;
1669} 1505}
1670 1506
1671/* 1507/*
1672 * Fixes the given object, giving it the abilities and titles 1508 * Fixes the given object, giving it the abilities and titles
… …
1674 */ 1510 */
1675 1511
1676void 1512void
1677give_artifact_abilities (object *op, object *artifct) 1513give_artifact_abilities (object *op, object *artifct)
1678{ 1514{
1679 char new_name[MAX_BUF]; 1515 op->title = format ("of %s", &artifct->name);
1680 1516
1681 sprintf (new_name, "of %s", &artifct->name);
1682 op->title = new_name;
1683 add_abilities (op, artifct); /* Give out the bonuses */ 1517 add_abilities (op, artifct); /* Give out the bonuses */
1684 1518
1685#if 0 /* Bit verbose, but keep it here until next time I need it... */ 1519#if 0 /* Bit verbose, but keep it here until next time I need it... */
1686 { 1520 {
1687 char identified = QUERY_FLAG (op, FLAG_IDENTIFIED); 1521 char identified = op->flag [FLAG_IDENTIFIED];
1688 1522
1689 SET_FLAG (op, FLAG_IDENTIFIED); 1523 op->set_flag (FLAG_IDENTIFIED);
1690 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL)); 1524 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1691 if (!identified) 1525 if (!identified)
1692 CLEAR_FLAG (op, FLAG_IDENTIFIED); 1526 op->clr_flag (FLAG_IDENTIFIED);
1693 } 1527 }
1694#endif 1528#endif
1695 return; 1529 return;
1696} 1530}
1697 1531
… …
1707#define ARTIFACT_TRIES 2 1541#define ARTIFACT_TRIES 2
1708 1542
1709void 1543void
1710generate_artifact (object *op, int difficulty) 1544generate_artifact (object *op, int difficulty)
1711{ 1545{
1712 artifactlist *al;
1713 artifact *art; 1546 artifact *art;
1714 int i;
1715 1547
1716 al = find_artifactlist (op->type); 1548 artifactlist *al = find_artifactlist (op->type);
1717 1549
1718 if (al == NULL) 1550 if (al == NULL)
1719 { 1551 {
1720#if 0 /* This is too verbose, usually */ 1552#if 0 /* This is too verbose, usually */
1721 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name); 1553 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);
1722#endif 1554#endif
1723 return; 1555 return;
1724 } 1556 }
1725 1557
1726 for (i = 0; i < ARTIFACT_TRIES; i++) 1558 for (int i = 0; i < ARTIFACT_TRIES; i++)
1727 { 1559 {
1728 int roll = RANDOM () % al->total_chance; 1560 int roll = rndm (al->total_chance);
1729 1561
1730 for (art = al->items; art != NULL; art = art->next) 1562 for (art = al->items; art; art = art->next)
1731 { 1563 {
1732 roll -= art->chance; 1564 roll -= art->chance;
1733 if (roll < 0) 1565 if (roll < 0)
1734 break; 1566 break;
1735 } 1567 }
… …
1739#if 1 1571#if 1
1740 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type); 1572 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1741#endif 1573#endif
1742 return; 1574 return;
1743 } 1575 }
1744 if (!strcmp (art->item->name, "NONE")) 1576
1577 if (art->item->name == shstr_NONE)
1745 return; 1578 return;
1579
1746 if (FABS (op->magic) < art->item->magic) 1580 if (fabs (op->magic) < art->item->magic)
1747 continue; /* Not magic enough to be this item */ 1581 continue; /* Not magic enough to be this item */
1748 1582
1749 /* Map difficulty not high enough */ 1583 /* Map difficulty not high enough */
1750 if (difficulty < art->difficulty) 1584 if (difficulty < art->difficulty)
1751 continue; 1585 continue;
1752 1586
1753 if (!legal_artifact_combination (op, art)) 1587 if (!legal_artifact_combination (op, art))
1754 { 1588 {
1755#ifdef TREASURE_VERBOSE 1589#ifdef TREASURE_VERBOSE
1756 LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); 1590 LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1757#endif 1591#endif
1758 continue; 1592 continue;
1759 } 1593 }
1594
1760 give_artifact_abilities (op, art->item); 1595 give_artifact_abilities (op, art->item);
1761 return; 1596 return;
1762 } 1597 }
1763} 1598}
1764 1599
… …
1768 */ 1603 */
1769 1604
1770void 1605void
1771fix_flesh_item (object *item, object *donor) 1606fix_flesh_item (object *item, object *donor)
1772{ 1607{
1773 char tmpbuf[MAX_BUF];
1774 int i;
1775
1776 if (item->type == FLESH && donor) 1608 if (item->type == FLESH && donor)
1777 { 1609 {
1778 /* change the name */ 1610 /* change the name */
1779 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name); 1611 item->name = format ("%s's %s", &donor->name, &item->name);
1780 item->name = tmpbuf;
1781 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl); 1612 item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1782 item->name_pl = tmpbuf;
1783 1613
1784 /* weight is FLESH weight/100 * donor */ 1614 /* weight is FLESH weight/100 * donor */
1785 if ((item->weight = (signed long) (((double) item->weight / (double) 100.0) * (double) donor->weight)) == 0) 1615 item->weight = max (1, item->weight * donor->weight / 100);
1786 item->weight = 1;
1787 1616
1788 /* value is multiplied by level of donor */ 1617 /* value is multiplied by level of donor */
1789 item->value *= isqrt (donor->level * 2); 1618 item->value *= isqrt (donor->level * 2);
1790 1619
1791 /* food value */ 1620 /* food value */
1792 item->stats.food += (donor->stats.hp / 100) + donor->stats.Con; 1621 item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1793 1622
1794 /* flesh items inherit some abilities of donor, but not 1623 /* flesh items inherit some abilities of donor, but not
1795 * full effect. 1624 * full effect.
1796 */ 1625 */
1797 for (i = 0; i < NROFATTACKS; i++) 1626 for (int i = 0; i < NROFATTACKS; i++)
1798 item->resist[i] = donor->resist[i] / 2; 1627 item->resist[i] = donor->resist[i] / 2;
1799 1628
1800 /* item inherits donor's level (important for quezals) */ 1629 /* item inherits donor's level (important for quezals) */
1801 item->level = donor->level; 1630 item->level = donor->level;
1802 1631
1803 /* if donor has some attacktypes, the flesh is poisonous */ 1632 /* if donor has some attacktypes, the flesh is poisonous */
1804 if (donor->attacktype & AT_POISON) 1633 if (donor->attacktype & AT_POISON)
1805 item->type = POISON; 1634 item->type = POISON;
1635
1806 if (donor->attacktype & AT_ACID) 1636 if (donor->attacktype & AT_ACID)
1807 item->stats.hp = -1 * item->stats.food; 1637 item->stats.hp = -item->stats.food;
1808 SET_FLAG (item, FLAG_NO_STEAL);
1809 }
1810}
1811 1638
1812/* special_potion() - so that old potion code is still done right. */ 1639 item->set_flag (FLAG_NO_STEAL);
1813 1640 }
1814int
1815special_potion (object *op)
1816{
1817
1818 int i;
1819
1820 if (op->attacktype)
1821 return 1;
1822
1823 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1824 return 1;
1825
1826 for (i = 0; i < NROFATTACKS; i++)
1827 if (op->resist[i])
1828 return 1;
1829
1830 return 0;
1831} 1641}
1832 1642
1833void 1643static void
1834free_treasurestruct (treasure *t) 1644free_treasurestruct (treasure *t)
1835{ 1645{
1836 if (t->next)
1837 free_treasurestruct (t->next); 1646 if (t->next) free_treasurestruct (t->next);
1838 if (t->next_yes)
1839 free_treasurestruct (t->next_yes); 1647 if (t->next_yes) free_treasurestruct (t->next_yes);
1840 if (t->next_no)
1841 free_treasurestruct (t->next_no); 1648 if (t->next_no) free_treasurestruct (t->next_no);
1842 1649
1843 delete t; 1650 delete t;
1844} 1651}
1845 1652
1846void 1653static void
1847free_charlinks (linked_char *lc) 1654free_charlinks (linked_char *lc)
1848{ 1655{
1849 if (lc->next) 1656 if (lc->next)
1850 free_charlinks (lc->next); 1657 free_charlinks (lc->next);
1851 1658
1852 delete lc; 1659 delete lc;
1853} 1660}
1854 1661
1855void 1662static void
1856free_artifact (artifact * at) 1663free_artifact (artifact *at)
1857{ 1664{
1858 if (at->next)
1859 free_artifact (at->next); 1665 if (at->next) free_artifact (at->next);
1860
1861 if (at->allowed)
1862 free_charlinks (at->allowed); 1666 if (at->allowed) free_charlinks (at->allowed);
1863 1667
1864 at->item->free (1); 1668 at->item->destroy ();
1865 1669
1866 delete at;
1867}
1868
1869void
1870free_artifactlist (artifactlist * al)
1871{
1872 artifactlist *nextal;
1873
1874 for (al = first_artifactlist; al != NULL; al = nextal)
1875 {
1876 nextal = al->next;
1877
1878 if (al->items)
1879 free_artifact (al->items);
1880
1881 free (al); 1670 sfree (at);
1882 }
1883} 1671}
1884 1672
1885void
1886free_all_treasures (void)
1887{
1888 treasurelist *tl, *next;
1889
1890
1891 for (tl = first_treasurelist; tl != NULL; tl = next)
1892 {
1893 next = tl->next;
1894 if (tl->items)
1895 free_treasurestruct (tl->items);
1896 delete tl;
1897 }
1898 free_artifactlist (first_artifactlist);
1899}

Diff Legend

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