… | |
… | |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
387 | #endif |
387 | #endif |
388 | } |
388 | } |
389 | |
389 | |
390 | /* Old spellcasting object - need to load in the appropiate object */ |
390 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
391 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
391 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
|
|
392 | if ((type == ROD |
|
|
393 | || type == WAND |
|
|
394 | || type == SCROLL |
|
|
395 | || type == HORN |
|
|
396 | || type == FIREWALL |
392 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
397 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
393 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
398 | || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet. |
|
|
399 | && !inv |
|
|
400 | && !loading_arch |
|
|
401 | && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here! |
|
|
402 | // TODO: at least one watchout-comments is redundant - investigate/remove |
394 | { |
403 | { |
|
|
404 | // TODO: fix firewall object on map |
395 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
405 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
396 | * in that spell was stored in sp. |
406 | * in that spell was stored in sp. |
397 | */ |
407 | */ |
398 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
408 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
399 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
409 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
400 | insert_ob_in_ob (tmp, this); |
410 | insert_ob_in_ob (tmp, this); |
401 | randomitems = NULL; /* So another spell isn't created for this object */ |
411 | randomitems = 0; |
402 | } |
412 | } |
403 | |
413 | |
404 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
414 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
405 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
415 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
406 | { |
416 | { |
407 | LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); |
417 | LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); |
408 | object *tmp = get_archetype_by_object_name (slaying); |
418 | object *tmp = get_archetype_by_object_name (slaying); |
409 | insert_ob_in_ob (tmp, this); |
419 | insert_ob_in_ob (tmp, this); |
410 | randomitems = NULL; /* So another spell isn't created for this object */ |
420 | randomitems = 0; /* So another spell isn't created for this object */ |
411 | /* without this, value is all screwed up */ |
421 | /* without this, value is all screwed up */ |
412 | value = arch->value * inv->value; |
422 | value = arch->value * inv->value; |
413 | } |
423 | } |
414 | |
424 | |
415 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
425 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
… | |
… | |
519 | |
529 | |
520 | bool |
530 | bool |
521 | object::parse_kv (object_thawer &f) |
531 | object::parse_kv (object_thawer &f) |
522 | { |
532 | { |
523 | object *op_inv = inv; |
533 | object *op_inv = inv; |
|
|
534 | key_value *last_kv = key_values; |
524 | |
535 | |
525 | for (;;) |
536 | for (;;) |
526 | { |
537 | { |
527 | switch (f.kw) |
538 | switch (f.kw) |
528 | { |
539 | { |
… | |
… | |
549 | case KW_race: f.get_ornull (race); break; |
560 | case KW_race: f.get_ornull (race); break; |
550 | case KW_slaying: f.get_ornull (slaying); break; |
561 | case KW_slaying: f.get_ornull (slaying); break; |
551 | case KW_tag: f.get_ornull (tag); break; |
562 | case KW_tag: f.get_ornull (tag); break; |
552 | |
563 | |
553 | case KW_arch: |
564 | case KW_arch: |
554 | { |
|
|
555 | object *tmp = object::read (f); |
565 | if (object *tmp = object::read (f)) |
556 | tmp->deactivate (); |
|
|
557 | |
|
|
558 | { |
566 | { |
|
|
567 | tmp->deactivate (); |
|
|
568 | |
559 | // was: insert_ob_in_ob (tmp, op); |
569 | // was: insert_ob_in_ob (tmp, op); |
560 | // but manually adding it can improve map loading times a lot |
570 | // but manually adding it can improve map loading times a lot |
561 | // also, appending instead of prepending keeps the |
571 | // also, appending instead of prepending keeps the |
562 | // save ordering the same between repeated load/saves. |
572 | // save ordering the same between repeated load/saves. |
563 | // and finally we do not want any funny effects |
573 | // and finally we do not want any funny effects |
… | |
… | |
580 | |
590 | |
581 | tmp->below = 0; |
591 | tmp->below = 0; |
582 | tmp->env = this; |
592 | tmp->env = this; |
583 | op_inv = tmp; |
593 | op_inv = tmp; |
584 | } |
594 | } |
585 | } |
595 | else |
|
|
596 | LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); |
|
|
597 | |
586 | continue; |
598 | continue; |
587 | |
599 | |
588 | case KW_other_arch: |
600 | case KW_other_arch: |
589 | if (loading_arch == this) |
601 | if (loading_arch == this) |
590 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
602 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
… | |
… | |
606 | CLEAR_FLAG (this, FLAG_ANIMATE); |
618 | CLEAR_FLAG (this, FLAG_ANIMATE); |
607 | animation_id = 0; |
619 | animation_id = 0; |
608 | |
620 | |
609 | const char *str = f.get_str (); |
621 | const char *str = f.get_str (); |
610 | if (str && (animation_id = find_animation (str))) |
622 | if (str && (animation_id = find_animation (str))) |
611 | SET_FLAG (this, FLAG_ANIMATE); |
623 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
612 | } |
624 | } |
613 | break; |
625 | break; |
614 | |
626 | |
615 | case KW_last_heal: f.get (last_heal); break; |
627 | case KW_last_heal: f.get (last_heal); break; |
616 | case KW_last_sp: f.get (last_sp); break; |
628 | case KW_last_sp: f.get (last_sp); break; |
… | |
… | |
920 | case KW_expmul: f.get (expmul); break; |
932 | case KW_expmul: f.get (expmul); break; |
921 | case KW_glow_radius: f.get (glow_radius); break; |
933 | case KW_glow_radius: f.get (glow_radius); break; |
922 | case KW_weapontype: f.get (weapontype); break; |
934 | case KW_weapontype: f.get (weapontype); break; |
923 | case KW_tooltype: f.get (tooltype); break; |
935 | case KW_tooltype: f.get (tooltype); break; |
924 | case KW_casting_time: f.get (casting_time); break; |
936 | case KW_casting_time: f.get (casting_time); break; |
|
|
937 | |
|
|
938 | // elevation is deprecated |
925 | case KW_elevation: f.get (elevation); break; |
939 | case KW_elevation: break; |
|
|
940 | |
926 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
941 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
927 | case KW_client_type: f.get (client_type); break; |
942 | case KW_client_type: f.get (client_type); break; |
928 | case KW_duration: f.get (duration); break; |
943 | case KW_duration: f.get (duration); break; |
929 | case KW_range: f.get (range); break; |
944 | case KW_range: f.get (range); break; |
930 | case KW_range_modifier: f.get (range_modifier); break; |
945 | case KW_range_modifier: f.get (range_modifier); break; |
… | |
… | |
987 | |
1002 | |
988 | f.next (); |
1003 | f.next (); |
989 | return true; |
1004 | return true; |
990 | |
1005 | |
991 | case KW_ERROR: |
1006 | case KW_ERROR: |
992 | set_ob_key_value (this, f.kw_str, f.value, true); |
1007 | // append as key value pair (do not use kv_set as it prepends) |
|
|
1008 | // we also do not even try to find old values, duplicate keys stay duplicate |
|
|
1009 | { |
|
|
1010 | key_value *kv = new key_value; |
|
|
1011 | |
|
|
1012 | kv->next = 0; |
|
|
1013 | kv->key = shstr (f.kw_str); |
|
|
1014 | kv->value = shstr (f.value); |
|
|
1015 | |
|
|
1016 | if (!last_kv) |
|
|
1017 | key_values = last_kv = kv; |
|
|
1018 | else |
|
|
1019 | { |
|
|
1020 | while (last_kv->next) |
|
|
1021 | last_kv = last_kv->next; |
|
|
1022 | |
|
|
1023 | last_kv->next = kv; |
|
|
1024 | last_kv = kv; |
|
|
1025 | } |
|
|
1026 | } |
993 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1027 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
994 | break; |
1028 | break; |
995 | |
1029 | |
996 | default: |
1030 | default: |
997 | if (!f.parse_error ("object", name)) |
1031 | if (!f.parse_error ("object", name)) |
… | |
… | |
1240 | /* 110 */ |
1274 | /* 110 */ |
1241 | KW_destroy_on_death, |
1275 | KW_destroy_on_death, |
1242 | KW_NULL, |
1276 | KW_NULL, |
1243 | }; |
1277 | }; |
1244 | |
1278 | |
1245 | int i; |
|
|
1246 | |
|
|
1247 | /* This saves the key/value lists. We do it first so that any |
1279 | /* This saves the key/value lists. We do it first so that any |
1248 | * keys that match field names will be overwritten by the loader. |
1280 | * keys that match field names will be overwritten by the loader. |
1249 | */ |
1281 | */ |
1250 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1282 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1251 | { |
1283 | if (!tmp->key_values || tmp->kv (kv->key) != kv->value) |
1252 | /* Find the field in the opposing member. */ |
1284 | f.put (kv->key, kv->value); |
1253 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
|
|
1254 | |
|
|
1255 | /* If there's no partnering field, or it's got a different value, save our field. */ |
|
|
1256 | if (!arch_field || my_field->value != arch_field->value) |
|
|
1257 | f.put (my_field->key, my_field->value); |
|
|
1258 | } |
|
|
1259 | |
1285 | |
1260 | /* We don't need to worry about the arch's extra fields - they |
1286 | /* We don't need to worry about the arch's extra fields - they |
1261 | * will get taken care of the copy_to method. |
1287 | * will get taken care of the copy_to method. |
1262 | */ |
1288 | */ |
1263 | |
1289 | |
… | |
… | |
1286 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1312 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1287 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1313 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1288 | |
1314 | |
1289 | if (op->animation_id != tmp->animation_id) |
1315 | if (op->animation_id != tmp->animation_id) |
1290 | if (op->animation_id) |
1316 | if (op->animation_id) |
|
|
1317 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
|
|
1318 | else |
1291 | { |
1319 | { |
1292 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1320 | f.put (KW_animation, (const char *)0); |
1293 | |
1321 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1294 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
|
|
1295 | f.put (KW_is_animated, (sint32)0); |
|
|
1296 | } |
1322 | } |
1297 | else |
|
|
1298 | f.put (KW_animation, (const char *)0); |
|
|
1299 | |
1323 | |
1300 | CMP_OUT2 (str, stats.Str); |
1324 | CMP_OUT2 (str, stats.Str); |
1301 | CMP_OUT2 (dex, stats.Dex); |
1325 | CMP_OUT2 (dex, stats.Dex); |
1302 | CMP_OUT2 (con, stats.Con); |
1326 | CMP_OUT2 (con, stats.Con); |
1303 | CMP_OUT2 (wis, stats.Wis); |
1327 | CMP_OUT2 (wis, stats.Wis); |
… | |
… | |
1333 | CMP_OUT (direction); |
1357 | CMP_OUT (direction); |
1334 | CMP_OUT (type); |
1358 | CMP_OUT (type); |
1335 | CMP_OUT (subtype); |
1359 | CMP_OUT (subtype); |
1336 | CMP_OUT (attacktype); |
1360 | CMP_OUT (attacktype); |
1337 | |
1361 | |
1338 | for (i = 0; i < NROFATTACKS; i++) |
1362 | for (int i = 0; i < NROFATTACKS; i++) |
1339 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1363 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1340 | f.put (resist_save[i], op->resist[i]); |
1364 | f.put (resist_save[i], op->resist[i]); |
1341 | |
1365 | |
1342 | CMP_OUT (path_attuned); |
1366 | CMP_OUT (path_attuned); |
1343 | CMP_OUT (path_repelled); |
1367 | CMP_OUT (path_repelled); |
… | |
… | |
1354 | CMP_OUT (last_sp); |
1378 | CMP_OUT (last_sp); |
1355 | CMP_OUT (last_grace); |
1379 | CMP_OUT (last_grace); |
1356 | CMP_OUT (last_eat); |
1380 | CMP_OUT (last_eat); |
1357 | CMP_OUT (glow_radius); |
1381 | CMP_OUT (glow_radius); |
1358 | |
1382 | |
1359 | if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) |
1383 | if (op->flag [FLAG_IS_LINKED]) |
|
|
1384 | if (int i = get_button_value (op)) |
1360 | f.put (KW_connected, i); |
1385 | f.put (KW_connected, i); |
1361 | |
1386 | |
1362 | CMP_OUT (randomitems); |
1387 | CMP_OUT (randomitems); |
1363 | CMP_OUT2 (container, weight_limit); |
1388 | CMP_OUT2 (container, weight_limit); |
1364 | |
1389 | |
1365 | CMP_OUT (run_away); |
1390 | CMP_OUT (run_away); |
1366 | CMP_OUT (pick_up); |
1391 | CMP_OUT (pick_up); |
1367 | CMP_OUT (will_apply); |
1392 | CMP_OUT (will_apply); |
1368 | CMP_OUT (smoothlevel); |
1393 | CMP_OUT (smoothlevel); |
1369 | CMP_OUT (weapontype); |
1394 | CMP_OUT (weapontype); |
1370 | CMP_OUT (tooltype); |
1395 | CMP_OUT (tooltype); |
1371 | CMP_OUT (elevation); |
|
|
1372 | CMP_OUT (client_type); |
1396 | CMP_OUT (client_type); |
1373 | CMP_OUT (item_power); |
1397 | CMP_OUT (item_power); |
1374 | CMP_OUT (duration); |
1398 | CMP_OUT (duration); |
1375 | CMP_OUT (range); |
1399 | CMP_OUT (range); |
1376 | CMP_OUT (range_modifier); |
1400 | CMP_OUT (range_modifier); |
… | |
… | |
1385 | CMP_OUT (move_off); |
1409 | CMP_OUT (move_off); |
1386 | CMP_OUT (move_slow); |
1410 | CMP_OUT (move_slow); |
1387 | CMP_OUT (move_slow_penalty); |
1411 | CMP_OUT (move_slow_penalty); |
1388 | |
1412 | |
1389 | if (op->flag != tmp->flag) |
1413 | if (op->flag != tmp->flag) |
1390 | for (i = 0; i <= NUM_FLAGS; i++) |
1414 | for (int i = 0; i <= NUM_FLAGS; i++) |
1391 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1415 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1392 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1416 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1393 | |
1417 | |
1394 | // save body locations |
1418 | // save body locations |
1395 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1419 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1396 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1420 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1397 | f.put (body_locations[i].save_name, op->slot[i].info); |
1421 | f.put (body_locations[i].save_name, op->slot[i].info); |
1398 | } |
1422 | } |
1399 | |
1423 | |
1400 | /* |
1424 | /* |