| … | |
… | |
| 24 | |
24 | |
| 25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
| 26 | sub/add_weight will transcend the environment updating the carrying |
26 | sub/add_weight will transcend the environment updating the carrying |
| 27 | variable. */ |
27 | variable. */ |
| 28 | |
28 | |
| 29 | |
|
|
| 30 | #include <global.h> |
29 | #include <global.h> |
| 31 | #include <loader.h> |
30 | #include <loader.h> |
| 32 | #include <sproto.h> |
31 | #include <sproto.h> |
| 33 | |
32 | |
| 34 | // future resource loader base class |
33 | ///////////////////////////////////////////////////////////////////////////// |
| 35 | struct loader_base |
|
|
| 36 | { |
|
|
| 37 | virtual archetype *get_arch (const char *name); |
|
|
| 38 | virtual void put_arch (archetype *arch); |
|
|
| 39 | |
|
|
| 40 | virtual object *get_object (const char *name); |
|
|
| 41 | virtual void put_object (object *op); |
|
|
| 42 | |
|
|
| 43 | virtual player *get_player (); |
|
|
| 44 | virtual void put_player (player *pl); |
|
|
| 45 | |
|
|
| 46 | virtual region *get_region (); |
|
|
| 47 | virtual void put_region (region *region); |
|
|
| 48 | |
|
|
| 49 | virtual facetile *get_face (const char *name); |
|
|
| 50 | virtual void put_face (facetile *face); |
|
|
| 51 | |
|
|
| 52 | virtual treasurelist *get_treasure (const char *name, bool one = false); |
|
|
| 53 | virtual void put_treasure (treasurelist *treasure); |
|
|
| 54 | |
|
|
| 55 | virtual animation *get_animation (const char *name); |
|
|
| 56 | virtual void put_animation (animation *anim); |
|
|
| 57 | }; |
|
|
| 58 | |
|
|
| 59 | // future generic resource loader |
|
|
| 60 | // handles generic stuff valid in most files, such as |
|
|
| 61 | // animations, treasures, faces and so on |
|
|
| 62 | struct loader_generic : loader_base |
|
|
| 63 | { |
|
|
| 64 | virtual region *get_region (); |
|
|
| 65 | virtual void put_region (region *region); |
|
|
| 66 | |
|
|
| 67 | virtual facetile *get_face (const char *name); |
|
|
| 68 | virtual void put_face (facetile *face); |
|
|
| 69 | |
|
|
| 70 | virtual treasurelist *get_treasure (const char *name, bool one = false); |
|
|
| 71 | virtual void put_treasure (treasurelist *treasure); |
|
|
| 72 | |
|
|
| 73 | virtual animation *get_animation (const char *name); |
|
|
| 74 | virtual void put_animation (animation *anim); |
|
|
| 75 | }; |
|
|
| 76 | |
34 | |
| 77 | /* Maps the MOVE_* values to names */ |
35 | /* Maps the MOVE_* values to names */ |
| 78 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
36 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
| 79 | |
37 | |
| 80 | /* This table is only necessary to convert objects that existed before the |
38 | /* This table is only necessary to convert objects that existed before the |
| … | |
… | |
| 305 | * to check for objects to make sure there are no common errors. |
263 | * to check for objects to make sure there are no common errors. |
| 306 | */ |
264 | */ |
| 307 | static void |
265 | static void |
| 308 | check_loaded_object (object *op) |
266 | check_loaded_object (object *op) |
| 309 | { |
267 | { |
| 310 | int ip; |
|
|
| 311 | |
|
|
| 312 | /* We do some specialised handling to handle legacy cases of name_pl. |
268 | /* We do some specialised handling to handle legacy cases of name_pl. |
| 313 | * If the object doesn't have a name_pl, we just use the object name - |
269 | * If the object doesn't have a name_pl, we just use the object name - |
| 314 | * this isn't perfect (things won't be properly pluralised), but works to |
270 | * this isn't perfect (things won't be properly pluralised), but works to |
| 315 | * that degree (5 heart is still quite understandable). But the case we |
271 | * that degree (5 heart is still quite understandable). But the case we |
| 316 | * also have to catch is if this object is not using the normal name for |
272 | * also have to catch is if this object is not using the normal name for |
| 317 | * the object. In that case, we also want to use the loaded name. |
273 | * the object. In that case, we also want to use the loaded name. |
| 318 | * Otherwise, what happens is that the the plural name will lose |
274 | * Otherwise, what happens is that the the plural name will lose |
| 319 | * information (appear as just 'hearts' and not 'goblins heart') |
275 | * information (appear as just 'hearts' and not 'goblins heart') |
| 320 | */ |
276 | */ |
| 321 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
277 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
| 322 | op->name_pl = NULL; |
278 | op->name_pl = 0; |
| 323 | |
279 | |
| 324 | if (!op->name_pl) |
280 | if (!op->name_pl) |
| 325 | op->name_pl = op->name; |
281 | op->name_pl = op->name; |
| 326 | |
282 | |
| 327 | /* objects now have a materialname. try to patch it in */ |
283 | /* objects now have a materialname. try to patch it in */ |
| … | |
… | |
| 330 | if (op->map != NULL) |
286 | if (op->map != NULL) |
| 331 | set_materialname (op, op->map->difficulty, NULL); |
287 | set_materialname (op, op->map->difficulty, NULL); |
| 332 | else |
288 | else |
| 333 | set_materialname (op, 5, NULL); |
289 | set_materialname (op, 5, NULL); |
| 334 | } |
290 | } |
|
|
291 | |
| 335 | /* only do these when program is first run - a bit |
292 | /* only do these when program is first run - a bit |
| 336 | * excessive to do this at every run - most of this is |
293 | * excessive to do this at every run - most of this is |
| 337 | * really just to catch any errors - program will still run, but |
294 | * really just to catch any errors - program will still run, but |
| 338 | * not in the ideal fashion. |
295 | * not in the ideal fashion. |
| 339 | */ |
296 | */ |
| 340 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
297 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
| 341 | { |
298 | { |
| 342 | if (!op->skill) |
299 | if (!op->skill) |
| 343 | { |
|
|
| 344 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
300 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
| 345 | } |
|
|
| 346 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
301 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
| 347 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
302 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
| 348 | { |
|
|
| 349 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); |
303 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); |
| 350 | } |
|
|
| 351 | } |
304 | } |
| 352 | |
305 | |
| 353 | /* We changed last_heal to gen_sp_armour, which is what it |
306 | /* We changed last_heal to gen_sp_armour, which is what it |
| 354 | * really does for many objects. Need to catch any in maps |
307 | * really does for many objects. Need to catch any in maps |
| 355 | * that may have an old value. |
308 | * that may have an old value. |
| 356 | */ |
309 | */ |
| 357 | if ((op->type == WEAPON) || |
310 | if (op->type == WEAPON |
| 358 | (op->type == ARMOUR) || (op->type == HELMET) || |
311 | || op->type == ARMOUR || op->type == HELMET |
| 359 | (op->type == SHIELD) || (op->type == RING) || |
312 | || op->type == SHIELD || op->type == RING |
| 360 | (op->type == BOOTS) || (op->type == GLOVES) || |
313 | || op->type == BOOTS || op->type == GLOVES |
| 361 | (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) |
314 | || op->type == AMULET || op->type == GIRDLE |
|
|
315 | || op->type == BRACERS || op->type == CLOAK) |
| 362 | { |
316 | { |
| 363 | if (op->last_heal) |
317 | if (op->last_heal) |
| 364 | { |
318 | { |
| 365 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
319 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
| 366 | op->gen_sp_armour = op->last_heal; |
320 | op->gen_sp_armour = op->last_heal; |
| 367 | op->last_heal = 0; |
321 | op->last_heal = 0; |
| 368 | } |
322 | } |
| 369 | |
323 | |
| 370 | ip = calc_item_power (op, 0); |
324 | int ip = calc_item_power (op, 0); |
|
|
325 | |
| 371 | /* Legacy objects from before item power was in the game */ |
326 | /* Legacy objects from before item power was in the game */ |
| 372 | if (!op->item_power && ip) |
327 | if (!op->item_power && ip) |
| 373 | { |
328 | { |
| 374 | if (ip > 3) |
329 | if (ip > 3) |
| 375 | { |
|
|
| 376 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
330 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
| 377 | } |
331 | |
| 378 | op->item_power = ip; |
332 | op->item_power = ip; |
| 379 | } |
333 | } |
|
|
334 | |
| 380 | /* Check for possibly bogus values. Has to meet both these criteria - |
335 | /* Check for possibly bogus values. Has to meet both these criteria - |
| 381 | * something that has item_power 1 is probably just fine if our calculated |
336 | * something that has item_power 1 is probably just fine if our calculated |
| 382 | * value is 1 or 2 - these values are small enough that hard to be precise. |
337 | * value is 1 or 2 - these values are small enough that hard to be precise. |
| 383 | * similarly, it item_power is 0, the first check will always pass, |
338 | * similarly, it item_power is 0, the first check will always pass, |
| 384 | * but not the second one. |
339 | * but not the second one. |
| 385 | */ |
340 | */ |
| 386 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
341 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
| 387 | { |
|
|
| 388 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); |
342 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); |
| 389 | } |
|
|
| 390 | |
|
|
| 391 | } |
343 | } |
|
|
344 | |
| 392 | /* Old spellcasting object - need to load in the appropiate object */ |
345 | /* Old spellcasting object - need to load in the appropiate object */ |
| 393 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
346 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
| 394 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
347 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
| 395 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
348 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
| 396 | { |
349 | { |
| 397 | object *tmp; |
|
|
| 398 | |
|
|
| 399 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
350 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
| 400 | * in that spell was stored in sp. |
351 | * in that spell was stored in sp. |
| 401 | */ |
352 | */ |
| 402 | tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
353 | object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
| 403 | insert_ob_in_ob (tmp, op); |
354 | insert_ob_in_ob (tmp, op); |
| 404 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
355 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
| 405 | } |
356 | } |
|
|
357 | |
| 406 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
358 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
| 407 | |
|
|
| 408 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
359 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
| 409 | { |
360 | { |
| 410 | object *tmp; |
|
|
| 411 | |
|
|
| 412 | tmp = get_archetype_by_object_name (op->slaying); |
361 | object *tmp = get_archetype_by_object_name (op->slaying); |
| 413 | insert_ob_in_ob (tmp, op); |
362 | insert_ob_in_ob (tmp, op); |
| 414 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
363 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
| 415 | /* without this, value is all screwed up */ |
364 | /* without this, value is all screwed up */ |
| 416 | op->value = op->arch->clone.value * op->inv->value; |
365 | op->value = op->arch->clone.value * op->inv->value; |
| 417 | } |
366 | } |
| … | |
… | |
| 453 | { |
402 | { |
| 454 | op->move_type = MOVE_ALL; |
403 | op->move_type = MOVE_ALL; |
| 455 | op->stats.maxhp = 0; |
404 | op->stats.maxhp = 0; |
| 456 | } |
405 | } |
| 457 | else |
406 | else |
| 458 | { |
|
|
| 459 | op->move_type = MOVE_WALK; |
407 | op->move_type = MOVE_WALK; |
| 460 | } |
|
|
| 461 | } |
408 | } |
| 462 | } |
409 | } |
| 463 | |
410 | |
| 464 | } |
411 | } |
| 465 | |
412 | |
| … | |
… | |
| 539 | bool ismore = 0; |
486 | bool ismore = 0; |
| 540 | object *op_inv = op->inv; |
487 | object *op_inv = op->inv; |
| 541 | |
488 | |
| 542 | for (;;) |
489 | for (;;) |
| 543 | { |
490 | { |
| 544 | keyword kw = thawer.get_kv (); |
491 | switch (thawer.get_kv ()) |
| 545 | |
|
|
| 546 | switch (kw) |
|
|
| 547 | { |
492 | { |
| 548 | case KW_Object: // uppercase alias |
493 | case KW_Object: // uppercase alias |
| 549 | case KW_object: |
494 | case KW_object: |
| 550 | thawer.get (op->name); |
495 | thawer.get (op->name); |
| 551 | |
496 | |
| … | |
… | |
| 602 | tmp = arch_to_object (arch); |
547 | tmp = arch_to_object (arch); |
| 603 | else |
548 | else |
| 604 | { |
549 | { |
| 605 | tmp = object::create (); |
550 | tmp = object::create (); |
| 606 | /* record the name of the broken object */ |
551 | /* record the name of the broken object */ |
|
|
552 | //TODO: but do not log??? |
| 607 | tmp->name = str; |
553 | tmp->name = str; |
| 608 | } |
554 | } |
| 609 | |
555 | |
| 610 | // decativate the object we, as we are still going |
556 | // decativate the object we, as we are still going |
| 611 | // to read the speed value. Objects should be activated |
557 | // to read the speed value. Objects should be activated |
| … | |
… | |
| 669 | op->other_arch = archetype::find (thawer.get_str ()); |
615 | op->other_arch = archetype::find (thawer.get_str ()); |
| 670 | break; |
616 | break; |
| 671 | |
617 | |
| 672 | case KW_animation: |
618 | case KW_animation: |
| 673 | { |
619 | { |
|
|
620 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
621 | op->animation_id = 0; |
|
|
622 | |
| 674 | const char *str = thawer.get_str (); |
623 | const char *str = thawer.get_str (); |
| 675 | |
|
|
| 676 | if (!str) |
|
|
| 677 | { |
|
|
| 678 | op->animation_id = 0; |
|
|
| 679 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
| 680 | } |
|
|
| 681 | else if ((op->animation_id = find_animation (str))) |
624 | if (str && (op->animation_id = find_animation (str))) |
| 682 | SET_FLAG (op, FLAG_ANIMATE); |
625 | SET_FLAG (op, FLAG_ANIMATE); |
| 683 | } |
626 | } |
| 684 | |
|
|
| 685 | break; |
627 | break; |
| 686 | |
628 | |
| 687 | case KW_last_heal: thawer.get (op->last_heal); break; |
629 | case KW_last_heal: thawer.get (op->last_heal); break; |
| 688 | case KW_last_sp: thawer.get (op->last_sp); break; |
630 | case KW_last_sp: thawer.get (op->last_sp); break; |
| 689 | case KW_last_grace: thawer.get (op->last_grace); break; |
631 | case KW_last_grace: thawer.get (op->last_grace); break; |
| … | |
… | |
| 754 | case KW_path_denied: thawer.get (op->path_denied); break; |
696 | case KW_path_denied: thawer.get (op->path_denied); break; |
| 755 | case KW_invisible: thawer.get (op->invisible); break; |
697 | case KW_invisible: thawer.get (op->invisible); break; |
| 756 | case KW_magic: thawer.get (op->magic); break; |
698 | case KW_magic: thawer.get (op->magic); break; |
| 757 | case KW_state: thawer.get (op->state); break; |
699 | case KW_state: thawer.get (op->state); break; |
| 758 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
700 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
| 759 | case KW_material: thawer.get (op->material); break; |
701 | case KW_material: thawer.get (op->materials); break; //TODO: nuke |
| 760 | case KW_materialname: thawer.get (op->materialname); break; |
702 | case KW_materialname: thawer.get (op->materialname); break; |
| 761 | |
703 | |
| 762 | /* These are the new values */ |
704 | /* These are the new values */ |
| 763 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
705 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
| 764 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
706 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
| … | |
… | |
| 1026 | add_button_link (op, op->map, thawer.get_sint32 ()); |
968 | add_button_link (op, op->map, thawer.get_sint32 ()); |
| 1027 | break; |
969 | break; |
| 1028 | |
970 | |
| 1029 | case KW_randomitems: |
971 | case KW_randomitems: |
| 1030 | op->randomitems = find_treasurelist (thawer.get_str ()); |
972 | op->randomitems = find_treasurelist (thawer.get_str ()); |
|
|
973 | //if (!op->randomitems) |
|
|
974 | // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ()); |
| 1031 | break; |
975 | break; |
| 1032 | |
976 | |
| 1033 | case KW_msg: |
977 | case KW_msg: |
| 1034 | thawer.get_ml (KW_endmsg, op->msg); |
978 | thawer.get_ml (KW_endmsg, op->msg); |
| 1035 | //TODO: allow longer messages |
979 | //TODO: allow longer messages |
| … | |
… | |
| 1073 | |
1017 | |
| 1074 | case KW_EOF: |
1018 | case KW_EOF: |
| 1075 | return LL_EOF; |
1019 | return LL_EOF; |
| 1076 | |
1020 | |
| 1077 | case KW_ERROR: |
1021 | case KW_ERROR: |
| 1078 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1022 | set_ob_key_value (op, thawer.kw_str, thawer.value, true); |
| 1079 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1023 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.kw_str, thawer.value);//D |
| 1080 | break; |
1024 | break; |
| 1081 | |
1025 | |
| 1082 | default: |
1026 | default: |
| 1083 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1027 | if (!thawer.parse_error ("object", op->name)) |
|
|
1028 | return false; |
| 1084 | break; |
1029 | break; |
| 1085 | } |
1030 | } |
| 1086 | } |
1031 | } |
| 1087 | } |
1032 | } |
| 1088 | |
1033 | |
| … | |
… | |
| 1422 | f.put (resist_save[i], op->resist[i]); |
1367 | f.put (resist_save[i], op->resist[i]); |
| 1423 | |
1368 | |
| 1424 | CMP_OUT (path_attuned); |
1369 | CMP_OUT (path_attuned); |
| 1425 | CMP_OUT (path_repelled); |
1370 | CMP_OUT (path_repelled); |
| 1426 | CMP_OUT (path_denied); |
1371 | CMP_OUT (path_denied); |
| 1427 | CMP_OUT (material); |
1372 | CMP_OUT2 (material, materials);//TODO: nuke |
| 1428 | CMP_OUT (materialname); |
1373 | CMP_OUT (materialname); |
| 1429 | CMP_OUT (value); |
1374 | CMP_OUT (value); |
| 1430 | CMP_OUT (carrying); |
1375 | CMP_OUT (carrying); |
| 1431 | CMP_OUT (weight); |
1376 | CMP_OUT (weight); |
| 1432 | CMP_OUT (invisible); |
1377 | CMP_OUT (invisible); |
| … | |
… | |
| 1509 | |
1454 | |
| 1510 | fp.put (op); |
1455 | fp.put (op); |
| 1511 | fp.put (KW_end); |
1456 | fp.put (KW_end); |
| 1512 | } |
1457 | } |
| 1513 | |
1458 | |
|
|
1459 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1460 | |
|
|
1461 | bool load_resource_file (const char *filename) |
|
|
1462 | { |
|
|
1463 | object_thawer f (filename); |
|
|
1464 | |
|
|
1465 | f.next_kv (); |
|
|
1466 | |
|
|
1467 | for (;;) |
|
|
1468 | { |
|
|
1469 | switch (f.kw) |
|
|
1470 | { |
|
|
1471 | case KW_region: |
|
|
1472 | if (!region::load (f)) |
|
|
1473 | return false; |
|
|
1474 | break; |
|
|
1475 | |
|
|
1476 | case KW_EOF: |
|
|
1477 | return true; |
|
|
1478 | |
|
|
1479 | default: |
|
|
1480 | if (!f.parse_error ("resource file")) |
|
|
1481 | return false; |
|
|
1482 | } |
|
|
1483 | |
|
|
1484 | f.next_kv (); |
|
|
1485 | } |
|
|
1486 | } |
|
|
1487 | |
