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.1 by elmex, Sun Aug 13 17:16:01 2006 UTC vs.
Revision 1.42 by root, Mon Apr 16 10:14:25 2007 UTC

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

Diff Legend

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