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.15 by root, Sat Sep 9 21:48:28 2006 UTC vs.
Revision 1.51 by root, Thu Apr 19 16:36:00 2007 UTC

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

Diff Legend

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