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.11 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.56 by root, Sat Apr 21 22:12:59 2007 UTC

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

Diff Legend

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