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.30 by elmex, Wed Jan 3 02:30:51 2007 UTC vs.
Revision 1.51 by root, Thu Apr 19 16:36:00 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23
24#define ALLOWED_COMBINATION
25 24
26/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
27 * It is useful for finding bugs in the treasures file. Since it only 26 * 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 27 * slows the startup some (and not actual game play), it is by default
29 * left on 28 * left on
30 */ 29 */
31#define TREASURE_DEBUG 30#define TREASURE_DEBUG
32 31
33/* TREASURE_VERBOSE enables copious output concerning artifact generation */ 32/* TREASURE_VERBOSE enables copious output concerning artifact generation */
34 33
35/* #define TREASURE_VERBOSE */ 34//#define TREASURE_VERBOSE
36 35
37#include <global.h> 36#include <global.h>
38#include <treasure.h> 37#include <treasure.h>
39#include <funcpoint.h> 38#include <funcpoint.h>
40#include <loader.h> 39#include <loader.h>
41 40
41extern char *spell_mapping[];
42
43static treasurelist *first_treasurelist;
42 44
43static void change_treasure (treasure *t, object *op); /* overrule default values */ 45static void change_treasure (treasure *t, object *op); /* overrule default values */
44extern char *spell_mapping[];
45 46
46/* 47typedef std::tr1::unordered_map<
47 * Initialize global archtype pointers: 48 const char *,
48 */ 49 treasurelist *,
50 str_hash,
51 str_equal,
52 slice_allocator< std::pair<const char *const, treasurelist *> >,
53 true
54> tl_map_t;
49 55
56static tl_map_t tl_map;
57
58/*
59 * Searches for the given treasurelist
60 */
61treasurelist *
62treasurelist::find (const char *name)
63{
64 if (!name)
65 return 0;
66
67 auto (i, tl_map.find (name));
68
69 if (i == tl_map.end ())
70 return 0;
71
72 return i->second;
73}
74
75/*
76 * Searches for the given treasurelist in the globally linked list
77 * of treasurelists which has been built by load_treasures().
78 */
79treasurelist *
80treasurelist::get (const char *name)
81{
82 treasurelist *tl = find (name);
83
84 if (!tl)
85 {
86 tl = new treasurelist;
87
88 tl->name = name;
89 tl->next = first_treasurelist;
90 first_treasurelist = tl;
91
92 tl_map.insert (std::make_pair (tl->name, tl));
93 }
94
95 return tl;
96}
97
98//TODO: class method
50void 99void
51init_archetype_pointers () 100clear (treasurelist *tl)
52{ 101{
53 int prev_warn = warn_archetypes; 102 if (tl->items)
103 {
104 free_treasurestruct (tl->items);
105 tl->items = 0;
106 }
54 107
55 warn_archetypes = 1;
56 if (ring_arch == NULL)
57 ring_arch = archetype::find ("ring");
58 if (amulet_arch == NULL)
59 amulet_arch = archetype::find ("amulet");
60 if (staff_arch == NULL)
61 staff_arch = archetype::find ("staff");
62 if (crown_arch == NULL)
63 crown_arch = archetype::find ("crown");
64 warn_archetypes = prev_warn;
65}
66
67/*
68 * Allocate and return the pointer to an empty treasurelist structure.
69 */
70
71static treasurelist *
72get_empty_treasurelist (void)
73{
74 return new treasurelist;
75}
76
77/*
78 * Allocate and return the pointer to an empty treasure structure.
79 */
80//TODO: make this a constructor
81static treasure *
82get_empty_treasure (void)
83{
84 treasure *t = new treasure;
85
86 t->chance = 100; 108 tl->total_chance = 0;
87
88 return t;
89} 109}
110
111#ifdef TREASURE_DEBUG
112/* recursived checks the linked list. Treasurelist is passed only
113 * so that the treasure name can be printed out
114 */
115static void
116check_treasurelist (const treasure *t, const treasurelist * tl)
117{
118 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
119 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
120
121 if (t->next)
122 check_treasurelist (t->next, tl);
123
124 if (t->next_yes)
125 check_treasurelist (t->next_yes, tl);
126
127 if (t->next_no)
128 check_treasurelist (t->next_no, tl);
129}
130#endif
90 131
91/* 132/*
92 * Reads the lib/treasure file from disk, and parses the contents 133 * Reads the lib/treasure file from disk, and parses the contents
93 * into an internal treasure structure (very linked lists) 134 * into an internal treasure structure (very linked lists)
94 */ 135 */
95
96static treasure * 136static treasure *
97load_treasure (FILE * fp, int *line) 137read_treasure (object_thawer &f)
98{ 138{
99 char buf[MAX_BUF], *cp, variable[MAX_BUF];
100 treasure *t = get_empty_treasure (); 139 treasure *t = new treasure;
101 int value;
102 140
103 nroftreasures++; 141 f.next ();
104 while (fgets (buf, MAX_BUF, fp) != NULL)
105 {
106 (*line)++;
107 142
108 if (*buf == '#') 143 for (;;)
109 continue; 144 {
110 if ((cp = strchr (buf, '\n')) != NULL) 145 coroapi::cede_to_tick_every (10);
111 *cp = '\0';
112 cp = buf;
113 while (isspace (*cp)) /* Skip blanks */
114 cp++;
115 146
116 if (sscanf (cp, "arch %s", variable)) 147 switch (f.kw)
117 {
118 if ((t->item = archetype::find (variable)) == NULL)
119 LOG (llevError, "Treasure lacks archetype: %s\n", variable);
120 } 148 {
121 else if (sscanf (cp, "list %s", variable)) 149 case KW_arch:
122 t->name = variable; 150 t->item = archetype::get (f.get_str ());
123 else if (sscanf (cp, "change_name %s", variable)) 151 break;
124 t->change_arch.name = variable; 152
125 else if (sscanf (cp, "change_title %s", variable)) 153 case KW_list: f.get (t->name); break;
126 t->change_arch.title = variable; 154 case KW_change_name: f.get (t->change_arch.name); break;
127 else if (sscanf (cp, "change_slaying %s", variable)) 155 case KW_change_title: f.get (t->change_arch.title); break;
128 t->change_arch.slaying = variable; 156 case KW_change_slaying: f.get (t->change_arch.slaying); break;
129 else if (sscanf (cp, "chance %d", &value)) 157 case KW_chance: f.get (t->chance); break;
130 t->chance = (uint8) value; 158 case KW_nrof: f.get (t->nrof); break;
131 else if (sscanf (cp, "nrof %d", &value)) 159 case KW_magic: f.get (t->magic); break;
132 t->nrof = (uint16) value; 160
133 else if (sscanf (cp, "magic %d", &value)) 161 case KW_yes: t->next_yes = read_treasure (f); continue;
134 t->magic = (uint8) value; 162 case KW_no: t->next_no = read_treasure (f); continue;
135 else if (!strcmp (cp, "yes")) 163
136 t->next_yes = load_treasure (fp, line); 164 case KW_end:
137 else if (!strcmp (cp, "no")) 165 f.next ();
138 t->next_no = load_treasure (fp, line);
139 else if (!strcmp (cp, "end"))
140 return t;
141 else if (!strcmp (cp, "more"))
142 {
143 t->next = load_treasure (fp, line);
144 return t; 166 return t;
145 }
146 else
147 LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
148 }
149 LOG (llevError, "treasure lacks 'end'.\n");
150 return t;
151}
152 167
153#ifdef TREASURE_DEBUG 168 case KW_more:
169 t->next = read_treasure (f);
170 return t;
154 171
155/* recursived checks the linked list. Treasurelist is passed only 172 default:
156 * so that the treasure name can be printed out 173 if (!f.parse_error ("treasurelist", t->name))
157 */ 174 return 0;
158static void
159check_treasurelist (const treasure *t, const treasurelist * tl)
160{
161 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
162 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
163 /* find_treasurelist will print out its own error message */
164 if (t->name && *t->name)
165 find_treasurelist (t->name);
166 if (t->next)
167 check_treasurelist (t->next, tl);
168 if (t->next_yes)
169 check_treasurelist (t->next_yes, tl);
170 if (t->next_no)
171 check_treasurelist (t->next_no, tl);
172}
173#endif
174 175
176 return t;
177 }
178
179 f.next ();
180 }
181}
182
175/* 183/*
176 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
177 * Each treasure is parsed with the help of load_treasure(). 184 * Each treasure is parsed with the help of load_treasure().
178 */ 185 */
179 186treasurelist *
180void 187treasurelist::read (object_thawer &f)
181load_treasures (void)
182{ 188{
183 FILE *fp; 189 assert (f.kw == KW_treasure || f.kw == KW_treasureone);
184 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
185 treasurelist *previous = NULL;
186 treasure *t;
187 int comp, line = 0;
188 190
189 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 191 bool one = f.kw == KW_treasureone;
190 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 192 treasurelist *tl = treasurelist::get (f.get_str ());
191 { 193 clear (tl);
192 LOG (llevError, "Can't open treasure file.\n"); 194 tl->items = read_treasure (f);
195 if (!tl->items)
193 return; 196 return 0;
194 }
195 while (fgets (buf, MAX_BUF, fp) != NULL)
196 {
197 line++;
198 if (*buf == '#')
199 continue;
200 197
201 if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name))
202 {
203 treasurelist *tl = get_empty_treasurelist ();
204
205 tl->name = name;
206 if (previous == NULL)
207 first_treasurelist = tl;
208 else
209 previous->next = tl;
210 previous = tl;
211 tl->items = load_treasure (fp, &line);
212
213 /* This is a one of the many items on the list should be generated. 198 /* This is a one of the many items on the list should be generated.
214 * Add up the chance total, and check to make sure the yes & no 199 * Add up the chance total, and check to make sure the yes & no
215 * fields of the treasures are not being used. 200 * fields of the treasures are not being used.
216 */ 201 */
217 if (!strncmp (buf, "treasureone", 11)) 202 tl->total_chance = 0;
203
204 if (one)
205 {
206 for (treasure *t = tl->items; t; t = t->next)
207 {
208 if (t->next_yes || t->next_no)
218 { 209 {
219 for (t = tl->items; t != NULL; t = t->next)
220 {
221#ifdef TREASURE_DEBUG
222 if (t->next_yes || t->next_no)
223 {
224 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 210 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
225 LOG (llevError, " the next_yes or next_no field is set\n"); 211 LOG (llevError, " the next_yes or next_no field is set\n");
226 }
227#endif
228 tl->total_chance += t->chance;
229 }
230 } 212 }
231 }
232 else
233 LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
234 }
235 close_and_delete (fp, comp);
236 213
237#ifdef TREASURE_DEBUG 214 tl->total_chance += t->chance;
238 /* Perform some checks on how valid the treasure data actually is. 215 }
239 * verify that list transitions work (ie, the list that it is supposed 216 }
240 * to transition to exists). Also, verify that at least the name
241 * or archetype is set for each treasure element.
242 */
243 for (previous = first_treasurelist; previous != NULL; previous = previous->next)
244 check_treasurelist (previous->items, previous);
245#endif
246}
247 217
248/*
249 * Searches for the given treasurelist in the globally linked list
250 * of treasurelists which has been built by load_treasures().
251 */
252
253treasurelist *
254find_treasurelist (const char *name)
255{
256 shstr_cmp name_ (name);
257
258 if (!name_)
259 return 0;
260
261 for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
262 if (name_ == tl->name)
263 return tl;
264
265 if (first_treasurelist)
266 LOG (llevError, "Couldn't find treasurelist %s\n", name);
267
268 return 0; 218 return tl;
269} 219}
270
271 220
272/* 221/*
273 * Generates the objects specified by the given treasure. 222 * Generates the objects specified by the given treasure.
274 * It goes recursively through the rest of the linked list. 223 * It goes recursively through the rest of the linked list.
275 * If there is a certain percental chance for a treasure to be generated, 224 * If there is a certain percental chance for a treasure to be generated,
… …
281 * start with equipment, but only their abilities). 230 * start with equipment, but only their abilities).
282 */ 231 */
283static void 232static void
284put_treasure (object *op, object *creator, int flags) 233put_treasure (object *op, object *creator, int flags)
285{ 234{
286 object *tmp;
287
288 /* Bit of a hack - spells should never be put onto the map. The entire 235 /* Bit of a hack - spells should never be put onto the map. The entire
289 * treasure stuff is a problem - there is no clear idea of knowing 236 * treasure stuff is a problem - there is no clear idea of knowing
290 * this is the original object, or if this is an object that should be created 237 * this is the original object, or if this is an object that should be created
291 * by another object. 238 * by another object.
292 */ 239 */
293 if (flags & GT_ENVIRONMENT && op->type != SPELL) 240 if (flags & GT_ENVIRONMENT && op->type != SPELL)
294 { 241 {
242 if (ob_blocked (op, creator->map, creator->x, creator->y))
243 op->destroy ();
244 else
245 {
295 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 246 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
296 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 247 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
248 }
297 } 249 }
298 else 250 else
299 { 251 {
300 op = creator->insert (op); 252 op = creator->insert (op);
301 253
302 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 254 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
303 monster_check_apply (creator, op); 255 monster_check_apply (creator, op);
304 256
305 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) 257 if (flags & GT_UPDATE_INV)
258 if (object *tmp = creator->in_player ())
306 esrv_send_item (tmp, op); 259 esrv_send_item (tmp, op);
307 } 260 }
308} 261}
309 262
310/* if there are change_xxx commands in the treasure, we include the changes 263/* if there are change_xxx commands in the treasure, we include the changes
311 * in the generated object 264 * in the generated object
… …
325 278
326 if (t->change_arch.slaying) 279 if (t->change_arch.slaying)
327 op->slaying = t->change_arch.slaying; 280 op->slaying = t->change_arch.slaying;
328} 281}
329 282
330void 283static void
331create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) 284create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
332{ 285{
333 object *tmp;
334
335 if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance) 286 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
336 { 287 {
337 if (t->name) 288 if (t->name)
338 { 289 {
339 if (difficulty >= t->magic) 290 if (difficulty >= t->magic)
340 {
341 treasurelist *tl = find_treasurelist (t->name); 291 if (treasurelist *tl = treasurelist::find (t->name))
342 if (tl)
343 create_treasure (tl, op, flag, difficulty, tries); 292 create_treasure (tl, op, flag, difficulty, tries);
344 } 293 else
294 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
345 } 295 }
346 else 296 else
347 { 297 {
348 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 298 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
349 { 299 {
350 tmp = arch_to_object (t->item); 300 object *tmp = arch_to_object (t->item);
301
351 if (t->nrof && tmp->nrof <= 1) 302 if (t->nrof && tmp->nrof <= 1)
352 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 303 tmp->nrof = rndm (t->nrof) + 1;
304
353 fix_generated_item (tmp, op, difficulty, t->magic, flag); 305 fix_generated_item (tmp, op, difficulty, t->magic, flag);
354 change_treasure (t, tmp); 306 change_treasure (t, tmp);
355 put_treasure (tmp, op, flag); 307 put_treasure (tmp, op, flag);
356 } 308 }
357 } 309 }
358 310
359 if (t->next_yes != NULL) 311 if (t->next_yes)
360 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 312 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
361 } 313 }
362 else if (t->next_no != NULL) 314 else if (t->next_no)
363 create_all_treasures (t->next_no, op, flag, difficulty, tries); 315 create_all_treasures (t->next_no, op, flag, difficulty, tries);
364 316
365 if (t->next != NULL) 317 if (t->next)
366 create_all_treasures (t->next, op, flag, difficulty, tries); 318 create_all_treasures (t->next, op, flag, difficulty, tries);
367} 319}
368 320
369void 321static void
370create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries) 322create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
371{ 323{
372 int value = RANDOM () % tl->total_chance; 324 int value = rndm (tl->total_chance);
373 treasure *t; 325 treasure *t;
374 326
375 if (tries++ > 100) 327 if (tries++ > 100)
376 { 328 {
377 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); 329 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
378 return; 330 return;
379 } 331 }
380 332
381 for (t = tl->items; t != NULL; t = t->next) 333 for (t = tl->items; t; t = t->next)
382 { 334 {
383 value -= t->chance; 335 value -= t->chance;
384 336
385 if (value < 0) 337 if (value < 0)
386 break; 338 break;
387 } 339 }
388 340
389 if (!t || value >= 0) 341 if (!t || value >= 0)
390 {
391 LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n"); 342 cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
392 abort ();
393 return;
394 }
395 343
396 if (t->name) 344 if (t->name)
397 { 345 {
398 if (difficulty >= t->magic) 346 if (difficulty >= t->magic)
399 { 347 {
400 treasurelist *tl = find_treasurelist (t->name); 348 treasurelist *tl = treasurelist::find (t->name);
401 if (tl) 349 if (tl)
402 create_treasure (tl, op, flag, difficulty, tries); 350 create_treasure (tl, op, flag, difficulty, tries);
403 } 351 }
404 else if (t->nrof) 352 else if (t->nrof)
405 create_one_treasure (tl, op, flag, difficulty, tries); 353 create_one_treasure (tl, op, flag, difficulty, tries);
406
407 return;
408 } 354 }
409
410 if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 355 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
411 { 356 {
412 object *tmp = arch_to_object (t->item); 357 if (object *tmp = arch_to_object (t->item))
413 358 {
414 if (!tmp)
415 return;
416
417 if (t->nrof && tmp->nrof <= 1) 359 if (t->nrof && tmp->nrof <= 1)
418 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 360 tmp->nrof = rndm (t->nrof) + 1;
419 361
420 fix_generated_item (tmp, op, difficulty, t->magic, flag); 362 fix_generated_item (tmp, op, difficulty, t->magic, flag);
421 change_treasure (t, tmp); 363 change_treasure (t, tmp);
422 put_treasure (tmp, op, flag); 364 put_treasure (tmp, op, flag);
365 }
423 } 366 }
424} 367}
425 368
426/* This calls the appropriate treasure creation function. tries is passed 369/* This calls the appropriate treasure creation function. tries is passed
427 * to determine how many list transitions or attempts to create treasure 370 * to determine how many list transitions or attempts to create treasure
… …
431 * to do that. 374 * to do that.
432 */ 375 */
433void 376void
434create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) 377create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
435{ 378{
379 // empty treasurelists are legal
380 if (!tl->items)
381 return;
436 382
437 if (tries++ > 100) 383 if (tries++ > 100)
438 { 384 {
439 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 385 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
440 return; 386 return;
441 } 387 }
388
442 if (tl->total_chance) 389 if (tl->total_chance)
443 create_one_treasure (tl, op, flag, difficulty, tries); 390 create_one_treasure (tl, op, flag, difficulty, tries);
444 else 391 else
445 create_all_treasures (tl->items, op, flag, difficulty, tries); 392 create_all_treasures (tl->items, op, flag, difficulty, tries);
446} 393}
… …
453object * 400object *
454generate_treasure (treasurelist *tl, int difficulty) 401generate_treasure (treasurelist *tl, int difficulty)
455{ 402{
456 difficulty = clamp (difficulty, 1, settings.max_level); 403 difficulty = clamp (difficulty, 1, settings.max_level);
457 404
458 object *ob = object::create (), *tmp; 405 object *ob = object::create ();
459 406
460 create_treasure (tl, ob, 0, difficulty, 0); 407 create_treasure (tl, ob, 0, difficulty, 0);
461 408
462 /* Don't want to free the object we are about to return */ 409 /* Don't want to free the object we are about to return */
463 tmp = ob->inv; 410 object *tmp = ob->inv;
464 if (tmp != NULL) 411 if (tmp)
465 tmp->remove (); 412 tmp->remove ();
466 413
467 if (ob->inv) 414 if (ob->inv)
468 LOG (llevError, "In generate treasure, created multiple objects.\n"); 415 LOG (llevError, "In generate treasure, created multiple objects.\n");
469 416
… …
477 * The array has two arguments, the difficulty of the level, and the 424 * The array has two arguments, the difficulty of the level, and the
478 * magical bonus "wanted". 425 * magical bonus "wanted".
479 */ 426 */
480 427
481static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 428static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
482
483/*chance of magic difficulty*/ 429// chance of magic difficulty
484
485/* +0 +1 +2 +3 +4 */ 430// +0 +1 +2 +3 +4
486 {95, 2, 2, 1, 0}, /*1 */ 431 {95, 2, 2, 1, 0}, // 1
487 {92, 5, 2, 1, 0}, /*2 */ 432 {92, 5, 2, 1, 0}, // 2
488 {85, 10, 4, 1, 0}, /*3 */ 433 {85, 10, 4, 1, 0}, // 3
489 {80, 14, 4, 2, 0}, /*4 */ 434 {80, 14, 4, 2, 0}, // 4
490 {75, 17, 5, 2, 1}, /*5 */ 435 {75, 17, 5, 2, 1}, // 5
491 {70, 18, 8, 3, 1}, /*6 */ 436 {70, 18, 8, 3, 1}, // 6
492 {65, 21, 10, 3, 1}, /*7 */ 437 {65, 21, 10, 3, 1}, // 7
493 {60, 22, 12, 4, 2}, /*8 */ 438 {60, 22, 12, 4, 2}, // 8
494 {55, 25, 14, 4, 2}, /*9 */ 439 {55, 25, 14, 4, 2}, // 9
495 {50, 27, 16, 5, 2}, /*10 */ 440 {50, 27, 16, 5, 2}, // 10
496 {45, 28, 18, 6, 3}, /*11 */ 441 {45, 28, 18, 6, 3}, // 11
497 {42, 28, 20, 7, 3}, /*12 */ 442 {42, 28, 20, 7, 3}, // 12
498 {40, 27, 21, 8, 4}, /*13 */ 443 {40, 27, 21, 8, 4}, // 13
499 {38, 25, 22, 10, 5}, /*14 */ 444 {38, 25, 22, 10, 5}, // 14
500 {36, 23, 23, 12, 6}, /*15 */ 445 {36, 23, 23, 12, 6}, // 15
501 {33, 21, 24, 14, 8}, /*16 */ 446 {33, 21, 24, 14, 8}, // 16
502 {31, 19, 25, 16, 9}, /*17 */ 447 {31, 19, 25, 16, 9}, // 17
503 {27, 15, 30, 18, 10}, /*18 */ 448 {27, 15, 30, 18, 10}, // 18
504 {20, 12, 30, 25, 13}, /*19 */ 449 {20, 12, 30, 25, 13}, // 19
505 {15, 10, 28, 30, 17}, /*20 */ 450 {15, 10, 28, 30, 17}, // 20
506 {13, 9, 27, 28, 23}, /*21 */ 451 {13, 9, 27, 28, 23}, // 21
507 {10, 8, 25, 28, 29}, /*22 */ 452 {10, 8, 25, 28, 29}, // 22
508 {8, 7, 23, 26, 36}, /*23 */ 453 { 8, 7, 23, 26, 36}, // 23
509 {6, 6, 20, 22, 46}, /*24 */ 454 { 6, 6, 20, 22, 46}, // 24
510 {4, 5, 17, 18, 56}, /*25 */ 455 { 4, 5, 17, 18, 56}, // 25
511 {2, 4, 12, 14, 68}, /*26 */ 456 { 2, 4, 12, 14, 68}, // 26
512 {0, 3, 7, 10, 80}, /*27 */ 457 { 0, 3, 7, 10, 80}, // 27
513 {0, 0, 3, 7, 90}, /*28 */ 458 { 0, 0, 3, 7, 90}, // 28
514 {0, 0, 0, 3, 97}, /*29 */ 459 { 0, 0, 0, 3, 97}, // 29
515 {0, 0, 0, 0, 100}, /*30 */ 460 { 0, 0, 0, 0, 100}, // 30
516 {0, 0, 0, 0, 100}, /*31 */ 461 { 0, 0, 0, 0, 100}, // 31
517}; 462};
518
519 463
520/* calculate the appropriate level for wands staves and scrolls. 464/* calculate the appropriate level for wands staves and scrolls.
521 * This code presumes that op has had its spell object created (in op->inv) 465 * This code presumes that op has had its spell object created (in op->inv)
522 * 466 *
523 * elmex Wed Aug 9 17:44:59 CEST 2006: 467 * elmex Wed Aug 9 17:44:59 CEST 2006:
524 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 468 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
525 */ 469 */
526
527int 470int
528level_for_item (const object *op, int difficulty) 471level_for_item (const object *op, int difficulty)
529{ 472{
530 int olevel = 0; 473 int olevel = 0;
531 474
… …
554 * elmex Thu Aug 10 18:45:44 CEST 2006: 497 * elmex Thu Aug 10 18:45:44 CEST 2006:
555 * Scaling difficulty by max_level, as difficulty is a level and not some 498 * Scaling difficulty by max_level, as difficulty is a level and not some
556 * weird integer between 1-31. 499 * weird integer between 1-31.
557 * 500 *
558 */ 501 */
559
560int 502int
561magic_from_difficulty (int difficulty) 503magic_from_difficulty (int difficulty)
562{ 504{
563 int percent = 0, magic = 0; 505 int percent = 0, magic = 0;
564 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 506 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
… …
569 scaled_diff = 0; 511 scaled_diff = 0;
570 512
571 if (scaled_diff >= DIFFLEVELS) 513 if (scaled_diff >= DIFFLEVELS)
572 scaled_diff = DIFFLEVELS - 1; 514 scaled_diff = DIFFLEVELS - 1;
573 515
574 percent = RANDOM () % 100; 516 percent = rndm (100);
575 517
576 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 518 for (magic = 0; magic < (MAXMAGIC + 1); magic++)
577 { 519 {
578 percent -= difftomagic_list[scaled_diff][magic]; 520 percent -= difftomagic_list[scaled_diff][magic];
579 521
… …
585 { 527 {
586 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); 528 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
587 magic = 0; 529 magic = 0;
588 } 530 }
589 531
590 magic = (RANDOM () % 3) ? magic : -magic; 532 magic = (rndm (3)) ? magic : -magic;
591 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */ 533 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
592 534
593 return magic; 535 return magic;
594} 536}
595 537
… …
610 if (op->arch) 552 if (op->arch)
611 { 553 {
612 if (op->type == ARMOUR) 554 if (op->type == ARMOUR)
613 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 555 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;
614 556
615 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 557 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
616 magic = (-magic); 558 magic = (-magic);
617 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 559 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;
618 } 560 }
619 else 561 else
620 { 562 {
621 if (op->type == ARMOUR) 563 if (op->type == ARMOUR)
622 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 564 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
623 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 565 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
624 magic = (-magic); 566 magic = (-magic);
625 op->weight = (op->weight * (100 - magic * 10)) / 100; 567 op->weight = (op->weight * (100 - magic * 10)) / 100;
626 } 568 }
627} 569}
628 570
… …
652 * 1) Since rings can have multiple bonuses, if the same bonus 594 * 1) Since rings can have multiple bonuses, if the same bonus
653 * is rolled again, increase it - the bonuses now stack with 595 * is rolled again, increase it - the bonuses now stack with
654 * other bonuses previously rolled and ones the item might natively have. 596 * other bonuses previously rolled and ones the item might natively have.
655 * 2) Add code to deal with new PR method. 597 * 2) Add code to deal with new PR method.
656 */ 598 */
657
658void 599void
659set_ring_bonus (object *op, int bonus) 600set_ring_bonus (object *op, int bonus)
660{ 601{
661 602
662 int r = RANDOM () % (bonus > 0 ? 25 : 11); 603 int r = rndm (bonus > 0 ? 25 : 11);
663 604
664 if (op->type == AMULET) 605 if (op->type == AMULET)
665 { 606 {
666 if (!(RANDOM () % 21)) 607 if (!(rndm (21)))
667 r = 20 + RANDOM () % 2; 608 r = 20 + rndm (2);
668 else 609 else
669 { 610 {
670 if (RANDOM () & 2) 611 if (rndm (2))
671 r = 10; 612 r = 10;
672 else 613 else
673 r = 11 + RANDOM () % 9; 614 r = 11 + rndm (9);
674 } 615 }
675 } 616 }
676 617
677 switch (r) 618 switch (r)
678 { 619 {
… …
715 case 16: 656 case 16:
716 case 17: 657 case 17:
717 case 18: 658 case 18:
718 case 19: 659 case 19:
719 { 660 {
720 int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table; 661 int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
721 662
722 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */ 663 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
723 val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b; 664 val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
724 665
725 /* Cursed items need to have higher negative values to equal out with 666 /* Cursed items need to have higher negative values to equal out with
726 * positive values for how protections work out. Put another 667 * positive values for how protections work out. Put another
727 * little random element in since that they don't always end up with 668 * little random element in since that they don't always end up with
728 * even values. 669 * even values.
729 */ 670 */
730 if (bonus < 0) 671 if (bonus < 0)
731 val = 2 * -val - RANDOM () % b; 672 val = 2 * -val - rndm (b);
732 if (val > 35) 673 if (val > 35)
733 val = 35; /* Upper limit */ 674 val = 35; /* Upper limit */
734 b = 0; 675 b = 0;
676
735 while (op->resist[resist_table[resist]] != 0 && b < 4) 677 while (op->resist[resist_table[resist]] != 0 && b < 4)
736 {
737 resist = RANDOM () % num_resist_table; 678 resist = rndm (num_resist_table);
738 } 679
739 if (b == 4) 680 if (b == 4)
740 return; /* Not able to find a free resistance */ 681 return; /* Not able to find a free resistance */
682
741 op->resist[resist_table[resist]] = val; 683 op->resist[resist_table[resist]] = val;
742 /* We should probably do something more clever here to adjust value 684 /* We should probably do something more clever here to adjust value
743 * based on how good a resistance we gave. 685 * based on how good a resistance we gave.
744 */ 686 */
745 break; 687 break;
… …
773 case 22: 715 case 22:
774 op->stats.exp += bonus; /* Speed! */ 716 op->stats.exp += bonus; /* Speed! */
775 op->value = (op->value * 2) / 3; 717 op->value = (op->value * 2) / 3;
776 break; 718 break;
777 } 719 }
720
778 if (bonus > 0) 721 if (bonus > 0)
779 op->value *= 2 * bonus; 722 op->value *= 2 * bonus;
780 else 723 else
781 op->value = -(op->value * 2 * bonus) / 3; 724 op->value = -(op->value * 2 * bonus) / 3;
782} 725}
… …
787 * higher is the chance of returning a low number. 730 * higher is the chance of returning a low number.
788 * It is only used in fix_generated_treasure() to set bonuses on 731 * It is only used in fix_generated_treasure() to set bonuses on
789 * rings and amulets. 732 * rings and amulets.
790 * Another scheme is used to calculate the magic of weapons and armours. 733 * Another scheme is used to calculate the magic of weapons and armours.
791 */ 734 */
792
793int 735int
794get_magic (int diff) 736get_magic (int diff)
795{ 737{
796 int i; 738 int i;
797 739
798 if (diff < 3) 740 if (diff < 3)
799 diff = 3; 741 diff = 3;
742
800 for (i = 0; i < 4; i++) 743 for (i = 0; i < 4; i++)
801 if (RANDOM () % diff) 744 if (rndm (diff))
802 return i; 745 return i;
746
803 return 4; 747 return 4;
804} 748}
805 749
806#define DICE2 (get_magic(2)==2?2:1) 750#define DICE2 (get_magic(2)==2?2:1)
807#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3) 751#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
808 752
809/* 753/*
810 * fix_generated_item(): This is called after an item is generated, in 754 * fix_generated_item(): This is called after an item is generated, in
811 * order to set it up right. This produced magical bonuses, puts spells 755 * order to set it up right. This produced magical bonuses, puts spells
812 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 756 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
… …
826 * value. 770 * value.
827 * GT_MINIMAL: Does minimal processing on the object - just enough to make it 771 * GT_MINIMAL: Does minimal processing on the object - just enough to make it
828 * a working object - don't change magic, value, etc, but set it material 772 * a working object - don't change magic, value, etc, but set it material
829 * type as appropriate, for objects that need spell objects, set those, etc 773 * type as appropriate, for objects that need spell objects, set those, etc
830 */ 774 */
831
832void 775void
833fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) 776fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
834{ 777{
835 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; 778 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
836 779
… …
841 save_item_power = op->item_power; 784 save_item_power = op->item_power;
842 op->item_power = 0; 785 op->item_power = 0;
843 786
844 if (op->randomitems && op->type != SPELL) 787 if (op->randomitems && op->type != SPELL)
845 { 788 {
846 create_treasure (op->randomitems, op, flags, difficulty, 0); 789 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
847 if (!op->inv)
848 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
849
850 /* So the treasure doesn't get created again */ 790 /* So the treasure doesn't get created again */
851 op->randomitems = NULL; 791 op->randomitems = 0;
852 } 792 }
853 793
854 if (difficulty < 1) 794 if (difficulty < 1)
855 difficulty = 1; 795 difficulty = 1;
856 796
… …
873 if (!op->magic && max_magic) 813 if (!op->magic && max_magic)
874 set_magic (difficulty, op, max_magic, flags); 814 set_magic (difficulty, op, max_magic, flags);
875 815
876 num_enchantments = calc_item_power (op, 1); 816 num_enchantments = calc_item_power (op, 1);
877 817
878 if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 818 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
819 || op->type == HORN
820 || difficulty >= settings.max_level) /* high difficulties always generate an artifact,
879 * used for shop_floors or treasures */ 821 * used for shop_floors or treasures */
880 generate_artifact (op, difficulty); 822 generate_artifact (op, difficulty);
881 } 823 }
882 824
883 /* Object was made an artifact. Calculate its item_power rating. 825 /* Object was made an artifact. Calculate its item_power rating.
… …
941 case WEAPON: 883 case WEAPON:
942 case ARMOUR: 884 case ARMOUR:
943 case SHIELD: 885 case SHIELD:
944 case HELMET: 886 case HELMET:
945 case CLOAK: 887 case CLOAK:
946 if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4)) 888 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
947 set_ring_bonus (op, -DICE2); 889 set_ring_bonus (op, -DICE2);
948 break; 890 break;
949 891
950 case BRACERS: 892 case BRACERS:
951 if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))) 893 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
952 { 894 {
953 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 895 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
954 if (!QUERY_FLAG (op, FLAG_CURSED)) 896 if (!QUERY_FLAG (op, FLAG_CURSED))
955 op->value *= 3; 897 op->value *= 3;
956 } 898 }
… …
982 */ 924 */
983 if (op->inv && op->randomitems) 925 if (op->inv && op->randomitems)
984 { 926 {
985 /* value multiplier is same as for scrolls */ 927 /* value multiplier is same as for scrolls */
986 op->value = (op->value * op->inv->value); 928 op->value = (op->value * op->inv->value);
987 op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty; 929 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
988 } 930 }
989 else 931 else
990 { 932 {
991 op->name = "potion"; 933 op->name = "potion";
992 op->name_pl = "potions"; 934 op->name_pl = "potions";
993 } 935 }
994 936
995 if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2) 937 if (!(flags & GT_ONLY_GOOD) && rndm (2))
996 SET_FLAG (op, FLAG_CURSED); 938 SET_FLAG (op, FLAG_CURSED);
997 break; 939 break;
998 } 940 }
999 941
1000 case AMULET: 942 case AMULET:
… …
1010 } 952 }
1011 953
1012 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 954 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */
1013 break; 955 break;
1014 956
1015 if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3)) 957 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1016 SET_FLAG (op, FLAG_CURSED); 958 SET_FLAG (op, FLAG_CURSED);
1017 959
1018 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 960 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1019 961
1020 if (op->type != RING) /* Amulets have only one ability */ 962 if (op->type != RING) /* Amulets have only one ability */
1021 break; 963 break;
1022 964
1023 if (!(RANDOM () % 4)) 965 if (!(rndm (4)))
1024 { 966 {
1025 int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 967 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1026 968
1027 if (d > 0) 969 if (d > 0)
1028 op->value *= 3; 970 op->value *= 3;
1029 971
1030 set_ring_bonus (op, d); 972 set_ring_bonus (op, d);
1031 973
1032 if (!(RANDOM () % 4)) 974 if (!(rndm (4)))
1033 { 975 {
1034 int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 976 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1035 977
1036 if (d > 0) 978 if (d > 0)
1037 op->value *= 5; 979 op->value *= 5;
1038 set_ring_bonus (op, d); 980 set_ring_bonus (op, d);
1039 } 981 }
1040 } 982 }
1041 983
1042 if (GET_ANIM_ID (op)) 984 if (GET_ANIM_ID (op))
1043 SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op))); 985 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1044 986
1045 break; 987 break;
1046 988
1047 case BOOK: 989 case BOOK:
1048 /* Is it an empty book?, if yes lets make a special· 990 /* Is it an empty book?, if yes lets make a special·
1049 * msg for it, and tailor its properties based on the· 991 * msg for it, and tailor its properties based on the·
1050 * creator and/or map level we found it on. 992 * creator and/or map level we found it on.
1051 */ 993 */
1052 if (!op->msg && RANDOM () % 10) 994 if (!op->msg && rndm (10))
1053 { 995 {
1054 /* set the book level properly */ 996 /* set the book level properly */
1055 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 997 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))
1056 { 998 {
1057 if (op->map && op->map->difficulty) 999 if (op->map && op->map->difficulty)
1058 op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1; 1000 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1059 else 1001 else
1060 op->level = RANDOM () % 20 + 1; 1002 op->level = rndm (20) + 1;
1061 } 1003 }
1062 else 1004 else
1063 op->level = RANDOM () % creator->level; 1005 op->level = rndm (creator->level);
1064 1006
1065 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1007 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1066 /* books w/ info are worth more! */ 1008 /* books w/ info are worth more! */
1067 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1009 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1068 /* creator related stuff */ 1010 /* creator related stuff */
… …
1167 */ 1109 */
1168 1110
1169/* 1111/*
1170 * Allocate and return the pointer to an empty artifactlist structure. 1112 * Allocate and return the pointer to an empty artifactlist structure.
1171 */ 1113 */
1172
1173static artifactlist * 1114static artifactlist *
1174get_empty_artifactlist (void) 1115get_empty_artifactlist (void)
1175{ 1116{
1176 artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist)); 1117 return salloc0 <artifactlist> ();
1177
1178 if (al == NULL)
1179 fatal (OUT_OF_MEMORY);
1180 al->next = NULL;
1181 al->items = NULL;
1182 al->total_chance = 0;
1183 return al;
1184} 1118}
1185 1119
1186/* 1120/*
1187 * Allocate and return the pointer to an empty artifact structure. 1121 * Allocate and return the pointer to an empty artifact structure.
1188 */ 1122 */
1189
1190static artifact * 1123static artifact *
1191get_empty_artifact (void) 1124get_empty_artifact (void)
1192{ 1125{
1193 artifact *a = (artifact *) malloc (sizeof (artifact)); 1126 return salloc0 <artifact> ();
1194
1195 if (a == NULL)
1196 fatal (OUT_OF_MEMORY);
1197 a->item = NULL;
1198 a->next = NULL;
1199 a->chance = 0;
1200 a->difficulty = 0;
1201 a->allowed = NULL;
1202 return a;
1203} 1127}
1204 1128
1205/* 1129/*
1206 * Searches the artifact lists and returns one that has the same type 1130 * Searches the artifact lists and returns one that has the same type
1207 * of objects on it. 1131 * of objects on it.
1208 */ 1132 */
1209
1210artifactlist * 1133artifactlist *
1211find_artifactlist (int type) 1134find_artifactlist (int type)
1212{ 1135{
1213 artifactlist *al;
1214
1215 for (al = first_artifactlist; al != NULL; al = al->next) 1136 for (artifactlist *al = first_artifactlist; al; al = al->next)
1216 if (al->type == type) 1137 if (al->type == type)
1217 return al; 1138 return al;
1139
1218 return NULL; 1140 return 0;
1219} 1141}
1220 1142
1221/* 1143/*
1222 * For debugging purposes. Dumps all tables. 1144 * For debugging purposes. Dumps all tables.
1223 */ 1145 */
1224
1225void 1146void
1226dump_artifacts (void) 1147dump_artifacts (void)
1227{ 1148{
1228 artifactlist *al; 1149 artifactlist *al;
1229 artifact *art; 1150 artifact *art;
… …
1236 for (art = al->items; art != NULL; art = art->next) 1157 for (art = al->items; art != NULL; art = art->next)
1237 { 1158 {
1238 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance); 1159 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1239 if (art->allowed != NULL) 1160 if (art->allowed != NULL)
1240 { 1161 {
1241 fprintf (logfile, "\tAllowed combinations:"); 1162 fprintf (logfile, "\tallowed combinations:");
1242 for (next = art->allowed; next != NULL; next = next->next) 1163 for (next = art->allowed; next != NULL; next = next->next)
1243 fprintf (logfile, "%s,", &next->name); 1164 fprintf (logfile, "%s,", &next->name);
1244 fprintf (logfile, "\n"); 1165 fprintf (logfile, "\n");
1245 } 1166 }
1246 } 1167 }
… …
1257 treasurelist *tl; 1178 treasurelist *tl;
1258 int i; 1179 int i;
1259 1180
1260 if (depth > 100) 1181 if (depth > 100)
1261 return; 1182 return;
1183
1262 while (t) 1184 while (t)
1263 { 1185 {
1264 if (t->name) 1186 if (t->name)
1265 { 1187 {
1266 for (i = 0; i < depth; i++) 1188 for (i = 0; i < depth; i++)
1267 fprintf (logfile, " "); 1189 fprintf (logfile, " ");
1190
1268 fprintf (logfile, "{ (list: %s)\n", &t->name); 1191 fprintf (logfile, "{ (list: %s)\n", &t->name);
1192
1269 tl = find_treasurelist (t->name); 1193 tl = treasurelist::find (t->name);
1270 if (tl) 1194 if (tl)
1271 dump_monster_treasure_rec (name, tl->items, depth + 2); 1195 dump_monster_treasure_rec (name, tl->items, depth + 2);
1196
1272 for (i = 0; i < depth; i++) 1197 for (i = 0; i < depth; i++)
1273 fprintf (logfile, " "); 1198 fprintf (logfile, " ");
1199
1274 fprintf (logfile, "} (end of list: %s)\n", &t->name); 1200 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1275 } 1201 }
1276 else 1202 else
1277 { 1203 {
1278 for (i = 0; i < depth; i++) 1204 for (i = 0; i < depth; i++)
1279 fprintf (logfile, " "); 1205 fprintf (logfile, " ");
1206
1280 if (t->item && t->item->clone.type == FLESH) 1207 if (t->item && t->item->clone.type == FLESH)
1281 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1208 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1282 else 1209 else
1283 fprintf (logfile, "%s\n", &t->item->clone.name); 1210 fprintf (logfile, "%s\n", &t->item->clone.name);
1284 } 1211 }
1285 1212
1286 if (t->next_yes) 1213 if (t->next_yes)
1287 { 1214 {
1288 for (i = 0; i < depth; i++) 1215 for (i = 0; i < depth; i++)
1289 fprintf (logfile, " "); 1216 fprintf (logfile, " ");
1217
1290 fprintf (logfile, " (if yes)\n"); 1218 fprintf (logfile, " (if yes)\n");
1291 dump_monster_treasure_rec (name, t->next_yes, depth + 1); 1219 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1292 } 1220 }
1293 1221
1294 if (t->next_no) 1222 if (t->next_no)
1295 { 1223 {
1296 for (i = 0; i < depth; i++) 1224 for (i = 0; i < depth; i++)
1297 fprintf (logfile, " "); 1225 fprintf (logfile, " ");
1226
1298 fprintf (logfile, " (if no)\n"); 1227 fprintf (logfile, " (if no)\n");
1299 dump_monster_treasure_rec (name, t->next_no, depth + 1); 1228 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1300 } 1229 }
1301 1230
1302 t = t->next; 1231 t = t->next;
… …
1305 1234
1306/* 1235/*
1307 * For debugging purposes. Dumps all treasures for a given monster. 1236 * For debugging purposes. Dumps all treasures for a given monster.
1308 * Created originally by Raphael Quinet for debugging the alchemy code. 1237 * Created originally by Raphael Quinet for debugging the alchemy code.
1309 */ 1238 */
1310
1311void 1239void
1312dump_monster_treasure (const char *name) 1240dump_monster_treasure (const char *name)
1313{ 1241{
1314 archetype *at; 1242 archetype *at;
1315 int found; 1243 int found;
1316 1244
1317 found = 0; 1245 found = 0;
1318 fprintf (logfile, "\n"); 1246 fprintf (logfile, "\n");
1247
1319 for (at = first_archetype; at != NULL; at = at->next) 1248 for (at = first_archetype; at != NULL; at = at->next)
1320 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1249 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1321 { 1250 {
1322 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1251 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1323 if (at->clone.randomitems != NULL) 1252 if (at->clone.randomitems != NULL)
1324 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1253 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1325 else 1254 else
1326 fprintf (logfile, "(nothing)\n"); 1255 fprintf (logfile, "(nothing)\n");
1256
1327 fprintf (logfile, "\n"); 1257 fprintf (logfile, "\n");
1328 found++; 1258 found++;
1329 } 1259 }
1260
1330 if (found == 0) 1261 if (found == 0)
1331 fprintf (logfile, "No objects have the name %s!\n\n", name); 1262 fprintf (logfile, "No objects have the name %s!\n\n", name);
1332} 1263}
1333 1264
1334/* 1265/*
1335 * Builds up the lists of artifacts from the file in the libdir. 1266 * Builds up the lists of artifacts from the file in the libdir.
1336 */ 1267 */
1337
1338void 1268void
1339init_artifacts (void) 1269init_artifacts (void)
1340{ 1270{
1341 static int has_been_inited = 0; 1271 static int has_been_inited = 0;
1342 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next; 1272 char filename[MAX_BUF];
1343 artifact *art = NULL; 1273 artifact *art = NULL;
1344 linked_char *tmp;
1345 int value;
1346 artifactlist *al; 1274 artifactlist *al;
1347 1275
1348 if (has_been_inited) 1276 if (has_been_inited)
1349 return; 1277 return;
1350 else 1278 else
1351 has_been_inited = 1; 1279 has_been_inited = 1;
1352 1280
1353 sprintf (filename, "%s/artifacts", settings.datadir); 1281 sprintf (filename, "%s/artifacts", settings.datadir);
1354 object_thawer thawer (filename); 1282 object_thawer f (filename);
1355 1283
1356 if (!thawer) 1284 if (!f)
1357 return; 1285 return;
1358 1286
1359 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1287 f.next ();
1360 {
1361 if (*buf == '#')
1362 continue;
1363 if ((cp = strchr (buf, '\n')) != NULL)
1364 *cp = '\0';
1365 cp = buf;
1366 while (*cp == ' ') /* Skip blanks */
1367 cp++;
1368 if (*cp == '\0')
1369 continue;
1370 1288
1371 if (!strncmp (cp, "Allowed", 7)) 1289 for (;;)
1290 {
1291 switch (f.kw)
1372 { 1292 {
1293 case KW_allowed:
1373 if (art == NULL) 1294 if (!art)
1295 art = get_empty_artifact ();
1296
1374 { 1297 {
1375 art = get_empty_artifact (); 1298 if (!strcmp (f.get_str (), "all"))
1376 nrofartifacts++; 1299 break;
1300
1301 char *next, *cp = f.get_str ();
1302
1303 do
1304 {
1305 if ((next = strchr (cp, ',')))
1306 *next++ = '\0';
1307
1308 linked_char *tmp = new linked_char;
1309
1310 tmp->name = cp;
1311 tmp->next = art->allowed;
1312 art->allowed = tmp;
1313 }
1314 while ((cp = next));
1377 } 1315 }
1378 cp = strchr (cp, ' ') + 1; 1316 break;
1379 if (!strcmp (cp, "all")) 1317
1318 case KW_chance:
1319 f.get (art->chance);
1320 break;
1321
1322 case KW_difficulty:
1323 f.get (art->difficulty);
1324 break;
1325
1326 case KW_object:
1327 {
1328 art->item = object::create ();
1329 f.get (art->item->name);
1330 f.next ();
1331
1332 if (!art->item->parse_kv (f))
1333 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1334
1335 al = find_artifactlist (art->item->type);
1336
1337 if (!al)
1338 {
1339 al = get_empty_artifactlist ();
1340 al->type = art->item->type;
1341 al->next = first_artifactlist;
1342 first_artifactlist = al;
1343 }
1344
1345 art->next = al->items;
1346 al->items = art;
1347 art = 0;
1348 }
1380 continue; 1349 continue;
1381 1350
1382 do 1351 case KW_EOF:
1352 goto done;
1353
1354 default:
1355 if (!f.parse_error ("artifacts file"))
1356 cleanup ("artifacts file required");
1383 { 1357 break;
1384 nrofallowedstr++;
1385 if ((next = strchr (cp, ',')) != NULL)
1386 *(next++) = '\0';
1387 tmp = new linked_char;
1388
1389 tmp->name = cp;
1390 tmp->next = art->allowed;
1391 art->allowed = tmp;
1392 }
1393 while ((cp = next) != NULL);
1394 }
1395 else if (sscanf (cp, "chance %d", &value))
1396 art->chance = (uint16) value;
1397 else if (sscanf (cp, "difficulty %d", &value))
1398 art->difficulty = (uint8) value;
1399 else if (!strncmp (cp, "Object", 6))
1400 { 1358 }
1401 art->item = object::create ();
1402 1359
1403 if (!load_object (thawer, art->item, 0)) 1360 f.next ();
1404 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1405
1406 art->item->name = strchr (cp, ' ') + 1;
1407 al = find_artifactlist (art->item->type);
1408 if (al == NULL)
1409 {
1410 al = get_empty_artifactlist ();
1411 al->type = art->item->type;
1412 al->next = first_artifactlist;
1413 first_artifactlist = al;
1414 }
1415 art->next = al->items;
1416 al->items = art;
1417 art = NULL;
1418 }
1419 else
1420 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1421 } 1361 }
1422 1362
1363done:
1423 for (al = first_artifactlist; al != NULL; al = al->next) 1364 for (al = first_artifactlist; al; al = al->next)
1424 { 1365 {
1366 al->total_chance = 0;
1367
1425 for (art = al->items; art != NULL; art = art->next) 1368 for (art = al->items; art; art = art->next)
1426 { 1369 {
1427 if (!art->chance) 1370 if (!art->chance)
1428 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1371 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1429 else 1372 else
1430 al->total_chance += art->chance; 1373 al->total_chance += art->chance;
… …
1435 } 1378 }
1436 1379
1437 LOG (llevDebug, "done.\n"); 1380 LOG (llevDebug, "done.\n");
1438} 1381}
1439 1382
1440
1441/* 1383/*
1442 * Used in artifact generation. The bonuses of the first object 1384 * Used in artifact generation. The bonuses of the first object
1443 * is modified by the bonuses of the second object. 1385 * is modified by the bonuses of the second object.
1444 */ 1386 */
1445
1446void 1387void
1447add_abilities (object *op, object *change) 1388add_abilities (object *op, object *change)
1448{ 1389{
1449 int i, tmp; 1390 int i, tmp;
1450 1391
1451 if (change->face != blank_face) 1392 if (change->face != blank_face)
1452 { 1393 {
1453#ifdef TREASURE_VERBOSE 1394#ifdef TREASURE_VERBOSE
1454 LOG (llevDebug, "FACE: %d\n", change->face->number); 1395 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1455#endif 1396#endif
1456 op->face = change->face; 1397 op->face = change->face;
1457 } 1398 }
1458 1399
1459 for (i = 0; i < NUM_STATS; i++) 1400 for (i = 0; i < NUM_STATS; i++)
… …
1499 1440
1500 op->set_speed (op->speed); 1441 op->set_speed (op->speed);
1501 } 1442 }
1502 1443
1503 if (change->nrof) 1444 if (change->nrof)
1504 op->nrof = RANDOM () % ((int) change->nrof) + 1; 1445 op->nrof = rndm (change->nrof) + 1;
1505 1446
1506 op->stats.exp += change->stats.exp; /* Speed modifier */ 1447 op->stats.exp += change->stats.exp; /* Speed modifier */
1507 op->stats.wc += change->stats.wc; 1448 op->stats.wc += change->stats.wc;
1508 op->stats.ac += change->stats.ac; 1449 op->stats.ac += change->stats.ac;
1509 1450
… …
1612 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1553 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1613 } 1554 }
1614 1555
1615 op->value *= change->value; 1556 op->value *= change->value;
1616 1557
1617 if (change->material) 1558 if (change->materials)
1618 op->material = change->material; 1559 op->materials = change->materials;
1619 1560
1620 if (change->materialname) 1561 if (change->materialname)
1621 op->materialname = change->materialname; 1562 op->materialname = change->materialname;
1622 1563
1623 if (change->slaying) 1564 if (change->slaying)
… …
1640 if (art->allowed == (linked_char *) NULL) 1581 if (art->allowed == (linked_char *) NULL)
1641 return 1; /* Ie, "all" */ 1582 return 1; /* Ie, "all" */
1642 for (tmp = art->allowed; tmp; tmp = tmp->next) 1583 for (tmp = art->allowed; tmp; tmp = tmp->next)
1643 { 1584 {
1644#ifdef TREASURE_VERBOSE 1585#ifdef TREASURE_VERBOSE
1645 LOG (llevDebug, "legal_art: %s\n", tmp->name); 1586 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1646#endif 1587#endif
1647 if (*tmp->name == '!') 1588 if (*tmp->name == '!')
1648 name = tmp->name + 1, neg = 1; 1589 name = tmp->name + 1, neg = 1;
1649 else 1590 else
1650 name = tmp->name, neg = 0; 1591 name = tmp->name, neg = 0;
… …
1717 return; 1658 return;
1718 } 1659 }
1719 1660
1720 for (i = 0; i < ARTIFACT_TRIES; i++) 1661 for (i = 0; i < ARTIFACT_TRIES; i++)
1721 { 1662 {
1722 int roll = RANDOM () % al->total_chance; 1663 int roll = rndm (al->total_chance);
1723 1664
1724 for (art = al->items; art != NULL; art = art->next) 1665 for (art = al->items; art; art = art->next)
1725 { 1666 {
1726 roll -= art->chance; 1667 roll -= art->chance;
1727 if (roll < 0) 1668 if (roll < 0)
1728 break; 1669 break;
1729 } 1670 }
… …
1745 continue; 1686 continue;
1746 1687
1747 if (!legal_artifact_combination (op, art)) 1688 if (!legal_artifact_combination (op, art))
1748 { 1689 {
1749#ifdef TREASURE_VERBOSE 1690#ifdef TREASURE_VERBOSE
1750 LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); 1691 LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1751#endif 1692#endif
1752 continue; 1693 continue;
1753 } 1694 }
1695
1754 give_artifact_abilities (op, art->item); 1696 give_artifact_abilities (op, art->item);
1755 return; 1697 return;
1756 } 1698 }
1757} 1699}
1758 1700
… …
1802 SET_FLAG (item, FLAG_NO_STEAL); 1744 SET_FLAG (item, FLAG_NO_STEAL);
1803 } 1745 }
1804} 1746}
1805 1747
1806/* special_potion() - so that old potion code is still done right. */ 1748/* special_potion() - so that old potion code is still done right. */
1807
1808int 1749int
1809special_potion (object *op) 1750special_potion (object *op)
1810{ 1751{
1811 if (op->attacktype) 1752 if (op->attacktype)
1812 return 1; 1753 return 1;
… …
1822} 1763}
1823 1764
1824void 1765void
1825free_treasurestruct (treasure *t) 1766free_treasurestruct (treasure *t)
1826{ 1767{
1827 if (t->next)
1828 free_treasurestruct (t->next); 1768 if (t->next) free_treasurestruct (t->next);
1829 if (t->next_yes)
1830 free_treasurestruct (t->next_yes); 1769 if (t->next_yes) free_treasurestruct (t->next_yes);
1831 if (t->next_no)
1832 free_treasurestruct (t->next_no); 1770 if (t->next_no) free_treasurestruct (t->next_no);
1833 1771
1834 delete t; 1772 delete t;
1835} 1773}
1836 1774
1837void 1775void
… …
1842 1780
1843 delete lc; 1781 delete lc;
1844} 1782}
1845 1783
1846void 1784void
1847free_artifact (artifact * at) 1785free_artifact (artifact *at)
1848{ 1786{
1849 if (at->next)
1850 free_artifact (at->next); 1787 if (at->next) free_artifact (at->next);
1851
1852 if (at->allowed)
1853 free_charlinks (at->allowed); 1788 if (at->allowed) free_charlinks (at->allowed);
1854 1789
1855 at->item->destroy (1); 1790 at->item->destroy (1);
1856 1791
1857 delete at; 1792 sfree (at);
1858} 1793}
1859 1794
1860void 1795void
1861free_artifactlist (artifactlist * al) 1796free_artifactlist (artifactlist *al)
1862{ 1797{
1863 artifactlist *nextal; 1798 artifactlist *nextal;
1864 1799
1865 for (al = first_artifactlist; al; al = nextal) 1800 for (al = first_artifactlist; al; al = nextal)
1866 { 1801 {
1867 nextal = al->next; 1802 nextal = al->next;
1868 1803
1869 if (al->items) 1804 if (al->items)
1870 free_artifact (al->items); 1805 free_artifact (al->items);
1871 1806
1872 free (al); 1807 sfree (al);
1873 } 1808 }
1874} 1809}
1875 1810
1876void 1811void
1877free_all_treasures (void) 1812free_all_treasures (void)
1878{ 1813{
1879 treasurelist *tl, *next; 1814 treasurelist *tl, *next;
1880 1815
1881
1882 for (tl = first_treasurelist; tl != NULL; tl = next) 1816 for (tl = first_treasurelist; tl; tl = next)
1883 { 1817 {
1818 clear (tl);
1819
1884 next = tl->next; 1820 next = tl->next;
1885 if (tl->items)
1886 free_treasurestruct (tl->items);
1887 delete tl; 1821 delete tl;
1888 } 1822 }
1823
1889 free_artifactlist (first_artifactlist); 1824 free_artifactlist (first_artifactlist);
1890} 1825}

Diff Legend

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