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

Diff Legend

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