diff --git a/src/Map.cc b/src/Map.cc index c3240040..22eabf03 100644 --- a/src/Map.cc +++ b/src/Map.cc @@ -52,13 +52,14 @@ const BattleParamsIndex::Entry& BattleParamsIndex::get( -PSOEnemy::PSOEnemy(uint64_t id) : PSOEnemy(id, 0, 0, 0, "__missing__") { } +PSOEnemy::PSOEnemy(uint64_t id) : PSOEnemy(id, 0, 0, 0, 0, "__missing__") { } PSOEnemy::PSOEnemy( uint64_t id, uint16_t source_type, uint32_t experience, uint32_t rt_index, + size_t num_clones, const char* type_name) : id(id), source_type(source_type), @@ -66,11 +67,12 @@ PSOEnemy::PSOEnemy( last_hit(0), experience(experience), rt_index(rt_index), + num_clones(num_clones), type_name(type_name) { } string PSOEnemy::str() const { - return string_printf("[Enemy E-%" PRIX64 " \"%s\" source_type=%hX hit=%02hhX/%hu exp=%" PRIu32 " rt_index=%" PRIX32 "]", - this->id, this->type_name, this->source_type, this->hit_flags, this->last_hit, this->experience, this->rt_index); + return string_printf("[Enemy E-%" PRIX64 " \"%s\" source_type=%hX hit=%02hhX/%hu exp=%" PRIu32 " rt_index=%" PRIX32 " clones=%zu]", + this->id, this->type_name, this->source_type, this->hit_flags, this->last_hit, this->experience, this->rt_index, this->num_clones); } @@ -110,317 +112,284 @@ vector parse_map( } }; - auto get_battle_params = [&](uint8_t type) -> const BattleParamsIndex::Entry& { - return battle_params->get(is_solo, episode, difficulty, type); + auto create_enemy = [&]( + const EnemyEntry& e, + ssize_t bp_index, + uint32_t rt_index, + const char* type_name) { + const BattleParamsIndex::Entry& bp_entry = battle_params->get( + is_solo, episode, difficulty, bp_index); + enemies.emplace_back( + next_enemy_id++, + e.base, + bp_entry.experience, + rt_index, + e.num_clones, + type_name); }; for (size_t y = 0; y < entry_count; y++) { const auto& e = map[y]; - size_t num_clones = e.num_clones; switch (e.base) { case 0x40: // Hildebear and Hildetorr - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x49 + (e.skin & 0x01)).experience, - 0x01 + (e.skin & 0x01), "Hilde(bear|torr)"); + create_enemy(e, 0x49 + (e.skin & 0x01), 0x01 + (e.skin & 0x01), "Hilde(bear|torr)"); break; case 0x41: // Rappies if (episode == 3) { // Del Rappy and Sand Rappy if (alt_enemies) { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x17 + (e.skin & 0x01)).experience, - 17 + (e.skin & 0x01), "(Del|Sand) Rappy"); + create_enemy(e, 0x17 + (e.skin & 0x01), 17 + (e.skin & 0x01), "(Del|Sand) Rappy"); } else { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x05 + (e.skin & 0x01)).experience, - 17 + (e.skin & 0x01), "(Del|Sand) Rappy"); + create_enemy(e, 0x05 + (e.skin & 0x01), 17 + (e.skin & 0x01), "(Del|Sand) Rappy"); } } else { // Rag Rappy and Al Rappy (Love for Episode II) if (e.skin & 0x01) { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x18 + (e.skin & 0x01)).experience, - 0xFF, "Rare Rappy"); // Don't know (yet) which rare Rappy it is + // TODO: Don't know (yet) which rare Rappy it is + create_enemy(e, 0x18 + (e.skin & 0x01), 0xFF, "Rare Rappy"); } else { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x18 + (e.skin & 0x01)).experience, - 5, "Rag Rappy"); + create_enemy(e, 0x18 + (e.skin & 0x01), 5, "Rag Rappy"); } } break; case 0x42: // Monest + 30 Mothmants - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x01).experience, 4, "Monest"); + create_enemy(e, 0x01, 4, "Monest"); for (size_t x = 0; x < 30; x++) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x00).experience, 3, "Mothmant"); + create_enemy(e, 0x00, 3, "Mothmant"); } break; case 0x43: // Savage Wolf and Barbarous Wolf - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x02 + ((e.reserved[10] & 0x800000) ? 1 : 0)).experience, + create_enemy(e, 0x02 + ((e.reserved[10] & 0x800000) ? 1 : 0), 7 + ((e.reserved[10] & 0x800000) ? 1 : 0), "(Savage|Barbarous) Wolf"); break; case 0x44: // Booma family - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x4B + (e.skin % 3)).experience, - 9 + (e.skin % 3), "(|Go|Gigo)Booma"); + create_enemy(e, 0x4B + (e.skin % 3), 9 + (e.skin % 3), "(|Go|Gigo)Booma"); break; case 0x60: // Grass Assassin - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x4E).experience, 12, "Grass Assassin"); + create_enemy(e, 0x4E, 12, "Grass Assassin"); break; case 0x61: // Del Lily, Poison Lily, Nar Lily if ((episode == 2) && (alt_enemies)) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x25).experience, 83, "Del Lily"); + create_enemy(e, 0x25, 83, "Del Lily"); } else { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x04 + ((e.reserved[10] & 0x800000) ? 1 : 0)).experience, + create_enemy(e, 0x04 + ((e.reserved[10] & 0x800000) ? 1 : 0), 13 + ((e.reserved[10] & 0x800000) ? 1 : 0), "(Poison|Nar) Lily"); } break; case 0x62: // Nano Dragon - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x1A).experience, 15, "Nano Dragon"); + create_enemy(e, 0x1A, 15, "Nano Dragon"); break; case 0x63: // Shark family - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x4F + (e.skin % 3)).experience, - 16 + (e.skin % 3), "(Evil|Pal|Guil) Shark"); + create_enemy(e, 0x4F + (e.skin % 3), 16 + (e.skin % 3), "(Evil|Pal|Guil) Shark"); break; case 0x64: // Slime + 4 clones - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x2F + ((e.reserved[10] & 0x800000) ? 0 : 1)).experience, + create_enemy(e, 0x2F + ((e.reserved[10] & 0x800000) ? 0 : 1), 19 + ((e.reserved[10] & 0x800000) ? 1 : 0), "Pof?uilly Slime"); for (size_t x = 0; x < 4; x++) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x30).experience, 19, "Pof?uilly Slime clone"); + create_enemy(e, 0x30, 19, "Pof?uilly Slime clone"); } break; case 0x65: // Pan Arms, Migium, Hidoom for (size_t x = 0; x < 3; x++) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x31 + x).experience, 21 + x, "(Pan Arms|Hidoom|Migium)"); + create_enemy(e, 0x31 + x, 21 + x, "(Pan Arms|Hidoom|Migium)"); } break; case 0x80: // Dubchic and Gillchic if (e.skin & 0x01) { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x1B + (e.skin & 0x01)).experience, 50, "(Dub|Gill)chic"); + create_enemy(e, 0x1B + (e.skin & 0x01), 50, "(Dub|Gill)chic"); } else { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x1B + (e.skin & 0x01)).experience, 24, "(Dub|Gill)chic"); + create_enemy(e, 0x1B + (e.skin & 0x01), 24, "(Dub|Gill)chic"); } break; case 0x81: // Garanz - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x1D).experience, 25, "Garanz"); + create_enemy(e, 0x1D, 25, "Garanz"); break; case 0x82: // Sinow Beat and Gold if (e.reserved[10] & 0x800000) { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x13).experience, - 26 + ((e.reserved[10] & 0x800000) ? 1 : 0), "Sinow (Beat|Gold)"); + create_enemy(e, 0x13, 26 + ((e.reserved[10] & 0x800000) ? 1 : 0), "Sinow (Beat|Gold)"); } else { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x06).experience, - 26 + ((e.reserved[10] & 0x800000) ? 1 : 0), "Sinow (Beat|Gold)"); + create_enemy(e, 0x06, 26 + ((e.reserved[10] & 0x800000) ? 1 : 0), "Sinow (Beat|Gold)"); } if (e.num_clones == 0) { create_clones(4); } break; case 0x83: // Canadine - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x07).experience, 28, "Canadine"); + create_enemy(e, 0x07, 28, "Canadine"); break; case 0x84: // Canadine Group - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x09).experience, 29, "Canune"); + create_enemy(e, 0x09, 29, "Canune"); for (size_t x = 0; x < 8; x++) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x08).experience, 28, "Canadine"); + create_enemy(e, 0x08, 28, "Canadine"); } break; case 0x85: // Dubwitch + enemies.emplace_back(next_enemy_id++, e.base, 0xFFFFFFFF, 0, 0, "__dubwitch__"); break; case 0xA0: // Delsaber - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x52).experience, 30, "Delsaber"); + create_enemy(e, 0x52, 30, "Delsaber"); break; case 0xA1: // Chaos Sorcerer + 2 Bits - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x0A).experience, 31, "Chaos Sorcerer"); + create_enemy(e, 0x0A, 31, "Chaos Sorcerer"); create_clones(2); break; case 0xA2: // Dark Gunner - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x1E).experience, 34, "Dark Gunner"); + create_enemy(e, 0x1E, 34, "Dark Gunner"); break; case 0xA4: // Chaos Bringer - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x0D).experience, 36, "Chaos Bringer"); + create_enemy(e, 0x0D, 36, "Chaos Bringer"); break; case 0xA5: // Dark Belra - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x0E).experience, 37, "Dark Belra"); + create_enemy(e, 0x0E, 37, "Dark Belra"); break; case 0xA6: // Dimenian family - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x53 + (e.skin % 3)).experience, 41 + (e.skin % 3), "(|La|So) Dimenian"); + create_enemy(e, 0x53 + (e.skin % 3), 41 + (e.skin % 3), "(|La|So) Dimenian"); break; case 0xA7: // Bulclaw + 4 claws - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x1F).experience, 40, "Bulclaw"); + create_enemy(e, 0x1F, 40, "Bulclaw"); for (size_t x = 0; x < 4; x++) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x20).experience, 38, "Claw"); + create_enemy(e, 0x20, 38, "Claw"); } break; case 0xA8: // Claw - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x20).experience, 38, "Claw"); + create_enemy(e, 0x20, 38, "Claw"); break; case 0xC0: // Dragon or Gal Gryphon if (episode == 1) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x12).experience, 44, "Dragon"); + create_enemy(e, 0x12, 44, "Dragon"); } else if (episode == 2) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x1E).experience, 77, "Gal Gryphon"); + create_enemy(e, 0x1E, 77, "Gal Gryphon"); } break; case 0xC1: // De Rol Le - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x0F).experience, 45, "De Rol Le"); + create_enemy(e, 0x0F, 45, "De Rol Le"); break; case 0xC2: // Vol Opt form 1 + enemies.emplace_back(next_enemy_id++, e.base, 0xFFFFFFFF, 0, 0, "__vol_opt_1__"); break; case 0xC5: // Vol Opt form 2 - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x25).experience, 46, "Vol Opt"); + create_enemy(e, 0x25, 46, "Vol Opt"); break; - case 0xC8: // Dark Falz + 510 Helpers + case 0xC8: // Dark Falz + 510 Darvants if (difficulty) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x38).experience, 47, "Dark Falz 3"); // Final form + create_enemy(e, 0x38, 47, "Dark Falz 3"); // Final form } else { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x37).experience, 47, "Dark Falz 2"); // Second form + create_enemy(e, 0x37, 47, "Dark Falz 2"); // Second form } for (size_t x = 0; x < 510; x++) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x35).experience, 0, "Darvant"); + create_enemy(e, 0x35, 0, "Darvant"); } break; case 0xCA: // Olga Flow - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x2C).experience, 78, "Olga Flow"); + create_enemy(e, 0x2C, 78, "Olga Flow"); create_clones(0x200); break; case 0xCB: // Barba Ray - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x0F).experience, 73, "Barba Ray"); + create_enemy(e, 0x0F, 73, "Barba Ray"); create_clones(0x2F); break; case 0xCC: // Gol Dragon - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x12).experience, 76, "Gol Dragon"); + create_enemy(e, 0x12, 76, "Gol Dragon"); create_clones(5); break; case 0xD4: // Sinows Berill & Spigell - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params((e.reserved[10] & 0x800000) ? 0x13 : 0x06).experience, + create_enemy(e, (e.reserved[10] & 0x800000) ? 0x13 : 0x06, 62 + ((e.reserved[10] & 0x800000) ? 1 : 0), "Sinow (Berrill|Spigell)"); create_clones(4); break; case 0xD5: // Merillia & Meriltas - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x4B + (e.skin & 0x01)).experience, - 52 + (e.skin & 0x01), "Meril(lia|tas)"); + create_enemy(e, 0x4B + (e.skin & 0x01), 52 + (e.skin & 0x01), "Meril(lia|tas)"); break; case 0xD6: // Mericus, Merikle, & Mericarol if (e.skin) { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x44 + (e.skin % 3)).experience, 56 + (e.skin % 3), "Meri(cus|kle|carol)"); + create_enemy(e, 0x44 + (e.skin % 3), 56 + (e.skin % 3), "Meri(cus|kle|carol)"); } else { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x3A).experience, 56 + (e.skin % 3), "Meri(cus|kle|carol)"); + create_enemy(e, 0x3A, 56 + (e.skin % 3), "Meri(cus|kle|carol)"); } break; case 0xD7: // Ul Gibbon and Zol Gibbon - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x3B + (e.skin & 0x01)).experience, - 59 + (e.skin & 0x01), "(Ul|Zol) Gibbon"); + create_enemy(e, 0x3B + (e.skin & 0x01), 59 + (e.skin & 0x01), "(Ul|Zol) Gibbon"); break; case 0xD8: // Gibbles - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x3D).experience, 61, "Gibbles"); + create_enemy(e, 0x3D, 61, "Gibbles"); break; case 0xD9: // Gee - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x07).experience, 54, "Gee"); + create_enemy(e, 0x07, 54, "Gee"); break; case 0xDA: // Gi Gue - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x1A).experience, 55, "Gi Gue"); + create_enemy(e, 0x1A, 55, "Gi Gue"); break; case 0xDB: // Deldepth - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x30).experience, 71, "Deldepth"); + create_enemy(e, 0x30, 71, "Deldepth"); break; case 0xDC: // Delbiter - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x0D).experience, 72, "Delbiter"); + create_enemy(e, 0x0D, 72, "Delbiter"); break; case 0xDD: // Dolmolm and Dolmdarl - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x4F + (e.skin & 0x01)).experience, - 64 + (e.skin & 0x01), "Dolm(olm|darl)"); + create_enemy(e, 0x4F + (e.skin & 0x01), 64 + (e.skin & 0x01), "Dolm(olm|darl)"); break; case 0xDE: // Morfos - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x40).experience, 66, "Morfos"); + create_enemy(e, 0x40, 66, "Morfos"); break; case 0xDF: // Recobox & Recons - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x41).experience, 67, "Recobox"); + create_enemy(e, 0x41, 67, "Recobox"); for (size_t x = 0; x < e.num_clones; x++) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x42).experience, 68, "Recon"); + create_enemy(e, 0x42, 68, "Recon"); } break; case 0xE0: // Epsilon, Sinow Zoa and Zele if ((episode == 2) && (alt_enemies)) { - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x23).experience, 84, "Epsilon"); + create_enemy(e, 0x23, 84, "Epsilon"); create_clones(4); } else { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x43 + (e.skin & 0x01)).experience, - 69 + (e.skin & 0x01), "Sinow Z(oa|ele)"); + create_enemy(e, 0x43 + (e.skin & 0x01), 69 + (e.skin & 0x01), "Sinow Z(oa|ele)"); } break; case 0xE1: // Ill Gill - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x26).experience, 82, "Ill Gill"); + create_enemy(e, 0x26, 82, "Ill Gill"); break; case 0x0110: // Astark - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x09).experience, 1, "Astark"); + create_enemy(e, 0x09, 1, "Astark"); break; case 0x0111: // Satellite Lizard and Yowie - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x0D + ((e.reserved[10] & 0x800000) ? 1 : 0) + (alt_enemies ? 0x10 : 0)).experience, + create_enemy(e, 0x0D + ((e.reserved[10] & 0x800000) ? 1 : 0) + (alt_enemies ? 0x10 : 0), 2 + ((e.reserved[10] & 0x800000) ? 0 : 1), "(Satellite Lizard|Yowie)"); break; case 0x0112: // Merissa A/AA - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x19 + (e.skin & 0x01)).experience, - 4 + (e.skin & 0x01), "Merissa AA?"); + create_enemy(e, 0x19 + (e.skin & 0x01), 4 + (e.skin & 0x01), "Merissa AA?"); break; case 0x0113: // Girtablulu - enemies.emplace_back(next_enemy_id++, e.base, get_battle_params(0x1F).experience, 6, "Girtablulu"); + create_enemy(e, 0x1F, 6, "Girtablulu"); break; case 0x0114: // Zu and Pazuzu - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x0B + (e.skin & 0x01) + (alt_enemies ? 0x14: 0x00)).experience, + create_enemy(e, 0x0B + (e.skin & 0x01) + (alt_enemies ? 0x14: 0x00), 7 + (e.skin & 0x01), "(Pazu)?zu"); break; case 0x0115: // Boota family if (e.skin & 2) { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x03).experience, 9 + (e.skin % 3), "(|Ba|Ze) Boota"); + create_enemy(e, 0x03, 9 + (e.skin % 3), "(|Ba|Ze) Boota"); } else { - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x00 + (e.skin % 3)).experience, - 9 + (e.skin % 3), "(|Ba|Ze) Boota"); + create_enemy(e, 0x00 + (e.skin % 3), 9 + (e.skin % 3), "(|Ba|Ze) Boota"); } break; case 0x0116: // Dorphon and Eclair - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x0F + (e.skin & 0x01)).experience, - 12 + (e.skin & 0x01), "Dorphon (Eclair)?"); + create_enemy(e, 0x0F + (e.skin & 0x01), 12 + (e.skin & 0x01), "Dorphon( Eclair)?"); break; case 0x0117: // Goran family - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x11 + (e.skin % 3)).experience, - (e.skin & 2) ? 15 : ((e.skin & 1) ? 16 : 14), "Goran..."); + create_enemy(e, 0x11 + (e.skin % 3), (e.skin & 2) ? 15 : ((e.skin & 1) ? 16 : 14), "(Pyro )?Goran( Detonator)?"); break; - case 0x0119: // Saint Million, Shambertin, Kondrieu - enemies.emplace_back(next_enemy_id++, e.base, - get_battle_params(0x22).experience, + case 0x0119: // Saint-Million, Shambertin, Kondrieu + create_enemy(e, 0x22, (e.reserved[10] & 0x800000) ? 21 : (19 + (e.skin & 0x01)), "(Saint-Million|Shambertin|Kondrieu)"); break; default: - enemies.emplace_back(next_enemy_id++, e.base, 0xFFFFFFFF, 0, "__unknown__"); + enemies.emplace_back(next_enemy_id++, e.base, 0xFFFFFFFF, 0, 0, "__unknown__"); static_game_data_log.warning( "(Entry %zu, offset %zX in file) Unknown enemy type %08" PRIX32 " %08" PRIX32, y, y * sizeof(EnemyEntry), e.base, e.skin); break; } - create_clones(num_clones); + create_clones(e.num_clones); } return enemies; diff --git a/src/Map.hh b/src/Map.hh index 7e1bda31..a62a4262 100644 --- a/src/Map.hh +++ b/src/Map.hh @@ -62,6 +62,7 @@ struct PSOEnemy { uint8_t last_hit; uint32_t experience; uint32_t rt_index; + size_t num_clones; const char* type_name; explicit PSOEnemy(uint64_t id); @@ -70,6 +71,7 @@ struct PSOEnemy { uint16_t source_type, uint32_t experience, uint32_t rt_index, + size_t num_clones, const char* type_name); std::string str() const;