ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/treasure.C
(Generate patch)

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:01 2006 UTC vs.
Revision 1.6 by root, Thu Aug 31 18:59:23 2006 UTC

1 1
2/* 2/*
3 * static char *rcs_treasure_c = 3 * static char *rcs_treasure_c =
4 * "$Id: treasure.C,v 1.1 2006/08/13 17:16:01 elmex Exp $"; 4 * "$Id: treasure.C,v 1.6 2006/08/31 18:59:23 root Exp $";
5 */ 5 */
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
9 9
… …
107 treasure *t=get_empty_treasure(); 107 treasure *t=get_empty_treasure();
108 int value; 108 int value;
109 109
110 nroftreasures++; 110 nroftreasures++;
111 while(fgets(buf,MAX_BUF,fp)!=NULL) { 111 while(fgets(buf,MAX_BUF,fp)!=NULL) {
112 (*line)++; 112 (*line)++;
113 113
114 if(*buf=='#') 114 if(*buf=='#')
115 continue; 115 continue;
116 if((cp=strchr(buf,'\n'))!=NULL) 116 if((cp=strchr(buf,'\n'))!=NULL)
117 *cp='\0'; 117 *cp='\0';
118 cp=buf; 118 cp=buf;
119 while(isspace(*cp)) /* Skip blanks */ 119 while(isspace(*cp)) /* Skip blanks */
120 cp++; 120 cp++;
121 121
122 if(sscanf(cp,"arch %s",variable)) { 122 if(sscanf(cp,"arch %s",variable)) {
123 if((t->item=find_archetype(variable))==NULL) 123 if((t->item=find_archetype(variable))==NULL)
124 LOG(llevError,"Treasure lacks archetype: %s\n",variable); 124 LOG(llevError,"Treasure lacks archetype: %s\n",variable);
125 } else if (sscanf(cp, "list %s", variable)) 125 } else if (sscanf(cp, "list %s", variable))
126 t->name = add_string(variable); 126 t->name = add_string(variable);
127 else if (sscanf(cp, "change_name %s", variable)) 127 else if (sscanf(cp, "change_name %s", variable))
128 t->change_arch.name = add_string(variable); 128 t->change_arch.name = add_string(variable);
129 else if (sscanf(cp, "change_title %s", variable)) 129 else if (sscanf(cp, "change_title %s", variable))
130 t->change_arch.title = add_string(variable); 130 t->change_arch.title = add_string(variable);
131 else if (sscanf(cp, "change_slaying %s", variable)) 131 else if (sscanf(cp, "change_slaying %s", variable))
132 t->change_arch.slaying = add_string(variable); 132 t->change_arch.slaying = add_string(variable);
133 else if(sscanf(cp,"chance %d",&value)) 133 else if(sscanf(cp,"chance %d",&value))
134 t->chance=(uint8) value; 134 t->chance=(uint8) value;
135 else if(sscanf(cp,"nrof %d",&value)) 135 else if(sscanf(cp,"nrof %d",&value))
136 t->nrof=(uint16) value; 136 t->nrof=(uint16) value;
137 else if(sscanf(cp,"magic %d",&value)) 137 else if(sscanf(cp,"magic %d",&value))
138 t->magic=(uint8) value; 138 t->magic=(uint8) value;
139 else if(!strcmp(cp,"yes")) 139 else if(!strcmp(cp,"yes"))
140 t->next_yes=load_treasure(fp, line); 140 t->next_yes=load_treasure(fp, line);
141 else if(!strcmp(cp,"no")) 141 else if(!strcmp(cp,"no"))
142 t->next_no=load_treasure(fp, line); 142 t->next_no=load_treasure(fp, line);
143 else if(!strcmp(cp,"end")) 143 else if(!strcmp(cp,"end"))
144 return t; 144 return t;
145 else if(!strcmp(cp,"more")) { 145 else if(!strcmp(cp,"more")) {
146 t->next=load_treasure(fp, line); 146 t->next=load_treasure(fp, line);
147 return t; 147 return t;
148 } else 148 } else
149 LOG(llevError,"Unknown treasure-command: '%s', last entry %s, line %d\n", 149 LOG(llevError,"Unknown treasure-command: '%s', last entry %s, line %d\n",
150 cp,t->name?t->name:"null", *line); 150 cp,t->name?t->name:"null", *line);
151 } 151 }
152 LOG(llevError,"treasure lacks 'end'.\n"); 152 LOG(llevError,"treasure lacks 'end'.\n");
153 return t; 153 return t;
154} 154}
155 155
… …
158 * so that the treasure name can be printed out 158 * so that the treasure name can be printed out
159 */ 159 */
160static void check_treasurelist(const treasure *t, const treasurelist *tl) 160static void check_treasurelist(const treasure *t, const treasurelist *tl)
161{ 161{
162 if (t->item==NULL && t->name==NULL) 162 if (t->item==NULL && t->name==NULL)
163 LOG(llevError,"Treasurelist %s has element with no name or archetype\n", tl->name); 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)) 164 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", 165 LOG(llevError,"Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n",
166 tl->name); 166 tl->name);
167 /* find_treasurelist will print out its own error message */ 167 /* find_treasurelist will print out its own error message */
168 if (t->name && strcmp(t->name,"NONE")) 168 if (t->name && *t->name)
169 (void) find_treasurelist(t->name); 169 (void) find_treasurelist(t->name);
170 if (t->next) check_treasurelist(t->next, tl); 170 if (t->next) check_treasurelist(t->next, tl);
171 if (t->next_yes) check_treasurelist(t->next_yes,tl); 171 if (t->next_yes) check_treasurelist(t->next_yes,tl);
172 if (t->next_no) check_treasurelist(t->next_no, tl); 172 if (t->next_no) check_treasurelist(t->next_no, tl);
173} 173}
174#endif 174#endif
… …
185 treasure *t; 185 treasure *t;
186 int comp, line=0; 186 int comp, line=0;
187 187
188 sprintf(filename,"%s/%s",settings.datadir,settings.treasures); 188 sprintf(filename,"%s/%s",settings.datadir,settings.treasures);
189 if((fp=open_and_uncompress(filename,0,&comp))==NULL) { 189 if((fp=open_and_uncompress(filename,0,&comp))==NULL) {
190 LOG(llevError,"Can't open treasure file.\n"); 190 LOG(llevError,"Can't open treasure file.\n");
191 return; 191 return;
192 } 192 }
193 while(fgets(buf,MAX_BUF,fp)!=NULL) { 193 while(fgets(buf,MAX_BUF,fp)!=NULL) {
194 line++; 194 line++;
195 if(*buf=='#') 195 if(*buf=='#')
196 continue; 196 continue;
197 197
198 if(sscanf(buf,"treasureone %s\n",name) || sscanf(buf,"treasure %s\n",name)) { 198 if(sscanf(buf,"treasureone %s\n",name) || sscanf(buf,"treasure %s\n",name)) {
199 treasurelist *tl=get_empty_treasurelist(); 199 treasurelist *tl=get_empty_treasurelist();
200 tl->name=add_string(name); 200 tl->name=add_string(name);
201 if(previous==NULL) 201 if(previous==NULL)
202 first_treasurelist=tl; 202 first_treasurelist=tl;
203 else 203 else
204 previous->next=tl; 204 previous->next=tl;
205 previous=tl; 205 previous=tl;
206 tl->items=load_treasure(fp, &line); 206 tl->items=load_treasure(fp, &line);
207 207
208 /* This is a one of the many items on the list should be generated. 208 /* 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 209 * Add up the chance total, and check to make sure the yes & no
210 * fields of the treasures are not being used. 210 * fields of the treasures are not being used.
211 */ 211 */
212 if (!strncmp(buf,"treasureone",11)) { 212 if (!strncmp(buf,"treasureone",11)) {
213 for (t=tl->items; t!=NULL; t=t->next) { 213 for (t=tl->items; t!=NULL; t=t->next) {
214#ifdef TREASURE_DEBUG 214#ifdef TREASURE_DEBUG
215 if (t->next_yes || t->next_no) { 215 if (t->next_yes || t->next_no) {
216 LOG(llevError,"Treasure %s is one item, but on treasure %s\n", 216 LOG(llevError,"Treasure %s is one item, but on treasure %s\n",
217 tl->name, t->item ? t->item->name : t->name); 217 tl->name, t->item ? t->item->name : t->name);
218 LOG(llevError," the next_yes or next_no field is set\n"); 218 LOG(llevError," the next_yes or next_no field is set\n");
219 } 219 }
220#endif 220#endif
221 tl->total_chance += t->chance; 221 tl->total_chance += t->chance;
222 } 222 }
223 } 223 }
224 } else 224 } else
225 LOG(llevError,"Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line); 225 LOG(llevError,"Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
226 } 226 }
227 close_and_delete(fp, comp); 227 close_and_delete(fp, comp);
228 228
229#ifdef TREASURE_DEBUG 229#ifdef TREASURE_DEBUG
230 /* Perform some checks on how valid the treasure data actually is. 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 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 232 * to transition to exists). Also, verify that at least the name
233 * or archetype is set for each treasure element. 233 * or archetype is set for each treasure element.
234 */ 234 */
235 for (previous=first_treasurelist; previous!=NULL; previous=previous->next) 235 for (previous=first_treasurelist; previous!=NULL; previous=previous->next)
236 check_treasurelist(previous->items, previous); 236 check_treasurelist(previous->items, previous);
237#endif 237#endif
238} 238}
239 239
240/* 240/*
241 * Searches for the given treasurelist in the globally linked list 241 * Searches for the given treasurelist in the globally linked list
… …
284 * by another object. 284 * by another object.
285 */ 285 */
286 if (flags & GT_ENVIRONMENT && op->type != SPELL) { 286 if (flags & GT_ENVIRONMENT && op->type != SPELL) {
287 op->x = creator->x; 287 op->x = creator->x;
288 op->y = creator->y; 288 op->y = creator->y;
289 SET_FLAG(op, FLAG_OBJ_ORIGINAL); 289 SET_FLAG(op, FLAG_OBJ_ORIGINAL);
290 insert_ob_in_map (op, creator->map,op,INS_NO_MERGE | INS_NO_WALK_ON); 290 insert_ob_in_map (op, creator->map,op,INS_NO_MERGE | INS_NO_WALK_ON);
291 } else { 291 } else {
292 op = insert_ob_in_ob (op, creator); 292 op = insert_ob_in_ob (op, creator);
293 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 293 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
294 monster_check_apply(creator, op); 294 monster_check_apply(creator, op);
… …
303static void change_treasure(treasure *t, object *op) 303static void change_treasure(treasure *t, object *op)
304{ 304{
305 /* CMD: change_name xxxx */ 305 /* CMD: change_name xxxx */
306 if(t->change_arch.name) 306 if(t->change_arch.name)
307 { 307 {
308 FREE_AND_COPY(op->name, t->change_arch.name); 308 FREE_AND_COPY(op->name, t->change_arch.name);
309 /* not great, but better than something that is completely wrong */ 309 /* not great, but better than something that is completely wrong */
310 FREE_AND_COPY(op->name_pl, t->change_arch.name); 310 FREE_AND_COPY(op->name_pl, t->change_arch.name);
311 } 311 }
312 312
313 if(t->change_arch.title) 313 if(t->change_arch.title)
314 { 314 {
315 if(op->title) 315 if(op->title)
… …
330 object *tmp; 330 object *tmp;
331 331
332 332
333 if((int)t->chance >= 100 || (RANDOM()%100 + 1) < (int) t->chance) { 333 if((int)t->chance >= 100 || (RANDOM()%100 + 1) < (int) t->chance) {
334 if (t->name) { 334 if (t->name) {
335 if (strcmp(t->name,"NONE") && difficulty>=t->magic) 335 if (strcmp(t->name,"NONE") && difficulty>=t->magic)
336 create_treasure(find_treasurelist(t->name), op, flag, difficulty, tries); 336 create_treasure(find_treasurelist(t->name), op, flag, difficulty, tries);
337 } 337 }
338 else { 338 else {
339 if(t->item->clone.invisible != 0 || ! (flag & GT_INVISIBLE)) { 339 if(t->item->clone.invisible != 0 || ! (flag & GT_INVISIBLE)) {
340 tmp=arch_to_object(t->item); 340 tmp=arch_to_object(t->item);
341 if(t->nrof&&tmp->nrof<=1) 341 if(t->nrof&&tmp->nrof<=1)
… …
353 if(t->next!=NULL) 353 if(t->next!=NULL)
354 create_all_treasures(t->next,op,flag,difficulty, tries); 354 create_all_treasures(t->next,op,flag,difficulty, tries);
355} 355}
356 356
357void create_one_treasure(treasurelist *tl, object *op, int flag, int difficulty, 357void create_one_treasure(treasurelist *tl, object *op, int flag, int difficulty,
358 int tries) 358 int tries)
359{ 359{
360 int value = RANDOM() % tl->total_chance; 360 int value = RANDOM() % tl->total_chance;
361 treasure *t; 361 treasure *t;
362 362
363 if (tries++>100) { 363 if (tries++>100) {
364 LOG(llevDebug,"create_one_treasure: tries exceeded 100, returning without making treasure\n"); 364 LOG(llevDebug,"create_one_treasure: tries exceeded 100, returning without making treasure\n");
365 return; 365 return;
366 } 366 }
367 for (t=tl->items; t!=NULL; t=t->next) { 367 for (t=tl->items; t!=NULL; t=t->next) {
368 value -= t->chance; 368 value -= t->chance;
369 if (value<0) break; 369 if (value<0) break;
370 } 370 }
371 371
372 if (!t || value>=0) { 372 if (!t || value>=0) {
373 LOG(llevError, "create_one_treasure: got null object or not able to find treasure\n"); 373 LOG(llevError, "create_one_treasure: got null object or not able to find treasure\n");
374 abort(); 374 abort();
375 return; 375 return;
376 } 376 }
377 if (t->name) { 377 if (t->name) {
378 if (!strcmp(t->name,"NONE")) return; 378 if (!strcmp(t->name,"NONE")) return;
379 if (difficulty>=t->magic) 379 if (difficulty>=t->magic)
380 create_treasure(find_treasurelist(t->name), op, flag, difficulty, tries); 380 create_treasure(find_treasurelist(t->name), op, flag, difficulty, tries);
381 else if (t->nrof) 381 else if (t->nrof)
382 create_one_treasure(tl, op, flag, difficulty, tries); 382 create_one_treasure(tl, op, flag, difficulty, tries);
383 return; 383 return;
384 } 384 }
385 if((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE) { 385 if((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE) {
386 object *tmp=arch_to_object(t->item); 386 object *tmp=arch_to_object(t->item);
387 if (!tmp) return; 387 if (!tmp) return;
388 if(t->nrof && tmp->nrof<=1) 388 if(t->nrof && tmp->nrof<=1)
389 tmp->nrof = RANDOM()%((int) t->nrof) + 1; 389 tmp->nrof = RANDOM()%((int) t->nrof) + 1;
390 fix_generated_item (tmp, op, difficulty, t->magic, flag); 390 fix_generated_item (tmp, op, difficulty, t->magic, flag);
391 change_treasure(t, tmp); 391 change_treasure(t, tmp);
392 put_treasure (tmp, op, flag); 392 put_treasure (tmp, op, flag);
… …
399 * list transitions, or so that excessively good treasure will not be 399 * 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 400 * created on weak maps, because it will exceed the number of allowed tries
401 * to do that. 401 * to do that.
402 */ 402 */
403void create_treasure(treasurelist *t, object *op, int flag, int difficulty, 403void create_treasure(treasurelist *t, object *op, int flag, int difficulty,
404 int tries) 404 int tries)
405{ 405{
406 406
407 if (tries++>100) { 407 if (tries++>100) {
408 LOG(llevDebug,"createtreasure: tries exceeded 100, returning without making treasure\n"); 408 LOG(llevDebug,"createtreasure: tries exceeded 100, returning without making treasure\n");
409 return; 409 return;
410 } 410 }
411 if (t->total_chance) 411 if (t->total_chance)
412 create_one_treasure(t, op, flag,difficulty, tries); 412 create_one_treasure(t, op, flag,difficulty, tries);
413 else 413 else
414 create_all_treasures(t->items, op, flag, difficulty, tries); 414 create_all_treasures(t->items, op, flag, difficulty, tries);
415} 415}
416 416
417/* This is similar to the old generate treasure function. However, 417/* This is similar to the old generate treasure function. However,
… …
419 * create_treasure. We create a dummy object that the treasure gets 419 * create_treasure. We create a dummy object that the treasure gets
420 * inserted into, and then return that treausre 420 * inserted into, and then return that treausre
421 */ 421 */
422object *generate_treasure(treasurelist *t, int difficulty) 422object *generate_treasure(treasurelist *t, int difficulty)
423{ 423{
424 object *ob = get_object(), *tmp; 424 object *ob = get_object(), *tmp;
425 425
426 create_treasure(t, ob, 0, difficulty, 0); 426 create_treasure(t, ob, 0, difficulty, 0);
427 427
428 /* Don't want to free the object we are about to return */ 428 /* Don't want to free the object we are about to return */
429 tmp = ob->inv; 429 tmp = ob->inv;
430 if (tmp!=NULL) remove_ob(tmp); 430 if (tmp!=NULL) remove_ob(tmp);
431 if (ob->inv) { 431 if (ob->inv) {
432 LOG(llevError,"In generate treasure, created multiple objects.\n"); 432 LOG(llevError,"In generate treasure, created multiple objects.\n");
433 } 433 }
434 free_object(ob); 434 free_object(ob);
435 return tmp; 435 return tmp;
436} 436}
437 437
438/* 438/*
439 * This is a new way of calculating the chance for an item to have 439 * This is a new way of calculating the chance for an item to have
440 * a specific magical bonus. 440 * a specific magical bonus.
… …
612void set_ring_bonus(object *op,int bonus) { 612void set_ring_bonus(object *op,int bonus) {
613 613
614 int r=RANDOM()%(bonus>0?25:11); 614 int r=RANDOM()%(bonus>0?25:11);
615 615
616 if(op->type==AMULET) { 616 if(op->type==AMULET) {
617 if(!(RANDOM()%21)) 617 if(!(RANDOM()%21))
618 r=20+RANDOM()%2; 618 r=20+RANDOM()%2;
619 else { 619 else {
620 if(RANDOM()&2) 620 if(RANDOM()&2)
621 r=10; 621 r=10;
622 else 622 else
623 r=11+RANDOM()%9; 623 r=11+RANDOM()%9;
624 } 624 }
625 } 625 }
626 626
627 switch(r) { 627 switch(r) {
628 /* Redone by MSW 2000-11-26 to have much less code. Also, 628 /* Redone by MSW 2000-11-26 to have much less code. Also,
629 * bonuses and penalties will stack and add to existing values. 629 * bonuses and penalties will stack and add to existing values.
630 * of the item. 630 * of the item.
631 */ 631 */
632 case 0: 632 case 0:
633 case 1: 633 case 1:
634 case 2: 634 case 2:
635 case 3: 635 case 3:
636 case 4: 636 case 4:
637 case 5: 637 case 5:
638 case 6: 638 case 6:
639 set_attr_value(&op->stats, r, (signed char)(bonus + get_attr_value(&op->stats,r))); 639 set_attr_value(&op->stats, r, (signed char)(bonus + get_attr_value(&op->stats,r)));
640 break; 640 break;
641 641
642 case 7: 642 case 7:
643 op->stats.dam+=bonus; 643 op->stats.dam+=bonus;
644 break; 644 break;
645 645
646 case 8: 646 case 8:
647 op->stats.wc+=bonus; 647 op->stats.wc+=bonus;
648 break; 648 break;
649 649
650 case 9: 650 case 9:
651 op->stats.food+=bonus; /* hunger/sustenance */ 651 op->stats.food+=bonus; /* hunger/sustenance */
652 break; 652 break;
653 653
654 case 10: 654 case 10:
655 op->stats.ac+=bonus; 655 op->stats.ac+=bonus;
656 break; 656 break;
657 657
658 /* Item that gives protections/vulnerabilities */ 658 /* Item that gives protections/vulnerabilities */
659 case 11: 659 case 11:
660 case 12: 660 case 12:
661 case 13: 661 case 13:
662 case 14: 662 case 14:
663 case 15: 663 case 15:
664 case 16: 664 case 16:
665 case 17: 665 case 17:
666 case 18: 666 case 18:
667 case 19: 667 case 19:
668 { 668 {
669 int b=5+FABS(bonus),val,resist=RANDOM() % num_resist_table; 669 int b=5+FABS(bonus),val,resist=RANDOM() % num_resist_table;
670 670
671 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */ 671 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
672 val = 10 + RANDOM() % b + RANDOM() % b + RANDOM() % b + RANDOM() % b; 672 val = 10 + RANDOM() % b + RANDOM() % b + RANDOM() % b + RANDOM() % b;
673 673
674 /* Cursed items need to have higher negative values to equal out with 674 /* Cursed items need to have higher negative values to equal out with
675 * positive values for how protections work out. Put another 675 * positive values for how protections work out. Put another
676 * little random element in since that they don't always end up with 676 * little random element in since that they don't always end up with
677 * even values. 677 * even values.
678 */ 678 */
679 if (bonus<0) val = 2*-val - RANDOM() % b; 679 if (bonus<0) val = 2*-val - RANDOM() % b;
680 if (val>35) val=35; /* Upper limit */ 680 if (val>35) val=35; /* Upper limit */
681 b=0; 681 b=0;
682 while (op->resist[resist_table[resist]]!=0 && b<4) { 682 while (op->resist[resist_table[resist]]!=0 && b<4) {
683 resist=RANDOM() % num_resist_table; 683 resist=RANDOM() % num_resist_table;
684 } 684 }
685 if (b==4) return; /* Not able to find a free resistance */ 685 if (b==4) return; /* Not able to find a free resistance */
686 op->resist[resist_table[resist]] = val; 686 op->resist[resist_table[resist]] = val;
687 /* We should probably do something more clever here to adjust value 687 /* We should probably do something more clever here to adjust value
688 * based on how good a resistance we gave. 688 * based on how good a resistance we gave.
689 */ 689 */
690 break; 690 break;
691 } 691 }
692 case 20: 692 case 20:
693 if(op->type==AMULET) { 693 if(op->type==AMULET) {
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 } else {
697 op->stats.hp=1; /* regenerate hit points */ 697 op->stats.hp=1; /* regenerate hit points */
698 op->value*=4; 698 op->value*=4;
699 } 699 }
700 break; 700 break;
701 701
702 case 21: 702 case 21:
703 if(op->type==AMULET) { 703 if(op->type==AMULET) {
704 SET_FLAG(op,FLAG_REFL_MISSILE); 704 SET_FLAG(op,FLAG_REFL_MISSILE);
705 op->value*=9; 705 op->value*=9;
706 } else { 706 } else {
707 op->stats.sp=1; /* regenerate spell points */ 707 op->stats.sp=1; /* regenerate spell points */
708 op->value*=3; 708 op->value*=3;
709 } 709 }
710 break; 710 break;
711 711
712 case 22: 712 case 22:
713 op->stats.exp+=bonus; /* Speed! */ 713 op->stats.exp+=bonus; /* Speed! */
714 op->value=(op->value*2)/3; 714 op->value=(op->value*2)/3;
715 break; 715 break;
716 } 716 }
717 if(bonus>0) 717 if(bonus>0)
718 op->value*=2*bonus; 718 op->value*=2*bonus;
719 else 719 else
720 op->value= -(op->value*2*bonus)/3; 720 op->value= -(op->value*2*bonus)/3;
721} 721}
722 722
723/* 723/*
724 * get_magic(diff) will return a random number between 0 and 4. 724 * 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 725 * diff can be any value above 2. The higher the diff-variable, the
… …
1155 1155
1156artifactlist *find_artifactlist(int type) { 1156artifactlist *find_artifactlist(int type) {
1157 artifactlist *al; 1157 artifactlist *al;
1158 1158
1159 for (al=first_artifactlist; al!=NULL; al=al->next) 1159 for (al=first_artifactlist; al!=NULL; al=al->next)
1160 if (al->type == type) return al; 1160 if (al->type == type) return al;
1161 return NULL; 1161 return NULL;
1162} 1162}
1163 1163
1164/* 1164/*
1165 * For debugging purposes. Dumps all tables. 1165 * For debugging purposes. Dumps all tables.
… …
1173 fprintf(logfile,"\n"); 1173 fprintf(logfile,"\n");
1174 for (al=first_artifactlist; al!=NULL; al=al->next) { 1174 for (al=first_artifactlist; al!=NULL; al=al->next) {
1175 fprintf(logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance); 1175 fprintf(logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1176 for (art=al->items; art!=NULL; art=art->next) { 1176 for (art=al->items; art!=NULL; art=art->next) {
1177 fprintf(logfile,"Artifact %-30s Difficulty %3d Chance %5d\n", 1177 fprintf(logfile,"Artifact %-30s Difficulty %3d Chance %5d\n",
1178 art->item->name, art->difficulty, art->chance); 1178 art->item->name, art->difficulty, art->chance);
1179 if (art->allowed !=NULL) { 1179 if (art->allowed !=NULL) {
1180 fprintf(logfile,"\tAllowed combinations:"); 1180 fprintf(logfile,"\tAllowed combinations:");
1181 for (next=art->allowed; next!=NULL; next=next->next) 1181 for (next=art->allowed; next!=NULL; next=next->next)
1182 fprintf(logfile, "%s,", next->name); 1182 fprintf(logfile, "%s,", next->name);
1183 fprintf(logfile,"\n"); 1183 fprintf(logfile,"\n");
1184 } 1184 }
1185 } 1185 }
1186 } 1186 }
1187 fprintf(logfile,"\n"); 1187 fprintf(logfile,"\n");
1188} 1188}
… …
1198 if (depth > 100) 1198 if (depth > 100)
1199 return; 1199 return;
1200 while (t != NULL) 1200 while (t != NULL)
1201 { 1201 {
1202 if (t->name != NULL) 1202 if (t->name != NULL)
1203 { 1203 {
1204 for (i = 0; i < depth; i++) 1204 for (i = 0; i < depth; i++)
1205 fprintf (logfile, " "); 1205 fprintf (logfile, " ");
1206 fprintf (logfile, "{ (list: %s)\n", t->name); 1206 fprintf (logfile, "{ (list: %s)\n", t->name);
1207 tl = find_treasurelist (t->name); 1207 tl = find_treasurelist (t->name);
1208 dump_monster_treasure_rec (name, tl->items, depth + 2); 1208 dump_monster_treasure_rec (name, tl->items, depth + 2);
1209 for (i = 0; i < depth; i++) 1209 for (i = 0; i < depth; i++)
1210 fprintf (logfile, " "); 1210 fprintf (logfile, " ");
1211 fprintf (logfile, "} (end of list: %s)\n", t->name); 1211 fprintf (logfile, "} (end of list: %s)\n", t->name);
1212 } 1212 }
1213 else 1213 else
1214 { 1214 {
1215 for (i = 0; i < depth; i++) 1215 for (i = 0; i < depth; i++)
1216 fprintf (logfile, " "); 1216 fprintf (logfile, " ");
1217 if (t->item->clone.type == FLESH) 1217 if (t->item->clone.type == FLESH)
1218 fprintf (logfile, "%s's %s\n", name, t->item->clone.name); 1218 fprintf (logfile, "%s's %s\n", name, t->item->clone.name);
1219 else 1219 else
1220 fprintf (logfile, "%s\n", t->item->clone.name); 1220 fprintf (logfile, "%s\n", t->item->clone.name);
1221 } 1221 }
1222 if (t->next_yes != NULL) 1222 if (t->next_yes != NULL)
1223 { 1223 {
1224 for (i = 0; i < depth; i++) 1224 for (i = 0; i < depth; i++)
1225 fprintf (logfile, " "); 1225 fprintf (logfile, " ");
1226 fprintf (logfile, " (if yes)\n"); 1226 fprintf (logfile, " (if yes)\n");
1227 dump_monster_treasure_rec (name, t->next_yes, depth + 1); 1227 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1228 } 1228 }
1229 if (t->next_no != NULL) 1229 if (t->next_no != NULL)
1230 { 1230 {
1231 for (i = 0; i < depth; i++) 1231 for (i = 0; i < depth; i++)
1232 fprintf (logfile, " "); 1232 fprintf (logfile, " ");
1233 fprintf (logfile, " (if no)\n"); 1233 fprintf (logfile, " (if no)\n");
1234 dump_monster_treasure_rec (name, t->next_no, depth + 1); 1234 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1235 } 1235 }
1236 t = t->next; 1236 t = t->next;
1237 } 1237 }
1238} 1238}
1239 1239
1240/* 1240/*
… …
1250 found = 0; 1250 found = 0;
1251 fprintf (logfile, "\n"); 1251 fprintf (logfile, "\n");
1252 for (at = first_archetype; at != NULL; at = at->next) 1252 for (at = first_archetype; at != NULL; at = at->next)
1253 if (! strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1253 if (! strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1254 { 1254 {
1255 fprintf (logfile, "treasures for %s (arch: %s)\n", at->clone.name, 1255 fprintf (logfile, "treasures for %s (arch: %s)\n", at->clone.name,
1256 at->name); 1256 at->name);
1257 if (at->clone.randomitems != NULL) 1257 if (at->clone.randomitems != NULL)
1258 dump_monster_treasure_rec (at->clone.name, 1258 dump_monster_treasure_rec (at->clone.name,
1259 at->clone.randomitems->items, 1); 1259 at->clone.randomitems->items, 1);
1260 else 1260 else
1261 fprintf (logfile, "(nothing)\n"); 1261 fprintf (logfile, "(nothing)\n");
1262 fprintf (logfile, "\n"); 1262 fprintf (logfile, "\n");
1263 found++; 1263 found++;
1264 } 1264 }
1265 if (found == 0) 1265 if (found == 0)
1266 fprintf (logfile, "No objects have the name %s!\n\n", name); 1266 fprintf (logfile, "No objects have the name %s!\n\n", name);
1267} 1267}
1268 1268
… …
1270 * Builds up the lists of artifacts from the file in the libdir. 1270 * Builds up the lists of artifacts from the file in the libdir.
1271 */ 1271 */
1272 1272
1273void init_artifacts(void) { 1273void init_artifacts(void) {
1274 static int has_been_inited=0; 1274 static int has_been_inited=0;
1275 FILE *fp;
1276 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next; 1275 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;
1277 artifact *art=NULL; 1276 artifact *art=NULL;
1278 linked_char *tmp; 1277 linked_char *tmp;
1279 int value, comp; 1278 int value, comp;
1280 artifactlist *al; 1279 artifactlist *al;
1281 1280
1282 if (has_been_inited) return; 1281 if (has_been_inited) return;
1283 else has_been_inited = 1; 1282 else has_been_inited = 1;
1284 1283
1285 sprintf(filename, "%s/artifacts", settings.datadir); 1284 sprintf(filename, "%s/artifacts", settings.datadir);
1286 LOG(llevDebug, "Reading artifacts from %s...",filename); 1285 object_thawer thawer (filename);
1287 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) {
1288 LOG(llevError, "Can't open %s.\n", filename);
1289 return;
1290 }
1291 1286
1287 if (!thawer)
1288 return;
1289
1292 while (fgets(buf, HUGE_BUF, fp)!=NULL) { 1290 while (fgets(buf, HUGE_BUF, thawer)!=NULL) {
1293 if (*buf=='#') continue; 1291 if (*buf=='#') continue;
1294 if((cp=strchr(buf,'\n'))!=NULL) 1292 if((cp=strchr(buf,'\n'))!=NULL)
1295 *cp='\0'; 1293 *cp='\0';
1296 cp=buf; 1294 cp=buf;
1297 while(*cp==' ') /* Skip blanks */ 1295 while(*cp==' ') /* Skip blanks */
1298 cp++; 1296 cp++;
1299 if (*cp=='\0') continue; 1297 if (*cp=='\0') continue;
1300 1298
1301 if (!strncmp(cp, "Allowed", 7)) { 1299 if (!strncmp(cp, "Allowed", 7)) {
1302 if (art==NULL) { 1300 if (art==NULL) {
1303 art=get_empty_artifact(); 1301 art=get_empty_artifact();
1304 nrofartifacts++; 1302 nrofartifacts++;
1305 } 1303 }
1306 cp = strchr(cp,' ') + 1; 1304 cp = strchr(cp,' ') + 1;
1307 if (!strcmp(cp,"all")) continue; 1305 if (!strcmp(cp,"all")) continue;
1308 1306
1309 do { 1307 do {
1310 nrofallowedstr++; 1308 nrofallowedstr++;
1311 if ((next=strchr(cp, ','))!=NULL) 1309 if ((next=strchr(cp, ','))!=NULL)
1312 *(next++) = '\0'; 1310 *(next++) = '\0';
1313 tmp = (linked_char*) malloc(sizeof(linked_char)); 1311 tmp = (linked_char*) malloc(sizeof(linked_char));
1314 tmp->name = add_string(cp); 1312 tmp->name = add_string(cp);
1315 tmp->next = art->allowed; 1313 tmp->next = art->allowed;
1316 art->allowed = tmp; 1314 art->allowed = tmp;
1317 } while ((cp=next)!=NULL); 1315 } while ((cp=next)!=NULL);
1318 } 1316 }
1319 else if (sscanf(cp, "chance %d", &value)) 1317 else if (sscanf(cp, "chance %d", &value))
1320 art->chance = (uint16) value; 1318 art->chance = (uint16) value;
1321 else if (sscanf(cp, "difficulty %d", &value)) 1319 else if (sscanf(cp, "difficulty %d", &value))
1322 art->difficulty = (uint8) value; 1320 art->difficulty = (uint8) value;
1323 else if (!strncmp(cp, "Object",6)) { 1321 else if (!strncmp(cp, "Object",6)) {
1324 art->item = (object *) calloc(1, sizeof(object)); 1322 art->item = (object *) calloc(1, sizeof(object));
1325 reset_object(art->item); 1323 reset_object(art->item);
1326 if (!load_object(fp, art->item,LO_LINEMODE,0)) 1324 if (!load_object(thawer, art->item,LO_LINEMODE,0))
1327 LOG(llevError,"Init_Artifacts: Could not load object.\n"); 1325 LOG(llevError,"Init_Artifacts: Could not load object.\n");
1328 art->item->name = add_string((strchr(cp, ' ')+1)); 1326 art->item->name = add_string((strchr(cp, ' ')+1));
1329 al=find_artifactlist(art->item->type); 1327 al=find_artifactlist(art->item->type);
1330 if (al==NULL) { 1328 if (al==NULL) {
1331 al = get_empty_artifactlist(); 1329 al = get_empty_artifactlist();
1332 al->type = art->item->type; 1330 al->type = art->item->type;
1333 al->next = first_artifactlist; 1331 al->next = first_artifactlist;
1334 first_artifactlist = al; 1332 first_artifactlist = al;
1335 } 1333 }
1336 art->next = al->items; 1334 art->next = al->items;
1337 al->items = art; 1335 al->items = art;
1338 art = NULL; 1336 art = NULL;
1339 } 1337 }
1340 else 1338 else
1341 LOG(llevError,"Unknown input in artifact file: %s\n", buf); 1339 LOG(llevError,"Unknown input in artifact file: %s\n", buf);
1342 } 1340 }
1343
1344 close_and_delete(fp, comp);
1345 1341
1346 for (al=first_artifactlist; al!=NULL; al=al->next) { 1342 for (al=first_artifactlist; al!=NULL; al=al->next) {
1347 for (art=al->items; art!=NULL; art=art->next) { 1343 for (art=al->items; art!=NULL; art=art->next) {
1348 if (!art->chance) 1344 if (!art->chance)
1349 LOG(llevError,"Warning: artifact with no chance: %s\n", art->item->name); 1345 LOG(llevError,"Warning: artifact with no chance: %s\n", art->item->name);
1350 else 1346 else
1351 al->total_chance += art->chance; 1347 al->total_chance += art->chance;
1352 } 1348 }
1353#if 0 1349#if 0
1354 LOG(llevDebug,"Artifact list type %d has %d total chance\n", 1350 LOG(llevDebug,"Artifact list type %d has %d total chance\n",
1355 al->type, al->total_chance); 1351 al->type, al->total_chance);
1356#endif 1352#endif
1357 } 1353 }
1358 1354
1359 LOG(llevDebug,"done.\n"); 1355 LOG(llevDebug,"done.\n");
1360} 1356}
… …
1368void add_abilities(object *op, object *change) { 1364void add_abilities(object *op, object *change) {
1369 int i,j, tmp; 1365 int i,j, tmp;
1370 1366
1371 if (change->face != blank_face) { 1367 if (change->face != blank_face) {
1372#ifdef TREASURE_VERBOSE 1368#ifdef TREASURE_VERBOSE
1373 LOG(llevDebug, "FACE: %d\n", change->face->number); 1369 LOG(llevDebug, "FACE: %d\n", change->face->number);
1374#endif 1370#endif
1375 op->face = change->face; 1371 op->face = change->face;
1376 } 1372 }
1377 for (i = 0; i < NUM_STATS; i++) 1373 for (i = 0; i < NUM_STATS; i++)
1378 change_attr_value(&(op->stats), i, get_attr_value(&(change->stats), i)); 1374 change_attr_value(&(op->stats), i, get_attr_value(&(change->stats), i));
1379 1375
1380 op->attacktype |= change->attacktype; 1376 op->attacktype |= change->attacktype;
1381 op->path_attuned |= change->path_attuned; 1377 op->path_attuned |= change->path_attuned;
1382 op->path_repelled |= change->path_repelled; 1378 op->path_repelled |= change->path_repelled;
1383 op->path_denied |= change->path_denied; 1379 op->path_denied |= change->path_denied;
… …
1385 op->stats.luck += change->stats.luck; 1381 op->stats.luck += change->stats.luck;
1386 1382
1387 if (QUERY_FLAG(change,FLAG_CURSED)) SET_FLAG(op, FLAG_CURSED); 1383 if (QUERY_FLAG(change,FLAG_CURSED)) SET_FLAG(op, FLAG_CURSED);
1388 if (QUERY_FLAG(change,FLAG_DAMNED)) SET_FLAG(op, FLAG_DAMNED); 1384 if (QUERY_FLAG(change,FLAG_DAMNED)) SET_FLAG(op, FLAG_DAMNED);
1389 if ((QUERY_FLAG(change,FLAG_CURSED) || QUERY_FLAG(change,FLAG_DAMNED)) 1385 if ((QUERY_FLAG(change,FLAG_CURSED) || QUERY_FLAG(change,FLAG_DAMNED))
1390 && op->magic > 0) 1386 && op->magic > 0)
1391 set_abs_magic(op, -op->magic); 1387 set_abs_magic(op, -op->magic);
1392 1388
1393 if (QUERY_FLAG(change,FLAG_LIFESAVE)) SET_FLAG(op,FLAG_LIFESAVE); 1389 if (QUERY_FLAG(change,FLAG_LIFESAVE)) SET_FLAG(op,FLAG_LIFESAVE);
1394 if (QUERY_FLAG(change,FLAG_REFL_SPELL)) SET_FLAG(op,FLAG_REFL_SPELL); 1390 if (QUERY_FLAG(change,FLAG_REFL_SPELL)) SET_FLAG(op,FLAG_REFL_SPELL);
1395 if (QUERY_FLAG(change,FLAG_STEALTH)) SET_FLAG(op,FLAG_STEALTH); 1391 if (QUERY_FLAG(change,FLAG_STEALTH)) SET_FLAG(op,FLAG_STEALTH);
1396 if (QUERY_FLAG(change,FLAG_XRAYS)) SET_FLAG(op,FLAG_XRAYS); 1392 if (QUERY_FLAG(change,FLAG_XRAYS)) SET_FLAG(op,FLAG_XRAYS);
… …
1398 if (QUERY_FLAG(change,FLAG_SEE_IN_DARK)) SET_FLAG(op,FLAG_SEE_IN_DARK); 1394 if (QUERY_FLAG(change,FLAG_SEE_IN_DARK)) SET_FLAG(op,FLAG_SEE_IN_DARK);
1399 if (QUERY_FLAG(change,FLAG_REFL_MISSILE)) SET_FLAG(op,FLAG_REFL_MISSILE); 1395 if (QUERY_FLAG(change,FLAG_REFL_MISSILE)) SET_FLAG(op,FLAG_REFL_MISSILE);
1400 if (QUERY_FLAG(change,FLAG_MAKE_INVIS)) SET_FLAG(op,FLAG_MAKE_INVIS); 1396 if (QUERY_FLAG(change,FLAG_MAKE_INVIS)) SET_FLAG(op,FLAG_MAKE_INVIS);
1401 1397
1402 if (QUERY_FLAG(change,FLAG_STAND_STILL)) { 1398 if (QUERY_FLAG(change,FLAG_STAND_STILL)) {
1403 CLEAR_FLAG(op,FLAG_ANIMATE); 1399 CLEAR_FLAG(op,FLAG_ANIMATE);
1404 /* so artifacts will join */ 1400 /* so artifacts will join */
1405 if(!QUERY_FLAG(op,FLAG_ALIVE)) op->speed = 0.0; 1401 if(!QUERY_FLAG(op,FLAG_ALIVE)) op->speed = 0.0;
1406 update_ob_speed(op); 1402 update_ob_speed(op);
1407 } 1403 }
1408 if(change->nrof) op->nrof=RANDOM()%((int) change->nrof) + 1; 1404 if(change->nrof) op->nrof=RANDOM()%((int) change->nrof) + 1;
1409 op->stats.exp += change->stats.exp; /* Speed modifier */ 1405 op->stats.exp += change->stats.exp; /* Speed modifier */
1410 op->stats.wc += change->stats.wc; 1406 op->stats.wc += change->stats.wc;
1411 op->stats.ac += change->stats.ac; 1407 op->stats.ac += change->stats.ac;
1412 1408
1413 if (change->other_arch) { 1409 if (change->other_arch) {
1414 /* Basically, for horns & potions, the other_arch field is the spell 1410 /* Basically, for horns & potions, the other_arch field is the spell
1415 * to cast. So convert that to into a spell and put it into 1411 * to cast. So convert that to into a spell and put it into
1416 * this object. 1412 * this object.
1417 */ 1413 */
1418 if (op->type == HORN || op->type == POTION) { 1414 if (op->type == HORN || op->type == POTION) {
1419 object *tmp_obj; 1415 object *tmp_obj;
1420 /* Remove any spells this object currently has in it */ 1416 /* Remove any spells this object currently has in it */
1421 while (op->inv) { 1417 while (op->inv) {
1422 tmp_obj = op->inv; 1418 tmp_obj = op->inv;
1423 remove_ob(tmp_obj); 1419 remove_ob(tmp_obj);
1424 free_object(tmp_obj); 1420 free_object(tmp_obj);
1425 } 1421 }
1426 tmp_obj = arch_to_object(change->other_arch); 1422 tmp_obj = arch_to_object(change->other_arch);
1427 insert_ob_in_ob(tmp_obj, op); 1423 insert_ob_in_ob(tmp_obj, op);
1428 } 1424 }
1429 /* No harm setting this for potions/horns */ 1425 /* No harm setting this for potions/horns */
1430 op->other_arch = change->other_arch; 1426 op->other_arch = change->other_arch;
1431 } 1427 }
1432 1428
1433 if (change->stats.hp < 0) 1429 if (change->stats.hp < 0)
1434 op->stats.hp = -change->stats.hp; 1430 op->stats.hp = -change->stats.hp;
1435 else 1431 else
1436 op->stats.hp += change->stats.hp; 1432 op->stats.hp += change->stats.hp;
1437 if (change->stats.maxhp < 0) 1433 if (change->stats.maxhp < 0)
1438 op->stats.maxhp = -change->stats.maxhp; 1434 op->stats.maxhp = -change->stats.maxhp;
1439 else 1435 else
1440 op->stats.maxhp += change->stats.maxhp; 1436 op->stats.maxhp += change->stats.maxhp;
1441 if (change->stats.sp < 0) 1437 if (change->stats.sp < 0)
1442 op->stats.sp = -change->stats.sp; 1438 op->stats.sp = -change->stats.sp;
1443 else 1439 else
1444 op->stats.sp += change->stats.sp; 1440 op->stats.sp += change->stats.sp;
1445 if (change->stats.maxsp < 0) 1441 if (change->stats.maxsp < 0)
1446 op->stats.maxsp = -change->stats.maxsp; 1442 op->stats.maxsp = -change->stats.maxsp;
1447 else 1443 else
1448 op->stats.maxsp += change->stats.maxsp; 1444 op->stats.maxsp += change->stats.maxsp;
1449 if (change->stats.food < 0) 1445 if (change->stats.food < 0)
1450 op->stats.food = -(change->stats.food); 1446 op->stats.food = -(change->stats.food);
1451 else 1447 else
1452 op->stats.food += change->stats.food; 1448 op->stats.food += change->stats.food;
1453 if (change->level < 0) 1449 if (change->level < 0)
1454 op->level = -(change->level); 1450 op->level = -(change->level);
1455 else 1451 else
1456 op->level += change->level; 1452 op->level += change->level;
1457 1453
1458 if (change->gen_sp_armour < 0) 1454 if (change->gen_sp_armour < 0)
1459 op->gen_sp_armour = -(change->gen_sp_armour); 1455 op->gen_sp_armour = -(change->gen_sp_armour);
1460 else 1456 else
1461 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1457 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100;
1462 1458
1463 op->item_power = change->item_power; 1459 op->item_power = change->item_power;
1464 1460
1465 for (i=0; i<NROFATTACKS; i++) { 1461 for (i=0; i<NROFATTACKS; i++) {
1466 if (change->resist[i]) { 1462 if (change->resist[i]) {
1467 op->resist[i] += change->resist[i]; 1463 op->resist[i] += change->resist[i];
1468 } 1464 }
1469 } 1465 }
1470 if (change->stats.dam) { 1466 if (change->stats.dam) {
1471 if (change->stats.dam < 0) 1467 if (change->stats.dam < 0)
1472 op->stats.dam = (-change->stats.dam); 1468 op->stats.dam = (-change->stats.dam);
1473 else if (op->stats.dam) { 1469 else if (op->stats.dam) {
1474 tmp = (signed char) (((int)op->stats.dam * (int)change->stats.dam)/10); 1470 tmp = (signed char) (((int)op->stats.dam * (int)change->stats.dam)/10);
1475 if (tmp == op->stats.dam) { 1471 if (tmp == op->stats.dam) {
1476 if (change->stats.dam < 10) 1472 if (change->stats.dam < 10)
1477 op->stats.dam--; 1473 op->stats.dam--;
1478 else 1474 else
1479 op->stats.dam++; 1475 op->stats.dam++;
1480 } 1476 }
1481 else 1477 else
1482 op->stats.dam = tmp; 1478 op->stats.dam = tmp;
1483 } 1479 }
1484 } 1480 }
1485 if (change->weight) { 1481 if (change->weight) {
1486 if (change->weight < 0) 1482 if (change->weight < 0)
1487 op->weight = (-change->weight); 1483 op->weight = (-change->weight);
1488 else 1484 else
1489 op->weight = (op->weight * (change->weight)) / 100; 1485 op->weight = (op->weight * (change->weight)) / 100;
1490 } 1486 }
1491 if (change->last_sp) { 1487 if (change->last_sp) {
1492 if (change->last_sp < 0) 1488 if (change->last_sp < 0)
1493 op->last_sp = (-change->last_sp); 1489 op->last_sp = (-change->last_sp);
1494 else 1490 else
1495 op->last_sp = (signed char) (((int)op->last_sp * (int)change->last_sp) / (int) 100); 1491 op->last_sp = (signed char) (((int)op->last_sp * (int)change->last_sp) / (int) 100);
1496 } 1492 }
1497 if (change->gen_sp_armour) { 1493 if (change->gen_sp_armour) {
1498 if (change->gen_sp_armour < 0) 1494 if (change->gen_sp_armour < 0)
1499 op->gen_sp_armour = (-change->gen_sp_armour); 1495 op->gen_sp_armour = (-change->gen_sp_armour);
1500 else 1496 else
1501 op->gen_sp_armour = (signed char) (((int)op->gen_sp_armour * ((int)change->gen_sp_armour)) 1497 op->gen_sp_armour = (signed char) (((int)op->gen_sp_armour * ((int)change->gen_sp_armour))
1502 / (int)100); 1498 / (int)100);
1503 } 1499 }
1504 op->value *= change->value; 1500 op->value *= change->value;
1505 1501
1506 if(change->material) op->material = change->material; 1502 if(change->material) op->material = change->material;
1507 1503
1508 if (change->materialname) { 1504 if (change->materialname) {
1509 if (op->materialname) 1505 if (op->materialname)
1510 free_string(op->materialname); 1506 free_string(op->materialname);
1511 op->materialname = add_refcount(change->materialname); 1507 op->materialname = add_refcount(change->materialname);
1512 } 1508 }
1513 1509
1514 if (change->slaying) { 1510 if (change->slaying) {
1515 if (op->slaying) 1511 if (op->slaying)
1516 free_string(op->slaying); 1512 free_string(op->slaying);
1517 op->slaying = add_refcount(change->slaying); 1513 op->slaying = add_refcount(change->slaying);
1518 } 1514 }
1519 if (change->race) { 1515 if (change->race) {
1520 if (op->race) 1516 if (op->race)
1521 free_string(op->race); 1517 free_string(op->race);
1522 op->race = add_refcount(change->race); 1518 op->race = add_refcount(change->race);
1523 } 1519 }
1524 if (change->msg) { 1520 if (change->msg) {
1525 if (op->msg) 1521 if (op->msg)
1526 free_string(op->msg); 1522 free_string(op->msg);
1527 op->msg = add_refcount(change->msg); 1523 op->msg = add_refcount(change->msg);
1528 } 1524 }
1529 /* GROS: Added support for event_... in artifact file */ 1525 /* GROS: Added support for event_... in artifact file */
1530 for(j=0;j<NR_EVENTS;j++) { 1526 for(j=0;j<NR_EVENTS;j++) {
1531 event *evt; 1527 event *evt;
1532 event *evt2; 1528 event *evt2;
1533 event *evtn; 1529 event *evtn;
1534 event *evtp; 1530 event *evtp;
1535 1531
1536 evt = find_event(change,j); 1532 evt = find_event(change,j);
1537 evt2= find_event(op,j); 1533 evt2= find_event(op,j);
1538 1534
1539 if ((evt) && (evt->hook)) { 1535 if ((evt) && (evt->hook)) {
1540 if ((evt2)&&(evt2->hook)) { 1536 if ((evt2)&&(evt2->hook)) {
1541 free_string(evt2->hook); 1537 free_string(evt2->hook);
1542 free_string(evt2->plugin); 1538 free_string(evt2->plugin);
1543 free_string(evt2->options); 1539 free_string(evt2->options);
1544 evtp = NULL; 1540 evtp = NULL;
1545 evtn = evt2->next; 1541 evtn = evt2->next;
1546 if (evt2 == op->events) { 1542 if (evt2 == op->events) {
1547 free(evt2); 1543 free(evt2);
1548 op->events = evtn; 1544 op->events = evtn;
1549 } 1545 }
1550 else { 1546 else {
1551 evtp = op->events; 1547 evtp = op->events;
1552 while (evtp->next != evt2) 1548 while (evtp->next != evt2)
1553 evtp = evtp->next; 1549 evtp = evtp->next;
1554 free(evt2); 1550 free(evt2);
1555 evtp->next = evtn; 1551 evtp->next = evtn;
1556 } 1552 }
1557 } 1553 }
1558 else if (evt2 == NULL) { 1554 else if (evt2 == NULL) {
1559 if (op->events == NULL) { 1555 if (op->events == NULL) {
1560 evt2 = (event *)malloc(sizeof(event)); 1556 evt2 = (event *)malloc(sizeof(event));
1561 op->events = evt2; 1557 op->events = evt2;
1562 } 1558 }
1563 else { 1559 else {
1564 evtp = op->events; 1560 evtp = op->events;
1565 while (evtp->next != NULL) 1561 while (evtp->next != NULL)
1566 evtp = evtp->next; 1562 evtp = evtp->next;
1567 evtp->next = (event *)malloc(sizeof(event)); 1563 evtp->next = (event *)malloc(sizeof(event));
1568 evt2 = evtp->next; 1564 evt2 = evtp->next;
1569 } 1565 }
1570 } 1566 }
1571 evt2->next = NULL; 1567 evt2->next = NULL;
1572 evt2->hook = add_refcount(evt->hook); 1568 evt2->hook = add_refcount(evt->hook);
1573 evt2->plugin = add_refcount(evt->plugin); 1569 evt2->plugin = add_refcount(evt->plugin);
1574 evt2->type = j; 1570 evt2->type = j;
1575 1571
1576 if (evt->options) 1572 if (evt->options)
1577 evt2->options = add_refcount(evt->options); 1573 evt2->options = add_refcount(evt->options);
1578 else 1574 else
1579 evt2->options = NULL; 1575 evt2->options = NULL;
1580 } 1576 }
1581 } 1577 }
1582} 1578}
1583 1579
1584static int legal_artifact_combination(object *op, artifact *art) { 1580static int legal_artifact_combination(object *op, artifact *art) {
1585 int neg, success = 0; 1581 int neg, success = 0;
… …
1629 char identified = QUERY_FLAG(op, FLAG_IDENTIFIED); 1625 char identified = QUERY_FLAG(op, FLAG_IDENTIFIED);
1630 SET_FLAG(op, FLAG_IDENTIFIED); 1626 SET_FLAG(op, FLAG_IDENTIFIED);
1631 LOG(llevDebug, "Generated artifact %s %s [%s]\n", 1627 LOG(llevDebug, "Generated artifact %s %s [%s]\n",
1632 op->name, op->title, describe_item(op, NULL)); 1628 op->name, op->title, describe_item(op, NULL));
1633 if (!identified) 1629 if (!identified)
1634 CLEAR_FLAG(op, FLAG_IDENTIFIED); 1630 CLEAR_FLAG(op, FLAG_IDENTIFIED);
1635 } 1631 }
1636#endif 1632#endif
1637 return; 1633 return;
1638} 1634}
1639 1635
… …
1667 1663
1668 for (art=al->items; art!=NULL; art=art->next) { 1664 for (art=al->items; art!=NULL; art=art->next) {
1669 roll -= art->chance; 1665 roll -= art->chance;
1670 if (roll<0) break; 1666 if (roll<0) break;
1671 } 1667 }
1672 1668
1673 if (art == NULL || roll>=0) { 1669 if (art == NULL || roll>=0) {
1674#if 1 1670#if 1
1675 LOG(llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", 1671 LOG(llevError, "Got null entry and non zero roll in generate_artifact, type %d\n",
1676 op->type); 1672 op->type);
1677#endif 1673#endif
1678 return; 1674 return;
1679 } 1675 }
1680 if (!strcmp(art->item->name,"NONE")) 1676 if (!strcmp(art->item->name,"NONE"))
1681 return; 1677 return;
1682 if (FABS(op->magic) < art->item->magic) 1678 if (FABS(op->magic) < art->item->magic)
1683 continue; /* Not magic enough to be this item */ 1679 continue; /* Not magic enough to be this item */
1684 1680
1685 /* Map difficulty not high enough */ 1681 /* Map difficulty not high enough */
1686 if (difficulty<art->difficulty) 1682 if (difficulty<art->difficulty)
1687 continue; 1683 continue;
1688 1684
1689 if (!legal_artifact_combination(op, art)) { 1685 if (!legal_artifact_combination(op, art)) {
1690#ifdef TREASURE_VERBOSE 1686#ifdef TREASURE_VERBOSE
1691 LOG(llevDebug, "%s of %s was not a legal combination.\n", 1687 LOG(llevDebug, "%s of %s was not a legal combination.\n",
1692 op->name, art->item->name); 1688 op->name, art->item->name);
… …
1706void fix_flesh_item(object *item, object *donor) { 1702void fix_flesh_item(object *item, object *donor) {
1707 char tmpbuf[MAX_BUF]; 1703 char tmpbuf[MAX_BUF];
1708 int i; 1704 int i;
1709 1705
1710 if(item->type==FLESH && donor) { 1706 if(item->type==FLESH && donor) {
1711 /* change the name */ 1707 /* change the name */
1712 sprintf(tmpbuf,"%s's %s",donor->name,item->name); 1708 sprintf(tmpbuf,"%s's %s",donor->name,item->name);
1713 FREE_AND_COPY(item->name, tmpbuf); 1709 FREE_AND_COPY(item->name, tmpbuf);
1714 sprintf(tmpbuf,"%s's %s",donor->name,item->name_pl); 1710 sprintf(tmpbuf,"%s's %s",donor->name,item->name_pl);
1715 FREE_AND_COPY(item->name_pl, tmpbuf); 1711 FREE_AND_COPY(item->name_pl, tmpbuf);
1716 1712
1717 /* weight is FLESH weight/100 * donor */ 1713 /* weight is FLESH weight/100 * donor */
1718 if((item->weight = (signed long) (((double)item->weight/(double)100.0) * (double)donor->weight))==0) 1714 if((item->weight = (signed long) (((double)item->weight/(double)100.0) * (double)donor->weight))==0)
1719 item->weight=1; 1715 item->weight=1;
1720 1716
1721 /* value is multiplied by level of donor */ 1717 /* value is multiplied by level of donor */
1722 item->value *= isqrt(donor->level*2); 1718 item->value *= isqrt(donor->level*2);
1723 1719
1724 /* food value */ 1720 /* food value */
1725 item->stats.food += (donor->stats.hp/100) + donor->stats.Con; 1721 item->stats.food += (donor->stats.hp/100) + donor->stats.Con;
1726 1722
1727 /* flesh items inherit some abilities of donor, but not 1723 /* flesh items inherit some abilities of donor, but not
1728 * full effect. 1724 * full effect.
1729 */ 1725 */
1730 for (i=0; i<NROFATTACKS; i++) 1726 for (i=0; i<NROFATTACKS; i++)
1731 item->resist[i] = donor->resist[i]/2; 1727 item->resist[i] = donor->resist[i]/2;
1732 1728
1733 /* item inherits donor's level (important for quezals) */ 1729 /* item inherits donor's level (important for quezals) */
1734 item->level = donor->level; 1730 item->level = donor->level;
1735 1731
1736 /* if donor has some attacktypes, the flesh is poisonous */ 1732 /* if donor has some attacktypes, the flesh is poisonous */
1737 if(donor->attacktype&AT_POISON) 1733 if(donor->attacktype&AT_POISON)
1738 item->type=POISON; 1734 item->type=POISON;
1739 if(donor->attacktype&AT_ACID) item->stats.hp = -1*item->stats.food; 1735 if(donor->attacktype&AT_ACID) item->stats.hp = -1*item->stats.food;
1740 SET_FLAG(item,FLAG_NO_STEAL); 1736 SET_FLAG(item,FLAG_NO_STEAL);
1741 } 1737 }
1742} 1738}
1743 1739
1744/* special_potion() - so that old potion code is still done right. */ 1740/* special_potion() - so that old potion code is still done right. */
1745 1741
… …
1751 1747
1752 if(op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow 1748 if(op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow
1753 || op->stats.Wis || op->stats.Int || op->stats.Cha ) return 1; 1749 || op->stats.Wis || op->stats.Int || op->stats.Cha ) return 1;
1754 1750
1755 for (i=0; i<NROFATTACKS; i++) 1751 for (i=0; i<NROFATTACKS; i++)
1756 if (op->resist[i]) return 1; 1752 if (op->resist[i]) return 1;
1757 1753
1758 return 0; 1754 return 0;
1759} 1755}
1760 1756
1761void free_treasurestruct(treasure *t) 1757void free_treasurestruct(treasure *t)
1762{ 1758{
1763 if (t->next) free_treasurestruct(t->next); 1759 if (t->next) free_treasurestruct(t->next);
1764 if (t->next_yes) free_treasurestruct(t->next_yes); 1760 if (t->next_yes) free_treasurestruct(t->next_yes);
1765 if (t->next_no) free_treasurestruct(t->next_no); 1761 if (t->next_no) free_treasurestruct(t->next_no);
1766 free(t); 1762 free(t);
1767} 1763}
1768 1764
1769void free_charlinks(linked_char *lc) 1765void free_charlinks(linked_char *lc)
1770{ 1766{
1771 if (lc->next) free_charlinks(lc->next); 1767 if (lc->next) free_charlinks(lc->next);
1772 free(lc); 1768 free(lc);
1773} 1769}
1774 1770
1775void free_artifact(artifact *at) 1771void free_artifact(artifact *at)
1776{ 1772{
1777 1773
1778 if (at->next) free_artifact(at->next); 1774 if (at->next) free_artifact(at->next);
1779 if (at->allowed) free_charlinks(at->allowed); 1775 if (at->allowed) free_charlinks(at->allowed);
1780 if (at->item) { 1776 if (at->item) {
1781 if (at->item->name) free_string(at->item->name); 1777 if (at->item->name) free_string(at->item->name);
1782 if (at->item->name_pl) free_string(at->item->name_pl); 1778 if (at->item->name_pl) free_string(at->item->name_pl);
1783 if (at->item->msg) free_string(at->item->msg); 1779 if (at->item->msg) free_string(at->item->msg);
1784 if (at->item->title) free_string(at->item->title); 1780 if (at->item->title) free_string(at->item->title);
1785 free(at->item); 1781 free(at->item);
1786 } 1782 }
1787 free(at); 1783 free(at);
1788} 1784}
1789 1785
1790void free_artifactlist(artifactlist *al) 1786void free_artifactlist(artifactlist *al)
1791{ 1787{
1792 artifactlist *nextal; 1788 artifactlist *nextal;
1793 for (al=first_artifactlist; al!=NULL; al=nextal) { 1789 for (al=first_artifactlist; al!=NULL; al=nextal) {
1794 nextal=al->next; 1790 nextal=al->next;
1795 if (al->items) { 1791 if (al->items) {
1796 free_artifact(al->items); 1792 free_artifact(al->items);
1797 } 1793 }
1798 free(al); 1794 free(al);
1799 } 1795 }
1800} 1796}
1801 1797
1802void free_all_treasures(void) { 1798void free_all_treasures(void) {
1803treasurelist *tl, *next; 1799treasurelist *tl, *next;
1804 1800
1805 1801
1806 for (tl=first_treasurelist; tl!=NULL; tl=next) { 1802 for (tl=first_treasurelist; tl!=NULL; tl=next) {
1807 next=tl->next; 1803 next=tl->next;
1808 if (tl->name) free_string(tl->name); 1804 if (tl->name) free_string(tl->name);
1809 if (tl->items) free_treasurestruct(tl->items); 1805 if (tl->items) free_treasurestruct(tl->items);
1810 free(tl); 1806 free(tl);
1811 } 1807 }
1812 free_artifactlist(first_artifactlist); 1808 free_artifactlist(first_artifactlist);
1813} 1809}

Diff Legend

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