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.39 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.125 by root, Sat Oct 8 21:54:05 2022 UTC

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

Diff Legend

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