incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up map parsing

Browse Source
This commit is contained in:
Martin Michelsen
2022-08-02 12:11:55 -07:00
parent ed36471a4e
commit 42c1d251eb
4 changed files with 217 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Map.cc
+178 -197
View File
@@ -57,10 +57,24 @@ const BattleParams* BattleParamTable::get_subtable(bool solo, uint8_t episode,
PSOEnemy::PSOEnemy() : PSOEnemy(0, 0) { } PSOEnemy::PSOEnemy(uint64_t id) : PSOEnemy(id, 0, 0, 0) { }
PSOEnemy::PSOEnemy(uint32_t experience, uint32_t rt_index) : unused(0), PSOEnemy::PSOEnemy(
hit_flags(0), last_hit(0), experience(experience), rt_index(rt_index) { } uint64_t id,
uint16_t source_type,
uint32_t experience,
uint32_t rt_index)
: id(id),
source_type(source_type),
hit_flags(0),
last_hit(0),
experience(experience),
rt_index(rt_index) { }
string PSOEnemy::str() const {
return string_printf("[Enemy E-%" PRIX64 " source_type=%hX hit=%02hhX/%hu exp=%" PRIu32 " rt_index=%" PRIX32 "]",
this->id, this->source_type, this->hit_flags, this->last_hit, this->experience, this->rt_index);
}
@@ -76,358 +90,325 @@ struct EnemyEntry {
uint32_t reserved15; uint32_t reserved15;
} __attribute__((packed)); } __attribute__((packed));
static uint64_t next_enemy_id = 1;
static vector<PSOEnemy> parse_map(uint8_t episode, uint8_t difficulty, static vector<PSOEnemy> parse_map(uint8_t episode, uint8_t difficulty,
const BattleParams* battle_params, const EnemyEntry* map, const BattleParams* battle_params, const EnemyEntry* map,
size_t entry_count, bool alt_enemies) { size_t entry_count, bool alt_enemies) {
vector<PSOEnemy> enemies; vector<PSOEnemy> enemies;
enemies.resize(0xB50); auto create_clones = [&](size_t count) {
size_t num_enemies = 0; for (; count > 0; count--) {
enemies.emplace_back(next_enemy_id++);
// TODO: this is some of the nastiest code ever. de-nastify it at your leisure
for (size_t y = 0; y < entry_count; y++) {
if (enemies.size() >= 0xB50) {
break;
} }
};
size_t num_clones = map[y].num_clones; for (size_t y = 0; y < entry_count; y++) {
const auto& e = map[y];
size_t num_clones = e.num_clones;
switch (map[y].base) { switch (e.base) {
case 0x40: // Hildebear and Hildetorr case 0x40: // Hildebear and Hildetorr
enemies[num_enemies].rt_index = 0x01 + (map[y].skin & 0x01); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x49 + (map[y].skin & 0x01)].experience; battle_params[0x49 + (e.skin & 0x01)].experience,
0x01 + (e.skin & 0x01));
break; break;
case 0x41: // Rappies case 0x41: // Rappies
if (episode == 3) { // Del Rappy and Sand Rappy if (episode == 3) { // Del Rappy and Sand Rappy
enemies[num_enemies].rt_index = 17 + (map[y].skin & 0x01);
if (alt_enemies) { if (alt_enemies) {
enemies[num_enemies].experience = battle_params[0x17 + (map[y].skin & 0x01)].experience; enemies.emplace_back(next_enemy_id++, e.base,
battle_params[0x17 + (e.skin & 0x01)].experience,
17 + (e.skin & 0x01));
} else { } else {
enemies[num_enemies].experience = battle_params[0x05 + (map[y].skin & 0x01)].experience; enemies.emplace_back(next_enemy_id++, e.base,
battle_params[0x05 + (e.skin & 0x01)].experience,
17 + (e.skin & 0x01));
} }
} else { // Rag Rappy and Al Rappy (Love for Episode II) } else { // Rag Rappy and Al Rappy (Love for Episode II)
if (map[y].skin & 0x01) { if (e.skin & 0x01) {
enemies[num_enemies].rt_index = 0xFF; // No clue what rappy it could be... yet. enemies.emplace_back(next_enemy_id++, e.base,
battle_params[0x18 + (e.skin & 0x01)].experience,
0xFF); // Don't know (yet) which rare Rappy it is
} else { } else {
enemies[num_enemies].rt_index = 5; enemies.emplace_back(next_enemy_id++, e.base,
battle_params[0x18 + (e.skin & 0x01)].experience,
5);
} }
enemies[num_enemies].experience = battle_params[0x18 + (map[y].skin & 0x01)].experience;
} }
break; break;
case 0x42: // Monest + 30 Mothmants case 0x42: // Monest + 30 Mothmants
enemies[num_enemies].experience = battle_params[0x01].experience; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x01].experience, 4);
enemies[num_enemies].rt_index = 4;
for (size_t x = 0; x < 30; x++) { for (size_t x = 0; x < 30; x++) {
if (num_enemies >= 0xB50) { enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x00].experience, 3);
break;
}
num_enemies++;
enemies[num_enemies].rt_index = 3;
enemies[num_enemies].experience = battle_params[0x00].experience;
} }
break; break;
case 0x43: // Savage Wolf and Barbarous Wolf case 0x43: // Savage Wolf and Barbarous Wolf
enemies[num_enemies].rt_index = 7 + ((map[y].reserved[10] & 0x800000) ? 1 : 0); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x02 + ((map[y].reserved[10] & 0x800000) ? 1 : 0)].experience; battle_params[0x02 + ((e.reserved[10] & 0x800000) ? 1 : 0)].experience,
7 + ((e.reserved[10] & 0x800000) ? 1 : 0));
break; break;
case 0x44: // Booma family case 0x44: // Booma family
enemies[num_enemies].rt_index = 9 + (map[y].skin % 3); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x4B + (map[y].skin % 3)].experience; battle_params[0x4B + (e.skin % 3)].experience,
9 + (e.skin % 3));
break; break;
case 0x60: // Grass Assassin case 0x60: // Grass Assassin
enemies[num_enemies].rt_index = 12; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x4E].experience, 12);
enemies[num_enemies].experience = battle_params[0x4E].experience;
break; break;
case 0x61: // Del Lily, Poison Lily, Nar Lily case 0x61: // Del Lily, Poison Lily, Nar Lily
if ((episode == 2) && (alt_enemies)) { if ((episode == 2) && (alt_enemies)) {
enemies[num_enemies].rt_index = 83; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x25].experience, 83);
enemies[num_enemies].experience = battle_params[0x25].experience;
} else { } else {
enemies[num_enemies].rt_index = 13 + ((map[y].reserved[10] & 0x800000) ? 1 : 0); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x04 + ((map[y].reserved[10] & 0x800000) ? 1 : 0)].experience; battle_params[0x04 + ((e.reserved[10] & 0x800000) ? 1 : 0)].experience,
13 + ((e.reserved[10] & 0x800000) ? 1 : 0));
} }
break; break;
case 0x62: // Nano Dragon case 0x62: // Nano Dragon
enemies[num_enemies].rt_index = 15; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x1A].experience, 15);
enemies[num_enemies].experience = battle_params[0x1A].experience;
break; break;
case 0x63: // Shark family case 0x63: // Shark family
enemies[num_enemies].rt_index = 16 + (map[y].skin % 3); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x4F + (map[y].skin % 3)].experience; battle_params[0x4F + (e.skin % 3)].experience,
16 + (e.skin % 3));
break; break;
case 0x64: // Slime + 4 clones case 0x64: // Slime + 4 clones
enemies[num_enemies].rt_index = 19 + ((map[y].reserved[10] & 0x800000) ? 1 : 0); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x2F + ((map[y].reserved[10] & 0x800000) ? 0 : 1)].experience; battle_params[0x2F + ((e.reserved[10] & 0x800000) ? 0 : 1)].experience,
19 + ((e.reserved[10] & 0x800000) ? 1 : 0));
for (size_t x = 0; x < 4; x++) { for (size_t x = 0; x < 4; x++) {
if (num_enemies >= 0xB50) { enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x30].experience, 19);
break;
}
num_enemies++;
enemies[num_enemies].rt_index = 19;
enemies[num_enemies].experience = battle_params[0x30].experience;
} }
break; break;
case 0x65: // Pan Arms, Migium, Hidoom case 0x65: // Pan Arms, Migium, Hidoom
for (size_t x = 0; x < 3; x++) { for (size_t x = 0; x < 3; x++) {
enemies[num_enemies + x].rt_index = 21 + x; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x31 + x].experience, 21 + x);
enemies[num_enemies + x].experience = battle_params[0x31 + x].experience;
} }
num_enemies += 2;
break; break;
case 0x80: // Dubchic and Gilchic case 0x80: // Dubchic and Gillchic
enemies[num_enemies].experience = battle_params[0x1B + (map[y].skin & 0x01)].experience; if (e.skin & 0x01) {
if (map[y].skin & 0x01) { enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].rt_index = 50; battle_params[0x1B + (e.skin & 0x01)].experience, 50);
} else { } else {
enemies[num_enemies].rt_index = 24; enemies.emplace_back(next_enemy_id++, e.base,
battle_params[0x1B + (e.skin & 0x01)].experience, 24);
} }
break; break;
case 0x81: // Garanz case 0x81: // Garanz
enemies[num_enemies].rt_index = 25; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x1D].experience, 25);
enemies[num_enemies].experience = battle_params[0x1D].experience;
break; break;
case 0x82: // Sinow Beat and Gold case 0x82: // Sinow Beat and Gold
enemies[num_enemies].rt_index = 26 + ((map[y].reserved[10] & 0x800000) ? 1 : 0); if (e.reserved[10] & 0x800000) {
if (map[y].reserved[10] & 0x800000) { enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x13].experience; battle_params[0x13].experience,
26 + ((e.reserved[10] & 0x800000) ? 1 : 0));
} else { } else {
enemies[num_enemies].experience = battle_params[0x06].experience; enemies.emplace_back(next_enemy_id++, e.base,
battle_params[0x06].experience,
26 + ((e.reserved[10] & 0x800000) ? 1 : 0));
} }
if (map[y].num_clones == 0) { if (e.num_clones == 0) {
num_clones = 4; // only if no clone # present create_clones(4);
} }
break; break;
case 0x83: // Canadine case 0x83: // Canadine
enemies[num_enemies].rt_index = 28; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x07].experience, 28);
enemies[num_enemies].experience = battle_params[0x07].experience;
break; break;
case 0x84: // Canadine Group case 0x84: // Canadine Group
enemies[num_enemies].rt_index = 29; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x09].experience, 29);
enemies[num_enemies].experience = battle_params[0x09].experience; for (size_t x = 0; x < 8; x++) {
for (size_t x = 1; x < 9; x++) { enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x08].experience, 28);
enemies[num_enemies + x].rt_index = 28;
enemies[num_enemies + x].experience = battle_params[0x08].experience;
} }
num_enemies += 8;
break; break;
case 0x85: // Dubwitch case 0x85: // Dubwitch
break; break;
case 0xA0: // Delsaber case 0xA0: // Delsaber
enemies[num_enemies].rt_index = 30; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x52].experience, 30);
enemies[num_enemies].experience = battle_params[0x52].experience;
break; break;
case 0xA1: // Chaos Sorcerer + 2 Bits case 0xA1: // Chaos Sorcerer + 2 Bits
enemies[num_enemies].rt_index = 31; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x0A].experience, 31);
enemies[num_enemies].experience = battle_params[0x0A].experience; create_clones(2);
num_enemies += 2;
break; break;
case 0xA2: // Dark Gunner case 0xA2: // Dark Gunner
enemies[num_enemies].rt_index = 34; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x1E].experience, 34);
enemies[num_enemies].experience = battle_params[0x1E].experience;
break; break;
case 0xA4: // Chaos Bringer case 0xA4: // Chaos Bringer
enemies[num_enemies].rt_index = 36; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x0D].experience, 36);
enemies[num_enemies].experience = battle_params[0x0D].experience;
break; break;
case 0xA5: // Dark Belra case 0xA5: // Dark Belra
enemies[num_enemies].rt_index = 37; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x0E].experience, 37);
enemies[num_enemies].experience = battle_params[0x0E].experience;
break; break;
case 0xA6: // Dimenian family case 0xA6: // Dimenian family
enemies[num_enemies].rt_index = 41 + (map[y].skin % 3); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x53 + (map[y].skin % 3)].experience; battle_params[0x53 + (e.skin % 3)].experience, 41 + (e.skin % 3));
break; break;
case 0xA7: // Bulclaw + 4 claws case 0xA7: // Bulclaw + 4 claws
enemies[num_enemies].rt_index = 40; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x1F].experience, 40);
enemies[num_enemies].experience = battle_params[0x1F].experience; for (size_t x = 0; x < 4; x++) {
for (size_t x = 1; x < 5; x++) { enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x20].experience, 38);
enemies[num_enemies + x].rt_index = 38;
enemies[num_enemies + x].experience = battle_params[0x20].experience;
} }
num_enemies += 4;
break; break;
case 0xA8: // Claw case 0xA8: // Claw
enemies[num_enemies].rt_index = 38; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x20].experience, 38);
enemies[num_enemies].experience = battle_params[0x20].experience;
break; break;
case 0xC0: // Dragon or Gal Gryphon case 0xC0: // Dragon or Gal Gryphon
if (episode == 1) { if (episode == 1) {
enemies[num_enemies].rt_index = 44; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x12].experience, 44);
enemies[num_enemies].experience = battle_params[0x12].experience;
} else if (episode == 0x02) { } else if (episode == 0x02) {
enemies[num_enemies].rt_index = 77; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x1E].experience, 77);
enemies[num_enemies].experience = battle_params[0x1E].experience;
} }
break; break;
case 0xC1: // De Rol Le case 0xC1: // De Rol Le
enemies[num_enemies].rt_index = 45; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x0F].experience, 45);
enemies[num_enemies].experience = battle_params[0x0F].experience;
break; break;
case 0xC2: // Vol Opt form 1 case 0xC2: // Vol Opt form 1
break; break;
case 0xC5: // Vol Opt form 2 case 0xC5: // Vol Opt form 2
enemies[num_enemies].rt_index = 46; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x25].experience, 46);
enemies[num_enemies].experience = battle_params[0x25].experience;
break; break;
case 0xC8: // Dark Falz + 510 Helpers case 0xC8: // Dark Falz + 510 Helpers
enemies[num_enemies].rt_index = 47;
if (difficulty) { if (difficulty) {
enemies[num_enemies].experience = battle_params[0x38].experience; // Form 2 enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x38].experience, 47); // Final form
} else { } else {
enemies[num_enemies].experience = battle_params[0x37].experience; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x37].experience, 47); // Second form
} }
for (size_t x = 1; x < 511; x++) { for (size_t x = 0; x < 510; x++) {
//enemies[num_enemies + x].base = 200; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x35].experience, 0);
enemies[num_enemies + x].experience = battle_params[0x35].experience;
} }
num_enemies += 510;
break; break;
case 0xCA: // Olga Flow case 0xCA: // Olga Flow
enemies[num_enemies].rt_index = 78; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x2C].experience, 78);
enemies[num_enemies].experience = battle_params[0x2C].experience; create_clones(0x200);
num_enemies += 512;
break; break;
case 0xCB: // Barba Ray case 0xCB: // Barba Ray
enemies[num_enemies].rt_index = 73; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x0F].experience, 73);
enemies[num_enemies].experience = battle_params[0x0F].experience; create_clones(0x2F);
num_enemies += 47;
break; break;
case 0xCC: // Gol Dragon case 0xCC: // Gol Dragon
enemies[num_enemies].rt_index = 76; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x12].experience, 76);
enemies[num_enemies].experience = battle_params[0x12].experience; create_clones(5);
num_enemies += 5;
break; break;
case 0xD4: // Sinow Berill & Spigell case 0xD4: // Sinows Berill & Spigell
enemies[num_enemies].rt_index = 62 + ((map[y].reserved[10] & 0x800000) ? 1 : 0); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[(map[y].reserved[10] & 0x800000) ? 0x13 : 0x06].experience; battle_params[(e.reserved[10] & 0x800000) ? 0x13 : 0x06].experience,
num_enemies += 4; // Add 4 clones which are never used... 62 + ((e.reserved[10] & 0x800000) ? 1 : 0));
create_clones(4);
break; break;
case 0xD5: // Merillia & Meriltas case 0xD5: // Merillia & Meriltas
enemies[num_enemies].rt_index = 52 + (map[y].skin & 0x01); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x4B + (map[y].skin & 0x01)].experience; battle_params[0x4B + (e.skin & 0x01)].experience,
52 + (e.skin & 0x01));
break; break;
case 0xD6: // Mericus, Merikle, & Mericarol case 0xD6: // Mericus, Merikle, & Mericarol
enemies[num_enemies].rt_index = 56 + (map[y].skin % 3); if (e.skin) {
if (map[y].skin) { enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x44 + (map[y].skin % 3)].experience; battle_params[0x44 + (e.skin % 3)].experience, 56 + (e.skin % 3));
} else { } else {
enemies[num_enemies].experience = battle_params[0x3A].experience; enemies.emplace_back(next_enemy_id++, e.base,
battle_params[0x3A].experience, 56 + (e.skin % 3));
} }
break; break;
case 0xD7: // Ul Gibbon and Zol Gibbon case 0xD7: // Ul Gibbon and Zol Gibbon
enemies[num_enemies].rt_index = 59 + (map[y].skin & 0x01); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x3B + (map[y].skin & 0x01)].experience; battle_params[0x3B + (e.skin & 0x01)].experience,
59 + (e.skin & 0x01));
break; break;
case 0xD8: // Gibbles case 0xD8: // Gibbles
enemies[num_enemies].rt_index = 61; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x3D].experience, 61);
enemies[num_enemies].experience = battle_params[0x3D].experience;
break; break;
case 0xD9: // Gee case 0xD9: // Gee
enemies[num_enemies].rt_index = 54; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x07].experience, 54);
enemies[num_enemies].experience = battle_params[0x07].experience;
break; break;
case 0xDA: // Gi Gue case 0xDA: // Gi Gue
enemies[num_enemies].rt_index = 55; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x1A].experience, 55);
enemies[num_enemies].experience = battle_params[0x1A].experience;
break; break;
case 0xDB: // Deldepth case 0xDB: // Deldepth
enemies[num_enemies].rt_index = 71; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x30].experience, 71);
enemies[num_enemies].experience = battle_params[0x30].experience;
break; break;
case 0xDC: // Delbiter case 0xDC: // Delbiter
enemies[num_enemies].rt_index = 72; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x0D].experience, 72);
enemies[num_enemies].experience = battle_params[0x0D].experience;
break; break;
case 0xDD: // Dolmolm and Dolmdarl case 0xDD: // Dolmolm and Dolmdarl
enemies[num_enemies].rt_index = 64 + (map[y].skin & 0x01); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x4F + (map[y].skin & 0x01)].experience; battle_params[0x4F + (e.skin & 0x01)].experience,
64 + (e.skin & 0x01));
break; break;
case 0xDE: // Morfos case 0xDE: // Morfos
enemies[num_enemies].rt_index = 66; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x40].experience, 66);
enemies[num_enemies].experience = battle_params[0x40].experience;
break; break;
case 0xDF: // Recobox & Recons case 0xDF: // Recobox & Recons
enemies[num_enemies].rt_index = 67; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x41].experience, 67);
enemies[num_enemies].experience = battle_params[0x41].experience; for (size_t x = 0; x < e.num_clones; x++) {
for (size_t x = 1; x <= map[y].num_clones; x++) { enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x42].experience, 68);
enemies[num_enemies + x].rt_index = 68;
enemies[num_enemies + x].experience = battle_params[0x42].experience;
} }
break; break;
case 0xE0: // Epsilon, Sinow Zoa and Zele case 0xE0: // Epsilon, Sinow Zoa and Zele
if ((episode == 0x02) && (alt_enemies)) { if ((episode == 0x02) && (alt_enemies)) {
enemies[num_enemies].rt_index = 84; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x23].experience, 84);
enemies[num_enemies].experience = battle_params[0x23].experience; create_clones(4);
num_enemies += 4;
} else { } else {
enemies[num_enemies].rt_index = 69 + (map[y].skin & 0x01); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x43 + (map[y].skin & 0x01)].experience; battle_params[0x43 + (e.skin & 0x01)].experience,
69 + (e.skin & 0x01));
} }
break; break;
case 0xE1: // Ill Gill case 0xE1: // Ill Gill
enemies[num_enemies].rt_index = 82; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x26].experience, 82);
enemies[num_enemies].experience = battle_params[0x26].experience;
break; break;
case 0x0110: // Astark case 0x0110: // Astark
enemies[num_enemies].rt_index = 1; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x09].experience, 1);
enemies[num_enemies].experience = battle_params[0x09].experience;
break; break;
case 0x0111: // Satellite Lizard and Yowie case 0x0111: // Satellite Lizard and Yowie
enemies[num_enemies].rt_index = 2 + ((map[y].reserved[10] & 0x800000) ? 0 : 1); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x0D + ((map[y].reserved[10] & 0x800000) ? 1 : 0) + (alt_enemies ? 0x10 : 0)].experience; battle_params[0x0D + ((e.reserved[10] & 0x800000) ? 1 : 0) + (alt_enemies ? 0x10 : 0)].experience,
2 + ((e.reserved[10] & 0x800000) ? 0 : 1));
break; break;
case 0x0112: // Merissa A/AA case 0x0112: // Merissa A/AA
enemies[num_enemies].rt_index = 4 + (map[y].skin & 0x01); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x19 + (map[y].skin & 0x01)].experience; battle_params[0x19 + (e.skin & 0x01)].experience,
4 + (e.skin & 0x01));
break; break;
case 0x0113: // Girtablulu case 0x0113: // Girtablulu
enemies[num_enemies].rt_index = 6; enemies.emplace_back(next_enemy_id++, e.base, battle_params[0x1F].experience, 6);
enemies[num_enemies].experience = battle_params[0x1F].experience;
break; break;
case 0x0114: // Zu and Pazuzu case 0x0114: // Zu and Pazuzu
enemies[num_enemies].rt_index = 7 + (map[y].skin & 0x01); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x0B + (map[y].skin & 0x01) + (alt_enemies ? 0x14: 0x00)].experience; battle_params[0x0B + (e.skin & 0x01) + (alt_enemies ? 0x14: 0x00)].experience,
7 + (e.skin & 0x01));
break; break;
case 0x0115: // Boota family case 0x0115: // Boota family
enemies[num_enemies].rt_index = 9 + (map[y].skin % 3); if (e.skin & 2) {
if (map[y].skin & 2) { enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x03].experience; battle_params[0x03].experience, 9 + (e.skin % 3));
} else { } else {
enemies[num_enemies].experience = battle_params[0x00 + (map[y].skin % 3)].experience; enemies.emplace_back(next_enemy_id++, e.base,
battle_params[0x00 + (e.skin % 3)].experience,
9 + (e.skin % 3));
} }
break; break;
case 0x0116: // Dorphon and Eclair case 0x0116: // Dorphon and Eclair
enemies[num_enemies].rt_index = 12 + (map[y].skin & 0x01); enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].experience = battle_params[0x0F + (map[y].skin & 0x01)].experience; battle_params[0x0F + (e.skin & 0x01)].experience,
12 + (e.skin & 0x01));
break; break;
case 0x0117: // Goran family case 0x0117: // Goran family
if (map[y].skin & 0x02) { enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].rt_index = 15; battle_params[0x11 + (e.skin % 3)].experience,
} else if (map[y].skin & 0x01) { (e.skin & 2) ? 15 : ((e.skin & 1) ? 16 : 14));
enemies[num_enemies].rt_index = 16;
} else {
enemies[num_enemies].rt_index = 14;
}
enemies[num_enemies].experience = battle_params[0x11 + (map[y].skin % 3)].experience;
break; break;
case 0x0119: // Saint Million, Shambertin, and Kondrieu case 0x0119: // Saint Million, Shambertin, Kondrieu
if (map[y].reserved[10] & 0x800000) { enemies.emplace_back(next_enemy_id++, e.base,
enemies[num_enemies].rt_index = 21; battle_params[0x22].experience,
} else { (e.reserved[10] & 0x800000) ? 21 : (19 + (e.skin & 0x01)));
enemies[num_enemies].rt_index = 19 + (map[y].skin & 0x01);
}
enemies[num_enemies].experience = battle_params[0x22].experience;
break; break;
default: default:
enemies[num_enemies].experience = 0xFFFFFFFF; enemies.emplace_back(next_enemy_id++, e.base, 0xFFFFFFFF, 0);
static_game_data_log.warning("Unknown enemy type %08" PRIX32 " %08" PRIX32, static_game_data_log.warning(
map[y].base, map[y].skin); "(Entry %zu, offset %zX in file) Unknown enemy type %08" PRIX32 " %08" PRIX32,
y, y * sizeof(EnemyEntry), e.base, e.skin);
break; break;
} }
if (num_clones) { create_clones(num_clones);
num_enemies += num_clones;
}
num_enemies++;
} }
return enemies; return enemies;
src/Map.hh
+16 -12
View File
@@ -2,22 +2,23 @@
#include <inttypes.h> #include <inttypes.h>
#include <phosg/Encoding.hh>
#include <vector> #include <vector>
#include <string> #include <string>
struct BattleParams { struct BattleParams {
uint16_t atp; // attack power le_uint16_t atp; // attack power
uint16_t psv; // perseverance (intelligence?) le_uint16_t psv; // perseverance (intelligence?)
uint16_t evp; // evasion le_uint16_t evp; // evasion
uint16_t hp; // hit points le_uint16_t hp; // hit points
uint16_t dfp; // defense le_uint16_t dfp; // defense
uint16_t ata; // accuracy le_uint16_t ata; // accuracy
uint16_t lck; // luck le_uint16_t lck; // luck
uint8_t unknown_a1[0x0E]; uint8_t unknown_a1[0x0E];
uint32_t experience; le_uint32_t experience;
uint32_t difficulty; le_uint32_t difficulty;
} __attribute__((packed)); } __attribute__((packed));
struct BattleParamTable { struct BattleParamTable {
@@ -39,14 +40,17 @@ struct BattleParamIndex {
// an enemy entry as loaded by the game // an enemy entry as loaded by the game
struct PSOEnemy { struct PSOEnemy {
uint16_t unused; uint64_t id;
uint16_t source_type;
uint8_t hit_flags; uint8_t hit_flags;
uint8_t last_hit; uint8_t last_hit;
uint32_t experience; uint32_t experience;
uint32_t rt_index; uint32_t rt_index;
PSOEnemy(); explicit PSOEnemy(uint64_t id);
PSOEnemy(uint32_t experience, uint32_t rt_index); PSOEnemy(uint64_t id, uint16_t source_type, uint32_t experience, uint32_t rt_index);
std::string str() const;
} __attribute__((packed)); } __attribute__((packed));
std::vector<PSOEnemy> load_map(const std::string& filename, uint8_t episode, std::vector<PSOEnemy> load_map(const std::string& filename, uint8_t episode,
src/ReceiveCommands.cc
+8 -3
View File
@@ -2112,7 +2112,6 @@ shared_ptr<Lobby> create_game_generic(shared_ptr<ServerState> s,
game->next_item_id[x] = (0x00200000 * x) + 0x00010000; game->next_item_id[x] = (0x00200000 * x) + 0x00010000;
} }
game->next_game_item_id = 0x00810000; game->next_game_item_id = 0x00810000;
game->enemies.resize(0x0B50);
const auto* bp_subtable = s->battle_params->get_subtable(game->mode == 3, const auto* bp_subtable = s->battle_params->get_subtable(game->mode == 3,
game->episode - 1, game->difficulty); game->episode - 1, game->difficulty);
@@ -2130,9 +2129,14 @@ shared_ptr<Lobby> create_game_generic(shared_ptr<ServerState> s,
game->variations.data()[x * 2].load(), game->variations.data()[x * 2].load(),
game->variations.data()[(x * 2) + 1].load()); game->variations.data()[(x * 2) + 1].load());
try { try {
game->enemies = load_map(filename.c_str(), game->episode, auto enemies = load_map(filename.c_str(), game->episode,
game->difficulty, bp_subtable, false); game->difficulty, bp_subtable, false);
c->log.info("Loaded map %s", filename.c_str()); game->enemies.insert(game->enemies.end(), enemies.begin(), enemies.end());
c->log.info("Loaded map %s (%zu entries)", filename.c_str(), enemies.size());
for (size_t z = 0; z < enemies.size(); z++) {
string e_str = enemies[z].str();
static_game_data_log.info("(Entry %zu) %s", z, e_str.c_str());
}
break; break;
} catch (const exception& e) { } catch (const exception& e) {
c->log.warning("Failed to load map %s: %s", filename.c_str(), e.what()); c->log.warning("Failed to load map %s: %s", filename.c_str(), e.what());
@@ -2143,6 +2147,7 @@ shared_ptr<Lobby> create_game_generic(shared_ptr<ServerState> s,
if (game->enemies.empty()) { if (game->enemies.empty()) {
throw runtime_error("failed to load any map data"); throw runtime_error("failed to load any map data");
} }
c->log.info("Loaded maps contain %zu entries overall", game->enemies.size());
} else { } else {
// In non-BB games, just set the variations (we don't track items/enemies/ // In non-BB games, just set the variations (we don't track items/enemies/
src/ReceiveSubcommands.cc
+15 -7
View File
@@ -13,6 +13,7 @@
#include "SendCommands.hh" #include "SendCommands.hh"
#include "Text.hh" #include "Text.hh"
#include "Items.hh" #include "Items.hh"
#include "Map.hh"
using namespace std; using namespace std;
@@ -840,7 +841,6 @@ static void process_subcommand_enemy_hit(shared_ptr<ServerState>,
forward_subcommand(l, c, command, flag, data); forward_subcommand(l, c, command, flag, data);
} }
// enemy killed by player
static void process_subcommand_enemy_killed(shared_ptr<ServerState> s, static void process_subcommand_enemy_killed(shared_ptr<ServerState> s,
shared_ptr<Lobby> l, shared_ptr<Client> c, uint8_t command, uint8_t flag, shared_ptr<Lobby> l, shared_ptr<Client> c, uint8_t command, uint8_t flag,
const string& data) { const string& data) {
@@ -849,10 +849,18 @@ static void process_subcommand_enemy_killed(shared_ptr<ServerState> s,
if (l->version == GameVersion::BB) { if (l->version == GameVersion::BB) {
const auto* cmd = check_size_sc<G_EnemyKilled_6xC8>(data); const auto* cmd = check_size_sc<G_EnemyKilled_6xC8>(data);
if (!l->is_game() || (cmd->enemy_id >= l->enemies.size() || if (!l->is_game()) {
(l->enemies[cmd->enemy_id].hit_flags & 0x80))) { throw runtime_error("client should not kill enemies outside of games");
}
if (cmd->enemy_id >= l->enemies.size()) {
send_text_message(c, u"$C6Missing enemy killed");
return; return;
} }
string e_str = l->enemies[cmd->enemy_id].str();
c->log.info("Enemy killed: entry %hu => %s", cmd->enemy_id.load(), e_str.c_str());
if (l->enemies[cmd->enemy_id].hit_flags & 0x80) {
return; // Enemy is already dead
}
if (l->enemies[cmd->enemy_id].experience == 0xFFFFFFFF) { if (l->enemies[cmd->enemy_id].experience == 0xFFFFFFFF) {
send_text_message(c, u"$C6Unknown enemy type killed"); send_text_message(c, u"$C6Unknown enemy type killed");
return; return;
@@ -862,18 +870,18 @@ static void process_subcommand_enemy_killed(shared_ptr<ServerState> s,
enemy.hit_flags |= 0x80; enemy.hit_flags |= 0x80;
for (size_t x = 0; x < l->max_clients; x++) { for (size_t x = 0; x < l->max_clients; x++) {
if (!((enemy.hit_flags >> x) & 1)) { if (!((enemy.hit_flags >> x) & 1)) {
continue; // player did not hit this enemy continue; // Player did not hit this enemy
} }
auto other_c = l->clients[x]; auto other_c = l->clients[x];
if (!other_c) { if (!other_c) {
continue; // no player continue; // No player
} }
if (other_c->game_data.player()->disp.level >= 199) { if (other_c->game_data.player()->disp.level >= 199) {
continue; // player is level 200 or higher continue; // Player is level 200 or higher
} }
// killer gets full experience, others get 77% // Killer gets full experience, others get 77%
uint32_t exp; uint32_t exp;
if (enemy.last_hit == other_c->lobby_client_id) { if (enemy.last_hit == other_c->lobby_client_id) {
exp = enemy.experience; exp = enemy.experience;