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.18 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.122 by root, Sun Nov 18 15:19:48 2018 UTC

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

Diff Legend

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