| … | |
… | |
| 641 | case KW_sky: thawer.get (sky); break; |
641 | case KW_sky: thawer.get (sky); break; |
| 642 | |
642 | |
| 643 | case KW_per_player: thawer.get (per_player); break; |
643 | case KW_per_player: thawer.get (per_player); break; |
| 644 | case KW_per_party: thawer.get (per_party); break; |
644 | case KW_per_party: thawer.get (per_party); break; |
| 645 | case KW_no_reset: thawer.get (no_reset); break; |
645 | case KW_no_reset: thawer.get (no_reset); break; |
|
|
646 | case KW_no_drop: thawer.get (no_drop); break; |
| 646 | |
647 | |
| 647 | case KW_region: default_region = region::find (thawer.get_str ()); break; |
648 | case KW_region: default_region = region::find (thawer.get_str ()); break; |
| 648 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
649 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
| 649 | |
650 | |
| 650 | // old names new names |
651 | // old names new names |
| … | |
… | |
| 724 | MAP_OUT (swap_time); |
725 | MAP_OUT (swap_time); |
| 725 | MAP_OUT (reset_time); |
726 | MAP_OUT (reset_time); |
| 726 | MAP_OUT (reset_timeout); |
727 | MAP_OUT (reset_timeout); |
| 727 | MAP_OUT (fixed_resettime); |
728 | MAP_OUT (fixed_resettime); |
| 728 | MAP_OUT (no_reset); |
729 | MAP_OUT (no_reset); |
|
|
730 | MAP_OUT (no_drop); |
| 729 | MAP_OUT (difficulty); |
731 | MAP_OUT (difficulty); |
| 730 | |
732 | |
| 731 | if (default_region) MAP_OUT2 (region, default_region->name); |
733 | if (default_region) MAP_OUT2 (region, default_region->name); |
| 732 | |
734 | |
| 733 | if (shopitems) |
735 | if (shopitems) |
| … | |
… | |
| 981 | |
983 | |
| 982 | if (QUERY_FLAG (op, FLAG_GENERATOR)) |
984 | if (QUERY_FLAG (op, FLAG_GENERATOR)) |
| 983 | { |
985 | { |
| 984 | total_exp += op->stats.exp; |
986 | total_exp += op->stats.exp; |
| 985 | |
987 | |
| 986 | if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) |
988 | if (archetype *at = op->other_arch) |
|
|
989 | { |
| 987 | total_exp += at->stats.exp * 8; |
990 | total_exp += at->stats.exp * 8; |
| 988 | |
|
|
| 989 | monster_cnt++; |
991 | monster_cnt++; |
|
|
992 | } |
|
|
993 | |
|
|
994 | for (object *inv = op->inv; inv; inv = inv->below) |
|
|
995 | { |
|
|
996 | total_exp += op->stats.exp * 8; |
|
|
997 | monster_cnt++; |
|
|
998 | } |
| 990 | } |
999 | } |
| 991 | } |
1000 | } |
| 992 | |
1001 | |
| 993 | avgexp = (double) total_exp / monster_cnt; |
1002 | avgexp = (double) total_exp / monster_cnt; |
| 994 | |
1003 | |
