| … | |
… | |
| 203 | { |
203 | { |
| 204 | for (treasure *t = tl->items; t; t = t->next) |
204 | for (treasure *t = tl->items; t; t = t->next) |
| 205 | { |
205 | { |
| 206 | if (t->next_yes || t->next_no) |
206 | if (t->next_yes || t->next_no) |
| 207 | { |
207 | { |
| 208 | LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); |
208 | LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name); |
| 209 | LOG (llevError, " the next_yes or next_no field is set\n"); |
209 | LOG (llevError, " the next_yes or next_no field is set\n"); |
| 210 | } |
210 | } |
| 211 | |
211 | |
| 212 | tl->total_chance += t->chance; |
212 | tl->total_chance += t->chance; |
| 213 | } |
213 | } |
| … | |
… | |
| 300 | else |
300 | else |
| 301 | LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); |
301 | LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); |
| 302 | } |
302 | } |
| 303 | else |
303 | else |
| 304 | { |
304 | { |
| 305 | if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) |
305 | if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE))) |
| 306 | { |
306 | { |
| 307 | object *tmp = arch_to_object (t->item); |
307 | object *tmp = arch_to_object (t->item); |
| 308 | |
308 | |
| 309 | if (t->nrof && tmp->nrof <= 1) |
309 | if (t->nrof && tmp->nrof <= 1) |
| 310 | tmp->nrof = rndm (t->nrof) + 1; |
310 | tmp->nrof = rndm (t->nrof) + 1; |
| … | |
… | |
| 357 | create_treasure (tl, op, flag, difficulty, tries); |
357 | create_treasure (tl, op, flag, difficulty, tries); |
| 358 | } |
358 | } |
| 359 | else if (t->nrof) |
359 | else if (t->nrof) |
| 360 | create_one_treasure (tl, op, flag, difficulty, tries); |
360 | create_one_treasure (tl, op, flag, difficulty, tries); |
| 361 | } |
361 | } |
| 362 | else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) |
362 | else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE)) |
| 363 | { |
363 | { |
| 364 | if (object *tmp = arch_to_object (t->item)) |
364 | if (object *tmp = arch_to_object (t->item)) |
| 365 | { |
365 | { |
| 366 | if (t->nrof && tmp->nrof <= 1) |
366 | if (t->nrof && tmp->nrof <= 1) |
| 367 | tmp->nrof = rndm (t->nrof) + 1; |
367 | tmp->nrof = rndm (t->nrof) + 1; |
| … | |
… | |
| 572 | |
572 | |
| 573 | op->magic = magic; |
573 | op->magic = magic; |
| 574 | if (op->arch) |
574 | if (op->arch) |
| 575 | { |
575 | { |
| 576 | if (op->type == ARMOUR) |
576 | if (op->type == ARMOUR) |
| 577 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; |
577 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100; |
| 578 | |
578 | |
| 579 | if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ |
579 | if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ |
| 580 | magic = (-magic); |
580 | magic = (-magic); |
| 581 | op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; |
581 | op->weight = (op->arch->weight * (100 - magic * 10)) / 100; |
| 582 | } |
582 | } |
| 583 | else |
583 | else |
| 584 | { |
584 | { |
| 585 | if (op->type == ARMOUR) |
585 | if (op->type == ARMOUR) |
| 586 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; |
586 | ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; |
| … | |
… | |
| 1224 | else |
1224 | else |
| 1225 | { |
1225 | { |
| 1226 | for (i = 0; i < depth; i++) |
1226 | for (i = 0; i < depth; i++) |
| 1227 | fprintf (logfile, " "); |
1227 | fprintf (logfile, " "); |
| 1228 | |
1228 | |
| 1229 | if (t->item && t->item->clone.type == FLESH) |
1229 | if (t->item && t->item->type == FLESH) |
| 1230 | fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); |
1230 | fprintf (logfile, "%s's %s\n", name, &t->item->object::name); |
| 1231 | else |
1231 | else |
| 1232 | fprintf (logfile, "%s\n", &t->item->clone.name); |
1232 | fprintf (logfile, "%s\n", &t->item->object::name); |
| 1233 | } |
1233 | } |
| 1234 | |
1234 | |
| 1235 | if (t->next_yes) |
1235 | if (t->next_yes) |
| 1236 | { |
1236 | { |
| 1237 | for (i = 0; i < depth; i++) |
1237 | for (i = 0; i < depth; i++) |
| … | |
… | |
| 1265 | int found; |
1265 | int found; |
| 1266 | |
1266 | |
| 1267 | found = 0; |
1267 | found = 0; |
| 1268 | fprintf (logfile, "\n"); |
1268 | fprintf (logfile, "\n"); |
| 1269 | |
1269 | |
| 1270 | for (at = first_archetype; at != NULL; at = at->next) |
1270 | for_all_archetypes (at) |
| 1271 | if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) |
1271 | if (!strcasecmp (at->object::name, name) && at->title == NULL) |
| 1272 | { |
1272 | { |
| 1273 | fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); |
1273 | fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname); |
| 1274 | if (at->clone.randomitems != NULL) |
1274 | if (at->randomitems != NULL) |
| 1275 | dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); |
1275 | dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1); |
| 1276 | else |
1276 | else |
| 1277 | fprintf (logfile, "(nothing)\n"); |
1277 | fprintf (logfile, "(nothing)\n"); |
| 1278 | |
1278 | |
| 1279 | fprintf (logfile, "\n"); |
1279 | fprintf (logfile, "\n"); |
| 1280 | found++; |
1280 | found++; |
| … | |
… | |
| 1612 | name = tmp->name + 1, neg = 1; |
1612 | name = tmp->name + 1, neg = 1; |
| 1613 | else |
1613 | else |
| 1614 | name = tmp->name, neg = 0; |
1614 | name = tmp->name, neg = 0; |
| 1615 | |
1615 | |
| 1616 | /* If we match name, then return the opposite of 'neg' */ |
1616 | /* If we match name, then return the opposite of 'neg' */ |
| 1617 | if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) |
1617 | if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname))) |
| 1618 | return !neg; |
1618 | return !neg; |
| 1619 | |
1619 | |
| 1620 | /* Set success as true, since if the match was an inverse, it means |
1620 | /* Set success as true, since if the match was an inverse, it means |
| 1621 | * everything is allowed except what we match |
1621 | * everything is allowed except what we match |
| 1622 | */ |
1622 | */ |
