be more aggressive when reducing size of card defs file

This commit is contained in:
Martin Michelsen
2023-08-31 13:35:02 -07:00
parent ee7c574fdf
commit 5b038364a1
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -289,7 +289,7 @@ string prs_compress_optimal(
// For each node, populate the literal value, and the best ways to get to the
// following nodes
for (size_t z = 0; z < in_size; z++) {
if ((z & 0xFFF) == 0) {
if ((z & 0xFFF) == 0 && progress_fn) {
progress_fn(CompressPhase::CONSTRUCT_PATHS, z, in_size, 0);
}
+4 -4
View File
@@ -1799,20 +1799,20 @@ CardIndex::CardIndex(const string& filename, const string& decompressed_filename
if (this->compressed_card_definitions.size() > 0x7BF8) {
// Try to reduce the compressed size by clearing out text
static_game_data_log.info("Compressed card list data is too long; removing text");
static_game_data_log.info("Compressed card list data is too long (0x%zX bytes); removing text", this->compressed_card_definitions.size());
for (size_t x = 0; x < max_cards; x++) {
if (static_cast<int8_t>(defs[x].type) < 0) {
continue;
}
defs[x].jp_name.clear();
defs[x].jp_short_name.clear();
}
uint64_t start = now();
this->compressed_card_definitions = prs_compress(decompressed_data);
this->compressed_card_definitions = prs_compress_optimal(decompressed_data.data(), decompressed_data.size());
uint64_t diff = now() - start;
static_game_data_log.info(
"Compressed card definitions (%zu bytes -> %zu bytes) in %" PRIu64 "ms",
"Compressed card definitions (0x%zX bytes -> 0x%zX bytes) in %" PRIu64 "ms",
decompressed_data.size(), this->compressed_card_definitions.size(), diff);
print_data(stderr, this->compressed_card_definitions);
}
if (this->compressed_card_definitions.size() > 0x7BF8) {
Binary file not shown.