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.8 by root, Sun Sep 3 08:05:39 2006 UTC vs.
Revision 1.42 by root, Mon Apr 16 10:14:25 2007 UTC

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

Diff Legend

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