29720407616

Committed 20 Jul 2026 05:59AM UTC coverage: 61.394% (-0.03%) from 61.419%

Build # 29720407616

Build Type

push

github

Committed by

web-flow

Commit Message

Improve uoconvert correctness and speed (#897)

* fix old Tokuno map issue

* quick fixes

* restructure mapwriter to store files in memory until a write is needed

* add dirty flag to only flush files which changed

* change uoconvert use of mapwriter to a stack variable

* added detailed timers to uoconvert map

* precalculate lowest adjacent z so we dont need to calculate again for each tile

* syntax formatting

* read landtiles directly instead of using safe_getmapinfo

* encapsulate the solid block processing result for a single block

* make processing parallel - 5 sec to 2,7 sec for britannia

* add changelog entry

* reduce redundant per-tile work in the solid-block loop

* bucket each static block once instead of rescanning it per tile

readstatics_block() presorts a block's statics by cell in a single pass
(storage order preserved); each tile's bucket then serves directly as the
per-tile scratch, dropping the 64x whole-block rescan and the per-tile copy.
Outputs byte-identical (SHA256 gate, map+maptile, both realms).

* extract merge_shapes and flatten the water-type lookup

- the shape-consolidation loop moves verbatim into merge_shapes(), with
  its invariants and comments; ComputeSolidBlock now reads as
  collect -> filter -> sort -> merge -> emit
- DiscardedWaterTypes is snapshotted into a flat per-graphic table after
  config load; the hot per-static probe drops the tree lookup
Outputs byte-identical (SHA256 gate, map+maptile, both realms).

* name the conversion's magic numbers

MAX_LANDTILE_ID joins LANDTILE_COUNT in plib; wall height, water-discard
window and sand-over-water gap become named constexprs. Landtile classifiers become constexpr in
terrainplane.h with their id lists sourced. Outputs byte-identical.

* unify the block-index math into one helper per layout

realm_block_index (8x8 row-major: base.dat/solidx1/statics.dat),
maptile_index (64x64, rounded-up stride), and staticblock_from_coords
(client mul column-major, reused ... (continued)

Coverage Stats

513 of 641 new or added lines in 22 files covered. (80.03%)

47 existing lines in 8 files now uncovered.

45116 of 73486 relevant lines covered (61.39%)

516637.68 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

69.92

/pol-core/uoconvert/UoConvertMain.cpp

#include "UoConvertMain.h"

#include <algorithm>
#include <chrono>
#include <cstring>
#include <stdexcept>
#include <stdio.h>
#include <string.h>
#include <string>
#include <vector>

#include "clib/Program/ProgramMain.h"
#include "clib/cfgelem.h"
#include "clib/cfgfile.h"
#include "clib/fileutil.h"
#include "clib/logfacility.h"
#include "clib/passert.h"
#include "clib/rawtypes.h"
#include "clib/stlutil.h"
#include "clib/timer.h"
#include "plib/clidata.h"
#include "plib/mapcell.h"
#include "plib/mapfunc.h"
#include "plib/mapshape.h"
#include "plib/mapsolid.h"
#include "plib/maptile.h"
#include "plib/mapwriter.h"
#include "plib/mul/map.h"
#include "plib/objtype.h"
#include "plib/polfile.h"
#include "plib/realmdescriptor.h"
#include "plib/systemstate.h"
#include "plib/udatfile.h"
#include "plib/uofile.h"
#include "plib/uofilei.h"
#include "plib/uoinstallfinder.h"
#include "plib/uopreader/uop.h"
#include "plib/uopreader/uophash.h"
#include "plib/ustruct.h"
#include "pol/landtile.h"

#include "parallel.h"
#include "terrainplane.h"


namespace Pol::UoConvert
{
using namespace std;
using namespace Pol::Core;
using namespace Pol::Plib;

namespace
{
// RAII owner for the C FILE* handles used by the .cfg writers below, so an early
// return or a throw closes the file instead of leaking it. Implicitly converts
// to FILE*, so the fprintf-based writer code reads exactly as before.
class UniqueFile
{
public:
  explicit UniqueFile( FILE* fp ) : fp_( fp ) {}
  ~UniqueFile()
  {
    if ( fp_ )
      fclose( fp_ );
  }
  UniqueFile( const UniqueFile& ) = delete;
  UniqueFile& operator=( const UniqueFile& ) = delete;

  operator FILE*() const { return fp_; }

private:
  FILE* fp_;
};

// Open a text file for writing, throwing with the path on failure (the old code
// left the FILE* unchecked and would crash on the first fprintf).
UniqueFile open_out_text( const std::string& path )
{
  FILE* fp = fopen( path.c_str(), "wt" );
  if ( !fp )
    throw std::runtime_error( "Unable to open output file for writing: " + path );
  return UniqueFile( fp );
}
}  // namespace

///////////////////////////////////////////////////////////////////////////////


///////////////////////////////////////////////////////////////////////////////

UoConvertMain::UoConvertMain()
    : Pol::Clib::ProgramMain(), cfg_use_no_shoot( false ), cfg_LOS_through_windows( false )
{
}
UoConvertMain::~UoConvertMain() = default;
///////////////////////////////////////////////////////////////////////////////

void UoConvertMain::showHelp()
{
  ERROR_PRINTLN( std::string{
      "Usage:\n"
      "    \n"
      "  UOCONVERT command [options ...]\n"
      "    \n"
      "  Commands: \n"
      "    map {uodata=Dir} {realm=realmname} {width=Width}        {height=Height} {mapid=0} "
      "{readuop=1} {x=X} {y=Y} {profile=0} {threads=0}\n"
      "    statics {uodata=Dir} {realm=realmname}\n"
      "    maptile {uodata=Dir} {realm=realmname}\n"
      "    multis {uodata=Dir} {outdir=dir}\n"
      "    tiles {uodata=Dir} {outdir=dir}\n"
      "    landtiles {uodata=Dir} {outdir=dir}" } );
}

using namespace Core;
using namespace Plib;

// A WALL-flagged landtile is treated as a solid of this height, unless a static
// sitting on it caps it lower (see the wall override in ComputeSolidBlock).
constexpr short WALL_LANDTILE_HEIGHT = 20;

// A discarded-water static replaces the map base only when it lies at or above
// the terrain top by at most this many z (statics further up are unrelated water).
constexpr short WATER_DISCARD_Z_WINDOW = 10;

// "Sand over water": a shape starting at most this far above a water shape is
// extended downward to meet it (see merge_shapes).
constexpr short SAND_OVER_WATER_MAX_GAP = 4;

void UoConvertMain::display_flags()
{
  for ( unsigned blocking = 0; blocking <= 1; ++blocking )
  {
    for ( unsigned platform = 0; platform <= 1; ++platform )
    {
      for ( unsigned walk = 0; walk <= 1; ++walk )
      {
        for ( unsigned wall = 0; wall <= 1; ++wall )
        {
          for ( unsigned half = 0; half <= 1; ++half )
          {
            for ( unsigned floor = 0; floor <= 1; ++floor )
            {
              unsigned flags = 0;
              if ( blocking )
                flags |= USTRUCT_TILE::FLAG_BLOCKING;
              if ( platform )
                flags |= USTRUCT_TILE::FLAG_PLATFORM;
              if ( walk )
                flags |= USTRUCT_TILE::FLAG__WALK;
              if ( wall )
                flags |= USTRUCT_TILE::FLAG_WALL;
              if ( half )
                flags |= USTRUCT_TILE::FLAG_HALF_HEIGHT;
              if ( floor )
                flags |= USTRUCT_TILE::FLAG_FLOOR;

              unsigned int polflags = Plib::polflags_from_tileflags(
                  0x4000, flags, cfg_use_no_shoot, cfg_LOS_through_windows );
              unsigned moveland = ( polflags & Plib::FLAG::MOVELAND ) ? 1 : 0;
              INFO_PRINTLN( "{} {} {} {} {} {}: {}", blocking, platform, walk, wall, half, floor,
                            moveland );
            }
          }
        }
      }
    }
  }
}

void UoConvertMain::create_maptile( const std::string& realmname )
{
  Plib::RealmDescriptor descriptor = Plib::RealmDescriptor::Load( realmname );
  uo_map_height = static_cast<unsigned short>( descriptor.height );
  uo_map_width = static_cast<unsigned short>( descriptor.width );

  INFO_PRINTLN(
      "Creating maptile file.\n"
      "  Realm: {}\n"
      "  Map ID: {}\n"
      "  Use Dif files: {}\n"
      "  Size: {}x{}",
      realmname, descriptor.uomapid, ( descriptor.uodif ? "Yes" : "No" ), uo_map_width,
      uo_map_height );

  Plib::MapWriter writer;
  writer.OpenExistingFiles( realmname );

  // Same precomputed terrain as create_map; maptile only needs the landtile id and the
  // effective (liquid-overridden) z per tile, so skip the lowest-adjacent-z pass.
  rawmapfullread();
  TerrainPlane plane;
  plane.build( uo_map_width, uo_map_height, /*need_low_z=*/false, cfg_threads );

  // Plain row-major sweep; the old 64x64 blocked iteration only existed to suit the
  // former one-block writer cache, which got replaced with in-memory buffers.
  for ( unsigned short y = 0; y < uo_map_height; ++y )
  {
    if ( y % Plib::MAPTILE_CHUNK == 0 )
      INFO_PRINT( "\rConverting: {}%", y * 100 / uo_map_height );
    for ( unsigned short x = 0; x < uo_map_width; ++x )
    {
      const std::size_t plane_idx = plane.index( x, y );
      const u16 landtile = plane.landtile[plane_idx];
      const s8 z = plane.eff_z[plane_idx];  // effective z (liquid override applied)

      if ( landtile > Plib::MAX_LANDTILE_ID )
        INFO_PRINTLN( "Tile {:#x} at ({},{},{}) is an invalid ID!", landtile, x, y, z );

      Plib::MAPTILE_CELL cell;
      cell.landtile = landtile;
      cell.z = z;
      writer.SetMapTile( x, y, cell );
    }
  }
  writer.Flush();
  INFO_PRINTLN( "\rConversion complete." );
}

class StaticsByZ
{
public:
  bool operator()( const StaticRec& a, const StaticRec& b ) const
  {
    return ( a.z < b.z ) || ( ( a.z == b.z && a.height < b.height ) );
  }
};


constexpr bool flags_match( unsigned int f1, unsigned int f2, unsigned char bits_compare )
{
  return ( f1 & bits_compare ) == ( f2 & bits_compare );
}

void UoConvertMain::update_map( const std::string& realm, unsigned short x, unsigned short y )
{
  MapWriter mapwriter;
  mapwriter.OpenExistingFiles( realm );
  rawmapfullread();
  rawstaticfullread();
  unsigned short x_base = x / SOLIDX_X_SIZE * SOLIDX_X_SIZE;
  unsigned short y_base = y / SOLIDX_Y_SIZE * SOLIDX_Y_SIZE;

  // ProcessSolidBlock reads the smoothed-terrain plane; build the full plane. This is a
  // rarely-used single-block debug path (x=/y= args), so the full build is acceptable.
  TerrainPlane plane;
  plane.build( uo_map_width, uo_map_height, /*need_low_z=*/true, cfg_threads );

  BlockResult result;
  ComputeSolidBlock( x_base, y_base, plane, result );
  StitchBlock( mapwriter, x_base, y_base, result );
  INFO_PRINTLN( "empty={}, nonempty={}\nwith more_solids: {}\ntotal statics={}", empty, nonempty,
                with_more_solids, total_statics );
}

void UoConvertMain::create_map( const std::string& realm, unsigned short width,
                                unsigned short height )
{
  MapWriter mapwriter;
  INFO_PRINT(
      "Creating map base and solids files.\n"
      "  Realm: {}\n"
      "  Map ID: {}\n"
      "  Reading UOP file: {}\n"
      "  Use Dif files: {}\n"
      "  Size: {}x{}\n"
      "Initializing files: ",
      realm, uo_mapid, ( uo_readuop ? "Yes" : "No" ), ( uo_usedif ? "Yes" : "No" ), uo_map_width,
      uo_map_height );
  // Reset the opt-in per-tile profiling accumulators for this run.
  prof_mapinfo_ns = prof_statics_ns = prof_shape_ns = prof_writer_ns = 0;

  // Coarse, always-on phase timers so a plain run shows where the wall-clock goes
  // (file init vs map read vs static read vs the hot loop vs the final flush).
  Tools::Timer<> init_timer;
  mapwriter.CreateNewFiles( realm, width, height );
  init_timer.stop();
  INFO_PRINTLN( "Done." );

  Tools::Timer<> mapread_timer;
  rawmapfullread();
  mapread_timer.stop();

  Tools::Timer<> staticread_timer;
  rawstaticfullread();
  staticread_timer.stop();

  // Precompute the smoothed-terrain plane once (safe_getmapinfo + lowest-adjacent-z for
  // every tile) so the block loop below is flat array reads instead of ~36 raw cell
  // fetches per tile. The plane is immutable during the loop.
  Tools::Timer<> plane_timer;
  TerrainPlane plane;
  plane.build( width, height, /*need_low_z=*/true, cfg_threads );
  plane_timer.stop();

  // ComputeSolidBlock runs concurrently below and calls getstaticblock / the raw-map
  // readers, whose lazy first-touch init (rawstaticfullread / rawmapfullread) would race if
  // it fired inside the parallel region. Both were already forced above; assert it so a
  // future reorder trips here instead of racing.
  passert_always( Plib::rawmap_loaded() );
  passert_always( Plib::rawstatics_loaded() );

  // Phase A/B: compute every block in parallel over contiguous block-row bands (each
  // ComputeSolidBlock is pure and writes only its own BlockResult -- no shared state), in a
  // single parallel region (threads spawned once). Then stitch all blocks into the writer
  // serially in the fixed y-outer/x-inner order so the solids/solidx2 append offsets, and thus
  // every output byte, stay identical to a serial run. Profiling forces the compute serial:
  // per-tile timings are meaningless summed across overlapping threads. threads=0 =>
  // hardware_concurrency.
  const unsigned block_threads = cfg_profile ? 1u : cfg_threads;
  const std::size_t blocks_per_row =
      ( static_cast<std::size_t>( width ) + SOLIDX_X_SIZE - 1 ) / SOLIDX_X_SIZE;
  const std::size_t num_block_rows =
      ( static_cast<std::size_t>( height ) + SOLIDX_Y_SIZE - 1 ) / SOLIDX_Y_SIZE;
  std::vector<BlockResult> results( blocks_per_row * num_block_rows );

  Tools::Timer<> loop_timer;
  parallel_for(
      num_block_rows,
      [&]( std::size_t yr )
      {
        const unsigned short y_base = static_cast<unsigned short>( yr * SOLIDX_Y_SIZE );
        for ( std::size_t xi = 0; xi < blocks_per_row; ++xi )
        {
          const unsigned short x_base = static_cast<unsigned short>( xi * SOLIDX_X_SIZE );
          ComputeSolidBlock( x_base, y_base, plane, results[yr * blocks_per_row + xi] );
        }
      },
      block_threads );

  for ( std::size_t yr = 0; yr < num_block_rows; ++yr )
  {
    const unsigned short y_base = static_cast<unsigned short>( yr * SOLIDX_Y_SIZE );
    for ( std::size_t xi = 0; xi < blocks_per_row; ++xi )
    {
      const unsigned short x_base = static_cast<unsigned short>( xi * SOLIDX_X_SIZE );
      StitchBlock( mapwriter, x_base, y_base, results[yr * blocks_per_row + xi] );
    }
    INFO_PRINT( "\rConverting: {}%", static_cast<unsigned>( yr ) * 100 / num_block_rows );
  }
  loop_timer.stop();

  Tools::Timer<> flush_timer;
  mapwriter.WriteConfigFile();
  mapwriter.Flush();  // surface any write errors before reporting success
  flush_timer.stop();

  long long total_ms = init_timer.ellapsed() + mapread_timer.ellapsed() +
                       staticread_timer.ellapsed() + plane_timer.ellapsed() +
                       loop_timer.ellapsed() + flush_timer.ellapsed();

  INFO_PRINTLN(
      "\rConversion complete.\n"
      "Conversion details:\n"
      "  Total blocks: {}\n"
      "  Blocks with solids: {} ({}%)\n"
      "  Blocks without solids: {} ({}%)\n"
      "  Locations with solids: {}\n"
      "  Total number of solids: {}\n"
      "Timing:\n"
      "  Init files:   {} ms\n"
      "  Map read:     {} ms\n"
      "  Static read:  {} ms\n"
      "  Terrain plane:{} ms\n"
      "  Process loop: {} ms\n"
      "  Config+flush: {} ms\n"
      "  Total:        {} ms",
      empty + nonempty, nonempty, ( nonempty * 100 / ( empty + nonempty ) ), empty,
      ( empty * 100 / ( empty + nonempty ) ), with_more_solids, total_statics,
      init_timer.ellapsed(), mapread_timer.ellapsed(), staticread_timer.ellapsed(),
      plane_timer.ellapsed(), loop_timer.ellapsed(), flush_timer.ellapsed(), total_ms );

  if ( cfg_profile )
  {
    // Sub-totals of the process loop (see prof_* members). Their sum is slightly below the
    // loop time; the remainder is block bookkeeping plus the chrono-read overhead itself.
    auto to_ms = []( long long ns ) { return ns / 1'000'000; };
    INFO_PRINTLN(
        "Process loop breakdown (profile=1):\n"
        "    Map-info:    {} ms\n"
        "    Statics:     {} ms\n"
        "    Shape-build: {} ms\n"
        "    Writer:      {} ms\n"
        "    Sum:         {} ms",
        to_ms( prof_mapinfo_ns ), to_ms( prof_statics_ns ), to_ms( prof_shape_ns ),
        to_ms( prof_writer_ns ),
        to_ms( prof_mapinfo_ns + prof_statics_ns + prof_shape_ns + prof_writer_ns ) );
  }
}

// Consolidate one tile's statics (sorted descending by z/height, consumed via
// pop_back) into the tile's final shape stack: shapes[0] becomes the map base,
// the rest the cell's solid runs, bottom-up. See the declaration for the contract;
// every rule below is reflected byte-for-byte in solids.dat, so treat any change
// here as an output-format change.
void UoConvertMain::merge_shapes( StaticList& statics, std::vector<MapShape>& shapes ) const
{
  shapes.clear();

  // try to consolidate like shapes, and discard ones we don't care about.
  while ( !statics.empty() )
  {
    StaticRec srec = statics.back();
    statics.pop_back();

    unsigned int polflags = polflags_from_tileflags( srec.graphic, srec.flags, cfg_use_no_shoot,
                                                     cfg_LOS_through_windows );
    if ( ( ~polflags & FLAG::MOVELAND ) && ( ~polflags & FLAG::MOVESEA ) &&
         ( ~polflags & FLAG::BLOCKSIGHT ) && ( ~polflags & FLAG::BLOCKING ) &&
         ( ~polflags & FLAG::OVERFLIGHT ) )
    {
      // Invariant from the caller's filter: every element still in `statics` has
      // at least one of these bits set, so this can never fire.
      passert_always( 0 );
      continue;
    }

    if ( shapes.empty() )
    {
      // this, whatever it is, is the map base.
      // TODO: look for water statics and use THOSE as the map.
      // these will be converted below to make the map "solid"; the lowest
      // level is always gradual no matter what.
      // emplace_back( z, height, flags ) throughout this function: constructing the
      // MapShape in place lets the compiler keep the working shape in registers
      // (push_back's const& parameter forces it into memory for the copy).
      shapes.emplace_back( srec.z, short{ 0 }, ( polflags & 0xFFu ) | FLAG::GRADUAL );

      // for wall flag - map tile always height 0, at bottom. if map tile has height, add it as
      // a static
      if ( srec.height != 0 )
        shapes.emplace_back( srec.z, srec.height, polflags );
      continue;
    }

    MapShape& prev = shapes.back();
    // we're adding it.
    MapShape shape{ .z = srec.z, .height = srec.height, .flags = polflags };

    // always add the map shape seperately
    if ( shapes.size() == 1 )
    {
      shapes.emplace_back( shape.z, shape.height, shape.flags );
      continue;
    }

    if ( shape.z < prev.z + prev.height )
    {
      // things can't exist in the same place.
      // shrink the bottom part of this shape.
      // if that would give it negative height, then skip it.
      short height_remove = prev.z + prev.height - shape.z;
      if ( height_remove <= shape.height )
      {
        shape.z += height_remove;
        shape.height -= height_remove;
      }
      else
      {  // example: 5530, 14
        continue;
      }
    }

    // sometimes water has "sand" a couple z-coords above it.
    // We'll try to detect this (really, anything that is up to
    // SAND_OVER_WATER_MAX_GAP dist from water) and extend the thing above downward.
    if ( ( prev.flags & FLAG::MOVESEA ) && ( shape.z > prev.z + prev.height ) &&
         ( shape.z <= prev.z + prev.height + SAND_OVER_WATER_MAX_GAP ) )
    {
      short height_add = shape.z - prev.z - prev.height;
      shape.z -= height_add;
      shape.height += height_add;
    }
    if ( ( prev.flags & FLAG::MOVESEA ) && ( prev.z + prev.height == -5 ) &&
         ( shape.flags & FLAG::MOVESEA ) && ( shape.z == 25 ) )
    {
      // The client's statics0.mul really does contain stray water statics (0x1796)
      // floating at z=25 directly above ordinary ocean whose surface tops out at -5;
      // on real Britannia (map1) e.g. around (1344,573) and (1703,450). Dropping
      // them keeps the ocean a single walkable-sea shape instead of stacking a
      // phantom water slab 30z above it. The -5 and 25 literals are those exact
      // client-data values, not tunables.
      continue;
    }

    if ( shape.z > prev.z + prev.height )
    {
      //
      // elevated above what's below, must include separately
      //

      shapes.emplace_back( shape.z, shape.height, shape.flags );
      continue;
    }

    passert_always( shape.z == prev.z + prev.height );

    if ( shape.z == prev.z + prev.height )
    {
      //
      // sitting right on top of the previous solid
      //

      // standable atop non-standable: standable
      // nonstandable atop standable: nonstandable
      // etc
      bool can_combine = flags_match( prev.flags, shape.flags, FLAG::BLOCKSIGHT | FLAG::BLOCKING );
      if ( prev.flags & FLAG::MOVELAND && ~shape.flags & FLAG::BLOCKING &&
           ~shape.flags & FLAG::MOVELAND )
      {
        can_combine = false;
      }

      if ( can_combine )
      {
        prev.flags = shape.flags;
        prev.height += shape.height;
      }
      else  // if one blocks LOS, but not the other, they can't be combined this way.
      {
        shapes.emplace_back( shape.z, shape.height, shape.flags );
        continue;
      }
    }
  }
}

// Phase A (pure compute): produce this block's cells, solids, and block-local index
// data from immutable inputs only. Deliberately touches no MapWriter and no
// UoConvertMain counters -- stats and warnings accumulate into `result` so this can
// run concurrently across blocks. StitchBlock() folds the result into the MapWriter
// in block order.
void UoConvertMain::ComputeSolidBlock( unsigned short x_base, unsigned short y_base,
                                       const TerrainPlane& plane, BlockResult& result ) const
{
  // Raw UO tile flags fetched for every tile's statics below. Any static reaching
  // `statics` is guaranteed to have at least one of these bits set, so nothing
  // downstream needs to re-check srec.flags against this same mask.
  static constexpr unsigned int kSolidStaticFlags =
      USTRUCT_TILE::FLAG_BLOCKING | USTRUCT_TILE::FLAG_PLATFORM | USTRUCT_TILE::FLAG_HALF_HEIGHT |
      USTRUCT_TILE::FLAG_LIQUID | USTRUCT_TILE::FLAG_HOVEROVER;

  // Reset the caller's buffer, retaining vector capacity so reusing one BlockResult across
  // blocks avoids per-block heap allocation. addindex must be re-zeroed (the stitch copies
  // it wholesale and run-less cells must read 0); cells are fully rewritten for the clamped
  // region and never read outside it, so they need no reset.
  result.solids.clear();
  result.warnings.clear();
  result.has_solids = false;
  result.nonempty_locations = 0;
  result.total_statics = 0;
  result.prof_mapinfo_ns = result.prof_statics_ns = result.prof_shape_ns = 0;
  std::memset( result.addindex, 0, sizeof( result.addindex ) );

  // Block-local, 0-based count of solid elements appended so far in this block. Replaces
  // the old `NextSolidIndex() - baseindex` math (which was already block-local); the
  // stitch rebases it against the live solids buffer.
  unsigned int local_elems = 0;

  unsigned short x_add_max = SOLIDX_X_SIZE, y_add_max = SOLIDX_Y_SIZE;
  if ( x_base + x_add_max > uo_map_width )
    x_add_max = uo_map_width - x_base;
  if ( y_base + y_add_max > uo_map_height )
    y_add_max = uo_map_height - y_base;
  result.x_add_max = x_add_max;
  result.y_add_max = y_add_max;

  // Reused across tiles (cleared, not reconstructed) to avoid a per-tile
  // allocation across the ~25M tiles a full map conversion visits. The reserve
  // covers the typical per-tile count, so most tiles never reallocate at all.
  std::vector<MapShape> shapes;
  shapes.reserve( 8 );

  // Opt-in per-tile profiling: `t` is a rolling cursor and lap() folds the elapsed time
  // since the last cursor into an accumulator, advancing the cursor. Guarded by cfg_profile
  // at every call site so a normal run does no chrono reads at all.
  using ProfClock = std::chrono::high_resolution_clock;
  ProfClock::time_point t;
  auto lap = [&]( long long& acc )
  {
    auto now = ProfClock::now();
    acc += std::chrono::duration_cast<std::chrono::nanoseconds>( now - t ).count();
    t = now;
  };

  // All of this block's statics, bucketed per cell in a single pass over the raw
  // block, instead of one whole-block readstatics() scan per tile (64x the work).
  // thread_local so each parallel worker reuses one scratch -- with its vectors'
  // capacity -- across every block of its band; BlockResult itself is per-block in
  // create_map, so the scratch must not live there.
  thread_local StaticBuckets cell_statics;
  if ( cfg_profile )
    t = ProfClock::now();
  readstatics_block( cell_statics, x_base, y_base, kSolidStaticFlags );
  if ( cfg_profile )
    lap( result.prof_statics_ns );

  for ( unsigned short x_add = 0; x_add < x_add_max; ++x_add )
  {
    for ( unsigned short y_add = 0; y_add < y_add_max; ++y_add )
    {
      unsigned short x = x_base + x_add;
      unsigned short y = y_base + y_add;

      if ( cfg_profile )
        t = ProfClock::now();

      // read the precomputed smoothed terrain, and treat it like a static.
      const std::size_t plane_idx = plane.index( x, y );
      const u16 landtile = plane.landtile[plane_idx];
      short z = plane.eff_z[plane_idx];  // effective z: the liquid override is already folded in

      if ( landtile > MAX_LANDTILE_ID )
        result.warnings.push_back(
            fmt::format( "Tile {:#x} at ({},{},{}) is an invalid ID!", landtile, x, y, z ) );

      short low_z = plane.low_z[plane_idx];

      short lt_height = z - low_z;
      z = low_z;

      if ( landtile > MAX_LANDTILE_ID )
        result.warnings.push_back(
            fmt::format( "Tile {:#x} at ({},{},{}) is an invalid ID!", landtile, x, y, z ) );

      unsigned int lt_flags = Plib::landtile_uoflags_read( landtile );
      if ( ~lt_flags & USTRUCT_TILE::FLAG_BLOCKING )
      {  // this seems to be the default.
        lt_flags |= USTRUCT_TILE::FLAG_PLATFORM;
      }
      lt_flags |=
          USTRUCT_TILE::FLAG_NO_SHOOT;  // added to make sure people using noshoot will have shapes
      // generated by this tile in future block LOS, shouldn't
      // affect people using old LOS method one way or another.
      lt_flags |= USTRUCT_TILE::FLAG_FLOOR;
      lt_flags |= USTRUCT_TILE::FLAG_HALF_HEIGHT;  // the entire map is this way

      if ( lt_flags & USTRUCT_TILE::FLAG_WALL )
        lt_height = WALL_LANDTILE_HEIGHT;

      if ( cfg_profile )
        lap( result.prof_mapinfo_ns );

      // This tile's bucket doubles as the mutable per-tile scratch: the merge loop
      // below consumes it via pop_back, and readstatics_block re-clears it for the
      // next block, so no copy into a separate vector is needed.
      StaticList& statics = cell_statics[x_add * STATICBLOCK_CHUNK + y_add];

      std::erase_if( statics,
                     [this]( const StaticRec& srec )
                     {
                       unsigned int polflags = polflags_from_tileflags(
                           srec.graphic, srec.flags, cfg_use_no_shoot, cfg_LOS_through_windows );
                       return ( ~polflags & FLAG::MOVELAND ) && ( ~polflags & FLAG::MOVESEA ) &&
                              ( ~polflags & FLAG::BLOCKSIGHT ) && ( ~polflags & FLAG::BLOCKING ) &&
                              ( ~polflags & FLAG::OVERFLIGHT );
                     } );

      if ( cfg_profile )
        lap( result.prof_statics_ns );

      bool addMap = true;

      for ( const auto& srec : statics )
      {
        // Look for water tiles. If there are any, discard the map (which is usually at -15 anyway)
        if ( z + lt_height <= srec.z &&
             // only where the map is below or same Z as the static
             ( ( srec.z - ( z + lt_height ) ) <= WATER_DISCARD_Z_WINDOW ) &&
             is_discarded_water[srec.graphic] )
        {
          // arr, there be water here
          addMap = false;
        }

        // if there's a static on top of one of these "wall" landtiles, make it override.
        if ( ( lt_flags & USTRUCT_TILE::FLAG_WALL ) &&  // wall?
             z <= srec.z && srec.z - z <= lt_height )
        {
          lt_height = srec.z - z;
        }
      }
      // shadows above caves (check the cheap emptiness test first; most tiles
      // have no statics at all)
      if ( !statics.empty() && is_cave_shadow( landtile ) )
      {
        addMap = false;
      }


      // If the map is a NODRAW tile, and there are statics, discard the map tile
      if ( landtile == 2 && !statics.empty() )
        addMap = false;

      if ( addMap )
        statics.emplace_back( 0, static_cast<signed char>( z ), lt_flags,
                              static_cast<char>( lt_height ) );

      if ( statics.size() > 1 )
      {
        sort( statics.begin(), statics.end(), StaticsByZ() );
        reverse( statics.begin(), statics.end() );
      }

      merge_shapes( statics, shapes );

      // the first StaticShape is the map base; the rest are this cell's solid runs
      // (left in place -- no need to pay an O(n) front erase per tile).
      const MapShape& base = shapes[0];
      const size_t num_runs = shapes.size() - 1;
      MAPCELL cell;
      passert_always( base.height == 0 );
      cell.z = static_cast<signed char>(
          base.z );  // assume now map has height=1. a static was already added if it was >0
      cell.flags = static_cast<u8>( base.flags );
      if ( num_runs != 0 )
        cell.flags |= FLAG::MORE_SOLIDS;

      if ( cfg_profile )
        lap( result.prof_shape_ns );

      result.cells.cell[x_add][y_add] = cell;

      if ( num_runs != 0 )
      {
        ++result.nonempty_locations;
        result.total_statics += static_cast<unsigned int>( num_runs );
        result.has_solids = true;

        // Block-local element offset of this cell's first run. Captured before the
        // appends below, so it equals the count of runs emitted by earlier cells of
        // this block -- identical to the old `NextSolidIndex() - baseindex`.
        unsigned int addindex = local_elems;
        if ( addindex > std::numeric_limits<unsigned short>::max() )
          throw std::runtime_error( "addoffset overflow" );
        result.addindex[x_add][y_add] = static_cast<unsigned short>( addindex );
        for ( size_t j = 1; j < shapes.size(); ++j )
        {
          const MapShape& shape = shapes[j];
          char _z, height, flags;
          _z = static_cast<char>( shape.z );
          height = static_cast<char>( shape.height );
          flags = static_cast<u8>( shape.flags );
          if ( !height )  // make 0 height solid
          {
            --_z;
            ++height;
          }

          if ( j != shapes.size() - 1 )
            flags |= FLAG::MORE_SOLIDS;
          result.solids.emplace_back( _z, height, flags );
          ++local_elems;
        }
      }
    }
  }
}

// Phase B (stitch): fold one block's compute result into the MapWriter. Runs in the
// exact block order create_map used to run ProcessSolidBlock, so every solids/solidx2
// append offset -- and thus every byte of solidx1/solidx2 -- is identical to the old
// serial path.
void UoConvertMain::StitchBlock( MapWriter& mapwriter, unsigned short x_base, unsigned short y_base,
                                 const BlockResult& result )
{
  // Reduce the per-block stat sums into the run-wide counters.
  with_more_solids += result.nonempty_locations;
  total_statics += result.total_statics;
  if ( cfg_profile )
  {
    prof_mapinfo_ns += result.prof_mapinfo_ns;
    prof_statics_ns += result.prof_statics_ns;
    prof_shape_ns += result.prof_shape_ns;
  }

  // Replay invalid-ID warnings in the order they were produced.
  for ( const auto& w : result.warnings )
    INFO_PRINTLN( "{}", w );

  // Time the MapWriter mutations as the "writer" slice of the loop breakdown (the
  // per-tile writer laps moved out of ComputeSolidBlock, which no longer writes).
  using ProfClock = std::chrono::high_resolution_clock;
  ProfClock::time_point writer_start;
  if ( cfg_profile )
    writer_start = ProfClock::now();

  // Cell writes are disjoint per block. A full block (the only case in practice --
  // map dimensions are enforced divisible by 8) is one aligned block assignment;
  // the per-cell fallback covers a hypothetical edge-clamped partial block.
  if ( result.x_add_max == SOLIDX_X_SIZE && result.y_add_max == SOLIDX_Y_SIZE )
  {
    mapwriter.SetMapBlock( x_base, y_base, result.cells );
  }
  else
  {
    for ( unsigned short x_add = 0; x_add < result.x_add_max; ++x_add )
      for ( unsigned short y_add = 0; y_add < result.y_add_max; ++y_add )
        mapwriter.SetMapCell( x_base + x_add, y_base + y_add, result.cells.cell[x_add][y_add] );
  }

  if ( !result.has_solids )
  {
    ++empty;
    mapwriter.SetSolidx2Offset( x_base, y_base, 0 );
  }
  else
  {
    ++nonempty;
    SOLIDX2_ELEM idx2_elem{};
    idx2_elem.baseindex = mapwriter.NextSolidIndex();
    // addindex is already block-local and zero for run-less cells -- emit as-is.
    std::memcpy( idx2_elem.addindex, result.addindex, sizeof( idx2_elem.addindex ) );

    // Byte offset this block's solidx2 elem lands at (before appending it).
    unsigned int idx2_offset = mapwriter.NextSolidx2Offset();
    mapwriter.AppendSolidx2Elem( idx2_elem );
    for ( const auto& solid : result.solids )
      mapwriter.AppendSolid( solid );
    mapwriter.SetSolidx2Offset( x_base, y_base, idx2_offset );
  }

  if ( cfg_profile )
  {
    auto now = ProfClock::now();
    prof_writer_ns +=
        std::chrono::duration_cast<std::chrono::nanoseconds>( now - writer_start ).count();
  }
}

std::string UoConvertMain::resolve_type_from_id( unsigned id ) const
{
  if ( BoatTypes.contains( id ) )
    return "Boat";
  return "Multi";
}

void UoConvertMain::write_multi_element( FILE* multis_cfg, const USTRUCT_MULTI_ELEMENT& elem,
                                         const std::string& mytype, bool& first )
{
  if ( elem.graphic == GRAPHIC_NODRAW )
    return;

  std::string type = elem.flags ? "static" : "dynamic";

  if ( mytype == "Boat" && first && elem.graphic != 1 )
    type = "static";

  std::string comment;
  if ( cfg_use_new_hsa_format )
  {
    USTRUCT_TILE_HSA tile;
    readtile( elem.graphic, &tile );
    comment.assign( tile.name, sizeof( tile.name ) );
  }
  else
  {
    USTRUCT_TILE tile;
    readtile( elem.graphic, &tile );
    comment.assign( tile.name, sizeof( tile.name ) );
  }

  fprintf( multis_cfg, "    %-7s 0x%04x %4d %4d %4d   // %s\n", type.c_str(), elem.graphic, elem.x,
           elem.y, elem.z, comment.c_str() );

  first = false;
}

void UoConvertMain::write_multi( FILE* multis_cfg, unsigned id,
                                 std::vector<Plib::USTRUCT_MULTI_ELEMENT>& multi_elems )
{
  std::string mytype = resolve_type_from_id( id );

  fprintf( multis_cfg, "%s 0x%x\n", mytype.c_str(), id );
  fprintf( multis_cfg, "{\n" );

  bool first = true;
  for ( const auto& elem : multi_elems )
  {
    write_multi_element( multis_cfg, elem, mytype, first );
  }

  fprintf( multis_cfg, "}\n\n" );
}

void UoConvertMain::write_multi( FILE* multis_cfg, unsigned id, FILE* multi_mul,
                                 unsigned int offset, unsigned int length )
{
  USTRUCT_MULTI_ELEMENT elem;
  unsigned int count =
      cfg_use_new_hsa_format ? length / sizeof( USTRUCT_MULTI_ELEMENT_HSA ) : length / sizeof elem;

  std::string mytype = resolve_type_from_id( id );

  fprintf( multis_cfg, "%s 0x%x\n", mytype.c_str(), id );
  fprintf( multis_cfg, "{\n" );

  if ( fseek( multi_mul, offset, SEEK_SET ) != 0 )
  {
    throw std::runtime_error( "write_multi(): fseek() failed" );
  }


  bool first = true;
  while ( count-- )
  {
    if ( fread( &elem, sizeof elem, 1, multi_mul ) != 1 )
    {
      throw std::runtime_error( "write_multi(): fread() failed" );
    }

    if ( cfg_use_new_hsa_format )
    {
      if ( fseek( multi_mul, 4, SEEK_CUR ) != 0 )
        throw std::runtime_error( "write_multi(): fseek() failed" );
    }

    write_multi_element( multis_cfg, elem, mytype, first );
  }

  fprintf( multis_cfg, "}\n\n" );
}

void UoConvertMain::create_multis_cfg( FILE* multi_idx, FILE* multi_mul, FILE* multis_cfg )
{
  if ( fseek( multi_idx, 0, SEEK_SET ) != 0 )
    throw std::runtime_error( "create_multis_cfg: fseek failed" );
  unsigned count = 0;
  USTRUCT_IDX idxrec;
  for ( int i = 0; fread( &idxrec, sizeof idxrec, 1, multi_idx ) == 1; ++i )
  {
    const USTRUCT_VERSION* vrec = nullptr;

    if ( check_verdata( VERFILE_MULTI_MUL, i, vrec ) )
    {
      write_multi( multis_cfg, i, verfile, vrec->filepos, vrec->length );
      ++count;
    }
    else
    {
      if ( idxrec.offset == 0xFFffFFffLu )
        continue;

      write_multi( multis_cfg, i, multi_mul, idxrec.offset, idxrec.length );
      ++count;
    }
  }
  INFO_PRINTLN( "{} multi definitions written to multis.cfg", count );
}

void UoConvertMain::create_multis_cfg()
{
  std::map<unsigned int, std::vector<USTRUCT_MULTI_ELEMENT>> multi_map;

  std::string outdir = programArgsFindEquals( "outdir=", "." );
  UniqueFile multis_cfg = open_out_text( outdir + "/multis.cfg" );

  if ( open_uopmulti_file( multi_map ) )
  {
    for ( auto& [id, elems] : multi_map )
    {
      write_multi( multis_cfg, id, elems );
    }

    INFO_PRINTLN( "{} multi definitions written to multis.cfg", multi_map.size() );

    return;
  }

  UniqueFile multi_idx( open_uo_file( "multi.idx" ) );
  UniqueFile multi_mul( open_uo_file( "multi.mul" ) );

  create_multis_cfg( multi_idx, multi_mul, multis_cfg );
}
void UoConvertMain::write_flags( FILE* fp, unsigned int flags )
{
  if ( flags & FLAG::MOVELAND )
    fprintf( fp, "    MoveLand 1\n" );
  if ( flags & FLAG::MOVESEA )
    fprintf( fp, "    MoveSea 1\n" );
  if ( flags & FLAG::BLOCKSIGHT )
    fprintf( fp, "    BlockSight 1\n" );
  if ( ~flags & FLAG::OVERFLIGHT )
    fprintf( fp, "    OverFlight 0\n" );
  if ( flags & FLAG::ALLOWDROPON )
    fprintf( fp, "    AllowDropOn 1\n" );
  if ( flags & FLAG::GRADUAL )
    fprintf( fp, "    Gradual 1\n" );
  if ( flags & FLAG::STACKABLE )
    fprintf( fp, "    Stackable 1\n" );
  if ( flags & FLAG::BLOCKING )
    fprintf( fp, "    Blocking 1\n" );
  if ( flags & FLAG::MOVABLE )
    fprintf( fp, "    Movable 1\n" );
  if ( flags & FLAG::EQUIPPABLE )
    fprintf( fp, "    Equippable 1\n" );
  if ( flags & FLAG::DESC_PREPEND_A )
    fprintf( fp, "    DescPrependA 1\n" );
  if ( flags & FLAG::DESC_PREPEND_AN )
    fprintf( fp, "    DescPrependAn 1\n" );
}

void UoConvertMain::create_tiles_cfg()
{
  std::string outdir = programArgsFindEquals( "outdir=", "." );
  UniqueFile fp = open_out_text( outdir + "/tiles.cfg" );
  char name[21];

  unsigned count = 0;
  for ( unsigned int graphic_i = 0; graphic_i <= Plib::systemstate.config.max_tile_id; ++graphic_i )
  {
    u16 graphic = static_cast<u16>( graphic_i );
    USTRUCT_TILE tile;
    if ( cfg_use_new_hsa_format )
    {
      USTRUCT_TILE_HSA newtile;
      read_objinfo( graphic, newtile );
      tile.anim = newtile.anim;
      tile.flags = newtile.flags;
      tile.height = newtile.height;
      tile.layer = newtile.layer;
      memcpy( tile.name, newtile.name, sizeof tile.name );
      tile.unk14 = newtile.unk14;
      tile.unk15 = newtile.unk15;
      tile.unk6 = newtile.unk6;
      tile.unk7 = newtile.unk7;
      tile.unk8 = newtile.unk8;
      tile.unk9 = newtile.unk9;
      tile.weight = newtile.weight;
    }
    else
      read_objinfo( graphic, tile );
    const bool is_mount = MountTypes.contains( graphic );

    if ( tile.name[0] == '\0' && tile.flags == 0 && tile.layer == 0 && tile.height == 0 &&
         !is_mount )
    {
      continue;
    }
    unsigned int flags =
        polflags_from_tileflags( graphic, tile.flags, cfg_use_no_shoot, cfg_LOS_through_windows );
    if ( is_mount )
    {
      tile.layer = 25;
      flags |= FLAG::EQUIPPABLE;
    }

    memset( name, 0, sizeof name );
    memcpy( name, tile.name, sizeof tile.name );

    fprintf( fp, "tile 0x%x\n", graphic );
    fprintf( fp, "{\n" );
    fprintf( fp, "    Desc %s\n", name );
    fprintf( fp, "    UoFlags 0x%08lx\n", static_cast<unsigned long>( tile.flags ) );
    if ( tile.layer )
      fprintf( fp, "    Layer %u\n", tile.layer );
    if ( flags & FLAG::EQUIPPABLE )
      fprintf( fp, "    AnimID %u\n", tile.anim );
    if ( static_cast<unsigned long>( tile.flags ) & USTRUCT_TILE::FLAG_PARTIAL_HUE )
      fprintf( fp, "    PartialHue 1\n" );
    fprintf( fp, "    Height %u\n", tile.height );
    fprintf( fp, "    Weight %u\n", tile.weight );
    write_flags( fp, flags );
    fprintf( fp, "}\n" );
    fprintf( fp, "\n" );
    ++count;
  }

  INFO_PRINTLN( "{} tile definitions written to tiles.cfg", count );
}

void UoConvertMain::create_landtiles_cfg()
{
  std::string outdir = programArgsFindEquals( "outdir=", "." );
  UniqueFile fp = open_out_text( outdir + "/landtiles.cfg" );
  unsigned count = 0;

  for ( u16 i = 0; i <= MAX_LANDTILE_ID; ++i )
  {
    USTRUCT_LAND_TILE landtile;
    if ( cfg_use_new_hsa_format )
    {
      USTRUCT_LAND_TILE_HSA newlandtile;
      readlandtile( i, &newlandtile );
      landtile.flags = newlandtile.flags;
      landtile.unk = newlandtile.unk;
      memcpy( landtile.name, newlandtile.name, sizeof landtile.name );
    }
    else
      readlandtile( i, &landtile );

    if ( landtile.name[0] || landtile.flags )
    {
      fprintf( fp, "landtile 0x%x\n", i );
      fprintf( fp, "{\n" );
      fprintf( fp, "    Name %s\n", landtile.name );
      fprintf( fp, "    UoFlags 0x%08lx\n", static_cast<unsigned long>( landtile.flags ) );

      unsigned int flags = polflags_from_landtileflags( i, landtile.flags );
      flags &= ~FLAG::MOVABLE;  // movable makes no sense for landtiles
      write_flags( fp, flags );
      fprintf( fp, "}\n" );
      fprintf( fp, "\n" );
      ++count;
    }
  }

  INFO_PRINTLN( "{} landtile definitions written to landtiles.cfg", count );
}

int UoConvertMain::main()
{
  const std::vector<std::string>& binArgs = programArgs();

  /**********************************************
   * show help
   **********************************************/
  if ( binArgs.size() == 1 )
  {
    showHelp();
    return 0;  // return "okay"
  }

  // Setups uoconvert by finding the path of uo files and max tiles from pol.cfg or command
  // line arguments. Also loads parameters from uoconvert.cfg.
  setup_uoconvert();

  std::string command = binArgs[1];
  if ( command == "uoptomul" )
  {
    if ( !convert_uop_to_mul() )
      return 1;
  }
  else if ( command == "map" )
  {
    UoConvert::uo_mapid = programArgsFindEquals( "mapid=", 0, false );
    UoConvert::uo_usedif = programArgsFindEquals( "usedif=", 1, false );
    UoConvert::uo_readuop = (bool)programArgsFindEquals( "readuop=", 1, false );
    cfg_profile = (bool)programArgsFindEquals( "profile=", 0, false );
    cfg_threads = static_cast<unsigned>( programArgsFindEquals( "threads=", 0, false ) );

    std::string realm = programArgsFindEquals( "realm=", "britannia" );

    UoConvert::open_uo_data_files();
    UoConvert::read_uo_data();

    // Auto-detects defaults for mapid=0 or 1 based on the map size. All other sizes are fixed based
    // on the mapid.
    Pol::Plib::MUL::MapInfo mapinfo( UoConvert::uo_mapid, UoConvert::uo_map_size );
    int default_width = mapinfo.width();
    int default_height = mapinfo.height();

    if ( mapinfo.guessed() )
      INFO_PRINTLN( "Auto-detected map dimensions: {}x{}", default_width, default_height );

    uo_map_width =
        static_cast<unsigned short>( programArgsFindEquals( "width=", default_width, false ) );
    uo_map_height =
        static_cast<unsigned short>( programArgsFindEquals( "height=", default_height, false ) );

    check_for_errors_in_map_parameters();

    int x = programArgsFindEquals( "x=", -1, false );
    int y = programArgsFindEquals( "y=", -1, false );

    // britannia: realm=main mapid=0 width=6144 height=4096
    // ilshenar: realm=ilshenar mapid=2 width=2304 height=1600
    // malas: realm=malas mapid=3 width=2560 height=2048
    // tokuno: realm=tokuno mapid=4 width=1448 height=1448
    // termur: realm=termur mapid=5 width=1280 height=4096

    if ( x >= 0 && y >= 0 )
    {
      UoConvertMain::update_map( realm, static_cast<u16>( x ), static_cast<u16>( y ) );
    }
    else
    {
      UoConvertMain::create_map( realm, static_cast<unsigned short>( uo_map_width ),
                                 static_cast<unsigned short>( uo_map_height ) );
    }
  }
  else if ( command == "statics" )
  {
    std::string realm = programArgsFindEquals( "realm=", "britannia" );
    Plib::RealmDescriptor descriptor = Plib::RealmDescriptor::Load( realm );

    UoConvert::uo_mapid = descriptor.uomapid;
    UoConvert::uo_usedif = descriptor.uodif;
    UoConvert::uo_map_width = static_cast<unsigned short>( descriptor.width );
    UoConvert::uo_map_height = static_cast<unsigned short>( descriptor.height );

    UoConvert::open_uo_data_files();
    UoConvert::read_uo_data();

    write_pol_static_files( realm );
  }
  else if ( command == "multis" )
  {
    UoConvert::open_uo_data_files();
    UoConvert::read_uo_data();
    UoConvertMain::create_multis_cfg();
  }
  else if ( command == "tiles" )
  {
    UoConvert::open_uo_data_files();
    UoConvert::read_uo_data();
    UoConvertMain::create_tiles_cfg();
  }
  else if ( command == "landtiles" )
  {
    UoConvert::open_uo_data_files();
    UoConvert::read_uo_data();
    UoConvertMain::create_landtiles_cfg();
  }
  else if ( command == "maptile" )
  {
    cfg_threads = static_cast<unsigned>( programArgsFindEquals( "threads=", 0, false ) );
    std::string realm = programArgsFindEquals( "realm=", "britannia" );
    Plib::RealmDescriptor descriptor = Plib::RealmDescriptor::Load( realm );

    UoConvert::uo_mapid = descriptor.uomapid;
    UoConvert::uo_usedif = descriptor.uodif;
    UoConvert::uo_map_width = static_cast<unsigned short>( descriptor.width );
    UoConvert::uo_map_height = static_cast<unsigned short>( descriptor.height );

    UoConvert::open_uo_data_files();
    UoConvert::read_uo_data();

    UoConvertMain::create_maptile( realm );
  }
  else if ( command == "flags" )
  {
    UoConvertMain::display_flags();
  }
  else  // unknown option
  {
    showHelp();
    return 1;
  }
  UoConvert::clear_tiledata();
  return 0;
}
void UoConvertMain::check_for_errors_in_map_parameters()
{
  if ( !MUL::Map::valid_size( UoConvert::uo_map_size, uo_map_width, uo_map_height ) )
  {
    size_t expected_size =
        MUL::Map::blockSize * MUL::Map::expected_blocks( uo_map_width, uo_map_height );

    INFO_PRINTLN( "\nWarning: Width and height do not match the map size ({} bytes, expected {})",
                  UoConvert::uo_map_size, expected_size );

    if ( uo_map_width == 0 || uo_map_height == 0 )
      throw std::runtime_error(
          "Width and height were not identified automatically. Please specify them manually." );


    if ( ( uo_map_width % MUL::Map::blockWidth != 0 ) ||
         ( uo_map_height % MUL::Map::blockHeight != 0 ) )
      throw std::runtime_error( "Width and height must be divisible by 8" );

    if ( uo_map_size < expected_size )
      throw std::runtime_error( "Map size is smaller than the given width and height" );
  }
}
bool UoConvertMain::convert_uop_to_mul()
{
  // this is kludgy and doesn't take into account the UODataPath. Mostly a proof of concept now.
  UoConvert::uo_mapid = programArgsFindEquals( "mapid=", 0, false );

  std::string mul_mapfile = "map" + to_string( uo_mapid ) + ".mul";
  std::string uop_mapfile = "map" + to_string( uo_mapid ) + "LegacyMUL.uop";

  auto maphash = []( int mapid, size_t chunkidx )
  { return HashLittle2( fmt::format( "build/map{}legacymul/{:08d}.dat", mapid, chunkidx ) ); };

  std::ifstream ifs( uop_mapfile, std::ifstream::binary );
  if ( !ifs )
  {
    ERROR_PRINTLN( "Error when opening mapfile: {}", uop_mapfile );
    return false;
  }

  kaitai::kstream ks( &ifs );
  uop_t uopfile( &ks );

  // TODO: read all blocks
  std::map<uint64_t, uop_t::file_t*> filemap;
  uop_t::block_addr_t* currentblock = uopfile.header()->firstblock();
  for ( auto file : *currentblock->block_body()->files() )
  {
    if ( file == nullptr )
      continue;
    if ( file->decompressed_size() == 0 )
      continue;
    filemap[file->filehash()] = file;
  }

  if ( uopfile.header()->nfiles() != filemap.size() )
    INFO_PRINTLN( "Warning: not all chunks read ({}/{})", filemap.size(),
                  uopfile.header()->nfiles() );

  std::ofstream ofs( mul_mapfile, std::ofstream::binary );
  for ( size_t i = 0; i < filemap.size(); i++ )
  {
    auto fileitr = filemap.find( maphash( uo_mapid, i ) );
    if ( fileitr == filemap.end() )
    {
      INFO_PRINTLN( "Couldn't find file hash: {}", maphash( uo_mapid, i ) );
      continue;
    }

    auto file = fileitr->second;
    ofs << file->data()->filebytes();
    INFO_PRINTLN( "Wrote: {}/{}", i + 1, filemap.size() );
  }
  INFO_PRINTLN( "Done converting." );

  return true;
}
void UoConvertMain::setup_uoconvert()
{
  std::string uodata_root = programArgsFindEquals( "uodata=", "" );
  unsigned short max_tile =
      static_cast<unsigned short>( programArgsFindEquals( "maxtileid=", 0x0, true ) );

  if ( max_tile )
  {
    INFO_PRINTLN( "Warning: maxtileid will be ignored and detected from tiledata.mul instead." );
  }

  // read required parameters from pol.cfg
  if ( uodata_root.empty() )
  {
    INFO_PRINTLN( "Reading pol.cfg." );
    Clib::ConfigFile cf( "pol.cfg" );
    Clib::ConfigElem elem;

    cf.readraw( elem );

    if ( uodata_root.empty() )
      uodata_root = Plib::UOInstallFinder::remove_elem( elem );
  }

  // Save the parameters into this ugly global state we have
  Plib::systemstate.config.uo_datafile_root = Clib::normalized_dir_form( uodata_root );

  // Load parameters from uoconvert.cfg (multi types, mounts, etc)
  load_uoconvert_cfg();
}

void parse_graphics_properties( Clib::ConfigElem& elem, const std::string& prop_name,
                                std::set<unsigned int>& dest )
{
  std::string prop_value;
  std::string graphicnum;

  if ( !elem.has_prop( prop_name.c_str() ) )
  {
    elem.throw_prop_not_found( prop_name );
  }

  while ( elem.remove_prop( prop_name.c_str(), &prop_value ) )
  {
    ISTRINGSTREAM is( prop_value );
    while ( is >> graphicnum )
    {
      dest.insert( strtoul( graphicnum.c_str(), nullptr, 0 ) );
    }
  }
}

void notice_deprecated( Clib::ConfigElem& elem, const std::string& prop_name )
{
  if ( elem.has_prop( prop_name.c_str() ) )
  {
    INFO_PRINTLN( "Note: specifying {} in MultiTypes is no longer needed.", prop_name );
  }
}

void UoConvertMain::load_uoconvert_cfg()
{
  std::string main_cfg = "uoconvert.cfg";
  if ( Clib::FileExists( main_cfg ) )
  {
    Clib::ConfigElem elem;
    INFO_PRINTLN( "Reading uoconvert.cfg." );
    Clib::ConfigFile cf_main( main_cfg );
    while ( cf_main.read( elem ) )
    {
      if ( elem.type_is( "MultiTypes" ) )
      {
        parse_graphics_properties( elem, "Boats", BoatTypes );
        notice_deprecated( elem, "Houses" );
        notice_deprecated( elem, "Stairs" );
      }
      else if ( elem.type_is( "LOSOptions" ) )
      {
        if ( elem.has_prop( "UseNoShoot" ) )
          UoConvertMain::cfg_use_no_shoot = elem.remove_bool( "UseNoShoot" );

        if ( elem.has_prop( "LOSThroughWindows" ) )
          UoConvertMain::cfg_LOS_through_windows = elem.remove_bool( "LOSThroughWindows" );
      }
      else if ( elem.type_is( "Mounts" ) )
      {
        parse_graphics_properties( elem, "Tiles", MountTypes );
      }
      else if ( elem.type_is( "StaticOptions" ) )
      {
        if ( elem.has_prop( "MaxStaticsPerBlock" ) )
        {
          UoConvert::cfg_max_statics_per_block = elem.remove_int( "MaxStaticsPerBlock" );

          if ( UoConvert::cfg_max_statics_per_block > MAX_STATICS_PER_BLOCK )
          {
            UoConvert::cfg_max_statics_per_block = MAX_STATICS_PER_BLOCK;
            INFO_PRINTLN( "max. Statics per Block limited to {} Items",
                          UoConvert::cfg_max_statics_per_block );
          }
          else if ( UoConvert::cfg_max_statics_per_block < 0 )
            UoConvert::cfg_max_statics_per_block = 1000;
        }

        if ( elem.has_prop( "WarningStaticsPerBlock" ) )
        {
          UoConvert::cfg_warning_statics_per_block = elem.remove_int( "WarningStaticsPerBlock" );

          if ( UoConvert::cfg_warning_statics_per_block > MAX_STATICS_PER_BLOCK )
          {
            UoConvert::cfg_warning_statics_per_block = MAX_STATICS_PER_BLOCK;
            INFO_PRINTLN( "max. Statics per Block for Warning limited to {} Items",
                          UoConvert::cfg_warning_statics_per_block );
          }
          else if ( UoConvert::cfg_warning_statics_per_block < 0 )
            UoConvert::cfg_warning_statics_per_block = 1000;
        }

        if ( elem.has_prop( "DiscardedWaterTiles" ) )
        {
          parse_graphics_properties( elem, "DiscardedWaterTiles", DiscardedWaterTypes );
        }
        else
          for ( int i = 0x1796; i <= 0x17B2; ++i )
            DiscardedWaterTypes.insert( i );

        if ( elem.has_prop( "ShowIllegalGraphicWarning" ) )
          UoConvert::cfg_show_illegal_graphic_warning =
              elem.remove_bool( "ShowIllegalGraphicWarning" );
      }
      else if ( elem.type_is( "TileOptions" ) )
      {
        if ( elem.has_prop( "ShowRoofAndPlatformWarning" ) )
          cfg_show_roof_and_platform_warning = elem.remove_bool( "ShowRoofAndPlatformWarning" );
      }
      else if ( elem.type_is( "ClientOptions" ) )
      {
        if ( elem.has_prop( "UseNewHSAFormat" ) )
          INFO_PRINTLN( "Warning: UseNewHSAFormat in uoconvert.cfg is no longer needed." );
      }
    }
  }

  // Snapshot the water-type set into the flat lookup the conversion loop probes.
  for ( unsigned int graphic : DiscardedWaterTypes )
    if ( graphic < is_discarded_water.size() )
      is_discarded_water[graphic] = true;
}
}  // namespace Pol::UoConvert


///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////

int main( int argc, char* argv[] )
{
  Pol::UoConvert::UoConvertMain program;
  program.start( argc, argv );
}

polserver / polserver / 29720407616

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous