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.35 by root, Sat Jan 27 02:19:36 2007 UTC vs.
Revision 1.121 by root, Sat Nov 17 23:40:00 2018 UTC

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

Diff Legend

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