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.3 by root, Mon Aug 28 14:05:24 2006 UTC vs.
Revision 1.45 by root, Mon Apr 16 15:41:26 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines