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

Diff Legend

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