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.5 by root, Wed Aug 30 06:06:27 2006 UTC vs.
Revision 1.88 by root, Fri Nov 6 12:27:05 2009 UTC

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

Diff Legend

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