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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.8 by root, Sun Sep 3 08:05:39 2006 UTC vs.
Revision 1.97 by root, Sun Nov 29 10:55:18 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines