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

Diff Legend

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