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.55 by root, Sat Apr 21 22:05:52 2007 UTC

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

Diff Legend

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