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

Diff Legend

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