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

add Ep3 NTE side-by-side card defs comparison

Browse Source
This commit is contained in:
Martin Michelsen
2024-10-25 22:31:35 -07:00
parent 823199be2e
commit 84159821e9
3 changed files with 229 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Episode3/DataIndexes.cc
+23 -4
View File
@@ -975,9 +975,25 @@ string CardDefinition::str(bool single_line, const TextSet* text_archive) const
}
}
}
string jp_name_s = this->jp_name.decode();
string en_name_short_s = this->en_short_name.decode();
string jp_name_short_s = this->jp_short_name.decode();
string names_str;
if (!en_name_s.empty()) {
names_str += phosg::string_printf(" EN: \"%s\"", en_name_s.c_str());
if (!en_name_short_s.empty() && en_name_short_s != en_name_s) {
names_str += phosg::string_printf(" (Abr. \"%s\")", en_name_short_s.c_str());
}
}
if (!jp_name_s.empty()) {
names_str += phosg::string_printf(" JP: \"%s\"", jp_name_s.c_str());
if (!jp_name_short_s.empty() && jp_name_short_s != jp_name_s) {
names_str += phosg::string_printf(" (Abr. \"%s\")", jp_name_short_s.c_str());
}
}
return phosg::string_printf(
"\
Card: %04" PRIX32 " \"%s\"\n\
Card: %04" PRIX32 "%s\n\
Type: %s, class: %s\n\
Usability condition: %s\n\
Rank: %s\n\
@@ -998,7 +1014,7 @@ Card: %04" PRIX32 " \"%s\"\n\
%s\n\
Effects:%s",
this->card_id.load(),
en_name_s.c_str(),
names_str.c_str(),
type_str.c_str(),
card_class_str.c_str(),
criterion_str.c_str(),
@@ -2590,12 +2606,15 @@ MapIndex::VersionedMap::VersionedMap(std::string&& compressed_data, uint8_t lang
: language(language),
compressed_data(std::move(compressed_data)) {
string decompressed = prs_decompress(this->compressed_data);
if (decompressed.size() != sizeof(MapDefinition)) {
if (decompressed.size() == sizeof(MapDefinitionTrial)) {
this->map = make_shared<MapDefinition>(*reinterpret_cast<const MapDefinitionTrial*>(decompressed.data()));
} else if (decompressed.size() == sizeof(MapDefinition)) {
this->map = make_shared<MapDefinition>(*reinterpret_cast<const MapDefinition*>(decompressed.data()));
} else {
throw runtime_error(phosg::string_printf(
"decompressed data size is incorrect (expected %zu bytes, read %zu bytes)",
sizeof(MapDefinition), decompressed.size()));
}
this->map = make_shared<MapDefinition>(*reinterpret_cast<const MapDefinition*>(decompressed.data()));
}
shared_ptr<const MapDefinitionTrial> MapIndex::VersionedMap::trial() const {
src/Episode3/DataIndexes.hh
+3 -1
View File
@@ -1413,7 +1413,9 @@ struct MapDefinition { // .mnmd format; also the format of (decompressed) quests
/* 59DC */ uint8_t map_category;
// This field determines block graphics to be used in the Cyber environment.
// There are 10 block types (0-9); if this value is > 9, type 0 is used.
// There are 10 block types (0-9); if this value is > 9, type 0 is used. This
// field has no effect in Ep3 NTE, even though there are 6 different block
// texture files on the NTE disc.
/* 59DD */ uint8_t cyber_block_type;
/* 59DE */ be_uint16_t unknown_a11;