enforce stack limits when loading BB character data

The !req.path.starts_with( was causing every subsequent command to be processed as a rare-tables substring command.

.github/workflows/cmake.yml

@@ -16,19 +16,18 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        with_resource_file: ["true", "false"]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Install libraries (Linux)
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: sudo apt-get install -y libevent-dev
+        run: sudo apt-get install -y cmake libasio-dev
 
       - name: Install libraries (macOS)
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
-          brew install libevent
+          brew install cmake asio libiconv
 
           cat << EOF > nproc
           #!/bin/sh
@@ -47,7 +46,6 @@ jobs:
           sudo make install
 
       - name: Install resource_file
-        if: ${{ matrix.with_resource_file == 'true' }}
         run: |
           git clone https://github.com/fuzziqersoftware/resource_dasm.git
           cd resource_dasm

.gitignore

@@ -14,6 +14,7 @@ CTestTestfile.cmake
 install_manifest.txt
 Makefile
 Testing
+build
 
 # Files modified by the user and/or server that don't have defaults
 system/config.json
@@ -35,6 +36,7 @@ system/patch-bb/.metadata-cache.json
 # repository
 files
 make_release.py
+notes-private
 old-khyller
 old-newserv
 release

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.22)
 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW)
 
 
@@ -19,19 +19,15 @@ endif()
 
 # Library search
 
-find_path     (LIBEVENT_INCLUDE_DIR NAMES event.h)
-find_library  (LIBEVENT_LIBRARY     NAMES event)
-find_library  (LIBEVENT_CORE        NAMES event_core)
-find_library  (LIBEVENT_PTHREADS    NAMES event_pthreads)
-set (LIBEVENT_INCLUDE_DIRS ${LIBEVENT_INCLUDE_DIR})
-set (LIBEVENT_LIBRARIES
-        ${LIBEVENT_LIBRARY}
-        ${LIBEVENT_CORE}
-        ${LIBEVENT_PTHREADS})
-
+find_path(ASIO_INCLUDE_DIR NAMES asio.hpp HINTS "${WINDOWS_ENV}/include" REQUIRED)
+if(WIN32)
+    find_path(Iconv_INCLUDE_DIRS NAMES iconv.h HINTS "${WINDOWS_ENV}/include" REQUIRED)
+    find_library(Iconv_LIBRARIES NAMES iconv HINTS "${WINDOWS_ENV}/lib" REQUIRED)
+else()
+    find_package(Iconv REQUIRED)
+endif()
 find_package(phosg REQUIRED)
-find_package(Iconv REQUIRED)
-find_package(resource_file QUIET)
+find_package(resource_file REQUIRED)
 
 
 
@@ -54,10 +50,12 @@ add_custom_target(
 set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/Revision.cc
     src/Account.cc
+    src/AddressTranslator.cc
     src/AFSArchive.cc
+    src/AsyncHTTPServer.cc
+    src/AsyncUtils.cc
     src/BattleParamsIndex.cc
     src/BMLArchive.cc
-    src/CatSession.cc
     src/Channel.cc
     src/ChatCommands.cc
     src/ChoiceSearch.cc
@@ -80,9 +78,9 @@ set(SOURCES
     src/Episode3/RulerServer.cc
     src/Episode3/Server.cc
     src/Episode3/Tournament.cc
-    src/EventUtils.cc
     src/FileContentsCache.cc
     src/FunctionCompiler.cc
+    src/GameServer.cc
     src/GSLArchive.cc
     src/HTTPServer.cc
     src/ImageEncoder.cc
@@ -94,8 +92,8 @@ set(SOURCES
     src/ItemData.cc
     src/ItemNameIndex.cc
     src/ItemParameterTable.cc
-    src/ItemTranslationTable.cc
     src/Items.cc
+    src/ItemTranslationTable.cc
     src/LevelTable.cc
     src/Lobby.cc
     src/Loggers.cc
@@ -104,12 +102,11 @@ set(SOURCES
     src/Menu.cc
     src/NetworkAddresses.cc
     src/PatchFileIndex.cc
-    src/PatchServer.cc
     src/PlayerFilesManager.cc
     src/PlayerSubordinates.cc
     src/PPKArchive.cc
     src/ProxyCommands.cc
-    src/ProxyServer.cc
+    src/ProxySession.cc
     src/PSOEncryption.cc
     src/PSOGCObjectGraph.cc
     src/PSOProtocol.cc
@@ -119,10 +116,8 @@ set(SOURCES
     src/ReceiveCommands.cc
     src/ReceiveSubcommands.cc
     src/ReplaySession.cc
-    src/Revision.cc
     src/SaveFileFormats.cc
     src/SendCommands.cc
-    src/Server.cc
     src/ServerShell.cc
     src/ServerState.cc
     src/ShellCommands.cc
@@ -135,19 +130,12 @@ set(SOURCES
     src/WordSelectTable.cc
 )
 
-if(resource_file_FOUND)
-    set(SOURCES ${SOURCES} src/AddressTranslator.cc)
-endif()
-
 add_executable(newserv ${SOURCES})
-target_include_directories(newserv PUBLIC ${LIBEVENT_INCLUDE_DIR} ${Iconv_INCLUDE_DIRS})
-target_link_libraries(newserv phosg::phosg ${LIBEVENT_LIBRARIES} ${Iconv_LIBRARIES} pthread)
-if(resource_file_FOUND)
-    target_compile_definitions(newserv PUBLIC HAVE_RESOURCE_FILE)
-    target_link_libraries(newserv resource_file::resource_file)
-    message(STATUS "resource_file found; enabling patch support")
-else()
-    message(WARNING "resource_file not found; disabling patch support")
+target_include_directories(newserv PUBLIC ${ASIO_INCLUDE_DIR} ${Iconv_INCLUDE_DIRS})
+target_link_libraries(newserv phosg::phosg ${Iconv_LIBRARIES} pthread resource_file::resource_file)
+if (WIN32)
+    target_compile_definitions(newserv PUBLIC -DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00)
+    target_link_libraries(newserv ws2_32 mswsock bcrypt iphlpapi -static -static-libgcc -static-libstdc++)
 endif()
 add_dependencies(newserv newserv-Revision-cc)
 
@@ -170,15 +158,6 @@ foreach(LogTestCase IN ITEMS ${LogTestCases})
         COMMAND ${CMAKE_BINARY_DIR}/newserv --replay-log=${LogTestCase} --config=${CMAKE_SOURCE_DIR}/tests/config.json)
 endforeach()
 
-if(resource_file_FOUND)
-    foreach(LogRDTestCase IN ITEMS ${LogRDTestCases})
-        add_test(
-            NAME ${LogRDTestCase}
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-            COMMAND ${CMAKE_BINARY_DIR}/newserv --replay-log=${LogRDTestCase} --config=${CMAKE_SOURCE_DIR}/tests/config.json)
-    endforeach()
-endif()
-
 file(GLOB ScriptTestCases ${CMAKE_SOURCE_DIR}/tests/*.test.sh)
 
 foreach(ScriptTestCase IN ITEMS ${ScriptTestCases})

Dockerfile

@@ -11,7 +11,7 @@ RUN apt update && apt install -y --no-install-recommends \
     make \
     cmake \
     g++ \
-    libevent-dev \
+    libasio-dev \
     zlib1g-dev
 
 # ---
@@ -29,13 +29,13 @@ RUN git clone --depth 1 -b ${PHOSG_TARGET} https://github.com/fuzziqersoftware/p
     sudo make install
 
 RUN \
-if [ "$BUILD_RESOURCE_DASM" = "true" ] ; then \
+    if [ "$BUILD_RESOURCE_DASM" = "true" ] ; then \
     git clone --depth 1 -b ${RESOURCE_DASM_TARGET} https://github.com/fuzziqersoftware/resource_dasm.git && \
     cd resource_dasm && \
     cmake . && \
     make -j$(nproc) && \
     sudo make install \
-; fi
+    ; fi
 
 # ---
 
@@ -53,10 +53,10 @@ RUN cmake -B $PWD/build -DCMAKE_BUILD_TYPE=${BUILD_TYPE} && \
     sudo make -C build install
 
 RUN \
-if [ "$BUILD_STRIP" = "true" ] ; then \
-  strip /usr/local/lib/*.a && \
-  strip /usr/local/bin/* \
-; fi
+    if [ "$BUILD_STRIP" = "true" ] ; then \
+    strip /usr/local/lib/*.a && \
+    strip /usr/local/bin/* \
+    ; fi
 
 # ---
 
@@ -72,7 +72,7 @@ RUN cp -f system/config.example.json system/config.json && \
 FROM ${BASE_IMAGE} AS final
 
 RUN apt update && apt install -y --no-install-recommends \
-    libevent-dev \
+    libasio-dev \
     && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 WORKDIR /newserv

README.md

@@ -12,8 +12,8 @@ See TODO.md for a list of known issues and future work I've curated, or go to th
 * Background
     * [History](#history)
     * [Other server projects](#other-server-projects)
-    * [Developer information](#developer-information)
     * [Using newserv in other projects](#using-newserv-in-other-projects)
+    * [Contributing to newserv](#contributing-to-newserv)
 * [Compatibility](#compatibility)
 * Setup
     * [Server setup](#server-setup)
@@ -26,7 +26,7 @@ See TODO.md for a list of known issues and future work I've curated, or go to th
     * [Cross-version play](#cross-version-play)
     * [Server-side saves](#server-side-saves)
     * [Episode 3 features](#episode-3-features)
-    * [Memory patches, client functions, and DOL files](#memory-patches-client-functions-and-dol-files)
+    * [Memory patches, client functions, and DOL files](#memory-patches-and-client-functions)
     * [Using newserv as a proxy](#using-newserv-as-a-proxy)
     * [Chat commands](#chat-commands)
     * [REST API](#rest-api)
@@ -46,7 +46,7 @@ For a while it was essentially necessary to use a proxy to go online at all, so
 
 <img align="left" src="static/s-aeon.png" /> Sometime in 2006 or 2007, I abandoned Khyller and rebuilt the entire thing from scratch, resulting in Aeon. Aeon was substantially cleaner in code than Khyller but still fairly hard to work with, and it lacked a few of the more arcane features I had originally written (for example, the ability to convert any quest into a download quest). In addition, the code still had some stability problems... it turns out that Aeon's concurrency primitives were simply incorrect. I had derived the concept of a mutex myself, before taking any real computer engineering classes, but had implemented it incorrectly. I made the race window as small as possible, but Aeon would still randomly crash after running seemingly fine for a few days.
 
-At the time of its inception, Aeon was also called newserv, and you may find some beta releases floating around the Internet with filenames like `newserv-b3.zip`. I had released betas 1, 2, and 3 before I released the entire source of beta 5 and stopped working on the project when I went to college. This was around the time when I switched from writing software primarily on Windows to primarily on macOS and Linux, so Aeon beta 5 was the last server I wrote that specifically targeted Windows. (newserv, which you're looking at now, is a bit tedious to compile on Windows but does work.)
+At the time of its inception, Aeon was also called newserv, and you may find some beta releases floating around the Internet with filenames like `newserv-b3.zip`. I had released betas 1, 2, and 3 before I released the entire source of beta 5 and stopped working on the project when I went to college. This was around the time when I switched from writing software primarily on Windows to primarily on macOS and Linux, so Aeon beta 5 was the last server I wrote that specifically targeted Windows. (newserv, which you're looking at now, is difficult to compile on Windows but does work.)
 
 <img align="left" src="static/s-newserv.png" /> After a long hiatus from PSO and much professional and personal development in my technical abilities, I was reminiscing sometime in October 2018 by reading my old code archives. Somehow inspired when I came across Aeon, I spent a weekend and a couple more evenings rewriting the entire project again, cleaning up ancient patterns I had used eleven years ago, replacing entire modules with simple STL containers, and eliminating even more support files in favor of configuration autodetection. The code is now suitably modern and stable, and I'm not embarrassed by its existence, as I am by Aeon beta 5's source code and my archive of Khyller (which, thankfully, no one else ever saw).
 
@@ -54,42 +54,49 @@ At the time of its inception, Aeon was also called newserv, and you may find som
 
 Independently of this project, there are many other PSO servers out there. Those that I know of that are (or were) public are listed here in approximate chronological order:
 
-* (Early 2000s) **[Schtserv](https://schtserv.com/)**: The first public-access PSO server; written in Delphi by Schthack. Still active and popular as of early 2025. Schtserv is also the only other unofficial server to support all versions of PSO, including Episode 3. (Their implementation of Episode 3 is based on newserv's, which is itself based on Sega's.)
+* (Early 2000s) **[Schtserv](https://schtserv.com/)**: The first public-access PSO server, written in Delphi by Schthack. Schtserv is the only other unofficial server to support Episode 3, their implementation of which is based on newserv's (which is based on Sega's).
 * (2005) **Khyller**: An early attempt of mine to support PSO PC, GC, and BB. See above for more details.
 * (2006) **Aeon**: My second attempt. Better than Khyller, but still unreliable.
-* (2008) **Tethealla**: A fairly extensive implementation of PSOBB, written in C by Sodaboy. The public version of Tethealla has been [officially disowned](https://www.pioneer2.net/community/threads/tethealla-server-forums-removal.26365/) (as it is now more than 15 years old), but closed-source development continues. [Ephinea](https://ephinea.pioneer2.net/), currently the most popular PSOBB server, is the continuation of this project. Several other modern PSOBB servers are forks of the initial public version of Tethealla as well.
-* (2008) **[Sylverant](https://sylverant.net/)** [(source)](https://sourceforge.net/projects/sylverant/): The second public-access PSO server; written in C by BlueCrab. Still active and popular as of early 2025.
+* (2008) **Tethealla**: A fairly extensive implementation of PSOBB, written in C by Sodaboy. The public version of Tethealla has been [officially disowned](https://www.pioneer2.net/community/threads/tethealla-server-forums-removal.26365/) as it is now more than 15 years old, but closed-source development continues. [Ephinea](https://ephinea.pioneer2.net/) is the continuation of this project. Several other modern PSOBB servers are forks of the initial public version of Tethealla as well.
+* (2008) **[Sylverant](https://sylverant.net/)** [(source)](https://sourceforge.net/projects/sylverant/): The second public-access PSO server, written in C by BlueCrab.
 * (2015) **[Archon](https://github.com/dcrodman/archon)**: A PSOBB server written in Go by Drew Rodman.
 * (2015) **[Idola](https://github.com/HybridEidolon/idolapsoserv)**: A PSOBB server written in Rust by HybridEidolon. Functionality status unknown; the project has been archived.
-* (2017) **[Aselia](https://github.com/Solybum/Aselia)**: A PSOBB server written written in C# by Soly. It seems this was planned to be open-source at some point, but that has not (yet) happened.
+* (2017) **[Aselia](https://github.com/Solybum/Aselia)**: A PSOBB server written in C# by Soly. It seems this was planned to be open-source at some point, but that has not (yet) happened.
 * (2018) **newserv**: This project right here.
 * (2019) **[Mechonis](https://gitlab.com/sora3087/mechonis)**: A PSOBB server with a microservice architecture written in TypeScript by TrueVision.
+* (2020) **[Booma.Server](https://github.com/HelloKitty/Booma.Server)**: A PSOBB server written in C# by Glader, with Soly's help.
 * (2021) **[Phantasmal World](https://github.com/DaanVandenBosch/phantasmal-world)**: A set of PSO tools, including a web-based model viewer and quest builder, and a PSO server, written by Daan Vanden Bosch.
 * (2021) **[Elseware](http://git.sharnoth.com/jake/elseware)**: A PSOBB server written in Rust by Jake.
 
-## Developer information
+## Using newserv in other projects
 
-There is a lot of code in this project that could be useful as a reference. Some of the more notable files are:
+You are free to use code from newserv in your own open-source projects; the only condition is that the contents of the LICENSE file must be included in your project if you use code from newserv. Your project does not also have to use the MIT license; you can use any license you want.
+
+If you want to use parts of newserv in your project, there are two easy ways to do so with proper licensing:
+* If you're using a lot of code from newserv, you can put a copy of newserv's LICENSE file in your repository alongside your own license file, or include the contents of newserv's license in your own license file.
+* If you're only using a few files from newserv, you can copy and paste the contents of the LICENSE file into a comment at the beginning of each copied file.
+
+Some of the more likely useful files are:
 * **src/CommandFormats.hh**: Complete listing of all network commands used in all known versions of the game, and their formats
 * **src/CommonItemSet.hh/cc**: Format of ItemPT files, shop definition files, and tekker adjustment tables
 * **src/DCSerialNumbers.hh/cc**: PSO DC serial number validation algorithm and serial number generator
 * **src/ItemData.hh**: Item format reference
 * **src/ItemCreator.hh/cc**: Reverse-engineered item generator from Episodes 1&2 (used for all versions)
 * **src/ItemParameterTable.hh**: Format of many structures in ItemPMT.prs
-* **src/Map.hh/cc**: Map file (.dat) structure and reverse-engineered Challenge Mode random enemy generation algorithm
+* **src/Map.hh/cc**: Map file (.dat) structure, listing of object/enemy types and parameters, and reverse-engineered Challenge Mode random enemy generation algorithm
 * **src/QuestScript.cc**: Complete listing of all quest opcodes on all versions, along with their arguments and behavior
 * **src/RareItemSet.hh/cc**: Format of ItemRT files (rare item drop tables)
 * **src/SaveFileFormats.hh**: Definitions of save file structures for all versions
 * **src/Episode3/DataIndexes.hh**: Episode 3 file structures, including card definition format and map/quest format
 * **system/item-tables/names-v4.json**: Names of all items, indexed by the first 3 bytes of data1
 
-## Using newserv in other projects
+## Contributing to newserv
 
-There is a fair amount of code in this project that could potentially be useful to other projects. You are free to use code from newserv in your own open-source projects; the only condition is that the contents of the LICENSE file must be included in your project if you use code from newserv. Your project does not also have to use the MIT license; you can use any license you want.
+The goals of this project are:
+* Build stable, extensible PSO server software that includes all vanilla functionality as well as optional modern conveniences, features, and cheats.
+* Document the internals of PSO's network protocol, file formats, and game mechanics. This is mainly done through comments in the code.
 
-If you want to use parts of newserv in your project, there are two easy ways to do so with proper licensing:
-* If you're using a lot of code from newserv, you can put a copy of newserv's LICENSE file in your repository alongside your own license file, or include the contents of newserv's license in your own license file.
-* If you're only using a few files from newserv, you can copy and paste the contents of the LICENSE file into a comment at the beginning of each copied file.
+This is a personal project; there is no official development team, official website, or official instance of newserv. Issues and pull requests are certainly welcome, but please only add content (e.g. quests or patches) that you've created, is already public, or you have permission to release publicly.
 
 # Compatibility
 
@@ -97,14 +104,14 @@ newserv supports all known versions of PSO, including various development protot
 
 | Version         | Lobbies  | Games    | Proxy    |
 |-----------------|----------|----------|----------|
-| DC NTE          | Yes      | Yes      | No       |
-| DC 11/2000      | Yes      | Yes      | No       |
+| DC NTE          | Yes      | Yes      | Yes      |
+| DC 11/2000      | Yes      | Yes      | Yes      |
 | DC 12/2000      | Yes      | Yes      | Yes      |
 | DC 01/2001      | Yes      | Yes      | Yes      |
 | DC V1           | Yes      | Yes      | Yes      |
 | DC 08/2001      | Yes      | Yes      | Yes      |
 | DC V2           | Yes      | Yes      | Yes      |
-| PC NTE          | Yes (1)  | Yes      | No       |
+| PC NTE          | Yes (1)  | Yes      | Yes      |
 | PC              | Yes      | Yes      | Yes      |
 | GC Ep1&2 NTE    | Yes      | Yes      | Yes      |
 | GC Ep1&2        | Yes      | Yes      | Yes      |
@@ -128,27 +135,27 @@ Currently newserv works on macOS, Windows, and Ubuntu Linux. It will likely work
 
 ### Windows/macOS
 
-1. Download the latest release-windows-amd64.zip or release-macos-arm64.zip file from the [releases page](https://github.com/fuzziqersoftware/newserv/releases).
+1. Download the latest release.zip file from the [releases page](https://github.com/fuzziqersoftware/newserv/releases).
 2. Extract the contents of the archive to some location on your computer.
-3. (Optional) If you want to change any config options, go into the system/ folder, open config.json in a text editor, and edit it to your liking. There are comments in the file that describe what all the options do.
+3. Go into the system/ folder, open config.json in a text editor, and edit it to your liking. There are comments in the file that describe what all the options do. Most of the options can be left alone if you want default behavior, but on Windows, you must change LocalAddress and ExternalAddress.
 4. (Optional) If you plan to play Blue Burst on newserv, set up the patch directory. See [client patch directories](#client-patch-directories) for details.
 5. Run the newserv executable.
 
 ### Linux
 
-There are currently no precompiled releases for Linux. To run newserv on Linux, you'll have to build it from source - see the "Building from source" section below.
+There are currently no precompiled releases for Linux. To run newserv on Linux, you'll have to build it from source - see the section below.
 
-### Building from source
+### Building from source (macOS/Linux)
 
-1. Install the packages newserv depends on.
-    * If you're on Windows, install [Cygwin](https://www.cygwin.com/). While doing so, install the `cmake`, `gcc-core`, `gcc-g++`, `git`, `libevent2.1_7`, `libevent-devel`, `make`, `libiconv-devel`, and `zlib` packages. Do the rest of these steps inside a Cygwin shell (not a Windows cmd shell or PowerShell).
-    * If you're on macOS, run `brew install cmake libevent libiconv`.
-    * If you're on Linux, run `sudo apt-get install cmake libevent-dev` (or use your Linux distribution's package manager).
-3. Build and install [phosg](https://github.com/fuzziqersoftware/phosg).
-4. Optionally, install [resource_dasm](https://github.com/fuzziqersoftware/resource_dasm). This will enable newserv to send memory patches and load DOL files on PSO GC clients. PSO GC clients can play PSO normally on newserv without this.
-5. Run `cmake . && make` in the newserv directory.
+To build on macOS or Linux:
 
-After building newserv, edit system/config.example.json as needed **and rename it to system/config.json** (note that this step is not necessary for the precompiled releases!), set up [client patch directories](#client-patch-directories) if you're planning to play Blue Burst, then run `./newserv` in newserv's directory.
+1. Install the dependencies needed for your platform:
+    * macOS: `brew install cmake asio libiconv`
+    * Linux: `sudo apt-get install cmake libasio-dev` (or use your Linux distribution's package manager)
+2. Build and install [phosg](https://github.com/fuzziqersoftware/phosg) and [resource_dasm](https://github.com/fuzziqersoftware/resource_dasm).
+3. Run `cmake . && make` in the newserv directory.
+
+After building newserv, edit system/config.example.json as needed **and rename it to system/config.json** (note that this step is not necessary for the precompiled releases), set up [client patch directories](#client-patch-directories) if you're planning to play Blue Burst, then run `./newserv` in newserv's directory.
 
 The server has an interactive shell which can be used to make changes, such as managing user accounts, updating the server's configuration, managing Episode 3 tournaments, and more. Type `help` and press Enter to see all the commands.
 
@@ -156,6 +163,10 @@ On Linux and macOS, the server also responds to SIGUSR1 and SIGUSR2. SIGUSR1 doe
 
 To use newserv in other ways (e.g. for translating data), see the end of this document.
 
+### Building from source (Windows)
+
+The current version of newserv is cross-compiled using mingw-w64 on a macOS build machine, with the necessary libraries manually installed. Setting up such a build environment is tedious and not recommended; it's recommended to just use a release version instead.
+
 ## Client patch directories
 
 newserv implements a patch server for PSO PC and PSO BB game data. Any file or directory you put in the system/patch-bb or system/patch-pc directories will be synced to clients when they connect to the patch server.
@@ -275,7 +286,8 @@ A license is a set of credentials that a player can use to log in. There are six
 * *GC licenses* consist of a 10-digit decimal serial number, a 12-character access key, and a password of up to 8 characters.
 * *XB licenses* consist of a gamertag of up to 16 characters, a 16-character hex user ID, and a 16-character hex account ID.
 * *BB licenses* consist of a username of up to 16 characters and a password of up to 16 characters.
-Each account may have multiple licenses. To add a license to an account, use `add-license` in the shell.
+
+Each account may have multiple licenses. To add a license to an existing account, use `add-license` in the shell.
 
 On BB, character data is scoped to the license, but system and Guild Card data is scoped to the account. That is, an account with multiple BB licenses can have more than 4 characters (up to 4 per license), but they will all share the same team membership and Guild Card lists.
 
@@ -373,7 +385,9 @@ newserv has the ability to save character data on the server side. For PSO BB, t
 
 Each account has 4 BB character slots and 16 non-BB character file slots. The non-BB slots are independent of the BB slots, and can be accessed with the `$savechar <slot>` and `$loadchar <slot>` commands (slots are numbered 1 through 16). `$savechar` copies the character you're currently playing as and saves the data on the server, and `$loadchar` does the reverse, overwriting your current character with the data saved on the server. Note that you can load a character that was saved from a different version of PSO, which allows you to easily transfer characters between games. On v1 and v2, changes done by `$loadchar` will be undone if you join a game; to permanently save your changes, disconnect from the lobby after using the command.
 
-There is a third command, `$bbchar <username> <password> <slot>`, which behaves similarly to `$savechar` but writes the character data to a BB character slot in a different account instead (slots are numbered 1 through 4). This can be used to "upgrade" a character to BB from an earlier version.
+You can see basic information about a character saved on the server (without affecting your current character) by using `$checkchar <slot>`. You can delete a previously-saved character with `$deletechar <slot>`.
+
+There is also the command `$bbchar <username> <password> <slot>`, which behaves similarly to `$savechar` but writes the character data to a BB character slot in a different account instead (slots are numbered 1 through 4). This can be used to "upgrade" a character to BB from an earlier version.
 
 Exactly which data is saved and loaded depends on the game version:
 
@@ -433,9 +447,7 @@ There is no public editor for Episode 3 maps and quests, but the format is descr
 
 Like quests, Episode 3 card definitions, maps, and quests are cached in memory. If you've changed any of these files, you can run `reload ep3-cards` or `reload ep3-maps` in the interactive shell to make the changes take effect without restarting the server.
 
-## Memory patches, client functions, and DOL files
-
-*Everything in this section requires resource_dasm to be installed, so newserv can use the assemblers and disassemblers from its libresource_file library. If resource_dasm is not installed, newserv will still build and run, but these features will not be available.*
+## Memory patches and client functions
 
 You can put assembly files in the system/client-functions directory with filenames like PatchName.VERS.patch.s and they will appear in the Patches menu for clients that support client functions. Client functions are written in SH-4, PowerPC, or x86 assembly and are compiled when newserv is started. The assembly system's features are documented in the comments in system/client-functions/System/WriteMemoryGC.ppc.s.
 
@@ -443,50 +455,53 @@ The VERS token in client function filenames refers to the specific version of th
 
 The specific versions are:
 
-| Game                         | VERS | Architecture  |
-|------------------------------|------|---------------|
-| PSO DC Network Trial Edition | 1OJ1 | Not supported |
-| PSO DC 11/2000 prototype     | 1OJ2 | Not supported |
-| PSO DC 12/2000 prototype     | 1OJ3 | Not supported |
-| PSO DC 01/2001 prototype     | 1OJ4 | Not supported |
-| PSO DC v1 JP                 | 1OJF | Not supported |
-| PSO DC v1 US                 | 1OEF | Not supported |
-| PSO DC v1 EU                 | 1OPF | Not supported |
-| PSO DC 08/2001 prototype     | 2OJ5 | SH-4          |
-| PSO DC v2 JP                 | 2OJF | SH-4          |
-| PSO DC v2 US                 | 2OEF | SH-4          |
-| PSO DC v2 EU                 | 2OPF | SH-4          |
-| PSO PC (v2)                  | 2OJW | Not supported |
-| PSO GC Trial Edition         | 3OJT | PowerPC       |
-| PSO GC v1.2 JP               | 3OJ2 | PowerPC       |
-| PSO GC v1.3 JP               | 3OJ3 | PowerPC       |
-| PSO GC v1.4 (Plus) JP        | 3OJ4 | PowerPC       |
-| PSO GC v1.5 (Plus) JP        | 3OJ5 | PowerPC (1)   |
-| PSO GC v1.0 US               | 3OE0 | PowerPC       |
-| PSO GC v1.1 US               | 3OE1 | PowerPC       |
-| PSO GC v1.2 (Plus) US        | 3OE2 | PowerPC (1)   |
-| PSO GC v1.0 EU               | 3OP0 | PowerPC       |
-| PSO GC Ep3 Trial Edition     | 3SJT | PowerPC       |
-| PSO GC Ep3 JP                | 3SJ0 | PowerPC       |
-| PSO GC Ep3 US                | 3SE0 | PowerPC (1)   |
-| PSO GC Ep3 EU                | 3SP0 | PowerPC (1)   |
-| PSO Xbox Beta                | 4OJB | x86           |
-| PSO Xbox JP Disc             | 4OJD | x86           |
-| PSO Xbox JP TU               | 4OJU | x86           |
-| PSO Xbox US Disc             | 4OED | x86           |
-| PSO Xbox US TU               | 4OEU | x86           |
-| PSO Xbox EU Disc             | 4OPD | x86           |
-| PSO Xbox EU TU               | 4OPU | x86           |
-| PSO BB JP 1.25.11            | 59NJ | x86           |
-| PSO BB JP 1.25.13            | 59NL | x86           |
-| PSO BB Tethealla             | 59NL | x86           |
+| Game                         | VERS | CPU architecture               |
+|------------------------------|------|--------------------------------|
+| PSO DC Network Trial Edition | 1OJ1 | Client functions not supported |
+| PSO DC 11/2000 prototype     | 1OJ2 | Client functions not supported |
+| PSO DC 12/2000 prototype     | 1OJ3 | Client functions not supported |
+| PSO DC 01/2001 prototype     | 1OJ4 | Client functions not supported |
+| PSO DC v1 JP                 | 1OJF | Client functions not supported |
+| PSO DC v1 US                 | 1OEF | Client functions not supported |
+| PSO DC v1 EU                 | 1OPF | Client functions not supported |
+| PSO DC 08/2001 prototype     | 2OJ5 | SH-4                           |
+| PSO DC v2 JP                 | 2OJF | SH-4                           |
+| PSO DC v2 US                 | 2OEF | SH-4                           |
+| PSO DC v2 EU                 | 2OPF | SH-4                           |
+| PSO PC (v2) 04/2002          | 2OJW | Client functions not supported |
+| PSO PC (v2) 02/2003          | 2OJZ | Client functions not supported |
+| PSO GC Trial Edition         | 3OJT | PowerPC                        |
+| PSO GC v1.2 JP               | 3OJ2 | PowerPC                        |
+| PSO GC v1.3 JP               | 3OJ3 | PowerPC                        |
+| PSO GC v1.4 (Plus) JP        | 3OJ4 | PowerPC                        |
+| PSO GC v1.5 (Plus) JP        | 3OJ5 | PowerPC (1)                    |
+| PSO GC v1.0 US               | 3OE0 | PowerPC                        |
+| PSO GC v1.1 US               | 3OE1 | PowerPC                        |
+| PSO GC v1.2 (Plus) US        | 3OE2 | PowerPC (1)                    |
+| PSO GC v1.0 EU               | 3OP0 | PowerPC                        |
+| PSO GC Ep3 Trial Edition     | 3SJT | PowerPC                        |
+| PSO GC Ep3 JP                | 3SJ0 | PowerPC                        |
+| PSO GC Ep3 US                | 3SE0 | PowerPC (1)                    |
+| PSO GC Ep3 EU                | 3SP0 | PowerPC (1)                    |
+| PSO Xbox Beta                | 4OJB | x86                            |
+| PSO Xbox JP Disc             | 4OJD | x86                            |
+| PSO Xbox JP TU               | 4OJU | x86                            |
+| PSO Xbox US Disc             | 4OED | x86                            |
+| PSO Xbox US TU               | 4OEU | x86                            |
+| PSO Xbox EU Disc             | 4OPD | x86                            |
+| PSO Xbox EU TU               | 4OPU | x86                            |
+| PSO BB JP 1.25.11            | 59NJ | x86                            |
+| PSO BB JP 1.25.13            | 59NL | x86                            |
+| PSO BB Tethealla             | 59NL | x86                            |
 
 *Notes:*
 1. *Client functions are only supported on these versions if EnableSendFunctionCallQuestNumbers is set in config.json. See the comments there for more information.*
 
-newserv comes with a set of patches for many of the above versions, based on AR codes originally made by Ralf at GC-Forever and Aleron Ives. Many of them were originally posted in [this thread](https://www.gc-forever.com/forums/viewtopic.php?f=38&t=2050).
+newserv comes with a set of patches for many of the above versions. These are organized in subdirectories within system/client-functions/.
 
-You can also put DOL files in the system/dol directory, and they will appear in the Programs menu for GC clients. Selecting a DOL file there will load the file into the GameCube's memory and run it, just like the old homebrew loaders (PSUL and PSOload) did. For this to work, ReadMemoryWordGC.ppc.s, WriteMemoryGC.ppc.s, and RunDOL.ppc.s must be present in the system/client-functions/System directory. This has been tested on Dolphin but not on a real GameCube, so results may vary.
+### DOL loader
+
+You can put DOL files in the system/dol directory, and they will appear in the Programs menu for GC clients. Selecting a DOL file there will load the file into the GameCube's memory and run it, just like the old homebrew loaders (PSUL and PSOload) did. For this to work, ReadMemoryWordGC.ppc.s, WriteMemoryGC.ppc.s, and RunDOL.ppc.s must be present in the system/client-functions/System directory. This has been tested on Dolphin but not on a real GameCube, so results may vary.
 
 Like other kinds of data, functions and DOL files are cached in memory. If you've changed any of these files, you can run `reload functions` or `reload dol-files` in the interactive shell to make the changes take effect without restarting the server.
 
@@ -498,9 +513,9 @@ If you want to play online on remote servers rather than running your own server
 
 To use the proxy for PSO DC, PC, or GC, add an entry to the corresponding ProxyDestinations dictionary in config.json, then run newserv and connect to it as normal (see below). You'll see a "Proxy server" option in the main menu, and you can pick which remote server to connect to.
 
-To use the proxy for PSO BB, set the ProxyDestination-BB entry in config.json. If this option is set, it essentially disables the game server for all PSO BB clients - all clients will be proxied to the specified destination instead. Unfortunately, because PSO BB uses a different set of handlers for the data server phase and character selection, there's no in-game way to present the player with a list of options, like there is on PSO PC and PSO GC.
+To use the proxy for PSO BB, set the ProxyDestination-BB entry in config.json. If this option is set, it essentially disables the game server for all BB clients - all BB clients will be proxied to the specified destination instead. Unfortunately, because PSO BB uses a different set of handlers for the data server phase and character selection, there's no in-game way to present the player with a list of options, like there is on PSO PC and PSO GC.
 
-When you're on PSO DC, PC, or GC and are connected to a remote server through newserv's proxy, choosing the Change Ship or Change Block action from the lobby counter will send you back to newserv's main menu instead of the remote server's ship or block select menu. You can go back to the server you were just on by choosing it from the proxy server menu again.
+When you're on PSO DC, PC, GC, or Xbox and are connected to a remote server through newserv's proxy, choosing the Change Ship or Change Block action from the lobby counter will send you back to newserv's main menu instead of the remote server's ship or block select menu. You can go back to the server you were just on by choosing it from the proxy server menu again.
 
 There are many options available when starting a proxy session. All options are off by default unless otherwise noted. The options are:
 * **Chat commands**: enables chat commands in the proxy session (on by default).
@@ -513,95 +528,101 @@ There are many options available when starting a proxy session. All options are
 * **Infinite Meseta** (Episode 3 only): gives you 1,000,000 Meseta, regardless of the value sent by the remote server.
 * **Block events**: disables holiday events sent by the remote server.
 * **Block patches**: prevents any B2 (patch) commands from reaching the client.
-* **Save files**: saves copies of several kinds of files when they're sent by the remote server. The files are written to the current directory (which is usually the directory containing the system/ directory). These kinds of files can be saved:
+* **Save files**: saves copies of several kinds of files when they're sent by the remote server. The files are written to the current directory (which is usually the directory containing the system/ directory). Saved files can then be used with newserv by just moving the file into the appropriate place in the system/ directory and renaming it appropriately. These kinds of files can be saved:
     * Online quests and download quests (saved as .bin/.dat files)
     * GBA games (saved as .gba files)
-    * Patches (saved as .bin files, and disassembled to text files if newserv is built with patch support)
-    * Player data from BB sessions (saved as .bin files, which are not the same format as .nsc files)
+    * Patches (saved as .bin files and disassembled as .txt files)
+    * Player data from BB sessions (saved as .psochar files)
     * Episode 3 online quests and maps (saved as .mnmd files)
     * Episode 3 download quests (saved as .mnm files)
     * Episode 3 card definitions (saved as .mnr files)
     * Episode 3 media updates (saved as .gvm, .bml, or .bin files)
 
-The remote server will probably try to assign you a Guild Card number that doesn't match the one you have on newserv. On PSO DC, PC and GC, the proxy server rewrites the commands in transit to make it look like the remote server assigned you the same Guild Card number as you have on newserv, but if the remote server has some external integrations (e.g. forum or Discord bots), they will use the Guild Card number that the remote server believes it has assigned to you. The number assigned by the remote server is shown to you when you first connect to the remote server, and you can retrieve it in lobbies or during games with the `$li` command.
+The remote server will probably try to assign you a Guild Card number that doesn't match the one you have on newserv. The proxy rewrites the commands in transit to make it look like the remote server assigned you the same Guild Card number as you have on newserv, but if the remote server has some external integrations (e.g. forum or Discord bots), they will use the Guild Card number that the remote server believes it has assigned to you. The number assigned by the remote server is shown to you when you first connect to the remote server, and you can retrieve it in lobbies or during games with the `$li` command.
 
-Some chat commands (see below) have the same basic function on the proxy server but have different effects or conditions. In addition, there are some server shell commands that affect clients on the proxy (run `help` in the shell to see what they are). If there's only one proxy session open, the shell's proxy commands will affect that session. Otherwise, you'll have to specify which session to affect with the `on` prefix - to send a chat message in LinkedSession:17205AE4, for example, you would run `on 17205AE4 chat ...`.
+Some chat commands (see below) have the same basic function on the proxy but have different effects or conditions. In addition, there are some server shell commands that affect clients on the proxy (run `help` in the shell to see what they are). If there's only one proxy session open, the shell's proxy commands will affect that session. Otherwise, you'll have to specify which session to affect with the `on` prefix - to send a chat message in C-17's session, for example, you would run `on C-17 chat ...`.
 
 ## Chat commands
 
 newserv supports a variety of commands players can use by chatting in-game. Any chat message that begins with `$` is treated as a chat command. (If you actually want to send a chat message starting with `$`, type `$$` instead.) On the DC 11/2000 prototype, `@` is used instead of `$` for all chat commands, since `$` does not appear on the English virtual keyboard.
 
-Some commands only work on the game server and not on the proxy server. The chat commands are:
+Some commands only work for clients not in proxy sessions. The chat commands are:
 
 * Information commands
-    * `$li`: Show basic information about the lobby or game you're in. If you're on the proxy server, show information about your connection instead (remote Guild Card number, client ID, etc.).
-    * `$si` (game server only): Show basic information about the server.
-    * `$ping`: Show round-trip ping time from the server to you. On the proxy server, show the ping time from you to the proxy and from the proxy to the server.
-    * `$matcount` (game server only): Show how many of each type of material you've used.
-    * `$killcount` (game server only): Show the kill count on your currently-equipped weapon. If you're in a game and not on BB, the value is only accurate at the time the item enters the game.
+    * `$li`: Show basic information about the lobby or game you're in. If you're on the proxy, show information about your connection instead (remote Guild Card number, client ID, etc.).
+    * `$si`: Show basic information about the server.
+    * `$ping`: Show round-trip ping time from the server to you. On the proxy, show the ping time from you to the proxy and from the proxy to the server.
+    * `$matcount` (non-proxy only): Show how many of each type of material you've used.
+    * `$killcount` (non-proxy only): Show the kill count on your currently-equipped weapon. If you're in a game and not on BB, the value is only accurate at the time the item enters the game.
     * `$itemnotifs <mode>`: Enable item drop notification messages. If the game has private drops enabled, you will only see a notification if the dropped item is visible to you; you won't be notified of other players' drops. The modes are:
         * `off`: No notifications are shown.
         * `rare`: You are notified when a rare item drops.
         * `on`: You are notified when any item drops, except Meseta.
         * `every`: You are notified when any item drops, including Meseta.
     * `$announcerares`: Enable or disable announcements for your rare item finds. This determines whether rare items you find will be announced to the game and server, not whether you will see announcements for others finding rare items.
-    * `$what` (game server only): Show the type, name, and stats of the nearest item on the ground.
-    * `$where` (game server only): Show your current floor number and coordinates. Mainly useful for debugging.
-    * `$qfread <field-name>` (game server only): Show the value of a quest counter in your player data. The field names are defined in config.json.
+    * `$what` (non-proxy only): Show the type, name, and stats of the nearest item on the ground.
+    * `$where`: Show your current floor number and coordinates. Mainly useful for debugging.
+    * `$qfread <field-name>` (non-proxy only): Show the value of a quest counter in your player data. The field names are defined in config.json.
 
-* Debugging commands
-    * `$debug` (game server only): Enable or disable debug. You need the DEBUG flag in your user account to use this command. Enabling debug does several things:
+* Basic debugging commands (special permissions not required)
+    * `$whatobj` and `$whatene` (non-proxy only): Tells you what the closest object or enemy spawn point is to your position, along with its coordinates and object or enemy ID. The full definition is also printed to the server's log.
+    * `$qcheck <flag-num>` (non-proxy only): Show the value of a quest flag. If you're in a game, show the value of the flag in that game; if you're in the lobby, show the saved value of that quest flag for your character (BB only).
+    * `$qgread <flag-num>` (non-proxy only): Show the value of a quest counter ("global flag").
+    * `$sound <sound-id>`: Play the given sound (GC only).
+
+* Restricted debugging commands (`$debug` permission required)
+    * `$debug`: Enable debug mode. You need the DEBUG flag in your user account to use this command. Enabling debug does several things:
+        * You'll be able to use the rest of the commands in this section.
         * You'll see in-game messages from the server when you take some actions, like killing enemies, opening boxes, or flipping switches.
         * You'll see the rare seed value and floor variations when you join a game.
         * You'll be placed into the last available slot in lobbies and games instead of the first, unless you're joining a BB solo-mode game.
         * You'll be able to join games with any PSO version, not only those for which cross-version play is normally enabled. See the "Cross-version play" section above for details on this.
-        * The rest of the commands in this section are enabled on the game server. (They are always enabled on the proxy server.)
-    * `$readmem <address>` (game server only): Read 4 bytes from the given address and show you the values.
-    * `$writemem <address> <data>` (game server only): Write data to the given address. Data is not required to be any specific size.
-    * `$nativecall <address> [arg1 ...]` (game server only, GC only): Call a native function on your client. Only arguments passed in registers are supported; calling functions that take many arguments is not supported.
-    * `$quest <number>` (game server only): Load a quest by quest number. Can be used to load battle or challenge quests with only one player present. Debug is not required to be enabled if the specified quest has the AllowStartFromChatCommand field set in its metadata file.
+    * `$readmem <address>`: Read 4 bytes from the given address and show you the values.
+    * `$writemem <address> <data>`: Write data to the given address. Data is not required to be any specific size.
+    * `$nativecall <address> [arg1 ...]` (GC only): Call a native function on your client. Only arguments passed in registers are supported; calling functions that take many arguments is not supported.
+    * `$quest <number>` (non-proxy only): Load a quest by quest number. Can be used to load battle or challenge quests with only one player present. `$debug` is not required for this command if the specified quest has the AllowStartFromChatCommand field set in its metadata file.
     * `$qcall <function-id>`: Call a quest function on your client.
-    * `$qcheck <flag-num>` (game server only): Show the value of a quest flag. This command can be used without debug mode enabled. If you're in a game, show the value of the flag in that game; if you're in the lobby, show the saved value of that quest flag for your character (BB only).
     * `$qset <flag-num>` or `$qclear <flag-num>`: Set or clear a quest flag for everyone in the game. If you're in the lobby and on BB, set or clear the saved value of a quest flag in your character file.
-    * `$qgread <flag-num>` (game server only): Show the value of a quest counter ("global flag"). This command can be used without debug mode enabled.
-    * `$qgwrite <flag-num> <value>` (game server only): Set the value of a quest counter ("global flag") for yourself.
+    * `$qgwrite <flag-num> <value>` (non-proxy only): Set the value of a quest counter ("global flag") for yourself.
     * `$qsync <reg-num> <value>`: Set a quest register's value for yourself only. `<reg-num>` should be either rXX (e.g. r60) or fXX (e.g. f60); if the latter, `<value>` is parsed as a floating-point value instead of as an integer.
     * `$qsyncall <reg-num> <value>`: Set a quest register's value for everyone in the game. `<reg-num>` should be either rXX (e.g. r60) or fXX (e.g. f60); if the latter, `<value>` is parsed as a floating-point value instead of as an integer.
     * `$swset [floor] <flag-num>` and `$swclear [floor] <flag-num>`: Set or clear a switch flag. If floor is not given, sets or clears the flag on your current floor.
     * `$swsetall`: Set all switch flags on your current floor. This unlocks all doors, disables all laser fences, triggers all light/poison switches, etc.
-    * `$gc` (game server only): Send your own Guild Card to yourself.
+    * `$gc` (non-proxy only): Send your own Guild Card to yourself.
     * `$sc <data>`: Send a command to yourself.
     * `$ss <data>`: Send a command to the remote server (if in a proxy session) or to the game server.
     * `$sb <data>`: Send a command to yourself, and to the remote server or game server.
-    * `$auction` (Episode 3 only): Bring up the CARD Auction menu, regardless of how many players are in the game or if you have a VIP card.
+    * `$auction` (Episode 3 only): Bring up the CARD Auction menu, even if there are fewer than 4 players are in the game or you don't have a VIP card.
 
 * Personal state commands
-    * `$arrow <color-id>`: Change your lobby arrow color.
-    * `$secid <section-id>`: Set your override section ID. After running this command, any games you create will use your override section ID for rare drops instead of your character's actual section ID. If you're in a game and you are the leader of the game, this also immediately changes the item tables used by the server when creating items. To revert to your actual section id, run `$secid` with no name after it. On the proxy server, this will not work if the remote server controls item drops. If the server does not allow cheat mode anywhere (that is, "CheatModeBehavior" is "Off" in config.json), this command does nothing.
-    * `$rand <seed>`: Set your override random seed (specified as a 32-bit hex value). This will make any games you create use the given seed for rare enemies. This also makes item drops deterministic in Blue Burst games hosted by newserv. On the proxy server, this command can cause desyncs with other players in the same game, since they will not see the overridden random seed. To remove the override, run `$rand` with no arguments. If the server does not allow cheat mode anywhere (that is, "CheatModeBehavior" is "Off" in config.json), this command does nothing.
-    * `$ln [name-or-type]`: Set the lobby number. Visible only to you. This command exists because some non-lobby maps can be loaded as lobbies with invalid lobby numbers. See the "GC lobby types" and "Ep3 lobby types" entries in the information menu for acceptable values here. Note that non-lobby maps do not have a lobby counter, so there's no way to exit the lobby without using either `$ln` again or `$exit`. On the game server, `$ln` reloads the lobby immediately; on the proxy server, it doesn't take effect until you load another lobby yourself (which means you'll like have to use `$exit` to escape). Run this command with no argument to return to the default lobby.
+    * `$arrow <color-id>`: Change your lobby arrow color. The color may be specified by number (0-12) or by name (red, blue, green, yellow, purple, cyan, orange, pink, white, white2, white3, or black).
+    * `$secid <section-id>`: Set your override section ID. After running this command, any games you create will use your override section ID for rare drops instead of your character's actual section ID. If you're in a game and you are the leader of the game, this also immediately changes the item tables used by the server when creating items. To revert to your actual section id, run `$secid` with no name after it. On the proxy, this will not work if the remote server controls item drops. If the server does not allow cheat mode anywhere (that is, "CheatModeBehavior" is "Off" in config.json), this command does nothing.
+    * `$rand <seed>`: Set your override random seed (specified as a 32-bit hex value). This will make any games you create use the given seed for rare enemies and item drops. On the proxy, this command can cause desyncs with other players in the same game, since they will not see the overridden random seed. To remove the override, run `$rand` with no arguments. If the server does not allow cheat mode anywhere (that is, "CheatModeBehavior" is "Off" in config.json), this command does nothing.
+    * `$ln [name-or-type]`: Set the lobby number. Visible only to you. This command exists because some non-lobby maps can be loaded as lobbies with invalid lobby numbers. See the "GC lobby types" and "Ep3 lobby types" entries in the information menu for acceptable values here. Note that non-lobby maps do not have a lobby counter, so there's no way to exit the lobby without using either `$ln` again or `$exit`. On the game server, `$ln` reloads the lobby immediately; on the proxy, it doesn't take effect until you load another lobby yourself (which means you'll like have to use `$exit` to escape). Run this command with no argument to return to the default lobby.
     * `$swa`: Enable or disable switch assist. When enabled, the server will unlock two-player and four-player doors in non-quest games when you step on any of the required switches.
     * `$exit`: If you're in a lobby, send you to the main menu (which ends your proxy session, if you're in one). If you're in a game or spectator team, send you to the lobby (but does not end your proxy session if you're in one). Does nothing if you're in a non-Episode 3 game and no quest is in progress.
     * `$patch <name>`: Run a patch on your client. `<name>` must exactly match the name of a patch on the server.
 
-* Character data commands (game server only)
+* Character data commands (non-proxy only)
     * `$savechar <slot>`: Save your current character data on the server in the specified slot. See the [server-side saves section](#server-side-saves) for more details.
-    * `$loadchar <slot>`: Save your current character data on the server in the specified slot. See the [server-side saves section](#server-side-saves) for more details.
+    * `$loadchar <slot>`: Load character data from the specified slot on the server, and replace your current character with it. See the [server-side saves section](#server-side-saves) for more details.
     * `$bbchar <username> <password> <slot>`: Save your current character data on the server in a different account's BB character slots. See the [server-side saves section](#server-side-saves) for more details.
+    * `$checkchar [slot]`: Tells you basic information about a server-side character previously saved using `$savechar`. If `slot` is not given, tells you which slots are used and which are free.
+    * `$deletechar <slot>`: Deletes a server-side character previously saved using `$savechar`.
     * `$edit <stat> <value>`: Modify your character data. See the [using $edit](#using-edit) section for details.
 
-* Blue Burst player commands (game server only)
+* Blue Burst player commands (non-proxy only)
     * `$bank [number]`: Switch your current bank, so you can access your other character's banks (if `number` is 1-4) or your shared account bank (if `number` is 0). If `number` is not given, switch back to your current character's bank.
     * `$save`: Save your character, system, and Guild Card data immediately. (By default, your character is saved every 60 seconds while online, and your account and Guild Card data are saved whenever they change.)
 
-* Game state commands (game server only)
+* Game state commands (non-proxy only)
     * `$maxlevel <level>`: Set the maximum level for players to join the current game. (This only applies when joining; if a player joins and then levels up past this level during the game, they are not kicked out, but won't be able to rejoin if they leave.)
     * `$minlevel <level>`: Set the minimum level for players to join the current game.
     * `$password <password>`: Set the game's join password. To unlock the game, run `$password` with nothing after it.
     * `$dropmode [mode]`: Change the way item drops behave in the current game. `mode` can be `none`, `client`, `shared`, `private`, or `duplicate`. If `mode` is not given, tells you the current drop mode without changing it. See the [item tables and drop modes section](#item-tables-and-drop-modes) for more information.
     * `$persist`: Enable or disable persistence for the current game. When persistence is on, the game will not be deleted when the last player leaves. The states of enemies, objects, and switches will be saved, and items left on the floor will not be deleted. (But if you're in the private or duplicate drop mode, items dropped by enemies are deleted - to make sure a certain item won't be deleted, you can pick it up and drop it again.) If the game is empty for too long (15 minutes by default), it is then deleted.
 
-* Episode 3 commands (game server only)
+* Episode 3 commands (non-proxy only)
     * `$spec`: Toggle the allow spectators flag for Episode 3 games. If any players are spectating when this flag is disabled, they are sent back to the lobby.
     * `$inftime`: Toggle infinite-time mode. Must be used before starting a battle. If infinite-time mode is on, the overall and per-phase time limits will be disabled regardless of the values chosen during battle rules setup. After completing a battle, infinite-time mode is reset to the server's default value (which can be set in Episode3BehaviorFlags in config.json).
     * `$dicerange [d:L-H] [1:L-H] [a1:L-H] [d1:L-H]`: Set override dice ranges for the next battle. The min and max dice values from the rules setup menu always apply to the ATK dice, but you can specify a different range for the DEF dice with `d:2-4` (for example). The `1:` override applies to the 1-player team in a 2v1 game (so you would set the 2-player team's desired dice range in the rules menu). You can also specify the 1-player team's ATK and DEF ranges separately with the `a1:` and `d1:` overrides. Note that these ranges will only be used if the chosen map or quest does not override them.
@@ -611,22 +632,22 @@ Some commands only work on the game server and not on the proxy server. The chat
     * `$playrec <name>`: Play a battle recording. This command creates a spectator team immediately but the replay does not start automatically, to give other players a chance to join. To start the battle replay within the spectator team, run `$playrec` again (with no name). There is a bug in Dolphin that makes this command unstable in emulation (see the "Battle records" section above).
 
 * Cheat mode commands
-    * `$cheat` (game server only): Enable or disable cheat mode for the current game. All other cheat mode commands do nothing if cheat mode is disabled. By default, cheat mode is off in new games but can be enabled; there is an option in config.json that allows you to disable cheat mode entirely, or set it to on by default in new games. Cheat mode is always enabled on the proxy server, unless cheat mode is disabled on the entire server.
-    * `$infhp`: Enable or disable infinite HP mode. Applies to only you; does not affect other players. When enabled, one-hit KO attacks will still kill you, but on most versions of the game (not DCv1, GC US 1.2, or GC JP 1.5), the server will automatically revive you if you die. On all versions except GC US 1.2 and GC JP 1.5, infinite HP also automatically cures status ailments.
-    * `$inftp`: Enable or disable infinite TP mode. Applies to only you; does not affect other players.
+    * `$cheat` (non-proxy only): Enable or disable cheat mode for the current game. All other cheat mode commands do nothing if cheat mode is disabled. By default, cheat mode is off in new games but can be enabled; there is an option in config.json that allows you to disable cheat mode entirely, or set it to on by default in new games. Cheat mode is always enabled on the proxy, unless cheat mode is disabled on the entire server.
+    * `$infhp`: Enable or disable infinite HP mode. Applies to only you; does not affect other players. When enabled, one-hit KO attacks will still kill you, but on most versions of the game, the server will automatically revive you if you die. Infinite HP also automatically cures status ailments.
+    * `$inftp`: Enable or disable infinite TP mode. Applies to only you; does not affect other players. Does not work on DCv1 or earlier versions.
     * `$warpme <floor-id>` (or `$warp <floor-id>`): Warp yourself to the given floor.
-    * `$warpall <floor-id>`: Warp everyone in the game to the given floor. You must be the leader to use this command, unless you're on the proxy server.
+    * `$warpall <floor-id>`: Warp everyone in the game to the given floor. You must be the leader to use this command, unless you're on the proxy.
     * `$next`: Warp yourself to the next floor.
-    * `$item <desc>` (or `$i <desc>`): Create an item. `desc` may be a description of the item (e.g. "Hell Saber +5 0/10/25/0/10") or a string of hex data specifying the item code. Item codes are 16 hex bytes; at least 2 bytes must be specified, and all unspecified bytes are zeroes. If you are on the proxy server, you must not be using Blue Burst for this command to work. On the game server, this command works for all versions.
-    * `$unset <index>` (game server only): In an Episode 3 battle, removes one of your set cards from the field. `<index>` is the index of the set card as it appears on your screen - 1 is the card next to your SC's icon, 2 is the card to the right of 1, etc. This does not cause a Hunters-side SC to lose HP, as they normally do when their items are destroyed.
-    * `$dropmode [mode]` (proxy server): Change the way item drops behave in the current game, if you are not on BB. Unlike the game server version of this command, using this on the proxy server requires cheats to be enabled. This works by intercepting the drop requests sent to and from the leader. (So, if you are the leader and not using server drop mode on the remote server, it affects the entire game; otherwise, it affects only items generated by your actions.) `mode` can be `none` (no drops), `default` (normal drops), or `proxy` (use newserv's drop tables instead of the remote server's). If `mode` is not given, tells you the current drop mode without changing it.
+    * `$item <desc>` (or `$i <desc>`): Create an item. `desc` may be a description of the item (e.g. "Hell Saber +5 0/10/25/0/10") or a string of hex data specifying the item code. Item codes are 16 hex bytes; at least 2 bytes must be specified, and all unspecified bytes are zeroes. If you are on the proxy, you must not be using Blue Burst for this command to work. On the game server, this command works for all versions.
+    * `$unset <index>` (non-proxy only): In an Episode 3 battle, removes one of your set cards from the field. `<index>` is the index of the set card as it appears on your screen - 1 is the card next to your SC's icon, 2 is the card to the right of 1, etc. This does not cause a Hunters-side SC to lose HP, as they normally do when their items are destroyed.
+    * `$dropmode [mode]` (proxy only): Change the way item drops behave in the current game, if you are not on BB. Unlike the game server version of this command, using this on the proxy requires cheats to be enabled. This works by intercepting the drop requests sent to and from the leader. (So, if you are the leader and not using server drop mode on the remote server, it affects the entire game; otherwise, it affects only items generated by your actions.) `mode` can be `none` (no drops), `default` (normal drops), or `proxy` (use newserv's drop tables instead of the remote server's). If `mode` is not given, tells you the current drop mode without changing it.
 
 * Aesthetic commands
-    * `$event <event>`: Set the current holiday event in the current lobby. Holiday events are documented in the "Using $event" item in the information menu. If you're on the proxy server, this applies to all lobbies and games you join, but only you will see the new event - other players will not.
-    * `$allevent <event>` (game server only): Set the current holiday event in all lobbies.
+    * `$event <event>`: Set the current holiday event in the current lobby. Holiday events are documented in the "Using $event" item in the information menu. If you're on the proxy, this applies to all lobbies and games you join, but only you will see the new event - other players will not.
+    * `$allevent <event>` (non-proxy only): Set the current holiday event in all lobbies.
     * `$song <song-id>` (Episode 3 only): Play a specific song in the current lobby.
 
-* Administration commands (game server only)
+* Administration commands (non-proxy only)
     * `$ann <message>`: Send an announcement message. The message is sent as temporary on-screen text to all players in all games and lobbies. On BB, the message appears in the scrolling top bar.
     * `$ann!`, `$ann?`, `$ann?!`: Same as `$ann`, but with `?`, omits the sender's name, and with `!`, sends the message as a Simple Mail message instead of on-screen text.
     * `$silence <identifier>`: Silence a player (remove their ability to chat) or unsilence a player. The identifier may be the player's name or Guild Card number.
@@ -690,7 +711,7 @@ The HTTP server has the following endpoints:
 * `GET /y/data/config`: Returns the server's configuration file.
 * `GET /y/accounts`: Returns information about all registered accounts.
 * `GET /y/clients`: Returns information about all connected clients on the game server.
-* `GET /y/proxy-clients`: Returns information about all connected clients on the proxy server.
+* `GET /y/proxy-clients`: Returns information about all connected clients on the proxy.
 * `GET /y/lobbies`: Returns information about all lobbies and games.
 * `GET /y/server`: Returns information about the server.
 * `GET /y/summary`: Returns a summary of the server's state, connected clients, active games, and proxy sessions.
@@ -718,7 +739,7 @@ Upon connecting, you'll get the message `{"ServerType": "newserv"}`. After that,
 
 # Non-server features
 
-newserv has many CLI options, which can be used to access functionality other than the game and proxy server. Run `newserv help` to see a full list of the options and how to use each one.
+newserv has many CLI options, which can be used to access functionality other than the game server and proxy. Run `newserv help` to see a full list of the options and how to use each one.
 
 The data formats that newserv can convert to/from are:
 
@@ -737,6 +758,7 @@ The data formats that newserv can convert to/from are:
 | PSO DC save file (.vms)             | `encrypt-vms-save`        | `decrypt-vms-save`           |
 | PSO PC save file                    | `encrypt-pc-save`         | `decrypt-pc-save`            |
 | PSO GC save file (.gci)             | `encrypt-gci-save`        | `decrypt-gci-save`           |
+| PSO Xbox save file                  | None                      | `decrypt-xbox-save`          |
 | PSO GC snapshot file                | None                      | `decode-gci-snapshot`        |
 | Quest script (.bin)                 | `assemble-quest-script`   | `disassemble-quest-script`   |
 | Quest map (.dat)                    | None                      | `disassemble-quest-map`      |
@@ -760,6 +782,7 @@ There are several actions that don't fit well into the table above, which let yo
 * Format Episode 3 game data in a human-readable manner (`show-ep3-maps`, `show-ep3-cards`, `generate-ep3-cards-html`)
 * Format Blue Burst battle parameter files in a human-readable manner (`show-battle-params`)
 * Convert item data to a human-readable description, or vice versa (`describe-item`)
+* Show the server's item and level tables (`show-item-tables`, `show-level-tables`)
 * Connect to another PSO server and pretend to be a client (`cat-client`)
 * Generate or describe DC serial numbers (`generate-dc-serial-number`, `inspect-dc-serial-number`)
 

TODO.md

@@ -1,13 +1,19 @@
 ## General
 
-- Make UI strings localizable (e.g. entries in menus, welcome message, etc.)
-- Add an idle connection timeout for proxy sessions
+- Make a server patch version of story flag fixer quest
+- Fix enemy flag mapping in v2/v3 crossplay and test
+- Handle items in crossplay - use the replacement table
+- Make proxy server handle all login commands on non-BB, including sending 9C when needed
+- Add $switchit command (activates switch flag(s) for nearest object, e.g. laser fence, door, fog collision)
+- Add a way to persist flags across connections, at least on v3, because of Meet User + B2 enable quest interactions - maybe update the quest to patch one of the login commands so the server can tell it's enabled
+- Handle MeetUserExtensions properly in 41 and C4 commands on the proxy (rewrite the embedded 19 command and put some metadata in the persistent config, perhaps)
 - Clean up ItemParameterTable implementation (see comment at the top of the class definition)
-- Handle MeetUserExtensions properly in 41 and C4 commands on the proxy (rewrite the embedded 19 command and store a map of received destinations)
+- Make UI strings localizable (e.g. entries in menus, welcome message, etc.)
 
 ## PSO DC
 
 - Investigate if https://crates.io/crates/blaze-ssl-async can be used to implement the HL check server
+- v2 challenge data in $savechar/$loadchar doesn't work properly
 
 ## Episode 3
 
@@ -27,3 +33,5 @@
 - Figure out why Pouilly Slime EXP doesn't work
 - Make server-specified rare enemies work with maps loaded by the proxy
 - Implement serialization for various table types (ItemPMT, ItemPT, etc.)
+- Record some BB tests
+- Add all necessary Guild Card number rewrites in BB commands on the proxy

notes/ar-codes.txt

@@ -17,7 +17,8 @@ Version codes (from README.md):
   2OJF: PSO DC v2 JP
   2OEF: PSO DC v2 US
   2OPF: PSO DC v2 EU
-  2OJW: PSO PC (v2)
+  2OJW: PSO PC (v2) 04/2002
+  2OJZ: PSO PC (v2) 02/2003
   3OJT: PSO GC Trial Edition
   3OJ2: PSO GC v1.2 JP
   3OJ3: PSO GC v1.3 JP
@@ -39,14 +40,30 @@ Version codes (from README.md):
   4OPD: PSO Xbox EU Disc
   4OPU: PSO Xbox EU TU
   59NJ: PSO BB JP 1.25.11
-  59NL: PSO BB JP 1.25.13
-  59NL: PSO BB Tethealla
+  59NL: PSO BB JP 1.25.13 (including the Tethealla client)
 
 The menu code
 This code makes all disabled items in menus selectable, which allows you to e.g. use items you can't normally use
+3OJ2 => 04263B80 48000028
+        042AC548 48000020
+3OJ3 => 04264758 48000028
+        042AD3F0 48000020
+3OJ4 => 042657B4 48000028
+        042AE51C 48000020
+3OJ5 => 04265554 48000028
+        042AE2D0 48000020
+3OE0 => 04264458 48000028
+        042ACF04 48000020
 3OE1 => 04264458 48000028
         042ACF48 48000020
+3OE2 => 04265818 48000028
+        042AE484 48000020
+3OP0 => 04265060 48000028
+        042ADC18 48000020
+3SJT => 0417ADD0 48000028
+3SJ0 => 0416B5A4 48000028
 3SE0 => 0416B458 48000028
+3SP0 => 0416B904 48000028
 
 Disable serial number validation (untested)
 2OEF => 8C1E743E 01E0
@@ -703,3 +720,15 @@ Show extended item info when targeting a dropped item
         04005188 38210020
         0400518C 7C0803A6
         04005190 4E800020
+
+All weapons can do 3-hit combos
+3OE1 => 041D3248 38000001
+
+Disable save file signature validation (for moving Xbox saves across consoles)
+4OJB => 002F01CB 9090
+4OJD => 002F0CDB 9090
+4OJU => 002F22DB 9090
+4OED => 002F212B 9090
+4OEU => 002F22DB 9090
+4OPD => 002F215B 9090
+4OPU => 002F234B 9090

notes/dc-proto-connection-addresses.txt

@@ -1,5 +1,5 @@
-DC NTE: pso02.dricas.ne.jp
-Nov 2000 proto: test1.st-pso.games.sega.net
-Dec 2000 proto: sg107634.csrd.sega.co.jp OR master.pso.dream-key.com
-Jan 2001 proto: master.pso.dream-key.com
-Aug 2001 proto (v2): game01.st-pso.games.sega.net
+1OJ1 (DC NTE): pso02.dricas.ne.jp
+1OJ2 (11/2000): test1.st-pso.games.sega.net
+1OJ3 (12/2000): sg107634.csrd.sega.co.jp OR master.pso.dream-key.com
+1OJ4 (01/2001): master.pso.dream-key.com
+2OJ5 (08/2001; v2): game01.st-pso.games.sega.net

notes/ep3-nte-differences.txt

@@ -1,4 +1,6 @@
 List of differences in Ep3 NTE compared to Final:
+- COMs can play more than one defense card per turn
+- The battle setup menu allows 1v2 battles
 - Assist cards
 - - Dice Fever sets dice to 6, not 5, and there is no Dice Fever +
 - - Rich + and Charity + also don't exist

notes/hangame-notes.txt

@@ -1,7 +1,7 @@
-patch required in TethVer12513 to get this to work: 0048210D EB
+patch required in 59NL to get this to work: 0048210D EB
 
-is_hangame callsites:
-0040457C - ??? (something in TDataProtocol?)
+is_hangame callsites in 59NL:
+0040457C - don't save password on disconnect
 004820F4 - client version check (use patch above to bypass)
 00708318 - patch server domain name
 00708348 - patch server port

notes/quest-flags.txt

@@ -105,7 +105,6 @@
 00F5 = Weapon badge approval for gran squall //is cleared if quest is left
 00F6 = Secret delivery. Got AKIKO's FRYING PAN!
 00FB = Got Orochi-agito
-00FB = Received OROCHI-AGITO!
 00FD = Unknown addicting food
 0105 = Central dome fire swirl. Got Glory of the past!
 0106 = Central dome fire swirl. Got Mark3.

src/Account.cc

@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <filesystem>
 #include <phosg/Filesystem.hh>
 #include <phosg/Hash.hh>
 #include <phosg/Random.hh>
@@ -292,7 +293,7 @@ phosg::JSON Account::json() const {
 }
 
 string Account::str() const {
-  std::string ret = phosg::string_printf("Account: %010" PRIu32 "/%08" PRIX32 "\n", this->account_id, this->account_id);
+  std::string ret = std::format("Account: {:010}/{:08X}\n", this->account_id, this->account_id);
 
   if (this->flags) {
     string flags_str = "";
@@ -336,10 +337,10 @@ string Account::str() const {
     }
     if (flags_str.empty()) {
       flags_str = "none";
-    } else if (phosg::ends_with(flags_str, ",")) {
+    } else if (flags_str.ends_with(",")) {
       flags_str.pop_back();
     }
-    ret += phosg::string_printf("  Flags: %08" PRIX32 " (%s)\n", this->flags, flags_str.c_str());
+    ret += std::format("  Flags: {:08X} ({})\n", this->flags, flags_str);
   }
 
   if (this->user_flags) {
@@ -349,56 +350,56 @@ string Account::str() const {
     }
     if (user_flags_str.empty()) {
       user_flags_str = "none";
-    } else if (phosg::ends_with(user_flags_str, ",")) {
+    } else if (user_flags_str.ends_with(",")) {
       user_flags_str.pop_back();
     }
-    ret += phosg::string_printf("  User flags: %08" PRIX32 " (%s)\n", this->user_flags, user_flags_str.c_str());
+    ret += std::format("  User flags: {:08X} ({})\n", this->user_flags, user_flags_str);
   }
 
   if (this->ban_end_time) {
     string time_str = phosg::format_time(this->ban_end_time);
-    ret += phosg::string_printf("  Banned until: %" PRIu64 " (%s)\n", this->ban_end_time, time_str.c_str());
+    ret += std::format("  Banned until: {} ({})\n", this->ban_end_time, time_str);
   }
   if (this->ep3_current_meseta || this->ep3_total_meseta_earned) {
-    ret += phosg::string_printf("  Episode 3 meseta: %" PRIu32 " (total earned: %" PRIu32 ")\n",
+    ret += std::format("  Episode 3 meseta: {} (total earned: {})\n",
         this->ep3_current_meseta, this->ep3_total_meseta_earned);
   }
   if (!this->last_player_name.empty()) {
-    ret += phosg::string_printf("  Last player name: \"%s\"\n", this->last_player_name.c_str());
+    ret += std::format("  Last player name: \"{}\"\n", this->last_player_name);
   }
   if (!this->auto_reply_message.empty()) {
-    ret += phosg::string_printf("  Auto reply message: \"%s\"\n", this->auto_reply_message.c_str());
+    ret += std::format("  Auto reply message: \"{}\"\n", this->auto_reply_message);
   }
   if (this->bb_team_id) {
-    ret += phosg::string_printf("  BB team ID: %08" PRIX32 "\n", this->bb_team_id);
+    ret += std::format("  BB team ID: {:08X}\n", this->bb_team_id);
   }
   if (this->is_temporary) {
-    ret += phosg::string_printf("  Is temporary license: true\n");
+    ret += std::format("  Is temporary license: true\n");
   }
 
   for (const auto& it : this->dc_nte_licenses) {
-    ret += phosg::string_printf("  DC NTE license: serial_number=%s access_key=%s\n",
-        it.second->serial_number.c_str(), it.second->access_key.c_str());
+    ret += std::format("  DC NTE license: serial_number={} access_key={}\n",
+        it.second->serial_number, it.second->access_key);
   }
   for (const auto& it : this->dc_licenses) {
-    ret += phosg::string_printf("  DC license: serial_number=%" PRIX32 " access_key=%s\n",
-        it.second->serial_number, it.second->access_key.c_str());
+    ret += std::format("  DC license: serial_number={:X} access_key={}\n",
+        it.second->serial_number, it.second->access_key);
   }
   for (const auto& it : this->pc_licenses) {
-    ret += phosg::string_printf("  PC license: serial_number=%" PRIX32 " access_key=%s\n",
-        it.second->serial_number, it.second->access_key.c_str());
+    ret += std::format("  PC license: serial_number={:X} access_key={}\n",
+        it.second->serial_number, it.second->access_key);
   }
   for (const auto& it : this->gc_licenses) {
-    ret += phosg::string_printf("  GC license: serial_number=%010" PRIu32 " access_key=%s password=%s\n",
-        it.second->serial_number, it.second->access_key.c_str(), it.second->password.c_str());
+    ret += std::format("  GC license: serial_number={:010} access_key={} password={}\n",
+        it.second->serial_number, it.second->access_key, it.second->password);
   }
   for (const auto& it : this->xb_licenses) {
-    ret += phosg::string_printf("  XB license: gamertag=%s user_id=%016" PRIX64 " account_id=%016" PRIX64 "\n",
-        it.second->gamertag.c_str(), it.second->user_id, it.second->account_id);
+    ret += std::format("  XB license: gamertag={} user_id={:016X} account_id={:016X}\n",
+        it.second->gamertag, it.second->user_id, it.second->account_id);
   }
   for (const auto& it : this->bb_licenses) {
-    ret += phosg::string_printf("  BB license: username=%s password=%s\n",
-        it.second->username.c_str(), it.second->password.c_str());
+    ret += std::format("  BB license: username={} password={}\n",
+        it.second->username, it.second->password);
   }
 
   phosg::strip_trailing_whitespace(ret);
@@ -409,13 +410,13 @@ void Account::save() const {
   if (!this->is_temporary) {
     auto json = this->json();
     string json_data = json.serialize(phosg::JSON::SerializeOption::FORMAT | phosg::JSON::SerializeOption::HEX_INTEGERS);
-    string filename = phosg::string_printf("system/licenses/%010" PRIu32 ".json", this->account_id);
+    string filename = std::format("system/licenses/{:010}.json", this->account_id);
     phosg::save_file(filename, json_data);
   }
 }
 
 void Account::delete_file() const {
-  string filename = phosg::string_printf("system/licenses/%010" PRIu32 ".json", this->account_id);
+  string filename = std::format("system/licenses/{:010}.json", this->account_id);
   remove(filename.c_str());
 }
 
@@ -440,24 +441,24 @@ uint64_t Login::proxy_session_id() const {
 }
 
 string Login::str() const {
-  string ret = phosg::string_printf("Account:%08" PRIX32, this->account->account_id);
+  string ret = std::format("Account:{:08X}", this->account->account_id);
   if (this->account_was_created) {
     ret += " (new)";
   }
   if (this->dc_nte_license) {
-    ret += phosg::string_printf(" via DC NTE serial number %s", this->dc_nte_license->serial_number.c_str());
+    ret += std::format(" via DC NTE serial number {}", this->dc_nte_license->serial_number);
   } else if (this->dc_license) {
-    ret += phosg::string_printf(" via DC serial number %08" PRIX32, this->dc_license->serial_number);
+    ret += std::format(" via DC serial number {:08X}", this->dc_license->serial_number);
   } else if (this->pc_license) {
-    ret += phosg::string_printf(" via PC serial number %08" PRIX32, this->pc_license->serial_number);
+    ret += std::format(" via PC serial number {:08X}", this->pc_license->serial_number);
   } else if (this->gc_license) {
-    ret += phosg::string_printf(" via GC serial number %010" PRIu32, this->gc_license->serial_number);
+    ret += std::format(" via GC serial number {:010}", this->gc_license->serial_number);
   } else if (this->xb_license) {
-    ret += phosg::string_printf(" via XB user ID %016" PRIX64, this->xb_license->user_id);
+    ret += std::format(" via XB user ID {:016X}", this->xb_license->user_id);
   } else if (this->bb_license) {
-    ret += phosg::string_printf(" via BB username %s", this->bb_license->username.c_str());
+    ret += std::format(" via BB username {}", this->bb_license->username);
   } else {
-    ret += phosg::string_printf(" artificially");
+    ret += std::format(" artificially");
   }
   return ret;
 }
@@ -1043,16 +1044,17 @@ shared_ptr<Account> AccountIndex::create_temporary_account_for_shared_account(
 AccountIndex::AccountIndex(bool force_all_temporary)
     : force_all_temporary(force_all_temporary) {
   if (!this->force_all_temporary) {
-    if (!phosg::isdir("system/licenses")) {
-      mkdir("system/licenses", 0755);
+    if (!std::filesystem::is_directory("system/licenses")) {
+      std::filesystem::create_directories("system/licenses");
     } else {
-      for (const auto& item : phosg::list_directory("system/licenses")) {
-        if (phosg::ends_with(item, ".json")) {
+      for (const auto& item : std::filesystem::directory_iterator("system/licenses")) {
+        string filename = item.path().filename().string();
+        if (filename.ends_with(".json")) {
           try {
-            phosg::JSON json = phosg::JSON::parse(phosg::load_file("system/licenses/" + item));
+            phosg::JSON json = phosg::JSON::parse(phosg::load_file("system/licenses/" + filename));
             this->add(make_shared<Account>(json));
           } catch (const exception& e) {
-            phosg::log_error("Failed to index account %s", item.c_str());
+            phosg::log_error_f("Failed to index account {}", filename);
             throw;
           }
         }

src/AddressTranslator-Stub.hh

@@ -1,24 +0,0 @@
-#pragma once
-
-#include <stdexcept>
-#include <string>
-#include <utility>
-#include <vector>
-
-struct DiffEntry {
-  uint32_t address;
-  std::string a_data;
-  std::string b_data;
-};
-
-inline void run_address_translator(const std::string&, const std::string&, const std::string&) {
-  throw std::runtime_error("resource_file is not available; install it and rebuild newserv");
-}
-
-inline std::vector<DiffEntry> diff_dol_files(const std::string&, const std::string&) {
-  throw std::runtime_error("resource_file is not available; install it and rebuild newserv");
-}
-
-inline std::vector<DiffEntry> diff_xbe_files(const std::string&, const std::string&) {
-  throw std::runtime_error("resource_file is not available; install it and rebuild newserv");
-}

src/AddressTranslator.cc

@@ -1,13 +1,19 @@
 #include "AddressTranslator.hh"
 
 #include <array>
+#include <filesystem>
 #include <future>
 #include <phosg/Filesystem.hh>
 #include <phosg/Strings.hh>
+#include <resource_file/Emulators/X86Emulator.hh>
 #include <resource_file/ExecutableFormats/DOLFile.hh>
 #include <resource_file/ExecutableFormats/PEFile.hh>
 #include <resource_file/ExecutableFormats/XBEFile.hh>
 
+#include "Map.hh"
+#include "Text.hh"
+#include "Types.hh"
+
 using namespace std;
 
 class AddressTranslator {
@@ -107,44 +113,44 @@ public:
 
   AddressTranslator(const string& directory)
       : log("[addr-trans] "),
-        directory(directory),
-        enable_ppc(false) {
-    while (phosg::ends_with(this->directory, "/")) {
+        directory(directory) {
+    while (this->directory.ends_with("/")) {
       this->directory.pop_back();
     }
-    for (const auto& filename : phosg::list_directory(this->directory)) {
+    for (const auto& item : std::filesystem::directory_iterator(this->directory)) {
+      string filename = item.path().filename().string();
       if (filename.size() < 4) {
         continue;
       }
       string name = filename.substr(0, filename.size() - 4);
       string path = directory + "/" + filename;
 
-      if (phosg::ends_with(filename, ".dol")) {
+      if (filename.ends_with(".dol")) {
         ResourceDASM::DOLFile dol(path.c_str());
         auto mem = make_shared<ResourceDASM::MemoryContext>();
         dol.load_into(mem);
         this->mems.emplace(name, mem);
-        this->enable_ppc = true;
-        this->log.info("Loaded %s", name.c_str());
-      } else if (phosg::ends_with(filename, ".xbe")) {
+        this->ppc_mems.emplace(mem);
+        this->log.info_f("Loaded {}", name);
+      } else if (filename.ends_with(".xbe")) {
         ResourceDASM::XBEFile xbe(path.c_str());
         auto mem = make_shared<ResourceDASM::MemoryContext>();
         xbe.load_into(mem);
         this->mems.emplace(name, mem);
-        this->log.info("Loaded %s", name.c_str());
-      } else if (phosg::ends_with(filename, ".exe")) {
+        this->log.info_f("Loaded {}", name);
+      } else if (filename.ends_with(".exe")) {
         ResourceDASM::PEFile pe(path.c_str());
         auto mem = make_shared<ResourceDASM::MemoryContext>();
         pe.load_into(mem);
         this->mems.emplace(name, mem);
-        this->log.info("Loaded %s", name.c_str());
-      } else if (phosg::ends_with(filename, ".bin")) {
+        this->log.info_f("Loaded {}", name);
+      } else if (filename.ends_with(".bin")) {
         string data = phosg::load_file(path);
         auto mem = make_shared<ResourceDASM::MemoryContext>();
         mem->allocate_at(0x8C010000, data.size());
         mem->memcpy(0x8C010000, data.data(), data.size());
         this->mems.emplace(name, mem);
-        this->log.info("Loaded %s", name.c_str());
+        this->log.info_f("Loaded {}", name);
       }
     }
   }
@@ -198,18 +204,273 @@ public:
         }
       }
       if (r2_low_found && r2_high_found) {
-        fprintf(stderr, "(%s) r2 = %08" PRIX32 "\n", it.first.c_str(), r2);
+        phosg::fwrite_fmt(stderr, "({}) r2 = {:08X}\n", it.first, r2);
       } else {
-        fprintf(stderr, "(%s) r2 = __MISSING__\n", it.first.c_str());
+        phosg::fwrite_fmt(stderr, "({}) r2 = __MISSING__\n", it.first);
       }
       if (r13_low_found && r13_high_found) {
-        fprintf(stderr, "(%s) r13 = %08" PRIX32 "\n", it.first.c_str(), r13);
+        phosg::fwrite_fmt(stderr, "({}) r13 = {:08X}\n", it.first, r13);
       } else {
-        fprintf(stderr, "(%s) r13 = __MISSING__\n", it.first.c_str());
+        phosg::fwrite_fmt(stderr, "({}) r13 = __MISSING__\n", it.first);
       }
     }
   }
 
+  struct ParseDATConstructorTableSpec {
+    string src_name;
+    uint32_t index_addr;
+    size_t num_areas;
+    bool has_names;
+    vector<uint32_t> x86_constructor_calls;
+
+    ParseDATConstructorTableSpec(const phosg::JSON& json) {
+      this->src_name = json.at("SourceName").as_string();
+      this->index_addr = json.at("IndexAddress").as_int();
+      this->num_areas = json.at("AreaCount").as_int();
+      this->has_names = json.at("HasNames").as_bool();
+      for (const auto& z : json.at("X86ConstructorCalls").as_list()) {
+        this->x86_constructor_calls.emplace_back(z->as_int());
+      }
+    }
+
+    static vector<ParseDATConstructorTableSpec> from_json_list(const phosg::JSON& json) {
+      vector<ParseDATConstructorTableSpec> ret;
+      for (const auto& z : json.as_list()) {
+        ret.emplace_back(*z);
+      }
+      return ret;
+    }
+  };
+
+  template <bool BE>
+  struct DATConstructorTableEntry {
+    static constexpr bool IsBE = BE;
+
+    U16T<BE> type;
+    U16T<BE> unknown_a1;
+    U32T<BE> constructor_addr;
+    F32T<BE> unknown_a2;
+    U32T<BE> default_num_children;
+  } __attribute__((packed));
+
+  template <bool BE>
+  struct DATConstructorTableEntryWithName {
+    static constexpr bool IsBE = BE;
+
+    pstring<TextEncoding::ASCII, 0x10> debug_name;
+    U16T<BE> type;
+    U16T<BE> unknown_a1;
+    U32T<BE> constructor_addr;
+    F32T<BE> unknown_a2;
+    U32T<BE> default_num_children;
+  } __attribute__((packed));
+
+  // Returns {type: {constructor_addr: [(start_area, end_area), ...]}}
+  template <typename EntryT>
+  map<uint32_t, map<uint32_t, vector<pair<size_t, size_t>>>>
+  parse_dat_constructor_table_t(
+      shared_ptr<const ResourceDASM::MemoryContext>& mem,
+      const ParseDATConstructorTableSpec& spec) {
+    if (!mem) {
+      throw runtime_error("no file selected");
+    }
+
+    // On some of the x86 builds of the game (PCv2 and Xbox), the constructor
+    // tables aren't entirely static in the data sections - some parts are
+    // written during static initialization instead. To handle this, we make a
+    // copy of the immutable MemoryContext and run the static initialization
+    // functions using resource_dasm's emulator before parsing the constructor
+    // table.
+    shared_ptr<const ResourceDASM::MemoryContext> effective_mem = mem;
+    if (!spec.x86_constructor_calls.empty()) {
+      auto constructed_mem = make_shared<ResourceDASM::MemoryContext>(mem->duplicate());
+      uint32_t esp = constructed_mem->allocate(0x1000) + 0x1000;
+      for (uint32_t constructor_addr : spec.x86_constructor_calls) {
+        ResourceDASM::X86Emulator emu(constructed_mem);
+
+        // Uncomment for debugging
+        // auto debugger = make_shared<ResourceDASM::EmulatorDebugger<ResourceDASM::X86Emulator>>();
+        // debugger->bind(emu);
+        // debugger->state.mode = ResourceDASM::DebuggerMode::TRACE;
+
+        auto& regs = emu.registers();
+        regs.eip = constructor_addr;
+        regs.esp().u = esp - 4;
+        constructed_mem->write_u32l(esp - 4, 0xFFFFFFFF); // Return addr
+        try {
+          emu.execute();
+        } catch (const out_of_range&) {
+          if (regs.eip != 0xFFFFFFFF) {
+            throw;
+          }
+        }
+      }
+      effective_mem = constructed_mem;
+    }
+
+    map<uint32_t, map<uint32_t, vector<pair<size_t, size_t>>>> table;
+
+    auto index_r = effective_mem->reader(spec.index_addr, spec.num_areas * sizeof(uint32_t));
+    for (size_t area = 0; area < spec.num_areas; area++) {
+      uint32_t entries_addr = EntryT::IsBE ? index_r.get_u32b() : index_r.get_u32l();
+      if (!entries_addr) {
+        continue;
+      }
+      auto entries_r = effective_mem->reader(entries_addr, 0x4000); // 0x4000 is probably enough
+      while (!entries_r.eof()) {
+        const auto& entry = entries_r.get<EntryT>();
+        if (entry.type == 0xFFFF) {
+          break;
+        }
+        auto& group = table[entry.type][entry.constructor_addr];
+        if (!group.empty() && (group.back().second == (area - 1))) {
+          group.back().second = area;
+        } else {
+          group.emplace_back(make_pair(area, area));
+        }
+      }
+      if (entries_r.eof()) {
+        throw runtime_error("did not find end-of-entries marker");
+      }
+    }
+
+    return table;
+  }
+
+  static uint64_t area_mask_for_ranges(const vector<pair<size_t, size_t>>& ranges) {
+    uint64_t ret = 0;
+    for (const auto& [start, end] : ranges) {
+      for (size_t z = start; z <= end; z++) {
+        ret |= static_cast<uint64_t>(1ULL << z);
+      }
+    }
+    return ret;
+  }
+
+  void parse_dat_constructor_table(const ParseDATConstructorTableSpec& spec) {
+    map<uint32_t, map<uint32_t, vector<pair<size_t, size_t>>>> table;
+    auto spec_mem = this->mems.at(spec.src_name);
+    if (this->ppc_mems.count(spec_mem)) {
+      table = this->parse_dat_constructor_table_t<DATConstructorTableEntry<true>>(spec_mem, spec);
+    } else if (!spec.has_names) {
+      table = this->parse_dat_constructor_table_t<DATConstructorTableEntry<false>>(spec_mem, spec);
+    } else {
+      table = this->parse_dat_constructor_table_t<DATConstructorTableEntryWithName<false>>(spec_mem, spec);
+    }
+
+    for (const auto& [type, constructor_to_area_ranges] : table) {
+      phosg::fwrite_fmt(stdout, "{:04X} =>", type);
+      for (const auto& [constructor, area_ranges] : constructor_to_area_ranges) {
+        phosg::fwrite_fmt(stdout, " {:08X}", constructor);
+        bool is_first = true;
+        for (const auto& [start, end] : area_ranges) {
+          fputc(is_first ? ':' : ',', stdout);
+          if (start == end) {
+            phosg::fwrite_fmt(stdout, "{:02X}", start);
+          } else {
+            phosg::fwrite_fmt(stdout, "{:02X}-{:02X}", start, end);
+          }
+          is_first = false;
+        }
+      }
+      fputc('\n', stdout);
+    }
+  }
+
+  void parse_dat_constructor_table_multi(
+      const vector<ParseDATConstructorTableSpec>& specs, bool is_enemies, bool print_area_masks) {
+    map<string, map<uint32_t, map<uint32_t, vector<pair<size_t, size_t>>>>> all_tables;
+    for (const auto& spec : specs) {
+      map<uint32_t, map<uint32_t, vector<pair<size_t, size_t>>>> table;
+      auto spec_mem = this->mems.at(spec.src_name);
+      if (this->ppc_mems.count(spec_mem)) {
+        table = this->parse_dat_constructor_table_t<DATConstructorTableEntry<true>>(spec_mem, spec);
+      } else if (!spec.has_names) {
+        table = this->parse_dat_constructor_table_t<DATConstructorTableEntry<false>>(spec_mem, spec);
+      } else {
+        table = this->parse_dat_constructor_table_t<DATConstructorTableEntryWithName<false>>(spec_mem, spec);
+      }
+      all_tables.emplace(spec.src_name, std::move(table));
+    }
+
+    map<string, size_t> version_widths;
+    map<uint32_t, map<string, string>> formatted_cells_for_type;
+    for (const auto& spec : specs) {
+      const auto& table = all_tables.at(spec.src_name);
+      size_t max_width = 0;
+
+      for (const auto& [type, constructor_to_area_ranges] : table) {
+        string cell_data;
+        for (const auto& [constructor, area_ranges] : constructor_to_area_ranges) {
+          if (!cell_data.empty()) {
+            cell_data.push_back(' ');
+          }
+          cell_data += std::format("{:08X}", constructor);
+          if (print_area_masks) {
+            cell_data += std::format(":{:016X}", this->area_mask_for_ranges(area_ranges));
+          } else {
+            bool is_first = true;
+            for (const auto& [start, end] : area_ranges) {
+              cell_data.push_back(is_first ? ':' : ',');
+              if (start == end) {
+                cell_data += std::format("{:02X}", start);
+              } else {
+                cell_data += std::format("{:02X}-{:02X}", start, end);
+              }
+              is_first = false;
+            }
+          }
+        }
+        max_width = max<size_t>(max_width, cell_data.size());
+        formatted_cells_for_type[type][spec.src_name] = std::move(cell_data);
+      }
+      version_widths[spec.src_name] = max_width;
+    }
+
+    vector<string> formatted_lines;
+    string header_line = "TYPE =>";
+    for (const auto& spec : specs) {
+      size_t width = version_widths.at(spec.src_name);
+      header_line.push_back(' ');
+      header_line += spec.src_name;
+      if (width > spec.src_name.size()) {
+        header_line.resize(header_line.size() + (width - spec.src_name.size()), '-');
+      }
+    }
+    header_line += " NAME";
+
+    for (const auto& [type, formatted_cells] : formatted_cells_for_type) {
+      string line = std::format("{:04X} =>", type);
+      for (const auto& spec : specs) {
+        size_t width = version_widths.at(spec.src_name);
+        try {
+          const auto& cell_data = formatted_cells.at(spec.src_name);
+          line.push_back(' ');
+          line += cell_data;
+          if (width > cell_data.size()) {
+            line.resize(line.size() + (width - cell_data.size()), ' ');
+          }
+        } catch (const out_of_range&) {
+          line.resize(line.size() + (width + 1), ' ');
+        }
+      }
+      line.push_back(' ');
+      line += is_enemies
+          ? MapFile::name_for_enemy_type(type)
+          : MapFile::name_for_object_type(type);
+
+      if ((formatted_lines.size() % 40) == 0) {
+        formatted_lines.emplace_back(header_line);
+      }
+      formatted_lines.emplace_back(std::move(line));
+    }
+
+    for (auto& line : formatted_lines) {
+      phosg::strip_trailing_whitespace(line);
+      phosg::fwrite_fmt(stdout, "{}\n", line);
+    }
+  }
+
   uint32_t find_match(
       shared_ptr<const ResourceDASM::MemoryContext> dest_mem,
       uint32_t src_addr,
@@ -241,7 +502,7 @@ public:
     size_t src_offset = src_addr - src_section.first;
     size_t src_bytes_available_before = src_offset;
     size_t src_bytes_available_after = src_section.second - src_offset - 4;
-    this->log.info("(find_match/%s) Source offset = %08zX with %zX/%zX bytes available before/after",
+    this->log.info_f("(find_match/{}) Source offset = {:08X} with {:X}/{:X} bytes available before/after",
         method_token, src_offset, src_bytes_available_before, src_bytes_available_after);
 
     size_t match_bytes_before = 0;
@@ -311,7 +572,7 @@ public:
           }
         }
       }
-      this->log.info("(find_match/%s) For match length %zX, %zu matches found", method_token, match_length, num_matches);
+      this->log.info_f("(find_match/{}) For match length {:X}, {} matches found", method_token, match_length, num_matches);
       if (num_matches == 1) {
         return last_match_address;
       } else if (num_matches == 0) {
@@ -374,7 +635,13 @@ public:
     throw runtime_error("scan field too long; too many matches");
   }
 
-  void find_all_matches(uint32_t src_addr, uint32_t src_size) const {
+  enum class MatchType {
+    ANY = 0,
+    TEXT,
+    DATA,
+  };
+
+  void find_all_matches(uint32_t src_addr, uint32_t src_size, MatchType type) const {
     if (!this->src_mem) {
       throw runtime_error("no source file selected");
     }
@@ -382,7 +649,7 @@ public:
     map<string, uint32_t> results;
     for (const auto& it : this->mems) {
       if (it.second == this->src_mem) {
-        log.info("(%s) %08" PRIX32 " (from source)", it.first.c_str(), src_addr);
+        log.info_f("({}) {:08X} (from source)", it.first, src_addr);
         results.emplace(it.first, src_addr);
 
       } else {
@@ -399,39 +666,68 @@ public:
             ExpandMethod::PPC_DATA_BACKWARD,
             ExpandMethod::PPC_DATA_BOTH,
         };
+        static const vector<ExpandMethod> ppc_text_methods = {
+            ExpandMethod::PPC_TEXT_FORWARD,
+            ExpandMethod::PPC_TEXT_FORWARD_WITH_BARRIER,
+            ExpandMethod::PPC_TEXT_BACKWARD,
+            ExpandMethod::PPC_TEXT_BACKWARD_WITH_BARRIER,
+            ExpandMethod::PPC_TEXT_BOTH,
+            ExpandMethod::PPC_TEXT_BOTH_WITH_BARRIER,
+            ExpandMethod::PPC_TEXT_BOTH_IGNORE_ORIGIN,
+        };
+        static const vector<ExpandMethod> ppc_data_methods = {
+            ExpandMethod::PPC_DATA_FORWARD,
+            ExpandMethod::PPC_DATA_BACKWARD,
+            ExpandMethod::PPC_DATA_BOTH,
+        };
         static const vector<ExpandMethod> raw_methods = {
             ExpandMethod::RAW_FORWARD,
             ExpandMethod::RAW_BACKWARD,
             ExpandMethod::RAW_BOTH,
         };
-        const auto& methods = this->enable_ppc ? ppc_methods : raw_methods;
-        for (size_t z = 0; z < methods.size(); z++) {
-          futures.emplace_back(async(&AddressTranslator::find_match, this, it.second, src_addr, src_size, methods[z]));
+
+        const vector<ExpandMethod>* methods;
+        if (this->ppc_mems.count(it.second)) {
+          if (type == MatchType::ANY) {
+            methods = &ppc_methods;
+          } else if (type == MatchType::TEXT) {
+            methods = &ppc_text_methods;
+          } else if (type == MatchType::DATA) {
+            methods = &ppc_data_methods;
+          } else {
+            throw logic_error("invalid match type");
+          }
+        } else {
+          methods = &raw_methods;
+        }
+
+        for (size_t z = 0; z < methods->size(); z++) {
+          futures.emplace_back(async(&AddressTranslator::find_match, this, it.second, src_addr, src_size, methods->at(z)));
         }
 
         unordered_set<uint32_t> match_addrs;
         for (size_t z = 0; z < futures.size(); z++) {
-          const char* method_name = this->name_for_expand_method(methods[z]);
+          const char* method_name = this->name_for_expand_method(methods->at(z));
           try {
             uint32_t ret = futures[z].get();
-            log.info("(%s) (%s) %08" PRIX32, it.first.c_str(), method_name, ret);
+            log.info_f("({}) ({}) {:08X}", it.first, method_name, ret);
             match_addrs.emplace(ret);
           } catch (const exception& e) {
-            log.error("(%s) (%s) failed: %s", it.first.c_str(), method_name, e.what());
+            log.error_f("({}) ({}) failed: {}", it.first, method_name, e.what());
           }
         }
 
         if (match_addrs.empty()) {
-          log.error("(%s) no match found", it.first.c_str());
+          log.error_f("({}) no match found", it.first);
         } else if (match_addrs.size() > 1) {
-          log.error("(%s) different matches found by different methods", it.first.c_str());
+          log.error_f("({}) different matches found by different methods", it.first);
         } else {
           results.emplace(it.first, *match_addrs.begin());
         }
       }
     }
     for (const auto& it : results) {
-      fprintf(stdout, "%s => %08" PRIX32 "\n", it.first.c_str(), it.second);
+      phosg::fwrite_fmt(stdout, "{} => {:08X}\n", it.first, it.second);
     }
   }
 
@@ -490,7 +786,7 @@ public:
           }
         }
       }
-      this->log.info("... For match length %zX, %zu matches found", match_length, num_matches);
+      this->log.info_f("... For match length {:X}, {} matches found", match_length, num_matches);
       if (num_matches == 1) {
         return last_match_address;
       } else if (num_matches == 0) {
@@ -519,37 +815,37 @@ public:
     map<string, uint32_t> results;
     for (const auto& it : this->mems) {
       if (it.second == this->src_mem) {
-        log.info("(%s) %08" PRIX32 " (from source)", it.first.c_str(), src_addr);
+        log.info_f("({}) {:08X} (from source)", it.first, src_addr);
         results.emplace(it.first, src_addr);
 
       } else {
         uint32_t ret = 0;
         try {
           ret = this->find_be_to_le_data_match(it.second, src_addr, src_size);
-          log.info("(%s) %08" PRIX32, it.first.c_str(), ret);
+          log.info_f("({}) {:08X}", it.first, ret);
         } catch (const exception& e) {
-          log.error("(%s) failed: %s", it.first.c_str(), e.what());
+          log.error_f("({}) failed: {}", it.first, e.what());
         }
 
         if (ret == 0) {
-          log.error("(%s) no match found", it.first.c_str());
+          log.error_f("({}) no match found", it.first);
         } else {
           results.emplace(it.first, ret);
         }
       }
     }
     for (const auto& it : results) {
-      fprintf(stdout, "%s => %08" PRIX32 "\n", it.first.c_str(), it.second);
+      phosg::fwrite_fmt(stdout, "{} => {:08X}\n", it.first, it.second);
     }
   }
 
-  void find_data(const std::string& data) const {
+  void find_data(const string& data) const {
     for (const auto& [name, mem] : this->mems) {
       for (const auto& [sec_addr, sec_size] : mem->allocated_blocks()) {
         uint32_t last_addr = sec_addr + sec_size - data.size();
         for (uint32_t addr = sec_addr; addr < last_addr; addr++) {
           if (!mem->memcmp(addr, data.data(), data.size())) {
-            fprintf(stderr, "%s => %08" PRIX32 "\n", name.c_str(), addr);
+            phosg::fwrite_fmt(stderr, "{} => {:08X}\n", name, addr);
           }
         }
       }
@@ -570,13 +866,29 @@ public:
     } else if (tokens[0] == "match") {
       this->find_all_matches(
           stoul(tokens.at(1), nullptr, 16),
-          tokens.size() >= 3 ? stoul(tokens[2], nullptr, 16) : 0);
+          tokens.size() >= 3 ? stoul(tokens[2], nullptr, 16) : 0,
+          MatchType::ANY);
+    } else if (tokens[0] == "match-text") {
+      this->find_all_matches(
+          stoul(tokens.at(1), nullptr, 16),
+          tokens.size() >= 3 ? stoul(tokens[2], nullptr, 16) : 0,
+          MatchType::TEXT);
+    } else if (tokens[0] == "match-data") {
+      this->find_all_matches(
+          stoul(tokens.at(1), nullptr, 16),
+          tokens.size() >= 3 ? stoul(tokens[2], nullptr, 16) : 0,
+          MatchType::DATA);
     } else if (tokens[0] == "match-be-le") {
       this->find_all_be_to_le_data_matches(
           stoul(tokens.at(1), nullptr, 16),
           tokens.size() >= 3 ? stoul(tokens[2], nullptr, 16) : 0);
     } else if (tokens[0] == "find-ppc-globals") {
       this->find_ppc_rtoc_global_regs();
+    } else if ((tokens[0] == "parse-dat-object-constructor-tables") ||
+        (tokens[0] == "parse-dat-enemy-constructor-tables")) {
+      bool is_enemies = (tokens[0] == "parse-dat-enemy-constructor-tables");
+      auto specs = ParseDATConstructorTableSpec::from_json_list(phosg::JSON::parse(phosg::load_file(tokens.at(1))));
+      this->parse_dat_constructor_table_multi(specs, is_enemies, true);
     } else if (!tokens[0].empty()) {
       throw runtime_error("unknown command");
     }
@@ -585,9 +897,9 @@ public:
   void run_shell() {
     while (!feof(stdin)) {
       if (!this->src_filename.empty()) {
-        fprintf(stdout, "addr-trans:%s/%s> ", this->directory.c_str(), this->src_filename.c_str());
+        phosg::fwrite_fmt(stdout, "addr-trans:{}/{}> ", this->directory, this->src_filename);
       } else {
-        fprintf(stdout, "addr-trans:%s> ", this->directory.c_str());
+        phosg::fwrite_fmt(stdout, "addr-trans:{}> ", this->directory);
       }
       fflush(stdout);
 
@@ -595,7 +907,7 @@ public:
       try {
         this->handle_command(command);
       } catch (const exception& e) {
-        this->log.error("Failed: %s", e.what());
+        this->log.error_f("Failed: {}", e.what());
       }
     }
     fputc('\n', stdout);
@@ -605,12 +917,12 @@ private:
   phosg::PrefixedLogger log;
   string directory;
   unordered_map<string, shared_ptr<const ResourceDASM::MemoryContext>> mems;
+  unordered_set<shared_ptr<const ResourceDASM::MemoryContext>> ppc_mems;
   string src_filename;
   shared_ptr<const ResourceDASM::MemoryContext> src_mem;
-  bool enable_ppc;
 };
 
-void run_address_translator(const std::string& directory, const std::string& use_filename, const std::string& command) {
+void run_address_translator(const string& directory, const string& use_filename, const string& command) {
   AddressTranslator trans(directory);
   if (!use_filename.empty()) {
     trans.set_source_file(use_filename);

src/AsyncHTTPServer.cc

@@ -0,0 +1,409 @@
+#include "AsyncHTTPServer.hh"
+
+#include <inttypes.h>
+#include <stdlib.h>
+
+#include <phosg/Encoding.hh>
+#include <phosg/Network.hh>
+#include <phosg/Time.hh>
+#include <string>
+#include <vector>
+
+#include "AsyncUtils.hh"
+#include "Loggers.hh"
+#include "Revision.hh"
+#include "Server.hh"
+
+using namespace std;
+
+static const unordered_map<int, const char*> explanation_for_response_code{
+    {100, "Continue"},
+    {101, "Switching Protocols"},
+    {102, "Processing"},
+    {200, "OK"},
+    {201, "Created"},
+    {202, "Accepted"},
+    {203, "Non-Authoritative Information"},
+    {204, "No Content"},
+    {205, "Reset Content"},
+    {206, "Partial Content"},
+    {207, "Multi-Status"},
+    {208, "Already Reported"},
+    {226, "IM Used"},
+    {300, "Multiple Choices"},
+    {301, "Moved Permanently"},
+    {302, "Found"},
+    {303, "See Other"},
+    {304, "Not Modified"},
+    {305, "Use Proxy"},
+    {307, "Temporary Redirect"},
+    {308, "Permanent Redirect"},
+    {400, "Bad Request"},
+    {401, "Unathorized"},
+    {402, "Payment Required"},
+    {403, "Forbidden"},
+    {404, "Not Found"},
+    {405, "Method Not Allowed"},
+    {406, "Not Acceptable"},
+    {407, "Proxy Authentication Required"},
+    {408, "Request Timeout"},
+    {409, "Conflict"},
+    {410, "Gone"},
+    {411, "Length Required"},
+    {412, "Precondition Failed"},
+    {413, "Request Entity Too Large"},
+    {414, "Request-URI Too Long"},
+    {415, "Unsupported Media Type"},
+    {416, "Requested Range Not Satisfiable"},
+    {417, "Expectation Failed"},
+    {418, "I\'m a Teapot"},
+    {420, "Enhance Your Calm"},
+    {422, "Unprocessable Entity"},
+    {423, "Locked"},
+    {424, "Failed Dependency"},
+    {426, "Upgrade Required"},
+    {428, "Precondition Required"},
+    {429, "Too Many Requests"},
+    {431, "Request Header Fields Too Large"},
+    {444, "No Response"},
+    {449, "Retry With"},
+    {451, "Unavailable For Legal Reasons"},
+    {500, "Internal Server Error"},
+    {501, "Not Implemented"},
+    {502, "Bad Gateway"},
+    {503, "Service Unavailable"},
+    {504, "Gateway Timeout"},
+    {505, "HTTP Version Not Supported"},
+    {506, "Variant Also Negotiates"},
+    {507, "Insufficient Storage"},
+    {508, "Loop Detected"},
+    {509, "Bandwidth Limit Exceeded"},
+    {510, "Not Extended"},
+    {511, "Network Authentication Required"},
+    {598, "Network Read Timeout Error"},
+    {599, "Network Connect Timeout Error"},
+};
+
+HTTPError::HTTPError(int code, const std::string& what)
+    : std::runtime_error(what), code(code) {}
+
+const std::string* HTTPRequest::get_header(const std::string& name) const {
+  auto its = this->headers.equal_range(name);
+  if (its.first == its.second) {
+    return nullptr;
+  }
+  const string* ret = &its.first->second;
+  its.first++;
+  if (its.first != its.second) {
+    throw std::out_of_range("Header appears multiple times: " + name);
+  }
+  return ret;
+}
+
+const std::string* HTTPRequest::get_query_param(const std::string& name) const {
+  auto its = this->query_params.equal_range(name);
+  if (its.first == its.second) {
+    return nullptr;
+  }
+  const string* ret = &its.first->second;
+  its.first++;
+  if (its.first != its.second) {
+    throw std::out_of_range("Query parameter appears multiple times: " + name);
+  }
+  return ret;
+}
+
+static void url_decode_inplace(string& s) {
+  size_t write_offset = 0, read_offset = 0;
+  for (; read_offset < s.size(); write_offset++) {
+    if ((s[read_offset] == '%') && (read_offset < s.size() - 2)) {
+      s[write_offset] =
+          static_cast<char>(phosg::value_for_hex_char(s[read_offset + 1]) << 4) |
+          static_cast<char>(phosg::value_for_hex_char(s[read_offset + 2]));
+      read_offset += 3;
+    } else if (s[write_offset] == '+') {
+      s[write_offset] = ' ';
+      read_offset++;
+    } else {
+      s[write_offset] = s[read_offset];
+      read_offset++;
+    }
+  }
+  s.resize(write_offset);
+}
+
+HTTPClient::HTTPClient(asio::ip::tcp::socket&& sock) : r(std::move(sock)) {}
+
+asio::awaitable<HTTPRequest> HTTPClient::recv_http_request(size_t max_line_size, size_t max_body_size) {
+  HTTPRequest req;
+  std::string request_line = co_await this->r.read_line("\r\n", max_line_size);
+  auto line_tokens = phosg::split(request_line, ' ');
+  if (line_tokens.size() != 3) {
+    throw runtime_error("invalid HTTP request line");
+  }
+  const auto& method_token = line_tokens[0];
+  if (method_token == "GET") {
+    req.method = HTTPRequest::Method::GET;
+  } else if (method_token == "POST") {
+    req.method = HTTPRequest::Method::POST;
+  } else if (method_token == "DELETE") {
+    req.method = HTTPRequest::Method::DELETE;
+  } else if (method_token == "HEAD") {
+    req.method = HTTPRequest::Method::HEAD;
+  } else if (method_token == "PATCH") {
+    req.method = HTTPRequest::Method::PATCH;
+  } else if (method_token == "PUT") {
+    req.method = HTTPRequest::Method::PUT;
+  } else if (method_token == "UPDATE") {
+    req.method = HTTPRequest::Method::UPDATE;
+  } else if (method_token == "OPTIONS") {
+    req.method = HTTPRequest::Method::OPTIONS;
+  } else if (method_token == "CONNECT") {
+    req.method = HTTPRequest::Method::CONNECT;
+  } else if (method_token == "TRACE") {
+    req.method = HTTPRequest::Method::TRACE;
+  } else {
+    throw HTTPError(400, "unknown request method");
+  }
+
+  req.http_version = std::move(line_tokens[2]);
+
+  size_t fragment_start_offset = line_tokens[1].find('#');
+  if (fragment_start_offset != string::npos) {
+    req.fragment = line_tokens[1].substr(fragment_start_offset + 1);
+    line_tokens[1].resize(fragment_start_offset);
+  }
+
+  size_t query_start_offset = line_tokens[1].find('?');
+  string query;
+  if (query_start_offset != string::npos) {
+    query = line_tokens[1].substr(query_start_offset + 1);
+    line_tokens[1].resize(query_start_offset);
+  }
+
+  req.path = std::move(line_tokens[1]);
+  if (req.path.empty()) {
+    throw std::runtime_error("request path is missing");
+  }
+
+  auto query_tokens = phosg::split(query, '&');
+  for (auto& token : query_tokens) {
+    size_t equals_pos = token.find('=');
+    if (equals_pos == string::npos) {
+      url_decode_inplace(token);
+      req.query_params.emplace(std::move(token), "");
+    } else {
+      string key = token.substr(0, equals_pos);
+      string value = token.substr(equals_pos + 1);
+      url_decode_inplace(key);
+      url_decode_inplace(value);
+      req.query_params.emplace(std::move(key), std::move(value));
+    }
+  }
+
+  auto prev_header_it = req.headers.end();
+  for (;;) {
+    std::string line = co_await this->r.read_line("\r\n", max_line_size);
+    if (line.empty()) {
+      break;
+    }
+    if (line[0] == ' ' || line[0] == '\t') {
+      if (prev_header_it == req.headers.end()) {
+        throw std::runtime_error("received header continuation line before any header");
+      } else {
+        phosg::strip_whitespace(line);
+        prev_header_it->second.append(1, ' ');
+        prev_header_it->second += line;
+      }
+    } else {
+      size_t colon_pos = line.find(':');
+      if (colon_pos == string::npos) {
+        throw runtime_error("malformed header line");
+      }
+      string key = line.substr(0, colon_pos);
+      string value = line.substr(colon_pos + 1);
+      phosg::strip_whitespace(key);
+      phosg::strip_whitespace(value);
+      prev_header_it = req.headers.emplace(phosg::tolower(key), std::move(value));
+    }
+  }
+
+  auto transfer_encoding_header = req.get_header("transfer-encoding");
+  if (transfer_encoding_header && phosg::tolower(*transfer_encoding_header) == "chunked") {
+    deque<string> chunks;
+    size_t total_data_bytes = 0;
+    for (;;) {
+      auto line = co_await this->r.read_line("\r\n", 0x20);
+      size_t parse_offset = 0;
+      size_t chunk_size = stoull(line, &parse_offset, 16);
+      if (parse_offset != line.size()) {
+        throw HTTPError(400, "invalid chunk header during chunked encoding");
+      }
+      if (chunk_size == 0) {
+        break;
+      }
+      total_data_bytes += chunk_size;
+      if (total_data_bytes > max_body_size) {
+        throw HTTPError(400, "request data size too large");
+      }
+      chunks.emplace_back(co_await this->r.read_data(chunk_size));
+      auto after_chunk_data = co_await this->r.read_line("\r\n", 0x20);
+      if (!after_chunk_data.empty()) {
+        throw HTTPError(400, "incorrect trailing sequence after chunk data");
+      }
+    }
+  } else {
+    auto content_length_header = req.get_header("content-length");
+    size_t content_length = content_length_header ? stoull(*content_length_header) : 0;
+    if (content_length > max_body_size) {
+      throw HTTPError(400, "request data size too large");
+    } else if (content_length > 0) {
+      req.data = co_await this->r.read_data(content_length);
+    }
+  }
+
+  co_return req;
+}
+
+asio::awaitable<void> HTTPClient::send_http_response(const HTTPResponse& resp) {
+  AsyncWriteCollector w;
+  w.add(std::format("{} {} {}\r\n",
+      resp.http_version, resp.response_code, explanation_for_response_code.at(resp.response_code)));
+  for (const auto& it : resp.headers) {
+    w.add(it.first + ": " + it.second + "\r\n");
+  }
+  if (!resp.data.empty()) {
+    w.add(std::format("Content-Length: {}\r\n", resp.data.size()));
+  }
+  w.add("\r\n");
+  if (!resp.data.empty()) {
+    w.add_reference(resp.data.data(), resp.data.size());
+  }
+  co_await w.write(this->r.get_socket());
+}
+
+asio::awaitable<WebSocketMessage> HTTPClient::recv_websocket_message(size_t max_data_size) {
+  WebSocketMessage prev_msg;
+  bool prev_msg_present = false;
+
+  while (this->r.get_socket().is_open()) {
+    WebSocketMessage msg;
+
+    // We need at most 10 bytes to determine if there's a valid frame, or as
+    // little as 2
+    co_await this->r.read_data_into(msg.header, 2);
+
+    // Get the payload size
+    bool has_mask = msg.header[1] & 0x80;
+    size_t payload_size = msg.header[1] & 0x7F;
+    if (payload_size == 0x7F) {
+      phosg::be_uint64_t wire_size;
+      co_await this->r.read_data_into(&wire_size, sizeof(wire_size));
+      payload_size = wire_size;
+    } else if (payload_size == 0x7E) {
+      phosg::be_uint16_t wire_size;
+      co_await this->r.read_data_into(&wire_size, sizeof(wire_size));
+      payload_size = wire_size;
+    }
+
+    if (payload_size > max_data_size) {
+      throw runtime_error("Incoming WebSocket message exceeds size limit");
+    }
+
+    // Read the masking key if present
+    if (has_mask) {
+      co_await this->r.read_data_into(msg.mask_key, sizeof(msg.mask_key));
+    }
+
+    // Read and unmask message data
+    msg.data = co_await this->r.read_data(payload_size);
+    if (has_mask) {
+      for (size_t x = 0; x < msg.data.size(); x++) {
+        msg.data[x] ^= msg.mask_key[x & 3];
+      }
+    }
+
+    this->last_communication_time = phosg::now();
+
+    // If the current message is a control message, respond appropriately
+    // (these can be sent in the middle of fragmented messages)
+    uint8_t opcode = msg.header[0] & 0x0F;
+    if (opcode & 0x08) {
+      if (opcode == 0x0A) {
+        // Ping response; ignore it
+
+      } else if (opcode == 0x08) {
+        // Close message
+        co_await this->send_websocket_message(msg.data, msg.opcode);
+        this->r.get_socket().close();
+
+      } else if (opcode == 0x09) {
+        // Ping message
+        co_await this->send_websocket_message(msg.data, 0x0A);
+
+      } else {
+        // Unknown control message type
+        this->r.get_socket().close();
+      }
+      continue;
+    }
+
+    // If there's an existing fragment, the current message's opcode should be
+    // zero; if there's no pending message, it must not be zero
+    if (prev_msg_present == (opcode != 0)) {
+      this->r.get_socket().close();
+      continue;
+    }
+
+    // Save the message opcode, if present, and append the frame data
+    if (!prev_msg_present) {
+      prev_msg = std::move(msg);
+    } else {
+      prev_msg.header[0] = msg.header[0];
+      prev_msg.header[1] = msg.header[1];
+      if (opcode) {
+        prev_msg.opcode = msg.opcode;
+      }
+      if (has_mask) {
+        prev_msg.mask_key[0] = msg.mask_key[0];
+        prev_msg.mask_key[1] = msg.mask_key[1];
+        prev_msg.mask_key[2] = msg.mask_key[2];
+        prev_msg.mask_key[3] = msg.mask_key[3];
+      }
+      prev_msg.data += msg.data;
+    }
+
+    // If the FIN bit is set, then the frame is complete - append the payload
+    // to any pending payloads and call the message handler. If the FIN bit
+    // isn't set, we need to receive at least one continuation frame to
+    // complete the message.
+    if (prev_msg.header[0] & 0x80) {
+      co_return prev_msg;
+    }
+  }
+
+  throw logic_error("failed to receive websocket message");
+}
+
+asio::awaitable<void> HTTPClient::send_websocket_message(const void* data, size_t size, uint8_t opcode) {
+  phosg::StringWriter w;
+  w.put_u8(0x80 | (opcode & 0x0F));
+  if (size > 0xFFFF) {
+    w.put_u8(0x7F);
+    w.put_u64b(size);
+  } else if (size > 0x7D) {
+    w.put_u8(0x7E);
+    w.put_u16b(size);
+  } else {
+    w.put_u8(size);
+  }
+
+  array<asio::const_buffer, 2> bufs = {asio::const_buffer(w.data(), w.size()), asio::const_buffer(data, size)};
+  co_await asio::async_write(this->r.get_socket(), bufs, asio::use_awaitable);
+}
+
+asio::awaitable<void> HTTPClient::send_websocket_message(const std::string& data, uint8_t opcode) {
+  return this->send_websocket_message(data.data(), data.size(), opcode);
+}
+
+const HTTPServerLimits DEFAULT_HTTP_LIMITS;

src/AsyncHTTPServer.hh

@@ -0,0 +1,230 @@
+#pragma once
+
+#include "WindowsPlatform.hh"
+
+#include <stdlib.h>
+
+#include <asio.hpp>
+#include <exception>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <phosg/Hash.hh>
+#include <phosg/Time.hh>
+#include <string>
+
+#include "AsyncUtils.hh"
+#include "Server.hh"
+
+struct HTTPRequest {
+  enum class Method {
+    GET = 0,
+    POST,
+    DELETE,
+    HEAD,
+    PATCH,
+    PUT,
+    UPDATE,
+    OPTIONS,
+    CONNECT,
+    TRACE,
+  };
+  std::string http_version;
+  Method method;
+  std::string path;
+  std::string fragment;
+  std::unordered_multimap<std::string, std::string> headers; // Header names converted to all lowercase
+  std::unordered_multimap<std::string, std::string> query_params;
+  std::string data;
+
+  // Header name should be entirely lowercase for this function. Returns
+  // nullptr if the header doesn't exist; throws http_error(400) if multiple
+  // instances of it exist.
+  const std::string* get_header(const std::string& name) const;
+
+  const std::string* get_query_param(const std::string& name) const;
+};
+
+struct HTTPResponse {
+  std::string http_version;
+  int response_code = 200;
+  // Content-Length should NOT be specified in headers; it is automatically
+  // added in async_write() if data is not blank.
+  std::unordered_multimap<std::string, std::string> headers;
+  std::string data;
+};
+
+struct WebSocketMessage {
+  uint8_t header[2] = {0, 0};
+  uint8_t opcode = 0x01;
+  uint8_t mask_key[4] = {0, 0, 0, 0};
+  std::string data;
+};
+
+class HTTPError : public std::runtime_error {
+public:
+  HTTPError(int code, const std::string& what);
+  int code;
+};
+
+struct HTTPClient {
+  AsyncSocketReader r;
+  uint64_t last_communication_time = 0;
+  bool is_websocket = false;
+
+  HTTPClient(asio::ip::tcp::socket&& sock);
+
+  asio::awaitable<HTTPRequest> recv_http_request(size_t max_line_size, size_t max_body_size);
+  asio::awaitable<void> send_http_response(const HTTPResponse& resp);
+
+  asio::awaitable<WebSocketMessage> recv_websocket_message(size_t max_data_size);
+  asio::awaitable<void> send_websocket_message(const void* data, size_t size, uint8_t opcode = 0x01);
+  asio::awaitable<void> send_websocket_message(const std::string& data, uint8_t opcode = 0x01);
+};
+
+struct HTTPServerLimits {
+  size_t max_http_request_line_size = 0x1000; // 4KB
+  size_t max_http_data_size = 0x200000; // 2MB
+  size_t max_http_keepalive_idle_usecs = 300 * 1000 * 1000; // 5 minutes (0 = no limit)
+  size_t max_websocket_message_size = 0x200000; // 2MB
+  size_t max_websocket_idle_usecs = 0; // No limit by default
+};
+
+extern const HTTPServerLimits DEFAULT_HTTP_LIMITS;
+
+template <typename ClientT = HTTPClient>
+class AsyncHTTPServer : public Server<ClientT, ServerSocket> {
+public:
+  explicit AsyncHTTPServer(
+      std::shared_ptr<asio::io_context> io_context,
+      const std::string& log_prefix = "[AsyncHTTPServer] ",
+      const HTTPServerLimits& limits = DEFAULT_HTTP_LIMITS)
+      : Server<ClientT, ServerSocket>(io_context, log_prefix), limits(limits) {}
+  AsyncHTTPServer(const AsyncHTTPServer&) = delete;
+  AsyncHTTPServer(AsyncHTTPServer&&) = delete;
+  AsyncHTTPServer& operator=(const AsyncHTTPServer&) = delete;
+  AsyncHTTPServer& operator=(AsyncHTTPServer&&) = delete;
+  virtual ~AsyncHTTPServer() = default;
+
+  void listen(const std::string& addr, int port) {
+    if (port == 0) {
+      throw std::runtime_error("Listening port cannot be zero");
+    }
+    asio::ip::address asio_addr = addr.empty() ? asio::ip::address_v4::any() : asio::ip::make_address(addr);
+    auto sock = std::make_shared<ServerSocket>();
+    sock->name = std::format("http:{}:{}", addr, port);
+    sock->endpoint = asio::ip::tcp::endpoint(asio_addr, port);
+    this->add_socket(std::move(sock));
+  }
+
+protected:
+  HTTPServerLimits limits;
+
+  // Attempts to switch the client to WebSockets. Returns true if this is done
+  // successfully (and the caller should then receive/send WebSocket messages),
+  // or false if this failed (and the caller should send an HTTP response).
+  asio::awaitable<bool> enable_websockets(std::shared_ptr<ClientT> c, const HTTPRequest& req) {
+    if (req.method != HTTPRequest::Method::GET) {
+      co_return false;
+    }
+
+    auto connection_header = req.get_header("connection");
+    if (!connection_header || phosg::tolower(*connection_header) != "upgrade") {
+      co_return false;
+    }
+    auto upgrade_header = req.get_header("upgrade");
+    if (!upgrade_header || phosg::tolower(*upgrade_header) != "websocket") {
+      co_return false;
+    }
+    auto sec_websocket_key_header = req.get_header("sec-websocket-key");
+    if (!sec_websocket_key_header) {
+      co_return false;
+    }
+
+    std::string sec_websocket_accept_data = *sec_websocket_key_header + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    std::string sec_websocket_accept = phosg::base64_encode(phosg::SHA1(sec_websocket_accept_data).bin());
+
+    HTTPResponse resp;
+    resp.http_version = req.http_version;
+    resp.response_code = 101;
+    resp.headers.emplace("Upgrade", "websocket");
+    resp.headers.emplace("Connection", "upgrade");
+    resp.headers.emplace("Sec-WebSocket-Accept", std::move(sec_websocket_accept));
+    co_await c->send_http_response(resp);
+
+    c->is_websocket = true;
+    co_return true;
+  }
+
+  [[nodiscard]] virtual std::shared_ptr<ClientT> create_client(
+      std::shared_ptr<ServerSocket>, asio::ip::tcp::socket&& client_sock) {
+    return std::make_shared<HTTPClient>(std::move(client_sock));
+  }
+
+  // handle_request must do one of the following three things:
+  // 1. Return an HTTP response.
+  // 2. Call enable_websockets, and if it returns true, return nullptr. After
+  //    this point, handle_request will not be called again for this client;
+  //    handle_websocket_message will be called instead when any WebSocket
+  //    messages are received. If enable_websockets returns false,
+  //    handle_request must still return an HTTP response.
+  // 3. Throw an exception. In this case, the client receives an HTTP 500
+  //    response.
+  virtual asio::awaitable<std::unique_ptr<HTTPResponse>> handle_request(std::shared_ptr<ClientT> c, HTTPRequest&& req) = 0;
+  virtual asio::awaitable<void> handle_websocket_message(std::shared_ptr<ClientT>, WebSocketMessage&&) {
+    co_return;
+  }
+
+  virtual asio::awaitable<void> handle_client(std::shared_ptr<ClientT> c) {
+    asio::steady_timer idle_timer(*this->io_context);
+    while (c->r.get_socket().is_open()) {
+      if (c->is_websocket) {
+        WebSocketMessage msg = co_await c->recv_websocket_message(this->limits.max_websocket_message_size);
+        idle_timer.cancel();
+        try {
+          co_await this->handle_websocket_message(c, std::move(msg));
+        } catch (const std::exception& e) {
+          c->r.close();
+        }
+
+      } else {
+        HTTPRequest req = co_await c->recv_http_request(
+            this->limits.max_http_request_line_size, this->limits.max_http_data_size);
+        idle_timer.cancel();
+        std::unique_ptr<HTTPResponse> resp;
+        try {
+          resp = co_await this->handle_request(c, std::move(req));
+        } catch (const std::exception& e) {
+          resp = std::make_unique<HTTPResponse>();
+          resp->http_version = req.http_version;
+          resp->response_code = 500;
+          resp->headers.emplace("Content-Type", "text/plain");
+          resp->data = "Internal server error:\n";
+          resp->data += e.what();
+        }
+        if (resp) {
+          co_await c->send_http_response(*resp);
+        }
+        if (!c->is_websocket) {
+          auto* conn_header = req.get_header("connection");
+          if (!conn_header || (*conn_header != "keep-alive")) {
+            c->r.close();
+          }
+        }
+      }
+
+      size_t idle_usecs_limit = c->is_websocket
+          ? this->limits.max_websocket_idle_usecs
+          : this->limits.max_http_keepalive_idle_usecs;
+      if (idle_usecs_limit && c->r.get_socket().is_open()) {
+        idle_timer.expires_after(std::chrono::microseconds(idle_usecs_limit));
+        idle_timer.async_wait([c](std::error_code ec) {
+          if (!ec) {
+            c->r.close();
+          }
+        });
+      }
+    }
+    idle_timer.cancel();
+  }
+};

src/AsyncUtils.cc

@@ -0,0 +1,160 @@
+#include "AsyncUtils.hh"
+
+#include <asio.hpp>
+#include <exception>
+#include <functional>
+#include <optional>
+#include <phosg/Strings.hh>
+#include <string>
+
+using namespace std;
+
+AsyncEvent::AsyncEvent(asio::any_io_executor ex)
+    : executor(ex), is_set(false) {}
+
+void AsyncEvent::set() {
+  lock_guard g(this->lock);
+  this->is_set = true;
+  for (auto& waiter : this->waiters) {
+    asio::post(this->executor,
+        [handler = std::move(waiter)]() mutable {
+          (*handler)();
+        });
+  }
+  this->waiters.clear();
+}
+
+void AsyncEvent::clear() {
+  lock_guard g(this->lock);
+  this->is_set = false;
+}
+
+asio::awaitable<void> AsyncEvent::wait() {
+  auto token = asio::use_awaitable_t<>{};
+  co_await asio::async_initiate<asio::use_awaitable_t<>, void()>(
+      [this](auto&& handler) -> void {
+        lock_guard g(this->lock);
+        if (this->is_set) {
+          handler();
+        } else {
+          this->waiters.emplace_back(make_unique<asio::detail::awaitable_handler<asio::any_io_executor>>(std::move(handler)));
+        }
+      },
+      token);
+}
+
+AsyncSocketReader::AsyncSocketReader(asio::ip::tcp::socket&& sock)
+    : sock(std::move(sock)) {}
+
+asio::awaitable<string> AsyncSocketReader::read_line(const char* delimiter, size_t max_length) {
+  size_t delimiter_size = strlen(delimiter);
+  if (delimiter_size == 0) {
+    throw logic_error("delimiter is empty");
+  }
+  size_t delimiter_backup_bytes = delimiter_size - 1;
+
+  size_t delimiter_pos = this->pending_data.find(delimiter);
+  while ((delimiter_pos == string::npos) && (!max_length || (this->pending_data.size() < max_length))) {
+    size_t pre_size = this->pending_data.size();
+    this->pending_data.resize(min(max_length, this->pending_data.size() + 0x400));
+
+    auto buf = asio::buffer(this->pending_data.data() + pre_size, this->pending_data.size() - pre_size);
+    size_t bytes_read = co_await this->sock.async_read_some(buf, asio::use_awaitable);
+    this->pending_data.resize(pre_size + bytes_read);
+    delimiter_pos = this->pending_data.find(
+        delimiter,
+        (delimiter_backup_bytes > pre_size) ? 0 : (pre_size - delimiter_backup_bytes));
+  }
+
+  if (delimiter_pos == string::npos) {
+    throw runtime_error("line exceeds max length");
+  }
+
+  // TODO: It's not great that we copy the data here. There's probably a more
+  // idiomatic and efficient way to do this.
+  string ret = this->pending_data.substr(0, delimiter_pos);
+  this->pending_data = this->pending_data.substr(delimiter_pos + delimiter_size);
+  co_return ret;
+}
+
+asio::awaitable<string> AsyncSocketReader::read_data(size_t size) {
+  string ret;
+  if (this->pending_data.size() == size) {
+    this->pending_data.swap(ret);
+  } else if (this->pending_data.size() > size) {
+    ret = this->pending_data.substr(0, size);
+    this->pending_data = this->pending_data.substr(size);
+  } else {
+    size_t bytes_to_read = size - this->pending_data.size();
+    this->pending_data.swap(ret);
+    ret.resize(size);
+    co_await asio::async_read(this->sock, asio::buffer(ret.data() + size - bytes_to_read, bytes_to_read), asio::use_awaitable);
+  }
+  co_return ret;
+}
+
+asio::awaitable<void> AsyncSocketReader::read_data_into(void* data, size_t size) {
+  if (this->pending_data.size() == size) {
+    memcpy(data, this->pending_data.data(), size);
+    this->pending_data.clear();
+  } else if (this->pending_data.size() > size) {
+    memcpy(data, this->pending_data.data(), size);
+    this->pending_data = this->pending_data.substr(size);
+  } else {
+    memcpy(data, this->pending_data.data(), this->pending_data.size());
+    size_t bytes_to_read = size - this->pending_data.size();
+    this->pending_data.clear();
+    void* read_buf = reinterpret_cast<uint8_t*>(data) + size - bytes_to_read;
+    co_await asio::async_read(this->sock, asio::buffer(read_buf, bytes_to_read), asio::use_awaitable);
+  }
+}
+
+void AsyncWriteCollector::add(string&& data) {
+  const auto& item = this->owned_data.emplace_back(std::move(data));
+  bufs.emplace_back(asio::buffer(item.data(), item.size()));
+}
+
+void AsyncWriteCollector::add_reference(const void* data, size_t size) {
+  bufs.emplace_back(asio::buffer(data, size));
+}
+
+asio::awaitable<void> AsyncWriteCollector::write(asio::ip::tcp::socket& sock) {
+  deque<string> local_owned_data;
+  local_owned_data.swap(this->owned_data);
+  vector<asio::const_buffer> local_bufs;
+  local_bufs.swap(this->bufs);
+  co_await asio::async_write(sock, local_bufs, asio::use_awaitable);
+}
+
+asio::awaitable<void> async_sleep(chrono::steady_clock::duration duration) {
+  asio::steady_timer timer(co_await asio::this_coro::executor, duration);
+  co_await timer.async_wait(asio::use_awaitable);
+}
+
+asio::awaitable<asio::ip::tcp::socket> async_connect_tcp(uint32_t ipv4_addr, uint16_t port) {
+  uint8_t octets[4] = {
+      static_cast<uint8_t>(ipv4_addr >> 24),
+      static_cast<uint8_t>(ipv4_addr >> 16),
+      static_cast<uint8_t>(ipv4_addr >> 8),
+      static_cast<uint8_t>(ipv4_addr)};
+  return async_connect_tcp(std::format("{}.{}.{}.{}", octets[0], octets[1], octets[2], octets[3]), port);
+}
+
+asio::awaitable<asio::ip::tcp::socket> async_connect_tcp(const std::string& host, uint16_t port) {
+  auto executor = co_await asio::this_coro::executor;
+
+  asio::ip::tcp::resolver resolver(executor);
+  auto endpoints = co_await resolver.async_resolve(host, std::format("{}", port), asio::use_awaitable);
+
+  asio::ip::tcp::socket sock(executor);
+  co_await asio::async_connect(sock, endpoints, asio::use_awaitable);
+
+  co_return sock;
+}
+
+asio::awaitable<asio::ip::tcp::socket> async_connect_tcp(const asio::ip::tcp::endpoint& ep) {
+  auto executor = co_await asio::this_coro::executor;
+  asio::ip::tcp::socket sock(executor);
+  co_await sock.async_connect(ep, asio::use_awaitable);
+  co_return sock;
+}

src/AsyncUtils.hh

@@ -0,0 +1,260 @@
+#pragma once
+
+#include <asio.hpp>
+#include <asio/experimental/parallel_group.hpp>
+#include <asio/experimental/promise.hpp>
+#include <deque>
+#include <exception>
+#include <functional>
+#include <optional>
+#include <phosg/Strings.hh>
+
+template <typename T>
+class AsyncPromise {
+public:
+  AsyncPromise() = default;
+
+  asio::awaitable<T> get() {
+    if (!this->exc && !this->val.has_value()) {
+      auto executor = co_await asio::this_coro::executor;
+      co_await asio::async_initiate<decltype(asio::use_awaitable), void(std::error_code)>(
+          [this, &executor](auto&& new_handler) {
+            this->resolver_ref.emplace(ResolverRef{.resolve = std::move(new_handler), .executor = &executor});
+          },
+          asio::use_awaitable);
+    }
+
+    if (this->exc) {
+      std::rethrow_exception(this->exc);
+    } else if (this->val.has_value()) {
+      co_return *this->val;
+    } else {
+      throw std::logic_error("AsyncPromise await resolved but did not have a value or exception");
+    }
+  }
+
+  void set_value(T&& result) {
+    if (this->exc || this->val.has_value()) {
+      throw std::logic_error("attempted to set value on completed promise");
+    }
+    this->val = result;
+    this->resolve();
+  }
+
+  void set_exception(std::exception_ptr ex) {
+    if (this->exc || this->val.has_value()) {
+      throw std::logic_error("attempted to set value on completed promise");
+    }
+    this->exc = ex;
+    this->resolve();
+  }
+
+  void cancel() {
+    this->set_exception(std::make_exception_ptr(std::runtime_error("AsyncPromise cancelled")));
+  }
+
+  bool done() const {
+    return this->exc || this->val.has_value();
+  }
+
+private:
+  struct ResolverRef {
+    asio::detail::awaitable_handler<asio::any_io_executor, std::error_code> resolve;
+    asio::any_io_executor* executor;
+  };
+  std::optional<T> val;
+  std::exception_ptr exc;
+  std::optional<ResolverRef> resolver_ref;
+
+  void resolve() {
+    if (this->resolver_ref.has_value()) {
+      auto* executor = this->resolver_ref->executor;
+      asio::post(*executor, [ref = std::move(this->resolver_ref)]() mutable -> void {
+        ref->resolve(std::error_code{});
+      });
+      this->resolver_ref.reset();
+    }
+  }
+};
+
+template <>
+class AsyncPromise<void> {
+public:
+  AsyncPromise() = default;
+
+  asio::awaitable<void> get() {
+    if (!this->exc && !this->returned) {
+      auto executor = co_await asio::this_coro::executor;
+      co_await asio::async_initiate<decltype(asio::use_awaitable), void(std::error_code)>(
+          [this, &executor](auto&& new_handler) {
+            this->resolver_ref.emplace(ResolverRef{.resolve = std::move(new_handler), .executor = &executor});
+          },
+          asio::use_awaitable);
+    }
+
+    if (this->exc) {
+      std::rethrow_exception(this->exc);
+    } else if (this->returned) {
+      co_return;
+    } else {
+      throw std::logic_error("AsyncPromise await resolved but did not have a value or exception");
+    }
+  }
+
+  void set_value() {
+    if (this->exc || this->returned) {
+      throw std::logic_error("attempted to set value on completed promise");
+    }
+    this->returned = true;
+    this->resolve();
+  }
+
+  void set_exception(std::exception_ptr ex) {
+    if (this->exc || this->returned) {
+      throw std::logic_error("attempted to set value on completed promise");
+    }
+    this->exc = ex;
+    this->resolve();
+  }
+
+  void cancel() {
+    this->set_exception(std::make_exception_ptr(std::runtime_error("AsyncPromise cancelled")));
+  }
+
+  bool done() const {
+    return this->exc || this->returned;
+  }
+
+private:
+  struct ResolverRef {
+    asio::detail::awaitable_handler<asio::any_io_executor, std::error_code> resolve;
+    asio::any_io_executor* executor;
+  };
+  bool returned;
+  std::exception_ptr exc;
+  std::optional<ResolverRef> resolver_ref;
+
+  void resolve() {
+    if (this->resolver_ref.has_value()) {
+      auto* executor = this->resolver_ref->executor;
+      asio::post(*executor, [ref = std::move(this->resolver_ref)]() mutable -> void {
+        ref->resolve(std::error_code{});
+      });
+      this->resolver_ref.reset();
+    }
+  }
+};
+
+class AsyncEvent {
+public:
+  AsyncEvent(asio::any_io_executor ex);
+  AsyncEvent(const AsyncEvent&) = delete;
+  AsyncEvent(AsyncEvent&&) = delete;
+  AsyncEvent& operator=(const AsyncEvent&) = delete;
+  AsyncEvent& operator=(AsyncEvent&&) = delete;
+
+  void set();
+  void clear();
+  asio::awaitable<void> wait();
+
+private:
+  asio::any_io_executor executor;
+  bool is_set;
+  std::mutex lock;
+  std::vector<std::unique_ptr<asio::detail::awaitable_handler<asio::any_io_executor>>> waiters;
+};
+
+class AsyncSocketReader {
+public:
+  explicit AsyncSocketReader(asio::ip::tcp::socket&& sock);
+  AsyncSocketReader(const AsyncSocketReader&) = delete;
+  AsyncSocketReader(AsyncSocketReader&&) = delete;
+  AsyncSocketReader& operator=(const AsyncSocketReader&) = delete;
+  AsyncSocketReader& operator=(AsyncSocketReader&&) = delete;
+  ~AsyncSocketReader() = default;
+
+  // Reads one line from the socket, buffering any extra data read. The
+  // delimiter is not included in the returned line. max_length = 0 means no
+  // maximum length is enforced.
+  asio::awaitable<std::string> read_line(
+      const char* delimiter = "\n", size_t max_length = 0);
+  asio::awaitable<std::string> read_data(size_t size);
+  asio::awaitable<void> read_data_into(void* data, size_t size);
+
+  // The caller cannot know what the socket's read state is, so this should
+  // only be used when the caller intends to write to the socket, not read
+  inline asio::ip::tcp::socket& get_socket() {
+    return this->sock;
+  }
+
+  inline void close() {
+    this->sock.close();
+  }
+
+private:
+  std::string pending_data; // Data read but not yet returned to the caller
+  asio::ip::tcp::socket sock;
+};
+
+class AsyncWriteCollector {
+public:
+  AsyncWriteCollector() = default;
+  AsyncWriteCollector(const AsyncWriteCollector&) = delete;
+  AsyncWriteCollector(AsyncWriteCollector&&) = delete;
+  AsyncWriteCollector& operator=(const AsyncWriteCollector&) = delete;
+  AsyncWriteCollector& operator=(AsyncWriteCollector&&) = delete;
+  ~AsyncWriteCollector() = default;
+
+  void add(std::string&& data);
+
+  // When using add_reference, it is the caller's responsibility to ensure that
+  // the buffer is valid until *this is destroyed or write() returns.
+  void add_reference(const void* data, size_t size);
+
+  asio::awaitable<void> write(asio::ip::tcp::socket& sock);
+
+private:
+  std::deque<std::string> owned_data;
+  std::vector<asio::const_buffer> bufs;
+};
+
+asio::awaitable<void> async_sleep(std::chrono::steady_clock::duration duration);
+
+inline asio::ip::tcp::endpoint make_endpoint_ipv4(uint32_t addr, uint16_t port) {
+  return asio::ip::tcp::endpoint(asio::ip::address_v4(addr), port);
+}
+
+inline asio::ip::tcp::endpoint make_endpoint_ipv6(const void* addr, uint16_t port) {
+  std::array<uint8_t, 0x10> bytes;
+  for (size_t z = 0; z < 0x10; z++) {
+    bytes[z] = reinterpret_cast<const uint8_t*>(addr)[z];
+  }
+  return asio::ip::tcp::endpoint(asio::ip::address_v6(bytes), port);
+}
+
+inline std::string str_for_endpoint(const asio::ip::tcp::endpoint& ep) {
+  return ep.address().to_string() + std::format(":{}", ep.port());
+}
+
+inline uint32_t ipv4_addr_for_asio_addr(const asio::ip::address& addr) {
+  if (!addr.is_v4()) {
+    throw std::runtime_error("Address is not IPv4");
+  }
+  return addr.to_v4().to_uint();
+}
+
+asio::awaitable<asio::ip::tcp::socket> async_connect_tcp(uint32_t ipv4_addr, uint16_t port);
+asio::awaitable<asio::ip::tcp::socket> async_connect_tcp(const std::string& host, uint16_t port);
+asio::awaitable<asio::ip::tcp::socket> async_connect_tcp(const asio::ip::tcp::endpoint& ep);
+
+template <typename FnT, typename... ArgTs>
+asio::awaitable<std::invoke_result_t<FnT, ArgTs...>> call_on_thread_pool(asio::thread_pool& pool, FnT&& f, ArgTs&&... args) {
+  using ReturnT = std::invoke_result_t<FnT, ArgTs...>;
+  auto bound = std::bind(std::forward<FnT>(f), std::forward<ArgTs>(args)...);
+  AsyncPromise<ReturnT> promise;
+
+  asio::post(pool, [&promise, &bound]() -> void {
+    promise.set_value(bound());
+  });
+  co_return co_await promise.get();
+}

src/BMLArchive.cc

@@ -14,7 +14,7 @@ struct BMLHeaderT {
   parray<uint8_t, 0x04> unknown_a1;
   U32T<BE> num_entries;
   parray<uint8_t, 0x38> unknown_a2;
-} __packed__;
+} __attribute__((packed));
 
 using BMLHeader = BMLHeaderT<false>;
 using BMLHeaderBE = BMLHeaderT<true>;
@@ -30,7 +30,7 @@ struct BMLHeaderEntryT {
   U32T<BE> compressed_gvm_size;
   U32T<BE> decompressed_gvm_size;
   parray<uint8_t, 0x0C> unknown_a2;
-} __packed__;
+} __attribute__((packed));
 
 using BMLHeaderEntry = BMLHeaderEntryT<false>;
 using BMLHeaderEntryBE = BMLHeaderEntryT<true>;

src/BattleParamsIndex.cc

@@ -9,28 +9,36 @@
 
 using namespace std;
 
-void BattleParamsIndex::Table::print(FILE* stream) const {
-  auto print_entry = +[](FILE* stream, const PlayerStats& e) {
-    fprintf(stream,
-        "%5hu %5hu %5hu %5hu %5hu %5hu %5hu %5hu %5" PRIu32 " %5" PRIu32,
-        e.char_stats.atp.load(),
-        e.char_stats.mst.load(),
-        e.char_stats.evp.load(),
-        e.char_stats.hp.load(),
-        e.char_stats.dfp.load(),
-        e.char_stats.ata.load(),
-        e.char_stats.lck.load(),
-        e.esp.load(),
-        e.experience.load(),
-        e.meseta.load());
+void BattleParamsIndex::Table::print(FILE* stream, Episode episode) const {
+  auto print_entry = [stream, episode](const PlayerStats& e, size_t z) {
+    string names_str;
+    for (auto type : enemy_types_for_battle_param_index(episode, z)) {
+      if (!names_str.empty()) {
+        names_str += ", ";
+      }
+      names_str += phosg::name_for_enum(type);
+    }
+    phosg::fwrite_fmt(stream,
+        "{:5} {:5} {:5} {:5} {:5} {:5} {:5} {:5} {:5} {:5}  {}",
+        e.char_stats.atp,
+        e.char_stats.mst,
+        e.char_stats.evp,
+        e.char_stats.hp,
+        e.char_stats.dfp,
+        e.char_stats.ata,
+        e.char_stats.lck,
+        e.esp,
+        e.experience,
+        e.meseta,
+        names_str);
   };
 
   for (size_t diff = 0; diff < 4; diff++) {
-    fprintf(stream, "%c ZZ   ATP   PSV   EVP    HP   DFP   ATA   LCK   ESP   EXP  DIFF\n",
+    phosg::fwrite_fmt(stream, "{} ZZ   ATP   PSV   EVP    HP   DFP   ATA   LCK   ESP   EXP  DIFF  NAMES\n",
         abbreviation_for_difficulty(diff));
     for (size_t z = 0; z < 0x60; z++) {
-      fprintf(stream, "  %02zX ", z);
-      print_entry(stream, this->stats[diff][z]);
+      phosg::fwrite_fmt(stream, "  {:02X} ", z);
+      print_entry(this->stats[diff][z], z);
       fputc('\n', stream);
     }
   }
@@ -54,8 +62,8 @@ BattleParamsIndex::BattleParamsIndex(
     for (uint8_t episode = 0; episode < 3; episode++) {
       auto& file = this->files[is_solo][episode];
       if (file.data->size() < sizeof(Table)) {
-        throw runtime_error(phosg::string_printf(
-            "battle params table size is incorrect (expected %zX bytes, have %zX bytes; is_solo=%hhu, episode=%hhu)",
+        throw runtime_error(std::format(
+            "battle params table size is incorrect (expected {:X} bytes, have {:X} bytes; is_solo={}, episode={})",
             sizeof(Table), file.data->size(), is_solo, episode));
       }
       file.table = reinterpret_cast<const Table*>(file.data->data());

src/BattleParamsIndex.hh

@@ -76,7 +76,7 @@ public:
     /* AE00 */ parray<parray<MovementData, 0x60>, 4> movement_data;
     /* F600 */
 
-    void print(FILE* stream) const;
+    void print(FILE* stream, Episode episode) const;
   } __packed_ws__(Table, 0xF600);
 
   BattleParamsIndex(

src/CatSession.cc

@@ -1,187 +0,0 @@
-#include "CatSession.hh"
-
-#include <arpa/inet.h>
-#include <ctype.h>
-#include <errno.h>
-#include <event2/buffer.h>
-#include <event2/bufferevent.h>
-#include <event2/event.h>
-#include <event2/listener.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <algorithm>
-#include <iostream>
-#include <phosg/Encoding.hh>
-#include <phosg/Filesystem.hh>
-#include <phosg/Network.hh>
-#include <phosg/Random.hh>
-#include <phosg/Strings.hh>
-#include <phosg/Time.hh>
-
-#include "Loggers.hh"
-#include "PSOProtocol.hh"
-#include "ProxyCommands.hh"
-#include "ReceiveCommands.hh"
-#include "ReceiveSubcommands.hh"
-#include "SendCommands.hh"
-
-using namespace std;
-
-CatSession::exit_shell::exit_shell() : runtime_error("shell exited") {}
-
-CatSession::CatSession(
-    shared_ptr<struct event_base> base,
-    const struct sockaddr_storage& remote,
-    Version version,
-    shared_ptr<const PSOBBEncryption::KeyFile> bb_key_file)
-    : log(phosg::string_printf("[CatSession:%s] ", phosg::name_for_enum(version)), proxy_server_log.min_level),
-      base(base),
-      read_event(event_new(this->base.get(), 0, EV_READ | EV_PERSIST, CatSession::dispatch_read_stdin, this), event_free),
-      channel(version, 1, CatSession::dispatch_on_channel_input, CatSession::dispatch_on_channel_error, this, "CatSession"),
-      bb_key_file(bb_key_file) {
-
-  if (remote.ss_family != AF_INET) {
-    throw runtime_error("remote is not AF_INET");
-  }
-
-  string netloc_str = phosg::render_sockaddr_storage(remote);
-  this->log.info("Connecting to %s", netloc_str.c_str());
-
-  struct bufferevent* bev = bufferevent_socket_new(
-      this->base.get(), -1, BEV_OPT_CLOSE_ON_FREE | BEV_OPT_DEFER_CALLBACKS);
-  if (!bev) {
-    throw runtime_error(phosg::string_printf("failed to open socket (%d)", EVUTIL_SOCKET_ERROR()));
-  }
-  this->channel.set_bufferevent(bev, 0);
-
-  if (bufferevent_socket_connect(this->channel.bev.get(),
-          reinterpret_cast<const sockaddr*>(&remote), sizeof(struct sockaddr_in)) != 0) {
-    throw runtime_error(phosg::string_printf("failed to connect (%d)", EVUTIL_SOCKET_ERROR()));
-  }
-
-  event_add(this->read_event.get(), nullptr);
-  this->poll.add(0, POLLIN);
-}
-
-void CatSession::execute_command(const std::string& command) {
-  string full_cmd = phosg::parse_data_string(command, nullptr, phosg::ParseDataFlags::ALLOW_FILES);
-  send_command_with_header(this->channel, full_cmd.data(), full_cmd.size());
-}
-
-void CatSession::dispatch_on_channel_input(
-    Channel& ch, uint16_t command, uint32_t flag, std::string& data) {
-  auto* session = reinterpret_cast<CatSession*>(ch.context_obj);
-  session->on_channel_input(command, flag, data);
-}
-
-void CatSession::on_channel_input(
-    uint16_t command, uint32_t flag, std::string& data) {
-  if (!uses_v4_encryption(this->channel.version)) {
-    if (command == 0x02 || command == 0x17 || command == 0x91 || command == 0x9B) {
-      const auto& cmd = check_size_t<S_ServerInitDefault_DC_PC_V3_02_17_91_9B>(data, 0xFFFF);
-      if (uses_v3_encryption(this->channel.version)) {
-        this->channel.crypt_in = make_shared<PSOV3Encryption>(cmd.server_key);
-        this->channel.crypt_out = make_shared<PSOV3Encryption>(cmd.client_key);
-        this->log.info("Enabled V3 encryption (server key %08" PRIX32 ", client key %08" PRIX32 ")",
-            cmd.server_key.load(), cmd.client_key.load());
-      } else { // PC, DC, or patch server
-        this->channel.crypt_in = make_shared<PSOV2Encryption>(cmd.server_key);
-        this->channel.crypt_out = make_shared<PSOV2Encryption>(cmd.client_key);
-        this->log.info("Enabled V2 encryption (server key %08" PRIX32 ", client key %08" PRIX32 ")",
-            cmd.server_key.load(), cmd.client_key.load());
-      }
-    }
-  } else { // BB
-    if (command == 0x03 || command == 0x9B) {
-      if (!this->bb_key_file) {
-        throw runtime_error("BB encryption requires a key file");
-      }
-      const auto& cmd = check_size_t<S_ServerInitDefault_BB_03_9B>(data, 0xFFFF);
-      this->channel.crypt_in = make_shared<PSOBBEncryption>(*this->bb_key_file, &cmd.server_key[0], sizeof(cmd.server_key));
-      this->channel.crypt_out = make_shared<PSOBBEncryption>(*this->bb_key_file, &cmd.client_key[0], sizeof(cmd.client_key));
-      this->log.info("Enabled BB encryption");
-    }
-  }
-
-  // TODO: Use the iovec form of print_data here instead of
-  // prepend_command_header (which copies the string)
-  string full_cmd = prepend_command_header(this->channel.version, this->channel.crypt_in.get(), command, flag, data);
-  phosg::print_data(stdout, full_cmd, 0, nullptr, phosg::PrintDataFlags::PRINT_ASCII | phosg::PrintDataFlags::OFFSET_16_BITS);
-}
-
-void CatSession::dispatch_on_channel_error(Channel& ch, short events) {
-  auto* session = reinterpret_cast<CatSession*>(ch.context_obj);
-  session->on_channel_error(events);
-}
-
-void CatSession::on_channel_error(short events) {
-  if (events & BEV_EVENT_CONNECTED) {
-    this->log.info("Channel connected");
-  }
-  if (events & BEV_EVENT_ERROR) {
-    int err = EVUTIL_SOCKET_ERROR();
-    this->log.warning("Error %d (%s) in unlinked client stream", err,
-        evutil_socket_error_to_string(err));
-  }
-  if (events & (BEV_EVENT_ERROR | BEV_EVENT_EOF)) {
-    this->log.info("Session endpoint has disconnected");
-    this->channel.disconnect();
-    event_base_loopexit(this->base.get(), nullptr);
-  }
-}
-
-void CatSession::dispatch_read_stdin(evutil_socket_t, short, void* ctx) {
-  reinterpret_cast<CatSession*>(ctx)->read_stdin();
-}
-
-void CatSession::read_stdin() {
-  bool any_command_read = false;
-  for (;;) {
-    auto poll_result = this->poll.poll();
-    short fd_events = 0;
-    try {
-      fd_events = poll_result.at(0);
-    } catch (const out_of_range&) {
-    }
-
-    if (!(fd_events & POLLIN)) {
-      break;
-    }
-
-    string command(2048, '\0');
-    if (!fgets(command.data(), command.size(), stdin)) {
-      if (!any_command_read) {
-        // ctrl+d probably; we should exit
-        fputc('\n', stderr);
-        event_base_loopexit(this->base.get(), nullptr);
-        return;
-      } else {
-        break; // probably not EOF; just no more commands for now
-      }
-    }
-
-    // trim the extra data off the string
-    size_t len = strlen(command.c_str());
-    if (len == 0) {
-      break;
-    }
-    if (command[len - 1] == '\n') {
-      len--;
-    }
-    command.resize(len);
-    any_command_read = true;
-
-    try {
-      execute_command(command);
-    } catch (const exit_shell&) {
-      event_base_loopexit(this->base.get(), nullptr);
-      return;
-    } catch (const exception& e) {
-      fprintf(stderr, "FAILED: %s\n", e.what());
-    }
-  }
-}

src/CatSession.hh

@@ -1,54 +0,0 @@
-#pragma once
-
-#include <event2/event.h>
-
-#include <functional>
-#include <map>
-#include <memory>
-#include <phosg/Filesystem.hh>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include "PSOEncryption.hh"
-#include "PSOProtocol.hh"
-#include "ServerState.hh"
-
-class CatSession {
-public:
-  CatSession(
-      std::shared_ptr<struct event_base> base,
-      const struct sockaddr_storage& remote,
-      Version version,
-      std::shared_ptr<const PSOBBEncryption::KeyFile> bb_key_file);
-  CatSession(const CatSession&) = delete;
-  CatSession(CatSession&&) = delete;
-  CatSession& operator=(const CatSession&) = delete;
-  CatSession& operator=(CatSession&&) = delete;
-  virtual ~CatSession() = default;
-
-protected:
-  phosg::PrefixedLogger log;
-  std::shared_ptr<struct event_base> base;
-  std::unique_ptr<struct event, void (*)(struct event*)> read_event;
-  phosg::Poll poll;
-
-  Channel channel;
-  std::shared_ptr<const PSOBBEncryption::KeyFile> bb_key_file;
-
-  class exit_shell : public std::runtime_error {
-  public:
-    exit_shell();
-    ~exit_shell() = default;
-  };
-
-  virtual void execute_command(const std::string& command);
-
-  static void dispatch_read_stdin(evutil_socket_t fd, short events, void* ctx);
-  static void dispatch_on_channel_input(Channel& ch, uint16_t command, uint32_t flag, std::string& msg);
-  static void dispatch_on_channel_error(Channel& ch, short events);
-  void on_channel_input(uint16_t command, uint32_t flag, std::string& msg);
-  void on_channel_error(short events);
-  void read_stdin();
-};

src/Channel.cc

@@ -1,9 +1,6 @@
 #include "Channel.hh"
 
 #include <errno.h>
-#include <event2/buffer.h>
-#include <event2/bufferevent.h>
-#include <event2/event.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -17,230 +14,17 @@ using namespace std;
 
 extern bool use_terminal_colors;
 
-static void flush_and_free_bufferevent(struct bufferevent* bev) {
-  bufferevent_flush(bev, EV_READ | EV_WRITE, BEV_FINISHED);
-  bufferevent_free(bev);
-}
-
 Channel::Channel(
     Version version,
     uint8_t language,
-    on_command_received_t on_command_received,
-    on_error_t on_error,
-    void* context_obj,
     const string& name,
     phosg::TerminalFormat terminal_send_color,
     phosg::TerminalFormat terminal_recv_color)
-    : bev(nullptr, flush_and_free_bufferevent),
-      virtual_network_id(0),
-      version(version),
+    : version(version),
       language(language),
       name(name),
       terminal_send_color(terminal_send_color),
-      terminal_recv_color(terminal_recv_color),
-      on_command_received(on_command_received),
-      on_error(on_error),
-      context_obj(context_obj) {
-}
-
-Channel::Channel(
-    struct bufferevent* bev,
-    uint64_t virtual_network_id,
-    Version version,
-    uint8_t language,
-    on_command_received_t on_command_received,
-    on_error_t on_error,
-    void* context_obj,
-    const string& name,
-    phosg::TerminalFormat terminal_send_color,
-    phosg::TerminalFormat terminal_recv_color)
-    : bev(nullptr, flush_and_free_bufferevent),
-      version(version),
-      language(language),
-      name(name),
-      terminal_send_color(terminal_send_color),
-      terminal_recv_color(terminal_recv_color),
-      on_command_received(on_command_received),
-      on_error(on_error),
-      context_obj(context_obj) {
-  this->set_bufferevent(bev, virtual_network_id);
-}
-
-void Channel::replace_with(
-    Channel&& other,
-    on_command_received_t on_command_received,
-    on_error_t on_error,
-    void* context_obj,
-    const std::string& name) {
-  this->set_bufferevent(other.bev.release(), other.virtual_network_id);
-  this->local_addr = other.local_addr;
-  this->remote_addr = other.remote_addr;
-  this->version = other.version;
-  this->language = other.language;
-  this->crypt_in = other.crypt_in;
-  this->crypt_out = other.crypt_out;
-  this->name = name;
-  this->terminal_send_color = other.terminal_send_color;
-  this->terminal_recv_color = other.terminal_recv_color;
-  this->on_command_received = on_command_received;
-  this->on_error = on_error;
-  this->context_obj = context_obj;
-  other.disconnect(); // Clears crypts, addrs, etc.
-}
-
-void Channel::set_bufferevent(struct bufferevent* bev, uint64_t virtual_network_id) {
-  this->bev.reset(bev);
-  this->virtual_network_id = virtual_network_id;
-
-  if (this->bev.get()) {
-    int fd = bufferevent_getfd(this->bev.get());
-    if (fd < 0) {
-      memset(&this->local_addr, 0, sizeof(this->local_addr));
-      memset(&this->remote_addr, 0, sizeof(this->remote_addr));
-    } else {
-      phosg::get_socket_addresses(fd, &this->local_addr, &this->remote_addr);
-    }
-
-    bufferevent_setcb(this->bev.get(), &Channel::dispatch_on_input, nullptr, &Channel::dispatch_on_error, this);
-    bufferevent_enable(this->bev.get(), EV_READ | EV_WRITE);
-
-  } else {
-    memset(&this->local_addr, 0, sizeof(this->local_addr));
-    memset(&this->remote_addr, 0, sizeof(this->remote_addr));
-  }
-}
-
-void Channel::disconnect() {
-  if (this->bev.get()) {
-    // If the output buffer is not empty, move the bufferevent into the draining
-    // pool instead of disconnecting it, to make sure all the data gets sent.
-    struct evbuffer* out_buffer = bufferevent_get_output(this->bev.get());
-    if (evbuffer_get_length(out_buffer) == 0) {
-      this->bev.reset(); // Destructor flushes and frees the bufferevent
-    } else {
-      // The callbacks will free it when all the data is sent or the client
-      // disconnects
-
-      auto on_output = +[](struct bufferevent* bev, void*) -> void {
-        flush_and_free_bufferevent(bev);
-      };
-
-      auto on_error = +[](struct bufferevent* bev, short events, void*) -> void {
-        if (events & BEV_EVENT_ERROR) {
-          int err = EVUTIL_SOCKET_ERROR();
-          channel_exceptions_log.warning(
-              "Disconnecting channel caused error %d (%s)", err,
-              evutil_socket_error_to_string(err));
-        }
-        if (events & (BEV_EVENT_EOF | BEV_EVENT_ERROR)) {
-          bufferevent_flush(bev, EV_WRITE, BEV_FINISHED);
-          bufferevent_free(bev);
-        }
-      };
-
-      struct bufferevent* bev = this->bev.release();
-      bufferevent_setcb(bev, nullptr, on_output, on_error, bev);
-      bufferevent_disable(bev, EV_READ);
-    }
-  }
-
-  memset(&this->local_addr, 0, sizeof(this->local_addr));
-  memset(&this->remote_addr, 0, sizeof(this->remote_addr));
-  this->virtual_network_id = false;
-  this->crypt_in.reset();
-  this->crypt_out.reset();
-}
-
-Channel::Message Channel::recv() {
-  struct evbuffer* buf = bufferevent_get_input(this->bev.get());
-
-  size_t header_size = (this->version == Version::BB_V4) ? 8 : 4;
-  PSOCommandHeader header;
-  if (evbuffer_copyout(buf, &header, header_size) < static_cast<ssize_t>(header_size)) {
-    throw out_of_range("no command available");
-  }
-
-  if (this->crypt_in.get()) {
-    this->crypt_in->decrypt(&header, header_size, false);
-  }
-
-  size_t command_logical_size = header.size(version);
-
-  // If encryption is enabled, BB pads commands to 8-byte boundaries, and this
-  // is not reflected in the size field. This logic does not occur if encryption
-  // is not yet enabled.
-  size_t command_physical_size = (this->crypt_in.get() && (version == Version::BB_V4))
-      ? ((command_logical_size + 7) & ~7)
-      : command_logical_size;
-  if (evbuffer_get_length(buf) < command_physical_size) {
-    throw out_of_range("no command available");
-  }
-
-  // If we get here, then there is a full command in the buffer. Some encryption
-  // algorithms' advancement depends on the decrypted data, so we have to
-  // actually decrypt the header again (with advance=true) to keep them in a
-  // consistent state.
-
-  string header_data(header_size, '\0');
-  if (evbuffer_remove(buf, header_data.data(), header_data.size()) < static_cast<ssize_t>(header_data.size())) {
-    throw logic_error("enough bytes available, but could not remove them");
-  }
-  if (this->crypt_in.get()) {
-    this->crypt_in->decrypt(header_data.data(), header_data.size());
-  }
-
-  string command_data(command_physical_size - header_size, '\0');
-  if (evbuffer_remove(buf, command_data.data(), command_data.size()) < static_cast<ssize_t>(command_data.size())) {
-    throw logic_error("enough bytes available, but could not remove them");
-  }
-
-  if (this->crypt_in.get()) {
-    // Some versions of PSO DC can send commands whose sizes are not a multiple
-    // of 4, but the server is expected to always use a multiple of 4 bytes when
-    // decrypting (the extra cipher bytes are lost). To emulate this behavior,
-    // we have to round up the size for DC commands here.
-    size_t orig_size = command_data.size();
-    command_data.resize((orig_size + 3) & (~3), 0);
-    this->crypt_in->decrypt(command_data.data(), command_data.size());
-    command_data.resize(orig_size);
-  }
-  command_data.resize(command_logical_size - header_size);
-
-  if (command_data_log.should_log(phosg::LogLevel::INFO) && (this->terminal_recv_color != phosg::TerminalFormat::END)) {
-    if (use_terminal_colors && this->terminal_recv_color != phosg::TerminalFormat::NORMAL) {
-      print_color_escape(stderr, this->terminal_recv_color, phosg::TerminalFormat::BOLD, phosg::TerminalFormat::END);
-    }
-
-    if (version == Version::BB_V4) {
-      command_data_log.info(
-          "Received from %s (version=BB command=%04hX flag=%08" PRIX32 ")",
-          this->name.c_str(),
-          header.command(this->version),
-          header.flag(this->version));
-    } else {
-      command_data_log.info(
-          "Received from %s (version=%s command=%02hX flag=%02" PRIX32 ")",
-          this->name.c_str(),
-          phosg::name_for_enum(this->version),
-          header.command(this->version),
-          header.flag(this->version));
-    }
-
-    vector<struct iovec> iovs;
-    iovs.emplace_back(iovec{.iov_base = header_data.data(), .iov_len = header_data.size()});
-    iovs.emplace_back(iovec{.iov_base = command_data.data(), .iov_len = command_data.size()});
-    phosg::print_data(stderr, iovs, 0, nullptr, phosg::PrintDataFlags::PRINT_ASCII | phosg::PrintDataFlags::DISABLE_COLOR | phosg::PrintDataFlags::OFFSET_16_BITS);
-
-    if (use_terminal_colors && this->terminal_recv_color != phosg::TerminalFormat::NORMAL) {
-      phosg::print_color_escape(stderr, phosg::TerminalFormat::NORMAL, phosg::TerminalFormat::END);
-    }
-  }
-
-  return {
-      .command = header.command(this->version),
-      .flag = header.flag(this->version),
-      .data = std::move(command_data),
-  };
+      terminal_recv_color(terminal_recv_color) {
 }
 
 void Channel::send(uint16_t cmd, uint32_t flag, bool silent) {
@@ -249,7 +33,7 @@ void Channel::send(uint16_t cmd, uint32_t flag, bool silent) {
 
 void Channel::send(uint16_t cmd, uint32_t flag, const std::vector<std::pair<const void*, size_t>> blocks, bool silent) {
   if (!this->connected()) {
-    channel_exceptions_log.warning("Attempted to send command on closed channel; dropping data");
+    channel_exceptions_log.warning_f("Attempted to send command on closed channel; dropping data");
     return;
   }
 
@@ -342,16 +126,16 @@ void Channel::send(uint16_t cmd, uint32_t flag, const std::vector<std::pair<cons
   }
   send_data.resize(send_data_size, '\0');
 
-  if (!silent && (command_data_log.should_log(phosg::LogLevel::INFO)) && (this->terminal_send_color != phosg::TerminalFormat::END)) {
+  if (!silent && (command_data_log.should_log(phosg::LogLevel::L_INFO)) && (this->terminal_send_color != phosg::TerminalFormat::END)) {
     if (use_terminal_colors && this->terminal_send_color != phosg::TerminalFormat::NORMAL) {
       print_color_escape(stderr, phosg::TerminalFormat::FG_YELLOW, phosg::TerminalFormat::BOLD, phosg::TerminalFormat::END);
     }
     if (version == Version::BB_V4) {
-      command_data_log.info("Sending to %s (version=BB command=%04hX flag=%08" PRIX32 ")",
-          this->name.c_str(), cmd, flag);
+      command_data_log.info_f("Sending to {} (version=BB command={:04X} flag={:08X})",
+          this->name, cmd, flag);
     } else {
-      command_data_log.info("Sending to %s (version=%s command=%02hX flag=%02" PRIX32 ")",
-          this->name.c_str(), phosg::name_for_enum(version), cmd, flag);
+      command_data_log.info_f("Sending to {} (version={} command={:02X} flag={:02X})",
+          this->name, phosg::name_for_enum(version), cmd, flag);
     }
     phosg::print_data(stderr, send_data.data(), logical_size, 0, nullptr, phosg::PrintDataFlags::PRINT_ASCII | phosg::PrintDataFlags::DISABLE_COLOR | phosg::PrintDataFlags::OFFSET_16_BITS);
     if (use_terminal_colors && this->terminal_send_color != phosg::TerminalFormat::NORMAL) {
@@ -363,8 +147,7 @@ void Channel::send(uint16_t cmd, uint32_t flag, const std::vector<std::pair<cons
     this->crypt_out->encrypt(send_data.data(), send_data.size());
   }
 
-  struct evbuffer* buf = bufferevent_get_output(this->bev.get());
-  evbuffer_add(buf, send_data.data(), send_data.size());
+  this->send_raw(std::move(send_data));
 }
 
 void Channel::send(uint16_t cmd, uint32_t flag, const void* data, size_t size, bool silent) {
@@ -387,35 +170,229 @@ void Channel::send(const void* data, size_t size, bool silent) {
 }
 
 void Channel::send(const string& data, bool silent) {
-  return this->send(data.data(), data.size(), silent);
+  this->send(data.data(), data.size(), silent);
 }
 
-void Channel::dispatch_on_input(struct bufferevent*, void* ctx) {
-  Channel* ch = reinterpret_cast<Channel*>(ctx);
-  // The client can be disconnected during on_command_received, so we have to
-  // make sure ch->bev is valid every time before calling recv()
-  while (ch->bev.get()) {
-    Message msg;
-    try {
-      msg = ch->recv();
-    } catch (const out_of_range&) {
-      break;
-    } catch (const exception& e) {
-      channel_exceptions_log.warning("Error receiving on channel: %s", e.what());
-      ch->on_error(*ch, BEV_EVENT_ERROR);
-      break;
+asio::awaitable<Channel::Message> Channel::recv() {
+  size_t header_size = (this->version == Version::BB_V4) ? 8 : 4;
+  PSOCommandHeader header;
+  co_await this->recv_raw(&header, header_size);
+  if (this->crypt_in.get()) {
+    this->crypt_in->decrypt(&header, header_size);
+  }
+
+  size_t command_logical_size = header.size(version);
+  if (command_logical_size < header_size) {
+    throw runtime_error("header size field is smaller than header");
+  }
+
+  // If encryption is enabled, BB pads commands to 8-byte boundaries, and this
+  // is not reflected in the size field. This logic does not occur if encryption
+  // is not yet enabled.
+  size_t command_physical_size = (this->crypt_in.get() && (version == Version::BB_V4))
+      ? ((command_logical_size + 7) & ~7)
+      : command_logical_size;
+
+  string command_data(command_physical_size - header_size, '\0');
+  co_await this->recv_raw(command_data.data(), command_data.size());
+
+  if (this->crypt_in.get()) {
+    // Some versions of PSO DC can send commands whose sizes are not a multiple
+    // of 4, but the server is expected to always use a multiple of 4 bytes when
+    // decrypting (the extra cipher bytes are lost). To emulate this behavior,
+    // we have to round up the size for DC commands here.
+    size_t orig_size = command_data.size();
+    command_data.resize((orig_size + 3) & (~3), 0);
+    this->crypt_in->decrypt(command_data.data(), command_data.size());
+    command_data.resize(orig_size);
+  }
+  command_data.resize(command_logical_size - header_size);
+
+  if (command_data_log.should_log(phosg::LogLevel::L_INFO) && (this->terminal_recv_color != phosg::TerminalFormat::END)) {
+    if (use_terminal_colors && this->terminal_recv_color != phosg::TerminalFormat::NORMAL) {
+      print_color_escape(stderr, this->terminal_recv_color, phosg::TerminalFormat::BOLD, phosg::TerminalFormat::END);
     }
-    if (ch->on_command_received) {
-      ch->on_command_received(*ch, msg.command, msg.flag, msg.data);
+
+    if (version == Version::BB_V4) {
+      command_data_log.info_f(
+          "Received from {} (version=BB command={:04X} flag={:08X})",
+          this->name,
+          header.command(this->version),
+          header.flag(this->version));
+    } else {
+      command_data_log.info_f(
+          "Received from {} (version={} command={:02X} flag={:02X})",
+          this->name,
+          phosg::name_for_enum(this->version),
+          header.command(this->version),
+          header.flag(this->version));
+    }
+
+    vector<struct iovec> iovs;
+    iovs.emplace_back(iovec{.iov_base = &header, .iov_len = header_size});
+    iovs.emplace_back(iovec{.iov_base = command_data.data(), .iov_len = command_data.size()});
+    phosg::print_data(stderr, iovs, 0, nullptr, phosg::PrintDataFlags::PRINT_ASCII | phosg::PrintDataFlags::DISABLE_COLOR | phosg::PrintDataFlags::OFFSET_16_BITS);
+
+    if (use_terminal_colors && this->terminal_recv_color != phosg::TerminalFormat::NORMAL) {
+      phosg::print_color_escape(stderr, phosg::TerminalFormat::NORMAL, phosg::TerminalFormat::END);
+    }
+  }
+
+  co_return Message{
+      .command = header.command(this->version),
+      .flag = header.flag(this->version),
+      .data = std::move(command_data),
+  };
+}
+
+shared_ptr<SocketChannel> SocketChannel::create(
+    std::shared_ptr<asio::io_context> io_context,
+    std::unique_ptr<asio::ip::tcp::socket>&& sock,
+    Version version,
+    uint8_t language,
+    const string& name,
+    phosg::TerminalFormat terminal_send_color,
+    phosg::TerminalFormat terminal_recv_color) {
+  shared_ptr<SocketChannel> ret(new SocketChannel(
+      io_context, std::move(sock), version, language, name, terminal_send_color, terminal_recv_color));
+  asio::co_spawn(*io_context, ret->send_task(), asio::detached);
+  return ret;
+}
+
+SocketChannel::SocketChannel(
+    std::shared_ptr<asio::io_context> io_context,
+    std::unique_ptr<asio::ip::tcp::socket>&& sock,
+    Version version,
+    uint8_t language,
+    const string& name,
+    phosg::TerminalFormat terminal_send_color,
+    phosg::TerminalFormat terminal_recv_color)
+    : Channel(version, language, name, terminal_send_color, terminal_recv_color),
+      sock(std::move(sock)),
+      local_addr(this->sock->local_endpoint()),
+      remote_addr(this->sock->remote_endpoint()),
+      send_buffer_nonempty_signal(io_context->get_executor()) {}
+
+std::string SocketChannel::default_name() const {
+  return "ip:" + str_for_endpoint(this->remote_addr);
+}
+
+bool SocketChannel::connected() const {
+  return !this->should_disconnect && this->sock && this->sock->is_open();
+}
+
+void SocketChannel::disconnect() {
+  this->should_disconnect = true;
+  this->send_buffer_nonempty_signal.set();
+}
+
+void SocketChannel::send_raw(string&& data) {
+  if (this->sock && !this->should_disconnect) {
+    this->outbound_data.emplace_back(std::move(data));
+    this->send_buffer_nonempty_signal.set();
+  }
+}
+
+asio::awaitable<void> SocketChannel::recv_raw(void* data, size_t size) {
+  if (!this->sock || this->should_disconnect) {
+    throw runtime_error("Cannot receive on closed channel");
+  }
+  co_await asio::async_read(*this->sock, asio::buffer(data, size), asio::use_awaitable);
+}
+
+asio::awaitable<void> SocketChannel::send_task() {
+  // Ensure *this doesn't get deleted while the socket is open
+  auto this_sh = this->shared_from_this();
+
+  while (this->sock->is_open()) {
+    deque<string> to_send;
+    to_send.swap(this->outbound_data);
+
+    if (!to_send.empty()) {
+      vector<asio::const_buffer> bufs;
+      bufs.reserve(to_send.size());
+      for (const auto& it : to_send) {
+        bufs.emplace_back(asio::buffer(it.data(), it.size()));
+      }
+      co_await asio::async_write(*this->sock, bufs, asio::use_awaitable);
+    }
+
+    if (this->outbound_data.empty()) {
+      if (this->should_disconnect) {
+        this->sock->close();
+      } else {
+        this->send_buffer_nonempty_signal.clear();
+        co_await this->send_buffer_nonempty_signal.wait();
+      }
     }
   }
 }
 
-void Channel::dispatch_on_error(struct bufferevent*, short events, void* ctx) {
-  Channel* ch = reinterpret_cast<Channel*>(ctx);
-  if (ch->on_error) {
-    ch->on_error(*ch, events);
-  } else {
-    ch->disconnect();
+PeerChannel::PeerChannel(
+    std::shared_ptr<asio::io_context> io_context,
+    Version version,
+    uint8_t language,
+    const std::string& name,
+    phosg::TerminalFormat terminal_send_color,
+    phosg::TerminalFormat terminal_recv_color)
+    : Channel(version, language, name, terminal_send_color, terminal_recv_color),
+      send_buffer_nonempty_signal(io_context->get_executor()) {}
+
+void PeerChannel::link_peers(std::shared_ptr<PeerChannel> peer1, std::shared_ptr<PeerChannel> peer2) {
+  if (peer1->connected() || peer2->connected()) {
+    throw logic_error("Cannot link already-connected peer channels");
+  }
+  peer1->peer = peer2;
+  peer2->peer = peer1;
+}
+
+std::string PeerChannel::default_name() const {
+  return std::format("peer:{}->{}", reinterpret_cast<const void*>(this), reinterpret_cast<const void*>(this->peer.lock().get()));
+}
+
+bool PeerChannel::connected() const {
+  return (!this->inbound_data.empty()) || (this->peer.lock() != nullptr);
+}
+
+void PeerChannel::disconnect() {
+  auto peer = this->peer.lock();
+  if (peer) {
+    peer->peer.reset();
+    peer->send_buffer_nonempty_signal.set();
+  }
+  this->peer.reset();
+  this->send_buffer_nonempty_signal.set();
+}
+
+void PeerChannel::send_raw(string&& data) {
+  auto peer = this->peer.lock();
+  if (peer) {
+    peer->inbound_data.emplace_back(std::move(data));
+    peer->send_buffer_nonempty_signal.set();
+  }
+}
+
+asio::awaitable<void> PeerChannel::recv_raw(void* data, size_t size) {
+  while (size > 0) {
+    while (this->inbound_data.empty() && this->peer.lock()) {
+      this->send_buffer_nonempty_signal.clear();
+      co_await this->send_buffer_nonempty_signal.wait();
+    }
+
+    if (!this->inbound_data.empty()) {
+      auto& front_block = this->inbound_data.front();
+      if (size < front_block.size()) {
+        memcpy(data, front_block.data(), size);
+        front_block = front_block.substr(size);
+        size = 0;
+      } else {
+        memcpy(data, front_block.data(), front_block.size());
+        size -= front_block.size();
+        data = reinterpret_cast<uint8_t*>(data) + front_block.size();
+        this->inbound_data.pop_front();
+      }
+    } else if (!this->peer.lock()) {
+      throw runtime_error("Channel peer has disconnected");
+    }
   }
 }

src/Channel.hh

@@ -1,20 +1,16 @@
 #pragma once
 
-#include <netinet/in.h>
-
+#include <asio.hpp>
 #include <memory>
 #include <string>
 
+#include "AsyncUtils.hh"
 #include "PSOEncryption.hh"
 #include "PSOProtocol.hh"
 #include "Version.hh"
 
-struct Channel {
-  std::unique_ptr<struct bufferevent, void (*)(struct bufferevent*)> bev;
-  struct sockaddr_storage local_addr;
-  struct sockaddr_storage remote_addr;
-  uint64_t virtual_network_id; // 0 = normal TCP connection
-
+class Channel {
+public:
   Version version;
   uint8_t language;
   std::shared_ptr<PSOEncryption> crypt_in;
@@ -28,58 +24,46 @@ struct Channel {
     uint16_t command;
     uint32_t flag;
     std::string data;
+
+    template <typename T>
+    const T& check_size_t(size_t min_size, size_t max_size) const {
+      return ::check_size_t<const T>(this->data.data(), this->data.size(), min_size, max_size);
+    }
+    template <typename T>
+    T& check_size_t(size_t min_size, size_t max_size) {
+      return ::check_size_t<T>(this->data.data(), this->data.size(), min_size, max_size);
+    }
+
+    template <typename T>
+    const T& check_size_t(size_t max_size) const {
+      return ::check_size_t<const T>(this->data.data(), this->data.size(), sizeof(T), max_size);
+    }
+    template <typename T>
+    T& check_size_t(size_t max_size) {
+      return ::check_size_t<T>(this->data.data(), this->data.size(), sizeof(T), max_size);
+    }
+
+    template <typename T>
+    const T& check_size_t() const {
+      return ::check_size_t<const T>(this->data.data(), this->data.size(), sizeof(T), sizeof(T));
+    }
+    template <typename T>
+    T& check_size_t() {
+      return ::check_size_t<T>(this->data.data(), this->data.size(), sizeof(T), sizeof(T));
+    }
   };
 
-  typedef void (*on_command_received_t)(Channel&, uint16_t, uint32_t, std::string&);
-  typedef void (*on_error_t)(Channel&, short);
+  virtual ~Channel() = default;
 
-  on_command_received_t on_command_received;
-  on_error_t on_error;
-  void* context_obj;
+  virtual std::string default_name() const = 0;
 
-  // Creates an unconnected channel
-  Channel(
-      Version version,
-      uint8_t language,
-      on_command_received_t on_command_received,
-      on_error_t on_error,
-      void* context_obj,
-      const std::string& name,
-      phosg::TerminalFormat terminal_send_color = phosg::TerminalFormat::END,
-      phosg::TerminalFormat terminal_recv_color = phosg::TerminalFormat::END);
-  // Creates a connected channel
-  Channel(
-      struct bufferevent* bev,
-      uint64_t virtual_network_id,
-      Version version,
-      uint8_t language,
-      on_command_received_t on_command_received,
-      on_error_t on_error,
-      void* context_obj,
-      const std::string& name = "",
-      phosg::TerminalFormat terminal_send_color = phosg::TerminalFormat::END,
-      phosg::TerminalFormat terminal_recv_color = phosg::TerminalFormat::END);
-  Channel(const Channel& other) = delete;
-  Channel(Channel&& other) = delete;
-  Channel& operator=(const Channel& other) = delete;
-  Channel& operator=(Channel&& other) = delete;
+  // Returns whether the channel is connected or not.
+  virtual bool connected() const = 0;
 
-  void replace_with(
-      Channel&& other,
-      on_command_received_t on_command_received,
-      on_error_t on_error,
-      void* context_obj,
-      const std::string& name = "");
-
-  void set_bufferevent(struct bufferevent* bev, uint64_t virtual_network_id);
-
-  inline bool connected() const {
-    return this->bev.get() != nullptr;
-  }
-  void disconnect();
-
-  // Receives a message. Throws std::out_of_range if no messages are available.
-  Message recv();
+  // Disconnects the channel. Any pending data will still be sent before the
+  // underlying transport (e.g. socket) is closed, but further send calls will
+  // do nothing.
+  virtual void disconnect() = 0;
 
   // Sends a message with an automatically-constructed header.
   void send(uint16_t cmd, uint32_t flag = 0, bool silent = false);
@@ -97,7 +81,99 @@ struct Channel {
   void send(const void* data, size_t size, bool silent = false);
   void send(const std::string& data, bool silent = false);
 
-private:
-  static void dispatch_on_input(struct bufferevent*, void* ctx);
-  static void dispatch_on_error(struct bufferevent*, short events, void* ctx);
+  // Receives a message. Throws std::out_of_range if no messages are available.
+  asio::awaitable<Message> recv();
+
+protected:
+  Channel(
+      Version version,
+      uint8_t language,
+      const std::string& name,
+      phosg::TerminalFormat terminal_send_color = phosg::TerminalFormat::END,
+      phosg::TerminalFormat terminal_recv_color = phosg::TerminalFormat::END);
+  Channel(const Channel& other) = delete;
+  Channel(Channel&& other) = delete;
+  Channel& operator=(const Channel& other) = delete;
+  Channel& operator=(Channel&& other) = delete;
+
+  // Sends raw data on the underlying transport. If the channel is already
+  // disconnected, silently drops the data.
+  virtual void send_raw(std::string&& data) = 0;
+  // Receives raw data on the underlying transport. Raises when the channel is
+  // disconnected.
+  virtual asio::awaitable<void> recv_raw(void* data, size_t size) = 0;
+};
+
+// Standard channel type, used for most PSO clients. Represents an open TCP
+// socket.
+class SocketChannel : public Channel, public std::enable_shared_from_this<SocketChannel> {
+public:
+  std::unique_ptr<asio::ip::tcp::socket> sock;
+  asio::ip::tcp::endpoint local_addr;
+  asio::ip::tcp::endpoint remote_addr;
+
+  // SocketChannel has a static constructor because it has an internal task,
+  // which is necessary to support flushing before disconnection (for example)
+  // and also to make send_raw not a coroutine, which keeps the rest of the
+  // code cleaner. The task needs to hold a shared_ptr to the SocketChannel
+  // whilc it's open
+  static std::shared_ptr<SocketChannel> create(std::shared_ptr<asio::io_context> io_context,
+      std::unique_ptr<asio::ip::tcp::socket>&& sock,
+      Version version,
+      uint8_t language,
+      const std::string& name = "",
+      phosg::TerminalFormat terminal_send_color = phosg::TerminalFormat::END,
+      phosg::TerminalFormat terminal_recv_color = phosg::TerminalFormat::END);
+
+  virtual std::string default_name() const;
+
+  virtual bool connected() const;
+  virtual void disconnect();
+
+  virtual void send_raw(std::string&& data);
+  virtual asio::awaitable<void> recv_raw(void* data, size_t size);
+
+private:
+  SocketChannel(
+      std::shared_ptr<asio::io_context> io_context,
+      std::unique_ptr<asio::ip::tcp::socket>&& sock,
+      Version version,
+      uint8_t language,
+      const std::string& name,
+      phosg::TerminalFormat terminal_send_color,
+      phosg::TerminalFormat terminal_recv_color);
+
+  std::deque<std::string> outbound_data;
+  bool should_disconnect = false;
+  AsyncEvent send_buffer_nonempty_signal;
+
+  asio::awaitable<void> send_task();
+};
+
+// In-process peer channel, used for replay testing.
+class PeerChannel : public Channel {
+public:
+  std::weak_ptr<PeerChannel> peer;
+
+  PeerChannel(
+      std::shared_ptr<asio::io_context> io_context,
+      Version version,
+      uint8_t language,
+      const std::string& name = "",
+      phosg::TerminalFormat terminal_send_color = phosg::TerminalFormat::END,
+      phosg::TerminalFormat terminal_recv_color = phosg::TerminalFormat::END);
+
+  static void link_peers(std::shared_ptr<PeerChannel> peer1, std::shared_ptr<PeerChannel> peer2);
+
+  virtual std::string default_name() const;
+
+  virtual bool connected() const;
+  virtual void disconnect();
+
+  virtual void send_raw(std::string&& data);
+  virtual asio::awaitable<void> recv_raw(void* data, size_t size);
+
+private:
+  AsyncEvent send_buffer_nonempty_signal;
+  std::deque<std::string> inbound_data;
 };

src/ChatCommands.hh

@@ -2,13 +2,13 @@
 
 #include <stdint.h>
 
+#include <asio.hpp>
 #include <memory>
 #include <string>
 
 #include "Client.hh"
 #include "Lobby.hh"
-#include "ProxyServer.hh"
+#include "ProxySession.hh"
 #include "ServerState.hh"
 
-void on_chat_command(std::shared_ptr<Client> c, const std::string& text, bool check_permissions);
-void on_chat_command(std::shared_ptr<ProxyServer::LinkedSession> ses, const std::string& text, bool check_permissions);
+asio::awaitable<void> on_chat_command(std::shared_ptr<Client> c, const std::string& text, bool check_permissions);

src/ChoiceSearch.hh

@@ -31,16 +31,16 @@ struct ChoiceSearchConfigT {
 
   operator ChoiceSearchConfigT<!BE>() const {
     ChoiceSearchConfigT<!BE> ret;
-    ret.disabled = this->disabled.load();
+    ret.disabled = this->disabled;
     for (size_t z = 0; z < this->entries.size(); z++) {
       auto& ret_e = ret.entries[z];
       const auto& this_e = this->entries[z];
-      ret_e.parent_choice_id = this_e.parent_choice_id.load();
-      ret_e.choice_id = this_e.choice_id.load();
+      ret_e.parent_choice_id = this_e.parent_choice_id;
+      ret_e.choice_id = this_e.choice_id;
     }
     return ret;
   }
-} __packed__;
+} __attribute__((packed));
 
 using ChoiceSearchConfig = ChoiceSearchConfigT<false>;
 using ChoiceSearchConfigBE = ChoiceSearchConfigT<true>;

src/Client.cc

@@ -1,16 +1,15 @@
 #include "Client.hh"
 
 #include <errno.h>
-#include <event2/buffer.h>
-#include <event2/bufferevent.h>
-#include <event2/event.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <atomic>
+#include <filesystem>
 #include <phosg/Network.hh>
 #include <phosg/Time.hh>
 
+#include "GameServer.hh"
 #include "IPStackSimulator.hh"
 #include "Loggers.hh"
 #include "SendCommands.hh"
@@ -23,7 +22,7 @@ const uint64_t CLIENT_CONFIG_MAGIC = 0x8399AC32;
 
 static atomic<uint64_t> next_id(1);
 
-void Client::Config::set_flags_for_version(Version version, int64_t sub_version) {
+void Client::set_flags_for_version(Version version, int64_t sub_version) {
   this->set_flag(Flag::PROXY_CHAT_COMMANDS_ENABLED);
 
   // BB shares some sub_version values with GC Episode 3, so we handle it
@@ -153,17 +152,17 @@ void Client::Config::set_flags_for_version(Version version, int64_t sub_version)
       this->set_flag(Flag::CAN_RECEIVE_ENABLE_B2_QUEST);
       break;
     default:
-      throw runtime_error(phosg::string_printf("unknown sub_version %" PRIX64, sub_version));
+      throw runtime_error(std::format("unknown sub_version {:X}", sub_version));
   }
 }
 
-Client::ItemDropNotificationMode Client::Config::get_drop_notification_mode() const {
+Client::ItemDropNotificationMode Client::get_drop_notification_mode() const {
   uint8_t mode_s = (this->check_flag(Flag::ITEM_DROP_NOTIFICATIONS_1) ? 1 : 0) |
       (this->check_flag(Flag::ITEM_DROP_NOTIFICATIONS_2) ? 2 : 0);
   return static_cast<Client::ItemDropNotificationMode>(mode_s);
 }
 
-void Client::Config::set_drop_notification_mode(ItemDropNotificationMode new_mode) {
+void Client::set_drop_notification_mode(ItemDropNotificationMode new_mode) {
   uint8_t mode_s = static_cast<uint8_t>(new_mode);
   if (mode_s & 1) {
     this->set_flag(Client::Flag::ITEM_DROP_NOTIFICATIONS_1);
@@ -177,133 +176,126 @@ void Client::Config::set_drop_notification_mode(ItemDropNotificationMode new_mod
   }
 }
 
-bool Client::Config::should_update_vs(const Config& other) const {
-  constexpr uint64_t mask = static_cast<uint64_t>(Flag::CLIENT_SIDE_MASK);
-  return ((this->enabled_flags ^ other.enabled_flags) & mask) ||
-      (this->specific_version != other.specific_version) ||
-      (this->override_random_seed != other.override_random_seed) ||
-      (this->override_section_id != other.override_section_id) ||
-      (this->override_lobby_event != other.override_lobby_event) ||
-      (this->override_lobby_number != other.override_lobby_number) ||
-      (this->proxy_destination_address != other.proxy_destination_address) ||
-      (this->proxy_destination_port != other.proxy_destination_port);
-}
-
 Client::Client(
-    shared_ptr<Server> server,
-    struct bufferevent* bev,
-    uint64_t virtual_network_id,
-    Version version,
+    shared_ptr<GameServer> server,
+    shared_ptr<Channel> channel,
     ServerBehavior server_behavior)
     : server(server),
       id(next_id++),
-      log(phosg::string_printf("[C-%" PRIX64 "] ", this->id), client_log.min_level),
-      channel(bev, virtual_network_id, version, 1, nullptr, nullptr, this, "", phosg::TerminalFormat::FG_YELLOW, phosg::TerminalFormat::FG_GREEN),
+      log(std::format("[C-{:X}] ", this->id), client_log.min_level),
+      channel(channel),
       server_behavior(server_behavior),
-      should_disconnect(false),
-      should_send_to_lobby_server(false),
-      should_send_to_proxy_server(false),
-      bb_connection_phase(0xFF),
-      ping_start_time(0),
-      sub_version(-1),
-      floor(0),
-      lobby_client_id(0),
-      lobby_arrow_color(0),
-      preferred_lobby_id(-1),
-      save_game_data_event(
-          event_new(
-              bufferevent_get_base(bev), -1, EV_TIMEOUT | EV_PERSIST,
-              &Client::dispatch_save_game_data, this),
-          event_free),
-      send_ping_event(
-          event_new(
-              bufferevent_get_base(bev), -1, EV_TIMEOUT,
-              &Client::dispatch_send_ping, this),
-          event_free),
-      idle_timeout_event(
-          event_new(
-              bufferevent_get_base(bev), -1, EV_TIMEOUT,
-              &Client::dispatch_idle_timeout, this),
-          event_free),
-      card_battle_table_number(-1),
-      card_battle_table_seat_number(0),
-      card_battle_table_seat_state(0),
-      last_game_info_requested(0),
-      should_update_play_time(false),
-      bb_character_index(-1),
-      next_exp_value(0),
-      can_chat(true),
-      dol_base_addr(0),
-      external_bank_character_index(-1),
-      last_play_time_update(0) {
+      save_game_data_timer(*server->get_io_context()),
+      send_ping_timer(*server->get_io_context()),
+      idle_timeout_timer(*server->get_io_context()),
+      should_update_play_time(false) {
   this->update_channel_name();
 
-  this->config.set_flags_for_version(version, -1);
+  // Don't print data sent to patch clients to the logs. The patch server
+  // protocol is fully understood and data logs for patch clients are generally
+  // more annoying than helpful at this point.
   auto s = server->get_state();
-  if (is_v1_or_v2(this->version()) ? s->default_rare_notifs_enabled_v1_v2 : s->default_rare_notifs_enabled_v3_v4) {
-    this->config.set_drop_notification_mode(ItemDropNotificationMode::RARES_ONLY);
+  if (is_patch(this->version()) && s->hide_download_commands) {
+    this->channel->terminal_recv_color = phosg::TerminalFormat::END;
+    this->channel->terminal_send_color = phosg::TerminalFormat::END;
+  } else {
+    this->channel->terminal_recv_color = phosg::TerminalFormat::FG_GREEN;
+    this->channel->terminal_send_color = phosg::TerminalFormat::FG_YELLOW;
   }
-  this->config.specific_version = default_specific_version_for_version(version, -1);
 
-  memset(&this->next_connection_addr, 0, sizeof(this->next_connection_addr));
+  this->set_flags_for_version(this->version(), -1);
+  if (is_v1_or_v2(this->version()) ? s->default_rare_notifs_enabled_v1_v2 : s->default_rare_notifs_enabled_v3_v4) {
+    this->set_drop_notification_mode(ItemDropNotificationMode::RARES_ONLY);
+  }
+  this->specific_version = default_specific_version_for_version(this->version(), -1);
 
-  this->reschedule_save_game_data_event();
-  this->reschedule_ping_and_timeout_events();
+  this->reschedule_save_game_data_timer();
+  this->reschedule_ping_and_timeout_timers();
 
   // Don't print data sent to patch clients to the logs. The patch server
   // protocol is fully understood and data logs for patch clients are generally
   // more annoying than helpful at this point.
   if ((s->hide_download_commands) &&
-      ((this->channel.version == Version::PC_PATCH) || (this->channel.version == Version::BB_PATCH))) {
-    this->channel.terminal_recv_color = phosg::TerminalFormat::END;
-    this->channel.terminal_send_color = phosg::TerminalFormat::END;
+      ((this->version() == Version::PC_PATCH) || (this->version() == Version::BB_PATCH))) {
+    this->channel->terminal_recv_color = phosg::TerminalFormat::END;
+    this->channel->terminal_send_color = phosg::TerminalFormat::END;
+  } else {
+    this->channel->terminal_send_color = phosg::TerminalFormat::FG_YELLOW;
+    this->channel->terminal_recv_color = phosg::TerminalFormat::FG_GREEN;
   }
 
-  this->log.info("Created");
+  this->log.info_f("Created");
 }
 
 Client::~Client() {
   if (!this->disconnect_hooks.empty()) {
-    this->log.warning("Disconnect hooks pending at client destruction time:");
+    this->log.warning_f("Disconnect hooks pending at client destruction time:");
     for (const auto& it : this->disconnect_hooks) {
-      this->log.warning("  %s", it.first.c_str());
+      this->log.warning_f("  {}", it.first);
     }
   }
 
   if ((this->version() == Version::BB_V4) && (this->character_data.get())) {
     this->save_all();
   }
-  this->log.info("Deleted");
+  this->log.info_f("Deleted");
 }
 
 void Client::update_channel_name() {
-  string ip_str = this->require_server_state()->format_address_for_channel_name(
-      this->channel.remote_addr, this->channel.virtual_network_id);
+  string default_name = this->channel->default_name();
 
   auto player = this->character(false, false);
   if (player) {
     string name_str = player->disp.name.decode(this->language());
     size_t level = player->disp.stats.level + 1;
-    this->channel.name = phosg::string_printf("C-%" PRIX64 " (%s Lv.%zu) @ %s", this->id, name_str.c_str(), level, ip_str.c_str());
+    this->channel->name = std::format("C-{:X} ({} Lv.{}) @ {}",
+        this->id, name_str, level, default_name);
   } else {
-    this->channel.name = phosg::string_printf("C-%" PRIX64 " @ %s", this->id, ip_str.c_str());
+    this->channel->name = std::format("C-{:X} @ {}", this->id, default_name);
   }
-  this->log.info("Channel name updated from player data: %s", this->channel.name.c_str());
+  this->log.info_f("Channel name updated: {}", this->channel->name);
 }
 
-void Client::reschedule_save_game_data_event() {
-  if (this->version() == Version::BB_V4) {
-    struct timeval tv = phosg::usecs_to_timeval(60000000); // 1 minute
-    event_add(this->save_game_data_event.get(), &tv);
+void Client::reschedule_save_game_data_timer() {
+  if (this->version() != Version::BB_V4) {
+    return;
   }
+  this->save_game_data_timer.expires_after(std::chrono::seconds(60));
+  this->save_game_data_timer.async_wait([this](std::error_code ec) {
+    if (!ec) {
+      if (this->character(false)) {
+        this->save_all();
+      }
+      this->reschedule_save_game_data_timer();
+    }
+  });
 }
 
-void Client::reschedule_ping_and_timeout_events() {
+void Client::reschedule_ping_and_timeout_timers() {
   auto s = this->require_server_state();
-  struct timeval ping_tv = phosg::usecs_to_timeval(s->client_ping_interval_usecs);
-  event_add(this->send_ping_event.get(), &ping_tv);
-  struct timeval idle_tv = phosg::usecs_to_timeval(s->client_idle_timeout_usecs);
-  event_add(this->idle_timeout_event.get(), &idle_tv);
+  if (!is_patch(this->version())) {
+    this->send_ping_timer.expires_after(std::chrono::microseconds(s->client_ping_interval_usecs));
+    this->send_ping_timer.async_wait([this](std::error_code ec) {
+      if (!ec) {
+        this->log.info_f("Sending ping command");
+        try {
+          // The game doesn't use this timestamp; we only use it for debugging purposes
+          be_uint64_t timestamp = phosg::now();
+          this->channel->send(0x1D, 0x00, &timestamp, sizeof(be_uint64_t));
+        } catch (const exception& e) {
+          this->log.warning_f("Failed to send ping: {}", e.what());
+        }
+      }
+    });
+  }
+
+  this->idle_timeout_timer.expires_after(std::chrono::microseconds(s->client_idle_timeout_usecs));
+  this->idle_timeout_timer.async_wait([this](std::error_code ec) {
+    if (!ec) {
+      this->log.info_f("Idle timeout expired");
+      this->channel->disconnect();
+    }
+  });
 }
 
 void Client::convert_account_to_temporary_if_nte() {
@@ -312,7 +304,7 @@ void Client::convert_account_to_temporary_if_nte() {
   // replace it with a temporary account.
   auto s = this->require_server_state();
   if (s->use_temp_accounts_for_prototypes && this->login->account_was_created && is_any_nte(this->version())) {
-    this->log.info("Client is a prototype version and the account was created during this session; converting permanent account to temporary account");
+    this->log.info_f("Client is a prototype version and the account was created during this session; converting permanent account to temporary account");
     this->login->account->is_temporary = true;
     this->login->account->delete_file();
     this->login->account_was_created = false;
@@ -348,7 +340,7 @@ shared_ptr<const TeamIndex::Team> Client::team() const {
   auto s = this->require_server_state();
   auto team = s->team_index->get_by_id(this->login->account->bb_team_id);
   if (!team) {
-    this->log.info("Account contains a team ID, but the team does not exist; clearing team ID from account");
+    this->log.info_f("Account contains a team ID, but the team does not exist; clearing team ID from account");
     this->login->account->bb_team_id = 0;
     this->login->account->save();
     return nullptr;
@@ -356,7 +348,7 @@ shared_ptr<const TeamIndex::Team> Client::team() const {
 
   auto member_it = team->members.find(this->login->account->account_id);
   if (member_it == team->members.end()) {
-    this->log.info("Account contains a team ID, but the team does not contain this member; clearing team ID from account");
+    this->log.info_f("Account contains a team ID, but the team does not contain this member; clearing team ID from account");
     this->login->account->bb_team_id = 0;
     this->login->account->save();
     return nullptr;
@@ -368,7 +360,7 @@ shared_ptr<const TeamIndex::Team> Client::team() const {
     auto& m = member_it->second;
     string name = p->disp.name.decode(this->language());
     if (m.name != name) {
-      this->log.info("Updating player name in team config");
+      this->log.info_f("Updating player name in team config");
       s->team_index->update_member_name(this->login->account->account_id, name);
     }
   }
@@ -402,9 +394,9 @@ bool Client::evaluate_quest_availability_expression(
       .v1_present = v1_present,
   };
   int64_t ret = expr->evaluate(env);
-  if (this->log.should_log(phosg::LogLevel::INFO)) {
+  if (this->log.should_log(phosg::LogLevel::L_INFO)) {
     string expr_str = expr->str();
-    this->log.info("Evaluated integral expression %s => %s", expr_str.c_str(), ret ? "TRUE" : "FALSE");
+    this->log.info_f("Evaluated integral expression {} => {}", expr_str, ret ? "TRUE" : "FALSE");
   }
   return ret;
 }
@@ -432,7 +424,7 @@ bool Client::can_play_quest(
   if (!q->has_version_any_language(this->version())) {
     return false;
   }
-  if (num_players >= q->max_players) {
+  if (num_players > q->max_players) {
     return false;
   }
   return this->evaluate_quest_availability_expression(q->enabled_expression, game, event, difficulty, num_players, v1_present);
@@ -448,62 +440,11 @@ bool Client::can_use_chat_commands() const {
   return this->require_server_state()->enable_chat_commands;
 }
 
-void Client::dispatch_save_game_data(evutil_socket_t, short, void* ctx) {
-  reinterpret_cast<Client*>(ctx)->save_game_data();
-}
-
-void Client::save_game_data() {
-  if (this->version() != Version::BB_V4) {
-    throw logic_error("save_game_data called for non-BB client");
-  }
-  if (this->character(false)) {
-    this->save_all();
-  }
-}
-
-void Client::dispatch_send_ping(evutil_socket_t, short, void* ctx) {
-  reinterpret_cast<Client*>(ctx)->send_ping();
-}
-
-void Client::send_ping() {
-  if (!is_patch(this->version())) {
-    this->log.info("Sending ping command");
-    // The game doesn't use this timestamp; we only use it for debugging purposes
-    be_uint64_t timestamp = phosg::now();
-    try {
-      this->channel.send(0x1D, 0x00, &timestamp, sizeof(be_uint64_t));
-    } catch (const exception& e) {
-      this->log.info("Failed to send ping: %s", e.what());
-    }
-  }
-}
-
-void Client::dispatch_idle_timeout(evutil_socket_t, short, void* ctx) {
-  reinterpret_cast<Client*>(ctx)->idle_timeout();
-}
-
-void Client::idle_timeout() {
-  this->log.info("Idle timeout expired");
-  auto s = this->server.lock();
-  if (s) {
-    auto c = this->shared_from_this();
-    s->disconnect_client(c);
-  } else {
-    this->log.info("Server is deleted; cannot disconnect client");
-  }
-}
-
-void Client::suspend_timeouts() {
-  event_del(this->send_ping_event.get());
-  event_del(this->idle_timeout_event.get());
-  this->log.info("Timeouts suspended");
-}
-
 void Client::set_login(shared_ptr<Login> login) {
   this->login = login;
-  if (this->log.should_log(phosg::LogLevel::INFO)) {
+  if (this->log.should_log(phosg::LogLevel::L_INFO)) {
     string login_str = this->login->str();
-    this->log.info("Login: %s", login_str.c_str());
+    this->log.info_f("Login: {}", login_str);
   }
 }
 
@@ -669,25 +610,25 @@ string Client::system_filename() const {
   if (!this->login || !this->login->bb_license) {
     throw logic_error("client is not logged in");
   }
-  return phosg::string_printf("system/players/system_%s.psosys", this->login->bb_license->username.c_str());
+  return std::format("system/players/system_{}.psosys", this->login->bb_license->username);
 }
 
-string Client::character_filename(const std::string& bb_username, int8_t index) {
+string Client::character_filename(const std::string& bb_username, ssize_t index) {
   if (bb_username.empty()) {
     throw logic_error("non-BB players do not have character data");
   }
   if (index < 0) {
     throw logic_error("character index is not set");
   }
-  return phosg::string_printf("system/players/player_%s_%hhd.psochar", bb_username.c_str(), index);
+  return std::format("system/players/player_{}_{}.psochar", bb_username, index);
 }
 
 string Client::backup_character_filename(uint32_t account_id, size_t index, bool is_ep3) {
-  return phosg::string_printf("system/players/backup_player_%" PRIu32 "_%zu.%s",
+  return std::format("system/players/backup_player_{}_{}.{}",
       account_id, index, is_ep3 ? "pso3char" : "psochar");
 }
 
-string Client::character_filename(int8_t index) const {
+string Client::character_filename(ssize_t index) const {
   if (this->version() != Version::BB_V4) {
     throw logic_error("non-BB players do not have character data");
   }
@@ -704,7 +645,7 @@ string Client::guild_card_filename() const {
   if (!this->login || !this->login->bb_license) {
     throw logic_error("client is not logged in");
   }
-  return phosg::string_printf("system/players/guild_cards_%s.psocard", this->login->bb_license->username.c_str());
+  return std::format("system/players/guild_cards_{}.psocard", this->login->bb_license->username);
 }
 
 string Client::shared_bank_filename() const {
@@ -714,7 +655,7 @@ string Client::shared_bank_filename() const {
   if (!this->login || !this->login->bb_license) {
     throw logic_error("client is not logged in");
   }
-  return phosg::string_printf("system/players/shared_bank_%s.psobank", this->login->bb_license->username.c_str());
+  return std::format("system/players/shared_bank_{}.psobank", this->login->bb_license->username);
 }
 
 string Client::legacy_account_filename() const {
@@ -724,7 +665,7 @@ string Client::legacy_account_filename() const {
   if (!this->login || !this->login->bb_license) {
     throw logic_error("client is not logged in");
   }
-  return phosg::string_printf("system/players/account_%s.nsa", this->login->bb_license->username.c_str());
+  return std::format("system/players/account_{}.nsa", this->login->bb_license->username);
 }
 
 string Client::legacy_player_filename() const {
@@ -737,10 +678,10 @@ string Client::legacy_player_filename() const {
   if (this->bb_character_index < 0) {
     throw logic_error("character index is not set");
   }
-  return phosg::string_printf(
-      "system/players/player_%s_%hhd.nsc",
-      this->login->bb_license->username.c_str(),
-      static_cast<int8_t>(this->bb_character_index + 1));
+  return std::format(
+      "system/players/player_{}_{}.nsc",
+      this->login->bb_license->username,
+      static_cast<ssize_t>(this->bb_character_index + 1));
 }
 
 void Client::create_character_file(
@@ -772,25 +713,25 @@ void Client::load_all_files() {
   string sys_filename = this->system_filename();
   this->system_data = files_manager->get_system(sys_filename);
   if (this->system_data) {
-    player_data_log.info("Using loaded system file %s", sys_filename.c_str());
-  } else if (phosg::isfile(sys_filename)) {
+    player_data_log.info_f("Using loaded system file {}", sys_filename);
+  } else if (std::filesystem::is_regular_file(sys_filename)) {
     this->system_data = make_shared<PSOBBBaseSystemFile>(phosg::load_object_file<PSOBBBaseSystemFile>(sys_filename, true));
     files_manager->set_system(sys_filename, this->system_data);
-    player_data_log.info("Loaded system data from %s", sys_filename.c_str());
+    player_data_log.info_f("Loaded system data from {}", sys_filename);
   } else {
-    player_data_log.info("System file is missing: %s", sys_filename.c_str());
+    player_data_log.info_f("System file is missing: {}", sys_filename);
   }
 
   if (this->bb_character_index >= 0) {
     string char_filename = this->character_filename();
     this->character_data = files_manager->get_character(char_filename);
     if (this->character_data) {
-      player_data_log.info("Using loaded character file %s", char_filename.c_str());
-    } else if (phosg::isfile(char_filename)) {
+      player_data_log.info_f("Using loaded character file {}", char_filename);
+    } else if (std::filesystem::is_regular_file(char_filename)) {
       auto psochar = PSOCHARFile::load_shared(char_filename, !this->system_data);
       this->character_data = psochar.character_file;
       files_manager->set_character(char_filename, this->character_data);
-      player_data_log.info("Loaded character data from %s", char_filename.c_str());
+      player_data_log.info_f("Loaded character data from {}", char_filename);
 
       // If there was no .psosys file, use the system file from the .psochar
       // file instead
@@ -800,34 +741,34 @@ void Client::load_all_files() {
         }
         this->system_data = psochar.system_file;
         files_manager->set_system(sys_filename, this->system_data);
-        player_data_log.info("Loaded system data from %s", char_filename.c_str());
+        player_data_log.info_f("Loaded system data from {}", char_filename);
       }
 
       this->update_character_data_after_load(this->character_data);
       this->system_data->language = this->language();
 
     } else {
-      player_data_log.info("Character file is missing: %s", char_filename.c_str());
+      player_data_log.info_f("Character file is missing: {}", char_filename);
     }
   }
 
   string card_filename = this->guild_card_filename();
   this->guild_card_data = files_manager->get_guild_card(card_filename);
   if (this->guild_card_data) {
-    player_data_log.info("Using loaded Guild Card file %s", card_filename.c_str());
-  } else if (phosg::isfile(card_filename)) {
+    player_data_log.info_f("Using loaded Guild Card file {}", card_filename);
+  } else if (std::filesystem::is_regular_file(card_filename)) {
     this->guild_card_data = make_shared<PSOBBGuildCardFile>(phosg::load_object_file<PSOBBGuildCardFile>(card_filename));
     files_manager->set_guild_card(card_filename, this->guild_card_data);
-    player_data_log.info("Loaded Guild Card data from %s", card_filename.c_str());
+    player_data_log.info_f("Loaded Guild Card data from {}", card_filename);
   } else {
-    player_data_log.info("Guild Card file is missing: %s", card_filename.c_str());
+    player_data_log.info_f("Guild Card file is missing: {}", card_filename);
   }
 
   // If any of the above files were missing, try to load from .nsa/.nsc files instead
   if (!this->system_data || (!this->character_data && (this->bb_character_index >= 0)) || !this->guild_card_data) {
     string nsa_filename = this->legacy_account_filename();
     shared_ptr<LegacySavedAccountDataBB> nsa_data;
-    if (phosg::isfile(nsa_filename)) {
+    if (std::filesystem::is_regular_file(nsa_filename)) {
       nsa_data = make_shared<LegacySavedAccountDataBB>(phosg::load_object_file<LegacySavedAccountDataBB>(nsa_filename));
       if (!nsa_data->signature.eq(LegacySavedAccountDataBB::SIGNATURE)) {
         throw runtime_error("account data header is incorrect");
@@ -835,12 +776,12 @@ void Client::load_all_files() {
       if (!this->system_data) {
         this->system_data = make_shared<PSOBBBaseSystemFile>(nsa_data->system_file);
         files_manager->set_system(sys_filename, this->system_data);
-        player_data_log.info("Loaded legacy system data from %s", nsa_filename.c_str());
+        player_data_log.info_f("Loaded legacy system data from {}", nsa_filename);
       }
       if (!this->guild_card_data) {
         this->guild_card_data = make_shared<PSOBBGuildCardFile>(nsa_data->guild_card_file);
         files_manager->set_guild_card(card_filename, this->guild_card_data);
-        player_data_log.info("Loaded legacy Guild Card data from %s", nsa_filename.c_str());
+        player_data_log.info_f("Loaded legacy Guild Card data from {}", nsa_filename);
       }
     }
 
@@ -854,12 +795,12 @@ void Client::load_all_files() {
         this->system_data->joystick_config = *s->bb_default_joystick_config;
       }
       files_manager->set_system(sys_filename, this->system_data);
-      player_data_log.info("Created new system data");
+      player_data_log.info_f("Created new system data");
     }
     if (!this->guild_card_data) {
       this->guild_card_data = make_shared<PSOBBGuildCardFile>();
       files_manager->set_guild_card(card_filename, this->guild_card_data);
-      player_data_log.info("Created new Guild Card data");
+      player_data_log.info_f("Created new Guild Card data");
     }
 
     if (!this->character_data && (this->bb_character_index >= 0)) {
@@ -900,9 +841,9 @@ void Client::load_all_files() {
         this->character_data->option_flags = nsa_data->option_flags;
         this->character_data->symbol_chats = nsa_data->symbol_chats;
         this->character_data->shortcuts = nsa_data->shortcuts;
-        player_data_log.info("Loaded legacy player data from %s and %s", nsa_filename.c_str(), nsc_filename.c_str());
+        player_data_log.info_f("Loaded legacy player data from {} and {}", nsa_filename, nsc_filename);
       } else {
-        player_data_log.info("Loaded legacy player data from %s", nsc_filename.c_str());
+        player_data_log.info_f("Loaded legacy player data from {}", nsc_filename);
       }
       this->update_character_data_after_load(this->character_data);
     }
@@ -918,6 +859,13 @@ void Client::load_all_files() {
   if (this->character_data) {
     // Clear legacy play_time field
     this->character_data->disp.name.clear_after_bytes(0x18);
+
+    // Enforce item stack limits, in case they've changed
+    auto s = this->require_server_state();
+    auto stack_limits = s->item_stack_limits(this->version());
+    this->character_data->inventory.enforce_stack_limits(stack_limits);
+    this->character_data->bank.enforce_stack_limits(stack_limits);
+
     this->login->account->auto_reply_message = this->character_data->auto_reply.decode();
     this->login->account->save();
     this->last_play_time_update = phosg::now();
@@ -928,7 +876,7 @@ void Client::update_character_data_after_load(shared_ptr<PSOBBCharacterFile> cha
   charfile->import_tethealla_material_usage(this->require_server_state()->level_table(this->version()));
 
   uint8_t lang = this->language();
-  player_data_log.info("Overriding language fields in save files with %02hhX (%c)", lang, char_for_language_code(lang));
+  player_data_log.info_f("Overriding language fields in save files with {:02X} ({})", lang, char_for_language_code(lang));
   charfile->inventory.language = lang;
   charfile->guild_card.language = lang;
 }
@@ -946,7 +894,7 @@ void Client::save_all() {
   if (this->external_bank) {
     string filename = this->shared_bank_filename();
     phosg::save_object_file<PlayerBank200>(filename, *this->external_bank);
-    player_data_log.info("Saved shared bank file %s", filename.c_str());
+    player_data_log.info_f("Saved shared bank file {}", filename);
   }
   if (this->external_bank_character) {
     this->save_character_file(
@@ -962,7 +910,7 @@ void Client::save_system_file() const {
   }
   string filename = this->system_filename();
   phosg::save_object_file(filename, *this->system_data);
-  player_data_log.info("Saved system file %s", filename.c_str());
+  player_data_log.info_f("Saved system file {}", filename);
 }
 
 void Client::save_character_file(
@@ -970,14 +918,14 @@ void Client::save_character_file(
     shared_ptr<const PSOBBBaseSystemFile> system,
     shared_ptr<const PSOBBCharacterFile> character) {
   PSOCHARFile::save(filename, system, character);
-  player_data_log.info("Saved character file %s", filename.c_str());
+  player_data_log.info_f("Saved character file {}", filename);
 }
 
 void Client::save_ep3_character_file(
     const string& filename,
     const PSOGCEp3CharacterFile::Character& character) {
   phosg::save_file(filename, &character, sizeof(character));
-  player_data_log.info("Saved Episode 3 character file %s", filename.c_str());
+  player_data_log.info_f("Saved Episode 3 character file {}", filename);
 }
 
 void Client::save_character_file() {
@@ -993,7 +941,7 @@ void Client::save_character_file() {
     uint64_t t = phosg::now();
     uint64_t seconds = (t - this->last_play_time_update) / 1000000;
     this->character_data->play_time_seconds += seconds;
-    player_data_log.info("Added %" PRIu64 " seconds to play time", seconds);
+    player_data_log.info_f("Added {} seconds to play time", seconds);
     this->last_play_time_update = t;
   }
 
@@ -1006,7 +954,7 @@ void Client::save_guild_card_file() const {
   }
   string filename = this->guild_card_filename();
   phosg::save_object_file(filename, *this->guild_card_data);
-  player_data_log.info("Saved Guild Card file %s", filename.c_str());
+  player_data_log.info_f("Saved Guild Card file {}", filename);
 }
 
 void Client::load_backup_character(uint32_t account_id, size_t index) {
@@ -1030,7 +978,7 @@ void Client::save_and_unload_character() {
   if (this->character_data) {
     this->save_character_file();
     this->character_data.reset();
-    this->log.info("Unloaded character");
+    this->log.info_f("Unloaded character");
   }
 }
 
@@ -1056,13 +1004,13 @@ void Client::use_default_bank() {
     string filename = this->shared_bank_filename();
     phosg::save_object_file<PlayerBank200>(filename, *this->external_bank);
     this->external_bank.reset();
-    player_data_log.info("Detached shared bank %s", filename.c_str());
+    player_data_log.info_f("Detached shared bank {}", filename);
   }
   if (this->external_bank_character) {
     string filename = this->character_filename(this->external_bank_character_index);
     this->save_character_file(filename, this->system_data, this->external_bank_character);
     this->external_bank_character.reset();
-    player_data_log.info("Detached character %s from bank", filename.c_str());
+    player_data_log.info_f("Detached character {} from bank", filename);
   }
 }
 
@@ -1073,22 +1021,22 @@ bool Client::use_shared_bank() {
   auto files_manager = this->require_server_state()->player_files_manager;
   this->external_bank = files_manager->get_bank(filename);
   if (this->external_bank) {
-    player_data_log.info("Using loaded shared bank %s", filename.c_str());
+    player_data_log.info_f("Using loaded shared bank {}", filename);
     return true;
-  } else if (phosg::isfile(filename)) {
+  } else if (std::filesystem::is_regular_file(filename)) {
     this->external_bank = make_shared<PlayerBank200>(phosg::load_object_file<PlayerBank200>(filename));
     files_manager->set_bank(filename, this->external_bank);
-    player_data_log.info("Loaded shared bank %s", filename.c_str());
+    player_data_log.info_f("Loaded shared bank {}", filename);
     return true;
   } else {
     this->external_bank = make_shared<PlayerBank200>();
     files_manager->set_bank(filename, this->external_bank);
-    player_data_log.info("Created shared bank for %s", filename.c_str());
+    player_data_log.info_f("Created shared bank for {}", filename);
     return false;
   }
 }
 
-void Client::use_character_bank(int8_t index) {
+void Client::use_character_bank(ssize_t index) {
   this->use_default_bank();
   if (index != this->bb_character_index) {
     auto files_manager = this->require_server_state()->player_files_manager;
@@ -1097,42 +1045,61 @@ void Client::use_character_bank(int8_t index) {
     this->external_bank_character = files_manager->get_character(filename);
     if (this->external_bank_character) {
       this->external_bank_character_index = index;
-      player_data_log.info("Using loaded character file %s for external bank", filename.c_str());
-    } else if (phosg::isfile(filename)) {
+      player_data_log.info_f("Using loaded character file {} for external bank", filename);
+    } else if (std::filesystem::is_regular_file(filename)) {
       this->external_bank_character = PSOCHARFile::load_shared(filename, false).character_file;
       this->update_character_data_after_load(this->external_bank_character);
       this->external_bank_character_index = index;
       files_manager->set_character(filename, this->external_bank_character);
-      player_data_log.info("Loaded character data from %s for external bank", filename.c_str());
+      player_data_log.info_f("Loaded character data from {} for external bank", filename);
     } else {
       throw runtime_error("character does not exist");
     }
   }
 }
 
-void Client::print_inventory(FILE* stream) const {
+void Client::print_inventory() const {
   auto s = this->require_server_state();
   auto p = this->character();
-  fprintf(stream, "[PlayerInventory] Meseta: %" PRIu32 "\n", p->disp.stats.meseta.load());
-  fprintf(stream, "[PlayerInventory] %hhu items\n", p->inventory.num_items);
+  this->log.info_f("[PlayerInventory] Meseta: {}", p->disp.stats.meseta);
+  this->log.info_f("[PlayerInventory] {} items", p->inventory.num_items);
   for (size_t x = 0; x < p->inventory.num_items; x++) {
     const auto& item = p->inventory.items[x];
     auto hex = item.data.hex();
-    auto name = s->describe_item(this->version(), item.data, false);
-    fprintf(stream, "[PlayerInventory]   %2zu: [+%08" PRIX32 "] %s (%s)\n", x, item.flags.load(), hex.c_str(), name.c_str());
+    auto name = s->describe_item(this->version(), item.data);
+    this->log.info_f("[PlayerInventory]   {:2}: [+{:08X}] {} ({})", x, item.flags, hex, name);
   }
 }
 
-void Client::print_bank(FILE* stream) const {
+void Client::print_bank() const {
   auto s = this->require_server_state();
   auto bank = this->current_bank();
-  fprintf(stream, "[PlayerBank] Meseta: %" PRIu32 "\n", bank.meseta.load());
-  fprintf(stream, "[PlayerBank] %" PRIu32 " items\n", bank.num_items.load());
+  this->log.info_f("[PlayerBank] Meseta: {}", bank.meseta);
+  this->log.info_f("[PlayerBank] {} items", bank.num_items);
   for (size_t x = 0; x < bank.num_items; x++) {
     const auto& item = bank.items[x];
     const char* present_token = item.present ? "" : " (missing present flag)";
     auto hex = item.data.hex();
-    auto name = s->describe_item(this->version(), item.data, false);
-    fprintf(stream, "[PlayerBank]   %3zu: %s (%s) (x%hu)%s\n", x, hex.c_str(), name.c_str(), item.amount.load(), present_token);
+    auto name = s->describe_item(this->version(), item.data);
+    this->log.info_f("[PlayerBank]   {:3}: {} ({}) (x{}){}", x, hex, name, item.amount, present_token);
   }
 }
+
+void Client::cancel_pending_promises() {
+  for (const auto& promise : this->function_call_response_queue) {
+    if (!promise->done()) {
+      promise->cancel();
+    }
+  }
+  this->function_call_response_queue.clear();
+
+  if (this->character_data_ready_promise && !this->character_data_ready_promise->done()) {
+    this->character_data_ready_promise->cancel();
+  }
+  this->character_data_ready_promise.reset();
+
+  if (this->enable_save_promise && !this->enable_save_promise->done()) {
+    this->enable_save_promise->cancel();
+  }
+  this->enable_save_promise.reset();
+}

src/Client.hh

@@ -1,11 +1,10 @@
 #pragma once
 
-#include <netinet/in.h>
-
 #include <memory>
 #include <stdexcept>
 
 #include "Account.hh"
+#include "AsyncUtils.hh"
 #include "Channel.hh"
 #include "CommandFormats.hh"
 #include "Episode3/BattleRecord.hh"
@@ -15,6 +14,7 @@
 #include "PSOEncryption.hh"
 #include "PSOProtocol.hh"
 #include "PatchFileIndex.hh"
+#include "ProxySession.hh"
 #include "Quest.hh"
 #include "QuestScript.hh"
 #include "TeamIndex.hh"
@@ -22,21 +22,22 @@
 
 extern const uint64_t CLIENT_CONFIG_MAGIC;
 
-class Server;
+class GameServer;
 struct Lobby;
 class Parsed6x70Data;
 
+struct GetPlayerInfoResult {
+  // Exactly one of the following two shared_ptrs is not null
+  std::shared_ptr<PSOBBCharacterFile> character;
+  std::shared_ptr<PSOGCEp3CharacterFile::Character> ep3_character;
+  bool is_full_info; // True if the client sent 30; false if it was 61 or 98
+};
+
 class Client : public std::enable_shared_from_this<Client> {
 public:
   enum class Flag : uint64_t {
     // clang-format off
 
-    // This mask specifies which flags are sent to the client
-    // TODO: It'd be nice to use a pattern here (e.g. all server-side flags are
-    // in the high bits) but that would require re-recording or manually
-    // rewriting all the tests
-    CLIENT_SIDE_MASK                           = 0xEF3CFFFF7C0BFFFB,
-
     // Version-related flags
     CHECKED_FOR_DC_V1_PROTOTYPE                = 0x0000000000000002,
     NO_D6_AFTER_LOBBY                          = 0x0000000000000100,
@@ -49,31 +50,29 @@ public:
     SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE      = 0x0000000000004000,
     SEND_FUNCTION_CALL_NO_CACHE_PATCH          = 0x0000000000008000,
     CAN_RECEIVE_ENABLE_B2_QUEST                = 0x0000000000020000,
-    AWAITING_ENABLE_B2_QUEST                   = 0x0000000000040000, // Server-side only
+    AWAITING_ENABLE_B2_QUEST                   = 0x0000000000040000,
 
     // State flags
-    LOADING                                    = 0x0000000000100000, // Server-side only
-    LOADING_QUEST                              = 0x0000000000200000, // Server-side only
-    LOADING_RUNNING_JOINABLE_QUEST             = 0x0000000000400000, // Server-side only
-    LOADING_TOURNAMENT                         = 0x0000000000800000, // Server-side only
-    IN_INFORMATION_MENU                        = 0x0000000001000000, // Server-side only
-    AT_WELCOME_MESSAGE                         = 0x0000000002000000, // Server-side only
+    LOADING                                    = 0x0000000000100000,
+    LOADING_QUEST                              = 0x0000000000200000,
+    LOADING_RUNNING_JOINABLE_QUEST             = 0x0000000000400000,
+    LOADING_TOURNAMENT                         = 0x0000000000800000,
+    IN_INFORMATION_MENU                        = 0x0000000001000000,
+    AT_WELCOME_MESSAGE                         = 0x0000000002000000,
     SAVE_ENABLED                               = 0x0000000004000000,
     HAS_EP3_CARD_DEFS                          = 0x0000000008000000,
     HAS_EP3_MEDIA_UPDATES                      = 0x0000000010000000,
-    USE_OVERRIDE_RANDOM_SEED                   = 0x0000000020000000,
-    HAS_GUILD_CARD_NUMBER                      = 0x0000000040000000,
     HAS_AUTO_PATCHES                           = 0x0000004000000000,
-    AT_BANK_COUNTER                            = 0x0000000080000000, // Server-side only
-    SHOULD_SEND_ARTIFICIAL_ITEM_STATE          = 0x0001000000000000, // Server-side only
-    SHOULD_SEND_ARTIFICIAL_ENEMY_AND_SET_STATE = 0x0040000000000000, // Server-side only
-    SHOULD_SEND_ARTIFICIAL_OBJECT_STATE        = 0x0080000000000000, // Server-side only
-    SHOULD_SEND_ARTIFICIAL_FLAG_STATE          = 0x0002000000000000, // Server-side only
-    SHOULD_SEND_ARTIFICIAL_PLAYER_STATES       = 0x0200000000000000, // Server-side only
+    AT_BANK_COUNTER                            = 0x0000000080000000,
+    SHOULD_SEND_ARTIFICIAL_ITEM_STATE          = 0x0001000000000000,
+    SHOULD_SEND_ARTIFICIAL_ENEMY_AND_SET_STATE = 0x0040000000000000,
+    SHOULD_SEND_ARTIFICIAL_OBJECT_STATE        = 0x0080000000000000,
+    SHOULD_SEND_ARTIFICIAL_FLAG_STATE          = 0x0002000000000000,
+    SHOULD_SEND_ARTIFICIAL_PLAYER_STATES       = 0x0200000000000000,
     SHOULD_SEND_ENABLE_SAVE                    = 0x0004000000000000,
     SWITCH_ASSIST_ENABLED                      = 0x0000000100000000,
     IS_CLIENT_CUSTOMIZATION                    = 0x0100000000000000,
-    EP3_ALLOW_6xBC                             = 0x1000000000000000, // Server-side only
+    EP3_ALLOW_6xBC                             = 0x1000000000000000,
 
     // Cheat mode and option flags
     INFINITE_HP_ENABLED                        = 0x0000000200000000,
@@ -81,21 +80,16 @@ public:
     DEBUG_ENABLED                              = 0x0000000800000000,
     ITEM_DROP_NOTIFICATIONS_1                  = 0x0010000000000000,
     ITEM_DROP_NOTIFICATIONS_2                  = 0x0020000000000000,
+    HAS_ENEMY_DAMAGE_SYNC_PATCH                = 0x2000000000000000, // Must be same as in EnemyDamageSync*.s
 
     // Proxy option flags
     PROXY_SAVE_FILES                           = 0x0000001000000000,
     PROXY_CHAT_COMMANDS_ENABLED                = 0x0000002000000000,
     PROXY_PLAYER_NOTIFICATIONS_ENABLED         = 0x0000008000000000,
-    PROXY_SUPPRESS_CLIENT_PINGS                = 0x0000010000000000,
-    PROXY_SUPPRESS_REMOTE_LOGIN                = 0x0000020000000000,
-    PROXY_ZERO_REMOTE_GUILD_CARD               = 0x0000040000000000,
     PROXY_EP3_INFINITE_MESETA_ENABLED          = 0x0000080000000000,
     PROXY_EP3_INFINITE_TIME_ENABLED            = 0x0000100000000000,
-    PROXY_RED_NAME_ENABLED                     = 0x0000200000000000,
-    PROXY_BLANK_NAME_ENABLED                   = 0x0000400000000000,
     PROXY_BLOCK_FUNCTION_CALLS                 = 0x0000800000000000,
     PROXY_EP3_UNMASK_WHISPERS                  = 0x0008000000000000,
-    PROXY_VIRTUAL_CLIENT                       = 0x0400000000000000,
     // clang-format on
   };
   enum class ItemDropNotificationMode {
@@ -107,123 +101,70 @@ public:
 
   static constexpr uint64_t DEFAULT_FLAGS = static_cast<uint64_t>(Flag::PROXY_CHAT_COMMANDS_ENABLED);
 
-  struct Config {
-    uint64_t enabled_flags = DEFAULT_FLAGS; // Client::Flag enum
-    uint32_t specific_version = 0;
-    int32_t override_random_seed = 0;
-    uint8_t override_section_id = 0xFF; // FF = no override
-    uint8_t override_lobby_event = 0xFF; // FF = no override
-    uint8_t override_lobby_number = 0x80; // 80 = no override
-    uint32_t proxy_destination_address = 0;
-    uint16_t proxy_destination_port = 0;
-
-    Config() = default;
-
-    bool operator==(const Config& other) const = default;
-    bool operator!=(const Config& other) const = default;
-
-    bool should_update_vs(const Config& other) const;
-
-    [[nodiscard]] static inline bool check_flag(uint64_t enabled_flags, Flag flag) {
-      return !!(enabled_flags & static_cast<uint64_t>(flag));
-    }
-
-    [[nodiscard]] inline bool check_flag(Flag flag) const {
-      return this->check_flag(this->enabled_flags, flag);
-    }
-    inline void set_flag(Flag flag) {
-      this->enabled_flags |= static_cast<uint64_t>(flag);
-    }
-    inline void clear_flag(Flag flag) {
-      this->enabled_flags &= (~static_cast<uint64_t>(flag));
-    }
-    inline void toggle_flag(Flag flag) {
-      this->enabled_flags ^= static_cast<uint64_t>(flag);
-    }
-
-    void set_flags_for_version(Version version, int64_t sub_version);
-
-    ItemDropNotificationMode get_drop_notification_mode() const;
-    void set_drop_notification_mode(ItemDropNotificationMode new_mode);
-
-    template <size_t Bytes>
-    void parse_from(const parray<uint8_t, Bytes>& data) {
-      phosg::StringReader r(data.data(), data.size());
-      if (r.get_u32l() != CLIENT_CONFIG_MAGIC) {
-        throw std::invalid_argument("config signature is incorrect");
-      }
-      this->specific_version = r.get_u32l();
-      this->enabled_flags = r.get_u64l();
-      this->override_random_seed = r.get_u32l();
-      this->proxy_destination_address = r.get_u32b();
-      this->proxy_destination_port = r.get_u16l();
-      this->override_section_id = r.get_u8();
-      this->override_lobby_event = r.get_u8();
-      this->override_lobby_number = r.get_u8();
-    }
-
-    template <size_t Bytes>
-    void serialize_into(parray<uint8_t, Bytes>& data) const {
-      phosg::StringWriter w;
-      w.put_u32l(CLIENT_CONFIG_MAGIC);
-      w.put_u32l(this->specific_version);
-      w.put_u64l(this->enabled_flags & static_cast<uint64_t>(Flag::CLIENT_SIDE_MASK));
-      w.put_u32l(this->override_random_seed);
-      w.put_u32b(this->proxy_destination_address);
-      w.put_u16l(this->proxy_destination_port);
-      w.put_u8(this->override_section_id);
-      w.put_u8(this->override_lobby_event);
-      w.put_u8(this->override_lobby_number);
-
-      const auto& s = w.str();
-      for (size_t z = 0; z < s.size(); z++) {
-        data[z] = s[z];
-      }
-      data.clear_after(s.size(), 0xFF);
-    }
-  };
-
-  std::weak_ptr<Server> server;
+  std::weak_ptr<GameServer> server;
   uint64_t id;
   phosg::PrefixedLogger log;
 
+  // Account information (not all of these are used; depends on game version)
+  std::string username;
+  std::string password;
+  std::string email_address;
+  uint64_t hardware_id = 0;
+  int32_t sub_version = 0;
+  uint8_t bb_client_code = 0;
+  uint8_t bb_connection_phase = 0xFF;
+  ssize_t bb_character_index = -1; // -1 = not set
+  uint32_t bb_security_token = 0;
+  parray<uint8_t, 0x28> bb_client_config;
+  std::string login_character_name;
+  std::string serial_number;
+  std::string access_key;
+  std::string serial_number2;
+  std::string access_key2;
+  std::string v1_serial_number;
+  std::string v1_access_key;
+  XBNetworkLocation xb_netloc;
+  parray<le_uint32_t, 3> xb_unknown_a1a;
+  uint64_t xb_user_id = 0;
+  uint32_t xb_unknown_a1b = 0;
   std::shared_ptr<Login> login;
+  std::shared_ptr<ProxySession> proxy_session;
+
+  // Patch server state (only used for PC_PATCH and BB_PATCH versions)
+  std::vector<PatchFileChecksumRequest> patch_file_checksum_requests;
 
   // Network
-  Channel channel;
-  struct sockaddr_storage next_connection_addr;
+  std::shared_ptr<Channel> channel;
+  std::shared_ptr<PSOBBMultiKeyDetectorEncryption> bb_detector_crypt;
   ServerBehavior server_behavior;
-  bool should_disconnect;
-  bool should_send_to_lobby_server;
-  bool should_send_to_proxy_server;
   std::unordered_map<std::string, std::function<void()>> disconnect_hooks;
-  std::shared_ptr<XBNetworkLocation> xb_netloc;
-  parray<le_uint32_t, 3> xb_9E_unknown_a1a;
-  uint8_t bb_connection_phase;
-  uint64_t ping_start_time;
+  uint64_t ping_start_time = 0;
 
-  // Lobby/positioning
-  Config config;
-  Config synced_config;
+  // Basic state
+  uint64_t enabled_flags = DEFAULT_FLAGS; // Client::Flag enum
+  uint32_t specific_version = 0;
+  uint8_t override_section_id = 0xFF; // FF = no override
+  uint8_t override_lobby_event = 0xFF; // FF = no override
+  uint8_t override_lobby_number = 0x80; // 80 = no override
+  int64_t override_random_seed = -1;
   std::unique_ptr<Variations> override_variations;
-  int32_t sub_version;
   VectorXZF pos;
-  uint32_t floor;
+  uint32_t floor = 0x0F;
   std::weak_ptr<Lobby> lobby;
-  uint8_t lobby_client_id;
-  uint8_t lobby_arrow_color;
-  int64_t preferred_lobby_id; // <0 = no preference
+  uint8_t lobby_client_id = 0;
+  uint8_t lobby_arrow_color = 0;
+  int64_t preferred_lobby_id = -1; // <0 = no preference
 
-  std::unique_ptr<struct event, void (*)(struct event*)> save_game_data_event;
-  std::unique_ptr<struct event, void (*)(struct event*)> send_ping_event;
-  std::unique_ptr<struct event, void (*)(struct event*)> idle_timeout_event;
-  int16_t card_battle_table_number;
-  uint16_t card_battle_table_seat_number;
-  uint16_t card_battle_table_seat_state;
+  asio::steady_timer save_game_data_timer;
+  asio::steady_timer send_ping_timer;
+  asio::steady_timer idle_timeout_timer;
+  int16_t card_battle_table_number = -1;
+  uint16_t card_battle_table_seat_number = 0;
+  uint16_t card_battle_table_seat_state = 0;
   std::weak_ptr<Episode3::Tournament::Team> ep3_tournament_team;
   std::shared_ptr<const Episode3::BattleRecord> ep3_prev_battle_record;
   std::shared_ptr<const Menu> last_menu_sent;
-  uint32_t last_game_info_requested;
+  uint32_t last_game_info_requested = 0;
   struct JoinCommand {
     uint16_t command;
     uint32_t flag;
@@ -246,52 +187,72 @@ public:
   std::unordered_set<uint32_t> blocked_senders;
   std::unique_ptr<PlayerDispDataDCPCV3> v1_v2_last_reported_disp;
   std::shared_ptr<Parsed6x70Data> last_reported_6x70;
-  // These are null unless the client is within the trade sequence (D0-D4 or EE commands)
+  // These are null unless the client is within the trade sequence (D0-D4 or EE
+  // commands)
   std::unique_ptr<PendingItemTrade> pending_item_trade;
   std::unique_ptr<PendingCardTrade> pending_card_trade;
-  uint32_t telepipe_lobby_id;
+  uint32_t telepipe_lobby_id = 0;
   TelepipeState telepipe_state;
   std::shared_ptr<Episode3::PlayerConfig> ep3_config; // Null for non-Ep3
-  int8_t bb_character_index;
   ItemData bb_identify_result;
   std::array<std::vector<ItemData>, 3> bb_shop_contents;
 
   // Miscellaneous (used by chat commands)
-  uint32_t next_exp_value; // next EXP value to give
-  bool can_chat;
-  struct PendingCharacterExport {
-    std::shared_ptr<const Account> dest_account;
-    ssize_t character_index = -1;
-    std::shared_ptr<const BBLicense> dest_bb_license; // Only used for $bbchar; null for $savechar
-  };
-  std::unique_ptr<PendingCharacterExport> pending_character_export;
-  std::deque<std::function<void(uint32_t, uint32_t)>> function_call_response_queue;
+  uint32_t next_exp_value = 0; // next EXP value to give
+  bool can_chat = true;
+  // NOTE: If you add any new optional promises here, make sure to also add
+  // them to cancel_pending_promises.
+  // NOTE: Entries in this queue can be nullptr; that represents a B2 command
+  // sent by the remote server during a proxy session. We can't just omit those
+  // from the queue entirely, because if we did, we could end up sending the
+  // wrong B3 response back.
+  std::deque<std::shared_ptr<AsyncPromise<C_ExecuteCodeResult_B3>>> function_call_response_queue;
+  std::shared_ptr<AsyncPromise<GetPlayerInfoResult>> character_data_ready_promise;
+  std::shared_ptr<AsyncPromise<void>> enable_save_promise;
 
   // File loading state
-  uint32_t dol_base_addr;
-  std::shared_ptr<DOLFileIndex::File> loading_dol_file;
   std::unordered_map<std::string, std::shared_ptr<const std::string>> sending_files;
 
   Client(
-      std::shared_ptr<Server> server,
-      struct bufferevent* bev,
-      uint64_t virtual_network_id,
-      Version version,
+      std::shared_ptr<GameServer> server,
+      std::shared_ptr<Channel> channel,
       ServerBehavior server_behavior);
   ~Client();
 
   void update_channel_name();
 
-  void reschedule_save_game_data_event();
-  void reschedule_ping_and_timeout_events();
+  void reschedule_save_game_data_timer();
+  void reschedule_ping_and_timeout_timers();
 
   inline Version version() const {
-    return this->channel.version;
+    return this->channel->version;
   }
   inline uint8_t language() const {
-    return this->channel.language;
+    return this->channel->language;
   }
 
+  [[nodiscard]] static inline bool check_flag(uint64_t enabled_flags, Flag flag) {
+    return !!(enabled_flags & static_cast<uint64_t>(flag));
+  }
+
+  [[nodiscard]] inline bool check_flag(Flag flag) const {
+    return this->check_flag(this->enabled_flags, flag);
+  }
+  inline void set_flag(Flag flag) {
+    this->enabled_flags |= static_cast<uint64_t>(flag);
+  }
+  inline void clear_flag(Flag flag) {
+    this->enabled_flags &= (~static_cast<uint64_t>(flag));
+  }
+  inline void toggle_flag(Flag flag) {
+    this->enabled_flags ^= static_cast<uint64_t>(flag);
+  }
+
+  void set_flags_for_version(Version version, int64_t sub_version);
+
+  ItemDropNotificationMode get_drop_notification_mode() const;
+  void set_drop_notification_mode(ItemDropNotificationMode new_mode);
+
   void convert_account_to_temporary_if_nte();
 
   void sync_config();
@@ -325,15 +286,6 @@ public:
 
   bool can_use_chat_commands() const;
 
-  static void dispatch_save_game_data(evutil_socket_t, short, void* ctx);
-  void save_game_data();
-  static void dispatch_send_ping(evutil_socket_t, short, void* ctx);
-  void send_ping();
-  static void dispatch_idle_timeout(evutil_socket_t, short, void* ctx);
-  void idle_timeout();
-
-  void suspend_timeouts();
-
   void set_login(std::shared_ptr<Login> login);
 
   void create_battle_overlay(std::shared_ptr<const BattleRules> rules, std::shared_ptr<const LevelTable> level_table);
@@ -361,9 +313,9 @@ public:
       std::shared_ptr<const LevelTable> level_table);
 
   std::string system_filename() const;
-  static std::string character_filename(const std::string& bb_username, int8_t index);
+  static std::string character_filename(const std::string& bb_username, ssize_t index);
   static std::string backup_character_filename(uint32_t account_id, size_t index, bool is_ep3);
-  std::string character_filename(int8_t index = -1) const;
+  std::string character_filename(ssize_t index = -1) const;
   std::string guild_card_filename() const;
   std::string shared_bank_filename() const;
 
@@ -391,11 +343,13 @@ public:
   const PlayerBank200& current_bank() const;
   std::shared_ptr<PSOBBCharacterFile> current_bank_character();
   bool use_shared_bank(); // Returns true if the bank exists; false if it was created
-  void use_character_bank(int8_t bb_character_index);
+  void use_character_bank(ssize_t bb_character_index);
   void use_default_bank();
 
-  void print_inventory(FILE* stream) const;
-  void print_bank(FILE* stream) const;
+  void print_inventory() const;
+  void print_bank() const;
+
+  void cancel_pending_promises();
 
 private:
   // The overlay character data is used in battle and challenge modes, when
@@ -407,10 +361,8 @@ private:
   std::shared_ptr<PSOBBGuildCardFile> guild_card_data;
   std::shared_ptr<PlayerBank200> external_bank;
   std::shared_ptr<PSOBBCharacterFile> external_bank_character;
-  int8_t external_bank_character_index;
-  uint64_t last_play_time_update;
-
-  void save_and_clear_external_bank();
+  ssize_t external_bank_character_index = -1;
+  uint64_t last_play_time_update = 0;
 
   void load_all_files();
   void update_character_data_after_load(std::shared_ptr<PSOBBCharacterFile> character_data);

src/CommandFormats.hh

@@ -172,7 +172,7 @@ struct C_Login_Patch_04 {
   parray<le_uint32_t, 3> unused;
   pstring<TextEncoding::ASCII, 0x10> username;
   pstring<TextEncoding::ASCII, 0x10> password;
-  pstring<TextEncoding::ASCII, 0x40> email;
+  pstring<TextEncoding::ASCII, 0x40> email_address;
 } __packed_ws__(C_Login_Patch_04, 0x6C);
 
 // 05 (S->C): Disconnect
@@ -275,7 +275,7 @@ struct S_ReconnectT {
   be_uint32_t address = 0;
   PortT port = 0;
   le_uint16_t unused = 0;
-} __packed__;
+} __attribute__((packed));
 using S_Reconnect_Patch_14 = S_ReconnectT<be_uint16_t>;
 check_struct_size(S_Reconnect_Patch_14, 0x08);
 
@@ -340,7 +340,7 @@ struct S_ServerInitWithAfterMessageT_DC_PC_V3_02_17_91_9B {
   // This field is not part of SEGA's implementation; the client ignores it.
   // newserv sends a message here disavowing the preceding copyright notice.
   pstring<TextEncoding::ASCII, AfterBytes> after_message;
-} __packed__;
+} __attribute__((packed));
 
 // 03 (C->S): Legacy register (non-BB)
 // Internal name: SndRegist
@@ -391,7 +391,7 @@ struct S_ServerInitWithAfterMessageT_BB_03_9B {
   S_ServerInitDefault_BB_03_9B basic_cmd;
   // As in 02, this field is not part of SEGA's implementation.
   pstring<TextEncoding::ASCII, AfterBytes> after_message;
-} __packed__;
+} __attribute__((packed));
 
 // 04 (C->S): Legacy login
 // Internal name: SndLogin2
@@ -514,13 +514,23 @@ struct S_UpdateClientConfig_BB_04 {
 // appears in PSO v1 and v2, but it is not used, implying that at some point
 // there was a separate command to send the block list, but it was scrapped.
 // Perhaps this was used for command A1, which is identical to 07 and A0 in all
-// versions of PSO (except DC NTE).
+// versions of PSO (except DC NTE, whch uses 07/8E/8F instead).
 
-// This command sets the interaction mode, which affects which objects can be
-// interacted with and what certain controls do. It also affects some in-game
-// behaviors; for example, if the leader's interaction mode is set incorrectly
-// in a game, the leader will not send the game state to joining players, so
-// they will wait forever and not be able to actually join.
+// In all PSO versions except DC NTE and 11/2000, this command sets the
+// interaction mode, which affects which objects can be interacted with and
+// what certain controls do. It also affects some in-game behaviors; for
+// example, if the leader's interaction mode is set incorrectly in a game, the
+// leader will not send the game state to joining players, so they will wait
+// forever and not be able to actually join.
+
+// In DC NTE and 11/2000, a side effect of this command not setting the
+// interaction mode is that the menu doesn't work properly unless another
+// command that sets the correct interaction mode (1) is sent before it. The
+// user-visible effects of the interaction mode not being set are that the
+// "Please select a ship" message doesn't appear, the X button does nothing,
+// and selecting an item from the menu doesn't dismiss the menu and instead
+// softlocks, since the client doesn't send anything.) One such command that
+// sets the correct interaction mode is command 04 with an error code of 0.
 
 // The menu is titled "Ship Select" unless the first menu item begins with the
 // text "BLOCK" (all caps), in which case it is titled "Block Select".
@@ -566,7 +576,7 @@ struct S_MenuItemT {
   // 80 = Is Episode 2 (V3/BB)
   // C0 = Is Episode 4 (BB)
   uint8_t flags = 0;
-} __packed__;
+} __attribute__((packed));
 using S_MenuItem_PC_BB_08 = S_MenuItemT<TextEncoding::UTF16>;
 using S_MenuItem_DC_V3_08_Ep3_E6 = S_MenuItemT<TextEncoding::MARKED>;
 check_struct_size(S_MenuItem_PC_BB_08, 0x2C);
@@ -628,7 +638,7 @@ struct SC_MeetUserExtensionT {
   /* 40 */ le_uint32_t unknown_a2 = 0;
   /* 44 */ pstring<Encoding, 0x20> player_name;
   /* 64 (or 84 on UTF16 versions) */
-} __packed__;
+} __attribute__((packed));
 using SC_MeetUserExtension_DC_V3 = SC_MeetUserExtensionT<TextEncoding::MARKED>;
 using SC_MeetUserExtension_PC_BB = SC_MeetUserExtensionT<TextEncoding::UTF16>;
 check_struct_size(SC_MeetUserExtension_DC_V3, 0x64);
@@ -683,7 +693,7 @@ template <TextEncoding Encoding>
 struct C_MenuSelectionT_10_Flag01 {
   C_MenuSelection_10_Flag00 basic_cmd;
   pstring<Encoding, 0x10> name;
-} __packed__;
+} __attribute__((packed));
 using C_MenuSelection_DC_V3_10_Flag01 = C_MenuSelectionT_10_Flag01<TextEncoding::MARKED>;
 using C_MenuSelection_PC_BB_10_Flag01 = C_MenuSelectionT_10_Flag01<TextEncoding::UTF16>;
 check_struct_size(C_MenuSelection_DC_V3_10_Flag01, 0x18);
@@ -693,7 +703,7 @@ template <TextEncoding Encoding>
 struct C_MenuSelectionT_10_Flag02 {
   C_MenuSelection_10_Flag00 basic_cmd;
   pstring<Encoding, 0x10> password;
-} __packed__;
+} __attribute__((packed));
 using C_MenuSelection_DC_V3_10_Flag02 = C_MenuSelectionT_10_Flag02<TextEncoding::MARKED>;
 using C_MenuSelection_PC_BB_10_Flag02 = C_MenuSelectionT_10_Flag02<TextEncoding::UTF16>;
 check_struct_size(C_MenuSelection_DC_V3_10_Flag02, 0x18);
@@ -704,7 +714,7 @@ struct C_MenuSelectionT_10_Flag03 {
   C_MenuSelection_10_Flag00 basic_cmd;
   pstring<Encoding, 0x10> name;
   pstring<Encoding, 0x10> password;
-} __packed__;
+} __attribute__((packed));
 using C_MenuSelection_DC_V3_10_Flag03 = C_MenuSelectionT_10_Flag03<TextEncoding::MARKED>;
 using C_MenuSelection_PC_BB_10_Flag03 = C_MenuSelectionT_10_Flag03<TextEncoding::UTF16>;
 check_struct_size(C_MenuSelection_DC_V3_10_Flag03, 0x28);
@@ -797,6 +807,20 @@ struct C_WriteFileConfirmation_V3_BB_13_A7 {
 using S_Reconnect_19 = S_ReconnectT<le_uint16_t>;
 check_struct_size(S_Reconnect_19, 8);
 
+// Sylverant implements an IPv6 version of this command, but it's not obvious
+// why. IPv6 technically did exist as a draft standard at the time of PSO's
+// development, but it wasn't widely used until over a decade later. IPv6
+// support is not implemented in any version of the PSO client that I've seen,
+// but we implement Sylverant's version of this command anyway because newserv
+// may connect to Sylverant via IPv6 when using the proxy. Sylverant sends the
+// value 6 in header.flag in this case, presumably to indicate the protocol.
+
+struct S_ReconnectIPv6_Extension_19 {
+  parray<uint8_t, 0x10> address;
+  le_uint16_t port = 0;
+  le_uint16_t unused = 0;
+} __packed_ws__(S_ReconnectIPv6_Extension_19, 0x14);
+
 // Because PSO PC and some versions of PSO DC/GC use the same port but different
 // protocols, we use a specially-crafted 19 command to send them to two
 // different ports depending on the client version. I first saw this technique
@@ -866,10 +890,8 @@ struct S_ReconnectSplit_19 {
 // it's not clear if this is accurate. At least, BB US v1.24.3 and later do not
 // support this command.
 
-// 0022: GameGuard check (BB)
-
-// Command 0022 is a 16-byte challenge (sent in the data field) using the
-// following structure.
+// 0022: GameGuard challenge/response (BB)
+// This command is not valid on BB Trial Edition.
 
 struct SC_GameGuardCheck_BB_0022 {
   parray<le_uint32_t, 4> data;
@@ -880,11 +902,13 @@ struct SC_GameGuardCheck_BB_0022 {
 // the returned timestamp is before the previous timestamp returned, but not by
 // too much - it seems the game only considers deltas between 3 seconds and 30
 // minutes suspicious for these purposes.
+// This command is not valid on BB Trial Edition.
 
 // 23 (S->C): Momoka Item Exchange result (BB)
 // Sent in response to a 6xD9 command from the client.
 // header.flag indicates if an item was exchanged: 0 means success, 1 means
 // failure.
+// This command is not valid on BB Trial Edition.
 
 // 24 (S->C): Secret Lottery Ticket exchange result (BB)
 // Sent in response to a 6xDE command from the client.
@@ -894,6 +918,7 @@ struct SC_GameGuardCheck_BB_0022 {
 // header.flag indicates whether the client had any Secret Lottery Tickets in
 // their inventory (and hence could participate): 0 means success, 1 means
 // failure. However, this value is unused by the client.
+// This command is not valid on BB Trial Edition.
 
 struct S_ExchangeSecretLotteryTicketResult_BB_24 {
   le_uint16_t label = 0;
@@ -904,8 +929,9 @@ struct S_ExchangeSecretLotteryTicketResult_BB_24 {
 
 // 25 (S->C): Gallon's Plan result (BB)
 // Sent in response to a 6xE1 command from the client.
-// The client sets the quest registers reg_num1 to reg_value1 and reg_num2 to
-// reg_value2, then starts a new quest thread at the specified label.
+// The client sets the quest registers reg_num1 to value1 and reg_num2 to
+// value2, then starts a new quest thread at the specified label.
+// This command is not valid on BB Trial Edition.
 
 struct S_GallonPlanResult_BB_25 {
   le_uint16_t label = 0;
@@ -978,7 +1004,7 @@ struct S_GuildCardSearchResultT {
   // reconnect_command. When processing the 9D/9E, newserv uses only the
   // lobby_id field within, but it fills in all fields when sending a 41.
   SC_MeetUserExtensionT<Encoding> extension;
-} __packed__;
+} __attribute__((packed));
 using S_GuildCardSearchResult_PC_41 = S_GuildCardSearchResultT<PSOCommandHeaderPC, TextEncoding::UTF16>;
 using S_GuildCardSearchResult_DC_V3_41 = S_GuildCardSearchResultT<PSOCommandHeaderDCV3, TextEncoding::MARKED>;
 using S_GuildCardSearchResult_BB_41 = S_GuildCardSearchResultT<PSOCommandHeaderBB, TextEncoding::UTF16>;
@@ -1258,7 +1284,7 @@ struct S_JoinGameT_DC_PC {
   /* 010B */ uint8_t challenge_mode = 0;
   /* 010C */ le_uint32_t random_seed = 0;
   /* 0110 */
-} __packed__;
+} __attribute__((packed));
 
 struct S_JoinGame_DCNTE_64 {
   uint8_t client_id = 0;
@@ -1356,7 +1382,7 @@ struct S_JoinLobbyT {
     LobbyDataT lobby_data;
     PlayerInventory inventory;
     DispDataT disp;
-  } __packed__;
+  } __attribute__((packed));
   // Note: not all of these will be filled in and sent if the lobby isn't full
   // (the command size will be shorter than this struct's size)
   parray<Entry, 12> entries;
@@ -1364,7 +1390,7 @@ struct S_JoinLobbyT {
   static inline size_t size(size_t used_entries) {
     return offsetof(S_JoinLobbyT, entries) + used_entries * sizeof(Entry);
   }
-} __packed__;
+} __attribute__((packed));
 using S_JoinLobby_DCNTE_65_67_68 = S_JoinLobbyT<LobbyFlags_DCNTE, PlayerLobbyDataDCGC, PlayerDispDataDCPCV3>;
 using S_JoinLobby_PC_65_67_68 = S_JoinLobbyT<LobbyFlags, PlayerLobbyDataPC, PlayerDispDataDCPCV3>;
 using S_JoinLobby_DC_GC_65_67_68_Ep3_EB = S_JoinLobbyT<LobbyFlags, PlayerLobbyDataDCGC, PlayerDispDataDCPCV3>;
@@ -1551,7 +1577,9 @@ struct SC_SimpleMail_BB_81 {
 struct S_LobbyListEntry_83 {
   le_uint32_t menu_id = 0;
   le_uint32_t item_id = 0;
-  le_uint32_t unused = 0;
+  // It appears that Sega's servers sent the number of players in each lobby in
+  // this field, but the client ignores it.
+  le_uint32_t player_count = 0;
 } __packed_ws__(S_LobbyListEntry_83, 0x0C);
 
 // 84 (C->S): Choose lobby
@@ -1625,7 +1653,7 @@ struct C_ConnectionInfo_DCNTE_8A {
   le_uint32_t unused = 0;
   pstring<TextEncoding::ASCII, 0x30> username;
   pstring<TextEncoding::ASCII, 0x30> password;
-  pstring<TextEncoding::ASCII, 0x30> email_address; // From Sylverant documentation
+  pstring<TextEncoding::ASCII, 0x30> email_address;
 } __packed_ws__(C_ConnectionInfo_DCNTE_8A, 0xA0);
 
 // 8A (S->C): Connection information result (DC NTE only)
@@ -1659,7 +1687,7 @@ struct C_Login_DCNTE_8B {
   pstring<TextEncoding::ASCII, 0x11> access_key;
   pstring<TextEncoding::ASCII, 0x30> username;
   pstring<TextEncoding::ASCII, 0x30> password;
-  pstring<TextEncoding::ASCII, 0x10> name;
+  pstring<TextEncoding::ASCII, 0x10> login_character_name;
   parray<uint8_t, 2> unused;
 } __packed_ws__(C_Login_DCNTE_8B, 0xAC);
 
@@ -1718,7 +1746,7 @@ struct C_RegisterV1_DC_92 {
   parray<uint8_t, 2> unused2;
   pstring<TextEncoding::ASCII, 0x30> serial_number2;
   pstring<TextEncoding::ASCII, 0x30> access_key2;
-  pstring<TextEncoding::ASCII, 0x30> email; // According to Sylverant documentation
+  pstring<TextEncoding::ASCII, 0x30> email_address;
 } __packed_ws__(C_RegisterV1_DC_92, 0xA0);
 
 // 92 (S->C): Register result (non-BB)
@@ -1739,7 +1767,7 @@ struct C_LoginV1_DC_93 {
   /* 29 */ pstring<TextEncoding::ASCII, 0x11> access_key;
   /* 3A */ pstring<TextEncoding::ASCII, 0x30> serial_number2;
   /* 6A */ pstring<TextEncoding::ASCII, 0x30> access_key2;
-  /* 9A */ pstring<TextEncoding::ASCII, 0x10> name;
+  /* 9A */ pstring<TextEncoding::ASCII, 0x10> login_character_name;
   /* AA */ parray<uint8_t, 2> unused2;
   /* AC */
 } __packed_ws__(C_LoginV1_DC_93, 0xAC);
@@ -1751,11 +1779,11 @@ struct C_LoginExtendedV1_DC_93 : C_LoginV1_DC_93 {
 // 93 (C->S): Log in (BB)
 
 struct C_LoginBase_BB_93 {
-  le_uint32_t player_tag = 0x00010000;
-  le_uint32_t guild_card_number = 0;
-  le_uint32_t sub_version = 0;
-  uint8_t language = 0;
-  int8_t character_slot = 0;
+  /* 00 */ le_uint32_t player_tag = 0x00010000;
+  /* 04 */ le_uint32_t guild_card_number = 0;
+  /* 08 */ le_uint32_t sub_version = 0;
+  /* 0C */ uint8_t language = 0;
+  /* 0D */ int8_t character_slot = 0;
   // Values for connection_phase:
   // 00 - initial connection (client will request system file, characters, etc.)
   // 01 - choose character
@@ -1764,17 +1792,18 @@ struct C_LoginBase_BB_93 {
   // 04 - login server
   // 05 - lobby server
   // 06 - lobby server (with Meet User fields specified)
-  uint8_t connection_phase = 0;
-  uint8_t client_code = 0;
-  le_uint32_t security_token = 0;
-  pstring<TextEncoding::ASCII, 0x30> username;
-  pstring<TextEncoding::ASCII, 0x30> password;
+  /* 0E */ uint8_t connection_phase = 0;
+  /* 0F */ uint8_t client_code = 0;
+  /* 10 */ le_uint32_t security_token = 0;
+  /* 14 */ pstring<TextEncoding::ASCII, 0x30> username;
+  /* 44 */ pstring<TextEncoding::ASCII, 0x30> password;
 
   // These fields map to the same fields in SC_MeetUserExtensionT. There is no
   // equivalent of the name field from that structure on BB (though newserv
   // doesn't use it anyway).
-  le_uint32_t menu_id = 0;
-  le_uint32_t preferred_lobby_id = 0;
+  /* 74 */ le_uint32_t menu_id = 0;
+  /* 78 */ le_uint32_t preferred_lobby_id = 0;
+  /* 7C */
 } __packed_ws__(C_LoginBase_BB_93, 0x7C);
 
 struct C_LoginWithoutHardwareInfo_BB_93 : C_LoginBase_BB_93 {
@@ -1782,14 +1811,16 @@ struct C_LoginWithoutHardwareInfo_BB_93 : C_LoginBase_BB_93 {
   // config at connect time. So the first time the server gets this command, it
   // will be something like "Ver. 1.24.3". This format is used on older client
   // versions (before 1.23.8?)
-  parray<uint8_t, 0x28> client_config;
+  /* 7C */ parray<uint8_t, 0x28> client_config;
+  /* A4 */
 } __packed_ws__(C_LoginWithoutHardwareInfo_BB_93, 0xA4);
 
 struct C_LoginWithHardwareInfo_BB_93 : C_LoginBase_BB_93 {
   // See the comment in the above structure. This format is used on newer client
   // versions.
-  parray<le_uint32_t, 2> hardware_info;
-  parray<uint8_t, 0x28> client_config;
+  /* 7C */ be_uint64_t hardware_id;
+  /* 84 */ parray<uint8_t, 0x28> client_config;
+  /* AC */
 } __packed_ws__(C_LoginWithHardwareInfo_BB_93, 0xAC);
 
 // 94: Invalid command
@@ -1973,7 +2004,7 @@ struct C_Login_DC_PC_GC_9D {
   /* 48 */ pstring<TextEncoding::ASCII, 0x10> access_key; // On XB, this is the XBL user ID
   /* 58 */ pstring<TextEncoding::ASCII, 0x30> serial_number2; // On DCv2, this is the hardware ID; on XB, this is the XBL gamertag
   /* 88 */ pstring<TextEncoding::ASCII, 0x30> access_key2; // On XB, this is the XBL user ID
-  /* B8 */ pstring<TextEncoding::ASCII, 0x10> name;
+  /* B8 */ pstring<TextEncoding::ASCII, 0x10> login_character_name;
   /* C8 */
 } __packed_ws__(C_Login_DC_PC_GC_9D, 0xC8);
 
@@ -1985,8 +2016,9 @@ struct C_LoginExtended_PC_9D : C_Login_DC_PC_GC_9D {
   SC_MeetUserExtension_PC_BB extension;
 } __packed_ws__(C_LoginExtended_PC_9D, 0x14C);
 
-// 9E (C->S): Log in with client config (V3/BB)
-// Not used on GC Episodes 1&2 Trial Edition.
+// 9E (C->S): Log in with client config (PC/V3/BB)
+// Not used on GC Episodes 1&2 Trial Edition, nor on v1 or most v2 versions.
+// Of all pre-v3 versions, only the latest version of PCv2 appears to use this.
 // The extended version of this command is used in the same circumstances as
 // when PSO PC uses the extended version of the 9D command.
 // PSO XB does not send the client config (security data) in the 9E command,
@@ -1994,23 +2026,25 @@ struct C_LoginExtended_PC_9D : C_Login_DC_PC_GC_9D {
 // retrieve the client config.
 // header.flag is 1 if the client has UDP disabled.
 
-struct C_Login_GC_9E : C_Login_DC_PC_GC_9D {
+struct C_Login_PC_GC_9E : C_Login_DC_PC_GC_9D {
   parray<uint8_t, 0x20> client_config;
-} __packed_ws__(C_Login_GC_9E, 0xE8);
-
-struct C_LoginExtended_GC_9E : C_Login_GC_9E {
+} __packed_ws__(C_Login_PC_GC_9E, 0xE8);
+struct C_LoginExtended_PC_9E : C_Login_PC_GC_9E {
+  SC_MeetUserExtension_PC_BB extension;
+} __packed_ws__(C_LoginExtended_PC_9E, 0x16C);
+struct C_LoginExtended_GC_9E : C_Login_PC_GC_9E {
   SC_MeetUserExtension_DC_V3 extension;
 } __packed_ws__(C_LoginExtended_GC_9E, 0x14C);
 
 struct C_Login_XB_9E : C_Login_DC_PC_GC_9D {
   /* 00C8 */ parray<uint8_t, 0x20> unknown_a4;
-  /* 00E8 */ XBNetworkLocation netloc;
+  /* 00E8 */ XBNetworkLocation xb_netloc;
   // By default, this array is initialized with [0x5A2773DD, 0xD82B2345,
   // 0x4FF904D5] on 4OEU (US TU version).
-  /* 0118 */ parray<le_uint32_t, 3> unknown_a1a;
+  /* 0118 */ parray<le_uint32_t, 3> xb_unknown_a1a;
   /* 0124 */ le_uint32_t xb_user_id_high = 0;
   /* 0128 */ le_uint32_t xb_user_id_low = 0;
-  /* 012C */ le_uint32_t unknown_a1b = 0;
+  /* 012C */ le_uint32_t xb_unknown_a1b = 0;
   /* 0130 */
 } __packed_ws__(C_Login_XB_9E, 0x130);
 
@@ -2036,15 +2070,15 @@ struct C_LoginExtended_BB_9E {
   /* 0170 */
 } __packed_ws__(C_LoginExtended_BB_9E, 0x170);
 
-// 9F (S->C): Request client config / security data (V3/BB)
-// This command is not valid on PSO GC Episodes 1&2 Trial Edition, nor any
-// pre-V3 PSO versions. Client will respond with a 9F command.
+// 9F (S->C): Request client config / security data (PC/V3/BB)
+// This command is not valid on PSO GC Episodes 1&2 Trial Edition nor on any
+// other pre-v3 versions, except the latest PC v2 version, which does have it.
+// Client will respond with a 9F command.
 // No arguments
 
-// 9F (C->S): Client config / security data response (V3/BB)
+// 9F (C->S): Client config / security data response (PC/V3/BB)
 // The data is opaque to the client, as described at the top of this file.
-// If newserv ever sent a 9F command (it currently does not). On BB, this
-// command does not work during the data server phase.
+// On BB, this command does not work during the data server phase.
 
 struct C_ClientConfig_V3_9F {
   parray<uint8_t, 0x20> data;
@@ -2109,7 +2143,7 @@ struct S_QuestMenuEntryT {
   le_uint32_t item_id = 0;
   pstring<Encoding, 0x20> name;
   pstring<Encoding, ShortDescLength> short_description;
-} __packed__;
+} __attribute__((packed));
 using S_QuestMenuEntry_PC_A2_A4 = S_QuestMenuEntryT<TextEncoding::UTF16, 0x70>;
 using S_QuestMenuEntry_DC_GC_A2_A4 = S_QuestMenuEntryT<TextEncoding::MARKED, 0x70>;
 using S_QuestMenuEntry_XB_A2_A4 = S_QuestMenuEntryT<TextEncoding::MARKED, 0x80>;
@@ -2493,7 +2527,7 @@ struct S_ChoiceSearchEntryT {
   le_uint16_t parent_choice_id = 0; // 0 for top-level categories
   le_uint16_t choice_id = 0;
   pstring<Encoding, 0x1C> text;
-} __packed__;
+} __attribute__((packed));
 using S_ChoiceSearchEntry_DC_V3_C0 = S_ChoiceSearchEntryT<TextEncoding::MARKED>;
 using S_ChoiceSearchEntry_PC_BB_C0 = S_ChoiceSearchEntryT<TextEncoding::UTF16>;
 check_struct_size(S_ChoiceSearchEntry_DC_V3_C0, 0x20);
@@ -2523,7 +2557,7 @@ struct C_CreateGameBaseT {
   le_uint32_t item_id = 0;
   pstring<Encoding, 0x10> name;
   pstring<Encoding, 0x10> password;
-} __packed__;
+} __attribute__((packed));
 using C_CreateGame_DCNTE = C_CreateGameBaseT<TextEncoding::SJIS>;
 check_struct_size(C_CreateGame_DCNTE, 0x28);
 
@@ -2538,7 +2572,7 @@ struct C_CreateGameT : C_CreateGameBaseT<Encoding> {
   // different meaning: if set to 0, the game can be joined by v1 and v2
   // players; if set to 1, it's v2-only.
   uint8_t episode = 0; // 1-4 on V3+ (3 on Episode 3); unused on DC/PC
-} __packed__;
+} __attribute__((packed));
 using C_CreateGame_DC_V3_0C_C1_Ep3_EC = C_CreateGameT<TextEncoding::MARKED>;
 using C_CreateGame_PC_C1 = C_CreateGameT<TextEncoding::UTF16>;
 check_struct_size(C_CreateGame_DC_V3_0C_C1_Ep3_EC, 0x2C);
@@ -2578,7 +2612,7 @@ struct S_ChoiceSearchResultEntryT_C4 {
   HeaderT reconnect_command_header; // Ignored by the client
   S_Reconnect_19 reconnect_command;
   SC_MeetUserExtensionT<NameEncoding> meet_user;
-} __packed__;
+} __attribute__((packed));
 using S_ChoiceSearchResultEntry_DC_V3_C4 = S_ChoiceSearchResultEntryT_C4<PSOCommandHeaderDCV3, TextEncoding::ASCII, TextEncoding::MARKED, TextEncoding::ASCII>;
 using S_ChoiceSearchResultEntry_PC_C4 = S_ChoiceSearchResultEntryT_C4<PSOCommandHeaderPC, TextEncoding::UTF16, TextEncoding::UTF16, TextEncoding::UTF16>;
 using S_ChoiceSearchResultEntry_BB_C4 = S_ChoiceSearchResultEntryT_C4<PSOCommandHeaderBB, TextEncoding::UTF16_ALWAYS_MARKED, TextEncoding::UTF16, TextEncoding::UTF16>;
@@ -2600,7 +2634,7 @@ check_struct_size(S_ChoiceSearchResultEntry_BB_C4, 0x158);
 template <size_t Count>
 struct C_SetBlockedSendersT_C6 {
   parray<le_uint32_t, Count> blocked_senders;
-} __packed__;
+} __attribute__((packed));
 using C_SetBlockedSenders_V3_C6 = C_SetBlockedSendersT_C6<30>;
 using C_SetBlockedSenders_BB_C6 = C_SetBlockedSendersT_C6<28>;
 check_struct_size(C_SetBlockedSenders_V3_C6, 0x78);
@@ -2773,7 +2807,7 @@ template <TextEncoding NameEncoding, TextEncoding MessageEncoding>
 struct S_InfoBoardEntryT_D8 {
   pstring<NameEncoding, 0x10> name;
   pstring<MessageEncoding, 0xAC> message;
-} __packed__;
+} __attribute__((packed));
 using S_InfoBoardEntry_V3_D8 = S_InfoBoardEntryT_D8<TextEncoding::ASCII, TextEncoding::MARKED>;
 using S_InfoBoardEntry_BB_D8 = S_InfoBoardEntryT_D8<TextEncoding::UTF16_ALWAYS_MARKED, TextEncoding::UTF16>;
 check_struct_size(S_InfoBoardEntry_V3_D8, 0xBC);
@@ -2974,7 +3008,7 @@ struct S_GameInformationBaseT_Ep3_E1 {
   /* 0100 */ RulesT rules;
   /* 0114 */ parray<PlayerEntry, 8> spectator_entries;
   /* 0294 */
-} __packed__;
+} __attribute__((packed));
 using S_GameInformation_Ep3NTE_E1 = S_GameInformationBaseT_Ep3_E1<Episode3::RulesTrial>;
 using S_GameInformation_Ep3_E1 = S_GameInformationBaseT_Ep3_E1<Episode3::Rules>;
 check_struct_size(S_GameInformation_Ep3NTE_E1, 0x28C);
@@ -3100,17 +3134,21 @@ struct S_TournamentGameDetailsBaseT_Ep3_E3 {
   /* 05BA */ le_uint16_t num_spectators = 0;
   /* 05BC */ parray<PlayerEntry, 8> spectator_entries;
   /* 073C */
-} __packed__;
+} __attribute__((packed));
 using S_TournamentGameDetails_Ep3NTE_E3 = S_TournamentGameDetailsBaseT_Ep3_E3<Episode3::RulesTrial>;
 using S_TournamentGameDetails_Ep3_E3 = S_TournamentGameDetailsBaseT_Ep3_E3<Episode3::Rules>;
 check_struct_size(S_TournamentGameDetails_Ep3NTE_E3, 0x734);
 check_struct_size(S_TournamentGameDetails_Ep3_E3, 0x73C);
 
 // E3 (C->S): Player preview request (BB)
+// header.flag is not used by the vanilla client, but newserv's MoreSaveSlots
+// patch uses header.flag to tell the server how many save slots the client
+// expects. The server uses this to send all the character previews at once,
+// thus reducing the number of network roundtrips during login.
 
 struct C_PlayerPreviewRequest_BB_E3 {
   le_int32_t character_index = 0;
-  le_uint32_t unused = 0;
+  le_uint32_t unknown_a1 = 0;
 } __packed_ws__(C_PlayerPreviewRequest_BB_E3, 0x08);
 
 // E4: CARD lobby battle table state (Episode 3)
@@ -3317,7 +3355,7 @@ struct C_GuildCardChecksum_01E8 {
 // 02E8 (S->C): Accept/decline guild card file checksum
 // If needs_update is nonzero, the client will request the guild card file by
 // sending an 03E8 command. If needs_update is zero, the client will skip
-// downloading the guild card file and send a 04EB command (requesting the
+// downloading the guild card file and send an 04EB command (requesting the
 // stream file) instead.
 
 struct S_GuildCardChecksumResponse_BB_02E8 {
@@ -3438,7 +3476,7 @@ struct SC_TeamChat_BB_07EA {
 struct S_TeamMemberList_BB_09EA {
   le_uint32_t entry_count = 0;
   struct Entry {
-    // This is displayed as "<%04d> %s" % (rank, name)
+    // This is displayed as "<{:04}> {}" % (rank, name)
     le_uint32_t rank = 0;
     le_uint32_t privilege_level = 0; // 0x10 or 0x20 = green, 0x30 = blue, 0x40 = red, anything else = white
     le_uint32_t guild_card_number = 0;
@@ -3641,7 +3679,7 @@ struct S_StreamFileChunk_BB_02EB {
 struct C_LeaveCharacterSelect_BB_00EC {
   // Reason codes:
   // 0 = canceled
-  // 1 = recreate character
+  // 1 = create or recreate character
   // 2 = dressing room
   le_uint32_t reason = 0;
 } __packed_ws__(C_LeaveCharacterSelect_BB_00EC, 4);
@@ -3771,7 +3809,8 @@ struct S_SetShutdownCommand_BB_01EF {
 // F0 (S->C): Force update player lobby data (BB)
 // Format is PlayerLobbyDataBB (in PlayerSubordinates.hh). This command
 // overwrites the lobby data for the player given by .client_id without
-// reloading the game or lobby.
+// reloading the game or lobby. This command is not valid on PSOBB Trial
+// Edition.
 
 // This command probably exists to handle cases like the following:
 // 1. Player A is in a team and is not the team master. Player A creates a game.
@@ -3888,7 +3927,7 @@ template <typename HeaderT>
 struct G_ExtendedHeaderT {
   HeaderT basic_header;
   le_uint32_t size = 0;
-} __packed__;
+} __attribute__((packed));
 
 // 6x00: Invalid subcommand
 // 6x01: Invalid subcommand
@@ -3928,7 +3967,9 @@ struct G_Unknown_6x04 {
 // subclass of 6x60.
 
 struct G_WriteSwitchFlag_6x05 {
-  // Note: header.object_id is 0xFFFF for room clear when all enemies defeated
+  // header.entity_id may be 0xFFFF if no object is responsible for the switch
+  // flag state change - this can happen when a wave event script sets a switch
+  // flag, for example.
   G_EntityIDHeader header;
   // TODO: Some of these might be big-endian on GC; it only byteswaps
   // switch_flag_num. Are the others actually uint16, or are they uint8[2]?
@@ -3992,20 +4033,22 @@ struct G_SymbolChat_6x07 {
 
 // 6x08: Invalid subcommand
 
-// 6x09: Unknown
+// 6x09: Kill enemy (broken/unused)
 // header.entity_id is expected to be an enemy ID, but is also expected to be
-// in the range [0x00, 0x80) since it writes to an array of 0x80 entries. This
-// duality makes no sense because enemy IDs are greater than or equal to
-// 0x1000, so any valid enemy ID would be far outside the array's range, and
-// the write is not bounds-checked. For this reason, newserv unconditionally
-// blocks this command.
+// in the range [0x00, 0x80) since the command handler writes to an array of
+// 0x80 entries. This duality is nonsense because enemy IDs are greater than or
+// equal to 0x1000, so any valid enemy ID would be far outside the array's
+// range. newserv unconditionally blocks this command because it appears never
+// to be used, and the array write is not bounds-checked, so it could be used
+// to cause undefined behavior on other clients. It seems that this broken
+// logic predates even DC NTE.
 
-struct G_Unknown_6x09 {
+struct G_LegacyKillEnemy_6x09 {
   G_EntityIDHeader header;
-} __packed_ws__(G_Unknown_6x09, 4);
+} __packed_ws__(G_LegacyKillEnemy_6x09, 4);
 
 // 6x0A: Update enemy state
-// In Ultimate mode, the low 7 bits of game_flags are ignored, and 6x9C is used
+// In Ultimate mode, the low 6 bits of game_flags are ignored, and 6x9C is used
 // to update those instead.
 
 template <bool BE>
@@ -4014,7 +4057,7 @@ struct G_UpdateEnemyStateT_6x0A {
   le_uint16_t enemy_index = 0; // [0, 0xB50)
   le_uint16_t total_damage = 0;
   typename std::conditional_t<BE, be_uint32_t, le_uint32_t> game_flags = 0;
-} __packed__;
+} __attribute__((packed));
 using G_UpdateEnemyState_GC_6x0A = G_UpdateEnemyStateT_6x0A<true>;
 using G_UpdateEnemyState_DC_PC_XB_BB_6x0A = G_UpdateEnemyStateT_6x0A<false>;
 check_struct_size(G_UpdateEnemyState_GC_6x0A, 0x0C);
@@ -4052,7 +4095,7 @@ struct G_AddStatusEffect_6x0C {
   // 12 = Confuse (slot 1; 10 seconds)
   // Anything else = command is ignored
   le_uint32_t effect_type = 0;
-  le_uint32_t level = 0; // Only used for Shifta/Deband/Jellen/Zalure
+  le_float amount = 0; // Only used for Shifta/Deband/Jellen/Zalure
 } __packed_ws__(G_AddStatusEffect_6x0C, 0x0C);
 
 // 6x0D: Clear status effect slot (protected on V3/V4)
@@ -4093,7 +4136,7 @@ struct G_DragonBossActionsT_6x12 {
   le_uint32_t unknown_a4 = 0;
   F32T<BE> x = 0.0f;
   F32T<BE> z = 0.0f;
-} __packed__;
+} __attribute__((packed));
 using G_DragonBossActions_DC_PC_XB_BB_6x12 = G_DragonBossActionsT_6x12<false>;
 using G_DragonBossActions_GC_6x12 = G_DragonBossActionsT_6x12<true>;
 check_struct_size(G_DragonBossActions_DC_PC_XB_BB_6x12, 0x14);
@@ -4249,11 +4292,11 @@ struct G_UseItem_6x27 {
 
 // 6x28: Feed MAG (protected on V3/V4)
 
-struct G_FeedMAG_6x28 {
+struct G_FeedMag_6x28 {
   G_ClientIDHeader header;
   le_uint32_t mag_item_id = 0;
   le_uint32_t fed_item_id = 0;
-} __packed_ws__(G_FeedMAG_6x28, 0x0C);
+} __packed_ws__(G_FeedMag_6x28, 0x0C);
 
 // 6x29: Delete inventory item (via bank deposit / sale / feeding MAG) (protected on V3 but not V4)
 // This subcommand is also used for reducing the size of stacks - if amount is
@@ -4290,25 +4333,26 @@ struct G_CreateInventoryItem_PC_V3_BB_6x2B : G_CreateInventoryItem_DC_6x2B {
   parray<uint8_t, 2> unused2 = 0;
 } __packed_ws__(G_CreateInventoryItem_PC_V3_BB_6x2B, 0x1C);
 
-// 6x2C: Talk to NPC (protected on V3/V4)
-// This updates G_6x70_NPCTalkState in the TObjPlayer struct, but the format is
-// not the same. The names here match the fields in G_6x70_NPCTalkState, hence
-// the unusual numbering.
+// 6x2C: Impose hold (protected on V3/V4)
+// This updates PlayerHoldState in the TObjPlayer struct, but the format is not
+// the same. The names here match the fields in PlayerHoldState. A player hold
+// prevents the player from moving further than the trigger radius from the
+// given x/z coordinates.
 
-struct G_TalkToNPC_6x2C {
+struct G_ImposeHold_6x2C {
   G_ClientIDHeader header;
   le_uint16_t unknown_a1 = 0;
   le_uint16_t unknown_a2 = 0;
-  le_float unknown_a5 = 0.0f;
-  le_float unknown_a6 = 0.0f;
-  le_float unknown_a4 = 0.0f;
-} __packed_ws__(G_TalkToNPC_6x2C, 0x14);
+  le_float x = 0.0f;
+  le_float z = 0.0f;
+  le_float trigger_radius2 = 0.0f; // "2" here means "squared"
+} __packed_ws__(G_ImposeHold_6x2C, 0x14);
 
-// 6x2D: Done talking to NPC (protected on V3/V4)
+// 6x2D: Release hold (protected on V3/V4)
 
-struct G_EndTalkToNPC_6x2D {
+struct G_ReleaseHold_6x2D {
   G_ClientIDHeader header;
-} __packed_ws__(G_EndTalkToNPC_6x2D, 4);
+} __packed_ws__(G_ReleaseHold_6x2D, 4);
 
 // 6x2E: Set and/or clear player flags (protected on V3/V4)
 
@@ -4458,8 +4502,10 @@ struct G_WalkToPosition_6x40 {
 
 // 6x41: Move to position (v1)
 // 6x42: Run (protected on V3/V4)
-// This subcommand is completely ignored by v2 and later.
+// Command 6x41 is completely ignored by v2 and later.
 // If UDP mode is enabled, this command is sent via UDP.
+// TODO: Should newserv translate 6x41 to 6x42? Is there any difference in how
+// v1 and pre-v1 handle 6x42 vs. 6x41?
 
 struct G_MoveToPosition_6x41_6x42 {
   G_ClientIDHeader header;
@@ -4561,6 +4607,8 @@ struct G_PlayerDied_6x4D {
 } __packed_ws__(G_PlayerDied_6x4D, 8);
 
 // 6x4E: Player is dead can be revived (protected on V3/V4)
+// This command creates the particle effect that Reverser and Moon Atomizers
+// can target.
 
 struct G_PlayerRevivable_6x4E {
   G_ClientIDHeader header;
@@ -4779,7 +4827,9 @@ struct G_UseStarAtomizer_6x66 {
 // 6x67: Trigger set event
 
 struct G_TriggerSetEvent_6x67 {
-  G_UnusedHeader header;
+  // If this command is sent by a box that triggers a set event, the entity ID
+  // in the header is the box's object ID.
+  G_EntityIDHeader header;
   le_uint32_t floor = 0;
   le_uint32_t event_id = 0; // NOT event index
   le_uint32_t client_id = 0;
@@ -4957,9 +5007,7 @@ struct G_6x70_Base_DCNTE {
   /* 0002 */ le_uint16_t room_id = 0;
   /* 0004 */ le_uint32_t flags1 = 0;
   /* 0008 */ VectorXYZF pos;
-  /* 0014 */ le_uint32_t angle_x = 0;
-  /* 0018 */ le_uint32_t angle_y = 0;
-  /* 001C */ le_uint32_t angle_z = 0;
+  /* 0014 */ VectorXYZI angle;
   /* 0020 */ le_uint16_t unknown_a3a = 0;
   /* 0022 */ le_uint16_t current_hp = 0;
 } __packed_ws__(G_6x70_Base_DCNTE, 0x24);
@@ -4973,7 +5021,7 @@ struct G_SyncPlayerDispAndInventory_DCNTE_6x70 {
   /* 0034 */ le_uint32_t unknown_a6 = 0;
   /* 0038 */ G_6x70_Sub_Telepipe telepipe;
   /* 0054 */ le_uint32_t death_flags = 0;
-  /* 0058 */ NPCTalkState_DCProtos npc_talk_state;
+  /* 0058 */ PlayerHoldState_DCProtos hold_state;
   /* 0068 */ le_uint32_t area = 0;
   /* 006C */ le_uint32_t game_flags = 0;
   /* 0070 */ PlayerVisualConfig visual;
@@ -4992,7 +5040,7 @@ struct G_SyncPlayerDispAndInventory_DC112000_6x70 {
   /* 0034 */ parray<uint8_t, 0x10> unknown_a5;
   /* 0044 */ G_6x70_Sub_Telepipe telepipe;
   /* 0060 */ le_uint32_t death_flags = 0;
-  /* 0064 */ NPCTalkState_DCProtos npc_talk_state;
+  /* 0064 */ PlayerHoldState_DCProtos hold_state;
   /* 0074 */ le_uint32_t area = 0;
   /* 0078 */ le_uint32_t game_flags = 0;
   /* 007C */ PlayerVisualConfig visual;
@@ -5018,7 +5066,7 @@ struct G_6x70_Base_V1 {
   /* 0074 */ le_uint32_t battle_team_number = 0;
   /* 0078 */ G_6x70_Sub_Telepipe telepipe;
   /* 0094 */ le_uint32_t death_flags = 0; // Only a few bits are used. 4 = player is dead
-  /* 0098 */ NPCTalkState npc_talk_state;
+  /* 0098 */ PlayerHoldState hold_state;
   /* 00AC */ le_uint32_t area = 0;
   /* 00B0 */ le_uint32_t game_flags = 0;
   /* 00B4 */ parray<uint8_t, 0x14> technique_levels_v1 = 0xFF; // Last byte is uninitialized
@@ -5107,7 +5155,7 @@ struct G_WordSelectT_6x74 {
   uint8_t size = 0;
   U16T<BE> client_id = 0;
   WordSelectMessage message;
-} __packed__;
+} __attribute__((packed));
 using G_WordSelect_6x74 = G_WordSelectT_6x74<false>;
 using G_WordSelectBE_6x74 = G_WordSelectT_6x74<true>;
 check_struct_size(G_WordSelect_6x74, 0x20);
@@ -5146,7 +5194,7 @@ struct G_SyncQuestRegister_6x77 {
   union {
     le_uint32_t as_int;
     le_float as_float;
-  } __packed__ value;
+  } __attribute__((packed)) value;
 } __packed_ws__(G_SyncQuestRegister_6x77, 0x0C);
 
 // 6x78: Unknown
@@ -5163,9 +5211,9 @@ struct G_Unknown_6x78 {
 struct G_GogoBall_6x79 {
   G_UnusedHeader header;
   le_uint32_t unknown_a1 = 0;
-  le_uint32_t unknown_a2 = 0;
+  le_uint32_t angle = 0;
   VectorXZF ball_pos;
-  uint8_t unknown_a5 = 0;
+  uint8_t use_missile_sound = 0;
   parray<uint8_t, 3> unused;
 } __packed_ws__(G_GogoBall_6x79, 0x18);
 
@@ -5235,7 +5283,7 @@ struct G_BattleScoresT_6x7F {
   } __packed_ws__(Entry, 8);
   G_UnusedHeader header;
   parray<Entry, 4> entries;
-} __packed__;
+} __attribute__((packed));
 using G_BattleScores_6x7F = G_BattleScoresT_6x7F<false>;
 using G_BattleScoresBE_6x7F = G_BattleScoresT_6x7F<true>;
 check_struct_size(G_BattleScores_6x7F, 0x24);
@@ -5455,11 +5503,11 @@ struct G_SelectChallengeModeFailureOption_6x97 {
 // 6x99: Unknown
 // This subcommand is completely ignored.
 
-// 6x9A: Update player stat (not valid on Episode 3)
+// 6x9A: Update entity stat (not valid on Episode 3)
 
-struct G_UpdatePlayerStat_6x9A {
-  G_ClientIDHeader header;
-  le_uint16_t client_id2 = 0;
+struct G_UpdateEntityStat_6x9A {
+  G_EntityIDHeader header;
+  le_uint16_t entity_index = 0;
   // Values for what:
   // 0 = subtract HP
   // 1 = subtract TP
@@ -5468,7 +5516,7 @@ struct G_UpdatePlayerStat_6x9A {
   // 4 = add TP
   uint8_t what = 0;
   uint8_t amount = 0;
-} __packed_ws__(G_UpdatePlayerStat_6x9A, 8);
+} __packed_ws__(G_UpdateEntityStat_6x9A, 8);
 
 // 6x9B: Level up all techniques (protected on V3/V4)
 // Used in battle mode if the rules specify that techniques should level up
@@ -5481,7 +5529,7 @@ struct G_LevelUpAllTechniques_6x9B {
 } __packed_ws__(G_LevelUpAllTechniques_6x9B, 8);
 
 // 6x9C: Set enemy low game flags (not valid on Episode 3)
-// This command only has an effect in Ultimate mode. It sets the low 7 bits of
+// This command only has an effect in Ultimate mode. It sets the low 6 bits of
 // game_flags (those that match 0x0000003F).
 
 struct G_SetEnemyLowGameFlagsUltimate_6x9C {
@@ -5539,10 +5587,12 @@ struct G_RevivePlayer_V3_BB_6xA1 {
 // server on BB)
 
 struct G_SpecializableItemDropRequest_6xA2 : G_StandardDropItemRequest_PC_V3_BB_6x60 {
-  /* 18 */ le_float fparam3 = 0.0f;
-  /* 1C */ le_int32_t iparam4 = 0;
-  /* 20 */ le_int32_t iparam5 = 0;
-  /* 24 */ le_int32_t iparam6 = 0;
+  // These fields directly map to param3-6 in the ObjectSetEntry structure from
+  // which the box was created.
+  /* 18 */ le_float param3 = 0.0f;
+  /* 1C */ le_int32_t param4 = 0;
+  /* 20 */ le_int32_t param5 = 0;
+  /* 24 */ le_int32_t param6 = 0;
   /* 28 */
 } __packed_ws__(G_SpecializableItemDropRequest_6xA2, 0x28);
 
@@ -5605,7 +5655,7 @@ struct G_GolDragonBossActionsT_6xA8 {
   F32T<BE> z = 0.0f;
   uint8_t unknown_a5 = 0;
   parray<uint8_t, 3> unused;
-} __packed__;
+} __attribute__((packed));
 using G_GolDragonBossActions_XB_BB_6xA8 = G_GolDragonBossActionsT_6xA8<false>;
 using G_GolDragonBossActions_GC_6xA8 = G_GolDragonBossActionsT_6xA8<true>;
 check_struct_size(G_GolDragonBossActions_XB_BB_6xA8, 0x18);
@@ -6168,7 +6218,9 @@ struct G_SetQuestCounter_BB_6xD2 {
 struct G_Unknown_BB_6xD4 {
   G_UnusedHeader header;
   le_uint16_t action = 0; // Must be in [0, 5]
-  uint8_t unknown_a1 = 0; // Must be in [0, 15]
+  // object_identifier must be in [0, 15]; it should match param4 of the
+  // relevant object.
+  uint8_t object_identifier = 0;
   uint8_t unused = 0;
 } __packed_ws__(G_Unknown_BB_6xD4, 8);
 
@@ -6257,7 +6309,7 @@ struct G_ExchangeItemInQuest_BB_6xDB {
 
 struct G_Episode4BossActions_BB_6xDC {
   G_UnusedHeader header;
-  le_uint16_t unknown_a1 = 0;
+  le_uint16_t action = 0; // Must be in range [0, 4]
   le_uint16_t unknown_a2 = 0;
 } __packed_ws__(G_Episode4BossActions_BB_6xDC, 8);
 
@@ -6337,7 +6389,7 @@ struct G_SetMesetaSlotPrizeResult_BB_6xE3 {
   ItemData item;
 } __packed_ws__(G_SetMesetaSlotPrizeResult_BB_6xE3, 0x18);
 
-// 6xE4: Invalid subcommand
+// 6xE4: Invalid subcommand (but used as an extension; see end of this file)
 // 6xE5: Invalid subcommand
 // 6xE6: Invalid subcommand
 // 6xE7: Invalid subcommand
@@ -7025,7 +7077,7 @@ struct G_SetTournamentPlayerDecksT_Ep3_6xB4x3D {
   /* 01C2:01CA */ uint8_t unknown_a4 = 0;
   /* 01C3:01CB */ uint8_t unknown_a5 = 0;
   /* 01C4:01CC */
-} __packed__;
+} __attribute__((packed));
 
 using G_SetTournamentPlayerDecks_Ep3NTE_6xB4x3D = G_SetTournamentPlayerDecksT_Ep3_6xB4x3D<Episode3::RulesTrial>;
 check_struct_size(G_SetTournamentPlayerDecks_Ep3NTE_6xB4x3D, 0x1C4);
@@ -7334,9 +7386,10 @@ struct G_TournamentMatchResult_Ep3_6xB4x51 {
   le_uint16_t num_players_per_team = 0;
   le_uint16_t winner_team_id = 0;
   le_uint32_t meseta_amount = 0;
-  // This field apparently is supposed to contain a %s token (as for printf)
-  // which is replaced with meseta_amount. The results screen animates this text
-  // counting up from 0 to meseta_amount.
+  // This field apparently is supposed to contain a %s token (as for sprintf)
+  // which is replaced with meseta_amount. (Yes, %s, not %d; it seems they
+  // manually convert it to a string for some reason before calling sprintf.)
+  // The results screen animates this text counting up from 0 to meseta_amount.
   pstring<TextEncoding::MARKED, 0x20> meseta_reward_text;
 } __packed_ws__(G_TournamentMatchResult_Ep3_6xB4x51, 0xF4);
 
@@ -7401,4 +7454,16 @@ struct G_RejectBattleStartRequest_Ep3_6xB4x53 {
 // Requested with the GetExtendedPlayerInfo patch. Format depends on version:
 //   DC v2: PSODCV2CharacterFile
 //   GC v3: PSOGCCharacterFile::Character
-//   XB v3: PSOXBCharacterFileCharacter
+//   XB v3: PSOXBCharacterFile::Character
+
+// 6xE4: Increment enemy damage threshold
+// This command increments or decrements the amount of damage an enemy has
+// sustained. This replaces the use of total_damage in 6x0A to update enemy HP.
+
+struct G_IncrementEnemyDamage_Extension_6xE4 {
+  G_EntityIDHeader header = {0xE4, sizeof(G_IncrementEnemyDamage_Extension_6xE4) / 4, 0x0000};
+  le_int16_t hit_amount = 0;
+  le_uint16_t total_damage_before_hit = 0;
+  le_uint16_t current_hp_before_hit = 0;
+  le_uint16_t max_hp = 0;
+} __packed_ws__(G_IncrementEnemyDamage_Extension_6xE4, 0x0C);

src/CommonFileFormats.hh

@@ -5,6 +5,10 @@
 
 #include "Text.hh"
 
+constexpr double radians_for_fixed_point_angle(uint16_t angle) {
+  return static_cast<double>(angle * 2 * M_PI) / 0x10000;
+}
+
 struct VectorXZF {
   le_float x = 0.0;
   le_float z = 0.0;
@@ -34,8 +38,14 @@ struct VectorXZF {
     return ((this->x * this->x) + (this->z * this->z));
   }
 
+  inline VectorXZF rotate_y(double angle) const {
+    double s = sin(angle);
+    double c = cos(angle);
+    return VectorXZF{this->x * c - this->z * s, this->x * s + this->z * c};
+  }
+
   inline std::string str() const {
-    return phosg::string_printf("[VectorXZF x=%g z=%g]", this->x.load(), this->z.load());
+    return std::format("[VectorXZF x={:g} z={:g}]", this->x, this->z);
   }
 } __packed_ws__(VectorXZF, 0x08);
 
@@ -73,8 +83,33 @@ struct VectorXYZF {
     return ((this->x * this->x) + (this->y * this->y) + (this->z * this->z));
   }
 
+  inline VectorXYZF rotate_x(double angle) const {
+    double s = sin(angle);
+    double c = cos(angle);
+    return VectorXYZF{
+        this->x,
+        this->y * c - this->z * s,
+        this->y * s + this->z * c};
+  }
+  inline VectorXYZF rotate_y(double angle) const {
+    double s = sin(angle);
+    double c = cos(angle);
+    return VectorXYZF{
+        this->x * c + this->z * s,
+        this->y,
+        -this->x * s + this->z * c};
+  }
+  inline VectorXYZF rotate_z(double angle) const {
+    double s = sin(angle);
+    double c = cos(angle);
+    return VectorXYZF{
+        this->x * c - this->y * s,
+        this->x * s + this->y * c,
+        this->z};
+  }
+
   inline std::string str() const {
-    return phosg::string_printf("[VectorXYZF x=%g y=%g z=%g]", this->x.load(), this->y.load(), this->z.load());
+    return std::format("[VectorXYZF x={:g} y={:g} z={:g}]", this->x, this->y, this->z);
   }
 } __packed_ws__(VectorXYZF, 0x0C);
 
@@ -97,7 +132,7 @@ struct ArrayRefT {
   /* 00 */ U32T<BE> count;
   /* 04 */ U32T<BE> offset;
   /* 08 */
-} __packed__;
+} __attribute__((packed));
 using ArrayRef = ArrayRefT<false>;
 using ArrayRefBE = ArrayRefT<true>;
 check_struct_size(ArrayRef, 8);
@@ -108,12 +143,11 @@ struct RELFileFooterT {
   static constexpr bool IsBE = BE;
   // Relocations is a list of words (le_uint16_t on DC/PC/XB/BB, be_uint16_t on
   // GC) containing the number of doublewords (uint32_t) to skip for each
-  // relocation. The relocation pointer starts immediately after the
-  // checksum_size field in the header, and advances by the value of one
-  // relocation word (times 4) before each relocation. At each relocated
-  // doubleword, the address of the first byte of the code (after checksum_size)
-  // is added to the existing value.
-  // For example, if the code segment contains the following data (where R
+  // relocation. The relocation pointer starts at the beginning of the file
+  // data, and advances by the value of one relocation word (times 4) before
+  // each relocation. At each relocated doubleword, the address of the first
+  // byte of the file is added to the existing value.
+  // For example, if the file data contains the following data (where R
   // specifies doublewords to relocate):
   //   RR RR RR RR ?? ?? ?? ?? ?? ?? ?? ?? RR RR RR RR
   //   RR RR RR RR ?? ?? ?? ?? RR RR RR RR

src/CommonItemSet.cc

@@ -128,8 +128,15 @@ CommonItemSet::Table::Table(const phosg::JSON& json, Episode episode)
   for (size_t z = 0; z < 0x64; z++) {
     static const array<Episode, 3> episodes = {Episode::EP1, Episode::EP2, Episode::EP4};
     for (Episode episode : episodes) {
+      auto types = enemy_types_for_rare_table_index(episode, z);
+      vector<string> names;
+      if (types.empty()) {
+        names.emplace_back(std::format("{}:!{:02X}", abbreviation_for_episode(episode), z));
+      }
       for (auto type : enemy_types_for_rare_table_index(episode, z)) {
-        string name = phosg::string_printf("%s:%s", abbreviation_for_episode(episode), phosg::name_for_enum(type));
+        names.emplace_back(std::format("{}:{}", abbreviation_for_episode(episode), phosg::name_for_enum(type)));
+      }
+      for (const auto& name : names) {
         from_json_into(*enemy_meseta_ranges_json.at(name), this->enemy_meseta_ranges[z]);
         this->enemy_type_drop_probs[z] = enemy_type_drop_probs_json.at(name)->as_int();
         this->enemy_item_classes[z] = enemy_item_classes_json.at(name)->as_int();
@@ -163,8 +170,8 @@ void CommonItemSet::Table::print(FILE* stream) const {
   const auto& meseta_ranges = this->enemy_meseta_ranges;
   const auto& drop_probs = this->enemy_type_drop_probs;
   const auto& item_classes = this->enemy_item_classes;
-  fprintf(stream, "Enemy tables:\n");
-  fprintf(stream, "  ##   $LOW  $HIGH  DAR%%  ITEM        ENEMIES\n");
+  phosg::fwrite_fmt(stream, "Enemy tables:\n");
+  phosg::fwrite_fmt(stream, "  ##   $LOW  $HIGH  DAR%  ITEM        ENEMIES\n");
   for (size_t z = 0; z < 0x64; z++) {
     string enemies_str;
     for (EnemyType enemy_type : enemy_types_for_rare_table_index(this->episode, z)) {
@@ -174,11 +181,11 @@ void CommonItemSet::Table::print(FILE* stream) const {
       enemies_str += phosg::name_for_enum(enemy_type);
     }
     if (drop_probs[z]) {
-      fprintf(stream, "  %02zX  %5hu  %5hu  %3hhu%%  %02hX:%s  %s\n",
+      phosg::fwrite_fmt(stream, "  {:02X}  {:5}  {:5}  {:3}%  {:02X}:{}  {}\n",
           z, meseta_ranges[z].min, meseta_ranges[z].max, drop_probs[z], item_classes[z],
-          name_for_common_item_class(item_classes[z]), enemies_str.c_str());
+          name_for_common_item_class(item_classes[z]), enemies_str);
     } else {
-      fprintf(stream, "  %02zX  -----  -----    0%%  --          %s\n", z, enemies_str.c_str());
+      phosg::fwrite_fmt(stream, "  {:02X}  -----  -----    0%  --          {}\n", z, enemies_str);
     }
   }
 
@@ -196,8 +203,8 @@ void CommonItemSet::Table::print(FILE* stream) const {
       "ROD     ",
       "WAND    ",
   };
-  fprintf(stream, "Base weapon config:\n");
-  fprintf(stream, "  TYPE         PROB  [SB  AL]  FLOORS\n");
+  phosg::fwrite_fmt(stream, "Base weapon config:\n");
+  phosg::fwrite_fmt(stream, "  TYPE         PROB  [SB  AL]  FLOORS\n");
   for (size_t z = 0; z < 12; z++) {
     uint8_t floor_to_class[10];
     if (this->subtype_base_table[z] < 0) {
@@ -213,17 +220,17 @@ void CommonItemSet::Table::print(FILE* stream) const {
         floor_to_class[x] = this->subtype_base_table[z] + (x / this->subtype_area_length_table[z]);
       }
     }
-    fprintf(stream, "  %02zX:%s  %3hhu%%  [%02hhX  %02hhX]  %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX\n",
+    phosg::fwrite_fmt(stream, "  {:02X}:{}  {:3}%  [{:02X}  {:02X}]  {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X}\n",
         z, base_weapon_type_names[z], this->base_weapon_type_prob_table[z],
         this->subtype_base_table[z], this->subtype_area_length_table[z],
         floor_to_class[0], floor_to_class[1], floor_to_class[2], floor_to_class[3], floor_to_class[4],
         floor_to_class[5], floor_to_class[6], floor_to_class[7], floor_to_class[8], floor_to_class[9]);
   }
 
-  fprintf(stream, "Box configuration:\n");
-  fprintf(stream, "  AR   $LOW  $HIGH  WEP%%  ARM%%  SHD%%  UNI%%   TL%%  MST%%   NO%%\n");
+  phosg::fwrite_fmt(stream, "Box configuration:\n");
+  phosg::fwrite_fmt(stream, "  AR   $LOW  $HIGH  WEP%  ARM%  SHD%  UNI%   TL%  MST%   NO%\n");
   for (size_t z = 0; z < 10; z++) {
-    fprintf(stream, "  %02zX  %5hu  %5hu  %3hhu%%  %3hhu%%  %3hhu%%  %3hhu%%  %3hhu%%  %3hhu%%  %3hhu%%\n",
+    phosg::fwrite_fmt(stream, "  {:02X}  {:5}  {:5}  {:3}%  {:3}%  {:3}%  {:3}%  {:3}%  {:3}%  {:3}%\n",
         z, this->box_meseta_ranges[z].min, this->box_meseta_ranges[z].max,
         this->box_item_class_prob_table[0][z],
         this->box_item_class_prob_table[1][z],
@@ -234,43 +241,43 @@ void CommonItemSet::Table::print(FILE* stream) const {
         this->box_item_class_prob_table[6][z]);
   }
 
-  fprintf(stream, "Weapon drops:\n");
-  fprintf(stream, "  Grinds:\n");
-  fprintf(stream, "    GD  AR0%%  AR1%%  AR2%%  AR3%%\n");
+  phosg::fwrite_fmt(stream, "Weapon drops:\n");
+  phosg::fwrite_fmt(stream, "  Grinds:\n");
+  phosg::fwrite_fmt(stream, "    GD  AR0%  AR1%  AR2%  AR3%\n");
   for (size_t z = 0; z < 9; z++) {
-    fprintf(stream, "    +%zu  %3hhd%%  %3hhd%%  %3hhd%%  %3hhd%%\n", z,
+    phosg::fwrite_fmt(stream, "    +{}  {:3}%  {:3}%  {:3}%  {:3}%\n", z,
         this->grind_prob_table[z][0], this->grind_prob_table[z][1],
         this->grind_prob_table[z][2], this->grind_prob_table[z][3]);
   }
-  fprintf(stream, "  Bonus value table:\n");
-  fprintf(stream, "    ID");
+  phosg::fwrite_fmt(stream, "  Bonus value table:\n");
+  phosg::fwrite_fmt(stream, "    ID");
   for (int8_t v = -10; v <= 100; v += 5) {
-    fprintf(stream, "  %5hhd%%", v);
+    phosg::fwrite_fmt(stream, "  {:5}%", v);
   }
   fputc('\n', stream);
   for (size_t z = 0; z < (this->has_rare_bonus_value_prob_table ? 6 : 5); z++) {
-    fprintf(stream, "    %02zX", z);
+    phosg::fwrite_fmt(stream, "    {:02X}", z);
     for (size_t x = 0; x < 0x17; x++) {
-      fprintf(stream, "  %5hu#", this->bonus_value_prob_table[x][z]);
+      phosg::fwrite_fmt(stream, "  {:5}#", this->bonus_value_prob_table[x][z]);
     }
     fputc('\n', stream);
   }
-  fprintf(stream, "  Area config tables:\n");
-  fprintf(stream, "    AR  BONUS  SP   NO%%  NTV%%   AB%%  MAC%%  DRK%%  HIT%%  SM  SPC%%\n");
+  phosg::fwrite_fmt(stream, "  Area config tables:\n");
+  phosg::fwrite_fmt(stream, "    AR  BONUS  SP   NO%  NTV%   AB%  MAC%  DRK%  HIT%  SM  SPC%\n");
   for (size_t z = 0; z < 10; z++) {
-    fprintf(stream, "    %02zX  %02hhX %02hhX  %02hhX  %3hhu%%  %3hhu%%  %3hhu%%  %3hhu%%  %3hhu%%  %3hhu%%  %02hhX  %3hhu%%\n",
+    phosg::fwrite_fmt(stream, "    {:02X}  {:02X} {:02X}  {:02X}  {:3}%  {:3}%  {:3}%  {:3}%  {:3}%  {:3}%  {:02X}  {:3}%\n",
         z, this->nonrare_bonus_prob_spec[0][z], this->nonrare_bonus_prob_spec[1][z], this->nonrare_bonus_prob_spec[2][z],
         this->bonus_type_prob_table[0][z], this->bonus_type_prob_table[1][z], this->bonus_type_prob_table[2][z],
         this->bonus_type_prob_table[3][z], this->bonus_type_prob_table[4][z], this->bonus_type_prob_table[5][z],
         this->special_mult[z], this->special_percent[z]);
   }
 
-  fprintf(stream, "  Tool class table:\n");
-  fprintf(stream, "    CS     A1     A2     A3     A4     A5     A6     A7     A8     A9    A10\n");
+  phosg::fwrite_fmt(stream, "  Tool class table:\n");
+  phosg::fwrite_fmt(stream, "    CS     A1     A2     A3     A4     A5     A6     A7     A8     A9    A10\n");
   for (size_t tool_class = 0; tool_class < this->tool_class_prob_table.size(); tool_class++) {
-    fprintf(stream, "    %02zX", tool_class);
+    phosg::fwrite_fmt(stream, "    {:02X}", tool_class);
     for (size_t area_norm = 0; area_norm < 10; area_norm++) {
-      fprintf(stream, "  %5hu", this->tool_class_prob_table[tool_class][area_norm]);
+      phosg::fwrite_fmt(stream, "  {:5}", this->tool_class_prob_table[tool_class][area_norm]);
     }
     fputc('\n', stream);
   }
@@ -297,42 +304,158 @@ void CommonItemSet::Table::print(FILE* stream) const {
       "MEGID   ",
   };
 
-  fprintf(stream, "  Technique table:\n");
-  fprintf(stream, "    TECH                   A1            A2            A3            A4            A5            A6            A7            A8            A9           A10\n");
+  phosg::fwrite_fmt(stream, "  Technique table:\n");
+  phosg::fwrite_fmt(stream, "    TECH                   A1            A2            A3            A4            A5            A6            A7            A8            A9           A10\n");
   for (size_t tech_num = 0; tech_num < this->technique_index_prob_table.size(); tech_num++) {
-    fprintf(stream, "    %02zX:%s", tech_num, technique_names[tech_num]);
+    phosg::fwrite_fmt(stream, "    {:02X}:{}", tech_num, technique_names[tech_num]);
     for (size_t area_norm = 0; area_norm < 10; area_norm++) {
       uint16_t prob = this->technique_index_prob_table[tech_num][area_norm];
       if (prob) {
         const auto& level_range = this->technique_level_ranges[tech_num][area_norm];
         size_t min_level = level_range.min + 1;
         size_t max_level = level_range.max + 1;
-        fprintf(stream, "  %5hu[%2zu-%2zu]", prob, min_level, max_level);
+        phosg::fwrite_fmt(stream, "  {:5}[{:2}-{:2}]", prob, min_level, max_level);
       } else {
-        fprintf(stream, "      0[-----]");
+        phosg::fwrite_fmt(stream, "      0[-----]");
       }
     }
     fputc('\n', stream);
   }
 
-  fprintf(stream, "  Armor/shield type bias: %hhu\n", this->armor_or_shield_type_bias);
+  phosg::fwrite_fmt(stream, "  Armor/shield type bias: {}\n", this->armor_or_shield_type_bias);
 
-  fprintf(stream, "  Armor/shield type index table:\n");
-  fprintf(stream, "    TY  PROB\n");
+  phosg::fwrite_fmt(stream, "  Armor/shield type index table:\n");
+  phosg::fwrite_fmt(stream, "    TY  PROB\n");
   for (size_t z = 0; z < 5; z++) {
-    fprintf(stream, "    %02zX  %3hhu%%\n", z, this->armor_shield_type_index_prob_table[z]);
+    phosg::fwrite_fmt(stream, "    {:02X}  {:3}%\n", z, this->armor_shield_type_index_prob_table[z]);
   }
 
-  fprintf(stream, "  Armor/shield slot count table:\n");
-  fprintf(stream, "    #S  PROB\n");
+  phosg::fwrite_fmt(stream, "  Armor/shield slot count table:\n");
+  phosg::fwrite_fmt(stream, "    #S  PROB\n");
   for (size_t z = 0; z < 5; z++) {
-    fprintf(stream, "    %02zX  %3hhu%%\n", z, this->armor_slot_count_prob_table[z]);
+    phosg::fwrite_fmt(stream, "    {:02X}  {:3}%\n", z, this->armor_slot_count_prob_table[z]);
   }
 
-  fprintf(stream, "  Unit maximum stars table:\n");
-  fprintf(stream, "    AR   #*\n");
+  phosg::fwrite_fmt(stream, "  Unit maximum stars table:\n");
+  phosg::fwrite_fmt(stream, "    AR   #*\n");
   for (size_t z = 0; z < 10; z++) {
-    fprintf(stream, "    %02zX  %3hhu\n", z, this->unit_max_stars_table[z]);
+    phosg::fwrite_fmt(stream, "    {:02X}  {:3}\n", z, this->unit_max_stars_table[z]);
+  }
+}
+
+void CommonItemSet::Table::print_diff(FILE* stream, const Table& other) const {
+  if (this->episode != other.episode) {
+    phosg::fwrite_fmt(stream, ">   Episode: {} -> {}\n", name_for_episode(this->episode), name_for_episode(other.episode));
+  }
+  if (this->base_weapon_type_prob_table != other.base_weapon_type_prob_table) {
+    phosg::fwrite_fmt(stream, ">   base_weapon_type_prob_table: {} -> {}\n",
+        phosg::format_data_string(&this->base_weapon_type_prob_table, sizeof(this->base_weapon_type_prob_table)),
+        phosg::format_data_string(&other.base_weapon_type_prob_table, sizeof(other.base_weapon_type_prob_table)));
+  }
+  if (this->subtype_base_table != other.subtype_base_table) {
+    phosg::fwrite_fmt(stream, ">   subtype_base_table: {} -> {}\n",
+        phosg::format_data_string(&this->subtype_base_table, sizeof(this->subtype_base_table)),
+        phosg::format_data_string(&other.subtype_base_table, sizeof(other.subtype_base_table)));
+  }
+  if (this->subtype_area_length_table != other.subtype_area_length_table) {
+    phosg::fwrite_fmt(stream, ">   subtype_area_length_table: {} -> {}\n",
+        phosg::format_data_string(&this->subtype_area_length_table, sizeof(this->subtype_area_length_table)),
+        phosg::format_data_string(&other.subtype_area_length_table, sizeof(other.subtype_area_length_table)));
+  }
+  if (this->grind_prob_table != other.grind_prob_table) {
+    phosg::fwrite_fmt(stream, ">   grind_prob_table: {} -> {}\n",
+        phosg::format_data_string(&this->grind_prob_table, sizeof(this->grind_prob_table)),
+        phosg::format_data_string(&other.grind_prob_table, sizeof(other.grind_prob_table)));
+  }
+  if (this->armor_shield_type_index_prob_table != other.armor_shield_type_index_prob_table) {
+    phosg::fwrite_fmt(stream, ">   armor_shield_type_index_prob_table: {} -> {}\n",
+        phosg::format_data_string(&this->armor_shield_type_index_prob_table, sizeof(this->armor_shield_type_index_prob_table)),
+        phosg::format_data_string(&other.armor_shield_type_index_prob_table, sizeof(other.armor_shield_type_index_prob_table)));
+  }
+  if (this->armor_slot_count_prob_table != other.armor_slot_count_prob_table) {
+    phosg::fwrite_fmt(stream, ">   armor_slot_count_prob_table: {} -> {}\n",
+        phosg::format_data_string(&this->armor_slot_count_prob_table, sizeof(this->armor_slot_count_prob_table)),
+        phosg::format_data_string(&other.armor_slot_count_prob_table, sizeof(other.armor_slot_count_prob_table)));
+  }
+  if (this->enemy_meseta_ranges != other.enemy_meseta_ranges) {
+    phosg::fwrite_fmt(stream, ">   enemy_meseta_ranges: {} -> {}\n",
+        phosg::format_data_string(&this->enemy_meseta_ranges, sizeof(this->enemy_meseta_ranges)),
+        phosg::format_data_string(&other.enemy_meseta_ranges, sizeof(other.enemy_meseta_ranges)));
+  }
+  if (this->enemy_type_drop_probs != other.enemy_type_drop_probs) {
+    phosg::fwrite_fmt(stream, ">   enemy_type_drop_probs: {} -> {}\n",
+        phosg::format_data_string(&this->enemy_type_drop_probs, sizeof(this->enemy_type_drop_probs)),
+        phosg::format_data_string(&other.enemy_type_drop_probs, sizeof(other.enemy_type_drop_probs)));
+  }
+  if (this->enemy_item_classes != other.enemy_item_classes) {
+    phosg::fwrite_fmt(stream, ">   enemy_item_classes: {} -> {}\n",
+        phosg::format_data_string(&this->enemy_item_classes, sizeof(this->enemy_item_classes)),
+        phosg::format_data_string(&other.enemy_item_classes, sizeof(other.enemy_item_classes)));
+  }
+  if (this->box_meseta_ranges != other.box_meseta_ranges) {
+    phosg::fwrite_fmt(stream, ">   box_meseta_ranges: {} -> {}\n",
+        phosg::format_data_string(&this->box_meseta_ranges, sizeof(this->box_meseta_ranges)),
+        phosg::format_data_string(&other.box_meseta_ranges, sizeof(other.box_meseta_ranges)));
+  }
+  if (this->has_rare_bonus_value_prob_table != other.has_rare_bonus_value_prob_table) {
+    phosg::fwrite_fmt(stream, ">   Has rare bonus value prob table: {} -> {}\n",
+        this->has_rare_bonus_value_prob_table ? "true" : "false",
+        other.has_rare_bonus_value_prob_table ? "true" : "false");
+  }
+  if (this->bonus_value_prob_table != other.bonus_value_prob_table) {
+    phosg::fwrite_fmt(stream, ">   bonus_value_prob_table: {} -> {}\n",
+        phosg::format_data_string(&this->bonus_value_prob_table, sizeof(this->bonus_value_prob_table)),
+        phosg::format_data_string(&other.bonus_value_prob_table, sizeof(other.bonus_value_prob_table)));
+  }
+  if (this->nonrare_bonus_prob_spec != other.nonrare_bonus_prob_spec) {
+    phosg::fwrite_fmt(stream, ">   nonrare_bonus_prob_spec: {} -> {}\n",
+        phosg::format_data_string(&this->nonrare_bonus_prob_spec, sizeof(this->nonrare_bonus_prob_spec)),
+        phosg::format_data_string(&other.nonrare_bonus_prob_spec, sizeof(other.nonrare_bonus_prob_spec)));
+  }
+  if (this->bonus_type_prob_table != other.bonus_type_prob_table) {
+    phosg::fwrite_fmt(stream, ">   bonus_type_prob_table: {} -> {}\n",
+        phosg::format_data_string(&this->bonus_type_prob_table, sizeof(this->bonus_type_prob_table)),
+        phosg::format_data_string(&other.bonus_type_prob_table, sizeof(other.bonus_type_prob_table)));
+  }
+  if (this->special_mult != other.special_mult) {
+    phosg::fwrite_fmt(stream, ">   special_mult: {} -> {}\n",
+        phosg::format_data_string(&this->special_mult, sizeof(this->special_mult)),
+        phosg::format_data_string(&other.special_mult, sizeof(other.special_mult)));
+  }
+  if (this->special_percent != other.special_percent) {
+    phosg::fwrite_fmt(stream, ">   special_percent: {} -> {}\n",
+        phosg::format_data_string(&this->special_percent, sizeof(this->special_percent)),
+        phosg::format_data_string(&other.special_percent, sizeof(other.special_percent)));
+  }
+  if (this->tool_class_prob_table != other.tool_class_prob_table) {
+    phosg::fwrite_fmt(stream, ">   tool_class_prob_table: {} -> {}\n",
+        phosg::format_data_string(&this->tool_class_prob_table, sizeof(this->tool_class_prob_table)),
+        phosg::format_data_string(&other.tool_class_prob_table, sizeof(other.tool_class_prob_table)));
+  }
+  if (this->technique_index_prob_table != other.technique_index_prob_table) {
+    phosg::fwrite_fmt(stream, ">   technique_index_prob_table: {} -> {}\n",
+        phosg::format_data_string(&this->technique_index_prob_table, sizeof(this->technique_index_prob_table)),
+        phosg::format_data_string(&other.technique_index_prob_table, sizeof(other.technique_index_prob_table)));
+  }
+  if (this->technique_level_ranges != other.technique_level_ranges) {
+    phosg::fwrite_fmt(stream, ">   technique_level_ranges: {} -> {}\n",
+        phosg::format_data_string(&this->technique_level_ranges, sizeof(this->technique_level_ranges)),
+        phosg::format_data_string(&other.technique_level_ranges, sizeof(other.technique_level_ranges)));
+  }
+  if (this->armor_or_shield_type_bias != other.armor_or_shield_type_bias) {
+    phosg::fwrite_fmt(stream, ">   Armor/shield type bias: {} -> {}\n",
+        this->armor_or_shield_type_bias ? "true" : "false",
+        other.armor_or_shield_type_bias ? "true" : "false");
+  }
+  if (this->unit_max_stars_table != other.unit_max_stars_table) {
+    phosg::fwrite_fmt(stream, ">   unit_max_stars_table: {} -> {}\n",
+        phosg::format_data_string(&this->unit_max_stars_table, sizeof(this->unit_max_stars_table)),
+        phosg::format_data_string(&other.unit_max_stars_table, sizeof(other.unit_max_stars_table)));
+  }
+  if (this->box_item_class_prob_table != other.box_item_class_prob_table) {
+    phosg::fwrite_fmt(stream, ">   box_item_class_prob_table: {} -> {}\n",
+        phosg::format_data_string(&this->box_item_class_prob_table, sizeof(this->box_item_class_prob_table)),
+        phosg::format_data_string(&other.box_item_class_prob_table, sizeof(other.box_item_class_prob_table)));
   }
 }
 
@@ -343,8 +466,16 @@ phosg::JSON CommonItemSet::Table::json() const {
   for (size_t z = 0; z < 0x64; z++) {
     static const array<Episode, 3> episodes = {Episode::EP1, Episode::EP2, Episode::EP4};
     for (Episode episode : episodes) {
-      for (auto type : enemy_types_for_rare_table_index(episode, z)) {
-        string name = phosg::string_printf("%s:%s", abbreviation_for_episode(episode), phosg::name_for_enum(type));
+      auto types = enemy_types_for_rare_table_index(episode, z);
+      vector<string> names;
+      if (types.empty()) {
+        names.emplace_back(std::format("{}:!{:02X}", abbreviation_for_episode(episode), z));
+      } else {
+        for (auto type : types) {
+          names.emplace_back(std::format("{}:{}", abbreviation_for_episode(episode), phosg::name_for_enum(type)));
+        }
+      }
+      for (const auto& name : names) {
         enemy_meseta_ranges_json.emplace(name, to_json(this->enemy_meseta_ranges[z]));
         enemy_type_drop_probs_json.emplace(name, this->enemy_type_drop_probs[z]);
         enemy_item_classes_json.emplace(name, this->enemy_item_classes[z]);
@@ -413,7 +544,7 @@ void CommonItemSet::print(FILE* stream) const {
         for (uint8_t section_id = 0; section_id < 10; section_id++) {
           try {
             auto table = this->get_table(episode, mode, difficulty, section_id);
-            fprintf(stream, "============ %s %s %s %s\n",
+            phosg::fwrite_fmt(stream, "============ {} {} {} {}\n",
                 name_for_mode(mode), name_for_episode(episode), name_for_difficulty(difficulty), name_for_section_id(section_id));
             table->print(stream);
           } catch (const runtime_error&) {
@@ -424,6 +555,43 @@ void CommonItemSet::print(FILE* stream) const {
   }
 }
 
+void CommonItemSet::print_diff(FILE* stream, const CommonItemSet& other) const {
+  static const array<GameMode, 4> modes = {GameMode::NORMAL, GameMode::BATTLE, GameMode::CHALLENGE, GameMode::SOLO};
+  for (const auto& mode : modes) {
+    static const array<Episode, 3> episodes = {Episode::EP1, Episode::EP2, Episode::EP4};
+    for (const auto& episode : episodes) {
+      for (uint8_t difficulty = 0; difficulty < 4; difficulty++) {
+        for (uint8_t section_id = 0; section_id < 10; section_id++) {
+          shared_ptr<const Table> this_table;
+          shared_ptr<const Table> other_table;
+          try {
+            this_table = this->get_table(episode, mode, difficulty, section_id);
+          } catch (const runtime_error&) {
+          }
+          try {
+            other_table = other.get_table(episode, mode, difficulty, section_id);
+          } catch (const runtime_error&) {
+          }
+
+          if (!this_table && !other_table) {
+            continue;
+          } else if (!this_table) {
+            phosg::fwrite_fmt(stream, "> Table present in other but not this: {} {} {} {}\n",
+                name_for_mode(mode), name_for_episode(episode), name_for_difficulty(difficulty), name_for_section_id(section_id));
+          } else if (!other_table) {
+            phosg::fwrite_fmt(stream, "> Table present in this but not other: {} {} {} {}\n",
+                name_for_mode(mode), name_for_episode(episode), name_for_difficulty(difficulty), name_for_section_id(section_id));
+          } else if (*this_table != *other_table) {
+            phosg::fwrite_fmt(stream, "> Tables do not match: {} {} {} {}\n",
+                name_for_mode(mode), name_for_episode(episode), name_for_difficulty(difficulty), name_for_section_id(section_id));
+            this_table->print_diff(stream, *other_table);
+          }
+        }
+      }
+    }
+  }
+}
+
 CommonItemSet::Table::Table(const phosg::StringReader& r, bool is_big_endian, bool is_v3, Episode episode)
     : episode(episode) {
   if (is_big_endian) {
@@ -503,7 +671,7 @@ shared_ptr<const CommonItemSet::Table> CommonItemSet::get_table(
   try {
     return this->tables.at(this->key_for_table(episode, mode, difficulty, secid));
   } catch (const out_of_range&) {
-    throw runtime_error(phosg::string_printf("common item table not available for episode=%s, mode=%s, difficulty=%hu, secid=%hu",
+    throw runtime_error(std::format("common item table not available for episode={}, mode={}, difficulty={}, secid={}",
         name_for_episode(episode), name_for_mode(mode), difficulty, secid));
   }
 }
@@ -554,11 +722,11 @@ GSLV3V4CommonItemSet::GSLV3V4CommonItemSet(std::shared_ptr<const std::string> gs
       default:
         throw runtime_error("invalid episode");
     }
-    return phosg::string_printf(
-        "ItemPT%s%s%c%1hhu.rel",
+    return std::format(
+        "ItemPT{}{}{}{}.rel",
         is_challenge ? "c" : "",
         episode_token,
-        tolower(abbreviation_for_difficulty(difficulty)),
+        static_cast<char>(tolower(abbreviation_for_difficulty(difficulty))),
         section_id);
   };
 

src/CommonItemSet.hh

@@ -18,11 +18,17 @@ public:
     Table(const phosg::JSON& json, Episode episode);
     Table(const phosg::StringReader& r, bool big_endian, bool is_v3, Episode episode);
 
+    bool operator==(const Table& other) const = default;
+    bool operator!=(const Table& other) const = default;
+
     template <typename IntT>
     struct Range {
       IntT min;
       IntT max;
-    } __packed__;
+
+      bool operator==(const Range& other) const = default;
+      bool operator!=(const Range& other) const = default;
+    } __attribute__((packed));
 
     Episode episode;
     parray<uint8_t, 0x0C> base_weapon_type_prob_table;
@@ -50,6 +56,7 @@ public:
 
     phosg::JSON json() const;
     void print(FILE* stream) const;
+    void print_diff(FILE* stream, const Table& other) const;
 
   private:
     template <bool BE>
@@ -254,16 +261,20 @@ public:
       /* 50 */ U32T<BE> box_item_class_prob_table_offset;
 
       // There are several unused fields here.
-    } __packed__;
+    } __attribute__((packed));
     using Offsets = OffsetsT<false>;
     using OffsetsBE = OffsetsT<true>;
     check_struct_size(Offsets, 0x54);
     check_struct_size(OffsetsBE, 0x54);
   };
 
+  bool operator==(const CommonItemSet& other) const = default;
+  bool operator!=(const CommonItemSet& other) const = default;
+
   std::shared_ptr<const Table> get_table(Episode episode, GameMode mode, uint8_t difficulty, uint8_t secid) const;
   phosg::JSON json() const;
   void print(FILE* stream) const;
+  void print_diff(FILE* stream, const CommonItemSet& other) const;
 
 protected:
   CommonItemSet() = default;
@@ -311,22 +322,22 @@ struct ProbabilityTable {
     return this->items[--this->count];
   }
 
-  void shuffle(std::shared_ptr<PSOLFGEncryption> opt_rand_crypt) {
+  void shuffle(std::shared_ptr<RandomGenerator> rand_crypt) {
     for (size_t z = 1; z < this->count; z++) {
-      size_t other_z = random_from_optional_crypt(opt_rand_crypt) % (z + 1);
+      size_t other_z = rand_crypt->next() % (z + 1);
       ItemT t = this->items[z];
       this->items[z] = this->items[other_z];
       this->items[other_z] = t;
     }
   }
 
-  ItemT sample(std::shared_ptr<PSOLFGEncryption> opt_rand_crypt) const {
+  ItemT sample(std::shared_ptr<RandomGenerator> rand_crypt) const {
     if (this->count == 0) {
       throw std::runtime_error("sample from empty probability table");
     } else if (this->count == 1) {
       return this->items[0];
     } else {
-      return this->items[random_from_optional_crypt(opt_rand_crypt) % this->count];
+      return this->items[rand_crypt->next() % this->count];
     }
   }
 };
@@ -337,7 +348,7 @@ public:
   struct WeightTableEntry {
     ValueT value;
     WeightT weight;
-  } __packed__;
+  } __attribute__((packed));
 
   using WeightTableEntry8 = WeightTableEntry<uint8_t>;
   using WeightTableEntry32 = WeightTableEntry<be_uint32_t>;

src/Compression.cc

@@ -1018,7 +1018,7 @@ void prs_disassemble(FILE* stream, const void* data, size_t size) {
     uint8_t buffered_bits = cr.buffered_bits();
     if (cr.read()) {
       uint8_t literal_value = r.get_u8();
-      fprintf(stream, "[%zX] %hhu> 1    %02hhX        literal %02hhX\n",
+      phosg::fwrite_fmt(stream, "[{:X}] {}> 1    {:02X}        literal {:02X}\n",
           output_bytes, buffered_bits, literal_value, literal_value);
       output_bytes++;
 
@@ -1030,19 +1030,19 @@ void prs_disassemble(FILE* stream, const void* data, size_t size) {
         uint16_t a = (a_high << 8) | a_low;
         ssize_t offset = (a >> 3) | (~0x1FFF);
         if (offset == ~0x1FFF) {
-          fprintf(stream, "[%zX] end\n", output_bytes);
+          phosg::fwrite_fmt(stream, "[{:X}] end\n", output_bytes);
           break;
         }
         if (a & 7) {
           count = (a & 7) + 2;
           read_offset = output_bytes + offset;
-          fprintf(stream, "[%zX] %hhu> 01   %02hhX %02hhX     long copy from %zd (offset=%zX) size=%zX\n",
+          phosg::fwrite_fmt(stream, "[{:X}] {}> 01   {:02X} {:02X}     long copy from {} (offset={:X}) size={:X}\n",
               output_bytes, buffered_bits, a_low, a_high, offset, read_offset, count);
         } else {
           uint8_t count_u8 = r.get_u8();
           count = count_u8 + 1;
           read_offset = output_bytes + offset;
-          fprintf(stream, "[%zX] %hhu> 01   %02hhX %02hhX %02hhX  extended copy from %zd (offset=%zX) size=%zX\n",
+          phosg::fwrite_fmt(stream, "[{:X}] {}> 01   {:02X} {:02X} {:02X}  extended copy from {} (offset={:X}) size={:X}\n",
               output_bytes, buffered_bits, a_low, a_high, count_u8, offset, read_offset, count);
         }
 
@@ -1053,7 +1053,7 @@ void prs_disassemble(FILE* stream, const void* data, size_t size) {
         count = ((first_bit ? 2 : 0) | (second_bit ? 1 : 0)) + 2;
         ssize_t offset = offset_u8 | (~0xFF);
         read_offset = output_bytes + offset;
-        fprintf(stream, "[%zX] %hhu> 00%c%c %02hhX        short copy from %zd (offset=%zX) size=%zX\n",
+        phosg::fwrite_fmt(stream, "[{:X}] {}> 00{}{} {:02X}        short copy from {} (offset={:X}) size={:X}\n",
             output_bytes, buffered_bits, first_bit ? '1' : '0', second_bit ? '1' : '0', offset_u8, offset, read_offset, count);
       }
 
@@ -1346,11 +1346,11 @@ void bc0_disassemble(FILE* stream, const void* data, size_t size) {
       uint8_t a2 = r.get_u8();
       size_t count = (a2 & 0x0F) + 3;
       // size_t backreference_offset = a1 | ((a2 << 4) & 0xF00);
-      fprintf(stream, "[%zX] backreference %02zX\n", output_bytes, count);
+      phosg::fwrite_fmt(stream, "[{:X}] backreference {:02X}\n", output_bytes, count);
       output_bytes += count;
 
     } else {
-      fprintf(stream, "[%zX] literal %02hhX\n", output_bytes, r.get_u8());
+      phosg::fwrite_fmt(stream, "[{:X}] literal {:02X}\n", output_bytes, r.get_u8());
       output_bytes++;
     }
   }

src/DCSerialNumbers.cc

@@ -1304,7 +1304,7 @@ string generate_dc_serial_number(uint8_t domain, uint8_t subdomain) {
   size_t index2 = phosg::random_object<uint32_t>() % num_primes2;
   size_t index3 = phosg::random_object<uint32_t>() % num_primes3;
   uint32_t value = primes1[index1] * primes2[index2] * primes3[index3];
-  string s = phosg::string_printf("%08X", value);
+  string s = std::format("{:08X}", value);
 
   string ret;
   for (char ch : s) {
@@ -1336,7 +1336,7 @@ unordered_map<uint32_t, string> generate_all_dc_serial_numbers(uint8_t domain, u
   while ((serial_number = iter.next()) != 0) {
     ret[serial_number].push_back(((iter.domain << 2) & 3) | (iter.subdomain & 3));
     if (iter.index3 == 0) {
-      fprintf(stderr, "... (it) domain=%hhu subdomain=%hhu index2=%hu results=%zu (0x%zX)\n", iter.domain, iter.subdomain, iter.index2, ret.size(), ret.size());
+      phosg::fwrite_fmt(stderr, "... (it) domain={} subdomain={} index2={} results={} (0x{:X})\n", iter.domain, iter.subdomain, iter.index2, ret.size(), ret.size());
     }
   }
   return ret;
@@ -1389,14 +1389,14 @@ size_t DCSerialNumberIterator::progress() const {
 
 void dc_serial_number_speed_test(uint64_t seed) {
   uint32_t effective_seed = (seed & 0xFFFFFFFF00000000) ? phosg::random_object<uint32_t>() : seed;
-  fprintf(stderr, "Product speed test with seed=%08" PRIX32 "\n", effective_seed);
+  phosg::fwrite_fmt(stderr, "Product speed test with seed={:08X}\n", effective_seed);
   PSOV2Encryption crypt(effective_seed);
   uint64_t time_slow = 0;
   uint64_t time_fast = 0;
   size_t num_disagreements = 0;
   static constexpr size_t count = 0x1000;
   for (size_t z = 0; z < count; z++) {
-    string s = phosg::string_printf("%08X", crypt.next());
+    string s = std::format("{:08X}", crypt.next());
 
     uint64_t start = phosg::now();
     bool is_valid_fast = dc_serial_number_is_valid_fast(s, 1, 0xFF);
@@ -1407,17 +1407,17 @@ void dc_serial_number_speed_test(uint64_t seed) {
     time_slow += phosg::now() - start;
 
     if (((z & 0xF) == 0) || is_valid_slow || is_valid_fast) {
-      fprintf(stderr, "... %02zX: %s => %s %s%s\n", z, s.c_str(), is_valid_slow ? "SLOW" : "----", is_valid_fast ? "FAST" : "----", is_valid_slow != is_valid_fast ? " !!!" : "");
+      phosg::fwrite_fmt(stderr, "... {:02X}: {} => {} {}{}\n", z, s, is_valid_slow ? "SLOW" : "----", is_valid_fast ? "FAST" : "----", is_valid_slow != is_valid_fast ? " !!!" : "");
     }
     if (is_valid_fast != is_valid_slow) {
       num_disagreements++;
     }
   }
 
-  fprintf(stderr, "Total time (slow): %" PRId64 " usecs (%" PRIu64 " per serial number)\n", time_slow, time_slow / count);
-  fprintf(stderr, "Total time (fast): %" PRId64 " usecs (%" PRIu64 " per serial number)\n", time_fast, time_fast / count);
-  fprintf(stderr, "Fast vs. slow speedup: %zux\n", static_cast<size_t>(time_slow / time_fast));
-  fprintf(stderr, "Disagreements: %zu\n", num_disagreements);
+  phosg::fwrite_fmt(stderr, "Total time (slow): {} usecs ({} per serial number)\n", time_slow, time_slow / count);
+  phosg::fwrite_fmt(stderr, "Total time (fast): {} usecs ({} per serial number)\n", time_fast, time_fast / count);
+  phosg::fwrite_fmt(stderr, "Fast vs. slow speedup: {}x\n", static_cast<size_t>(time_slow / time_fast));
+  phosg::fwrite_fmt(stderr, "Disagreements: {}\n", num_disagreements);
 }
 
 string decrypt_dp_address_jpn(
@@ -1480,7 +1480,7 @@ std::string crypt_dp_address_jpn_simple(const std::string& data, int64_t mask_ke
     if (mask_key < 0) {
       throw runtime_error("cannot determine mask key");
     }
-    phosg::log_info("Determined %08" PRIX64 " to be the most likely mask key", mask_key);
+    phosg::log_info_f("Determined {:08X} to be the most likely mask key", mask_key);
     r.go(0);
   }
 

src/DNSServer.cc

@@ -1,7 +1,5 @@
 #include "DNSServer.hh"
 
-#include <netinet/in.h>
-#include <poll.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -14,48 +12,23 @@
 
 #include "Loggers.hh"
 #include "NetworkAddresses.hh"
+#include "ServerState.hh"
 
 using namespace std;
 
-DNSServer::DNSServer(
-    shared_ptr<struct event_base> base,
-    uint32_t local_connect_address,
-    uint32_t external_connect_address,
-    shared_ptr<const IPV4RangeSet> banned_ipv4_ranges)
-    : base(base),
-      local_connect_address(local_connect_address),
-      external_connect_address(external_connect_address),
-      banned_ipv4_ranges(banned_ipv4_ranges) {}
-
-DNSServer::~DNSServer() {
-  for (const auto& it : this->fd_to_receive_event) {
-    close(it.first);
-  }
-}
-
-void DNSServer::listen(const std::string& socket_path) {
-  this->add_socket(phosg::listen(socket_path, 0, 0));
-}
+DNSServer::DNSServer(shared_ptr<ServerState> state)
+    : state(state) {}
 
 void DNSServer::listen(const std::string& addr, int port) {
-  this->add_socket(phosg::listen(addr, port, 0));
-}
+  if (port == 0) {
+    throw std::runtime_error("Listening port cannot be zero");
+  }
+  asio::ip::address asio_addr = addr.empty() ? asio::ip::address_v4::any() : asio::ip::make_address(addr);
+  asio::ip::udp::endpoint endpoint(asio_addr, port);
+  auto sock = make_shared<asio::ip::udp::socket>(*this->state->io_context, endpoint);
+  this->sockets.emplace(sock);
 
-void DNSServer::listen(int port) {
-  this->add_socket(phosg::listen("", port, 0));
-}
-
-void DNSServer::add_socket(int fd) {
-  unique_ptr<struct event, void (*)(struct event*)> e(
-      event_new(this->base.get(), fd, EV_READ | EV_PERSIST, &DNSServer::dispatch_on_receive_message, this),
-      event_free);
-  event_add(e.get(), nullptr);
-  this->fd_to_receive_event.emplace(fd, std::move(e));
-}
-
-void DNSServer::dispatch_on_receive_message(evutil_socket_t fd,
-    short events, void* ctx) {
-  reinterpret_cast<DNSServer*>(ctx)->on_receive_message(fd, events);
+  asio::co_spawn(*this->state->io_context, this->dns_server_task(sock), asio::detached);
 }
 
 string DNSServer::response_for_query(const void* vdata, size_t size, uint32_t resolved_address) {
@@ -77,45 +50,27 @@ string DNSServer::response_for_query(const void* vdata, size_t size, uint32_t re
   return response;
 }
 
-string DNSServer::response_for_query(
-    const string& query, uint32_t resolved_address) {
+string DNSServer::response_for_query(const string& query, uint32_t resolved_address) {
   return DNSServer::response_for_query(query.data(), query.size(), resolved_address);
 }
 
-void DNSServer::on_receive_message(int fd, short) {
+asio::awaitable<void> DNSServer::dns_server_task(std::shared_ptr<asio::ip::udp::socket> sock) {
   for (;;) {
-    struct sockaddr_storage remote;
-    socklen_t remote_size = sizeof(sockaddr_in);
-    memset(&remote, 0, remote_size);
-
     string input(2048, 0);
-    ssize_t bytes = recvfrom(fd, const_cast<char*>(input.data()), input.size(),
-        0, reinterpret_cast<sockaddr*>(&remote), &remote_size);
+    asio::ip::udp::endpoint sender_ep;
+    size_t bytes = co_await sock->async_receive_from(asio::buffer(input), sender_ep, asio::use_awaitable);
+    uint32_t sender_addr = ipv4_addr_for_asio_addr(sender_ep.address());
 
-    if (bytes < 0) {
-      if (errno != EAGAIN) {
-        dns_server_log.error("input error %d", errno);
-        throw runtime_error("cannot read from udp socket");
-      }
-      break;
-
-    } else if (bytes == 0) {
-      break;
-
-    } else if (bytes < 0x0C) {
-      dns_server_log.warning("input query too small");
+    if (bytes < 0x0C) {
+      dns_server_log.warning_f("input query too small");
       phosg::print_data(stderr, input.data(), bytes);
-
-    } else if (!this->banned_ipv4_ranges->check(remote)) {
+    } else if (!this->state->banned_ipv4_ranges->check(sender_addr)) {
       input.resize(bytes);
-      const sockaddr_in* remote_sin = reinterpret_cast<const sockaddr_in*>(&remote);
-      uint32_t remote_address = ntohl(remote_sin->sin_addr.s_addr);
-      uint32_t connect_address = is_local_address(remote_address)
-          ? this->local_connect_address
-          : this->external_connect_address;
+      uint32_t connect_address = is_local_address(sender_addr)
+          ? this->state->local_address
+          : this->state->external_address;
       string response = this->response_for_query(input, connect_address);
-      sendto(fd, response.data(), response.size(), 0,
-          reinterpret_cast<const sockaddr*>(&remote), remote_size);
+      co_await sock->async_send_to(asio::buffer(response.data(), response.size()), sender_ep, asio::use_awaitable);
     }
   }
 }

src/DNSServer.hh

@@ -1,7 +1,6 @@
 #pragma once
 
-#include <event2/event.h>
-
+#include <asio.hpp>
 #include <memory>
 #include <set>
 #include <string>
@@ -9,36 +8,25 @@
 
 #include "IPV4RangeSet.hh"
 
+struct ServerState;
+
 class DNSServer {
 public:
-  DNSServer(
-      std::shared_ptr<struct event_base> base,
-      uint32_t local_connect_address,
-      uint32_t external_connect_address,
-      std::shared_ptr<const IPV4RangeSet> banned_ipv4_ranges);
+  explicit DNSServer(std::shared_ptr<ServerState> state);
   DNSServer(const DNSServer&) = delete;
   DNSServer(DNSServer&&) = delete;
-  virtual ~DNSServer();
+  DNSServer& operator=(const DNSServer&) = delete;
+  DNSServer& operator=(DNSServer&&) = delete;
+  virtual ~DNSServer() = default;
 
-  inline void set_banned_ipv4_ranges(std::shared_ptr<const IPV4RangeSet> banned_ipv4_ranges) {
-    this->banned_ipv4_ranges = banned_ipv4_ranges;
-  }
-
-  void listen(const std::string& socket_path);
   void listen(const std::string& addr, int port);
-  void listen(int port);
-  void add_socket(int fd);
 
   static std::string response_for_query(const void* vdata, size_t size, uint32_t resolved_address);
   static std::string response_for_query(const std::string& query, uint32_t resolved_address);
 
 private:
-  std::shared_ptr<struct event_base> base;
-  std::unordered_map<int, std::unique_ptr<struct event, void (*)(struct event*)>> fd_to_receive_event;
-  uint32_t local_connect_address;
-  uint32_t external_connect_address;
-  std::shared_ptr<const IPV4RangeSet> banned_ipv4_ranges;
+  std::shared_ptr<ServerState> state;
+  std::unordered_set<std::shared_ptr<asio::ip::udp::socket>> sockets;
 
-  static void dispatch_on_receive_message(evutil_socket_t fd, short events, void* ctx);
-  void on_receive_message(int fd, short event);
+  asio::awaitable<void> dns_server_task(std::shared_ptr<asio::ip::udp::socket> sock);
 };

src/DownloadSession.cc

@@ -1,13 +1,7 @@
 #include "DownloadSession.hh"
 
-#include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>
-#include <event2/buffer.h>
-#include <event2/bufferevent.h>
-#include <event2/event.h>
-#include <event2/listener.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -24,7 +18,6 @@
 
 #include "Loggers.hh"
 #include "PSOProtocol.hh"
-#include "ProxyCommands.hh"
 #include "ReceiveCommands.hh"
 #include "ReceiveSubcommands.hh"
 #include "SendCommands.hh"
@@ -42,8 +35,9 @@ static string random_name() {
 }
 
 DownloadSession::DownloadSession(
-    std::shared_ptr<struct event_base> base,
-    const struct sockaddr_storage& remote,
+    std::shared_ptr<asio::io_context> io_context,
+    const std::string& remote_host,
+    uint16_t remote_port,
     const std::string& output_dir,
     Version version,
     uint8_t language,
@@ -61,10 +55,15 @@ DownloadSession::DownloadSession(
     const std::vector<std::string>& on_request_complete_commands,
     bool interactive,
     bool show_command_data)
-    : output_dir(output_dir),
+    : remote_host(remote_host),
+      remote_port(remote_port),
+      output_dir(output_dir),
+      version(version),
+      language(language),
+      show_command_data(show_command_data),
       bb_key_file(bb_key_file),
-      serial_number2(serial_number2),
       serial_number(serial_number),
+      serial_number2(serial_number2),
       access_key(access_key),
       username(username),
       password(password),
@@ -75,33 +74,16 @@ DownloadSession::DownloadSession(
       ship_menu_selections(ship_menu_selections),
       on_request_complete_commands(on_request_complete_commands),
       interactive(interactive),
-      log(phosg::string_printf("[DownloadSession:%s] ", phosg::name_for_enum(version)), proxy_server_log.min_level),
-      base(base),
-      channel(
-          version,
-          language,
-          DownloadSession::dispatch_on_channel_input,
-          DownloadSession::dispatch_on_channel_error,
-          this,
-          phosg::render_sockaddr_storage(remote),
-          show_command_data ? phosg::TerminalFormat::FG_GREEN : phosg::TerminalFormat::END,
-          show_command_data ? phosg::TerminalFormat::FG_YELLOW : phosg::TerminalFormat::END),
-      hardware_id(generate_random_hardware_id(this->channel.version)),
-      guild_card_number(0),
+      log(std::format("[DownloadSession:{}] ", phosg::name_for_enum(version)), proxy_server_log.min_level),
+      io_context(io_context),
+      hardware_id(generate_random_hardware_id(version)),
       prev_cmd_data(0),
-      client_config(0),
-      sent_96(false),
-      should_request_category_list(true),
-      current_request(0),
-      current_game_config_index(0),
-      in_game(false),
-      bin_complete(false),
-      dat_complete(false) {
+      client_config(0) {
   if (this->output_dir.empty()) {
     this->output_dir = ".";
   }
 
-  switch (this->channel.version) {
+  switch (version) {
     case Version::DC_V1:
     case Version::DC_V2:
       if (this->serial_number2 == 0 || this->serial_number == 0 || this->access_key.empty()) {
@@ -132,106 +114,102 @@ DownloadSession::DownloadSession(
       throw runtime_error("unsupported version");
   }
 
-  this->character->inventory.language = this->channel.language;
-
-  if (remote.ss_family != AF_INET) {
-    throw runtime_error("remote is not AF_INET");
-  }
-
-  string netloc_str = phosg::render_sockaddr_storage(remote);
-  this->log.info("Connecting to %s", netloc_str.c_str());
-
-  struct bufferevent* bev = bufferevent_socket_new(
-      this->base.get(), -1, BEV_OPT_CLOSE_ON_FREE | BEV_OPT_DEFER_CALLBACKS);
-  if (!bev) {
-    throw runtime_error(phosg::string_printf("failed to open socket (%d)", EVUTIL_SOCKET_ERROR()));
-  }
-  this->channel.set_bufferevent(bev, 0);
-
-  if (bufferevent_socket_connect(this->channel.bev.get(),
-          reinterpret_cast<const sockaddr*>(&remote), sizeof(struct sockaddr_in)) != 0) {
-    throw runtime_error(phosg::string_printf("failed to connect (%d)", EVUTIL_SOCKET_ERROR()));
-  }
+  this->character->inventory.language = language;
 }
 
-void DownloadSession::dispatch_on_channel_input(Channel& ch, uint16_t command, uint32_t flag, std::string& data) {
-  auto* session = reinterpret_cast<DownloadSession*>(ch.context_obj);
-  session->on_channel_input(command, flag, data);
+asio::awaitable<void> DownloadSession::run() {
+  string netloc_str = std::format("{}:{}", this->remote_host, this->remote_port);
+  this->log.info_f("Connecting to {}", netloc_str);
+  auto sock = make_unique<asio::ip::tcp::socket>(co_await async_connect_tcp(this->remote_host, this->remote_port));
+  this->channel = SocketChannel::create(
+      this->io_context,
+      std::move(sock),
+      this->version,
+      this->language,
+      netloc_str,
+      this->show_command_data ? phosg::TerminalFormat::FG_GREEN : phosg::TerminalFormat::END,
+      this->show_command_data ? phosg::TerminalFormat::FG_YELLOW : phosg::TerminalFormat::END);
+  this->log.info_f("Server channel connected");
+
+  while (this->channel->connected()) {
+    auto msg = co_await this->channel->recv();
+    co_await this->on_message(msg);
+  }
 }
 
 void DownloadSession::send_93_9D_9E(bool extended) {
-  if (is_v1(this->channel.version)) {
+  if (is_v1(this->version)) {
     C_LoginExtendedV1_DC_93 ret;
     ret.player_tag = this->guild_card_number ? 0xFFFF0000 : 0x00010000;
     ret.guild_card_number = this->guild_card_number;
     ret.hardware_id = this->hardware_id;
-    ret.sub_version = default_sub_version_for_version(this->channel.version);
+    ret.sub_version = default_sub_version_for_version(this->version);
     ret.is_extended = extended ? 1 : 0;
-    ret.language = this->channel.language;
-    ret.serial_number.encode(phosg::string_printf("%08" PRIX32, this->serial_number));
+    ret.language = this->language;
+    ret.serial_number.encode(std::format("{:08X}", this->serial_number));
     ret.access_key.encode(this->access_key);
-    ret.serial_number2.encode(phosg::string_printf("%08" PRIX32, this->serial_number2));
-    ret.name.encode(this->character->disp.name.decode());
-    this->channel.send(0x93, 0x01, &ret, extended ? sizeof(ret) : sizeof(C_LoginV1_DC_93));
+    ret.serial_number2.encode(std::format("{:08X}", this->serial_number2));
+    ret.login_character_name.encode(this->character->disp.name.decode());
+    this->channel->send(0x93, 0x01, &ret, extended ? sizeof(ret) : sizeof(C_LoginV1_DC_93));
 
-  } else if (is_v2(this->channel.version)) {
+  } else if (is_v2(this->version)) {
     C_LoginExtended_PC_9D ret;
     ret.player_tag = this->guild_card_number ? 0xFFFF0000 : 0x00010000;
     ret.guild_card_number = this->guild_card_number;
     ret.hardware_id = this->hardware_id;
-    ret.sub_version = default_sub_version_for_version(this->channel.version);
+    ret.sub_version = default_sub_version_for_version(this->version);
     ret.is_extended = extended ? 1 : 0;
-    ret.language = this->channel.language;
-    ret.serial_number.encode(phosg::string_printf("%08" PRIX32, this->serial_number));
+    ret.language = this->language;
+    ret.serial_number.encode(std::format("{:08X}", this->serial_number));
     ret.access_key.encode(this->access_key);
     ret.serial_number2 = ret.serial_number;
     ret.access_key2 = ret.access_key;
-    ret.name.encode(this->character->disp.name.decode());
+    ret.login_character_name.encode(this->character->disp.name.decode());
     size_t data_size = extended
-        ? ((this->channel.version == Version::PC_V2) ? sizeof(ret) : sizeof(C_LoginExtended_DC_GC_9D))
+        ? ((this->version == Version::PC_V2) ? sizeof(ret) : sizeof(C_LoginExtended_DC_GC_9D))
         : sizeof(C_Login_DC_PC_GC_9D);
-    this->channel.send(0x9D, 0x01, &ret, data_size);
+    this->channel->send(0x9D, 0x01, &ret, data_size);
 
-  } else if (this->channel.version == Version::GC_V3) {
+  } else if (this->version == Version::GC_V3) {
     C_LoginExtended_GC_9E ret;
     ret.player_tag = this->guild_card_number ? 0xFFFF0000 : 0x00010000;
     ret.guild_card_number = this->guild_card_number;
     ret.hardware_id = this->hardware_id;
-    ret.sub_version = default_sub_version_for_version(this->channel.version);
+    ret.sub_version = default_sub_version_for_version(this->version);
     ret.is_extended = extended ? 1 : 0;
-    ret.language = this->channel.language;
-    ret.serial_number.encode(phosg::string_printf("%08" PRIX32, this->serial_number));
+    ret.language = this->language;
+    ret.serial_number.encode(std::format("{:08X}", this->serial_number));
     ret.access_key.encode(this->access_key);
     ret.serial_number2 = ret.serial_number;
     ret.access_key2 = ret.access_key;
-    ret.name.encode(this->character->disp.name.decode());
+    ret.login_character_name.encode(this->character->disp.name.decode());
     ret.client_config = this->client_config;
-    this->channel.send(0x9E, 0x01, &ret, extended ? sizeof(ret) : sizeof(C_Login_GC_9E));
+    this->channel->send(0x9E, 0x01, &ret, extended ? sizeof(ret) : sizeof(C_Login_PC_GC_9E));
 
-  } else if (this->channel.version == Version::XB_V3) {
+  } else if (this->version == Version::XB_V3) {
     C_LoginExtended_XB_9E ret;
     ret.player_tag = this->guild_card_number ? 0xFFFF0000 : 0x00010000;
     ret.guild_card_number = this->guild_card_number;
     ret.hardware_id = this->hardware_id;
-    ret.sub_version = default_sub_version_for_version(this->channel.version);
+    ret.sub_version = default_sub_version_for_version(this->version);
     ret.is_extended = extended ? 1 : 0;
-    ret.language = this->channel.language;
+    ret.language = this->language;
     ret.serial_number.encode(this->xb_gamertag);
-    ret.access_key.encode(phosg::string_printf("%016" PRIX64, this->xb_user_id));
+    ret.access_key.encode(std::format("{:016X}", this->xb_user_id));
     ret.serial_number2 = ret.serial_number;
     ret.access_key2 = ret.access_key;
-    ret.name.encode(this->character->disp.name.decode());
-    ret.netloc.internal_ipv4_address = phosg::random_object<uint32_t>();
-    ret.netloc.external_ipv4_address = phosg::random_object<uint32_t>();
-    ret.netloc.port = 9500;
-    phosg::random_data(&ret.netloc.mac_address, sizeof(ret.netloc.mac_address));
-    ret.netloc.sg_ip_address = phosg::random_object<uint32_t>();
-    ret.netloc.spi = phosg::random_object<uint32_t>();
-    ret.netloc.account_id = this->xb_account_id;
-    ret.netloc.unknown_a3.clear(0);
+    ret.login_character_name.encode(this->character->disp.name.decode());
+    ret.xb_netloc.internal_ipv4_address = phosg::random_object<uint32_t>();
+    ret.xb_netloc.external_ipv4_address = phosg::random_object<uint32_t>();
+    ret.xb_netloc.port = 9500;
+    phosg::random_data(&ret.xb_netloc.mac_address, sizeof(ret.xb_netloc.mac_address));
+    ret.xb_netloc.sg_ip_address = phosg::random_object<uint32_t>();
+    ret.xb_netloc.spi = phosg::random_object<uint32_t>();
+    ret.xb_netloc.account_id = this->xb_account_id;
+    ret.xb_netloc.unknown_a3.clear(0);
     ret.xb_user_id_high = this->xb_user_id >> 32;
     ret.xb_user_id_low = this->xb_user_id;
-    this->channel.send(0x9E, 0x01, &ret, extended ? sizeof(ret) : sizeof(C_Login_DC_PC_GC_9D));
+    this->channel->send(0x9E, 0x01, &ret, extended ? sizeof(ret) : sizeof(C_Login_DC_PC_GC_9D));
 
   } else {
     throw runtime_error("unsupported version");
@@ -241,31 +219,31 @@ void DownloadSession::send_93_9D_9E(bool extended) {
 void DownloadSession::send_61_98(bool is_98) {
   uint8_t command = is_98 ? 0x98 : 0x61;
 
-  if (is_v1(this->channel.version)) {
+  if (is_v1(this->version)) {
     C_CharacterData_DCv1_61_98 ret;
     ret.inventory = this->character->inventory;
     ret.disp = convert_player_disp_data<PlayerDispDataDCPCV3, PlayerDispDataBB>(this->character->disp, 1, 1);
-    this->channel.send(command, 0x01, ret);
+    this->channel->send(command, 0x01, ret);
 
-  } else if (this->channel.version == Version::DC_V2) {
+  } else if (this->version == Version::DC_V2) {
     C_CharacterData_DCv2_61_98 ret;
     ret.inventory = this->character->inventory;
     ret.disp = convert_player_disp_data<PlayerDispDataDCPCV3, PlayerDispDataBB>(this->character->disp, 1, 1);
     ret.records.challenge = this->character->challenge_records;
     ret.records.battle = this->character->battle_records;
     ret.choice_search_config = this->character->choice_search_config;
-    this->channel.send(command, 0x02, ret);
+    this->channel->send(command, 0x02, ret);
 
-  } else if (this->channel.version == Version::PC_V2) {
+  } else if (this->version == Version::PC_V2) {
     C_CharacterData_PC_61_98 ret;
     ret.inventory = this->character->inventory;
     ret.disp = convert_player_disp_data<PlayerDispDataDCPCV3, PlayerDispDataBB>(this->character->disp, 1, 1);
     ret.records.challenge = this->character->challenge_records;
     ret.records.battle = this->character->battle_records;
     ret.choice_search_config = this->character->choice_search_config;
-    this->channel.send(command, 0x02, ret);
+    this->channel->send(command, 0x02, ret);
 
-  } else if (is_v3(this->channel.version)) {
+  } else if (is_v3(this->version)) {
     C_CharacterData_V3_61_98 ret;
     ret.inventory = this->character->inventory;
     ret.disp = convert_player_disp_data<PlayerDispDataDCPCV3, PlayerDispDataBB>(this->character->disp, 1, 1);
@@ -273,9 +251,9 @@ void DownloadSession::send_61_98(bool is_98) {
     ret.records.battle = this->character->battle_records;
     ret.choice_search_config = this->character->choice_search_config;
     ret.info_board.encode(this->character->info_board.decode());
-    this->channel.send(command, 0x03, ret);
+    this->channel->send(command, 0x03, ret);
 
-  } else if (this->channel.version == Version::BB_V4) {
+  } else if (this->version == Version::BB_V4) {
     C_CharacterData_BB_61_98 ret;
     ret.inventory = this->character->inventory;
     ret.disp = this->character->disp;
@@ -283,34 +261,30 @@ void DownloadSession::send_61_98(bool is_98) {
     ret.records.battle = this->character->battle_records;
     ret.choice_search_config = this->character->choice_search_config;
     ret.info_board.encode(this->character->info_board.decode());
-    this->channel.send(command, 0x04, ret);
+    this->channel->send(command, 0x04, ret);
 
   } else {
     throw runtime_error("unsupported version");
   }
 }
 
-void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::string& data) {
-  // TODO: Use the iovec form of print_data here instead of
-  // prepend_command_header (which copies the string)
-  string full_cmd = prepend_command_header(this->channel.version, this->channel.crypt_in.get(), command, flag, data);
-
-  for (size_t z = 0; z < 0x28 && z < data.size(); z++) {
-    this->prev_cmd_data[z] = data[z];
+asio::awaitable<void> DownloadSession::on_message(Channel::Message& msg) {
+  for (size_t z = 0; z < 0x28 && z < msg.data.size(); z++) {
+    this->prev_cmd_data[z] = msg.data[z];
   }
 
-  switch (command) {
+  switch (msg.command) {
     case 0x03: {
-      if (this->channel.version != Version::BB_V4) {
+      if (this->version != Version::BB_V4) {
         throw runtime_error("BB server sent non-BB encryption command");
       }
       if (!this->bb_key_file) {
         throw runtime_error("BB encryption requires a key file");
       }
-      const auto& cmd = check_size_t<S_ServerInitDefault_BB_03_9B>(data, 0xFFFF);
-      this->channel.crypt_in = make_shared<PSOBBEncryption>(*this->bb_key_file, &cmd.server_key[0], sizeof(cmd.server_key));
-      this->channel.crypt_out = make_shared<PSOBBEncryption>(*this->bb_key_file, &cmd.client_key[0], sizeof(cmd.client_key));
-      this->log.info("Enabled BB encryption");
+      const auto& cmd = msg.check_size_t<S_ServerInitDefault_BB_03_9B>(0xFFFF);
+      this->channel->crypt_in = make_shared<PSOBBEncryption>(*this->bb_key_file, &cmd.server_key[0], sizeof(cmd.server_key));
+      this->channel->crypt_out = make_shared<PSOBBEncryption>(*this->bb_key_file, &cmd.client_key[0], sizeof(cmd.client_key));
+      this->log.info_f("Enabled BB encryption");
       throw runtime_error("not yet implemented"); // Send 93
       break;
     }
@@ -319,54 +293,54 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
     case 0x17:
     case 0x91:
     case 0x9B: {
-      const auto& cmd = check_size_t<S_ServerInitDefault_DC_PC_V3_02_17_91_9B>(data, 0xFFFF);
-      if (uses_v3_encryption(this->channel.version)) {
-        this->channel.crypt_in = make_shared<PSOV3Encryption>(cmd.server_key);
-        this->channel.crypt_out = make_shared<PSOV3Encryption>(cmd.client_key);
-        this->log.info("Enabled V3 encryption (server key %08" PRIX32 ", client key %08" PRIX32 ")",
-            cmd.server_key.load(), cmd.client_key.load());
-      } else if (!uses_v4_encryption(this->channel.version)) {
-        this->channel.crypt_in = make_shared<PSOV2Encryption>(cmd.server_key);
-        this->channel.crypt_out = make_shared<PSOV2Encryption>(cmd.client_key);
-        this->log.info("Enabled V2 encryption (server key %08" PRIX32 ", client key %08" PRIX32 ")",
-            cmd.server_key.load(), cmd.client_key.load());
+      const auto& cmd = msg.check_size_t<S_ServerInitDefault_DC_PC_V3_02_17_91_9B>(0xFFFF);
+      if (uses_v3_encryption(this->version)) {
+        this->channel->crypt_in = make_shared<PSOV3Encryption>(cmd.server_key);
+        this->channel->crypt_out = make_shared<PSOV3Encryption>(cmd.client_key);
+        this->log.info_f("Enabled V3 encryption (server key {:08X}, client key {:08X})",
+            cmd.server_key, cmd.client_key);
+      } else if (!uses_v4_encryption(this->version)) {
+        this->channel->crypt_in = make_shared<PSOV2Encryption>(cmd.server_key);
+        this->channel->crypt_out = make_shared<PSOV2Encryption>(cmd.client_key);
+        this->log.info_f("Enabled V2 encryption (server key {:08X}, client key {:08X})",
+            cmd.server_key, cmd.client_key);
       } else {
         throw runtime_error("BB server sent non-BB encryption command");
       }
 
-      if (command == 0x02) {
-        bool is_extended = (this->channel.version == Version::XB_V3);
+      if (msg.command == 0x02) {
+        bool is_extended = (this->version == Version::XB_V3);
         this->send_93_9D_9E(is_extended);
 
       } else {
-        if (is_v1(this->channel.version)) {
+        if (is_v1(this->version)) {
           C_LoginV1_DC_PC_V3_90 ret;
-          ret.serial_number.encode(phosg::string_printf("%08" PRIX32, this->serial_number));
+          ret.serial_number.encode(std::format("{:08X}", this->serial_number));
           ret.access_key.encode(this->access_key);
-          this->channel.send(0x90, 0x00, ret);
+          this->channel->send(0x90, 0x00, ret);
 
-        } else if (is_v2(this->channel.version)) {
+        } else if (is_v2(this->version)) {
           C_Login_DC_PC_V3_9A ret;
-          ret.serial_number.encode(phosg::string_printf("%08" PRIX32, this->serial_number));
+          ret.serial_number.encode(std::format("{:08X}", this->serial_number));
           ret.access_key.encode(this->access_key);
           ret.player_tag = this->guild_card_number ? 0xFFFF0000 : 0x00010000;
           ret.guild_card_number = this->guild_card_number;
-          ret.sub_version = default_sub_version_for_version(this->channel.version);
+          ret.sub_version = default_sub_version_for_version(this->version);
           ret.serial_number2 = ret.serial_number;
           ret.access_key2 = ret.access_key;
-          this->channel.send(0x9A, 0x00, ret);
+          this->channel->send(0x9A, 0x00, ret);
 
-        } else if (this->channel.version == Version::GC_V3) {
+        } else if (this->version == Version::GC_V3) {
           C_VerifyAccount_V3_DB ret;
-          ret.serial_number.encode(phosg::string_printf("%08" PRIX32, this->serial_number));
+          ret.serial_number.encode(std::format("{:08X}", this->serial_number));
           ret.access_key.encode(this->access_key);
-          ret.sub_version = default_sub_version_for_version(this->channel.version);
+          ret.sub_version = default_sub_version_for_version(this->version);
           ret.serial_number2 = ret.serial_number;
           ret.access_key2 = ret.access_key;
           ret.password.encode(this->password);
-          this->channel.send(0xDB, 0x00, ret);
+          this->channel->send(0xDB, 0x00, ret);
 
-        } else if (this->channel.version == Version::XB_V3) {
+        } else if (this->version == Version::XB_V3) {
           this->send_93_9D_9E(true);
 
         } else {
@@ -379,36 +353,36 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
 
     case 0x90:
     case 0x9A: {
-      if (flag == 1) {
-        if (is_v1(this->channel.version)) {
+      if (msg.flag == 1) {
+        if (is_v1(this->version)) {
           C_RegisterV1_DC_92 ret;
           ret.hardware_id = this->hardware_id;
-          ret.sub_version = default_sub_version_for_version(this->channel.version);
-          ret.language = this->channel.language;
-          ret.serial_number2.encode(phosg::string_printf("%08" PRIX32, this->serial_number2));
-          this->channel.send(0x92, 0x00, ret);
+          ret.sub_version = default_sub_version_for_version(this->version);
+          ret.language = this->language;
+          ret.serial_number2.encode(std::format("{:08X}", this->serial_number2));
+          this->channel->send(0x92, 0x00, ret);
 
-        } else if (!is_v4(this->channel.version)) {
+        } else if (!is_v4(this->version)) {
           C_Register_DC_PC_V3_9C ret;
           ret.hardware_id = this->hardware_id;
-          ret.sub_version = default_sub_version_for_version(this->channel.version);
-          ret.language = this->channel.language;
-          if (this->channel.version == Version::XB_V3) {
+          ret.sub_version = default_sub_version_for_version(this->version);
+          ret.language = this->language;
+          if (this->version == Version::XB_V3) {
             ret.serial_number.encode(this->xb_gamertag);
-            ret.access_key.encode(phosg::string_printf("%016" PRIX64, this->xb_user_id));
+            ret.access_key.encode(std::format("{:016X}", this->xb_user_id));
             ret.password.encode("xbox-pso");
           } else {
-            ret.serial_number.encode(phosg::string_printf("%08" PRIX32, this->serial_number));
+            ret.serial_number.encode(std::format("{:08X}", this->serial_number));
             ret.access_key.encode(this->access_key);
             ret.password.encode(this->password);
           }
-          this->channel.send(0x9C, 0x00, ret);
+          this->channel->send(0x9C, 0x00, ret);
 
         } else {
           throw runtime_error("unsupported version");
         }
 
-      } else if (flag == 0 || flag == 2) {
+      } else if (msg.flag == 0 || msg.flag == 2) {
         this->send_93_9D_9E(true);
 
       } else {
@@ -419,17 +393,17 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
 
     case 0x92:
     case 0x9C:
-      if (flag == 0) {
+      if (msg.flag == 0) {
         throw runtime_error("server rejected login credentials");
       }
       this->send_93_9D_9E(true);
       break;
 
     case 0x9F: {
-      if (is_v1_or_v2(this->channel.version)) {
+      if (is_v1_or_v2(this->version)) {
         throw runtime_error("invalid command");
       }
-      this->channel.send(0x9F, 0x00, this->client_config);
+      this->channel->send(0x9F, 0x00, this->client_config);
       break;
     }
 
@@ -437,16 +411,16 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
       C_ExecuteCodeResult_B3 ret;
       ret.checksum = 0;
       ret.return_value = 0;
-      this->channel.send(0xB3, 0x00, ret);
+      this->channel->send(0xB3, 0x00, ret);
       break;
     }
 
     case 0x04: {
-      const auto& cmd = check_size_t<S_UpdateClientConfig_V3_04>(data, 0x08, sizeof(S_UpdateClientConfig_V3_04));
-      if (!is_v1_or_v2(this->channel.version)) {
+      const auto& cmd = msg.check_size_t<S_UpdateClientConfig_V3_04>(0x08, sizeof(S_UpdateClientConfig_V3_04));
+      if (!is_v1_or_v2(this->version)) {
         for (size_t z = 0; z < 0x20; z++) {
           size_t read_index = z + 8;
-          this->client_config[z] = (read_index < data.size()) ? data[read_index] : this->prev_cmd_data[read_index];
+          this->client_config[z] = (read_index < msg.data.size()) ? msg.data[read_index] : this->prev_cmd_data[read_index];
         }
       }
       this->guild_card_number = cmd.guild_card_number;
@@ -454,14 +428,14 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
         C_CharSaveInfo_DCv2_PC_V3_BB_96 ret;
         ret.creation_timestamp = this->character->creation_timestamp;
         ret.event_counter = this->character->save_count;
-        this->channel.send(0x96, 0x00, ret);
+        this->channel->send(0x96, 0x00, ret);
         this->sent_96 = true;
       }
       break;
     }
 
     case 0x97:
-      this->channel.send(0xB1, 0x00);
+      this->channel->send(0xB1, 0x00);
       break;
 
     case 0x95:
@@ -469,13 +443,13 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
       break;
 
     case 0xB1:
-      this->channel.send(0x99, 0x00);
+      this->channel->send(0x99, 0x00);
       break;
 
     case 0x1A:
     case 0xD5:
-      if (is_v3(this->channel.version)) {
-        this->channel.send(0xD6, 0x00);
+      if (is_v3(this->version)) {
+        this->channel->send(0xD6, 0x00);
       }
       break;
 
@@ -486,21 +460,21 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
       C_MenuSelection_10_Flag00 ret;
 
       auto handle_command = [&]<typename CmdT>() {
-        const auto* items = check_size_vec_t<CmdT>(data, flag + 1);
+        const auto* items = check_size_vec_t<CmdT>(msg.data, msg.flag + 1);
         size_t item_index;
-        this->log.info("Ship Select menu:");
-        for (item_index = 1; item_index <= flag; item_index++) {
+        this->log.info_f("Ship Select menu:");
+        for (item_index = 1; item_index <= msg.flag; item_index++) {
           const auto& item = items[item_index];
           auto text = strip_color(item.name.decode());
-          this->log.info("%zu: (%08" PRIX32 " %08" PRIX32 ") %s", item_index, item.menu_id.load(), item.item_id.load(), text.c_str());
+          this->log.info_f("{}: ({:08X} {:08X}) {}", item_index, item.menu_id, item.item_id, text);
           if (this->ship_menu_selections.count(text)) {
             break;
           }
         }
-        if (item_index > flag) {
+        if (item_index > msg.flag) {
           if (this->interactive) {
-            while (item_index == 0 || item_index > flag) {
-              this->log.info("Choose response index:");
+            while (item_index == 0 || item_index > msg.flag) {
+              this->log.info_f("Choose response index:");
               string input = phosg::fgets(stdin);
               item_index = stoul(input, nullptr, 0);
             }
@@ -512,13 +486,13 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
         ret.item_id = items[item_index].item_id;
       };
 
-      if (uses_utf16(this->channel.version)) {
+      if (uses_utf16(this->version)) {
         handle_command.operator()<S_MenuItem_PC_BB_08>();
       } else {
         handle_command.operator()<S_MenuItem_DC_V3_08_Ep3_E6>();
       }
 
-      this->channel.send(0x10, 0x00, ret);
+      this->channel->send(0x10, 0x00, ret);
       break;
     }
 
@@ -538,39 +512,32 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
       break;
 
     case 0x1D:
-      this->channel.send(0x1D, 0x00);
+      this->channel->send(0x1D, 0x00);
       break;
 
     case 0x19: {
-      const auto& cmd = check_size_t<S_Reconnect_19>(data, sizeof(S_Reconnect_19), 0xFFFF);
-
-      sockaddr_storage ss;
-      auto* sin = reinterpret_cast<sockaddr_in*>(&ss);
-      sin->sin_family = AF_INET;
-      sin->sin_addr.s_addr = htonl(cmd.address);
-      sin->sin_port = htons(cmd.port);
-      string netloc_str = phosg::render_sockaddr_storage(ss);
-      this->log.info("Connecting to %s", netloc_str.c_str());
-
-      struct bufferevent* bev = bufferevent_socket_new(this->base.get(), -1, BEV_OPT_CLOSE_ON_FREE | BEV_OPT_DEFER_CALLBACKS);
-      if (!bev) {
-        throw runtime_error(phosg::string_printf("failed to open socket (%d)", EVUTIL_SOCKET_ERROR()));
-      }
-      this->channel.set_bufferevent(bev, 0);
-      this->channel.crypt_in.reset();
-      this->channel.crypt_out.reset();
-
-      if (bufferevent_socket_connect(this->channel.bev.get(), reinterpret_cast<const sockaddr*>(&ss), sizeof(struct sockaddr_in)) != 0) {
-        throw runtime_error(phosg::string_printf("failed to connect (%d)", EVUTIL_SOCKET_ERROR()));
-      }
+      const auto& cmd = msg.check_size_t<S_Reconnect_19>(sizeof(S_Reconnect_19), 0xFFFF);
 
+      auto new_ep = make_endpoint_ipv4(cmd.address, cmd.port);
+      string netloc_str = str_for_endpoint(new_ep);
+      this->log.info_f("Connecting to {}", netloc_str);
+      auto sock = make_unique<asio::ip::tcp::socket>(co_await async_connect_tcp(new_ep));
+      this->channel = SocketChannel::create(
+          this->io_context,
+          std::move(sock),
+          this->version,
+          this->language,
+          netloc_str,
+          this->show_command_data ? phosg::TerminalFormat::FG_GREEN : phosg::TerminalFormat::END,
+          this->show_command_data ? phosg::TerminalFormat::FG_YELLOW : phosg::TerminalFormat::END);
+      this->log.info_f("Server channel connected");
       break;
     }
 
     case 0x83: {
-      const auto* items = check_size_vec_t<S_LobbyListEntry_83>(data, flag, true);
+      const auto* items = check_size_vec_t<S_LobbyListEntry_83>(msg.data, msg.flag, true);
       this->lobby_menu_items.clear();
-      for (size_t z = 0; z < flag; z++) {
+      for (size_t z = 0; z < msg.flag; z++) {
         this->lobby_menu_items.emplace_back(items[z]);
       }
       break;
@@ -581,7 +548,7 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
       // be able to see that we didn't, so we don't bother
 
       const auto& game_config = this->game_configs[this->current_game_config_index];
-      if (this->channel.version == Version::PC_V2) {
+      if (this->version == Version::PC_V2) {
         C_CreateGame_PC_C1 ret;
         ret.name.encode(random_name());
         ret.password.encode(random_name());
@@ -589,16 +556,16 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
         ret.battle_mode = (game_config.mode == GameMode::BATTLE);
         ret.challenge_mode = (game_config.mode == GameMode::CHALLENGE);
         ret.episode = 1;
-        this->channel.send(0xC1, 0x00, ret);
+        this->channel->send(0xC1, 0x00, ret);
 
-      } else if (!is_v4(this->channel.version)) {
+      } else if (!is_v4(this->version)) {
         C_CreateGame_DC_V3_0C_C1_Ep3_EC ret;
         ret.name.encode(random_name());
         ret.password.encode(random_name());
         ret.difficulty = 0;
         ret.battle_mode = (game_config.mode == GameMode::BATTLE);
         ret.challenge_mode = (game_config.mode == GameMode::CHALLENGE);
-        if (is_v1(this->channel.version)) {
+        if (is_v1(this->version)) {
           ret.episode = 0;
         } else if (game_config.episode == Episode::EP1) {
           ret.episode = 1;
@@ -609,7 +576,7 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
         } else {
           throw std::logic_error("invalid episode");
         }
-        this->channel.send(is_v1(this->channel.version) ? 0x0C : 0xC1, 0x00, ret);
+        this->channel->send(is_v1(this->version) ? 0x0C : 0xC1, 0x00, ret);
 
       } else {
         C_CreateGame_BB_C1 ret;
@@ -628,7 +595,7 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
           throw std::logic_error("invalid episode");
         }
         ret.solo_mode = (game_config.mode == GameMode::SOLO);
-        this->channel.send(is_v1(this->channel.version) ? 0x0C : 0xC1, 0x00, ret);
+        this->channel->send(is_v1(this->version) ? 0x0C : 0xC1, 0x00, ret);
       }
       break;
     }
@@ -641,32 +608,32 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
         this->character->inventory.items[z].data.id = 0x00010000 + z;
       }
 
-      if (!is_v1(this->channel.version)) {
-        this->channel.send(0x8A, 0x00);
+      if (!is_v1(this->version)) {
+        this->channel->send(0x8A, 0x00);
       }
-      this->channel.send(0x6F, 0x00);
+      this->channel->send(0x6F, 0x00);
       this->send_next_request();
       break;
     }
 
     case 0xA2: {
       auto handle_command = [&]<typename CmdT>() {
-        const auto* items = check_size_vec_t<CmdT>(data, flag);
-        for (size_t z = 0; z < flag; z++) {
+        const auto* items = check_size_vec_t<CmdT>(msg.data, msg.flag);
+        for (size_t z = 0; z < msg.flag; z++) {
           const auto& item = items[z];
           uint64_t request = (static_cast<uint64_t>(item.menu_id) << 32) | static_cast<uint64_t>(item.item_id);
           if (!this->done_requests.count(request)) {
-            this->log.info("Adding request %016" PRIX64, request);
+            this->log.info_f("Adding request {:016X}", request);
             this->pending_requests.emplace(request, item.name.decode());
           }
         }
       };
 
-      if (this->channel.version == Version::PC_V2) {
+      if (this->version == Version::PC_V2) {
         handle_command.operator()<S_QuestMenuEntry_PC_A2_A4>();
-      } else if (this->channel.version == Version::XB_V3) {
+      } else if (this->version == Version::XB_V3) {
         handle_command.operator()<S_QuestMenuEntry_XB_A2_A4>();
-      } else if (this->channel.version == Version::BB_V4) {
+      } else if (this->version == Version::BB_V4) {
         handle_command.operator()<S_QuestMenuEntry_BB_A2_A4>();
       } else {
         handle_command.operator()<S_QuestMenuEntry_DC_GC_A2_A4>();
@@ -677,26 +644,26 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
     case 0x44:
     case 0xA6: {
       auto handle_command = [&]<typename CmdT>() {
-        const auto& cmd = check_size_t<CmdT>(data, 0xFFFF);
+        const auto& cmd = msg.check_size_t<CmdT>(0xFFFF);
         string internal_name = cmd.filename.decode();
         string filtered_name;
         for (char ch : internal_name) {
           filtered_name.push_back((isalnum(ch) || (ch == '-') || (ch == '.') || (ch == '_')) ? ch : '_');
         }
-        string local_filename = phosg::string_printf(
-            "%s/%016" PRIX64 "_%" PRIu64 "_%s_%c_%s",
-            this->output_dir.c_str(),
+        string local_filename = std::format(
+            "{}/{:016X}_{}_{}_{}_{}",
+            this->output_dir,
             this->current_request,
             phosg::now(),
-            phosg::name_for_enum(this->channel.version),
-            char_for_language_code(this->channel.language),
-            filtered_name.c_str());
+            phosg::name_for_enum(this->version),
+            char_for_language_code(this->language),
+            filtered_name);
         this->open_files.emplace(internal_name, OpenFile{.request = this->current_request, .filename = local_filename, .total_size = cmd.file_size, .data = ""});
       };
 
-      if (is_dc(this->channel.version)) {
+      if (is_dc(this->version)) {
         handle_command.operator()<S_OpenFile_DC_44_A6>();
-      } else if (!is_v4(this->channel.version)) {
+      } else if (!is_v4(this->version)) {
         handle_command.operator()<S_OpenFile_PC_GC_44_A6>();
       } else {
         handle_command.operator()<S_OpenFile_BB_44_A6>();
@@ -705,22 +672,22 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
     }
     case 0x13:
     case 0xA7: {
-      const auto& cmd = check_size_t<S_WriteFile_13_A7>(data);
+      const auto& cmd = msg.check_size_t<S_WriteFile_13_A7>();
       string internal_filename = cmd.filename.decode();
 
-      if (!is_v1_or_v2(this->channel.version)) {
+      if (!is_v1_or_v2(this->version)) {
         C_WriteFileConfirmation_V3_BB_13_A7 ret;
         ret.filename.encode(internal_filename);
-        this->channel.send(command, flag, ret);
+        this->channel->send(msg.command, msg.flag, ret);
       }
 
-      auto f_it = this->open_files.find(internal_filename.c_str());
+      auto f_it = this->open_files.find(internal_filename);
       if (f_it == this->open_files.end()) {
-        this->log.warning("Received data for non-open file %s", internal_filename.c_str());
+        this->log.warning_f("Received data for non-open file {}", internal_filename);
         break;
       }
       auto& f = this->open_files.at(cmd.filename.decode());
-      size_t block_offset = flag * 0x400;
+      size_t block_offset = msg.flag * 0x400;
       size_t allowed_block_size = (block_offset < f.total_size)
           ? min<size_t>(f.total_size - block_offset, 0x400)
           : 0;
@@ -732,25 +699,25 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
       memcpy(f.data.data() + block_offset, cmd.data.data(), data_size);
       if (cmd.data_size != 0x400) {
         phosg::save_file(f.filename, f.data);
-        this->log.info("Wrote file %s (%zu bytes)", f.filename.c_str(), f.data.size());
+        this->log.info_f("Wrote file {} ({} bytes)", f.filename, f.data.size());
         this->open_files.erase(internal_filename);
-        if (phosg::ends_with(internal_filename, ".bin")) {
+        if (internal_filename.ends_with(".bin")) {
           this->bin_complete = true;
-        } else if (phosg::ends_with(internal_filename, ".dat")) {
+        } else if (internal_filename.ends_with(".dat")) {
           this->dat_complete = true;
         }
         if (this->open_files.empty() && this->bin_complete && this->dat_complete) {
-          if (is_v1_or_v2(this->channel.version)) {
+          if (is_v1_or_v2(this->version)) {
             this->on_request_complete();
           } else {
-            this->channel.send(0xAC, 0x00);
+            this->channel->send(0xAC, 0x00);
           }
         }
       }
       break;
     }
     case 0xAC: {
-      if (is_v1_or_v2(this->channel.version)) {
+      if (is_v1_or_v2(this->version)) {
         throw runtime_error("unsupported version");
       }
       this->on_request_complete();
@@ -761,24 +728,24 @@ void DownloadSession::on_channel_input(uint16_t command, uint32_t flag, std::str
 
 void DownloadSession::send_next_request() {
   if (should_request_category_list) {
-    this->log.info("Requesting quest list");
-    this->channel.send(0xA2, 0x00);
-    if (is_v4(this->channel.version)) {
-      this->channel.send(0xA2, 0x01);
+    this->log.info_f("Requesting quest list");
+    this->channel->send(0xA2, 0x00);
+    if (is_v4(this->version)) {
+      this->channel->send(0xA2, 0x01);
     }
     this->should_request_category_list = false;
 
   } else if (!this->pending_requests.empty()) {
     if (interactive) {
       const auto& config = this->game_configs[this->current_game_config_index];
-      this->log.info("Items available to expand (mode=%s, episode=%s):", name_for_mode(config.mode), name_for_episode(config.episode));
+      this->log.info_f("Items available to expand (mode={}, episode={}):", name_for_mode(config.mode), name_for_episode(config.episode));
       for (const auto& it : this->pending_requests) {
-        this->log.info("%016" PRIX64 ": %s", it.first, it.second.c_str());
+        this->log.info_f("{:016X}: {}", it.first, it.second);
       }
-      this->log.info("Choose item to expand by ID (q to quit; s to skip to next config):");
+      this->log.info_f("Choose item to expand by ID (q to quit; s to skip to next config):");
       string input = phosg::fgets(stdin);
       if (input.empty() || (input == "q\n")) {
-        this->channel.disconnect();
+        this->channel->disconnect();
         return;
       } else if (input == "s\n") {
         this->pending_requests.clear();
@@ -794,22 +761,22 @@ void DownloadSession::send_next_request() {
       this->current_request = item_it->first;
       this->done_requests.emplace(this->current_request);
       this->pending_requests.erase(item_it);
-      this->log.info("Sending request %016" PRIX64, this->current_request);
+      this->log.info_f("Sending request {:016X}", this->current_request);
     }
 
     C_MenuSelection_10_Flag00 cmd;
     cmd.menu_id = (this->current_request >> 32) & 0xFFFFFFFF;
     cmd.item_id = this->current_request & 0xFFFFFFFF;
-    this->channel.send(0x10, 0x00, cmd);
+    this->channel->send(0x10, 0x00, cmd);
   } else {
-    this->log.info("No pending requests with current parameters");
+    this->log.info_f("No pending requests with current parameters");
     this->on_request_complete();
   }
 }
 
 void DownloadSession::on_request_complete() {
   for (const auto& data : this->on_request_complete_commands) {
-    this->channel.send(data);
+    this->channel->send(data);
   }
 
   this->send_61_98(true);
@@ -819,14 +786,14 @@ void DownloadSession::on_request_complete() {
   C_LobbySelection_84 ret84;
   ret84.menu_id = item.menu_id;
   ret84.item_id = item.item_id;
-  this->channel.send(0x84, 0x00, ret84);
+  this->channel->send(0x84, 0x00, ret84);
 
   if (this->pending_requests.empty()) {
     // Advance to next mode/episode combination
     this->current_game_config_index++;
-    bool v1 = is_v1(this->channel.version);
-    bool v2 = is_v2(this->channel.version);
-    bool v3 = is_v3(this->channel.version);
+    bool v1 = is_v1(this->version);
+    bool v2 = is_v2(this->version);
+    bool v3 = is_v3(this->version);
     while ((this->current_game_config_index < this->game_configs.size()) &&
         ((v1 && !this->game_configs[this->current_game_config_index].v1) ||
             (v2 && !this->game_configs[this->current_game_config_index].v2) ||
@@ -834,36 +801,16 @@ void DownloadSession::on_request_complete() {
       this->current_game_config_index++;
     }
     if (this->current_game_config_index >= this->game_configs.size()) {
-      this->log.info("All modes complete");
-      this->channel.disconnect();
+      this->log.info_f("All modes complete");
+      this->channel->disconnect();
     } else {
       const auto& config = this->game_configs[this->current_game_config_index];
-      this->log.info("Advancing to %s mode in %s", name_for_mode(config.mode), name_for_episode(config.episode));
+      this->log.info_f("Advancing to {} mode in {}", name_for_mode(config.mode), name_for_episode(config.episode));
       this->should_request_category_list = true;
     }
   }
 }
 
-void DownloadSession::dispatch_on_channel_error(Channel& ch, short events) {
-  auto* session = reinterpret_cast<DownloadSession*>(ch.context_obj);
-  session->on_channel_error(events);
-}
-
-void DownloadSession::on_channel_error(short events) {
-  if (events & BEV_EVENT_CONNECTED) {
-    this->log.info("Server channel connected");
-  }
-  if (events & BEV_EVENT_ERROR) {
-    int err = EVUTIL_SOCKET_ERROR();
-    this->log.warning("Error %d (%s) in server stream", err, evutil_socket_error_to_string(err));
-  }
-  if (events & (BEV_EVENT_ERROR | BEV_EVENT_EOF)) {
-    this->log.info("Server endpoint has disconnected");
-    this->channel.disconnect();
-    event_base_loopexit(this->base.get(), nullptr);
-  }
-}
-
 const std::vector<DownloadSession::GameConfig> DownloadSession::game_configs({
     {.mode = GameMode::NORMAL, .episode = Episode::EP1, .v1 = true, .v2 = true, .v3 = true},
     {.mode = GameMode::NORMAL, .episode = Episode::EP2, .v1 = false, .v2 = false, .v3 = true},

src/DownloadSession.hh

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <event2/event.h>
-
 #include <functional>
 #include <map>
 #include <memory>
@@ -18,8 +16,9 @@
 class DownloadSession {
 public:
   DownloadSession(
-      std::shared_ptr<struct event_base> base,
-      const struct sockaddr_storage& remote,
+      std::shared_ptr<asio::io_context> io_context,
+      const std::string& remote_host,
+      uint16_t remote_port,
       const std::string& output_dir,
       Version version,
       uint8_t language,
@@ -43,12 +42,19 @@ public:
   DownloadSession& operator=(DownloadSession&&) = delete;
   virtual ~DownloadSession() = default;
 
+  asio::awaitable<void> run();
+
 protected:
   // Config (must be set by caller)
+  std::string remote_host;
+  uint16_t remote_port;
   std::string output_dir;
+  Version version;
+  uint8_t language;
+  bool show_command_data;
   std::shared_ptr<const PSOBBEncryption::KeyFile> bb_key_file;
-  uint32_t serial_number2;
   uint32_t serial_number;
+  uint32_t serial_number2;
   std::string access_key;
   std::string username;
   std::string password;
@@ -62,17 +68,17 @@ protected:
 
   // State (set during session)
   phosg::PrefixedLogger log;
-  std::shared_ptr<struct event_base> base;
-  Channel channel;
+  std::shared_ptr<asio::io_context> io_context;
+  std::shared_ptr<Channel> channel;
   uint64_t hardware_id;
-  uint32_t guild_card_number;
+  uint32_t guild_card_number = 0;
   parray<uint8_t, 0x28> prev_cmd_data;
   parray<uint8_t, 0x20> client_config;
-  bool sent_96;
+  bool sent_96 = false;
   std::vector<S_LobbyListEntry_83> lobby_menu_items;
 
-  bool should_request_category_list;
-  uint64_t current_request;
+  bool should_request_category_list = true;
+  uint64_t current_request = 0;
   std::map<uint64_t, std::string> pending_requests;
   std::unordered_set<uint64_t> done_requests;
 
@@ -92,20 +98,14 @@ protected:
     bool v3;
   };
   static const std::vector<GameConfig> game_configs;
-  size_t current_game_config_index;
-  bool in_game;
-  bool bin_complete;
-  bool dat_complete;
+  size_t current_game_config_index = 0;
+  bool in_game = false;
+  bool bin_complete = false;
+  bool dat_complete = false;
 
-  static void dispatch_on_channel_input(Channel& ch, uint16_t command, uint32_t flag, std::string& msg);
-  static void dispatch_on_channel_error(Channel& ch, short events);
-  void on_channel_input(uint16_t command, uint32_t flag, std::string& msg);
-  void on_channel_error(short events);
-
-  void send_next_request();
-  void on_request_complete();
-
-  void assign_item_ids(uint32_t base_item_id);
   void send_93_9D_9E(bool extended);
   void send_61_98(bool is_98);
+  asio::awaitable<void> on_message(Channel::Message& msg);
+  void send_next_request();
+  void on_request_complete();
 };

src/EnemyType.cc

@@ -42,6 +42,7 @@ static const vector<EnemyTypeDefinition> type_defs{
     {EnemyType::DARK_FALZ_2,             EP1,                    0x2F, 0x37, "DARK_FALZ_2",             "Dark Falz (phase 2)", nullptr},
     {EnemyType::DARK_FALZ_3,             EP1,                    0x2F, 0x38, "DARK_FALZ_3",             "Dark Falz (phase 3)", nullptr},
     {EnemyType::DARK_GUNNER,             EP1,                    0x22, 0x1E, "DARK_GUNNER",             "Dark Gunner", nullptr},
+    {EnemyType::DARK_GUNNER_CONTROL,     EP1,                    0xFF, 0xFF, "DARK_GUNNER_CONTROL",     "Dark Gunner (control)", nullptr},
     {EnemyType::DARVANT,                 EP1,                    0xFF, 0x35, "DARVANT",                 "Darvant", nullptr},
     {EnemyType::DARVANT_ULTIMATE,        EP1,                    0xFF, 0x39, "DARVANT_ULTIMATE",        "Darvant (ultimate)", nullptr},
     {EnemyType::DE_ROL_LE,               EP1,                    0x2D, 0x0F, "DE_ROL_LE",               "De Rol Le", "Dal Ral Lie"},
@@ -163,7 +164,7 @@ EnemyType phosg::enum_for_name<EnemyType>(const char* name) {
   if (index.empty()) {
     for (const auto& def : type_defs) {
       if (!index.emplace(def.enum_name, def.type).second) {
-        throw logic_error(phosg::string_printf("duplicate enemy enum name: %s", def.enum_name));
+        throw logic_error(std::format("duplicate enemy enum name: {}", def.enum_name));
       }
     }
   }
@@ -197,6 +198,33 @@ const vector<EnemyType>& enemy_types_for_rare_table_index(Episode episode, uint8
   }
 }
 
+const vector<EnemyType>& enemy_types_for_battle_param_index(Episode episode, uint8_t bp_index) {
+  const auto& generate_table = +[](Episode episode) -> vector<vector<EnemyType>> {
+    vector<vector<EnemyType>> ret;
+    for (const auto& def : type_defs) {
+      if (def.valid_in_episode(episode) && (def.bp_index != 0xFF)) {
+        if (def.bp_index >= ret.size()) {
+          ret.resize(def.bp_index + 1);
+        }
+        ret[def.bp_index].emplace_back(def.type);
+      }
+    }
+    return ret;
+  };
+
+  static array<vector<vector<EnemyType>>, 5> data;
+  auto& ret = data.at(static_cast<size_t>(episode));
+  if (ret.empty()) {
+    ret = generate_table(episode);
+  }
+  try {
+    return ret.at(bp_index);
+  } catch (const out_of_range&) {
+    static const vector<EnemyType> empty_vec;
+    return empty_vec;
+  }
+}
+
 EnemyType EnemyTypeDefinition::rare_type(Episode episode, uint8_t event, uint8_t floor) const {
   switch (this->type) {
     case EnemyType::HILDEBEAR:

src/EnemyType.hh

@@ -33,6 +33,7 @@ enum class EnemyType : uint8_t {
   DARK_FALZ_2,
   DARK_FALZ_3,
   DARK_GUNNER,
+  DARK_GUNNER_CONTROL,
   DARVANT,
   DARVANT_ULTIMATE,
   DE_ROL_LE,
@@ -180,3 +181,4 @@ template <>
 EnemyType phosg::enum_for_name<EnemyType>(const char* name);
 
 const std::vector<EnemyType>& enemy_types_for_rare_table_index(Episode episode, uint8_t rt_index);
+const std::vector<EnemyType>& enemy_types_for_battle_param_index(Episode episode, uint8_t bp_index);

src/Episode3/BattleRecord.cc

@@ -82,19 +82,19 @@ void BattleRecord::Event::serialize(phosg::StringWriter& w) const {
 
 void BattleRecord::Event::print(FILE* stream) const {
   string time_str = phosg::format_time(this->timestamp);
-  fprintf(stream, "Event @%016" PRIX64 " (%s) ", this->timestamp, time_str.c_str());
+  phosg::fwrite_fmt(stream, "Event @{:016X} ({}) ", this->timestamp, time_str);
   switch (this->type) {
     case Type::PLAYER_JOIN:
-      fprintf(stream, "PLAYER_JOIN %02" PRIX32 "\n", this->players[0].lobby_data.client_id.load());
+      phosg::fwrite_fmt(stream, "PLAYER_JOIN {:02X}\n", this->players[0].lobby_data.client_id);
       this->players[0].print(stream);
       break;
     case Type::PLAYER_LEAVE:
-      fprintf(stream, "PLAYER_LEAVE %02hhu\n", this->leaving_client_id);
+      phosg::fwrite_fmt(stream, "PLAYER_LEAVE {:02}\n", this->leaving_client_id);
       break;
     case Type::SET_INITIAL_PLAYERS:
-      fprintf(stream, "SET_INITIAL_PLAYERS");
+      phosg::fwrite_fmt(stream, "SET_INITIAL_PLAYERS");
       for (const auto& player : this->players) {
-        fprintf(stream, " %02" PRIX32, player.lobby_data.client_id.load());
+        phosg::fwrite_fmt(stream, " {:02X}", player.lobby_data.client_id);
       }
       fputc('\n', stream);
       for (const auto& player : this->players) {
@@ -102,23 +102,23 @@ void BattleRecord::Event::print(FILE* stream) const {
       }
       break;
     case Type::BATTLE_COMMAND:
-      fprintf(stream, "BATTLE_COMMAND\n");
+      phosg::fwrite_fmt(stream, "BATTLE_COMMAND\n");
       phosg::print_data(stream, this->data, 0, nullptr, phosg::PrintDataFlags::PRINT_ASCII | phosg::PrintDataFlags::DISABLE_COLOR | phosg::PrintDataFlags::OFFSET_16_BITS);
       break;
     case Type::GAME_COMMAND:
-      fprintf(stream, "GAME_COMMAND\n");
+      phosg::fwrite_fmt(stream, "GAME_COMMAND\n");
       phosg::print_data(stream, this->data, 0, nullptr, phosg::PrintDataFlags::PRINT_ASCII | phosg::PrintDataFlags::DISABLE_COLOR | phosg::PrintDataFlags::OFFSET_16_BITS);
       break;
     case Type::EP3_GAME_COMMAND:
-      fprintf(stream, "EP3_GAME_COMMAND\n");
+      phosg::fwrite_fmt(stream, "EP3_GAME_COMMAND\n");
       phosg::print_data(stream, this->data, 0, nullptr, phosg::PrintDataFlags::PRINT_ASCII | phosg::PrintDataFlags::DISABLE_COLOR | phosg::PrintDataFlags::OFFSET_16_BITS);
       break;
     case Type::CHAT_MESSAGE:
-      fprintf(stream, "CHAT_MESSAGE %08" PRIX32 "\n", this->guild_card_number);
+      phosg::fwrite_fmt(stream, "CHAT_MESSAGE {:08X}\n", this->guild_card_number);
       phosg::print_data(stream, this->data, 0, nullptr, phosg::PrintDataFlags::PRINT_ASCII | phosg::PrintDataFlags::DISABLE_COLOR | phosg::PrintDataFlags::OFFSET_16_BITS);
       break;
     case Type::SERVER_DATA_COMMAND:
-      fprintf(stream, "SERVER_DATA_COMMAND\n");
+      phosg::fwrite_fmt(stream, "SERVER_DATA_COMMAND\n");
       phosg::print_data(stream, this->data, 0, nullptr, phosg::PrintDataFlags::PRINT_ASCII | phosg::PrintDataFlags::DISABLE_COLOR | phosg::PrintDataFlags::OFFSET_16_BITS);
       break;
     default:
@@ -363,26 +363,24 @@ void BattleRecord::set_battle_end_timestamp() {
 void BattleRecord::print(FILE* stream) const {
   string start_str = phosg::format_time(this->battle_start_timestamp);
   string end_str = phosg::format_time(this->battle_end_timestamp);
-  fprintf(stream, "BattleRecord %s behavior_flags=%08" PRIX32 " start=%016" PRIX64 " (%s) end=%016" PRIX64 " (%s); %zu events\n",
+  phosg::fwrite_fmt(stream, "BattleRecord {} behavior_flags={:08X} start={:016X} ({}) end={:016X} ({}); {} events\n",
       this->is_writable ? "writable" : "read-only",
       this->behavior_flags,
       this->battle_start_timestamp,
-      start_str.c_str(),
+      start_str,
       this->battle_end_timestamp,
-      end_str.c_str(), this->events.size());
+      end_str, this->events.size());
   for (const auto& event : this->events) {
     event.print(stream);
   }
 }
 
-BattleRecordPlayer::BattleRecordPlayer(
-    shared_ptr<const BattleRecord> rec,
-    shared_ptr<struct event_base> base)
-    : record(rec),
+BattleRecordPlayer::BattleRecordPlayer(std::shared_ptr<asio::io_context> io_context, shared_ptr<const BattleRecord> rec)
+    : io_context(io_context),
+      record(rec),
       event_it(this->record->events.begin()),
       play_start_timestamp(0),
-      base(base),
-      next_command_ev(event_new(this->base.get(), -1, EV_TIMEOUT, &BattleRecordPlayer::dispatch_schedule_events, this), event_free) {}
+      next_command_timer(*this->io_context) {}
 
 shared_ptr<const BattleRecord> BattleRecordPlayer::get_record() const {
   return this->record;
@@ -395,40 +393,37 @@ void BattleRecordPlayer::set_lobby(shared_ptr<Lobby> l) {
 void BattleRecordPlayer::start() {
   if (this->play_start_timestamp == 0) {
     this->play_start_timestamp = phosg::now();
-    this->schedule_events();
+    asio::co_spawn(*this->io_context, this->play_task(), asio::detached);
   }
 }
 
-void BattleRecordPlayer::dispatch_schedule_events(evutil_socket_t, short, void* ctx) {
-  reinterpret_cast<BattleRecordPlayer*>(ctx)->schedule_events();
-}
-
-void BattleRecordPlayer::schedule_events() {
-  // If the lobby is destroyed, we can't replay anything - just return without
-  // rescheduling
+asio::awaitable<void> BattleRecordPlayer::play_task() {
   auto l = this->lobby.lock();
-  if (!l) {
-    return;
-  }
 
   for (;;) {
     uint64_t relative_ts = phosg::now() - this->play_start_timestamp + this->record->battle_start_timestamp;
 
+    // If the lobby is destroyed, we can't replay anything
+    if (!l) {
+      co_return;
+    }
+
     if (this->event_it == this->record->events.end()) {
       if (relative_ts >= this->record->battle_end_timestamp) {
         // If the record is complete and the end timestamp has been reached,
         // send exit commands to all players in the lobby, and don't reschedule
-        // the event (it will be deleted along with the Player when the lobby is
-        // destroyed, when the last client leaves)
+        // the event (it will be deleted along with the Player when the lobby
+        // is destroyed, when the last client leaves)
         send_command(l, 0xED, 0x00);
+        break;
 
       } else {
-        // There are no more events to play, but the battle has not officially
-        // ended yet - reschedule the event for the end time
-        auto tv = phosg::usecs_to_timeval(this->record->battle_end_timestamp - relative_ts);
-        event_add(this->next_command_ev.get(), &tv);
+        // There are no more events to play, but the battle has not actually
+        // ended yet; wait until the end time
+        this->next_command_timer.expires_after(std::chrono::microseconds(this->record->battle_end_timestamp - relative_ts));
+        co_await this->next_command_timer.async_wait(asio::use_awaitable);
+        l = this->lobby.lock();
       }
-      break;
 
     } else {
       if (this->event_it->timestamp <= relative_ts) {
@@ -464,11 +459,10 @@ void BattleRecordPlayer::schedule_events() {
         this->event_it++;
 
       } else {
-        // The next event should not occur yet, so reschedule for the time when
-        // it should occur
-        auto tv = phosg::usecs_to_timeval(this->event_it->timestamp - relative_ts);
-        event_add(this->next_command_ev.get(), &tv);
-        break;
+        // The next event should not occur yet, so wait until its time
+        this->next_command_timer.expires_after(std::chrono::microseconds(this->event_it->timestamp - relative_ts));
+        co_await this->next_command_timer.async_wait(asio::use_awaitable);
+        l = this->lobby.lock();
       }
     }
   }

src/Episode3/BattleRecord.hh

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <event2/event.h>
 #include <stdint.h>
 
+#include <asio.hpp>
 #include <deque>
 #include <memory>
 #include <phosg/Strings.hh>
@@ -108,7 +108,7 @@ private:
 
 class BattleRecordPlayer {
 public:
-  BattleRecordPlayer(std::shared_ptr<const BattleRecord> rec, std::shared_ptr<struct event_base> base);
+  BattleRecordPlayer(std::shared_ptr<asio::io_context> io_context, std::shared_ptr<const BattleRecord> rec);
   ~BattleRecordPlayer() = default;
 
   std::shared_ptr<const BattleRecord> get_record() const;
@@ -117,16 +117,14 @@ public:
   void start();
 
 private:
-  static void dispatch_schedule_events(evutil_socket_t, short, void* ctx);
-  void schedule_events();
-
+  std::shared_ptr<asio::io_context> io_context;
   std::shared_ptr<const BattleRecord> record;
   std::deque<BattleRecord::Event>::const_iterator event_it;
   uint64_t play_start_timestamp;
-  std::shared_ptr<struct event_base> base;
   std::weak_ptr<Lobby> lobby;
-  std::shared_ptr<struct event> next_command_ev;
-  phosg::StringReader random_r;
+  asio::steady_timer next_command_timer;
+
+  asio::awaitable<void> play_task();
 };
 
 } // namespace Episode3

src/Episode3/Card.cc

@@ -123,7 +123,7 @@ ssize_t Card::apply_abnormal_condition(
     int8_t dice_roll_value,
     int8_t random_percent) {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("apply_abnormal_condition(%02hhX, @%04X, @%04X, %hd, %hhd, %hhd): ", def_effect_index, target_card_ref, sc_card_ref, value, dice_roll_value, random_percent));
+  auto log = s->log_stack(std::format("apply_abnormal_condition({:02X}, @{:04X}, @{:04X}, {}, {}, {}): ", def_effect_index, target_card_ref, sc_card_ref, value, dice_roll_value, random_percent));
   bool is_nte = s->options.is_nte();
 
   ssize_t existing_cond_index;
@@ -150,13 +150,13 @@ ssize_t Card::apply_abnormal_condition(
         break;
       }
     }
-    log.debug("existing_cond_index < 0 (new condition) => cond_index = %zd", cond_index);
+    log.debug_f("existing_cond_index < 0 (new condition) => cond_index = {}", cond_index);
   } else {
-    log.debug("existing_cond_index = %zd (existing condition)", existing_cond_index);
+    log.debug_f("existing_cond_index = {} (existing condition)", existing_cond_index);
   }
 
   if (cond_index < 0) {
-    log.debug("no space for condition");
+    log.debug_f("no space for condition");
     return -1;
   }
 
@@ -164,7 +164,7 @@ ssize_t Card::apply_abnormal_condition(
   auto& cond = this->action_chain.conditions[cond_index];
   if ((eff.type == ConditionType::MV_BONUS) && (cond.type == ConditionType::MV_BONUS)) {
     existing_cond_value = clamp<int16_t>(cond.value, -99, 99);
-    log.debug("MV_BONUS combines => existing_cond_value = %hd", existing_cond_value);
+    log.debug_f("MV_BONUS combines => existing_cond_value = {}", existing_cond_value);
   }
 
   s->card_special->apply_stat_deltas_to_card_from_condition_and_clear_cond(cond, this->shared_from_this());
@@ -205,7 +205,7 @@ ssize_t Card::apply_abnormal_condition(
   }
 
   string cond_str = cond.str(s);
-  log.debug("wrote condition %zd => %s", cond_index, cond_str.c_str());
+  log.debug_f("wrote condition {} => {}", cond_index, cond_str);
 
   if (!is_nte) {
     s->card_special->update_condition_orders(this->shared_from_this());
@@ -214,7 +214,7 @@ ssize_t Card::apply_abnormal_condition(
         continue;
       }
       string cond_str = cond.str(s);
-      log.debug("sorted conditions: [%zu] => %s", z, cond_str.c_str());
+      log.debug_f("sorted conditions: [{}] => {}", z, cond_str);
     }
   }
 
@@ -298,13 +298,13 @@ void Card::commit_attack(
     size_t strike_number,
     int16_t* out_effective_damage) {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("commit_attack(@%04hX #%04hX, @%04hX #%04hX => %hd (str%zu)): ", this->get_card_ref(), this->get_card_id(), attacker_card->get_card_ref(), attacker_card->get_card_id(), damage, strike_number));
+  auto log = s->log_stack(std::format("commit_attack(@{:04X} #{:04X}, @{:04X} #{:04X} => {} (str{})): ", this->get_card_ref(), this->get_card_id(), attacker_card->get_card_ref(), attacker_card->get_card_id(), damage, strike_number));
   bool is_nte = s->options.is_nte();
 
   int16_t effective_damage = damage;
   s->card_special->adjust_attack_damage_due_to_conditions(
       this->shared_from_this(), &effective_damage, attacker_card->get_card_ref());
-  log.debug("adjusted damage = %hd", effective_damage);
+  log.debug_f("adjusted damage = {}", effective_damage);
 
   size_t num_assists = s->assist_server->compute_num_assist_effects_for_client(this->client_id);
   for (size_t z = 0; z < num_assists; z++) {
@@ -324,36 +324,36 @@ void Card::commit_attack(
       }
     }
   }
-  log.debug("after assists = %hd", effective_damage);
+  log.debug_f("after assists = {}", effective_damage);
 
   if (this->action_metadata.check_flag(0x10)) {
     effective_damage = 0;
-    log.debug("flag 0x10 => effective damage = %hd", effective_damage);
+    log.debug_f("flag 0x10 => effective damage = {}", effective_damage);
   }
 
   auto attacker_ps = attacker_card->player_state();
   attacker_ps->stats.damage_given += effective_damage;
   this->player_state()->stats.damage_taken += effective_damage;
-  log.debug("updated stats");
+  log.debug_f("updated stats");
 
   this->current_hp = clamp<int16_t>(this->current_hp - effective_damage, 0, this->max_hp);
-  log.debug("hp set to %hd", this->current_hp);
+  log.debug_f("hp set to {}", this->current_hp);
 
   if ((effective_damage > 0) &&
       (attacker_ps->stats.max_attack_damage < effective_damage)) {
     attacker_ps->stats.max_attack_damage = effective_damage;
-    log.debug("attacker new max damage %hd", effective_damage);
+    log.debug_f("attacker new max damage {}", effective_damage);
   }
 
   this->last_attack_final_damage = effective_damage;
-  log.debug("last attack final damage = %hd", effective_damage);
+  log.debug_f("last attack final damage = {}", effective_damage);
   if (effective_damage > 0) {
     this->card_flags = this->card_flags | 4;
-    log.debug("set flag 4");
+    log.debug_f("set flag 4");
   }
   if (this->current_hp < 1) {
     this->destroy_set_card(attacker_card);
-    log.debug("card destroyed");
+    log.debug_f("card destroyed");
   }
 
   G_ApplyConditionEffect_Ep3_6xB4x06 cmd_to_send;
@@ -507,19 +507,19 @@ void Card::execute_attack(shared_ptr<Card> attacker_card) {
   }
 
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("execute_attack(@%04X #%04X, @%04X #%04X): ", this->get_card_ref(), this->get_card_id(), attacker_card->get_card_ref(), attacker_card->get_card_id()));
+  auto log = s->log_stack(std::format("execute_attack(@{:04X} #{:04X}, @{:04X} #{:04X}): ", this->get_card_ref(), this->get_card_id(), attacker_card->get_card_ref(), attacker_card->get_card_id()));
   bool is_nte = s->options.is_nte();
 
   this->card_flags &= 0xFFFFFFF3;
   int16_t attack_ap = this->action_metadata.attack_bonus;
   int16_t attack_tp = 0;
   int16_t defense_power = is_nte ? 0 : this->compute_defense_power_for_attacker_card(attacker_card);
-  log.debug("ap=%hd, tp=%hd", attack_ap, attack_tp);
+  log.debug_f("ap={}, tp={}", attack_ap, attack_tp);
   if (!is_nte && (attack_ap == 0) && !this->action_metadata.check_flag(0x20)) {
-    log.debug("ap == 0 and flag 0x20 not set");
+    log.debug_f("ap == 0 and flag 0x20 not set");
     return;
   } else {
-    log.debug("ap != 0 or flag 0x20 set; continuing...");
+    log.debug_f("ap != 0 or flag 0x20 set; continuing...");
   }
 
   G_ApplyConditionEffect_Ep3_6xB4x06 cmd;
@@ -542,7 +542,7 @@ void Card::execute_attack(shared_ptr<Card> attacker_card) {
 
     if (is_nte) {
       defense_power = this->compute_defense_power_for_attacker_card(attacker_card);
-      log.debug("ap=%hd, tp=%hd, defense=%hd", attack_ap, attack_tp, defense_power);
+      log.debug_f("ap={}, tp={}, defense={}", attack_ap, attack_tp, defense_power);
       attacker_card->compute_action_chain_results(true, false);
       attack_ap = attacker_card->action_chain.chain.damage;
       if (this->action_chain.chain.attack_medium == AttackMedium::TECH) {
@@ -553,14 +553,14 @@ void Card::execute_attack(shared_ptr<Card> attacker_card) {
     }
 
     s->card_special->compute_attack_ap(this->shared_from_this(), &attack_ap, attacker_card->get_card_ref());
-    log.debug("computed ap %hd", attack_ap);
+    log.debug_f("computed ap {}", attack_ap);
     this->apply_ap_and_tp_adjust_assists_to_attack(attacker_card, &attack_ap, &defense_power, &attack_tp);
-    log.debug("assist adjusts ap=%hd, defense=%hd", attack_ap, defense_power);
+    log.debug_f("assist adjusts ap={}, defense={}", attack_ap, defense_power);
 
     int16_t raw_damage = attack_ap - defense_power;
     int16_t preliminary_damage = max<int16_t>(raw_damage, 0) - attack_tp;
     this->last_attack_preliminary_damage = preliminary_damage;
-    log.debug("raw_damage=%hd, preliminary_damange=%hd", raw_damage, preliminary_damage);
+    log.debug_f("raw_damage={}, preliminary_damange={}", raw_damage, preliminary_damage);
 
     uint32_t unknown_a9 = 0;
     auto target = s->card_special->compute_replaced_target_based_on_conditions(
@@ -568,19 +568,19 @@ void Card::execute_attack(shared_ptr<Card> attacker_card) {
 
     if (!target) {
       target = this->shared_from_this();
-      log.debug("target is not replaced");
+      log.debug_f("target is not replaced");
     } else {
-      log.debug("target replaced with @%04hX #%04hX", target->get_card_ref(), target->get_card_id());
+      log.debug_f("target replaced with @{:04X} #{:04X}", target->get_card_ref(), target->get_card_id());
     }
 
     if (!is_nte) {
       if (unknown_a9 != 0) {
         preliminary_damage = 0;
-        log.debug("a9 nonzero; preliminary_damage = 0");
+        log.debug_f("a9 nonzero; preliminary_damage = 0");
       }
       if (!(this->card_flags & 2) && (!attacker_card || !(attacker_card->card_flags & 2))) {
         s->card_special->check_for_defense_interference(attacker_card, this->shared_from_this(), &preliminary_damage);
-        log.debug("checked for defense interference");
+        log.debug_f("checked for defense interference");
       }
     }
 
@@ -592,19 +592,19 @@ void Card::execute_attack(shared_ptr<Card> attacker_card) {
     ps->stats.num_attacks_taken++;
 
     if (!(target->card_flags & 2)) {
-      log.debug("flag 2 not set");
+      log.debug_f("flag 2 not set");
       for (size_t strike_num = 0; strike_num < attacker_card->action_chain.chain.strike_count; strike_num++) {
         int16_t final_effective_damage = 0;
         target->commit_attack(preliminary_damage, attacker_card, &cmd, strike_num, &final_effective_damage);
         ps->stats.action_card_negated_damage += max<int16_t>(0, this->current_defense_power - final_effective_damage);
       }
     } else {
-      log.debug("flag 2 set; committing zero-damage attack");
+      log.debug_f("flag 2 set; committing zero-damage attack");
       target->commit_attack(0, attacker_card, &cmd, 0, nullptr);
     }
 
     if (!is_nte && (this != target.get())) {
-      log.debug("target was replaced; committing zero-damage attack on original card");
+      log.debug_f("target was replaced; committing zero-damage attack on original card");
       this->commit_attack(0, attacker_card, &cmd, 0, nullptr);
     }
 
@@ -906,7 +906,7 @@ void Card::clear_action_chain_and_metadata_and_most_flags() {
 
 void Card::compute_action_chain_results(bool apply_action_conditions, bool ignore_this_card_ap_tp) {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("compute_action_chain_results(@%04hX #%04hX): ", this->get_card_ref(), this->get_card_id()));
+  auto log = s->log_stack(std::format("compute_action_chain_results(@{:04X} #{:04X}): ", this->get_card_ref(), this->get_card_id()));
   bool is_nte = s->options.is_nte();
 
   this->action_chain.compute_attack_medium(s);
@@ -914,7 +914,7 @@ void Card::compute_action_chain_results(bool apply_action_conditions, bool ignor
   this->action_chain.chain.ap_effect_bonus = 0;
   this->action_chain.chain.tp_effect_bonus = 0;
 
-  log.debug("(initial) medium=%s, strike_count=%hhu, ap_effect_bonus=%hhd, tp_effect_bonus=%hhd",
+  log.debug_f("(initial) medium={}, strike_count={}, ap_effect_bonus={}, tp_effect_bonus={}",
       phosg::name_for_enum(this->action_chain.chain.attack_medium),
       this->action_chain.chain.strike_count,
       this->action_chain.chain.ap_effect_bonus,
@@ -929,9 +929,9 @@ void Card::compute_action_chain_results(bool apply_action_conditions, bool ignor
     stat_swap_type = StatSwapType::NONE;
   } else {
     stat_swap_type = s->card_special->compute_stat_swap_type(this->shared_from_this());
-    log.debug("stat_swap_type = %zu (0=none, 1=a/t, 2=a/h)", static_cast<size_t>(stat_swap_type));
+    log.debug_f("stat_swap_type = {} (0=none, 1=a/t, 2=a/h)", static_cast<size_t>(stat_swap_type));
     s->card_special->get_effective_ap_tp(stat_swap_type, &effective_ap, &effective_tp, this->get_current_hp(), this->ap, this->tp);
-    log.debug("effective_ap = %hd, effective_tp = %hd", effective_ap, effective_tp);
+    log.debug_f("effective_ap = {}, effective_tp = {}", effective_ap, effective_tp);
   }
 
   // This option doesn't exist in NTE
@@ -942,7 +942,7 @@ void Card::compute_action_chain_results(bool apply_action_conditions, bool ignor
     if (ce) {
       effective_ap += ce->def.ap.stat;
       effective_tp += ce->def.tp.stat;
-      log.debug("(action card @%04hX) updated effective_ap = %hd, effective_tp = %hd", this->action_chain.chain.attack_action_card_refs[z].load(), effective_ap, effective_tp);
+      log.debug_f("(action card @{:04X}) updated effective_ap = {}, effective_tp = {}", this->action_chain.chain.attack_action_card_refs[z], effective_ap, effective_tp);
     }
   }
 
@@ -957,7 +957,7 @@ void Card::compute_action_chain_results(bool apply_action_conditions, bool ignor
             stat_swap_type, &card_ap, &card_tp, card->get_current_hp(), card->ap, card->tp);
         effective_ap += card_ap;
         effective_tp += card_tp;
-        log.debug("(mag card set_index %zu @%04hX) updated effective_ap = %hd, effective_tp = %hd",
+        log.debug_f("(mag card set_index {} @{:04X}) updated effective_ap = {}, effective_tp = {}",
             set_index, card->get_card_ref(), effective_ap, effective_tp);
       }
     }
@@ -968,25 +968,25 @@ void Card::compute_action_chain_results(bool apply_action_conditions, bool ignor
     sc_card->compute_action_chain_results(apply_action_conditions, true);
     effective_ap += sc_card->action_chain.chain.effective_ap + sc_card->action_chain.chain.ap_effect_bonus;
     effective_tp += sc_card->action_chain.chain.effective_tp + sc_card->action_chain.chain.tp_effect_bonus;
-    log.debug("(item is attacking; adding SC stats) updated effective_ap = %hd, effective_tp = %hd",
+    log.debug_f("(item is attacking; adding SC stats) updated effective_ap = {}, effective_tp = {}",
         effective_ap, effective_tp);
   }
 
   if (!this->action_chain.check_flag(0x10)) {
     this->action_chain.chain.effective_ap = is_nte ? effective_ap : min<int16_t>(effective_ap, 99);
-    log.debug("set chain effective_ap = %hd", this->action_chain.chain.effective_ap);
+    log.debug_f("set chain effective_ap = {}", this->action_chain.chain.effective_ap);
   }
   if (!this->action_chain.check_flag(0x20)) {
     this->action_chain.chain.effective_tp = is_nte ? effective_tp : min<int16_t>(effective_tp, 99);
-    log.debug("set chain effective_tp = %hd", this->action_chain.chain.effective_tp);
+    log.debug_f("set chain effective_tp = {}", this->action_chain.chain.effective_tp);
   }
 
   if (apply_action_conditions) {
     auto this_sh = this->shared_from_this();
     s->card_special->apply_action_conditions(EffectWhen::BEFORE_ANY_CARD_ATTACK, this_sh, this_sh, 1, nullptr);
-    log.debug("applied action conditions (1)");
+    log.debug_f("applied action conditions (1)");
   } else {
-    log.debug("skipped applying action conditions (1)");
+    log.debug_f("skipped applying action conditions (1)");
   }
 
   size_t num_assists = s->assist_server->compute_num_assist_effects_for_client(this->client_id);
@@ -1106,29 +1106,29 @@ void Card::compute_action_chain_results(bool apply_action_conditions, bool ignor
   int16_t damage = 0;
   if (this->action_chain.chain.attack_medium == AttackMedium::TECH) {
     damage = this->action_chain.chain.effective_tp + this->action_chain.chain.tp_effect_bonus;
-    log.debug("(tech) damage = %hhd (eff) + %hhd (bonus) = %hd", this->action_chain.chain.effective_tp, this->action_chain.chain.tp_effect_bonus, damage);
+    log.debug_f("(tech) damage = {} (eff) + {} (bonus) = {}", this->action_chain.chain.effective_tp, this->action_chain.chain.tp_effect_bonus, damage);
   } else if (this->action_chain.chain.attack_medium == AttackMedium::PHYSICAL) {
     damage = this->action_chain.chain.effective_ap + this->action_chain.chain.ap_effect_bonus;
-    log.debug("(physical) damage = %hhd (eff) + %hhd (bonus) = %hd", this->action_chain.chain.effective_ap, this->action_chain.chain.ap_effect_bonus, damage);
+    log.debug_f("(physical) damage = {} (eff) + {} (bonus) = {}", this->action_chain.chain.effective_ap, this->action_chain.chain.ap_effect_bonus, damage);
   } else {
-    log.debug("(unknown attack medium) damage = 0");
+    log.debug_f("(unknown attack medium) damage = 0");
   }
 
   this->action_chain.chain.damage = is_nte
       ? (damage * this->action_chain.chain.damage_multiplier)
       : min<int16_t>(damage * this->action_chain.chain.damage_multiplier, 99);
-  log.debug("overall chain damage = %hd (base) * %hhd (mult) = %hhd", damage, this->action_chain.chain.damage_multiplier, this->action_chain.chain.damage);
+  log.debug_f("overall chain damage = {} (base) * {} (mult) = {}", damage, this->action_chain.chain.damage_multiplier, this->action_chain.chain.damage);
 
   if (apply_action_conditions) {
     auto this_sh = this->shared_from_this();
     s->card_special->apply_action_conditions(EffectWhen::BEFORE_ANY_CARD_ATTACK, this_sh, this_sh, 2, nullptr);
-    log.debug("applied action conditions (2)");
+    log.debug_f("applied action conditions (2)");
     if (!is_nte && this->action_chain.check_flag(0x100)) {
       this->action_chain.chain.damage = min<int16_t>(this->action_chain.chain.damage + 5, 99);
-      log.debug("(has flag 0x100) chain damage = %hhd", this->action_chain.chain.damage);
+      log.debug_f("(has flag 0x100) chain damage = {}", this->action_chain.chain.damage);
     }
   } else {
-    log.debug("skipped applying action conditions (2)");
+    log.debug_f("skipped applying action conditions (2)");
   }
 
   if (!is_nte) {
@@ -1156,9 +1156,9 @@ void Card::compute_action_chain_results(bool apply_action_conditions, bool ignor
     }
   }
 
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
     string chain_str = this->action_chain.str(s);
-    log.debug("result computed as %s", chain_str.c_str());
+    log.debug_f("result computed as {}", chain_str);
   }
 }
 
@@ -1226,24 +1226,24 @@ void Card::move_phase_before() {
 
 void Card::unknown_80236374(shared_ptr<Card> other_card, const ActionState* as) {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("unknown_80236374(@%04hX #%04hX, @%04hX #%04hX): ", this->get_card_ref(), this->get_card_id(), other_card->get_card_ref(), other_card->get_card_id()));
+  auto log = s->log_stack(std::format("unknown_80236374(@{:04X} #{:04X}, @{:04X} #{:04X}): ", this->get_card_ref(), this->get_card_id(), other_card->get_card_ref(), other_card->get_card_id()));
 
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
     if (as) {
       string as_str = as->str(s);
-      log.debug("as = %s", as_str.c_str());
+      log.debug_f("as = {}", as_str);
     } else {
-      log.debug("as = null");
+      log.debug_f("as = null");
     }
   }
 
   auto check_card = [&](shared_ptr<Card> card) -> void {
     if (card) {
       if (!card->unknown_80236554(other_card, as)) {
-        log.debug("check_card @%04hX #%04hX => false", card->get_card_ref(), card->get_card_id());
+        log.debug_f("check_card @{:04X} #{:04X} => false", card->get_card_ref(), card->get_card_id());
         card->action_metadata.clear_flags(0x20);
       } else {
-        log.debug("check_card @%04hX #%04hX => true", card->get_card_ref(), card->get_card_id());
+        log.debug_f("check_card @{:04X} #{:04X} => true", card->get_card_ref(), card->get_card_id());
         card->action_metadata.set_flags(0x20);
       }
     }
@@ -1378,14 +1378,14 @@ bool Card::is_guard_item() const {
 bool Card::unknown_80236554(shared_ptr<Card> other_card, const ActionState* as) {
   auto s = this->server();
   auto log = s->log_stack(other_card
-          ? phosg::string_printf("unknown_80236554(@%04hX #%04hX, @%04hX #%04hX): ", this->get_card_ref(), this->get_card_id(), other_card->get_card_ref(), other_card->get_card_id())
-          : phosg::string_printf("unknown_80236554(@%04hX #%04hX, null): ", this->get_card_ref(), this->get_card_id()));
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
+          ? std::format("unknown_80236554(@{:04X} #{:04X}, @{:04X} #{:04X}): ", this->get_card_ref(), this->get_card_id(), other_card->get_card_ref(), other_card->get_card_id())
+          : std::format("unknown_80236554(@{:04X} #{:04X}, null): ", this->get_card_ref(), this->get_card_id()));
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
     if (as) {
       string as_str = as->str(s);
-      log.debug("as = %s", as_str.c_str());
+      log.debug_f("as = {}", as_str);
     } else {
-      log.debug("as = null");
+      log.debug_f("as = null");
     }
   }
 
@@ -1398,7 +1398,7 @@ bool Card::unknown_80236554(shared_ptr<Card> other_card, const ActionState* as)
         if (other_card->action_chain.chain.target_card_refs[z] == this->get_card_ref()) {
           attack_bonus = other_card->action_chain.chain.damage;
           ret = true;
-          log.debug("attack_bonus = %hd (matched other_card->action_chain.chain.target_card_refs)", attack_bonus);
+          log.debug_f("attack_bonus = {} (matched other_card->action_chain.chain.target_card_refs)", attack_bonus);
           break;
         }
       }
@@ -1406,7 +1406,7 @@ bool Card::unknown_80236554(shared_ptr<Card> other_card, const ActionState* as)
       for (size_t z = 0; (z < 4 * 9) && (as->target_card_refs[z] != 0xFFFF); z++) {
         if (as->target_card_refs[z] == this->get_card_ref()) {
           attack_bonus = other_card->action_chain.chain.damage;
-          log.debug("attack_bonus = %hd (matched as->target_card_refs)", attack_bonus);
+          log.debug_f("attack_bonus = {} (matched as->target_card_refs)", attack_bonus);
           ret = true;
           break;
         }
@@ -1415,26 +1415,26 @@ bool Card::unknown_80236554(shared_ptr<Card> other_card, const ActionState* as)
   }
 
   this->action_metadata.attack_bonus = max<int16_t>(attack_bonus, 0);
-  log.debug("attack_bonus = %hhd", this->action_metadata.attack_bonus);
+  log.debug_f("attack_bonus = {}", this->action_metadata.attack_bonus);
   this->last_attack_preliminary_damage = 0;
   this->last_attack_final_damage = 0;
-  log.debug("last attack damage stats cleared");
+  log.debug_f("last attack damage stats cleared");
 
   if (other_card) {
-    log.debug("applying BEFORE_ANY_CARD_ATTACK conditions");
+    log.debug_f("applying BEFORE_ANY_CARD_ATTACK conditions");
     s->card_special->apply_action_conditions(
         EffectWhen::BEFORE_ANY_CARD_ATTACK, other_card, this->shared_from_this(), 0x20, as);
-    log.debug("applying BEFORE_THIS_CARD_ATTACKED conditions");
+    log.debug_f("applying BEFORE_THIS_CARD_ATTACKED conditions");
     s->card_special->apply_action_conditions(
         EffectWhen::BEFORE_THIS_CARD_ATTACKED, other_card, this->shared_from_this(), 0x40, as);
     if (other_card->action_chain.check_flag(0x20000)) {
-      log.debug("attack_bonus cleared due to cancellation");
+      log.debug_f("attack_bonus cleared due to cancellation");
       this->action_metadata.attack_bonus = 0;
       return ret;
     }
   }
   if (this->card_flags & 2) {
-    log.debug("attack_bonus cleared due to destruction");
+    log.debug_f("attack_bonus cleared due to destruction");
     this->action_metadata.attack_bonus = 0;
   }
   return ret;
@@ -1464,7 +1464,7 @@ void Card::apply_attack_result() {
   auto ps = this->player_state();
   bool is_nte = s->options.is_nte();
 
-  auto log = s->log_stack(phosg::string_printf("apply_attack_result(@%04hX #%04hX): ", this->get_card_ref(), this->get_card_id()));
+  auto log = s->log_stack(std::format("apply_attack_result(@{:04X} #{:04X}): ", this->get_card_ref(), this->get_card_id()));
   if (!this->action_chain.can_apply_attack()) {
     return;
   }
@@ -1573,9 +1573,9 @@ void Card::apply_attack_result() {
       }
     }
 
-    if (log.should_log(phosg::LogLevel::DEBUG)) {
+    if (log.should_log(phosg::LogLevel::L_DEBUG)) {
       string as_str = as.str(s);
-      log.debug("as constructed as %s", as_str.c_str());
+      log.debug_f("as constructed as {}", as_str);
     }
 
     for (size_t z = 0; z < this->action_chain.chain.target_card_ref_count; z++) {
@@ -1583,36 +1583,36 @@ void Card::apply_attack_result() {
       if (card) {
         card->current_defense_power = card->action_metadata.attack_bonus;
         if (!this->action_chain.check_flag(0x40)) {
-          log.debug("unknown_8024A6DC(@%04hX #%04hX) ...", card->get_card_ref(), card->get_card_id());
+          log.debug_f("unknown_8024A6DC(@{:04X} #{:04X}) ...", card->get_card_ref(), card->get_card_id());
           s->card_special->unknown_8024A6DC(this->shared_from_this(), card);
         }
       }
     }
 
-    log.debug("compute_action_chain_results 1 ...");
+    log.debug_f("compute_action_chain_results 1 ...");
     this->compute_action_chain_results(true, false);
 
     if (!this->action_chain.check_flag(0x40)) {
-      log.debug("apply_effects_before_attack ...");
+      log.debug_f("apply_effects_before_attack ...");
       s->card_special->apply_effects_before_attack(this->shared_from_this());
     }
     if (!(this->card_flags & 2)) {
-      log.debug("compute_action_chain_results 2 ...");
+      log.debug_f("compute_action_chain_results 2 ...");
       this->compute_action_chain_results(true, false);
-      log.debug("check_for_attack_interference ...");
+      log.debug_f("check_for_attack_interference ...");
       s->card_special->check_for_attack_interference(this->shared_from_this());
     }
-    log.debug("compute_action_chain_results 3 ...");
+    log.debug_f("compute_action_chain_results 3 ...");
     this->compute_action_chain_results(true, false);
 
-    log.debug("unknown_80236374 ...");
+    log.debug_f("unknown_80236374 ...");
     this->unknown_80236374(this->shared_from_this(), nullptr);
-    log.debug("execute_attack_on_all_valid_targets ...");
+    log.debug_f("execute_attack_on_all_valid_targets ...");
     this->execute_attack_on_all_valid_targets(this->shared_from_this());
   }
 
   if (!this->action_chain.check_flag(0x40)) {
-    log.debug("apply_effects_after_attack ...");
+    log.debug_f("apply_effects_after_attack ...");
     s->card_special->apply_effects_after_attack(this->shared_from_this());
   }
   ps->stats.num_attacks_given++;
@@ -1625,7 +1625,7 @@ void Card::apply_attack_result() {
     for (size_t client_id = 0; client_id < 4; client_id++) {
       auto ps = s->player_states[client_id];
       if (ps) {
-        log.debug("unknown_8023C110(%zu) ...", client_id);
+        log.debug_f("unknown_8023C110({}) ...", client_id);
         ps->unknown_8023C110();
       }
     }

src/Episode3/CardSpecial.cc

@@ -21,7 +21,7 @@ static string refs_str_for_cards_vector(const vector<shared_ptr<T>>& cards) {
     if (!ret.empty()) {
       ret += ", ";
     }
-    ret += phosg::string_printf("@%04hX", ref_for_card(card));
+    ret += std::format("@{:04X}", ref_for_card(card));
   }
   return ret;
 }
@@ -89,45 +89,45 @@ uint32_t CardSpecial::AttackEnvStats::at(size_t index) const {
 }
 
 void CardSpecial::AttackEnvStats::print(FILE* stream) const {
-  fprintf(stream, "(a)   total_num_set_cards                = %" PRIu32 "\n", this->total_num_set_cards);
-  fprintf(stream, "(ab)  num_a_beast_creatures              = %" PRIu32 "\n", this->num_a_beast_creatures);
-  fprintf(stream, "(ac)  player_num_atk_points              = %" PRIu32 "\n", this->player_num_atk_points);
-  fprintf(stream, "(adm) sc_effective_ap                    = %" PRIu32 "\n", this->sc_effective_ap);
-  fprintf(stream, "(ap)  effective_ap                       = %" PRIu32 "\n", this->effective_ap);
-  fprintf(stream, "(bi)  num_native_creatures               = %" PRIu32 "\n", this->num_native_creatures);
-  fprintf(stream, "(cs)  card_cost                          = %" PRIu32 "\n", this->card_cost);
-  fprintf(stream, "(d)   dice_roll_value1                   = %" PRIu32 "\n", this->dice_roll_value1);
-  fprintf(stream, "(dc)  dice_roll_value2                   = %" PRIu32 "\n", this->dice_roll_value2);
-  fprintf(stream, "(ddm) attack_bonus                       = %" PRIu32 "\n", this->attack_bonus);
-  fprintf(stream, "(df)  num_destroyed_ally_fcs             = %" PRIu32 "\n", this->num_destroyed_ally_fcs);
-  fprintf(stream, "(dk)  num_dark_creatures                 = %" PRIu32 "\n", this->num_dark_creatures);
-  fprintf(stream, "(dm)  effective_ap_if_not_tech           = %" PRIu32 "\n", this->effective_ap_if_not_tech);
-  fprintf(stream, "(dn)  unknown_a1                         = %" PRIu32 "\n", this->unknown_a1);
-  fprintf(stream, "(edm) target_attack_bonus                = %" PRIu32 "\n", this->target_attack_bonus);
-  fprintf(stream, "(ef)  non_target_team_num_set_cards      = %" PRIu32 "\n", this->non_target_team_num_set_cards);
-  fprintf(stream, "(ehp) target_current_hp                  = %" PRIu32 "\n", this->target_current_hp);
-  fprintf(stream, "(f)   num_set_cards                      = %" PRIu32 "\n", this->num_set_cards);
-  fprintf(stream, "(fdm) final_last_attack_damage           = %" PRIu32 "\n", this->final_last_attack_damage);
-  fprintf(stream, "(ff)  target_team_num_set_cards          = %" PRIu32 "\n", this->target_team_num_set_cards);
-  fprintf(stream, "(gn)  num_gun_type_items                 = %" PRIu32 "\n", this->num_gun_type_items);
-  fprintf(stream, "(hf)  num_item_or_creature_cards_in_hand = %" PRIu32 "\n", this->num_item_or_creature_cards_in_hand);
-  fprintf(stream, "(hp)  current_hp                         = %" PRIu32 "\n", this->current_hp);
-  fprintf(stream, "(kap) action_cards_ap                    = %" PRIu32 "\n", this->action_cards_ap);
-  fprintf(stream, "(ktp) action_cards_tp                    = %" PRIu32 "\n", this->action_cards_tp);
-  fprintf(stream, "(ldm) last_attack_preliminary_damage     = %" PRIu32 "\n", this->last_attack_preliminary_damage);
-  fprintf(stream, "(lv)  team_dice_bonus                    = %" PRIu32 "\n", this->team_dice_bonus);
-  fprintf(stream, "(mc)  num_machine_creatures              = %" PRIu32 "\n", this->num_machine_creatures);
-  fprintf(stream, "(mhp) max_hp                             = %" PRIu32 "\n", this->max_hp);
-  fprintf(stream, "(ndm) last_attack_damage_count           = %" PRIu32 "\n", this->last_attack_damage_count);
-  fprintf(stream, "(php) defined_max_hp                     = %" PRIu32 "\n", this->defined_max_hp);
-  fprintf(stream, "(rdm) last_attack_damage                 = %" PRIu32 "\n", this->last_attack_damage);
-  fprintf(stream, "(sa)  num_sword_type_items               = %" PRIu32 "\n", this->num_sword_type_items);
-  fprintf(stream, "(sat) num_sword_type_items_on_team       = %" PRIu32 "\n", this->num_sword_type_items_on_team);
-  fprintf(stream, "(tdm) effective_ap_if_not_physical       = %" PRIu32 "\n", this->effective_ap_if_not_physical);
-  fprintf(stream, "(tf)  player_num_destroyed_fcs           = %" PRIu32 "\n", this->player_num_destroyed_fcs);
-  fprintf(stream, "(tp)  effective_tp                       = %" PRIu32 "\n", this->effective_tp);
-  fprintf(stream, "(tt)  effective_ap_if_not_tech2          = %" PRIu32 "\n", this->effective_ap_if_not_tech2);
-  fprintf(stream, "(wd)  num_cane_type_items                = %" PRIu32 "\n", this->num_cane_type_items);
+  phosg::fwrite_fmt(stream, "(a)   total_num_set_cards                = {}\n", this->total_num_set_cards);
+  phosg::fwrite_fmt(stream, "(ab)  num_a_beast_creatures              = {}\n", this->num_a_beast_creatures);
+  phosg::fwrite_fmt(stream, "(ac)  player_num_atk_points              = {}\n", this->player_num_atk_points);
+  phosg::fwrite_fmt(stream, "(adm) sc_effective_ap                    = {}\n", this->sc_effective_ap);
+  phosg::fwrite_fmt(stream, "(ap)  effective_ap                       = {}\n", this->effective_ap);
+  phosg::fwrite_fmt(stream, "(bi)  num_native_creatures               = {}\n", this->num_native_creatures);
+  phosg::fwrite_fmt(stream, "(cs)  card_cost                          = {}\n", this->card_cost);
+  phosg::fwrite_fmt(stream, "(d)   dice_roll_value1                   = {}\n", this->dice_roll_value1);
+  phosg::fwrite_fmt(stream, "(dc)  dice_roll_value2                   = {}\n", this->dice_roll_value2);
+  phosg::fwrite_fmt(stream, "(ddm) attack_bonus                       = {}\n", this->attack_bonus);
+  phosg::fwrite_fmt(stream, "(df)  num_destroyed_ally_fcs             = {}\n", this->num_destroyed_ally_fcs);
+  phosg::fwrite_fmt(stream, "(dk)  num_dark_creatures                 = {}\n", this->num_dark_creatures);
+  phosg::fwrite_fmt(stream, "(dm)  effective_ap_if_not_tech           = {}\n", this->effective_ap_if_not_tech);
+  phosg::fwrite_fmt(stream, "(dn)  unknown_a1                         = {}\n", this->unknown_a1);
+  phosg::fwrite_fmt(stream, "(edm) target_attack_bonus                = {}\n", this->target_attack_bonus);
+  phosg::fwrite_fmt(stream, "(ef)  non_target_team_num_set_cards      = {}\n", this->non_target_team_num_set_cards);
+  phosg::fwrite_fmt(stream, "(ehp) target_current_hp                  = {}\n", this->target_current_hp);
+  phosg::fwrite_fmt(stream, "(f)   num_set_cards                      = {}\n", this->num_set_cards);
+  phosg::fwrite_fmt(stream, "(fdm) final_last_attack_damage           = {}\n", this->final_last_attack_damage);
+  phosg::fwrite_fmt(stream, "(ff)  target_team_num_set_cards          = {}\n", this->target_team_num_set_cards);
+  phosg::fwrite_fmt(stream, "(gn)  num_gun_type_items                 = {}\n", this->num_gun_type_items);
+  phosg::fwrite_fmt(stream, "(hf)  num_item_or_creature_cards_in_hand = {}\n", this->num_item_or_creature_cards_in_hand);
+  phosg::fwrite_fmt(stream, "(hp)  current_hp                         = {}\n", this->current_hp);
+  phosg::fwrite_fmt(stream, "(kap) action_cards_ap                    = {}\n", this->action_cards_ap);
+  phosg::fwrite_fmt(stream, "(ktp) action_cards_tp                    = {}\n", this->action_cards_tp);
+  phosg::fwrite_fmt(stream, "(ldm) last_attack_preliminary_damage     = {}\n", this->last_attack_preliminary_damage);
+  phosg::fwrite_fmt(stream, "(lv)  team_dice_bonus                    = {}\n", this->team_dice_bonus);
+  phosg::fwrite_fmt(stream, "(mc)  num_machine_creatures              = {}\n", this->num_machine_creatures);
+  phosg::fwrite_fmt(stream, "(mhp) max_hp                             = {}\n", this->max_hp);
+  phosg::fwrite_fmt(stream, "(ndm) last_attack_damage_count           = {}\n", this->last_attack_damage_count);
+  phosg::fwrite_fmt(stream, "(php) defined_max_hp                     = {}\n", this->defined_max_hp);
+  phosg::fwrite_fmt(stream, "(rdm) last_attack_damage                 = {}\n", this->last_attack_damage);
+  phosg::fwrite_fmt(stream, "(sa)  num_sword_type_items               = {}\n", this->num_sword_type_items);
+  phosg::fwrite_fmt(stream, "(sat) num_sword_type_items_on_team       = {}\n", this->num_sword_type_items_on_team);
+  phosg::fwrite_fmt(stream, "(tdm) effective_ap_if_not_physical       = {}\n", this->effective_ap_if_not_physical);
+  phosg::fwrite_fmt(stream, "(tf)  player_num_destroyed_fcs           = {}\n", this->player_num_destroyed_fcs);
+  phosg::fwrite_fmt(stream, "(tp)  effective_tp                       = {}\n", this->effective_tp);
+  phosg::fwrite_fmt(stream, "(tt)  effective_ap_if_not_tech2          = {}\n", this->effective_ap_if_not_tech2);
+  phosg::fwrite_fmt(stream, "(wd)  num_cane_type_items                = {}\n", this->num_cane_type_items);
 }
 
 CardSpecial::CardSpecial(shared_ptr<Server> server) : w_server(server) {}
@@ -251,14 +251,14 @@ void CardSpecial::apply_action_conditions(
   if (attacker_card == defender_card) {
     temp_as = this->create_attack_state_from_card_action_chain(attacker_card);
     if (as) {
-      log.debug("using action state from override");
+      log.debug_f("using action state from override");
       temp_as = *as;
     } else {
-      log.debug("using action state from attacker card");
+      log.debug_f("using action state from attacker card");
     }
   } else {
     temp_as = this->create_defense_state_for_card_pair_action_chains(attacker_card, defender_card);
-    log.debug("using action state from card pair");
+    log.debug_f("using action state from card pair");
   }
 
   this->apply_defense_conditions(temp_as, when, defender_card, flags);
@@ -307,9 +307,9 @@ bool CardSpecial::apply_defense_condition(
   bool is_nte = s->options.is_nte();
   auto log = s->log_stack("apply_defense_condition: ");
 
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
-    log.debug(
-        "when=%s, cond_index=%hhu, defender_card=(@%04hX #%04hX), flags=%08" PRIX32 ", p8=%s",
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
+    log.debug_f(
+        "when={}, cond_index={}, defender_card=(@{:04X} #{:04X}), flags={:08X}, p8={}",
         phosg::name_for_enum(when),
         cond_index,
         defender_card->get_card_ref(),
@@ -318,32 +318,32 @@ bool CardSpecial::apply_defense_condition(
         unknown_p8 ? "true" : "false");
     auto defender_cond_str = defender_cond->str(s);
     auto defense_state_str = defense_state.str(s);
-    log.debug("defender_cond = %s", defender_cond_str.c_str());
-    log.debug("defense_state = %s", defense_state_str.c_str());
+    log.debug_f("defender_cond = {}", defender_cond_str);
+    log.debug_f("defense_state = {}", defense_state_str);
   }
 
   if (defender_cond->type == ConditionType::NONE) {
-    log.debug("no condition");
+    log.debug_f("no condition");
     return false;
   }
 
   auto orig_eff = this->original_definition_for_condition(*defender_cond);
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
     auto orig_eff_str = orig_eff->str();
-    log.debug("orig_eff = %s", orig_eff_str.c_str());
+    log.debug_f("orig_eff = {}", orig_eff_str);
   }
 
   uint16_t attacker_card_ref = defense_state.attacker_card_ref;
   if (attacker_card_ref == 0xFFFF) {
     attacker_card_ref = defense_state.original_attacker_card_ref;
   }
-  log.debug("attacker_card_ref = @%04hX", attacker_card_ref);
+  log.debug_f("attacker_card_ref = @{:04X}", attacker_card_ref);
 
   bool defender_has_ability_trap = !is_nte && this->card_ref_has_ability_trap(*defender_cond);
-  log.debug("defender_has_ability_trap = %s", defender_has_ability_trap ? "true" : "false");
+  log.debug_f("defender_has_ability_trap = {}", defender_has_ability_trap ? "true" : "false");
 
   if ((is_nte || (flags & 4)) && !this->is_card_targeted_by_condition(*defender_cond, defense_state, defender_card)) {
-    log.debug("not targeted by condition");
+    log.debug_f("not targeted by condition");
     if (defender_cond->type != ConditionType::NONE) {
       G_ApplyConditionEffect_Ep3_6xB4x06 cmd;
       cmd.effect.flags = 0x04;
@@ -359,7 +359,7 @@ bool CardSpecial::apply_defense_condition(
   }
 
   if ((when == EffectWhen::AFTER_ANY_CARD_ATTACK) && (defender_cond->type == ConditionType::GUOM) && (flags & 4)) {
-    log.debug("deleting guom condition");
+    log.debug_f("deleting guom condition");
     CardShortStatus stat = defender_card->get_short_status();
     if (stat.card_flags & 4) {
       G_ApplyConditionEffect_Ep3_6xB4x06 cmd;
@@ -396,7 +396,7 @@ bool CardSpecial::apply_defense_condition(
   }
 
   if ((when == EffectWhen::BEFORE_DICE_PHASE_THIS_TEAM_TURN) && (flags & 4) && !defender_has_ability_trap && (defender_cond->type == ConditionType::ACID)) {
-    log.debug("applying acid");
+    log.debug_f("applying acid");
     int16_t hp = defender_card->get_current_hp();
     if (hp > 0) {
       this->send_6xB4x06_for_stat_delta(defender_card, defender_cond->card_ref, 0x20, -1, 0, 1);
@@ -406,11 +406,11 @@ bool CardSpecial::apply_defense_condition(
   }
 
   if (!orig_eff || (orig_eff->when != when)) {
-    log.debug("unsetting flag 4");
+    log.debug_f("unsetting flag 4");
     flags &= ~4;
   }
   if ((flags == 0) || defender_has_ability_trap) {
-    log.debug("no condition remains to apply");
+    log.debug_f("no condition remains to apply");
     return false;
   }
 
@@ -427,10 +427,10 @@ bool CardSpecial::apply_defense_condition(
 
   string expr = orig_eff->expr.decode();
   int16_t expr_value = this->evaluate_effect_expr(astats, expr.c_str(), dice_roll);
-  log.debug("execute_effect ...");
+  log.debug_f("execute_effect ...");
   this->execute_effect(*defender_cond, defender_card, expr_value, defender_cond->value, orig_eff->type, flags, attacker_card_ref);
   if (flags & 4) {
-    log.debug("recomputing action chaing results");
+    log.debug_f("recomputing action chaing results");
     if (is_nte || !(defender_card->card_flags & 2)) {
       defender_card->compute_action_chain_results(true, false);
     }
@@ -440,7 +440,7 @@ bool CardSpecial::apply_defense_condition(
   }
 
   if (dice_roll.value_used_in_expr && !(original_cond_flags & 1) && !unknown_p8) {
-    log.debug("dice roll was used; setting dice display flag");
+    log.debug_f("dice roll was used; setting dice display flag");
     defender_cond->flags |= 1;
     G_ApplyConditionEffect_Ep3_6xB4x06 cmd;
     cmd.effect.flags = 0x08;
@@ -491,11 +491,11 @@ bool CardSpecial::apply_stat_deltas_to_all_cards_from_all_conditions_with_card_r
 
 bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condition& cond, shared_ptr<Card> card) {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("apply_stat_deltas_to_card_from_condition_and_clear_cond(@%04hX #%04hX): ", card->get_card_ref(), card->get_card_id()));
+  auto log = s->log_stack(std::format("apply_stat_deltas_to_card_from_condition_and_clear_cond(@{:04X} #{:04X}): ", card->get_card_ref(), card->get_card_id()));
   bool is_nte = s->options.is_nte();
 
   string cond_str = cond.str(s);
-  log.debug("cond: %s", cond_str.c_str());
+  log.debug_f("cond: {}", cond_str);
 
   ConditionType cond_type = cond.type;
   int16_t cond_value = is_nte ? cond.value.load() : clamp<int16_t>(cond.value, -99, 99);
@@ -508,7 +508,7 @@ bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condit
       if (cond_flags & 2) {
         int16_t ap = clamp<int16_t>(card->ap, -99, 99);
         int16_t tp = clamp<int16_t>(card->tp, -99, 99);
-        log.debug("A_T_SWAP_0C: swapping AP (%hd) and TP (%hd)", ap, tp);
+        log.debug_f("A_T_SWAP_0C: swapping AP ({}) and TP ({})", ap, tp);
         if (!is_nte) {
           this->send_6xB4x06_for_stat_delta(card, cond_card_ref, 0xA0, tp - ap, 0, 0);
           this->send_6xB4x06_for_stat_delta(card, cond_card_ref, 0x80, ap - tp, 0, 0);
@@ -516,7 +516,7 @@ bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condit
         card->ap = tp;
         card->tp = ap;
       } else {
-        log.debug("A_T_SWAP_0C: required flag is missing");
+        log.debug_f("A_T_SWAP_0C: required flag is missing");
       }
       break;
     case ConditionType::A_H_SWAP:
@@ -524,7 +524,7 @@ bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condit
         int16_t ap = clamp<int16_t>(card->ap, -99, 99);
         int16_t hp = clamp<int16_t>(card->get_current_hp(), -99, 99);
         if (hp != ap) {
-          log.debug("A_H_SWAP: swapping AP (%hd) and HP (%hd)", ap, hp);
+          log.debug_f("A_H_SWAP: swapping AP ({}) and HP ({})", ap, hp);
           if (!is_nte) {
             this->send_6xB4x06_for_stat_delta(card, cond_card_ref, 0xA0, hp - ap, 0, 0);
             this->send_6xB4x06_for_stat_delta(card, cond_card_ref, 0x20, ap - hp, 0, 0);
@@ -533,10 +533,10 @@ bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condit
           card->ap = hp;
           this->destroy_card_if_hp_zero(card, cond_card_ref);
         } else {
-          log.debug("A_H_SWAP: AP (%hd) == HP (%hd)", ap, hp);
+          log.debug_f("A_H_SWAP: AP ({}) == HP ({})", ap, hp);
         }
       } else {
-        log.debug("A_H_SWAP: required flag is missing");
+        log.debug_f("A_H_SWAP: required flag is missing");
       }
       break;
     case ConditionType::AP_OVERRIDE:
@@ -550,12 +550,12 @@ bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condit
             this->send_6xB4x06_for_stat_delta(card, cond_card_ref, 0xA0, -cond_value, 0, 0);
           }
           card->ap = max<int16_t>(card->ap - cond_value, 0);
-          log.debug("AP_OVERRIDE: subtracting %hd from AP => %hd", cond_value, card->ap);
+          log.debug_f("AP_OVERRIDE: subtracting {} from AP => {}", cond_value, card->ap);
         } else {
           other_cond->value = clamp<int16_t>(other_cond->value + cond_value, -99, 99);
         }
       } else {
-        log.debug("AP_OVERRIDE: required flag is missing");
+        log.debug_f("AP_OVERRIDE: required flag is missing");
       }
       break;
     case ConditionType::TP_OVERRIDE:
@@ -567,12 +567,12 @@ bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condit
             this->send_6xB4x06_for_stat_delta(card, cond_card_ref, 0x80, -cond_value, 0, 0);
           }
           card->tp = max<int16_t>(card->tp - cond_value, 0);
-          log.debug("TP_OVERRIDE: subtracting %hd from TP => %hd", cond_value, card->tp);
+          log.debug_f("TP_OVERRIDE: subtracting {} from TP => {}", cond_value, card->tp);
         } else {
           other_cond->value = clamp<int16_t>(other_cond->value + cond_value, -99, 99);
         }
       } else {
-        log.debug("TP_OVERRIDE: required flag is missing");
+        log.debug_f("TP_OVERRIDE: required flag is missing");
       }
       break;
     case ConditionType::MISC_AP_BONUSES:
@@ -581,9 +581,9 @@ bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condit
           this->send_6xB4x06_for_stat_delta(card, cond_card_ref, 0xA0, -cond_value, 0, 0);
         }
         card->ap = max<int16_t>(card->ap - cond_value, 0);
-        log.debug("MISC_AP_BONUSES: subtracting %hd from AP => %hd", cond_value, card->ap);
+        log.debug_f("MISC_AP_BONUSES: subtracting {} from AP => {}", cond_value, card->ap);
       } else {
-        log.debug("MISC_AP_BONUSES: required flag is missing");
+        log.debug_f("MISC_AP_BONUSES: required flag is missing");
       }
       break;
     case ConditionType::MISC_TP_BONUSES:
@@ -592,9 +592,9 @@ bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condit
           this->send_6xB4x06_for_stat_delta(card, cond_card_ref, 0x80, -cond_value, 0, 0);
         }
         card->tp = max<int16_t>(card->tp - cond_value, 0);
-        log.debug("MISC_TP_BONUSES: subtracting %hd from TP => %hd", cond_value, card->tp);
+        log.debug_f("MISC_TP_BONUSES: subtracting {} from TP => {}", cond_value, card->tp);
       } else {
-        log.debug("MISC_TP_BONUSES: required flag is missing");
+        log.debug_f("MISC_TP_BONUSES: required flag is missing");
       }
       break;
     case ConditionType::AP_SILENCE:
@@ -604,9 +604,9 @@ bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condit
       if (cond_flags & 2) {
         this->send_6xB4x06_for_stat_delta(card, cond_card_ref, 0xA0, cond_value, 0, 0);
         card->ap = max<int16_t>(card->ap + cond_value, 0);
-        log.debug("AP_SILENCE: adding %hd to AP => %hd", cond_value, card->ap);
+        log.debug_f("AP_SILENCE: adding {} to AP => {}", cond_value, card->ap);
       } else {
-        log.debug("AP_SILENCE: required flag is missing");
+        log.debug_f("AP_SILENCE: required flag is missing");
       }
       break;
     case ConditionType::TP_SILENCE:
@@ -616,14 +616,14 @@ bool CardSpecial::apply_stat_deltas_to_card_from_condition_and_clear_cond(Condit
       if (cond_flags & 2) {
         this->send_6xB4x06_for_stat_delta(card, cond_card_ref, 0x80, cond_value, 0, 0);
         card->tp = max<int16_t>(card->tp + cond_value, 0);
-        log.debug("TP_SILENCE: adding %hd to TP => %hd", cond_value, card->tp);
+        log.debug_f("TP_SILENCE: adding {} to TP => {}", cond_value, card->tp);
       } else {
-        log.debug("TP_SILENCE: required flag is missing");
+        log.debug_f("TP_SILENCE: required flag is missing");
       }
       break;
     trial_unimplemented:
     default:
-      log.debug("%s: no adjustments for condition type", phosg::name_for_enum(cond_type));
+      log.debug_f("{}: no adjustments for condition type", phosg::name_for_enum(cond_type));
       break;
   }
 
@@ -741,22 +741,22 @@ CardSpecial::AttackEnvStats CardSpecial::compute_attack_env_stats(
   bool is_nte = s->options.is_nte();
 
   string pa_str = pa.str(s);
-  log.debug("pa=%s, card=@%04hX #%04hX, dice_roll=%hhu, target=@%04hX, condition_giver=@%04hX", pa_str.c_str(), card->get_card_ref(), card->get_card_id(), dice_roll.value, target_card_ref, condition_giver_card_ref);
+  log.debug_f("pa={}, card=@{:04X} #{:04X}, dice_roll={}, target=@{:04X}, condition_giver=@{:04X}", pa_str, card->get_card_ref(), card->get_card_id(), dice_roll.value, target_card_ref, condition_giver_card_ref);
 
   auto attacker_card = s->card_for_set_card_ref(pa.attacker_card_ref);
   if (!attacker_card && (pa.original_attacker_card_ref != 0xFFFF)) {
     attacker_card = s->card_for_set_card_ref(pa.original_attacker_card_ref);
-    log.debug("attacker=@%04hX #%04hX (from original)", attacker_card->get_card_ref(), attacker_card->get_card_id());
+    log.debug_f("attacker=@{:04X} #{:04X} (from original)", attacker_card->get_card_ref(), attacker_card->get_card_id());
   } else if (attacker_card) {
-    log.debug("attacker=@%04hX #%04hX (from set)", attacker_card->get_card_ref(), attacker_card->get_card_id());
+    log.debug_f("attacker=@{:04X} #{:04X} (from set)", attacker_card->get_card_ref(), attacker_card->get_card_id());
   } else {
-    log.debug("attacker=null (from set)");
+    log.debug_f("attacker=null (from set)");
   }
 
   AttackEnvStats ast;
 
   auto ps = card->player_state();
-  log.debug("base ps = %hhu", ps->client_id);
+  log.debug_f("base ps = {}", ps->client_id);
   ast.num_set_cards = is_nte ? ps->count_set_cards_for_env_stats_nte() : ps->count_set_cards();
   auto condition_giver_card = s->card_for_set_card_ref(condition_giver_card_ref);
   auto target_card = s->card_for_set_card_ref(target_card_ref);
@@ -871,8 +871,8 @@ CardSpecial::AttackEnvStats CardSpecial::compute_attack_env_stats(
   // Note: The (z < 8) conditions in these two loops are not present in the
   // original code.
   for (z = 0;
-       ((target_card_ref != z_ref) && (z < 8) && ((z_ref = pa.action_card_refs[z]) != 0xFFFF));
-       z++) {
+      ((target_card_ref != z_ref) && (z < 8) && ((z_ref = pa.action_card_refs[z]) != 0xFFFF));
+      z++) {
   }
 
   ast.action_cards_ap = 0;
@@ -1227,9 +1227,9 @@ shared_ptr<Card> CardSpecial::compute_replaced_target_based_on_conditions(
 
 StatSwapType CardSpecial::compute_stat_swap_type(shared_ptr<const Card> card) const {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("compute_stat_swap_type(@%04hX #%04hX): ", card->get_card_ref(), card->get_card_id()));
+  auto log = s->log_stack(std::format("compute_stat_swap_type(@{:04X} #{:04X}): ", card->get_card_ref(), card->get_card_id()));
   if (!card) {
-    log.debug("card is missing");
+    log.debug_f("card is missing");
     return StatSwapType::NONE;
   }
 
@@ -1237,33 +1237,33 @@ StatSwapType CardSpecial::compute_stat_swap_type(shared_ptr<const Card> card) co
   for (size_t cond_index = 0; cond_index < 9; cond_index++) {
     auto& cond = card->action_chain.conditions[cond_index];
     if (cond.type != ConditionType::NONE) {
-      auto cond_log = log.sub(phosg::string_printf("(%zu) ", cond_index));
+      auto cond_log = log.sub(std::format("({}) ", cond_index));
       string cond_str = cond.str(s);
-      cond_log.debug("%s", cond_str.c_str());
+      cond_log.debug_f("{}", cond_str);
       if (!this->card_ref_has_ability_trap(cond)) {
         if (cond.type == ConditionType::UNKNOWN_75) {
           if (ret == StatSwapType::A_H_SWAP) {
-            log.debug("UNKNOWN_75: clearing");
+            log.debug_f("UNKNOWN_75: clearing");
             ret = StatSwapType::NONE;
           } else {
-            log.debug("UNKNOWN_75: setting A_H_SWAP");
+            log.debug_f("UNKNOWN_75: setting A_H_SWAP");
             ret = StatSwapType::A_H_SWAP;
           }
         } else if (cond.type == ConditionType::A_T_SWAP) {
           if (ret == StatSwapType::A_T_SWAP) {
-            log.debug("A_T_SWAP: clearing");
+            log.debug_f("A_T_SWAP: clearing");
             ret = StatSwapType::NONE;
           } else {
-            log.debug("A_T_SWAP: setting A_T_SWAP");
+            log.debug_f("A_T_SWAP: setting A_T_SWAP");
             ret = StatSwapType::A_T_SWAP;
           }
         }
       } else {
-        log.debug("skipping due to ability trap");
+        log.debug_f("skipping due to ability trap");
       }
     }
   }
-  log.debug("ret = %zu", static_cast<size_t>(ret));
+  log.debug_f("ret = {}", static_cast<size_t>(ret));
   return ret;
 }
 
@@ -1713,8 +1713,8 @@ int32_t CardSpecial::evaluate_effect_expr(
     const char* expr,
     DiceRoll& dice_roll) const {
   auto log = this->server()->log_stack("evaluate_effect_expr: ");
-  if (log.min_level == phosg::LogLevel::DEBUG) {
-    log.debug("ast, expr=\"%s\", dice_roll=(client_id=%02hhX, a2=%02hhX, value=%02hhX, value_used_in_expr=%s, a5=%04hX)", expr, dice_roll.client_id, dice_roll.unknown_a2, dice_roll.value, dice_roll.value_used_in_expr ? "true" : "false", dice_roll.unknown_a5);
+  if (log.min_level == phosg::LogLevel::L_DEBUG) {
+    log.debug_f("ast, expr=\"{}\", dice_roll=(client_id={:02X}, a2={:02X}, value={:02X}, value_used_in_expr={}, a5={:04X})", expr, dice_roll.client_id, dice_roll.unknown_a2, dice_roll.value, dice_roll.value_used_in_expr ? "true" : "false", dice_roll.unknown_a5);
     ast.print(stderr);
   }
 
@@ -1747,7 +1747,7 @@ int32_t CardSpecial::evaluate_effect_expr(
   // Operators are evaluated left-to-right - there are no operator precedence
   // rules
   int32_t value = 0;
-  log.debug("value=%" PRId32 " (start)", value);
+  log.debug_f("value={} (start)", value);
   for (size_t token_index = 0; token_index < tokens.size(); token_index++) {
     auto token_type = tokens[token_index].first;
     int32_t token_value = tokens[token_index].second;
@@ -1756,7 +1756,7 @@ int32_t CardSpecial::evaluate_effect_expr(
     }
     if (token_type == ExpressionTokenType::NUMBER) {
       value = token_value;
-      log.debug("value=%" PRId32 " (token_type=NUMBER, token_value=%" PRId32 ")", value, token_value);
+      log.debug_f("value={} (token_type=NUMBER, token_value={})", value, token_value);
     } else {
       if (token_index >= tokens.size() - 1) {
         throw runtime_error("no token on right side of binary operator");
@@ -1770,23 +1770,23 @@ int32_t CardSpecial::evaluate_effect_expr(
       switch (token_type) {
         case ExpressionTokenType::ROUND_DIVIDE:
           value = lround(static_cast<double>(value) / right_value);
-          log.debug("value=%" PRId32 " (token_type=ROUND_DIVIDE, right_token_value=%" PRId32 ")", value, right_value);
+          log.debug_f("value={} (token_type=ROUND_DIVIDE, right_token_value={})", value, right_value);
           break;
         case ExpressionTokenType::SUBTRACT:
           value -= right_value;
-          log.debug("value=%" PRId32 " (token_type=SUBTRACT, right_token_value=%" PRId32 ")", value, right_value);
+          log.debug_f("value={} (token_type=SUBTRACT, right_token_value={})", value, right_value);
           break;
         case ExpressionTokenType::ADD:
           value += right_value;
-          log.debug("value=%" PRId32 " (token_type=ADD, right_token_value=%" PRId32 ")", value, right_value);
+          log.debug_f("value={} (token_type=ADD, right_token_value={})", value, right_value);
           break;
         case ExpressionTokenType::MULTIPLY:
           value *= right_value;
-          log.debug("value=%" PRId32 " (token_type=MULTIPLY, right_token_value=%" PRId32 ")", value, right_value);
+          log.debug_f("value={} (token_type=MULTIPLY, right_token_value={})", value, right_value);
           break;
         case ExpressionTokenType::FLOOR_DIVIDE:
           value = floor(value / right_value);
-          log.debug("value=%" PRId32 " (token_type=FLOOR_DIVIDE, right_token_value=%" PRId32 ")", value, right_value);
+          log.debug_f("value={} (token_type=FLOOR_DIVIDE, right_token_value={})", value, right_value);
           break;
         default:
           throw logic_error("invalid binary operator");
@@ -1794,7 +1794,7 @@ int32_t CardSpecial::evaluate_effect_expr(
     }
   }
 
-  log.debug("value=%" PRId32 " (result)", value);
+  log.debug_f("value={} (result)", value);
   return value;
 }
 
@@ -1807,10 +1807,10 @@ bool CardSpecial::execute_effect(
     uint32_t unknown_p7,
     uint16_t attacker_card_ref) {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("execute_effect(@%04hX #%04hX): ", card->get_card_ref(), card->get_card_id()));
+  auto log = s->log_stack(std::format("execute_effect(@{:04X} #{:04X}): ", card->get_card_ref(), card->get_card_id()));
   {
     string cond_str = cond.str(s);
-    log.debug("cond=%s, card=@%04hX, expr_value=%hd, unknown_p5=%hd, cond_type=%s, unknown_p7=%" PRIu32 ", attacker_card_ref=@%04hX", cond_str.c_str(), ref_for_card(card), expr_value, unknown_p5, phosg::name_for_enum(cond_type), unknown_p7, attacker_card_ref);
+    log.debug_f("cond={}, card=@{:04X}, expr_value={}, unknown_p5={}, cond_type={}, unknown_p7={} attacker_card_ref=@{:04X}", cond_str, ref_for_card(card), expr_value, unknown_p5, phosg::name_for_enum(cond_type), unknown_p7, attacker_card_ref);
   }
   bool is_nte = s->options.is_nte();
 
@@ -1959,7 +1959,7 @@ bool CardSpecial::execute_effect(
       if (unknown_p7 & 4) {
         int16_t hp = is_nte ? card->get_current_hp() : clamp<int16_t>(card->get_current_hp(), -99, 99);
         int16_t new_hp = is_nte ? (hp + positive_expr_value) : clamp<int16_t>(hp + positive_expr_value, -99, 99);
-        log.debug("HEAL: hp=%hd, positive_expr_value=%hd, new_hp=%hd", hp, positive_expr_value, new_hp);
+        log.debug_f("HEAL: hp={}, positive_expr_value={}, new_hp={}", hp, positive_expr_value, new_hp);
         this->send_6xB4x06_for_stat_delta(card, attacker_card_ref, 0x20, new_hp - hp, true, true);
         if (new_hp != hp) {
           card->set_current_hp(new_hp);
@@ -2842,8 +2842,8 @@ vector<shared_ptr<const Card>> CardSpecial::get_targeted_cards_for_condition(
     int16_t p_target_type,
     bool apply_usability_filters) const {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("get_targeted_cards_for_condition(@%04hX, %hhu, @%04hX): ", card_ref, def_effect_index, setter_card_ref));
-  log.debug("card_ref=@%04hX, def_effect_index=%02hhX, setter_card_ref=@%04hX, as, p_target_type=%hd, apply_usability_filters=%s", card_ref, def_effect_index, setter_card_ref, p_target_type, apply_usability_filters ? "true" : "false");
+  auto log = s->log_stack(std::format("get_targeted_cards_for_condition(@{:04X}, {}, @{:04X}): ", card_ref, def_effect_index, setter_card_ref));
+  log.debug_f("card_ref=@{:04X}, def_effect_index={:02X}, setter_card_ref=@{:04X}, as, p_target_type={}, apply_usability_filters={}", card_ref, def_effect_index, setter_card_ref, p_target_type, apply_usability_filters ? "true" : "false");
 
   vector<shared_ptr<const Card>> ret;
 
@@ -2852,12 +2852,12 @@ vector<shared_ptr<const Card>> CardSpecial::get_targeted_cards_for_condition(
   if (!card1) {
     card1 = s->card_for_set_card_ref(setter_card_ref);
   }
-  log.debug("card1=@%04hX", ref_for_card(card1));
+  log.debug_f("card1=@{:04X}", ref_for_card(card1));
 
   auto card2 = s->card_for_set_card_ref((as.attacker_card_ref == 0xFFFF)
           ? as.original_attacker_card_ref
           : as.attacker_card_ref);
-  log.debug("card2=@%04hX", ref_for_card(card2));
+  log.debug_f("card2=@{:04X}", ref_for_card(card2));
 
   Location card1_loc;
   if (!card1) {
@@ -2868,13 +2868,13 @@ vector<shared_ptr<const Card>> CardSpecial::get_targeted_cards_for_condition(
     this->get_card1_loc_with_card2_opposite_direction(&card1_loc, card1, card2);
 
     string card1_loc_str = card1_loc.str();
-    log.debug("card1_loc=%s", card1_loc_str.c_str());
+    log.debug_f("card1_loc={}", card1_loc_str);
   }
 
   AttackMedium attack_medium = card2
       ? card2->action_chain.chain.attack_medium
       : AttackMedium::UNKNOWN;
-  log.debug("attack_medium=%s", phosg::name_for_enum(attack_medium));
+  log.debug_f("attack_medium={}", phosg::name_for_enum(attack_medium));
 
   auto add_card_refs = [&](const vector<uint16_t>& result_card_refs) -> void {
     for (uint16_t result_card_ref : result_card_refs) {
@@ -2890,10 +2890,10 @@ vector<shared_ptr<const Card>> CardSpecial::get_targeted_cards_for_condition(
     case 0x05: { // p05
       auto result_card = s->card_for_set_card_ref(setter_card_ref);
       if (result_card) {
-        log.debug("(p01/p05) result_card=@%04hX", ref_for_card(result_card));
+        log.debug_f("(p01/p05) result_card=@{:04X}", ref_for_card(result_card));
         ret.emplace_back(result_card);
       } else {
-        log.debug("(p01/p05) result_card=null");
+        log.debug_f("(p01/p05) result_card=null");
       }
       break;
     }
@@ -3073,28 +3073,28 @@ vector<shared_ptr<const Card>> CardSpecial::get_targeted_cards_for_condition(
         if (def && ps) {
           // TODO: Again with the Gifoie hardcoding...
           uint16_t range_card_id = this->get_card_id_with_effective_range(card1, 0x00D9, card2);
-          log23.debug("effective range card ID is #%04hX", range_card_id);
+          log23.debug_f("effective range card ID is #{:04X}", range_card_id);
           parray<uint8_t, 9 * 9> range;
           compute_effective_range(range, s->options.card_index, range_card_id, card1_loc, s->map_and_rules, &log23);
           auto result_card_refs = ps->get_all_cards_within_range(range, card1_loc, 0xFF);
-          log23.debug("%zu result card refs", result_card_refs.size());
+          log23.debug_f("{} result card refs", result_card_refs.size());
           for (uint16_t result_card_ref : result_card_refs) {
-            auto result_log = log23.subf("(result @%04hX) ", result_card_ref);
+            auto result_log = log23.sub(std::format("(result @{:04X}) ", result_card_ref));
             auto result_card = s->card_for_set_card_ref(result_card_ref);
             if (!result_card) {
-              result_log.debug("result card not found");
+              result_log.debug_f("result card not found");
             } else if (result_card->get_definition()->def.type == CardType::ITEM) {
-              result_log.debug("result card is item");
+              result_log.debug_f("result card is item");
             } else {
-              result_log.debug("result card found and is not item");
+              result_log.debug_f("result card found and is not item");
               ret.emplace_back(result_card);
             }
           }
         } else {
-          log23.debug("def or ps is missing");
+          log23.debug_f("def or ps is missing");
         }
       } else {
-        log23.debug("card1 is missing");
+        log23.debug_f("card1 is missing");
       }
       break;
     }
@@ -3194,28 +3194,28 @@ vector<shared_ptr<const Card>> CardSpecial::get_targeted_cards_for_condition(
       };
       bool is_nte = s->options.is_nte();
       if (as.original_attacker_card_ref == 0xFFFF) {
-        log36.debug("original_attacker_card_ref missing");
+        log36.debug_f("original_attacker_card_ref missing");
         // debug_str_for_card_ref
         for (size_t z = 0; (z < 4 * 9) && (as.target_card_refs[z] != 0xFFFF); z++) {
           string debug_ref_str = s->debug_str_for_card_ref(as.target_card_refs[z]);
-          log36.debug("examining %s", debug_ref_str.c_str());
+          log36.debug_f("examining {}", debug_ref_str);
           auto result_card = s->card_for_set_card_ref(as.target_card_refs[z]);
           if (result_card && should_include(result_card->get_definition(), is_nte)) {
-            log36.debug("adding %s", debug_ref_str.c_str());
+            log36.debug_f("adding {}", debug_ref_str);
             ret.emplace_back(result_card);
           } else {
-            log36.debug("skipping %s", debug_ref_str.c_str());
+            log36.debug_f("skipping {}", debug_ref_str);
           }
         }
       } else if (card2 && should_include(card2->get_definition(), is_nte)) {
         string debug_ref_str = s->debug_str_for_card_ref(card2->get_card_ref());
-        log36.debug("original_attacker_card_ref present; adding card2 = %s", debug_ref_str.c_str());
+        log36.debug_f("original_attacker_card_ref present; adding card2 = {}", debug_ref_str);
         ret.emplace_back(card2);
       } else if (card2) {
         string debug_ref_str = s->debug_str_for_card_ref(card2->get_card_ref());
-        log36.debug("original_attacker_card_ref present and card2 (%s) not eligible", debug_ref_str.c_str());
+        log36.debug_f("original_attacker_card_ref present and card2 ({}) not eligible", debug_ref_str);
       } else {
-        log36.debug("original_attacker_card_ref present and card2 missing");
+        log36.debug_f("original_attacker_card_ref present and card2 missing");
       }
       break;
     }
@@ -3252,17 +3252,17 @@ vector<shared_ptr<const Card>> CardSpecial::get_targeted_cards_for_condition(
       ret = this->find_all_set_cards_with_cost_in_range(
           (p_target_type == 0x27) ? 4 : 0,
           (p_target_type == 0x27) ? 99 : 3);
-      if (log3940.should_log(phosg::LogLevel::DEBUG)) {
+      if (log3940.should_log(phosg::LogLevel::L_DEBUG)) {
         for (const auto& card : ret) {
-          log3940.debug("found target @%04hX #%04hX", card->get_card_ref(), card->get_card_id());
+          log3940.debug_f("found target @{:04X} #{:04X}", card->get_card_ref(), card->get_card_id());
         }
       }
       if (!s->options.is_nte()) {
-        log3940.debug("filtering targets");
+        log3940.debug_f("filtering targets");
         ret = this->filter_cards_by_range(ret, card1, card1_loc, card2);
-        if (log3940.should_log(phosg::LogLevel::DEBUG)) {
+        if (log3940.should_log(phosg::LogLevel::L_DEBUG)) {
           for (const auto& card : ret) {
-            log3940.debug("retained target @%04hX #%04hX", card->get_card_ref(), card->get_card_id());
+            log3940.debug_f("retained target @{:04X} #{:04X}", card->get_card_ref(), card->get_card_id());
           }
         }
       }
@@ -3497,9 +3497,9 @@ vector<shared_ptr<const Card>> CardSpecial::get_targeted_cards_for_condition(
       if (s->ruler_server->check_usability_or_apply_condition_for_card_refs(
               card_ref, setter_card_ref, c->get_card_ref(), def_effect_index, attack_medium)) {
         filtered_ret.emplace_back(c);
-        log.debug("usability filter: kept card @%04hX", ref_for_card(c));
+        log.debug_f("usability filter: kept card @{:04X}", ref_for_card(c));
       } else {
-        log.debug("usability filter: removed card @%04hX", ref_for_card(c));
+        log.debug_f("usability filter: removed card @{:04X}", ref_for_card(c));
       }
     }
     return filtered_ret;
@@ -3526,16 +3526,16 @@ bool CardSpecial::is_card_targeted_by_condition(
   auto s = this->server();
   auto log = s->log_stack("is_card_targeted_by_condition: ");
 
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
-    log.debug("card=(@%04hX #%04hX)", card->get_card_ref(), card->get_card_id());
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
+    log.debug_f("card=(@{:04X} #{:04X})", card->get_card_ref(), card->get_card_id());
     auto cond_str = cond.str(s);
     auto as_str = as.str(s);
-    log.debug("cond = %s", cond_str.c_str());
-    log.debug("as = %s", as_str.c_str());
+    log.debug_f("cond = {}", cond_str);
+    log.debug_f("as = {}", as_str);
   }
 
   if (cond.type == ConditionType::NONE) {
-    log.debug("condition is NONE (=> true)");
+    log.debug_f("condition is NONE (=> true)");
     return true;
   }
 
@@ -3546,12 +3546,12 @@ bool CardSpecial::is_card_targeted_by_condition(
       ((ce->def.type == CardType::ITEM) || ce->def.is_sc()) &&
       (cond.remaining_turns != 100) &&
       (s->options.is_nte() || (client_id_for_card_ref(card->get_card_ref()) == client_id_for_card_ref(cond.card_ref)))) {
-    log.debug("failed item or SC check (=> false)");
+    log.debug_f("failed item or SC check (=> false)");
     return false;
   }
 
   if (cond.remaining_turns != 102) {
-    log.debug("remaining_turns != 102 (=> true)");
+    log.debug_f("remaining_turns != 102 (=> true)");
     return true;
   }
 
@@ -3569,15 +3569,15 @@ bool CardSpecial::is_card_targeted_by_condition(
         0);
     for (auto c : target_cards) {
       if (c == card) {
-        log.debug("targeted by p condition (=> true)");
+        log.debug_f("targeted by p condition (=> true)");
         return true;
       }
     }
-    log.debug("not targeted by p condition (=> false)");
+    log.debug_f("not targeted by p condition (=> false)");
     return false;
   } else {
 
-    log.debug("SC check does not apply");
+    log.debug_f("SC check does not apply");
     return false;
   }
 }
@@ -3806,7 +3806,7 @@ size_t CardSpecial::sum_last_attack_damage(
   size_t damage_count = 0;
   auto check_card = [&](shared_ptr<const Card> c) -> void {
     if (c && (c->last_attack_final_damage > 0)) {
-      log.debug("check_card @%04hX #%04hX => %hd", c->get_card_ref(), c->get_card_id(), c->last_attack_final_damage);
+      log.debug_f("check_card @{:04X} #{:04X} => {}", c->get_card_ref(), c->get_card_id(), c->last_attack_final_damage);
       if (out_damage_sum) {
         *out_damage_sum += c->last_attack_final_damage;
       }
@@ -4013,13 +4013,13 @@ void CardSpecial::evaluate_and_apply_effects(
     bool apply_defense_condition_to_all_cards,
     uint16_t apply_defense_condition_to_card_ref) {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("evaluate_and_apply_effects(%s, @%04hX, @%04hX): ", phosg::name_for_enum(when), set_card_ref, sc_card_ref));
+  auto log = s->log_stack(std::format("evaluate_and_apply_effects({}, @{:04X}, @{:04X}): ", phosg::name_for_enum(when), set_card_ref, sc_card_ref));
   bool is_nte = s->options.is_nte();
 
   {
     string as_str = as.str(s);
-    log.debug("when=%s, set_card_ref=@%04hX, as=%s, sc_card_ref=@%04hX, apply_defense_condition_to_all_cards=%s, apply_defense_condition_to_card_ref=@%04hX",
-        phosg::name_for_enum(when), set_card_ref, as_str.c_str(), sc_card_ref, apply_defense_condition_to_all_cards ? "true" : "false", apply_defense_condition_to_card_ref);
+    log.debug_f("when={}, set_card_ref=@{:04X}, as={}, sc_card_ref=@{:04X}, apply_defense_condition_to_all_cards={}, apply_defense_condition_to_card_ref=@{:04X}",
+        phosg::name_for_enum(when), set_card_ref, as_str, sc_card_ref, apply_defense_condition_to_all_cards ? "true" : "false", apply_defense_condition_to_card_ref);
   }
 
   if (!is_nte) {
@@ -4028,7 +4028,7 @@ void CardSpecial::evaluate_and_apply_effects(
 
   auto ce = this->server()->definition_for_card_ref(set_card_ref);
   if (!ce) {
-    log.debug("ce missing");
+    log.debug_f("ce missing");
     return;
   }
 
@@ -4076,15 +4076,15 @@ void CardSpecial::evaluate_and_apply_effects(
   dice_roll.unknown_a2 = 3;
   dice_roll.value_used_in_expr = false;
 
-  log.debug("inputs: dice_roll=%02hhX, random_percent=%hhu, unknown_v1=%s", dice_roll.value, random_percent, unknown_v1 ? "true" : "false");
+  log.debug_f("inputs: dice_roll={:02X}, random_percent={}, unknown_v1={}", dice_roll.value, random_percent, unknown_v1 ? "true" : "false");
 
   for (size_t def_effect_index = 0; (def_effect_index < 3) && !unknown_v1 && (ce->def.effects[def_effect_index].type != ConditionType::NONE); def_effect_index++) {
-    auto effect_log = log.sub(phosg::string_printf("(effect:%zu) ", def_effect_index));
+    auto effect_log = log.sub(std::format("(effect:{}) ", def_effect_index));
     const auto& card_effect = ce->def.effects[def_effect_index];
     string card_effect_str = card_effect.str();
-    effect_log.debug("effect: %s", card_effect_str.c_str());
+    effect_log.debug_f("effect: {}", card_effect_str);
     if (card_effect.when != when) {
-      effect_log.debug("does not apply (effect.when=%s, when=%s)", phosg::name_for_enum(card_effect.when), phosg::name_for_enum(when));
+      effect_log.debug_f("does not apply (effect.when={}, when={})", phosg::name_for_enum(card_effect.when), phosg::name_for_enum(when));
       continue;
     }
 
@@ -4093,18 +4093,18 @@ void CardSpecial::evaluate_and_apply_effects(
       throw runtime_error("card effect arg3 is missing");
     }
     int16_t arg3_value = atoi(arg3_s.c_str() + 1);
-    effect_log.debug("arg3_value=%hd", arg3_value);
+    effect_log.debug_f("arg3_value={}", arg3_value);
     auto targeted_cards = this->get_targeted_cards_for_condition(
         set_card_ref, def_effect_index, sc_card_ref, as, arg3_value, 1);
     string refs_str = refs_str_for_cards_vector(targeted_cards);
-    effect_log.debug("targeted_cards=[%s]", refs_str.c_str());
+    effect_log.debug_f("targeted_cards=[{}]", refs_str);
     bool all_targets_matched = false;
     if (!is_nte &&
         !targeted_cards.empty() &&
         ((card_effect.type == ConditionType::UNKNOWN_64) ||
             (card_effect.type == ConditionType::MISC_DEFENSE_BONUSES) ||
             (card_effect.type == ConditionType::MOSTLY_HALFGUARDS))) {
-      effect_log.debug("special targeting applies");
+      effect_log.debug_f("special targeting applies");
       size_t count = 0;
       for (size_t z = 0; z < targeted_cards.size(); z++) {
         dice_roll.value_used_in_expr = false;
@@ -4132,22 +4132,22 @@ void CardSpecial::evaluate_and_apply_effects(
         targeted_cards.clear();
       }
     } else {
-      effect_log.debug("special targeting does not apply");
+      effect_log.debug_f("special targeting does not apply");
     }
 
     for (size_t z = 0; z < targeted_cards.size(); z++) {
-      auto target_log = effect_log.sub(phosg::string_printf("(target:@%04hX) ", targeted_cards[z]->get_card_ref()));
+      auto target_log = effect_log.sub(std::format("(target:@{:04X}) ", targeted_cards[z]->get_card_ref()));
       dice_roll.value_used_in_expr = false;
       string arg2_str = card_effect.arg2.decode();
-      target_log.debug("arg2_str = %s", arg2_str.c_str());
+      target_log.debug_f("arg2_str = {}", arg2_str);
       if (all_targets_matched ||
           this->evaluate_effect_arg2_condition(
               as, targeted_cards[z], arg2_str.c_str(), dice_roll, set_card_ref, sc_card_ref, random_percent, when)) {
-        target_log.debug("arg2 condition passed");
+        target_log.debug_f("arg2 condition passed");
         auto env_stats = this->compute_attack_env_stats(as, targeted_cards[z], dice_roll, set_card_ref, sc_card_ref);
         string expr_str = card_effect.expr.decode();
         int16_t value = this->evaluate_effect_expr(env_stats, expr_str.c_str(), dice_roll);
-        target_log.debug("expr = %s, value = %hd", expr_str.c_str(), value);
+        target_log.debug_f("expr = {}, value = {}", expr_str, value);
 
         uint32_t unknown_v1 = 0;
         auto target_card = this->compute_replaced_target_based_on_conditions(
@@ -4163,16 +4163,16 @@ void CardSpecial::evaluate_and_apply_effects(
             sc_card_ref);
         if (!target_card) {
           target_card = targeted_cards[z];
-          target_log.debug("target card (not replaced) = @%04hX", target_card->get_card_ref());
+          target_log.debug_f("target card (not replaced) = @{:04X}", target_card->get_card_ref());
         } else {
-          target_log.debug("target card (replaced) = @%04hX", target_card->get_card_ref());
+          target_log.debug_f("target card (replaced) = @{:04X}", target_card->get_card_ref());
         }
 
         ssize_t applied_cond_index = -1;
         if ((unknown_v1 == 0) && !this->should_cancel_condition_due_to_anti_abnormality(card_effect, target_card, dice_cmd.effect.target_card_ref, sc_card_ref)) {
           applied_cond_index = target_card->apply_abnormal_condition(
               card_effect, def_effect_index, dice_cmd.effect.target_card_ref, sc_card_ref, value, dice_roll.value, random_percent);
-          target_log.debug("applied abnormal condition");
+          target_log.debug_f("applied abnormal condition");
           // This debug_print call is in the original code.
           // this->debug_print(when, 4, &env_stats, "!set_abnormal..", target_card, card_effect.type);
         }
@@ -4202,12 +4202,12 @@ void CardSpecial::evaluate_and_apply_effects(
           if (apply_defense_condition_to_all_cards || (apply_defense_condition_to_card_ref == targeted_cards[z]->get_card_ref())) {
             this->apply_defense_condition(
                 when, &target_card->action_chain.conditions[applied_cond_index], applied_cond_index, as, target_card, 4, 1);
-            target_log.debug("applied defense condition");
+            target_log.debug_f("applied defense condition");
           }
         }
         target_card->send_6xB4x4E_4C_4D_if_needed(0);
       } else {
-        target_log.debug("arg2 condition failed");
+        target_log.debug_f("arg2 condition failed");
       }
       if (dice_roll.value_used_in_expr) {
         any_expr_used_dice_roll = true;
@@ -4712,73 +4712,73 @@ vector<shared_ptr<const Card>> CardSpecial::filter_cards_by_range(
     shared_ptr<const Card> card2) const {
   auto log = this->server()->log_stack("filter_cards_by_range: ");
 
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
-    auto card1_str = card1 ? phosg::string_printf("@%04hX #%04hX", card1->get_card_ref(), card1->get_card_id()) : "null";
-    auto card2_str = card2 ? phosg::string_printf("@%04hX #%04hX", card2->get_card_ref(), card2->get_card_id()) : "null";
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
+    auto card1_str = card1 ? std::format("@{:04X} #{:04X}", card1->get_card_ref(), card1->get_card_id()) : "null";
+    auto card2_str = card2 ? std::format("@{:04X} #{:04X}", card2->get_card_ref(), card2->get_card_id()) : "null";
     auto loc_str = card1_loc.str();
-    log.debug("card1=(%s), card2=(%s), loc=%s", card1_str.c_str(), card2_str.c_str(), loc_str.c_str());
+    log.debug_f("card1=({}), card2=({}), loc={}", card1_str, card2_str, loc_str);
 
     for (const auto& card : cards) {
       if (card) {
-        log.debug("input card: @%04hX #%04hX", card->get_card_ref(), card->get_card_id());
+        log.debug_f("input card: @{:04X} #{:04X}", card->get_card_ref(), card->get_card_id());
       } else {
-        log.debug("input card: null");
+        log.debug_f("input card: null");
       }
     }
   }
 
   vector<shared_ptr<const Card>> ret;
   if (!card1 || cards.empty()) {
-    log.debug("card1 missing or input list is blank");
+    log.debug_f("card1 missing or input list is blank");
     return ret;
   }
 
   auto ps = card1->player_state();
   if (!ps) {
-    log.debug("ps is missing");
+    log.debug_f("ps is missing");
     return ret;
   }
 
   // TODO: Remove hardcoded card ID here (Earthquake)
   uint16_t card_id = this->get_card_id_with_effective_range(card1, 0x00ED, card2);
-  log.debug("card_id = #%04hX", card_id);
+  log.debug_f("card_id = #{:04X}", card_id);
 
   parray<uint8_t, 9 * 9> range;
   compute_effective_range(range, this->server()->options.card_index, card_id, card1_loc, this->server()->map_and_rules);
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
     auto loc_str = card1_loc.str();
-    log.debug("compute_effective_range(range, ci, #%04hX, %s, map) =>", card_id, loc_str.c_str());
+    log.debug_f("compute_effective_range(range, ci, #{:04X}, {}, map) =>", card_id, loc_str);
     for (size_t y = 0; y < 9; y++) {
       const uint8_t* row = &range[y * 9];
-      log.debug("  range[%zu] = %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX",
+      log.debug_f("  range[{}] = {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X}",
           y, row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8]);
     }
   }
 
   auto card_refs_in_range = ps->get_card_refs_within_range_from_all_players(range, card1_loc, CardType::ITEM);
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
     for (uint16_t card_ref : card_refs_in_range) {
-      log.debug("ref in range: @%04hX", card_ref);
+      log.debug_f("ref in range: @{:04X}", card_ref);
     }
   }
 
   for (auto card : cards) {
     if (!card || (card->get_card_ref() == 0xFFFF)) {
       if (card) {
-        log.debug("(@%04hX #%04hX) out of range", card->get_card_ref(), card->get_card_id());
+        log.debug_f("(@{:04X} #{:04X}) out of range", card->get_card_ref(), card->get_card_id());
       } else {
-        log.debug("(null) card missing");
+        log.debug_f("(null) card missing");
       }
       continue;
     }
     for (uint16_t card_ref_in_range : card_refs_in_range) {
       if (card_ref_in_range == card->get_card_ref()) {
-        log.debug("(@%04hX #%04hX) in range", card->get_card_ref(), card->get_card_id());
+        log.debug_f("(@{:04X} #{:04X}) in range", card->get_card_ref(), card->get_card_id());
         ret.emplace_back(card);
         break;
       }
     }
-    log.debug("(@%04hX #%04hX) out of range", card->get_card_ref(), card->get_card_id());
+    log.debug_f("(@{:04X} #{:04X}) out of range", card->get_card_ref(), card->get_card_id());
   }
   return ret;
 }
@@ -4787,7 +4787,7 @@ void CardSpecial::apply_effects_after_attack_target_resolution(const ActionState
   auto s = this->server();
   auto log = s->log_stack("apply_effects_after_attack_target_resolution: ");
   string as_str = as.str(s);
-  log.debug("as=%s", as_str.c_str());
+  log.debug_f("as={}", as_str);
 
   for (size_t z = 0; (z < 8) && (as.action_card_refs[z] != 0xFFFF); z++) {
     uint16_t card_ref = this->send_6xB4x06_if_card_ref_invalid(as.action_card_refs[z], 0x1E);
@@ -4878,7 +4878,7 @@ void CardSpecial::dice_phase_before_for_card(shared_ptr<Card> card) {
 template <EffectWhen When1, EffectWhen When2>
 void CardSpecial::apply_effects_on_phase_change_t(shared_ptr<Card> unknown_p2, const ActionState* existing_as) {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("apply_effects_on_phase_change_t<%s, %s>(@%04hX #%04hX): ", phosg::name_for_enum(When1), phosg::name_for_enum(When2), unknown_p2->get_card_ref(), unknown_p2->get_card_id()));
+  auto log = s->log_stack(std::format("apply_effects_on_phase_change_t<{}, {}>(@{:04X} #{:04X}): ", phosg::name_for_enum(When1), phosg::name_for_enum(When2), unknown_p2->get_card_ref(), unknown_p2->get_card_id()));
   bool is_nte = s->options.is_nte();
 
   ActionState as;
@@ -4929,7 +4929,7 @@ void CardSpecial::unknown_8024945C(shared_ptr<Card> unknown_p2, const ActionStat
 }
 
 void CardSpecial::unknown_8024966C(shared_ptr<Card> unknown_p2, const ActionState* existing_as) {
-  auto log = this->server()->log_stack(phosg::string_printf("unknown_8024966C(@%04hX #%04hX): ", unknown_p2->get_card_ref(), unknown_p2->get_card_id()));
+  auto log = this->server()->log_stack(std::format("unknown_8024966C(@{:04X} #{:04X}): ", unknown_p2->get_card_ref(), unknown_p2->get_card_id()));
 
   ActionState as;
   if (!existing_as) {
@@ -5080,7 +5080,7 @@ template <
     EffectWhen WhenTargetsAndActionCards>
 void CardSpecial::apply_effects_before_or_after_attack(shared_ptr<Card> unknown_p2) {
   auto s = this->server();
-  auto log = s->log_stack(phosg::string_printf("apply_effects_before_or_after_attack<%s, %s, %s, %s>(@%04hX #%04hX): ",
+  auto log = s->log_stack(std::format("apply_effects_before_or_after_attack<{}, {}, {}, {}>(@{:04X} #{:04X}): ",
       phosg::name_for_enum(WhenAllCards), phosg::name_for_enum(WhenAttackerAndActionCards), phosg::name_for_enum(WhenAttackerOrHunterSCCard), phosg::name_for_enum(WhenTargetsAndActionCards), unknown_p2->get_card_ref(), unknown_p2->get_card_id()));
 
   ActionState as = this->create_attack_state_from_card_action_chain(unknown_p2);

src/Episode3/DataIndexes.hh

@@ -3,6 +3,7 @@
 #include <stdint.h>
 
 #include <array>
+#include <filesystem>
 #include <map>
 #include <memory>
 #include <phosg/Encoding.hh>
@@ -604,9 +605,10 @@ struct CardDefinition {
   // actions, and assist cards have 1 here.
   /* 008F */ uint8_t cannot_attack;
   /* 0090 */ uint8_t unused3;
-  // If cannot_drop is 0, this card can't appear in post-battle rewards. A
-  // value of 0 here also prevents the card from being used as a God Whim
-  // random assist.
+  // If cannot_drop is 1, this card can't appear in post-battle rewards and is
+  // considered unobtainable by players, so the game will remove it from the
+  // player's collection if they have any copies of it. A value of 1 here also
+  // prevents the card from being used as a God Whim random assist.
   /* 0091 */ uint8_t cannot_drop;
   // This criterion code specifies who can use the card, and when it can be
   // used. This specifies which Hero-side SCs can use which items, for example,
@@ -863,7 +865,8 @@ struct PlayerConfig {
   /* 0138:---- */ PlayerRecordsBattleBE unused_offline_records;
   /* 0150:---- */ parray<uint8_t, 4> unknown_a4;
   // The PlayerDataSegment structure begins here. In newserv, we combine this
-  // structure into PlayerConfig since the two are always used together.
+  // structure into PlayerConfig since the two are always used together on the
+  // server side.
   /* 0154:0000 */ uint8_t is_encrypted;
   /* 0155:0001 */ uint8_t basis;
   /* 0156:0002 */ parray<uint8_t, 2> unused;
@@ -936,6 +939,8 @@ struct PlayerConfig {
 
   void decrypt();
   void encrypt(uint8_t basis);
+
+  bool card_count_checksums_correct() const;
 } __packed_ws__(PlayerConfig, 0x2350);
 
 struct PlayerConfigNTE {
@@ -1131,9 +1136,16 @@ struct CompressedMapHeader { // .mnm file format
 struct OverlayState {
   // In the tiles array, the high 4 bits of each value are the tile type, and
   // the low 4 bits are the subtype. The types are:
-  // 10: blocked by rock (as if the corresponding map_tiles value was 00)
-  // 20: blocked by fence (as if the corresponding map_tiles value was 00)
-  // 30-34: teleporters (2 of each value may be present)
+  // 10-1F: blocked by rock (as if the corresponding map_tiles value was 00;
+  //   low 4 bits specify rotation in increments of 1/4 turn)
+  // 20-2F: blocked by fence (as if the corresponding map_tiles value was 00;
+  //   low 4 bits specify rotation in increments of 1/4 turn)
+  // 30-34: teleporters (each value should appear exactly twice or not at all):
+  //   30: purple teleporters
+  //   31: red teleporters
+  //   32: green teleporters
+  //   33: blue teleporters
+  //   34: purple teleporters (appears the same as 30 but is a distinct set)
   // 40-4F: traps on NTE
   // 40-44: traps on non-NTE (there may be up to 8 of each type, and one of
   //   each is chosen to be a real trap at battle start); the trap types are:
@@ -1559,8 +1571,8 @@ public:
   std::shared_ptr<const CardEntry> definition_for_name(const std::string& name) const;
   std::shared_ptr<const CardEntry> definition_for_name_normalized(const std::string& name) const;
   std::set<uint32_t> all_ids() const;
-  uint64_t definitions_mtime() const;
   phosg::JSON definitions_json() const;
+  uint64_t definitions_hash() const;
 
 private:
   static std::string normalize_card_name(const std::string& name);
@@ -1569,7 +1581,7 @@ private:
   std::unordered_map<uint32_t, std::shared_ptr<CardEntry>> card_definitions;
   std::unordered_map<std::string, std::shared_ptr<CardEntry>> card_definitions_by_name;
   std::unordered_map<std::string, std::shared_ptr<CardEntry>> card_definitions_by_name_normalized;
-  uint64_t mtime_for_card_definitions;
+  uint64_t defs_hash;
 };
 
 class MapIndex {

src/Episode3/DeckState.cc

@@ -187,7 +187,7 @@ void DeckState::restart() {
   this->shuffle();
 }
 
-void DeckState::do_mulligan(bool is_nte) {
+void DeckState::redraw_initial_hand(bool is_nte) {
   for (size_t z = 0; z < this->entries.size(); z++) {
     if (this->entries[z].state == CardState::DISCARDED) {
       this->entries[z].state = CardState::DRAWABLE;
@@ -308,7 +308,7 @@ static const char* name_for_card_state(DeckState::CardState st) {
 }
 
 void DeckState::print(FILE* stream, std::shared_ptr<const CardIndex> card_index) const {
-  fprintf(stream, "DeckState: client_id=%hhu draw_index=%hhu card_ref_base=@%04hX shuffle=%s loop=%s\n",
+  phosg::fwrite_fmt(stream, "DeckState: client_id={} draw_index={} card_ref_base=@{:04X} shuffle={} loop={}\n",
       this->client_id, this->draw_index, this->card_ref_base, this->shuffle_enabled ? "true" : "false", this->loop_enabled ? "true" : "false");
   for (size_t z = 0; z < 31; z++) {
     const auto& e = this->entries[z];
@@ -321,10 +321,10 @@ void DeckState::print(FILE* stream, std::shared_ptr<const CardIndex> card_index)
     }
     if (ce) {
       string name = ce->def.en_name.decode(1);
-      fprintf(stream, "  (%02zu) index=%02hhX ref=@%04hX card_id=#%04hX \"%s\" %s\n",
-          z, e.deck_index, this->card_refs[z], e.card_id, name.c_str(), name_for_card_state(e.state));
+      phosg::fwrite_fmt(stream, "  ({:02}) index={:02X} ref=@{:04X} card_id=#{:04X} \"{}\" {}\n",
+          z, e.deck_index, this->card_refs[z], e.card_id, name, name_for_card_state(e.state));
     } else {
-      fprintf(stream, "  (%02zu) index=%02hhX ref=@%04hX card_id=#%04hX %s\n",
+      phosg::fwrite_fmt(stream, "  ({:02}) index={:02X} ref=@{:04X} card_id=#{:04X} {}\n",
           z, e.deck_index, this->card_refs[z], e.card_id, name_for_card_state(e.state));
     }
   }

src/Episode3/DeckState.hh

@@ -96,7 +96,7 @@ public:
 
   void restart();
   void shuffle();
-  void do_mulligan(bool is_nte);
+  void redraw_initial_hand(bool is_nte);
 
   void print(FILE* stream, std::shared_ptr<const CardIndex> card_index = nullptr) const;
 

src/Episode3/MapState.cc

@@ -20,11 +20,11 @@ void MapState::clear() {
 }
 
 void MapState::print(FILE* stream) const {
-  fprintf(stream, "[Map: w=%hu h=%hu]\n", this->width.load(), this->height.load());
+  phosg::fwrite_fmt(stream, "[Map: w={} h={}]\n", this->width, this->height);
   for (size_t y = 0; y < this->height; y++) {
     fputc(' ', stream);
     for (size_t x = 0; x < this->width; x++) {
-      fprintf(stream, " %02hhX", this->tiles[y][x]);
+      phosg::fwrite_fmt(stream, " {:02X}", this->tiles[y][x]);
     }
     fputc('\n', stream);
   }

src/Episode3/PlayerState.cc

@@ -9,7 +9,7 @@ namespace Episode3 {
 PlayerState::PlayerState(uint8_t client_id, shared_ptr<Server> server)
     : w_server(server),
       client_id(client_id),
-      num_mulligans_allowed(1),
+      num_hand_redraws_allowed(1),
       sc_card_type(CardType::HUNTERS_SC),
       team_id(0xFF),
       atk_points(0),
@@ -705,14 +705,14 @@ void PlayerState::discard_set_assist_card() {
   s->destroy_cards_with_zero_hp();
 }
 
-bool PlayerState::do_mulligan() {
-  if (!this->is_mulligan_allowed()) {
+bool PlayerState::redraw_initial_hand() {
+  if (!this->is_hand_redraw_allowed()) {
     return false;
   }
 
   auto s = this->server();
 
-  this->num_mulligans_allowed--;
+  this->num_hand_redraws_allowed--;
   while (this->card_refs[0] != 0xFFFF) {
     this->discard_ref_from_hand(this->card_refs[0]);
   }
@@ -727,7 +727,7 @@ bool PlayerState::do_mulligan() {
     s->send(cmd);
   }
 
-  this->deck_state->do_mulligan(s->options.is_nte());
+  this->deck_state->redraw_initial_hand(s->options.is_nte());
   this->draw_hand(5);
 
   if (!s->options.is_nte()) {
@@ -841,7 +841,7 @@ vector<uint16_t> PlayerState::get_all_cards_within_range(
 
   auto log = s->log_stack("get_all_cards_within_range: ");
   string loc_str = loc.str();
-  log.debug("loc=%s, target_team_id=%02hhX", loc_str.c_str(), target_team_id);
+  log.debug_f("loc={}, target_team_id={:02X}", loc_str, target_team_id);
 
   vector<uint16_t> ret;
   for (size_t client_id = 0; client_id < 4; client_id++) {
@@ -939,8 +939,8 @@ size_t PlayerState::set_index_for_card_ref(uint16_t card_ref) const {
   return -1;
 }
 
-bool PlayerState::is_mulligan_allowed() const {
-  return (this->num_mulligans_allowed > 0);
+bool PlayerState::is_hand_redraw_allowed() const {
+  return (this->num_hand_redraws_allowed > 0);
 }
 
 bool PlayerState::is_team_turn() const {
@@ -1766,20 +1766,20 @@ bool PlayerState::set_action_cards_for_action_state(const ActionState& pa) {
 
   auto attacker_card = s->card_for_set_card_ref(pa.attacker_card_ref);
   if (attacker_card) {
-    log.debug("attacker card present");
+    log.debug_f("attacker card present");
     attacker_card->card_flags |= 0x100;
   }
 
   auto action_type = s->ruler_server->get_pending_action_type(pa);
   if (action_type == ActionType::DEFENSE) {
-    log.debug("action type is DEFENSE");
+    log.debug_f("action type is DEFENSE");
   } else if (action_type == ActionType::ATTACK) {
-    log.debug("action type is ATTACK");
+    log.debug_f("action type is ATTACK");
   } else {
-    log.debug("action type is UNKNOWN");
+    log.debug_f("action type is UNKNOWN");
   }
   if (!is_nte) {
-    log.debug("(non-nte) subtracting action points");
+    log.debug_f("(non-nte) subtracting action points");
     this->subtract_or_check_atk_or_def_points_for_action(pa, true);
   }
 
@@ -1787,7 +1787,7 @@ bool PlayerState::set_action_cards_for_action_state(const ActionState& pa) {
     auto card = s->card_for_set_card_ref(pa.attacker_card_ref);
     if (card) {
       card->loc.direction = pa.facing_direction;
-      log.debug("set facing direction to %s", phosg::name_for_enum(card->loc.direction));
+      log.debug_f("set facing direction to {}", phosg::name_for_enum(card->loc.direction));
 
       G_AddToSetCardLog_Ep3_6xB4x4A cmd;
       cmd.card_refs.clear(0xFFFF);
@@ -1796,9 +1796,9 @@ bool PlayerState::set_action_cards_for_action_state(const ActionState& pa) {
       cmd.entry_count = 0;
       size_t z = 0;
       do {
-        if (log.should_log(phosg::LogLevel::DEBUG)) {
+        if (log.should_log(phosg::LogLevel::L_DEBUG)) {
           string ref_str = s->debug_str_for_card_ref(pa.action_card_refs[z]);
-          log.debug("on action card ref %s", ref_str.c_str());
+          log.debug_f("on action card ref {}", ref_str);
         }
         card->unknown_80237A90(pa, pa.action_card_refs[z]);
         card->unknown_802379BC(pa.action_card_refs[z]);
@@ -1833,9 +1833,9 @@ bool PlayerState::set_action_cards_for_action_state(const ActionState& pa) {
     for (size_t z = 0; (z < 4 * 9) && (pa.target_card_refs[z] != 0xFFFF); z++) {
       auto target_card = s->card_for_set_card_ref(pa.target_card_refs[z]);
       if (target_card) {
-        if (log.should_log(phosg::LogLevel::DEBUG)) {
+        if (log.should_log(phosg::LogLevel::L_DEBUG)) {
           string ref_str = s->debug_str_for_card_ref(pa.target_card_refs[z]);
-          log.debug("on target card ref %s", ref_str.c_str());
+          log.debug_f("on target card ref {}", ref_str);
         }
         target_card->unknown_802379DC(pa);
         if (!is_nte) {
@@ -1859,13 +1859,13 @@ bool PlayerState::set_action_cards_for_action_state(const ActionState& pa) {
     }
   }
   if (is_nte) {
-    log.debug("(nte) subtracting action points");
+    log.debug_f("(nte) subtracting action points");
     this->subtract_or_check_atk_or_def_points_for_action(pa, 1);
   }
   for (size_t z = 0; (z < pa.action_card_refs.size()) && (pa.action_card_refs[z] != 0xFFFF); z++) {
-    if (log.should_log(phosg::LogLevel::DEBUG)) {
+    if (log.should_log(phosg::LogLevel::L_DEBUG)) {
       string ref_str = s->debug_str_for_card_ref(pa.action_card_refs[z]);
-      log.debug("discarding %s from hand", ref_str.c_str());
+      log.debug_f("discarding {} from hand", ref_str);
     }
     this->discard_ref_from_hand(pa.action_card_refs[z]);
   }

src/Episode3/PlayerState.hh

@@ -66,7 +66,7 @@ public:
   void discard_random_hand_card();
   bool discard_ref_from_hand(uint16_t card_ref);
   void discard_set_assist_card();
-  bool do_mulligan();
+  bool redraw_initial_hand();
   void draw_hand(ssize_t override_count = 0);
   void draw_initial_hand();
   int32_t error_code_for_client_setting_card(
@@ -95,7 +95,7 @@ public:
   uint8_t get_team_id() const;
   ssize_t hand_index_for_card_ref(uint16_t card_ref) const;
   size_t set_index_for_card_ref(uint16_t card_ref) const;
-  bool is_mulligan_allowed() const;
+  bool is_hand_redraw_allowed() const;
   bool is_team_turn() const;
   void log_discard(uint16_t card_ref, uint16_t reason);
   uint16_t pop_from_discard_log(uint16_t reason);
@@ -152,7 +152,7 @@ public:
   std::shared_ptr<Card> sc_card;
   bcarray<std::shared_ptr<Card>, 8> set_cards;
   uint8_t client_id;
-  uint16_t num_mulligans_allowed;
+  uint16_t num_hand_redraws_allowed;
   CardType sc_card_type;
   uint8_t team_id;
   uint8_t atk_points;

src/Episode3/PlayerStateSubordinates.cc

@@ -64,19 +64,19 @@ void Condition::clear_FF() {
 std::string Condition::str(shared_ptr<const Server> s) const {
   auto card_ref_str = s->debug_str_for_card_ref(this->card_ref);
   auto giver_ref_str = s->debug_str_for_card_ref(this->condition_giver_card_ref);
-  return phosg::string_printf(
-      "Condition[type=%s, turns=%hhu, a_arg=%hhd, dice=%hhu, flags=%02hhX, "
-      "def_eff_index=%hhu, ref=%s, value=%hd, giver_ref=%s "
-      "percent=%hhu value8=%hd order=%hu a8=%hu]",
+  return std::format(
+      "Condition[type={}, turns={}, a_arg={}, dice={}, flags={:02X}, "
+      "def_eff_index={}, ref={}, value={}, giver_ref={} "
+      "percent={} value8={} order={} a8={}]",
       phosg::name_for_enum(this->type),
       this->remaining_turns,
       this->a_arg_value,
       this->dice_roll_value,
       this->flags,
       this->card_definition_effect_index,
-      card_ref_str.c_str(),
-      this->value.load(),
-      giver_ref_str.c_str(),
+      card_ref_str,
+      this->value,
+      giver_ref_str,
       this->random_percent,
       this->value8,
       this->order,
@@ -103,12 +103,12 @@ void EffectResult::clear() {
 std::string EffectResult::str(shared_ptr<const Server> s) const {
   string attacker_ref_str = s->debug_str_for_card_ref(this->attacker_card_ref);
   string target_ref_str = s->debug_str_for_card_ref(this->target_card_ref);
-  return phosg::string_printf(
-      "EffectResult[att_ref=%s, target_ref=%s, value=%hhd, "
-      "cur_hp=%hhd, ap=%hhd, tp=%hhd, flags=%02hhX, op=%hhd, "
-      "cond_index=%hhu, dice=%hhu]",
-      attacker_ref_str.c_str(),
-      target_ref_str.c_str(),
+  return std::format(
+      "EffectResult[att_ref={}, target_ref={}, value={}, "
+      "cur_hp={}, ap={}, tp={}, flags={:02X}, op={}, "
+      "cond_index={}, dice={}]",
+      attacker_ref_str,
+      target_ref_str,
       this->value,
       this->current_hp,
       this->ap,
@@ -139,14 +139,14 @@ bool CardShortStatus::operator!=(const CardShortStatus& other) const {
 std::string CardShortStatus::str(shared_ptr<const Server> s) const {
   string loc_s = this->loc.str();
   string ref_str = s->debug_str_for_card_ref(this->card_ref);
-  return phosg::string_printf(
-      "CardShortStatus[ref=%s, cur_hp=%hd, flags=%08" PRIX32 ", loc=%s, "
-      "u1=%04hX, max_hp=%hhd, u2=%hhu]",
-      ref_str.c_str(),
-      this->current_hp.load(),
-      this->card_flags.load(),
-      loc_s.c_str(),
-      this->unused1.load(),
+  return std::format(
+      "CardShortStatus[ref={}, cur_hp={}, flags={:08X}, loc={}, "
+      "u1={:04X}, max_hp={}, u2={}]",
+      ref_str,
+      this->current_hp,
+      this->card_flags,
+      loc_s,
+      this->unused1,
       this->max_hp,
       this->unused2);
 }
@@ -193,18 +193,18 @@ std::string ActionState::str(shared_ptr<const Server> s) const {
   string original_attacker_ref_s = s->debug_str_for_card_ref(this->original_attacker_card_ref);
   string target_refs_s = s->debug_str_for_card_refs(this->target_card_refs);
   string action_refs_s = s->debug_str_for_card_refs(this->action_card_refs);
-  return phosg::string_printf(
-      "ActionState[client=%hX, u=%hhu, facing=%s, attacker_ref=%s, "
-      "def_ref=%s, target_refs=%s, action_refs=%s, "
-      "orig_attacker_ref=%s]",
-      this->client_id.load(),
+  return std::format(
+      "ActionState[client={:X}, u={}, facing={}, attacker_ref={}, "
+      "def_ref={}, target_refs={}, action_refs={}, "
+      "orig_attacker_ref={}]",
+      this->client_id,
       this->unused,
       phosg::name_for_enum(this->facing_direction),
-      attacker_ref_s.c_str(),
-      defense_ref_s.c_str(),
-      target_refs_s.c_str(),
-      action_refs_s.c_str(),
-      original_attacker_ref_s.c_str());
+      attacker_ref_s,
+      defense_ref_s,
+      target_refs_s,
+      action_refs_s,
+      original_attacker_ref_s);
 }
 
 ActionChain::ActionChain() {
@@ -243,20 +243,20 @@ std::string ActionChain::str(shared_ptr<const Server> s) const {
   string unknown_card_ref_a3_s = s->debug_str_for_card_ref(this->unknown_card_ref_a3);
   string attack_action_card_refs_s = s->debug_str_for_card_refs(this->attack_action_card_refs);
   string target_card_refs_s = s->debug_str_for_card_refs(this->target_card_refs);
-  return phosg::string_printf(
-      "ActionChain[eff_ap=%hhd, eff_tp=%hhd, ap_bonus=%hhd, damage=%hhd, "
-      "acting_ref=%s, unknown_ref_a3=%s, attack_action_refs=%s, "
-      "attack_action_ref_count=%hhu, medium=%s, target_ref_count=%hhu, "
-      "subphase=%s, strikes=%hhu, damage_mult=%hhd, attack_num=%hhu, "
-      "tp_bonus=%hhd, phys_bonus_nte=%hhu, tech_bonus_nte=%hhu, card_ap=%hhd, "
-      "card_tp=%hhd, flags=%08" PRIX32 ", target_refs=%s]",
+  return std::format(
+      "ActionChain[eff_ap={}, eff_tp={}, ap_bonus={}, damage={}, "
+      "acting_ref={}, unknown_ref_a3={}, attack_action_refs={}, "
+      "attack_action_ref_count={}, medium={}, target_ref_count={}, "
+      "subphase={}, strikes={}, damage_mult={}, attack_num={}, "
+      "tp_bonus={}, phys_bonus_nte={}, tech_bonus_nte={}, card_ap={}, "
+      "card_tp={}, flags={:08X}, target_refs={}]",
       this->effective_ap,
       this->effective_tp,
       this->ap_effect_bonus,
       this->damage,
-      acting_card_ref_s.c_str(),
-      unknown_card_ref_a3_s.c_str(),
-      attack_action_card_refs_s.c_str(),
+      acting_card_ref_s,
+      unknown_card_ref_a3_s,
+      attack_action_card_refs_s,
       this->attack_action_card_ref_count,
       phosg::name_for_enum(this->attack_medium),
       this->target_card_ref_count,
@@ -269,8 +269,8 @@ std::string ActionChain::str(shared_ptr<const Server> s) const {
       this->tech_attack_bonus_nte,
       this->card_ap,
       this->card_tp,
-      this->flags.load(),
-      target_card_refs_s.c_str());
+      this->flags,
+      target_card_refs_s);
 }
 
 void ActionChain::clear() {
@@ -341,7 +341,7 @@ std::string ActionChainWithConds::str(shared_ptr<const Server> s) const {
       if (ret.back() != '[') {
         ret += ", ";
       }
-      ret += phosg::string_printf("%zu:", z);
+      ret += std::format("{}:", z);
       ret += this->conditions[z].str(s);
     }
   }
@@ -580,22 +580,22 @@ std::string ActionMetadata::str(shared_ptr<const Server> s) const {
   string target_card_refs_s = s->debug_str_for_card_refs(this->target_card_refs);
   string defense_card_refs_s = s->debug_str_for_card_refs(this->defense_card_refs);
   string original_attacker_card_refs_s = s->debug_str_for_card_refs(this->original_attacker_card_refs);
-  return phosg::string_printf(
-      "ActionMetadata[ref=%s, target_ref_count=%hhu, def_ref_count=%hhu, "
-      "subphase=%s, def_power=%hhd, def_bonus=%hhd, "
-      "att_bonus=%hhd, flags=%08" PRIX32 ", target_refs=%s, "
-      "defense_refs=%s, original_attacker_refs=%s]",
-      card_ref_s.c_str(),
+  return std::format(
+      "ActionMetadata[ref={}, target_ref_count={}, def_ref_count={}, "
+      "subphase={}, def_power={}, def_bonus={}, "
+      "att_bonus={}, flags={:08X}, target_refs={}, "
+      "defense_refs={}, original_attacker_refs={}]",
+      card_ref_s,
       this->target_card_ref_count,
       this->defense_card_ref_count,
       phosg::name_for_enum(this->action_subphase),
       this->defense_power,
       this->defense_bonus,
       this->attack_bonus,
-      this->flags.load(),
-      target_card_refs_s.c_str(),
-      defense_card_refs_s.c_str(),
-      original_attacker_card_refs_s.c_str());
+      this->flags,
+      target_card_refs_s,
+      defense_card_refs_s,
+      original_attacker_card_refs_s);
 }
 
 void ActionMetadata::clear() {
@@ -683,13 +683,13 @@ std::string HandAndEquipState::str(shared_ptr<const Server> s) const {
   string set_card_refs_s = s->debug_str_for_card_refs(this->set_card_refs);
   string hand_card_refs2_s = s->debug_str_for_card_refs(this->hand_card_refs2);
   string set_card_refs2_s = s->debug_str_for_card_refs(this->set_card_refs2);
-  return phosg::string_printf(
-      "HandAndEquipState[dice=[%hhu, %hhu], atk=%hhu, def=%hhu, atk2=%hhu, "
-      "a1=%hhu, total_set_cost=%hhu, is_cpu=%hhu, assist_flags=%08" PRIX32 ", "
-      "hand_refs=%s, assist_ref=%s, set_refs=%s, sc_ref=%s, hand_refs2=%s, "
-      "set_refs2=%s, assist_ref2=%s, assist_set_num=%hu, assist_card_id=%s, "
-      "assist_turns=%hhu, assist_delay=%hhu, atk_bonus=%hhu, def_bonus=%hhu, "
-      "u2=[%hhu, %hhu]]",
+  return std::format(
+      "HandAndEquipState[dice=[{}, {}], atk={}, def={}, atk2={}, "
+      "a1={}, total_set_cost={}, is_cpu={}, assist_flags={:08X}, "
+      "hand_refs={}, assist_ref={}, set_refs={}, sc_ref={}, hand_refs2={}, "
+      "set_refs2={}, assist_ref2={}, assist_set_num={}, assist_card_id={}, "
+      "assist_turns={}, assist_delay={}, atk_bonus={}, def_bonus={}, "
+      "u2=[{}, {}]]",
       this->dice_results[0],
       this->dice_results[1],
       this->atk_points,
@@ -698,16 +698,16 @@ std::string HandAndEquipState::str(shared_ptr<const Server> s) const {
       this->unknown_a1,
       this->total_set_cards_cost,
       this->is_cpu_player,
-      this->assist_flags.load(),
-      hand_card_refs_s.c_str(),
-      assist_card_ref_s.c_str(),
-      set_card_refs_s.c_str(),
-      sc_card_ref_s.c_str(),
-      hand_card_refs2_s.c_str(),
-      set_card_refs2_s.c_str(),
-      assist_card_ref2_s.c_str(),
-      this->assist_card_set_number.load(),
-      assist_card_id_s.c_str(),
+      this->assist_flags,
+      hand_card_refs_s,
+      assist_card_ref_s,
+      set_card_refs_s,
+      sc_card_ref_s,
+      hand_card_refs2_s,
+      set_card_refs2_s,
+      assist_card_ref2_s,
+      this->assist_card_set_number,
+      assist_card_id_s,
       this->assist_remaining_turns,
       this->assist_delay_turns,
       this->atk_bonuses,
@@ -838,19 +838,19 @@ const char* PlayerBattleStats::name_for_rank(uint8_t rank) {
 }
 
 PlayerBattleStatsTrial::PlayerBattleStatsTrial(const PlayerBattleStats& data)
-    : damage_given(data.damage_given.load()),
-      damage_taken(data.damage_taken.load()),
-      num_opponent_cards_destroyed(data.num_opponent_cards_destroyed.load()),
-      num_owned_cards_destroyed(data.num_owned_cards_destroyed.load()),
-      total_move_distance(data.total_move_distance.load()) {}
+    : damage_given(data.damage_given),
+      damage_taken(data.damage_taken),
+      num_opponent_cards_destroyed(data.num_opponent_cards_destroyed),
+      num_owned_cards_destroyed(data.num_owned_cards_destroyed),
+      total_move_distance(data.total_move_distance) {}
 
 PlayerBattleStatsTrial::operator PlayerBattleStats() const {
   PlayerBattleStats ret;
-  ret.damage_given = this->damage_given.load();
-  ret.damage_taken = this->damage_taken.load();
-  ret.num_opponent_cards_destroyed = this->num_opponent_cards_destroyed.load();
-  ret.num_owned_cards_destroyed = this->num_owned_cards_destroyed.load();
-  ret.total_move_distance = this->total_move_distance.load();
+  ret.damage_given = this->damage_given;
+  ret.damage_taken = this->damage_taken;
+  ret.num_opponent_cards_destroyed = this->num_opponent_cards_destroyed;
+  ret.num_owned_cards_destroyed = this->num_owned_cards_destroyed;
+  ret.total_move_distance = this->total_move_distance;
   return ret;
 }
 
@@ -861,26 +861,26 @@ static bool is_card_within_range(
     phosg::PrefixedLogger* log) {
   if (ss.card_ref == 0xFFFF) {
     if (log) {
-      log->debug("is_card_within_range: (false) ss.card_ref missing");
+      log->debug_f("is_card_within_range: (false) ss.card_ref missing");
     }
     return false;
   }
   if (range[0] == 2) {
     if (log) {
-      log->debug("is_card_within_range: (true) range is entire field");
+      log->debug_f("is_card_within_range: (true) range is entire field");
     }
     return true;
   }
 
   if ((ss.loc.x < anchor_loc.x - 4) || (ss.loc.x > anchor_loc.x + 4)) {
     if (log) {
-      log->debug("is_card_within_range: (false) outside x range (ss.loc.x=%hhu, anchor_loc.x=%hhu)", ss.loc.x, anchor_loc.x);
+      log->debug_f("is_card_within_range: (false) outside x range (ss.loc.x={}, anchor_loc.x={})", ss.loc.x, anchor_loc.x);
     }
     return false;
   }
   if ((ss.loc.y < anchor_loc.y - 4) || (ss.loc.y > anchor_loc.y + 4)) {
     if (log) {
-      log->debug("is_card_within_range: (false) outside y range (ss.loc.y=%hhu, anchor_loc.y=%hhu)", ss.loc.y, anchor_loc.y);
+      log->debug_f("is_card_within_range: (false) outside y range (ss.loc.y={}, anchor_loc.y={})", ss.loc.y, anchor_loc.y);
     }
     return false;
   }
@@ -889,7 +889,7 @@ static bool is_card_within_range(
   uint8_t x_index = (ss.loc.x - anchor_loc.x) + 4;
   bool ret = (range[y_index * 9 + x_index] != 0);
   if (log) {
-    log->debug("is_card_within_range: (%s) (ss.loc=(%hhu,%hhu), anchor_loc=(%hhu,%hhu), indexes=(%hhu,%hhu))",
+    log->debug_f("is_card_within_range: ({}) (ss.loc=({},{}), anchor_loc=({},{}), indexes=({},{}))",
         ret ? "true" : "false", ss.loc.x, ss.loc.y, anchor_loc.x, anchor_loc.y, x_index, y_index);
   }
   return ret;
@@ -903,24 +903,24 @@ vector<uint16_t> get_card_refs_within_range(
   vector<uint16_t> ret;
   if (is_card_within_range(range, loc, short_statuses[0], log)) {
     if (log) {
-      log->debug("get_card_refs_within_range: sc card @%04hX within range", short_statuses[0].card_ref.load());
+      log->debug_f("get_card_refs_within_range: sc card @{:04X} within range", short_statuses[0].card_ref);
     }
     ret.emplace_back(short_statuses[0].card_ref);
   } else {
     if (log) {
-      log->debug("get_card_refs_within_range: sc card @%04hX not within range", short_statuses[0].card_ref.load());
+      log->debug_f("get_card_refs_within_range: sc card @{:04X} not within range", short_statuses[0].card_ref);
     }
   }
   for (size_t card_index = 7; card_index < 15; card_index++) {
     const auto& ss = short_statuses[card_index];
     if (is_card_within_range(range, loc, ss, log)) {
       if (log) {
-        log->debug("get_card_refs_within_range: card @%04hX within range", ss.card_ref.load());
+        log->debug_f("get_card_refs_within_range: card @{:04X} within range", ss.card_ref);
       }
       ret.emplace_back(ss.card_ref);
     } else {
       if (log) {
-        log->debug("get_card_refs_within_range: card @%04hX not within range", ss.card_ref.load());
+        log->debug_f("get_card_refs_within_range: card @{:04X} not within range", ss.card_ref);
       }
     }
   }

src/Episode3/RulerServer.cc

@@ -16,10 +16,10 @@ void compute_effective_range(
     const Location& loc,
     shared_ptr<const MapAndRulesState> map_and_rules,
     phosg::PrefixedLogger* log) {
-  if (log && log->should_log(phosg::LogLevel::DEBUG)) {
+  if (log && log->should_log(phosg::LogLevel::L_DEBUG)) {
     string loc_str = loc.str();
-    log->debug("compute_effective_range: card_id=#%04hX, loc=%s", card_id, loc_str.c_str());
-    log->debug("compute_effective_range: map_and_rules->map:");
+    log->debug_f("compute_effective_range: card_id=#{:04X}, loc={}", card_id, loc_str);
+    log->debug_f("compute_effective_range: map_and_rules->map:");
     map_and_rules->map.print(stderr);
   }
   ret.clear(0);
@@ -40,14 +40,14 @@ void compute_effective_range(
     }
   }
   if (log) {
-    log->debug("compute_effective_range: range_def: %05" PRIX32 " %05" PRIX32 " %05" PRIX32 " %05" PRIX32 " %05" PRIX32 " %05" PRIX32, range_def[0], range_def[1], range_def[2], range_def[3], range_def[4], range_def[5]);
+    log->debug_f("compute_effective_range: range_def: {:05X} {:05X} {:05X} {:05X} {:05X} {:05X}", range_def[0], range_def[1], range_def[2], range_def[3], range_def[4], range_def[5]);
   }
 
   if (range_def[0] == 0x000FFFFF) {
     // Entire field
     ret.clear(2);
     if (log) {
-      log->debug("compute_effective_range: entire field (2)");
+      log->debug_f("compute_effective_range: entire field (2)");
     }
     return;
   }
@@ -64,7 +64,7 @@ void compute_effective_range(
   }
   if (log) {
     for (size_t y = 0; y < 9; y++) {
-      log->debug("compute_effective_range: decoded_range: %hhX %hhX %hhX %hhX %hhX %hhX %hhX %hhX %hhX",
+      log->debug_f("compute_effective_range: decoded_range: {:X} {:X} {:X} {:X} {:X} {:X} {:X} {:X} {:X}",
           decoded_range[y * 9 + 0], decoded_range[y * 9 + 1], decoded_range[y * 9 + 2], decoded_range[y * 9 + 3], decoded_range[y * 9 + 4], decoded_range[y * 9 + 5], decoded_range[y * 9 + 6], decoded_range[y * 9 + 7], decoded_range[y * 9 + 8]);
     }
   }
@@ -98,7 +98,7 @@ void compute_effective_range(
           }
           ret[y * 9 + x] = decoded_range[up_y * 9 + up_x];
           if (log) {
-            log->debug("compute_effective_range: x=%hd y=%hd up_x=%hd up_y=%hd v=%hhX", x, y, up_x, up_y, ret[y * 9 + x]);
+            log->debug_f("compute_effective_range: x={} y={} up_x={} up_y={} v={:X}", x, y, up_x, up_y, ret[y * 9 + x]);
           }
         }
       }
@@ -107,7 +107,7 @@ void compute_effective_range(
 
   if (log) {
     for (size_t y = 0; y < 9; y++) {
-      log->debug("compute_effective_range: ret: %hhX %hhX %hhX %hhX %hhX %hhX %hhX %hhX %hhX",
+      log->debug_f("compute_effective_range: ret: {:X} {:X} {:X} {:X} {:X} {:X} {:X} {:X} {:X}",
           ret[y * 9 + 0], ret[y * 9 + 1], ret[y * 9 + 2], ret[y * 9 + 3], ret[y * 9 + 4], ret[y * 9 + 5], ret[y * 9 + 6], ret[y * 9 + 7], ret[y * 9 + 8]);
     }
   }
@@ -941,7 +941,7 @@ bool RulerServer::check_usability_or_condition_apply(
     AttackMedium attack_medium) const {
   auto s = this->server();
   bool is_nte = s->options.is_nte();
-  auto log = s->log_stack(phosg::string_printf("check_usability_or_condition_apply(%02hhX, #%04hX, %02hhX, #%04hX, #%04hX, %02hhX, %s, %s): ", client_id1, card_id1, client_id2, card_id2, card_id3, def_effect_index, is_item_usability_check ? "true" : "false", phosg::name_for_enum(attack_medium)));
+  auto log = s->log_stack(std::format("check_usability_or_condition_apply({:02X}, #{:04X}, {:02X}, #{:04X}, #{:04X}, {:02X}, {}, {}): ", client_id1, card_id1, client_id2, card_id2, card_id3, def_effect_index, is_item_usability_check ? "true" : "false", phosg::name_for_enum(attack_medium)));
 
   if (static_cast<uint8_t>(attack_medium) & 0x80) {
     attack_medium = AttackMedium::UNKNOWN;
@@ -951,11 +951,11 @@ bool RulerServer::check_usability_or_condition_apply(
   auto ce2 = this->definition_for_card_id(card_id2);
   auto ce3 = this->definition_for_card_id(card_id3);
   if (!ce1) {
-    log.debug("ce1 missing");
+    log.debug_f("ce1 missing");
     return false;
   }
   if (!is_nte && (ce1->def.type == CardType::ITEM) && this->card_id_is_boss_sc(card_id2)) {
-    log.debug("ce1 is item and card_id2 is boss sc");
+    log.debug_f("ce1 is item and card_id2 is boss sc");
     return false;
   }
 
@@ -964,12 +964,12 @@ bool RulerServer::check_usability_or_condition_apply(
     criterion_code = ce1->def.usable_criterion;
   } else {
     if (def_effect_index > 2) {
-      log.debug("invalid def_effect_index");
+      log.debug_f("invalid def_effect_index");
       return false;
     }
     criterion_code = ce1->def.effects[def_effect_index].apply_criterion;
   }
-  log.debug("criterion_code=%s", phosg::name_for_enum(criterion_code));
+  log.debug_f("criterion_code={}", phosg::name_for_enum(criterion_code));
 
   // For item usability checks, prevent criteria that depend on player
   // positioning/team setup
@@ -980,7 +980,7 @@ bool RulerServer::check_usability_or_condition_apply(
           (criterion_code == CriterionCode::FC) ||
           (criterion_code == CriterionCode::NOT_SC) ||
           (criterion_code == CriterionCode::SC))) {
-    log.debug("criterion is forbidden");
+    log.debug_f("criterion is forbidden");
     criterion_code = CriterionCode::NONE;
   }
 
@@ -1354,7 +1354,7 @@ bool RulerServer::check_usability_or_condition_apply(
       }
   }
 
-  log.debug("default return (false)");
+  log.debug_f("default return (false)");
   return false;
 }
 
@@ -1478,43 +1478,43 @@ bool RulerServer::compute_effective_range_and_target_mode_for_attack(
   for (z = 0; (z < 8) && (pa.action_card_refs[z] != 0xFFFF); z++) {
   }
   if (z >= 8) {
-    log.debug("too many action card refs");
+    log.debug_f("too many action card refs");
     return false;
   }
-  log.debug("%zu action card refs", z);
+  log.debug_f("{} action card refs", z);
   uint16_t card_ref = (z == 0) ? pa.attacker_card_ref : pa.action_card_refs[z - 1];
-  log.debug("base card ref = @%04hX", card_ref);
+  log.debug_f("base card ref = @{:04X}", card_ref);
 
   uint16_t card_id = this->card_id_for_card_ref(card_ref);
   if (card_id == 0xFFFF) {
-    log.debug("card ref is broken");
+    log.debug_f("card ref is broken");
     return false;
   }
 
   auto ce = this->definition_for_card_id(card_id);
   uint8_t client_id = client_id_for_card_ref(pa.attacker_card_ref);
   if ((client_id == 0xFF) || !ce) {
-    log.debug("card ref is broken or definition is missing");
+    log.debug_f("card ref is broken or definition is missing");
     return false;
   }
 
   if (out_orig_card_ref) {
-    log.debug("orig_card_ref = @%04hX", card_ref);
+    log.debug_f("orig_card_ref = @{:04X}", card_ref);
     *out_orig_card_ref = card_ref;
   }
 
   auto target_mode = ce->def.target_mode;
   if (this->card_ref_or_sc_has_fixed_range(pa.attacker_card_ref)) {
     const char* target_mode_name = name_for_target_mode(target_mode);
-    log.debug("attacker card ref @%04hX has fixed range; target mode is %s (%hhu)",
-        pa.attacker_card_ref.load(), target_mode_name, static_cast<uint8_t>(target_mode));
+    log.debug_f("attacker card ref @{:04X} has fixed range; target mode is {} ({})",
+        pa.attacker_card_ref, target_mode_name, static_cast<uint8_t>(target_mode));
     card_id = this->card_id_for_card_ref(pa.attacker_card_ref);
     if (!is_nte) {
       auto sc_ce = this->definition_for_card_id(card_id);
       if (sc_ce && (static_cast<uint8_t>(target_mode) < 6)) {
         target_mode = sc_ce->def.target_mode;
         const char* target_mode_name = name_for_target_mode(target_mode);
-        log.debug("sc_ce overrides target mode with %s (%hhu)",
+        log.debug_f("sc_ce overrides target mode with {} ({})",
             target_mode_name, static_cast<uint8_t>(target_mode));
       }
     }
@@ -1525,10 +1525,10 @@ bool RulerServer::compute_effective_range_and_target_mode_for_attack(
     auto assist_effect = this->assist_server->get_active_assist_by_index(z);
     if (assist_effect == AssistEffect::SIMPLE) {
       card_id = this->card_id_for_card_ref(pa.attacker_card_ref);
-      log.debug("SIMPLE assist overrides card id with #%04hX", card_id);
+      log.debug_f("SIMPLE assist overrides card id with #{:04X}", card_id);
     } else if (assist_effect == AssistEffect::HEAVY_FOG) {
       card_id = 0xFFFE;
-      log.debug("HEAVY_FOG assist overrides card id with #%04hX", card_id);
+      log.debug_f("HEAVY_FOG assist overrides card id with #{:04X}", card_id);
     }
   }
 
@@ -2059,27 +2059,27 @@ shared_ptr<const CardIndex::CardEntry> RulerServer::definition_for_card_id(uint3
 
 uint32_t RulerServer::get_card_id_with_effective_range(
     uint16_t card_ref, uint16_t card_id_override, TargetMode* out_target_mode) const {
-  auto log = this->server()->log_stack(phosg::string_printf("get_card_id_with_effective_range(@%04hX, #%04hX): ", card_ref, card_id_override));
+  auto log = this->server()->log_stack(std::format("get_card_id_with_effective_range(@{:04X}, #{:04X}): ", card_ref, card_id_override));
 
   uint16_t card_id = (card_id_override == 0xFFFF)
       ? this->card_id_for_card_ref(card_ref)
       : card_id_override;
-  log.debug("card_id=#%04hX", card_id);
+  log.debug_f("card_id=#{:04X}", card_id);
 
   if (card_id != 0xFFFF) {
     auto ce = this->definition_for_card_id(card_id);
     uint8_t client_id = client_id_for_card_ref(card_ref);
     if ((client_id != 0xFF) && ce) {
       TargetMode effective_target_mode = ce->def.target_mode;
-      log.debug("ce valid for #%04hX with effective target mode %s", card_id, name_for_target_mode(effective_target_mode));
+      log.debug_f("ce valid for #{:04X} with effective target mode {}", card_id, name_for_target_mode(effective_target_mode));
 
       if (this->card_ref_or_sc_has_fixed_range(card_ref)) {
         // Undo the override that may have been passed in
-        log.debug("@%04hX has FIXED_RANGE", card_ref);
+        log.debug_f("@{:04X} has FIXED_RANGE", card_ref);
         card_id = this->card_id_for_card_ref(card_ref);
         auto orig_ce = this->definition_for_card_id(card_id);
         if (orig_ce && (static_cast<uint8_t>(effective_target_mode) < 6)) {
-          log.debug("ce valid for #%04hX with effective target mode %s; overriding to %s", card_id, name_for_target_mode(effective_target_mode), name_for_target_mode(orig_ce->def.target_mode));
+          log.debug_f("ce valid for #{:04X} with effective target mode {}; overriding to {}", card_id, name_for_target_mode(effective_target_mode), name_for_target_mode(orig_ce->def.target_mode));
           effective_target_mode = orig_ce->def.target_mode;
         }
       }
@@ -2089,17 +2089,17 @@ uint32_t RulerServer::get_card_id_with_effective_range(
         auto eff = this->assist_server->get_active_assist_by_index(z);
         if (eff == AssistEffect::SIMPLE) {
           card_id = this->card_id_for_card_ref(card_ref);
-          log.debug("SIMPLE assist effect is active; using #%04hX for range", card_id);
+          log.debug_f("SIMPLE assist effect is active; using #{:04X} for range", card_id);
         } else if (eff == AssistEffect::HEAVY_FOG) {
           card_id = 0xFFFE;
-          log.debug("HEAVY_FOG assist effect is active; limiting range to one tile in front");
+          log.debug_f("HEAVY_FOG assist effect is active; limiting range to one tile in front");
         }
       }
 
       if (out_target_mode) {
         *out_target_mode = effective_target_mode;
       }
-      log.debug("results: card_id=#%04hX, target_mode=%s", card_id, name_for_target_mode(effective_target_mode));
+      log.debug_f("results: card_id=#{:04X}, target_mode={}", card_id, name_for_target_mode(effective_target_mode));
     }
   }
 

src/Episode3/Server.cc

@@ -58,7 +58,7 @@ Server::Server(shared_ptr<Lobby> lobby, Options&& options)
       battle_start_usecs(0),
       should_copy_prev_states_to_current_states(0),
       card_special(nullptr),
-      clients_done_in_mulligan_phase(false),
+      clients_done_in_redraw_initial_hand_phase(false),
       num_pending_attacks_with_cards(0),
       unknown_a14(0),
       unknown_a15(0),
@@ -83,12 +83,14 @@ Server::Server(shared_ptr<Lobby> lobby, Options&& options)
 
 Server::~Server() noexcept(false) {
   if (this->logger_stack.size() != 1) {
-    throw logic_error(phosg::string_printf("incorrect logger stack size: expected 1, received %zu", this->logger_stack.size()));
+    throw logic_error(std::format("incorrect logger stack size: expected 1, received {}", this->logger_stack.size()));
   }
   delete this->logger_stack.back();
 }
 
 void Server::init() {
+  this->log().info_f("Creating server with random seed {:08X}", this->options.rand_crypt->seed());
+
   this->map_and_rules = make_shared<MapAndRulesState>();
   this->num_clients_present = 0;
   this->overlay_state.clear();
@@ -173,9 +175,9 @@ std::string Server::debug_str_for_card_ref(uint16_t card_ref) const {
   auto ce = this->definition_for_card_ref(card_ref);
   if (ce) {
     string name = ce->def.en_name.decode();
-    return phosg::string_printf("@%04hX (#%04" PRIX32 " %s)", card_ref, ce->def.card_id.load(), name.c_str());
+    return std::format("@{:04X} (#{:04X} {})", card_ref, ce->def.card_id, name);
   } else {
-    return phosg::string_printf("@%04hX (missing)", card_ref);
+    return std::format("@{:04X} (missing)", card_ref);
   }
 }
 
@@ -186,9 +188,9 @@ std::string Server::debug_str_for_card_id(uint16_t card_id) const {
   auto ce = this->definition_for_card_id(card_id);
   if (ce) {
     string name = ce->def.en_name.decode();
-    return phosg::string_printf("#%04hX (%s)", card_id, name.c_str());
+    return std::format("#{:04X} ({})", card_id, name);
   } else {
-    return phosg::string_printf("#%04hX (missing)", card_id);
+    return std::format("#{:04X} (missing)", card_id);
   }
 }
 
@@ -260,7 +262,7 @@ void Server::send(const void* data, size_t size, uint8_t command, bool enable_ma
     }
 
   } else if ((this->options.behavior_flags & BehaviorFlag::LOG_COMMANDS_IF_LOBBY_MISSING) &&
-      this->log().info("Generated command")) {
+      this->log().info_f("Generated command")) {
     phosg::print_data(stderr, data, size, 0, nullptr, phosg::PrintDataFlags::PRINT_ASCII | phosg::PrintDataFlags::DISABLE_COLOR | phosg::PrintDataFlags::OFFSET_16_BITS);
   }
 }
@@ -273,9 +275,9 @@ void Server::send_6xB4x46() const {
   // debugging easier.
   G_ServerVersionStrings_Ep3_6xB4x46 cmd;
   cmd.version_signature.encode(this->options.is_nte() ? VERSION_SIGNATURE_NTE : VERSION_SIGNATURE, 1);
-  cmd.date_str1.encode(phosg::format_time(this->options.card_index->definitions_mtime() * 1000000), 1);
+  cmd.date_str1.encode(std::format("Card definitions: {:016X}", this->options.card_index->definitions_hash()), 1);
   string build_date = phosg::format_time(BUILD_TIMESTAMP);
-  cmd.date_str2.encode(phosg::string_printf("newserv %s compiled at %s", GIT_REVISION_HASH, build_date.c_str()), 1);
+  cmd.date_str2.encode(std::format("newserv {} compiled at {}", GIT_REVISION_HASH, build_date), 1);
   this->send(cmd);
 }
 
@@ -291,7 +293,7 @@ string Server::prepare_6xB6x41_map_definition(shared_ptr<const MapIndex::Map> ma
   return std::move(w.str());
 }
 
-void Server::send_commands_for_joining_spectator(Channel& ch) const {
+void Server::send_commands_for_joining_spectator(std::shared_ptr<Channel> ch) const {
   bool should_send_state = true;
   if (this->setup_phase == SetupPhase::REGISTRATION) {
     // If registration is still in progress, we only need to send the map data
@@ -303,84 +305,62 @@ void Server::send_commands_for_joining_spectator(Channel& ch) const {
   }
 
   if (this->last_chosen_map) {
-    string data = this->prepare_6xB6x41_map_definition(this->last_chosen_map, ch.language, this->options.is_nte());
-    this->log().info("Sending %c version of map %08" PRIX32, char_for_language_code(ch.language), this->last_chosen_map->map_number);
-    ch.send(0x6C, 0x00, data);
+    string data = this->prepare_6xB6x41_map_definition(this->last_chosen_map, ch->language, this->options.is_nte());
+    this->log().info_f("Sending {} version of map {:08X}", char_for_language_code(ch->language), this->last_chosen_map->map_number);
+    ch->send(0x6C, 0x00, data);
   }
 
   if (should_send_state) {
-    ch.send(0xC9, 0x00, this->prepare_6xB4x03());
+    ch->send(0xC9, 0x00, this->prepare_6xB4x03());
     for (uint8_t client_id = 0; client_id < 4; client_id++) {
       auto ps = this->player_states[client_id];
       if (ps) {
-        ch.send(0xC9, 0x00, ps->prepare_6xB4x02());
-        ch.send(0xC9, 0x00, ps->prepare_6xB4x04());
+        ch->send(0xC9, 0x00, ps->prepare_6xB4x02());
+        ch->send(0xC9, 0x00, ps->prepare_6xB4x04());
       }
     }
-    if (ch.version == Version::GC_EP3_NTE) {
+    if (ch->version == Version::GC_EP3_NTE) {
       G_UpdateMap_Ep3NTE_6xB4x05 cmd;
       cmd.state = *this->map_and_rules;
-      ch.send(0xC9, 0x00, cmd);
+      ch->send(0xC9, 0x00, cmd);
     } else {
       G_UpdateMap_Ep3_6xB4x05 cmd;
       cmd.state = *this->map_and_rules;
-      ch.send(0xC9, 0x00, cmd);
+      ch->send(0xC9, 0x00, cmd);
     }
     // TODO: Sega does something like this; do we have to do this too?
     // for (uint8_t client_id = 0; client_id < 4; client_id++) {
     //   (send 6xB4x4E, 6xB4x4C, 6xB4x4D for each set card)
     //   (send 6xB4x4F for client_id)
     // }
-    ch.send(0xC9, 0x00, this->prepare_6xB4x07_decks_update());
+    ch->send(0xC9, 0x00, this->prepare_6xB4x07_decks_update());
     // TODO: Sega sends 6xB4x05 here again; why? Is that necessary? They also
     // send 6xB4x02 again for each player after that (but not 6xB4x04)
-    ch.send(0xC9, 0x00, this->prepare_6xB4x1C_names_update());
-    ch.send(0xC9, 0x00, this->prepare_6xB4x50_trap_tile_locations());
+    ch->send(0xC9, 0x00, this->prepare_6xB4x1C_names_update());
+    ch->send(0xC9, 0x00, this->prepare_6xB4x50_trap_tile_locations());
     {
       G_LoadCurrentEnvironment_Ep3_6xB4x3B cmd_3B;
-      ch.send(0xC9, 0x00, &cmd_3B, sizeof(cmd_3B));
+      ch->send(0xC9, 0x00, &cmd_3B, sizeof(cmd_3B));
     }
   }
 }
 
-__attribute__((format(printf, 2, 3))) void Server::send_debug_message_printf(const char* fmt, ...) const {
-  auto l = this->lobby.lock();
-  if (l && (this->options.behavior_flags & Episode3::BehaviorFlag::ENABLE_STATUS_MESSAGES)) {
-    va_list va;
-    va_start(va, fmt);
-    std::string buf = phosg::string_vprintf(fmt, va);
-    va_end(va);
-    send_text_message(l, buf);
-  }
-}
-
-__attribute__((format(printf, 2, 3))) void Server::send_info_message_printf(const char* fmt, ...) const {
-  auto l = this->lobby.lock();
-  if (l) {
-    va_list va;
-    va_start(va, fmt);
-    std::string buf = phosg::string_vprintf(fmt, va);
-    va_end(va);
-    send_text_message(l, buf);
-  }
-}
-
 void Server::send_debug_command_received_message(
     uint8_t client_id, uint8_t subsubcommand, const char* description) const {
-  this->log().debug("%hhu/CAx%02hhX %s", client_id, subsubcommand, description);
-  this->send_debug_message_printf("$C5%hhu/CAx%02hhX %s", client_id, subsubcommand, description);
+  this->log().debug_f("{}/CAx{:02X} {}", client_id, subsubcommand, description);
+  this->send_debug_message("$C5{}/CAx{:02X} {}", client_id, subsubcommand, description);
 }
 
 void Server::send_debug_command_received_message(uint8_t subsubcommand, const char* description) const {
-  this->log().debug("*/CAx%02hhX %s", subsubcommand, description);
-  this->send_debug_message_printf("$C5*/CAx%02hhX %s", subsubcommand, description);
+  this->log().debug_f("*/CAx{:02X} {}", subsubcommand, description);
+  this->send_debug_message("$C5*/CAx{:02X} {}", subsubcommand, description);
 }
 
 void Server::send_debug_message_if_error_code_nonzero(uint8_t client_id, int32_t error_code) const {
   if (error_code < 0) {
-    this->send_debug_message_printf("$C4%hhu/ERROR -0x%zX", client_id, static_cast<ssize_t>(-error_code));
+    this->send_debug_message("$C4{}/ERROR -0x{:X}", client_id, static_cast<ssize_t>(-error_code));
   } else if (error_code > 0) {
-    this->send_debug_message_printf("$C4%hhu/ERROR 0x%zX", client_id, static_cast<ssize_t>(error_code));
+    this->send_debug_message("$C4{}/ERROR 0x{:X}", client_id, static_cast<ssize_t>(error_code));
   }
 }
 
@@ -949,62 +929,62 @@ void Server::end_action_phase() {
 
 bool Server::enqueue_attack_or_defense(uint8_t client_id, ActionState* pa) {
   auto log = this->log_stack("enqueue_attack_or_defense: ");
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
     string s = pa->str(this->shared_from_this());
-    log.debug("input: %s", s.c_str());
+    log.debug_f("input: {}", s);
   }
 
   if (client_id >= 4) {
     this->ruler_server->error_code3 = -0x78;
-    log.debug("failed: invalid client ID");
+    log.debug_f("failed: invalid client ID");
     return false;
   }
 
   auto ps = this->player_states[client_id];
   if (!ps) {
     this->ruler_server->error_code3 = -0x72;
-    log.debug("failed: player not present");
+    log.debug_f("failed: player not present");
     return false;
   }
 
   if (pa->action_card_refs[0] == 0xFFFF) {
     if (pa->defense_card_ref != 0xFFFF) {
       pa->action_card_refs[0] = pa->defense_card_ref;
-      log.debug("moved defense card ref to action card ref 0");
+      log.debug_f("moved defense card ref to action card ref 0");
     }
   } else {
     pa->defense_card_ref = pa->action_card_refs[0];
-    log.debug("moved action card ref 0 to defense card ref");
+    log.debug_f("moved action card ref 0 to defense card ref");
   }
 
   if (!this->ruler_server->is_attack_or_defense_valid(*pa)) {
-    log.debug("failed: attack or defense not valid");
+    log.debug_f("failed: attack or defense not valid");
     return false;
   }
 
   int16_t ally_atk_result = this->send_6xB4x33_remove_ally_atk_if_needed(*pa);
   if (ally_atk_result == 1) {
-    log.debug("pending: need ally approval");
+    log.debug_f("pending: need ally approval");
     return true;
   } else if (ally_atk_result == -1) {
-    log.debug("failed: ally declined");
+    log.debug_f("failed: ally declined");
     return false;
   }
 
   if (this->num_pending_attacks >= 0x20) {
     this->ruler_server->error_code3 = -0x71;
-    log.debug("failed: too many pending attacks");
+    log.debug_f("failed: too many pending attacks");
     return false;
   }
 
   size_t attack_index = this->num_pending_attacks++;
   this->pending_attacks[attack_index] = *pa;
-  if (log.should_log(phosg::LogLevel::DEBUG)) {
+  if (log.should_log(phosg::LogLevel::L_DEBUG)) {
     string pa_str = this->pending_attacks[attack_index].str(this->shared_from_this());
-    log.debug("set pending attack %zu: %s", attack_index, pa_str.c_str());
+    log.debug_f("set pending attack {}: {}", attack_index, pa_str);
   }
   ps->set_action_cards_for_action_state(*pa);
-  log.debug("set action cards");
+  log.debug_f("set action cards");
   auto card = this->card_for_set_card_ref(this->send_6xB4x06_if_card_ref_invalid(pa->attacker_card_ref, 1));
   if (card) {
     card->card_flags |= 0x400;
@@ -1056,7 +1036,7 @@ uint32_t Server::get_random_raw() {
   if (this->options.opt_rand_stream) {
     this->options.opt_rand_stream->readx(&ret, sizeof(ret));
   } else {
-    ret = random_from_optional_crypt(this->options.opt_rand_crypt);
+    ret = this->options.rand_crypt->next();
   }
 
   if (this->battle_record && this->battle_record->writable()) {
@@ -1740,20 +1720,20 @@ bool Server::update_registration_phase() {
   auto log = this->log_stack("update_registration_phase: ");
 
   if (this->setup_phase != SetupPhase::REGISTRATION) {
-    log.debug("setup_phase is not REGISTRATION");
+    log.debug_f("setup_phase is not REGISTRATION");
     return false;
   }
 
   if (this->map_and_rules->num_players == 0) {
     this->registration_phase = RegistrationPhase::AWAITING_NUM_PLAYERS;
-    log.debug("registration_phase set to AWAITING_NUM_PLAYERS");
+    log.debug_f("registration_phase set to AWAITING_NUM_PLAYERS");
     this->update_battle_state_flags_and_send_6xB4x03_if_needed();
     return false;
   }
 
   if (this->map_and_rules->num_players != this->num_clients_present) {
     this->registration_phase = RegistrationPhase::AWAITING_PLAYERS;
-    log.debug("registration_phase set to AWAITING_PLAYERS");
+    log.debug_f("registration_phase set to AWAITING_PLAYERS");
     this->update_battle_state_flags_and_send_6xB4x03_if_needed();
     return false;
   }
@@ -1767,20 +1747,20 @@ bool Server::update_registration_phase() {
 
   if (num_team0_registered_players != this->map_and_rules->num_team0_players) {
     this->registration_phase = RegistrationPhase::AWAITING_DECKS;
-    log.debug("registration_phase set to AWAITING_DECKS");
+    log.debug_f("registration_phase set to AWAITING_DECKS");
     this->update_battle_state_flags_and_send_6xB4x03_if_needed();
     return false;
   }
 
   this->registration_phase = RegistrationPhase::REGISTERED;
   this->update_battle_state_flags_and_send_6xB4x03_if_needed();
-  log.debug("battle can begin");
+  log.debug_f("battle can begin");
   return true;
 }
 
 const unordered_map<uint8_t, Server::handler_t> Server::subcommand_handlers({
-    {0x0B, &Server::handle_CAx0B_mulligan_hand},
-    {0x0C, &Server::handle_CAx0C_end_mulligan_phase},
+    {0x0B, &Server::handle_CAx0B_redraw_initial_hand},
+    {0x0C, &Server::handle_CAx0C_end_redraw_initial_hand_phase},
     {0x0D, &Server::handle_CAx0D_end_non_action_phase},
     {0x0E, &Server::handle_CAx0E_discard_card_from_hand},
     {0x0F, &Server::handle_CAx0F_set_card_from_hand},
@@ -1809,7 +1789,7 @@ void Server::on_server_data_input(shared_ptr<Client> sender_c, const string& dat
   size_t expected_size = header.size * 4;
   if (expected_size < data.size()) {
     phosg::print_data(stderr, data);
-    throw runtime_error(phosg::string_printf("command is incomplete: expected %zX bytes, received %zX bytes", expected_size, data.size()));
+    throw runtime_error(std::format("command is incomplete: expected {:X} bytes, received {:X} bytes", expected_size, data.size()));
   }
   if (header.subcommand != 0xB3) {
     throw runtime_error("server data command is not 6xB3");
@@ -1835,7 +1815,7 @@ void Server::on_server_data_input(shared_ptr<Client> sender_c, const string& dat
   }
 }
 
-void Server::handle_CAx0B_mulligan_hand(shared_ptr<Client>, const string& data) {
+void Server::handle_CAx0B_redraw_initial_hand(shared_ptr<Client>, const string& data) {
   const auto& in_cmd = check_size_t<G_RedrawInitialHand_Ep3_CAx0B>(data);
   this->send_debug_command_received_message(in_cmd.client_id, in_cmd.header.subsubcommand, "REDRAW");
   if (in_cmd.client_id >= 4) {
@@ -1854,20 +1834,20 @@ void Server::handle_CAx0B_mulligan_hand(shared_ptr<Client>, const string& data)
     if (!ps) {
       error_code = -0x72;
     } else {
-      ps->do_mulligan();
+      ps->redraw_initial_hand();
     }
   }
 
   if (!this->options.is_nte() || (error_code == 0)) {
     G_ActionResult_Ep3_6xB4x1E out_cmd;
-    out_cmd.sequence_num = in_cmd.header.sequence_num.load();
+    out_cmd.sequence_num = in_cmd.header.sequence_num;
     out_cmd.error_code = error_code;
     this->send(out_cmd);
   }
   this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, error_code);
 }
 
-void Server::handle_CAx0C_end_mulligan_phase(shared_ptr<Client>, const string& data) {
+void Server::handle_CAx0C_end_redraw_initial_hand_phase(shared_ptr<Client>, const string& data) {
   const auto& in_cmd = check_size_t<G_EndInitialRedrawPhase_Ep3_CAx0C>(data);
   this->send_debug_command_received_message(in_cmd.client_id, in_cmd.header.subsubcommand, "HAND READY");
   if (in_cmd.client_id >= 4) {
@@ -1898,13 +1878,13 @@ void Server::handle_CAx0C_end_mulligan_phase(shared_ptr<Client>, const string& d
     if (!ps) {
       error_code = -0x72;
     } else {
-      this->clients_done_in_mulligan_phase[in_cmd.client_id] = true;
+      this->clients_done_in_redraw_initial_hand_phase[in_cmd.client_id] = true;
       ps->assist_flags |= AssistFlag::READY_TO_END_PHASE;
       ps->update_hand_and_equip_state_and_send_6xB4x02_if_needed();
 
       bool all_clients_ready = true;
       for (size_t z = 0; z < 4; z++) {
-        if (this->player_states[z] && !this->clients_done_in_mulligan_phase[z]) {
+        if (this->player_states[z] && !this->clients_done_in_redraw_initial_hand_phase[z]) {
           all_clients_ready = false;
           break;
         }
@@ -2229,7 +2209,7 @@ void Server::handle_CAx14_update_deck_during_setup(shared_ptr<Client>, const str
         }
       }
       if (verify_error) {
-        throw runtime_error(phosg::string_printf("invalid deck: -0x%" PRIX32, verify_error));
+        throw runtime_error(std::format("invalid deck: -0x{:X}", verify_error));
       }
       if (!this->options.is_nte() && !(this->options.behavior_flags & BehaviorFlag::SKIP_D1_D2_REPLACE)) {
         this->ruler_server->replace_D1_D2_rank_cards_with_Attack(entry.card_ids);
@@ -2573,7 +2553,7 @@ void Server::send_6xB6x41_to_all_clients() const {
         map_commands_by_language[c->language()] = this->prepare_6xB6x41_map_definition(
             this->last_chosen_map, c->language(), this->options.is_nte());
       }
-      this->log().info("Sending %c version of map %08" PRIX32, char_for_language_code(c->language()), this->last_chosen_map->map_number);
+      this->log().info_f("Sending {} version of map {:08X}", char_for_language_code(c->language()), this->last_chosen_map->map_number);
       send_command(c, 0x6C, 0x00, map_commands_by_language[c->language()]);
     };
     for (const auto& c : l->clients) {
@@ -2782,7 +2762,7 @@ void Server::unknown_8023EEF4() {
   auto log = this->log_stack("unknown_8023EEF4: ");
 
   if (this->unknown_a14 >= 0x20) {
-    log.debug("unknown_a14 too large (0x%" PRIX32 ")", this->unknown_a14);
+    log.debug_f("unknown_a14 too large (0x{:X})", this->unknown_a14);
     return;
   }
 
@@ -2791,34 +2771,34 @@ void Server::unknown_8023EEF4() {
     auto card = this->attack_cards[this->unknown_a14];
     if (this->get_current_team_turn() == card->get_team_id()) {
       ActionState as = this->pending_attacks_with_cards[this->unknown_a14];
-      if (log.should_log(phosg::LogLevel::DEBUG)) {
-        log.debug("card @%04hX #%04hX can attack", card->get_card_ref(), card->get_card_id());
+      if (log.should_log(phosg::LogLevel::L_DEBUG)) {
+        log.debug_f("card @{:04X} #{:04X} can attack", card->get_card_ref(), card->get_card_id());
         string as_str = as.str(this->shared_from_this());
-        log.debug("as: %s", as_str.c_str());
+        log.debug_f("as: {}", as_str);
       }
       if (is_nte) {
         this->replace_targets_due_to_destruction_nte(&as);
       } else {
         this->replace_targets_due_to_destruction_or_conditions(&as);
       }
-      if (log.should_log(phosg::LogLevel::DEBUG)) {
+      if (log.should_log(phosg::LogLevel::L_DEBUG)) {
         string as_str = as.str(this->shared_from_this());
-        log.debug("as after target replacement: %s", as_str.c_str());
+        log.debug_f("as after target replacement: {}", as_str);
       }
       if (this->any_target_exists_for_attack(as)) {
-        log.debug("as is valid");
+        log.debug_f("as is valid");
         break;
       } else {
-        log.debug("as is not valid");
+        log.debug_f("as is not valid");
       }
     } else {
-      log.debug("card @%04hX #%04hX cannot attack (wrong turn)", card->get_card_ref(), card->get_card_id());
+      log.debug_f("card @{:04X} #{:04X} cannot attack (wrong turn)", card->get_card_ref(), card->get_card_id());
     }
     this->unknown_a14++;
   }
 
   if (this->unknown_a14 < this->num_pending_attacks_with_cards) {
-    log.debug("a14 (%" PRIu32 ") < num_pending_attacks_with_cards (%" PRIu32 ")", this->unknown_a14, this->num_pending_attacks_with_cards);
+    log.debug_f("a14 ({}) < num_pending_attacks_with_cards ({})", this->unknown_a14, this->num_pending_attacks_with_cards);
     this->defense_list_ended_for_client.clear(false);
 
     G_UpdateAttackTargets_Ep3_6xB4x29 cmd;
@@ -3142,13 +3122,13 @@ void Server::unknown_802402F4() {
     if (ps && (this->current_team_turn2 == ps->get_team_id())) {
       auto card = ps->get_sc_card();
       if (card) {
-        log.debug("SC card has action chain");
+        log.debug_f("SC card has action chain");
         card->compute_action_chain_results(true, false);
       }
       for (size_t set_index = 0; set_index < 8; set_index++) {
         card = ps->get_set_card(set_index);
         if (card) {
-          log.debug("set card %zu has action chain", set_index);
+          log.debug_f("set card {} has action chain", set_index);
           card->compute_action_chain_results(true, false);
         }
       }

src/Episode3/Server.hh

@@ -73,7 +73,7 @@ public:
     std::shared_ptr<const MapIndex> map_index;
     uint32_t behavior_flags;
     std::shared_ptr<phosg::StringReader> opt_rand_stream;
-    std::shared_ptr<PSOLFGEncryption> opt_rand_crypt;
+    std::shared_ptr<RandomGenerator> rand_crypt;
     std::shared_ptr<const Tournament> tournament;
     std::array<std::vector<uint16_t>, 5> trap_card_ids;
 
@@ -109,7 +109,7 @@ public:
     for (size_t z = 0; z < count; z++) {
       if (refs[z] != 0xFFFF) {
         std::string ref_str = this->debug_str_for_card_ref(refs[z]);
-        ret += phosg::string_printf("%zu:%s ", z, ref_str.c_str());
+        ret += std::format("{}:{} ", z, ref_str);
       }
     }
     if (ret.size() > 1) {
@@ -145,20 +145,23 @@ public:
     this->send(&cmd, cmd.header.size * 4, command, enable_masking);
   }
   void send(const void* data, size_t size, uint8_t command = 0xC9, bool enable_masking = true) const;
-  void send_commands_for_joining_spectator(Channel& ch) const;
+  void send_commands_for_joining_spectator(std::shared_ptr<Channel> ch) const;
 
   void force_battle_result(uint8_t surrendered_client_id, bool set_winner);
   void force_replace_assist_card(uint8_t client_id, uint16_t card_id);
   void force_destroy_field_character(uint8_t client_id, size_t set_index);
 
-  __attribute__((format(printf, 2, 3))) void send_debug_message_printf(const char* fmt, ...) const;
-  __attribute__((format(printf, 2, 3))) void send_info_message_printf(const char* fmt, ...) const;
-  void send_debug_command_received_message(
-      uint8_t client_id, uint8_t subsubcommand, const char* description) const;
-  void send_debug_command_received_message(
-      uint8_t subsubcommand, const char* description) const;
-  void send_debug_message_if_error_code_nonzero(
-      uint8_t client_id, int32_t error_code) const;
+  template <typename... ArgTs>
+  void send_debug_message(std::format_string<ArgTs...> fmt, ArgTs&&... args) const {
+    auto l = this->lobby.lock();
+    if (l && (this->options.behavior_flags & Episode3::BehaviorFlag::ENABLE_STATUS_MESSAGES)) {
+      send_text_message(l, std::format(std::forward<std::format_string<ArgTs...>>(fmt), std::forward<ArgTs>(args)...));
+    }
+  }
+
+  void send_debug_command_received_message(uint8_t client_id, uint8_t subsubcommand, const char* description) const;
+  void send_debug_command_received_message(uint8_t subsubcommand, const char* description) const;
+  void send_debug_message_if_error_code_nonzero(uint8_t client_id, int32_t error_code) const;
 
   void send_6xB4x46() const;
 
@@ -218,8 +221,8 @@ public:
   void update_battle_state_flags_and_send_6xB4x03_if_needed(bool always_send = false);
   bool update_registration_phase();
   void on_server_data_input(std::shared_ptr<Client> sender_c, const std::string& data);
-  void handle_CAx0B_mulligan_hand(std::shared_ptr<Client> sender_c, const std::string& data);
-  void handle_CAx0C_end_mulligan_phase(std::shared_ptr<Client> sender_c, const std::string& data);
+  void handle_CAx0B_redraw_initial_hand(std::shared_ptr<Client> sender_c, const std::string& data);
+  void handle_CAx0C_end_redraw_initial_hand_phase(std::shared_ptr<Client> sender_c, const std::string& data);
   void handle_CAx0D_end_non_action_phase(std::shared_ptr<Client> sender_c, const std::string& data);
   void handle_CAx0E_discard_card_from_hand(std::shared_ptr<Client> sender_c, const std::string& data);
   void handle_CAx0F_set_card_from_hand(std::shared_ptr<Client> sender_c, const std::string& data);
@@ -330,7 +333,7 @@ public:
   std::shared_ptr<CardSpecial> card_special;
   std::shared_ptr<StateFlags> state_flags;
   std::array<std::shared_ptr<PlayerState>, 4> player_states;
-  parray<uint32_t, 4> clients_done_in_mulligan_phase;
+  parray<uint32_t, 4> clients_done_in_redraw_initial_hand_phase;
   uint32_t num_pending_attacks_with_cards;
   bcarray<std::shared_ptr<Card>, 0x20> attack_cards;
   bcarray<ActionState, 0x20> pending_attacks_with_cards;

src/Episode3/Tournament.cc

@@ -3,7 +3,9 @@
 #include <phosg/Random.hh>
 
 #include "../CommandFormats.hh"
+#include "../GameServer.hh"
 #include "../SendCommands.hh"
+#include "../ServerState.hh"
 
 using namespace std;
 
@@ -49,16 +51,16 @@ string Tournament::Team::str() const {
     num_com_players += player.is_com();
   }
 
-  string ret = phosg::string_printf("[Team/%zu %s %zuH/%zuC/%zuP name=%s pass=%s rounds=%zu",
+  string ret = std::format("[Team/{} {} {}H/{}C/{}P name={} pass={} rounds={}",
       this->index, this->is_active ? "active" : "inactive",
-      num_human_players, num_com_players, this->max_players, this->name.c_str(),
-      this->password.c_str(), this->num_rounds_cleared);
+      num_human_players, num_com_players, this->max_players, this->name,
+      this->password, this->num_rounds_cleared);
   for (const auto& player : this->players) {
     if (player.is_human()) {
       if (player.player_name.empty()) {
-        ret += phosg::string_printf(" %08" PRIX32, player.account_id);
+        ret += std::format(" {:08X}", player.account_id);
       } else {
-        ret += phosg::string_printf(" %08" PRIX32 " (%s)", player.account_id, player.player_name.c_str());
+        ret += std::format(" {:08X} ({})", player.account_id, player.player_name);
       }
     }
   }
@@ -206,7 +208,7 @@ Tournament::Match::Match(
 
 string Tournament::Match::str() const {
   string winner_str = this->winner_team ? this->winner_team->str() : "(none)";
-  return phosg::string_printf("[Match round=%zu winner=%s]", this->round_num, winner_str.c_str());
+  return std::format("[Match round={} winner={}]", this->round_num, winner_str);
 }
 
 bool Tournament::Match::resolve_if_skippable() {
@@ -318,7 +320,7 @@ Tournament::Tournament(
     const Rules& rules,
     size_t num_teams,
     uint8_t flags)
-    : log(phosg::string_printf("[Tournament:%s] ", name.c_str())),
+    : log(std::format("[Tournament:{}] ", name)),
       map_index(map_index),
       com_deck_index(com_deck_index),
       name(name),
@@ -343,7 +345,7 @@ Tournament::Tournament(
     shared_ptr<const MapIndex> map_index,
     shared_ptr<const COMDeckIndex> com_deck_index,
     const phosg::JSON& json)
-    : log(phosg::string_printf("[Tournament:%s] ", json.get_string("name").c_str())),
+    : log(std::format("[Tournament:{}] ", json.get_string("name"))),
       map_index(map_index),
       com_deck_index(com_deck_index),
       source_json(json),
@@ -665,7 +667,7 @@ void Tournament::start() {
     auto m = this->zero_round_matches[z];
     auto t = m->winner_team;
     if (t->name.empty()) {
-      t->name = has_com_teams ? phosg::string_printf("COM:%zu", z) : "(no entrant)";
+      t->name = has_com_teams ? std::format("COM:{}", z) : "(no entrant)";
     }
     for (const auto& player : t->players) {
       if (player.is_com()) {
@@ -718,7 +720,7 @@ void Tournament::send_all_state_updates_on_deletion() const {
 }
 
 string Tournament::bracket_str() const {
-  string ret = phosg::string_printf("Tournament \"%s\"\n", this->name.c_str());
+  string ret = std::format("Tournament \"{}\"\n", this->name);
 
   function<void(shared_ptr<Match>, size_t)> add_match = [&](shared_ptr<Match> m, size_t indent_level) -> void {
     ret.append(2 * indent_level, ' ');
@@ -738,16 +740,16 @@ string Tournament::bracket_str() const {
   auto en_vm = this->map->version(1);
   if (en_vm) {
     string map_name = en_vm->map->name.decode(en_vm->language);
-    ret += phosg::string_printf("  Map: %08" PRIX32 " (%s)\n", this->map->map_number, map_name.c_str());
+    ret += std::format("  Map: {:08X} ({})\n", this->map->map_number, map_name);
   } else {
-    ret += phosg::string_printf("  Map: %08" PRIX32 "\n", this->map->map_number);
+    ret += std::format("  Map: {:08X}\n", this->map->map_number);
   }
   string rules_str = this->rules.str();
-  ret += phosg::string_printf("  Rules: %s\n", rules_str.c_str());
-  ret += phosg::string_printf("  Structure: %s, %zu entries\n", (this->flags & Flag::IS_2V2) ? "2v2" : "1v1", this->num_teams);
-  ret += phosg::string_printf("  COM teams: %s\n", (this->flags & Flag::HAS_COM_TEAMS) ? "allowed" : "forbidden");
-  ret += phosg::string_printf("  Shuffle entries: %s\n", (this->flags & Flag::SHUFFLE_ENTRIES) ? "yes" : "no");
-  ret += phosg::string_printf("  Resize on start: %s\n", (this->flags & Flag::RESIZE_ON_START) ? "yes" : "no");
+  ret += std::format("  Rules: {}\n", rules_str);
+  ret += std::format("  Structure: {}, {} entries\n", (this->flags & Flag::IS_2V2) ? "2v2" : "1v1", this->num_teams);
+  ret += std::format("  COM teams: {}\n", (this->flags & Flag::HAS_COM_TEAMS) ? "allowed" : "forbidden");
+  ret += std::format("  Shuffle entries: {}\n", (this->flags & Flag::SHUFFLE_ENTRIES) ? "yes" : "no");
+  ret += std::format("  Resize on start: {}\n", (this->flags & Flag::RESIZE_ON_START) ? "yes" : "no");
   switch (this->current_state) {
     case State::REGISTRATION:
       ret += "  State: REGISTRATION\n";
@@ -770,13 +772,13 @@ string Tournament::bracket_str() const {
     ret += "  Teams:\n";
     for (const auto& team : this->teams) {
       string team_str = team->str();
-      ret += phosg::string_printf("    %s\n", team_str.c_str());
+      ret += std::format("    {}\n", team_str);
     }
   } else {
     ret += "  Pending matches:\n";
     for (const auto& match : this->pending_matches) {
       string match_str = match->str();
-      ret += phosg::string_printf("    %s\n", match_str.c_str());
+      ret += std::format("    {}\n", match_str);
     }
   }
 
@@ -940,8 +942,12 @@ void TournamentIndex::link_client(shared_ptr<Client> c) {
 }
 
 void TournamentIndex::link_all_clients(std::shared_ptr<ServerState> s) {
-  for (const auto& c_it : s->channel_to_client) {
-    this->link_client(c_it.second);
+  // This can be called before the game server exists, so do nothing in that
+  // case
+  if (s->game_server) {
+    for (const auto& c : s->game_server->all_clients()) {
+      this->link_client(c);
+    }
   }
 }
 

src/Episode3/Tournament.hh

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <event2/event.h>
 #include <stdint.h>
 
 #include <memory>

src/EventUtils.cc

@@ -1,62 +0,0 @@
-#include "EventUtils.hh"
-
-#include <event2/buffer.h>
-#include <event2/event.h>
-
-#include <deque>
-#include <functional>
-#include <memory>
-#include <stdexcept>
-
-using namespace std;
-
-static void dispatch_forward_to_event_thread(evutil_socket_t, short, void* ctx) {
-  auto* fn = reinterpret_cast<function<void()>*>(ctx);
-  (*fn)();
-  delete fn;
-}
-
-void forward_to_event_thread(shared_ptr<struct event_base> base, function<void()>&& fn) {
-  struct timeval tv = {0, 0};
-  function<void()>* new_fn = new function<void()>(std::move(fn));
-  event_base_once(base.get(), -1, EV_TIMEOUT, dispatch_forward_to_event_thread, new_fn, &tv);
-}
-
-template <>
-void call_on_event_thread<void>(shared_ptr<struct event_base> base, function<void()>&& compute) {
-  bool succeeded = false;
-  string exc_what;
-  mutex ret_lock;
-  condition_variable ret_cv;
-  unique_lock<mutex> g(ret_lock);
-  forward_to_event_thread(base, [&]() -> void {
-    lock_guard<mutex> g(ret_lock);
-    try {
-      compute();
-      succeeded = true;
-    } catch (const exception& e) {
-      exc_what = e.what();
-    }
-    ret_cv.notify_one();
-  });
-  ret_cv.wait(g);
-  if (!succeeded) {
-    throw runtime_error(exc_what);
-  }
-}
-
-string evbuffer_remove_str(struct evbuffer* buf, ssize_t size) {
-  if (!buf) {
-    return "";
-  }
-  if (size < 0) {
-    size = static_cast<size_t>(evbuffer_get_length(buf));
-  }
-  string ret(size, '\0');
-  ssize_t bytes_removed = evbuffer_remove(buf, ret.data(), ret.size());
-  if (bytes_removed < 0) {
-    throw std::runtime_error("can\'t remove data from buffer");
-  }
-  ret.resize(bytes_removed);
-  return ret;
-}

src/EventUtils.hh

@@ -1,45 +0,0 @@
-#pragma once
-
-#include <event2/event.h>
-
-#include <condition_variable>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <optional>
-#include <stdexcept>
-#include <string>
-
-// Calls a function on the given base's event thread. This function returns
-// when the call has been enqueued, not necessarily after it returns.
-void forward_to_event_thread(std::shared_ptr<struct event_base> base, std::function<void()>&& fn);
-
-// Calls a function on the given base's event thread and waits for it to
-// return. Returns the value returned on that thread.
-template <typename T>
-T call_on_event_thread(std::shared_ptr<struct event_base> base, std::function<T()>&& compute) {
-  std::optional<T> ret;
-  std::string exc_what;
-  std::mutex ret_lock;
-  std::condition_variable ret_cv;
-  std::unique_lock<std::mutex> g(ret_lock);
-  forward_to_event_thread(base, [&]() -> void {
-    std::lock_guard<std::mutex> g(ret_lock);
-    try {
-      ret = compute();
-    } catch (const std::exception& e) {
-      exc_what = e.what();
-    }
-    ret_cv.notify_one();
-  });
-  ret_cv.wait(g);
-  if (!ret.has_value()) {
-    throw std::runtime_error(exc_what);
-  }
-  return ret.value();
-}
-
-template <>
-void call_on_event_thread<void>(std::shared_ptr<struct event_base> base, std::function<void()>&& compute);
-
-std::string evbuffer_remove_str(struct evbuffer* buf, ssize_t size = -1);

src/FunctionCompiler.cc

@@ -3,16 +3,15 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <filesystem>
 #include <phosg/Filesystem.hh>
 #include <phosg/Hash.hh>
 #include <phosg/Time.hh>
 #include <stdexcept>
 
-#ifdef HAVE_RESOURCE_FILE
 #include <resource_file/Emulators/PPC32Emulator.hh>
 #include <resource_file/Emulators/SH4Emulator.hh>
 #include <resource_file/Emulators/X86Emulator.hh>
-#endif
 
 #include "CommandFormats.hh"
 #include "CommonFileFormats.hh"
@@ -21,20 +20,6 @@
 
 using namespace std;
 
-static bool is_function_compiler_available = true;
-
-bool function_compiler_available() {
-#ifndef HAVE_RESOURCE_FILE
-  return false;
-#else
-  return is_function_compiler_available;
-#endif
-}
-
-void set_function_compiler_available(bool is_available) {
-  is_function_compiler_available = is_available;
-}
-
 const char* name_for_architecture(CompiledFunctionCode::Architecture arch) {
   switch (arch) {
     case CompiledFunctionCode::Architecture::POWERPC:
@@ -111,11 +96,9 @@ string CompiledFunctionCode::generate_client_command(
     size_t suffix_size,
     uint32_t override_relocations_offset) const {
   if (this->arch == Architecture::POWERPC) {
-    return this->generate_client_command_t<true>(
-        label_writes, suffix_data, suffix_size, override_relocations_offset);
+    return this->generate_client_command_t<true>(label_writes, suffix_data, suffix_size, override_relocations_offset);
   } else if ((this->arch == Architecture::X86) || (this->arch == Architecture::SH4)) {
-    return this->generate_client_command_t<false>(
-        label_writes, suffix_data, suffix_size, override_relocations_offset);
+    return this->generate_client_command_t<false>(label_writes, suffix_data, suffix_size, override_relocations_offset);
   } else {
     throw logic_error("invalid architecture");
   }
@@ -125,27 +108,12 @@ bool CompiledFunctionCode::is_big_endian() const {
   return this->arch == Architecture::POWERPC;
 }
 
-shared_ptr<CompiledFunctionCode> compile_function_code(
+static vector<shared_ptr<CompiledFunctionCode>> compile_function_code(
     CompiledFunctionCode::Architecture arch,
     const string& function_directory,
     const string& system_directory,
     const string& name,
     const string& text) {
-#ifndef HAVE_RESOURCE_FILE
-  (void)arch;
-  (void)function_directory;
-  (void)system_directory;
-  (void)name;
-  (void)text;
-  throw runtime_error("function compiler is not available");
-
-#else
-  auto ret = make_shared<CompiledFunctionCode>();
-  ret->arch = arch;
-  ret->short_name = name;
-  ret->index = 0;
-  ret->hide_from_patches_menu = false;
-
   unordered_set<string> get_include_stack;
   function<string(const string&)> get_include = [&](const string& name) -> string {
     const char* arch_name_token;
@@ -164,11 +132,11 @@ shared_ptr<CompiledFunctionCode> compile_function_code(
     }
 
     // Look in the function directory first, then the system directory
-    string asm_filename = phosg::string_printf("%s/%s.%s.inc.s", function_directory.c_str(), name.c_str(), arch_name_token);
-    if (!phosg::isfile(asm_filename)) {
-      asm_filename = phosg::string_printf("%s/%s.%s.inc.s", system_directory.c_str(), name.c_str(), arch_name_token);
+    string asm_filename = std::format("{}/{}.{}.inc.s", function_directory, name, arch_name_token);
+    if (!std::filesystem::is_regular_file(asm_filename)) {
+      asm_filename = std::format("{}/{}.{}.inc.s", system_directory, name, arch_name_token);
     }
-    if (phosg::isfile(asm_filename)) {
+    if (std::filesystem::is_regular_file(asm_filename)) {
       if (!get_include_stack.emplace(name).second) {
         throw runtime_error("mutual recursion between includes: " + name);
       }
@@ -191,100 +159,172 @@ shared_ptr<CompiledFunctionCode> compile_function_code(
     }
 
     string bin_filename = function_directory + "/" + name + ".inc.bin";
-    if (phosg::isfile(bin_filename)) {
+    if (std::filesystem::is_regular_file(bin_filename)) {
       return phosg::load_file(bin_filename);
     }
     bin_filename = system_directory + "/" + name + ".inc.bin";
-    if (phosg::isfile(bin_filename)) {
+    if (std::filesystem::is_regular_file(bin_filename)) {
       return phosg::load_file(bin_filename);
     }
     throw runtime_error("data not found for include: " + name + " (from " + asm_filename + " or " + bin_filename + ")");
   };
 
-  ResourceDASM::EmulatorBase::AssembleResult assembled;
-  if (arch == CompiledFunctionCode::Architecture::POWERPC) {
-    assembled = ResourceDASM::PPC32Emulator::assemble(text, get_include);
-  } else if (arch == CompiledFunctionCode::Architecture::X86) {
-    assembled = ResourceDASM::X86Emulator::assemble(text, get_include);
-  } else if (arch == CompiledFunctionCode::Architecture::SH4) {
-    assembled = ResourceDASM::SH4Emulator::assemble(text, get_include);
-  } else {
-    throw runtime_error("invalid architecture");
-  }
-  ret->code = std::move(assembled.code);
-  ret->label_offsets = std::move(assembled.label_offsets);
-  for (const auto& it : assembled.metadata_keys) {
-    if (it.first == "hide_from_patches_menu") {
-      ret->hide_from_patches_menu = true;
-    } else if (it.first == "index") {
-      if (it.second.size() != 1) {
-        throw runtime_error("invalid index value in .meta directive");
+  // Handle VERS tokens
+  vector<uint32_t> specific_versions;
+  auto lines = phosg::split(text, '\n');
+  for (auto& line : lines) {
+    if (line.starts_with(".versions ")) {
+      if (!specific_versions.empty()) {
+        throw std::runtime_error("multiple .versions directives in file");
       }
-      ret->index = it.second[0];
-    } else if (it.first == "name") {
-      ret->long_name = it.second;
-    } else if (it.first == "description") {
-      ret->description = it.second;
-    } else {
-      throw runtime_error("unknown metadata key: " + it.first);
+      for (auto& vers_token : phosg::split(line.substr(10), ' ')) {
+        phosg::strip_whitespace(vers_token);
+        if (vers_token.empty()) {
+          continue;
+        }
+        if (vers_token.size() != 4) {
+          throw std::runtime_error("invalid token in .version directive: " + vers_token);
+        }
+        specific_versions.emplace_back(*reinterpret_cast<const be_uint32_t*>(vers_token.data()));
+      }
+      line.clear();
     }
   }
 
-  set<uint32_t> reloc_indexes;
-  for (const auto& it : ret->label_offsets) {
-    if (phosg::starts_with(it.first, "reloc")) {
-      reloc_indexes.emplace(it.second / 4);
+  // Preprocess <VERS> tokens in the text if a .versions directive was given
+  vector<string> version_texts;
+  if (specific_versions.empty()) {
+    specific_versions.emplace_back(0);
+    version_texts.emplace_back(text);
+
+  } else {
+    vector<deque<string>> version_lines;
+    version_lines.resize(specific_versions.size());
+
+    size_t line_num = 1;
+    for (const auto& line : lines) {
+      size_t vers_offset = line.find("<VERS ");
+      if (vers_offset == string::npos) {
+        for (auto& lines : version_lines) {
+          lines.emplace_back(line);
+        }
+
+      } else {
+        for (size_t vers_index = 0; vers_index < specific_versions.size(); vers_index++) {
+          string version_line = line;
+          size_t vers_offset = line.find("<VERS ");
+          while (vers_offset != string::npos) {
+            size_t end_offset = version_line.find('>', vers_offset + 6);
+            if (end_offset == string::npos) {
+              throw runtime_error(std::format("(line {}) unterminated <VERS> replacement", line_num));
+            }
+            auto tokens = phosg::split(version_line.substr(vers_offset + 6, end_offset - vers_offset - 6), ' ');
+            if (tokens.size() != specific_versions.size()) {
+              throw runtime_error(std::format("(line {}) invalid <VERS> replacement", line_num));
+            }
+            version_line = version_line.substr(0, vers_offset) + tokens.at(vers_index) + version_line.substr(end_offset + 1);
+            vers_offset = version_line.find("<VERS ");
+          }
+          version_lines[vers_index].emplace_back(version_line);
+        }
+      }
+      line_num++;
+    }
+
+    for (const auto& lines : version_lines) {
+      version_texts.emplace_back(phosg::join(lines, "\n"));
     }
   }
 
-  try {
-    ret->entrypoint_offset_offset = ret->label_offsets.at("entry_ptr");
-  } catch (const out_of_range&) {
-    throw runtime_error("code does not contain entry_ptr label");
-  }
+  vector<shared_ptr<CompiledFunctionCode>> ret;
+  for (size_t vers_index = 0; vers_index < specific_versions.size(); vers_index++) {
+    uint32_t specific_version = specific_versions[vers_index];
+    const auto& version_text = version_texts.at(vers_index);
 
-  uint32_t prev_index = 0;
-  for (const auto& it : reloc_indexes) {
-    uint32_t delta = it - prev_index;
-    if (delta > 0xFFFF) {
-      throw runtime_error("relocation delta too far away");
+    try {
+      ResourceDASM::EmulatorBase::AssembleResult assembled;
+      if (arch == CompiledFunctionCode::Architecture::POWERPC) {
+        assembled = ResourceDASM::PPC32Emulator::assemble(version_text, get_include);
+      } else if (arch == CompiledFunctionCode::Architecture::X86) {
+        assembled = ResourceDASM::X86Emulator::assemble(version_text, get_include);
+      } else if (arch == CompiledFunctionCode::Architecture::SH4) {
+        assembled = ResourceDASM::SH4Emulator::assemble(version_text, get_include);
+      } else {
+        throw runtime_error("invalid architecture");
+      }
+
+      auto compiled = ret.emplace_back(make_shared<CompiledFunctionCode>());
+      compiled->arch = arch;
+      compiled->short_name = name;
+      compiled->specific_version = specific_version;
+      compiled->code = std::move(assembled.code);
+      compiled->label_offsets = std::move(assembled.label_offsets);
+      for (const auto& it : assembled.metadata_keys) {
+        if (it.first == "hide_from_patches_menu") {
+          compiled->hide_from_patches_menu = true;
+        } else if (it.first == "name") {
+          compiled->long_name = it.second;
+        } else if (it.first == "description") {
+          compiled->description = it.second;
+        } else if (it.first == "client_flag") {
+          compiled->client_flag = stoull(it.second, nullptr, 0);
+        } else {
+          throw runtime_error("unknown metadata key: " + it.first);
+        }
+      }
+
+      set<uint32_t> reloc_indexes;
+      for (const auto& it : compiled->label_offsets) {
+        if (it.first.starts_with("reloc")) {
+          reloc_indexes.emplace(it.second / 4);
+        }
+      }
+
+      try {
+        compiled->entrypoint_offset_offset = compiled->label_offsets.at("entry_ptr");
+      } catch (const out_of_range&) {
+        throw runtime_error("code does not contain entry_ptr label");
+      }
+
+      uint32_t prev_index = 0;
+      for (const auto& it : reloc_indexes) {
+        uint32_t delta = it - prev_index;
+        if (delta > 0xFFFF) {
+          throw runtime_error("relocation delta too far away");
+        }
+        compiled->relocation_deltas.emplace_back(delta);
+        prev_index = it;
+      }
+
+    } catch (const exception& e) {
+      string version_str = specific_version ? (" (" + str_for_specific_version(specific_version) + ")") : "";
+      function_compiler_log.warning_f("Failed to compile function {}{}: {}", name, version_str, e.what());
     }
-    ret->relocation_deltas.emplace_back(delta);
-    prev_index = it;
   }
 
   return ret;
-#endif
 }
 
 FunctionCodeIndex::FunctionCodeIndex(const string& directory) {
-  if (!function_compiler_available()) {
-    function_compiler_log.info("Function compiler is not available");
-    return;
-  }
-
-  string system_dir_path = phosg::ends_with(directory, "/") ? (directory + "System") : (directory + "/System");
+  string system_dir_path = directory.ends_with("/") ? (directory + "System") : (directory + "/System");
 
   uint32_t next_menu_item_id = 1;
-  for (const auto& subdir_name : phosg::list_directory_sorted(directory)) {
-    string subdir_path = phosg::ends_with(directory, "/") ? (directory + subdir_name) : (directory + "/" + subdir_name);
-    if (!phosg::isdir(subdir_path)) {
-      function_compiler_log.warning("Skipping %s (not a directory)", subdir_name.c_str());
-      continue;
-    }
+  for (const auto& item : std::filesystem::directory_iterator(directory)) {
+    string subdir_name = item.path().filename().string();
+    string subdir_path = directory.ends_with("/") ? (directory + subdir_name) : (directory + "/" + subdir_name);
 
-    for (const auto& filename : phosg::list_directory_sorted(subdir_path)) {
+    auto add_file = [&](string filename) -> void {
       try {
-        if (!phosg::ends_with(filename, ".s")) {
-          continue;
+        if (!filename.ends_with(".s")) {
+          return;
         }
 
         string name = filename.substr(0, filename.size() - 2);
-        if (phosg::ends_with(name, ".inc")) {
-          continue;
+        if (name.ends_with(".inc")) {
+          return;
         }
 
-        bool is_patch = phosg::ends_with(name, ".patch");
+        bool is_patch = name.ends_with(".patch");
         if (is_patch) {
           name.resize(name.size() - 6);
         }
@@ -293,15 +333,15 @@ FunctionCodeIndex::FunctionCodeIndex(const string& directory) {
         CompiledFunctionCode::Architecture arch = CompiledFunctionCode::Architecture::UNKNOWN;
         uint32_t specific_version = 0;
         string short_name = name;
-        if (phosg::ends_with(name, ".ppc")) {
+        if (name.ends_with(".ppc")) {
           arch = CompiledFunctionCode::Architecture::POWERPC;
           name.resize(name.size() - 4);
           short_name = name;
-        } else if (phosg::ends_with(name, ".x86")) {
+        } else if (name.ends_with(".x86")) {
           arch = CompiledFunctionCode::Architecture::X86;
           name.resize(name.size() - 4);
           short_name = name;
-        } else if (phosg::ends_with(name, ".sh4")) {
+        } else if (name.ends_with(".sh4")) {
           arch = CompiledFunctionCode::Architecture::SH4;
           name.resize(name.size() - 4);
           short_name = name;
@@ -327,69 +367,60 @@ FunctionCodeIndex::FunctionCodeIndex(const string& directory) {
 
         string path = subdir_path + "/" + filename;
         string text = phosg::load_file(path);
-        auto code = compile_function_code(arch, subdir_path, system_dir_path, name, text);
-        if (code->index != 0) {
-          if (!this->index_to_function.emplace(code->index, code).second) {
-            throw runtime_error(phosg::string_printf(
-                "duplicate function index: %08" PRIX32, code->index));
+        for (auto code : compile_function_code(arch, subdir_path, system_dir_path, name, text)) {
+          if (code->specific_version == 0) {
+            code->specific_version = specific_version;
+          }
+          code->source_path = path;
+          code->short_name = short_name;
+          this->name_to_function.emplace(name, code);
+          if (is_patch) {
+            code->menu_item_id = next_menu_item_id++;
+            this->menu_item_id_and_specific_version_to_patch_function.emplace(
+                static_cast<uint64_t>(code->menu_item_id) << 32 | code->specific_version, code);
+            this->name_and_specific_version_to_patch_function.emplace(
+                std::format("{}-{:08X}", code->short_name, code->specific_version), code);
           }
-        }
-        code->specific_version = specific_version;
-        code->source_path = path;
-        code->short_name = short_name;
-        this->name_to_function.emplace(name, code);
-        if (is_patch) {
-          code->menu_item_id = next_menu_item_id++;
-          this->menu_item_id_and_specific_version_to_patch_function.emplace(
-              static_cast<uint64_t>(code->menu_item_id) << 32 | specific_version, code);
-          this->name_and_specific_version_to_patch_function.emplace(
-              phosg::string_printf("%s-%08" PRIX32, short_name.c_str(), specific_version), code);
-        }
 
-        string index_prefix = code->index ? phosg::string_printf("%02X => ", code->index) : "";
-        string patch_prefix = is_patch ? phosg::string_printf("[%08" PRIX32 "/%08" PRIX32 "] ", code->menu_item_id, code->specific_version) : "";
-        function_compiler_log.info("Compiled function %s%s%s (%s)",
-            index_prefix.c_str(), patch_prefix.c_str(), name.c_str(), name_for_architecture(code->arch));
+          string patch_prefix = is_patch ? std::format("[{:08X}] ", code->menu_item_id) : "";
+          function_compiler_log.debug_f("Compiled function {}{} ({}; {})",
+              patch_prefix, name, str_for_specific_version(code->specific_version), name_for_architecture(code->arch));
+        }
 
       } catch (const exception& e) {
-        function_compiler_log.warning("Failed to compile function %s: %s", filename.c_str(), e.what());
+        function_compiler_log.warning_f("Failed to compile function {}: {}", filename, e.what());
       }
-    }
-  }
-}
+    };
 
-shared_ptr<const Menu> FunctionCodeIndex::patch_menu(uint32_t specific_version) const {
-  auto suffix = phosg::string_printf("-%08" PRIX32, specific_version);
-
-  auto ret = make_shared<Menu>(MenuID::PATCHES, "Patches");
-  ret->items.emplace_back(PatchesMenuItemID::GO_BACK, "Go back", "Return to the\nmain menu", 0);
-  for (const auto& it : this->name_and_specific_version_to_patch_function) {
-    const auto& fn = it.second;
-    if (fn->hide_from_patches_menu || !phosg::ends_with(it.first, suffix)) {
+    if (std::filesystem::is_regular_file(subdir_path)) {
+      add_file(subdir_path);
+    } else if (std::filesystem::is_directory(subdir_path)) {
+      for (const auto& item : std::filesystem::directory_iterator(subdir_path)) {
+        string filename = item.path().filename().string();
+        add_file(filename);
+      }
+    } else {
+      function_compiler_log.warning_f("Skipping {} (unknown file type)", subdir_name);
       continue;
     }
-    ret->items.emplace_back(
-        fn->menu_item_id,
-        fn->long_name.empty() ? fn->short_name : fn->long_name,
-        fn->description,
-        MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE);
   }
-  return ret;
 }
 
 shared_ptr<const Menu> FunctionCodeIndex::patch_switches_menu(
-    uint32_t specific_version, const std::unordered_set<std::string>& auto_patches_enabled) const {
-  auto suffix = phosg::string_printf("-%08" PRIX32, specific_version);
+    uint32_t specific_version,
+    const std::unordered_set<std::string>& server_auto_patches_enabled,
+    const std::unordered_set<std::string>& client_auto_patches_enabled) const {
+  auto suffix = std::format("-{:08X}", specific_version);
 
-  auto ret = make_shared<Menu>(MenuID::PATCH_SWITCHES, "Patch switches");
+  auto ret = make_shared<Menu>(MenuID::PATCH_SWITCHES, "Patches");
   ret->items.emplace_back(PatchesMenuItemID::GO_BACK, "Go back", "Return to the\nmain menu", 0);
   for (const auto& it : this->name_and_specific_version_to_patch_function) {
     const auto& fn = it.second;
-    if (fn->hide_from_patches_menu || !phosg::ends_with(it.first, suffix)) {
+    if (fn->hide_from_patches_menu || !it.first.ends_with(suffix) || server_auto_patches_enabled.count(fn->short_name)) {
       continue;
     }
     string name;
-    name.push_back(auto_patches_enabled.count(fn->short_name) ? '*' : '-');
+    name.push_back(client_auto_patches_enabled.count(fn->short_name) ? '*' : '-');
     name += fn->long_name.empty() ? fn->short_name : fn->long_name;
     ret->items.emplace_back(fn->menu_item_id, name, fn->description, MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE);
   }
@@ -409,16 +440,12 @@ bool FunctionCodeIndex::patch_menu_empty(uint32_t specific_version) const {
 std::shared_ptr<const CompiledFunctionCode> FunctionCodeIndex::get_patch(
     const std::string& name, uint32_t specific_version) const {
   return this->name_and_specific_version_to_patch_function.at(
-      phosg::string_printf("%s-%08" PRIX32, name.c_str(), specific_version));
+      std::format("{}-{:08X}", name, specific_version));
 }
 
 DOLFileIndex::DOLFileIndex(const string& directory) {
-  if (!function_compiler_available()) {
-    function_compiler_log.info("Function compiler is not available");
-    return;
-  }
-  if (!phosg::isdir(directory)) {
-    function_compiler_log.info("DOL file directory is missing");
+  if (!std::filesystem::is_directory(directory)) {
+    function_compiler_log.info_f("DOL file directory is missing");
     return;
   }
 
@@ -427,9 +454,10 @@ DOLFileIndex::DOLFileIndex(const string& directory) {
   menu->items.emplace_back(ProgramsMenuItemID::GO_BACK, "Go back", "Return to the\nmain menu", 0);
 
   uint32_t next_menu_item_id = 0;
-  for (const auto& filename : phosg::list_directory_sorted(directory)) {
-    bool is_dol = phosg::ends_with(filename, ".dol");
-    bool is_compressed_dol = phosg::ends_with(filename, ".dol.prs");
+  for (const auto& item : std::filesystem::directory_iterator(directory)) {
+    string filename = item.path().filename().string();
+    bool is_dol = filename.ends_with(".dol");
+    bool is_compressed_dol = filename.ends_with(".dol.prs");
     if (!is_dol && !is_compressed_dol) {
       continue;
     }
@@ -458,10 +486,9 @@ DOLFileIndex::DOLFileIndex(const string& directory) {
 
         string compressed_size_str = phosg::format_size(file_data.size());
         string decompressed_size_str = phosg::format_size(decompressed_size);
-        function_compiler_log.info("Loaded compressed DOL file %s (%s -> %s)",
-            dol->name.c_str(), compressed_size_str.c_str(), decompressed_size_str.c_str());
-        description = phosg::string_printf("$C6%s$C7\n%s\n%s (orig)",
-            dol->name.c_str(), compressed_size_str.c_str(), decompressed_size_str.c_str());
+        function_compiler_log.debug_f("Loaded compressed DOL file {} ({} -> {})",
+            dol->name, compressed_size_str, decompressed_size_str);
+        description = std::format("$C6{}$C7\n{}\n{} (orig)", dol->name, compressed_size_str, decompressed_size_str);
 
       } else {
         phosg::StringWriter w;
@@ -474,8 +501,8 @@ DOLFileIndex::DOLFileIndex(const string& directory) {
         dol->data = std::move(w.str());
 
         string size_str = phosg::format_size(dol->data.size());
-        function_compiler_log.info("Loaded DOL file %s (%s)", filename.c_str(), size_str.c_str());
-        description = phosg::string_printf("$C6%s$C7\n%s", dol->name.c_str(), size_str.c_str());
+        function_compiler_log.debug_f("Loaded DOL file {} ({})", filename, size_str);
+        description = std::format("$C6{}$C7\n{}", dol->name, size_str);
       }
 
       this->name_to_file.emplace(dol->name, dol);
@@ -484,7 +511,7 @@ DOLFileIndex::DOLFileIndex(const string& directory) {
       menu->items.emplace_back(dol->menu_item_id, dol->name, description, MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE);
 
     } catch (const exception& e) {
-      function_compiler_log.warning("Failed to load DOL file %s: %s", filename.c_str(), e.what());
+      function_compiler_log.warning_f("Failed to load DOL file {}: {}", filename, e.what());
     }
   }
 }
@@ -501,7 +528,7 @@ uint32_t specific_version_for_gc_header_checksum(uint32_t header_checksum) {
       char developer_code2 = 'P';
       uint8_t disc_number = 0;
       uint8_t version_code;
-    } __packed__ data;
+    } __attribute__((packed)) data;
     for (const char* game_code2 = "OS"; *game_code2; game_code2++) {
       data.game_code2 = *game_code2;
       for (const char* region_code = "JEP"; *region_code; region_code++) {

src/FunctionCompiler.hh

@@ -11,9 +11,6 @@
 
 #include "Menu.hh"
 
-bool function_compiler_available();
-void set_function_compiler_available(bool is_available);
-
 // TODO: Support x86 and SH4 function calls in the future. Currently we only
 // support PPC32 because I haven't written an appropriate x86 assembler yet.
 
@@ -28,15 +25,15 @@ struct CompiledFunctionCode {
   std::string code;
   std::vector<uint16_t> relocation_deltas;
   std::unordered_map<std::string, uint32_t> label_offsets;
-  uint32_t entrypoint_offset_offset;
+  uint32_t entrypoint_offset_offset = 0;
   std::string source_path; // Path to source file from newserv root
   std::string short_name; // Based on filename
   std::string long_name; // From .meta name directive
   std::string description; // From .meta description directive
-  uint8_t index; // 0 = unused (not registered in index_to_function)
-  uint32_t menu_item_id;
-  bool hide_from_patches_menu;
-  uint32_t specific_version;
+  uint64_t client_flag = 0; // From .meta client_flag directive
+  uint32_t menu_item_id = 0;
+  bool hide_from_patches_menu = false;
+  uint32_t specific_version = 0; // 0 = not a client-selectable patch
 
   bool is_big_endian() const;
 
@@ -55,12 +52,6 @@ struct CompiledFunctionCode {
 
 const char* name_for_architecture(CompiledFunctionCode::Architecture arch);
 
-std::shared_ptr<CompiledFunctionCode> compile_function_code(
-    CompiledFunctionCode::Architecture arch,
-    const std::string& directory,
-    const std::string& name,
-    const std::string& text);
-
 struct FunctionCodeIndex {
   FunctionCodeIndex() = default;
   explicit FunctionCodeIndex(const std::string& directory);
@@ -71,8 +62,10 @@ struct FunctionCodeIndex {
   // Key here is e.g. "PATCHNAME-SPECIFICVERSION", with the latter in hex
   std::map<std::string, std::shared_ptr<CompiledFunctionCode>> name_and_specific_version_to_patch_function;
 
-  std::shared_ptr<const Menu> patch_menu(uint32_t specific_version) const;
-  std::shared_ptr<const Menu> patch_switches_menu(uint32_t specific_version, const std::unordered_set<std::string>& auto_patches_enabled) const;
+  std::shared_ptr<const Menu> patch_switches_menu(
+      uint32_t specific_version,
+      const std::unordered_set<std::string>& server_auto_patches_enabled,
+      const std::unordered_set<std::string>& client_auto_patches_enabled) const;
   bool patch_menu_empty(uint32_t specific_version) const;
 
   std::shared_ptr<const CompiledFunctionCode> get_patch(const std::string& name, uint32_t specific_version) const;

src/GSLArchive.cc

@@ -15,7 +15,7 @@ struct GSLHeaderEntryT {
   U32T<BE> offset; // In pages, so actual offset is this * 0x800
   U32T<BE> size;
   uint64_t unused;
-} __packed__;
+} __attribute__((packed));
 
 using GSLHeaderEntry = GSLHeaderEntryT<false>;
 using GSLHeaderEntryBE = GSLHeaderEntryT<true>;

src/GameServer.cc

@@ -0,0 +1,196 @@
+#include "GameServer.hh"
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <iostream>
+#include <phosg/Encoding.hh>
+#include <phosg/Network.hh>
+#include <phosg/Strings.hh>
+#include <phosg/Time.hh>
+
+#include "Loggers.hh"
+#include "PSOProtocol.hh"
+#include "ReceiveCommands.hh"
+
+using namespace std;
+using namespace std::placeholders;
+
+GameServer::GameServer(shared_ptr<ServerState> state)
+    : Server(state->io_context, "[GameServer] "), state(state) {}
+
+void GameServer::listen(
+    const std::string& name,
+    const string& addr,
+    uint16_t port,
+    Version version,
+    ServerBehavior behavior) {
+  if (port == 0) {
+    throw std::runtime_error("Listening port cannot be zero");
+  }
+
+  asio::ip::address asio_addr = addr.empty() ? asio::ip::address_v4::any() : asio::ip::make_address(addr);
+  auto sock = make_shared<GameServerSocket>();
+  sock->name = name;
+  sock->endpoint = asio::ip::tcp::endpoint(asio_addr, port);
+  sock->version = version;
+  sock->behavior = behavior;
+  this->add_socket(std::move(sock));
+}
+
+shared_ptr<Client> GameServer::connect_channel(shared_ptr<Channel> ch, uint16_t port, ServerBehavior initial_state) {
+  auto c = make_shared<Client>(this->shared_from_this(), ch, initial_state);
+
+  this->log.info_f("Client connected: C-{:X} via TSI-{}-{}-{}",
+      c->id, port, phosg::name_for_enum(ch->version), phosg::name_for_enum(initial_state));
+
+  asio::co_spawn(*this->io_context, this->handle_connected_client(c), asio::detached);
+  return c;
+}
+
+shared_ptr<Client> GameServer::get_client() const {
+  if (this->clients.empty()) {
+    throw runtime_error("no clients on game server");
+  }
+  if (this->clients.size() > 1) {
+    throw runtime_error("multiple clients on game server");
+  }
+  return *this->clients.begin();
+}
+
+vector<shared_ptr<Client>> GameServer::get_clients_by_identifier(const string& ident) const {
+  int64_t account_id_hex = -1;
+  int64_t account_id_dec = -1;
+  try {
+    account_id_dec = stoul(ident, nullptr, 10);
+  } catch (const invalid_argument&) {
+  }
+  try {
+    account_id_hex = stoul(ident, nullptr, 16);
+  } catch (const invalid_argument&) {
+  }
+
+  // TODO: It's kind of not great that we do a linear search here, but this is
+  // only used in the shell, so it should be pretty rare.
+  vector<shared_ptr<Client>> results;
+  for (const auto& c : this->clients) {
+    if (c->login && c->login->account->account_id == account_id_hex) {
+      results.emplace_back(c);
+      continue;
+    }
+    if (c->login && c->login->account->account_id == account_id_dec) {
+      results.emplace_back(c);
+      continue;
+    }
+    if (c->login && c->login->xb_license && c->login->xb_license->gamertag == ident) {
+      results.emplace_back(c);
+      continue;
+    }
+    if (c->login && c->login->bb_license && c->login->bb_license->username == ident) {
+      results.emplace_back(c);
+      continue;
+    }
+
+    auto p = c->character(false, false);
+    if (p && p->disp.name.eq(ident, p->inventory.language)) {
+      results.emplace_back(c);
+      continue;
+    }
+
+    if (c->channel->name == ident) {
+      results.emplace_back(c);
+      continue;
+    }
+    if (c->channel->name.starts_with(ident + " ")) {
+      results.emplace_back(c);
+      continue;
+    }
+  }
+
+  return results;
+}
+
+shared_ptr<Client> GameServer::create_client(shared_ptr<GameServerSocket> listen_sock, asio::ip::tcp::socket&& client_sock) {
+  uint32_t addr = ipv4_addr_for_asio_addr(client_sock.remote_endpoint().address());
+  if (this->state->banned_ipv4_ranges->check(addr)) {
+    client_sock.close();
+    return nullptr;
+  }
+
+  auto channel = SocketChannel::create(
+      this->io_context,
+      make_unique<asio::ip::tcp::socket>(std::move(client_sock)),
+      listen_sock->version,
+      1,
+      "",
+      phosg::TerminalFormat::FG_YELLOW,
+      phosg::TerminalFormat::FG_GREEN);
+  auto c = make_shared<Client>(this->shared_from_this(), channel, listen_sock->behavior);
+  this->log.info_f("Client connected: C-{:X} via {}", c->id, listen_sock->name);
+
+  return c;
+}
+
+asio::awaitable<void> GameServer::handle_client_command(shared_ptr<Client> c, unique_ptr<Channel::Message> msg) {
+  try {
+    co_await on_command(c, std::move(msg));
+  } catch (const exception& e) {
+    this->log.warning_f("Error processing client command: {}", e.what());
+    c->channel->disconnect();
+  }
+}
+
+asio::awaitable<void> GameServer::handle_client(shared_ptr<Client> c) {
+  auto g = phosg::on_close_scope(std::bind(&Client::cancel_pending_promises, c.get()));
+
+  try {
+    co_await on_connect(c);
+  } catch (const exception& e) {
+    this->log.warning_f("Error in client initialization: {}", e.what());
+    c->channel->disconnect();
+  }
+
+  while (c->channel->connected()) {
+    auto msg = std::make_unique<Channel::Message>(co_await c->channel->recv());
+    asio::co_spawn(co_await asio::this_coro::executor, this->handle_client_command(c, std::move(msg)), asio::detached);
+  }
+}
+
+asio::awaitable<void> GameServer::destroy_client(std::shared_ptr<Client> c) {
+  this->log.info_f("Running cleanup tasks for {}", c->channel->name);
+
+  // The client may not actually be disconnected yet if an uncaught exception
+  // occurred in a handler task
+  c->channel->disconnect();
+
+  // Close the proxy session, if any
+  if (c->proxy_session) {
+    if (c->proxy_session->server_channel) {
+      c->proxy_session->server_channel->disconnect();
+    }
+    c->proxy_session.reset();
+  }
+
+  try {
+    co_await on_disconnect(c);
+  } catch (const exception& e) {
+    this->log.warning_f("Error during client disconnect cleanup: {}", e.what());
+  }
+
+  // Note: It's important to move the disconnect hooks out of the client here
+  // because the hooks could modify c->disconnect_hooks while it's being
+  // iterated here, which would invalidate these iterators.
+  unordered_map<string, function<void()>> hooks = std::move(c->disconnect_hooks);
+  for (auto h_it : hooks) {
+    try {
+      h_it.second();
+    } catch (const exception& e) {
+      c->log.warning_f("Disconnect hook {} failed: {}", h_it.first, e.what());
+    }
+  }
+}

src/GameServer.hh

@@ -0,0 +1,48 @@
+#pragma once
+
+#include <asio.hpp>
+#include <memory>
+#include <string>
+#include <unordered_set>
+#include <vector>
+
+#include "Client.hh"
+#include "Server.hh"
+#include "ServerState.hh"
+
+struct GameServerSocket : ServerSocket {
+  Version version;
+  ServerBehavior behavior;
+};
+
+class GameServer
+    : public Server<Client, GameServerSocket>,
+      public std::enable_shared_from_this<GameServer> {
+public:
+  GameServer() = delete;
+  GameServer(const GameServer&) = delete;
+  GameServer(GameServer&&) = delete;
+  explicit GameServer(std::shared_ptr<ServerState> state);
+  virtual ~GameServer() = default;
+
+  void listen(const std::string& name, const std::string& addr, uint16_t port, Version version, ServerBehavior initial_state);
+
+  std::shared_ptr<Client> connect_channel(std::shared_ptr<Channel> ch, uint16_t port, ServerBehavior initial_state);
+
+  std::shared_ptr<Client> get_client() const;
+  std::vector<std::shared_ptr<Client>> get_clients_by_identifier(const std::string& ident) const;
+
+  inline std::shared_ptr<ServerState> get_state() const {
+    return this->state;
+  }
+
+protected:
+  std::shared_ptr<ServerState> state;
+
+  asio::awaitable<void> handle_client_command(std::shared_ptr<Client> c, std::unique_ptr<Channel::Message> msg);
+
+  [[nodiscard]] virtual std::shared_ptr<Client> create_client(
+      std::shared_ptr<GameServerSocket> listen_sock, asio::ip::tcp::socket&& client_sock);
+  virtual asio::awaitable<void> handle_client(std::shared_ptr<Client> c);
+  virtual asio::awaitable<void> destroy_client(std::shared_ptr<Client> c);
+};

src/HTTPServer.hh

@@ -1,122 +1,50 @@
 #pragma once
 
-#include <event2/buffer.h>
-#include <event2/event.h>
-#include <event2/http.h>
 #include <stdlib.h>
 
 #include <memory>
 #include <string>
 
-#include "ProxyServer.hh"
+#include "AsyncHTTPServer.hh"
 #include "ServerState.hh"
 
-class HTTPServer {
+class HTTPServer : public AsyncHTTPServer<> {
 public:
-  // shared_base should be null unless the HTTP server should run on the main
-  // thread (on Windows).
-  HTTPServer(std::shared_ptr<ServerState> state, std::shared_ptr<struct event_base> shared_base);
-
+  explicit HTTPServer(std::shared_ptr<ServerState> state);
   HTTPServer(const HTTPServer&) = delete;
   HTTPServer(HTTPServer&&) = delete;
   HTTPServer& operator=(const HTTPServer&) = delete;
   HTTPServer& operator=(HTTPServer&&) = delete;
   virtual ~HTTPServer() = default;
 
-  void listen(const std::string& socket_path);
-  void listen(const std::string& addr, int port);
-  void listen(int port);
-  void add_socket(int fd);
-
-  void schedule_stop();
-  void wait_for_stop();
-
-  void send_rare_drop_notification(std::shared_ptr<const phosg::JSON> message);
+  asio::awaitable<void> send_rare_drop_notification(std::shared_ptr<const phosg::JSON> message);
 
 protected:
-  class http_error : public std::runtime_error {
-  public:
-    http_error(int code, const std::string& what);
-    int code;
-  };
-
-  struct WebsocketClient {
-    struct evhttp_connection* conn;
-    struct bufferevent* bev;
-
-    uint8_t pending_opcode;
-    std::string pending_data;
-
-    uint64_t last_communication_time;
-
-    void* context;
-
-    WebsocketClient(struct evhttp_connection* conn);
-    ~WebsocketClient();
-
-    void reset_pending_frame();
-  };
-
   std::shared_ptr<ServerState> state;
-  std::shared_ptr<struct event_base> base;
-  std::shared_ptr<struct evhttp> http;
-  std::thread th; // Not used on Windows
+  std::unordered_set<std::shared_ptr<HTTPClient>> rare_drop_subscribers;
 
-  std::unordered_set<std::shared_ptr<WebsocketClient>> rare_drop_subscribers;
+  std::shared_ptr<phosg::JSON> generate_server_version() const;
+  std::shared_ptr<phosg::JSON> generate_account_json(std::shared_ptr<const Account> a) const;
+  std::shared_ptr<phosg::JSON> generate_client_json(
+      std::shared_ptr<const Client> c, std::shared_ptr<const ItemNameIndex> item_name_index) const;
+  std::shared_ptr<phosg::JSON> generate_lobby_json(
+      std::shared_ptr<const Lobby> l, std::shared_ptr<const ItemNameIndex> item_name_index) const;
+  std::shared_ptr<phosg::JSON> generate_accounts_json() const;
+  std::shared_ptr<phosg::JSON> generate_clients_json() const;
+  std::shared_ptr<phosg::JSON> generate_server_info_json() const;
+  std::shared_ptr<phosg::JSON> generate_lobbies_json() const;
+  std::shared_ptr<phosg::JSON> generate_summary_json() const;
+  std::shared_ptr<phosg::JSON> generate_all_json() const;
 
-  std::unordered_map<struct bufferevent*, std::shared_ptr<WebsocketClient>> bev_to_websocket_client;
+  asio::awaitable<std::shared_ptr<phosg::JSON>> generate_ep3_cards_json(bool trial) const;
+  asio::awaitable<std::shared_ptr<phosg::JSON>> generate_common_tables_json() const;
+  std::shared_ptr<phosg::JSON> generate_rare_table_list_json() const;
+  asio::awaitable<std::shared_ptr<phosg::JSON>> generate_rare_table_json(const std::string& table_name) const;
+  asio::awaitable<std::shared_ptr<phosg::JSON>> generate_quest_list_json(std::shared_ptr<const QuestIndex> q);
 
-  static void require_GET(struct evhttp_request* req);
-  static phosg::JSON require_POST(struct evhttp_request* req);
+  void require_GET(const HTTPRequest& req);
+  phosg::JSON require_POST(const HTTPRequest& req);
 
-  std::shared_ptr<WebsocketClient> enable_websockets(struct evhttp_request* req);
-
-  static void dispatch_on_websocket_read(struct bufferevent* bev, void* ctx);
-  static void dispatch_on_websocket_error(struct bufferevent* bev, short events, void* ctx);
-
-  void on_websocket_read(struct bufferevent* bev);
-  void on_websocket_error(struct bufferevent* bev, short events);
-
-  void disconnect_websocket_client(struct bufferevent* bev);
-  void send_websocket_message(struct bufferevent* bev, const std::string& message, uint8_t opcode = 0x01);
-  void send_websocket_message(std::shared_ptr<WebsocketClient> c, const std::string& message, uint8_t opcode = 0x01);
-
-  virtual void handle_websocket_message(std::shared_ptr<WebsocketClient> c, uint8_t opcode, const std::string& message);
-  virtual void handle_websocket_disconnect(std::shared_ptr<WebsocketClient> c);
-
-  void thread_fn();
-
-  static void dispatch_handle_request(struct evhttp_request* req, void* ctx);
-  void handle_request(struct evhttp_request* req);
-
-  static const std::unordered_map<int, const char*> explanation_for_response_code;
-  static void send_response(struct evhttp_request* req, int code, const char* content_type, struct evbuffer* b);
-  static void send_response(struct evhttp_request* req, int code, const char* content_type, const char* fmt, ...);
-
-  static std::unordered_multimap<std::string, std::string> parse_url_params(const std::string& query);
-  static std::unordered_map<std::string, std::string> parse_url_params_unique(const std::string& query);
-  static const std::string& get_url_param(
-      const std::unordered_multimap<std::string, std::string>& params,
-      const std::string& key,
-      const std::string* _default = nullptr);
-
-  static phosg::JSON generate_server_version_st();
-  static phosg::JSON generate_client_config_json_st(const Client::Config& config);
-  static phosg::JSON generate_account_json_st(std::shared_ptr<const Account> a);
-  static phosg::JSON generate_game_client_json_st(std::shared_ptr<const Client> c, std::shared_ptr<const ItemNameIndex> item_name_index);
-  static phosg::JSON generate_proxy_client_json_st(std::shared_ptr<const ProxyServer::LinkedSession> ses);
-  static phosg::JSON generate_lobby_json_st(std::shared_ptr<const Lobby> l, std::shared_ptr<const ItemNameIndex> item_name_index);
-  phosg::JSON generate_accounts_json() const;
-  phosg::JSON generate_game_server_clients_json() const;
-  phosg::JSON generate_proxy_server_clients_json() const;
-  phosg::JSON generate_server_info_json() const;
-  phosg::JSON generate_lobbies_json() const;
-  phosg::JSON generate_summary_json() const;
-  phosg::JSON generate_all_json() const;
-
-  phosg::JSON generate_ep3_cards_json(bool trial) const;
-  phosg::JSON generate_common_tables_json() const;
-  phosg::JSON generate_rare_tables_json() const;
-  phosg::JSON generate_rare_table_json(const std::string& table_name) const;
-  phosg::JSON generate_quest_list_json(std::shared_ptr<const QuestIndex> q);
+  virtual asio::awaitable<std::unique_ptr<HTTPResponse>> handle_request(std::shared_ptr<HTTPClient> c, HTTPRequest&& req);
+  virtual asio::awaitable<void> destroy_client(std::shared_ptr<HTTPClient> c);
 };

src/IPFrameInfo.cc

@@ -13,9 +13,6 @@ static inline uint16_t collapse_checksum(uint32_t sum) {
   return (sum & 0xFFFF) + (sum >> 16);
 }
 
-FrameInfo::FrameInfo(LinkType link_type, const string& data)
-    : FrameInfo(link_type, data.data(), data.size()) {}
-
 FrameInfo::FrameInfo(LinkType link_type, const void* header_start, size_t size)
     : FrameInfo() {
   this->link_type = link_type;
@@ -126,37 +123,37 @@ string FrameInfo::header_str() const {
 
   string ret;
   if (this->ether) {
-    ret = phosg::string_printf(
-        "ETHER:%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX->%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX",
+    ret = std::format(
+        "ETHER:{:02X}{:02X}{:02X}{:02X}{:02X}{:02X}->{:02X}{:02X}{:02X}{:02X}{:02X}{:02X}",
         this->ether->src_mac[0], this->ether->src_mac[1], this->ether->src_mac[2],
         this->ether->src_mac[3], this->ether->src_mac[4], this->ether->src_mac[5],
         this->ether->dest_mac[0], this->ether->dest_mac[1], this->ether->dest_mac[2],
         this->ether->dest_mac[3], this->ether->dest_mac[4], this->ether->dest_mac[5]);
   } else if (this->hdlc) {
-    ret = phosg::string_printf("HDLC:%02hhX/%02hhX", this->hdlc->address, this->hdlc->control);
+    ret = std::format("HDLC:{:02X}/{:02X}", this->hdlc->address, this->hdlc->control);
   } else {
     return "<invalid-frame-info>";
   }
 
   if (this->arp) {
-    ret += phosg::string_printf(
-        ",ARP,hw_type=%04hX,proto_type=%04hX,hw_addr_len=%02hhX,proto_addr_len=%02hhX,op=%04hX",
-        this->arp->hardware_type.load(), this->arp->protocol_type.load(), this->arp->hwaddr_len, this->arp->paddr_len, this->arp->operation.load());
+    ret += std::format(
+        ",ARP,hw_type={:04X},proto_type={:04X},hw_addr_len={:02X},proto_addr_len={:02X},op={:04X}",
+        this->arp->hardware_type, this->arp->protocol_type, this->arp->hwaddr_len, this->arp->paddr_len, this->arp->operation);
 
   } else if (this->ipv4) {
-    ret += phosg::string_printf(
-        ",IPv4,size=%04hX,src=%08" PRIX32 ",dest=%08" PRIX32,
-        this->ipv4->size.load(), this->ipv4->src_addr.load(), this->ipv4->dest_addr.load());
+    ret += std::format(
+        ",IPv4,size={:04X},src={:08X},dest={:08X}",
+        this->ipv4->size, this->ipv4->src_addr, this->ipv4->dest_addr);
 
     if (this->udp) {
-      ret += phosg::string_printf(
-          ",UDP,src_port=%04hX,dest_port=%04hX,size=%04hX",
-          this->udp->src_port.load(), this->udp->dest_port.load(), this->udp->size.load());
+      ret += std::format(
+          ",UDP,src_port={:04X},dest_port={:04X},size={:04X}",
+          this->udp->src_port, this->udp->dest_port, this->udp->size);
 
     } else if (this->tcp) {
-      ret += phosg::string_printf(
-          ",TCP,src_port=%04hX,dest_port=%04hX,seq=%08" PRIX32 ",ack=%08" PRIX32 ",flags=%04hX(",
-          this->tcp->src_port.load(), this->tcp->dest_port.load(), this->tcp->seq_num.load(), this->tcp->ack_num.load(), this->tcp->flags.load());
+      ret += std::format(
+          ",TCP,src_port={:04X},dest_port={:04X},seq={:08X},ack={:08X},flags={:04X}(",
+          this->tcp->src_port, this->tcp->dest_port, this->tcp->seq_num, this->tcp->ack_num, this->tcp->flags);
       if (this->tcp->flags & TCPHeader::Flag::FIN) {
         ret += "FIN,";
       }
@@ -175,14 +172,14 @@ string FrameInfo::header_str() const {
       ret += ')';
 
     } else {
-      ret += phosg::string_printf(",proto=%02hhX", this->ipv4->protocol);
+      ret += std::format(",proto={:02X}", this->ipv4->protocol);
     }
 
   } else {
     if (this->ether) {
-      ret += phosg::string_printf(",proto=%04hX", this->ether->protocol.load());
+      ret += std::format(",proto={:04X}", this->ether->protocol);
     } else if (this->hdlc) {
-      ret += phosg::string_printf(",proto=%04hX", this->hdlc->protocol.load());
+      ret += std::format(",proto={:04X}", this->hdlc->protocol);
     }
   }
 

src/IPFrameInfo.hh

@@ -156,7 +156,6 @@ struct FrameInfo {
   size_t payload_size = 0;
 
   FrameInfo() = default;
-  FrameInfo(LinkType link_type, const std::string& data);
   FrameInfo(LinkType link_type, const void* data, size_t size);
 
   std::string header_str() const;

src/IPStackSimulator.hh

@@ -1,169 +1,209 @@
 #pragma once
 
-#include <netinet/in.h>
 #include <stdint.h>
 
-#include <deque>
+#include <asio.hpp>
+#include <list>
+#include <memory>
 #include <phosg/Filesystem.hh>
 #include <phosg/Process.hh>
 #include <string>
 
+#include "AsyncUtils.hh"
+#include "Channel.hh"
 #include "IPFrameInfo.hh"
-#include "ProxyServer.hh"
 #include "Server.hh"
 #include "ServerState.hh"
 #include "Text.hh"
 
-class IPStackSimulator : public std::enable_shared_from_this<IPStackSimulator> {
+class IPStackSimulator;
+class IPSSChannel;
+
+constexpr size_t DEFAULT_RESEND_PUSH_USECS = 200000; // 200ms
+
+enum class VirtualNetworkProtocol {
+  ETHERNET_TAPSERVER = 0,
+  HDLC_TAPSERVER,
+  HDLC_RAW,
+};
+
+struct IPSSSocket : ServerSocket {
+  VirtualNetworkProtocol protocol;
+};
+
+struct IPSSClient : std::enable_shared_from_this<IPSSClient> {
+  std::shared_ptr<asio::io_context> io_context;
+  std::weak_ptr<IPStackSimulator> sim;
+  uint64_t network_id;
+  asio::ip::tcp::socket sock;
+  VirtualNetworkProtocol protocol;
+  uint32_t hdlc_escape_control_character_flags = 0xFFFFFFFF;
+  uint32_t hdlc_remote_magic_number = 0;
+  parray<uint8_t, 6> mac_addr; // Only used for LinkType::ETHERNET
+  uint32_t ipv4_addr;
+  asio::steady_timer idle_timeout_timer;
+
+  struct TCPConnection {
+    std::weak_ptr<IPSSClient> client;
+    std::shared_ptr<IPSSChannel> server_channel;
+    bool awaiting_first_ack = true;
+    bool awaiting_ack = false;
+    uint32_t server_addr = 0;
+    uint16_t server_port = 0;
+    uint16_t client_port = 0;
+    uint32_t next_client_seq = 0;
+    uint32_t acked_server_seq = 0;
+    size_t resend_push_usecs = DEFAULT_RESEND_PUSH_USECS;
+    size_t next_push_max_frame_size = 1024;
+    size_t max_frame_size = 1024;
+    size_t bytes_received = 0;
+    size_t bytes_sent = 0;
+    size_t outbound_data_bytes = 0;
+    std::list<std::string> outbound_data;
+    asio::steady_timer resend_push_timer;
+
+    TCPConnection(std::shared_ptr<IPSSClient> client);
+
+    inline uint64_t key() const {
+      return (static_cast<uint64_t>(this->server_addr) << 32) |
+          (static_cast<uint64_t>(this->server_port) << 16) |
+          static_cast<uint64_t>(this->client_port);
+    }
+    static inline uint64_t key(const IPv4Header& ipv4, const TCPHeader& tcp) {
+      return (static_cast<uint64_t>(ipv4.dest_addr) << 32) |
+          (static_cast<uint64_t>(tcp.dest_port) << 16) |
+          static_cast<uint64_t>(tcp.src_port);
+    }
+    static inline uint64_t key(const FrameInfo& fi) {
+      if (!fi.ipv4 || !fi.tcp) {
+        throw std::logic_error("tcp_conn_key_for_frame called on non-TCP frame");
+      }
+      return key(*fi.ipv4, *fi.tcp);
+    }
+
+    void drain_outbound_data(size_t bytes);
+    void linearize_outbound_data(size_t bytes);
+  };
+  std::unordered_map<uint64_t, std::shared_ptr<TCPConnection>> tcp_connections;
+
+  IPSSClient(
+      std::shared_ptr<IPStackSimulator> sim,
+      uint64_t network_id,
+      VirtualNetworkProtocol protocol,
+      asio::ip::tcp::socket&& sock);
+  void reschedule_idle_timeout();
+};
+
+// IPSSChannel provides an "unwrapped" connection to the rest of the server. It
+// implements the Channel interface and can be used in place of an
+// SocketChannel, so the rest of the server doesn't have to know about
+// IPStackSimulator.
+class IPSSChannel : public Channel {
 public:
-  enum class Protocol {
-    ETHERNET_TAPSERVER = 0,
-    HDLC_TAPSERVER,
-    HDLC_RAW,
-  };
+  std::shared_ptr<IPStackSimulator> sim;
+  std::weak_ptr<IPSSClient> ipss_client;
+  std::weak_ptr<IPSSClient::TCPConnection> tcp_conn;
 
-  using unique_listener = std::unique_ptr<struct evconnlistener, void (*)(struct evconnlistener*)>;
-  using unique_bufferevent = std::unique_ptr<struct bufferevent, void (*)(struct bufferevent*)>;
-  using unique_evbuffer = std::unique_ptr<struct evbuffer, void (*)(struct evbuffer*)>;
-  using unique_event = std::unique_ptr<struct event, void (*)(struct event*)>;
+  IPSSChannel(
+      std::shared_ptr<IPStackSimulator> sim,
+      std::weak_ptr<IPSSClient> ipss_client,
+      std::weak_ptr<IPSSClient::TCPConnection> tcp_conn,
+      Version version,
+      uint8_t language,
+      const std::string& name = "",
+      phosg::TerminalFormat terminal_send_color = phosg::TerminalFormat::END,
+      phosg::TerminalFormat terminal_recv_color = phosg::TerminalFormat::END);
 
-  struct IPClient : std::enable_shared_from_this<IPClient> {
-    std::weak_ptr<IPStackSimulator> sim;
-    uint64_t network_id;
+  virtual std::string default_name() const;
 
-    unique_bufferevent bev;
-    Protocol protocol;
-    uint32_t hdlc_escape_control_character_flags = 0xFFFFFFFF;
-    uint32_t hdlc_remote_magic_number = 0;
-    parray<uint8_t, 6> mac_addr; // Only used for LinkType::ETHERNET
-    uint32_t ipv4_addr;
+  virtual bool connected() const;
+  virtual void disconnect();
 
-    struct TCPConnection {
-      std::weak_ptr<IPClient> client;
+  // Adds inbound data, which will then be available via recv_raw(). This
+  // function is called by IPStackSimulator to forward "unwrapped" data to
+  // the game/proxy servers.
+  void add_inbound_data(const void* data, size_t size);
 
-      // The PSO protocol begins with the server sending a command, but we
-      // shouldn't send a PSH immediately after the SYN+ACK, so the connection
-      // isn't handed to the Server object until after the 3-way handshake
-      // (receive SYN, send SYN+ACK, receive ACK). This means server_bev is null
-      // during the first part of the connection phase.
-      unique_bufferevent server_bev;
-      // TODO: Get rid of pending_data and just use server_bev's input buffer in
-      // its place
-      unique_evbuffer pending_data;
-      unique_event resend_push_event;
+  virtual void send_raw(std::string&& data);
+  virtual asio::awaitable<void> recv_raw(void* data, size_t size);
 
-      bool awaiting_first_ack;
+private:
+  AsyncEvent data_available_signal;
+  std::deque<std::string> inbound_data;
+  void* recv_buf = nullptr;
+  size_t recv_buf_size = 0;
+};
 
-      uint32_t server_addr;
-      uint16_t server_port;
-      uint16_t client_port;
-      uint32_t next_client_seq;
-      uint32_t acked_server_seq;
-      size_t resend_push_usecs;
-      size_t next_push_max_frame_size;
-      size_t max_frame_size;
-      size_t bytes_received;
-      size_t bytes_sent;
+class IPStackSimulator
+    : public Server<IPSSClient, IPSSSocket>,
+      public std::enable_shared_from_this<IPStackSimulator> {
+public:
+  IPStackSimulator(std::shared_ptr<ServerState> state);
+  ~IPStackSimulator() = default;
 
-      TCPConnection();
-    };
-    std::unordered_map<uint64_t, TCPConnection> tcp_connections;
-
-    unique_event idle_timeout_event;
-
-    IPClient(std::shared_ptr<IPStackSimulator> sim, uint64_t network_id, Protocol protocol, struct bufferevent* bev);
-
-    static void dispatch_on_client_input(struct bufferevent* bev, void* ctx);
-    void on_client_input(struct bufferevent* bev);
-    static void dispatch_on_client_error(struct bufferevent* bev, short events, void* ctx);
-    void on_client_error(struct bufferevent* bev, short events);
-
-    static void dispatch_on_idle_timeout(evutil_socket_t fd, short events, void* ctx);
-    void on_idle_timeout();
-  };
-
-  IPStackSimulator(
-      std::shared_ptr<struct event_base> base,
-      std::shared_ptr<ServerState> state);
-  ~IPStackSimulator();
-
-  void listen(const std::string& name, const std::string& socket_path, Protocol protocol);
-  void listen(const std::string& name, const std::string& addr, int port, Protocol protocol);
-  void listen(const std::string& name, int port, Protocol protocol);
-  void add_socket(const std::string& name, int fd, Protocol protocol);
+  void listen(const std::string& name, const std::string& addr, int port, VirtualNetworkProtocol protocol);
 
   static uint32_t connect_address_for_remote_address(uint32_t remote_addr);
 
-  std::shared_ptr<IPClient> get_network(uint64_t network_id) const;
-  inline const std::unordered_map<uint64_t, std::shared_ptr<IPClient>>& all_networks() const {
-    return this->network_id_to_client;
+  inline std::shared_ptr<ServerState> get_state() {
+    return this->state;
   }
 
-  void disconnect_client(uint64_t network_id);
-
 private:
-  std::shared_ptr<struct event_base> base;
   std::shared_ptr<ServerState> state;
-  uint64_t next_network_id;
-
-  struct ListeningSocket {
-    std::string name;
-    Protocol protocol;
-    unique_listener listener;
-
-    ListeningSocket(const std::string& name, Protocol protocol, unique_listener&& l)
-        : name(name),
-          protocol(protocol),
-          listener(std::move(l)) {}
-  };
-
-  std::unordered_map<int, ListeningSocket> listening_sockets;
-  std::unordered_map<uint64_t, std::shared_ptr<IPClient>> network_id_to_client;
+  uint64_t next_network_id = 1;
 
   parray<uint8_t, 6> host_mac_address_bytes;
   parray<uint8_t, 6> broadcast_mac_address_bytes;
 
-  FILE* pcap_text_log_file;
-
-  static uint64_t tcp_conn_key_for_connection(const IPClient::TCPConnection& conn);
+  static uint64_t tcp_conn_key_for_connection(std::shared_ptr<const IPSSClient::TCPConnection> conn);
   static uint64_t tcp_conn_key_for_client_frame(const IPv4Header& ipv4, const TCPHeader& tcp);
   static uint64_t tcp_conn_key_for_client_frame(const FrameInfo& fi);
 
   static std::string str_for_ipv4_netloc(uint32_t addr, uint16_t port);
-  static std::string str_for_tcp_connection(std::shared_ptr<const IPClient> c, const IPClient::TCPConnection& conn);
+  static std::string str_for_tcp_connection(
+      std::shared_ptr<const IPSSClient> c, std::shared_ptr<const IPSSClient::TCPConnection> conn);
 
-  static void dispatch_on_listen_accept(struct evconnlistener* listener,
-      evutil_socket_t fd, struct sockaddr* address, int socklen, void* ctx);
-  void on_listen_accept(struct evconnlistener* listener, evutil_socket_t fd, struct sockaddr* address, int socklen);
-  static void dispatch_on_listen_error(struct evconnlistener* listener, void* ctx);
-  void on_listen_error(struct evconnlistener* listener);
+  asio::awaitable<void> send_ethernet_tapserver_frame(
+      std::shared_ptr<IPSSClient> c, FrameInfo::Protocol proto, const void* data, size_t size) const;
+  asio::awaitable<void> send_hdlc_frame(
+      std::shared_ptr<IPSSClient> c, FrameInfo::Protocol proto, const void* data, size_t size, bool is_raw) const;
+  asio::awaitable<void> send_layer3_frame(
+      std::shared_ptr<IPSSClient> c, FrameInfo::Protocol proto, const void* data, size_t size) const;
+  [[nodiscard]] inline asio::awaitable<void> send_layer3_frame(
+      std::shared_ptr<IPSSClient> c, FrameInfo::Protocol proto, const std::string& data) const {
+    return this->send_layer3_frame(c, proto, data.data(), data.size());
+  }
 
-  void send_layer3_frame(std::shared_ptr<IPClient> c, FrameInfo::Protocol proto, const std::string& data) const;
-  void send_layer3_frame(std::shared_ptr<IPClient> c, FrameInfo::Protocol proto, const void* data, size_t size) const;
+  asio::awaitable<void> on_client_frame(std::shared_ptr<IPSSClient> c, const void* data, size_t size);
+  asio::awaitable<void> on_client_lcp_frame(std::shared_ptr<IPSSClient> c, const FrameInfo& fi);
+  asio::awaitable<void> on_client_pap_frame(std::shared_ptr<IPSSClient> c, const FrameInfo& fi);
+  asio::awaitable<void> on_client_ipcp_frame(std::shared_ptr<IPSSClient> c, const FrameInfo& fi);
+  asio::awaitable<void> on_client_arp_frame(std::shared_ptr<IPSSClient> c, const FrameInfo& fi);
+  asio::awaitable<void> on_client_udp_frame(std::shared_ptr<IPSSClient> c, const FrameInfo& fi);
+  asio::awaitable<void> on_client_tcp_frame(std::shared_ptr<IPSSClient> c, const FrameInfo& fi);
 
-  void on_client_frame(std::shared_ptr<IPClient> c, const std::string& frame);
-  void on_client_lcp_frame(std::shared_ptr<IPClient> c, const FrameInfo& fi);
-  void on_client_pap_frame(std::shared_ptr<IPClient> c, const FrameInfo& fi);
-  void on_client_ipcp_frame(std::shared_ptr<IPClient> c, const FrameInfo& fi);
-  void on_client_arp_frame(std::shared_ptr<IPClient> c, const FrameInfo& fi);
-  void on_client_udp_frame(std::shared_ptr<IPClient> c, const FrameInfo& fi);
-  void on_client_tcp_frame(std::shared_ptr<IPClient> c, const FrameInfo& fi);
-
-  static void dispatch_on_server_input(struct bufferevent* bev, void* ctx);
-  void on_server_input(std::shared_ptr<IPClient> c, IPClient::TCPConnection& conn);
-  static void dispatch_on_server_error(struct bufferevent* bev, short events, void* ctx);
-  void on_server_error(std::shared_ptr<IPClient> c, IPClient::TCPConnection& conn, short events);
-
-  static void dispatch_on_resend_push(evutil_socket_t, short, void* ctx);
-  void send_pending_push_frame(std::shared_ptr<IPClient> c, IPClient::TCPConnection& conn, bool always_send);
-  void send_tcp_frame(
-      std::shared_ptr<IPClient> c,
-      IPClient::TCPConnection& conn,
+  void schedule_send_pending_push_frame(std::shared_ptr<IPSSClient::TCPConnection> conn, uint64_t delay_usecs);
+  asio::awaitable<void> send_pending_push_frame(
+      std::shared_ptr<IPSSClient> c, std::shared_ptr<IPSSClient::TCPConnection> conn);
+  asio::awaitable<void> send_tcp_frame(
+      std::shared_ptr<IPSSClient> c,
+      std::shared_ptr<IPSSClient::TCPConnection> conn,
       uint16_t flags = 0,
-      struct evbuffer* src_buf = nullptr,
-      size_t src_bytes = 0);
+      const void* payload_data = nullptr,
+      size_t payload_bytes = 0);
 
-  void open_server_connection(std::shared_ptr<IPClient> c, IPClient::TCPConnection& conn);
+  asio::awaitable<void> open_server_connection(
+      std::shared_ptr<IPSSClient> c, std::shared_ptr<IPSSClient::TCPConnection> conn);
+  asio::awaitable<void> close_tcp_connection(
+      std::shared_ptr<IPSSClient> c, std::shared_ptr<IPSSClient::TCPConnection> conn);
 
-  void log_frame(const std::string& data) const;
+  [[nodiscard]] virtual std::shared_ptr<IPSSClient> create_client(
+      std::shared_ptr<IPSSSocket> listen_sock, asio::ip::tcp::socket&& client_sock);
+  asio::awaitable<void> handle_tapserver_client(std::shared_ptr<IPSSClient> c);
+  asio::awaitable<void> handle_hdlc_raw_client(std::shared_ptr<IPSSClient> c);
+  virtual asio::awaitable<void> handle_client(std::shared_ptr<IPSSClient> c);
+  virtual asio::awaitable<void> destroy_client(std::shared_ptr<IPSSClient> c);
+
+  friend class IPSSChannel;
 };

src/IPV4RangeSet.cc

@@ -1,7 +1,5 @@
 #include "IPV4RangeSet.hh"
 
-#include <arpa/inet.h>
-
 using namespace std;
 
 IPV4RangeSet::IPV4RangeSet(const phosg::JSON& json) {
@@ -45,7 +43,7 @@ phosg::JSON IPV4RangeSet::json() const {
   for (const auto& it : this->ranges) {
     uint32_t addr = it.first;
     uint8_t mask_bits = it.second;
-    ret.emplace_back(phosg::string_printf("%hhu.%hhu.%hhu.%hhu/%hhu",
+    ret.emplace_back(std::format("{}.{}.{}.{}/{}",
         static_cast<uint8_t>((addr >> 24) & 0xFF),
         static_cast<uint8_t>((addr >> 16) & 0xFF),
         static_cast<uint8_t>((addr >> 8) & 0xFF),
@@ -63,11 +61,3 @@ bool IPV4RangeSet::check(uint32_t addr) const {
   const auto& range = *(--it);
   return (((range.first ^ addr) & (0xFFFFFFFF << (32 - range.second))) == 0);
 }
-
-bool IPV4RangeSet::check(const struct sockaddr_storage& ss) const {
-  if (ss.ss_family != AF_INET) {
-    return false;
-  }
-  const sockaddr_in* sin = reinterpret_cast<const sockaddr_in*>(&ss);
-  return this->check(ntohl(sin->sin_addr.s_addr));
-}

src/IPV4RangeSet.hh

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <asio.hpp>
 #include <phosg/JSON.hh>
 #include <set>
 
@@ -11,7 +12,6 @@ public:
   phosg::JSON json() const;
 
   bool check(uint32_t addr) const;
-  bool check(const struct sockaddr_storage& ss) const;
 
 protected:
   std::map<uint32_t, uint8_t> ranges; // {addr: mask_bits}

src/ImageEncoder.cc

@@ -35,7 +35,7 @@ struct GVRHeader {
   be_uint16_t height;
 } __packed_ws__(GVRHeader, 0x10);
 
-string encode_gvm(const phosg::Image& img, GVRDataFormat data_format, const string& internal_name, uint32_t global_index) {
+string encode_gvm(const phosg::ImageRGBA8888N& img, GVRDataFormat data_format, const string& internal_name, uint32_t global_index) {
   int8_t dimensions_field = -2;
   {
     size_t h = img.get_height();
@@ -90,17 +90,16 @@ string encode_gvm(const phosg::Image& img, GVRDataFormat data_format, const stri
     for (size_t x = 0; x < img.get_width(); x += 4) {
       for (size_t yy = 0; yy < 4; yy++) {
         for (size_t xx = 0; xx < 4; xx++) {
-          uint64_t a, r, g, b;
-          img.read_pixel(x + xx, y + yy, &r, &g, &b, &a);
+          uint32_t c = img.read(x + xx, y + yy);
           switch (data_format) {
             case GVRDataFormat::RGB565:
-              w.put_u16b(encode_rgb565(r, g, b));
+              w.put_u16b(phosg::rgb565_for_rgba8888(c));
               break;
             case GVRDataFormat::RGB5A3:
-              w.put_u16b(encode_rgb5a3(r, g, b, a));
+              w.put_u16b(encode_rgb5a3(c));
               break;
             case GVRDataFormat::ARGB8888:
-              w.put_u32b(encode_argb8888(r, g, b, a));
+              w.put_u32b(phosg::argb8888_for_rgba8888(c));
               break;
             default:
               throw logic_error("cannot encode pixel format");
@@ -115,15 +114,15 @@ string encode_gvm(const phosg::Image& img, GVRDataFormat data_format, const stri
 
 static const array<uint32_t, 4> fon_colors = {0x000000FF, 0x555555FF, 0xAAAAAAFF, 0xFFFFFFFF};
 
-phosg::Image decode_fon(const string& data, size_t width) {
+phosg::ImageRGB888 decode_fon(const string& data, size_t width) {
   size_t num_pixels = data.size() * 4;
   size_t height = num_pixels / width;
-  phosg::Image ret(width, height);
+  phosg::ImageRGB888 ret(width, height);
 
   phosg::BitReader r(data);
   for (size_t y = 0; y < height; y++) {
     for (size_t x = 0; x < width; x++) {
-      ret.write_pixel(x, y, fon_colors[r.read(2)]);
+      ret.write(x, y, fon_colors[r.read(2)]);
     }
   }
   return ret;
@@ -133,11 +132,11 @@ constexpr size_t uabs(size_t a, size_t b) {
   return (a > b) ? (a - b) : (b - a);
 }
 
-string encode_fon(const phosg::Image& img) {
+string encode_fon(const phosg::ImageRGB888& img) {
   phosg::BitWriter w;
   for (size_t y = 0; y < img.get_height(); y++) {
     for (size_t x = 0; x < img.get_width(); x++) {
-      uint32_t color = img.read_pixel(x, y);
+      uint32_t color = img.read(x, y);
 
       size_t result_delta = 0x400;
       size_t result_index = 0;

src/ImageEncoder.hh

@@ -19,43 +19,29 @@ enum class GVRDataFormat : uint8_t {
   DXT1 = 0x0E,
 };
 
-std::string encode_gvm(const phosg::Image& img, GVRDataFormat data_format, const std::string& internal_name, uint32_t global_index);
-phosg::Image decode_fon(const std::string& data, size_t width);
-std::string encode_fon(const phosg::Image& img);
+std::string encode_gvm(
+    const phosg::ImageRGBA8888N& img, GVRDataFormat data_format, const std::string& internal_name, uint32_t global_index);
+phosg::ImageRGB888 decode_fon(const std::string& data, size_t width);
+std::string encode_fon(const phosg::ImageRGB888& img);
 
-constexpr uint16_t encode_rgb565(uint8_t r, uint8_t g, uint8_t b) {
-  return ((r << 8) & 0xF800) | ((g << 3) & 0x07E0) | ((b >> 3) & 0x001F);
-}
-
-constexpr uint16_t encode_rgb5a3(uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
-  if ((a & 0xE0) == 0xE0) {
-    return 0x8000 | ((r << 7) & 0x7C00) | ((g << 2) & 0x03E0) | ((b >> 3) & 0x001F);
+constexpr uint16_t encode_rgb5a3(uint32_t c) {
+  if ((phosg::get_a(c) & 0xE0) == 0xE0) {
+    return 0x8000 | ((phosg::get_r(c) << 7) & 0x7C00) | ((phosg::get_g(c) << 2) & 0x03E0) | ((phosg::get_b(c) >> 3) & 0x001F);
   } else {
-    return ((a << 7) & 0x7000) | ((r << 4) & 0x0F00) | (g & 0x00F0) | ((b >> 4) & 0x000F);
+    return ((phosg::get_a(c) << 7) & 0x7000) | ((phosg::get_r(c) << 4) & 0x0F00) | (phosg::get_g(c) & 0x00F0) | ((phosg::get_b(c) >> 4) & 0x000F);
   }
 }
 
-constexpr uint32_t encode_argb8888(uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
-  return (a << 24) | (r << 16) | (g << 8) | b;
-}
-
-constexpr uint16_t encode_argb8888_to_argb1555(uint32_t argb8888) {
-  // In:  aaaaaaaarrrrrrrrggggggggbbbbbbbb
-  // Out:                 arrrrrgggggbbbbb
-  return ((argb8888 >> 9) & 0x7C00) | ((argb8888 >> 6) & 0x03E0) | ((argb8888 >> 3) & 0x001F) | ((argb8888 >> 16) & 0x8000);
-}
-
-constexpr uint16_t encode_rgba8888_to_argb1555(uint32_t rgba8888) {
-  // In:  rrrrrrrrggggggggbbbbbbbbaaaaaaaa
-  // Out:                 arrrrrgggggbbbbb
-  return ((rgba8888 >> 17) & 0x7C00) | ((rgba8888 >> 14) & 0x03E0) | ((rgba8888 >> 11) & 0x001F) | ((rgba8888 << 8) & 0x8000);
-}
-
-constexpr uint32_t decode_argb1555_to_rgba8888(uint16_t argb1555) {
-  // In:                  arrrrrgggggbbbbb
-  // Out: rrrrrrrrggggggggbbbbbbbbaaaaaaaa
-  return ((argb1555 << 17) & 0xF8000000) | ((argb1555 << 12) & 0x07000000) |
-      ((argb1555 << 14) & 0x00F80000) | ((argb1555 << 9) & 0x00070000) |
-      ((argb1555 << 11) & 0x0000F800) | ((argb1555 << 6) & 0x00000700) |
-      ((argb1555 & 0x8000) ? 0x000000FF : 0x00000000);
+template <phosg::PixelFormat Format>
+bool has_any_transparent_pixels(const phosg::Image<Format>& img) {
+  if constexpr (phosg::Image<Format>::HAS_ALPHA) {
+    for (size_t y = 0; y < img.get_height(); y++) {
+      for (size_t x = 0; x < img.get_height(); x++) {
+        if (phosg::get_a(img.read(x, y)) != 0xFF) {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
 }

src/IntegralExpression.cc

@@ -184,7 +184,7 @@ int64_t IntegralExpression::FlagLookupNode::evaluate(const Env& env) const {
 }
 
 string IntegralExpression::FlagLookupNode::str() const {
-  return phosg::string_printf("F_%04hX", this->flag_index);
+  return std::format("F_{:04X}", this->flag_index);
 }
 
 IntegralExpression::ChallengeCompletionLookupNode::ChallengeCompletionLookupNode(
@@ -214,7 +214,7 @@ int64_t IntegralExpression::ChallengeCompletionLookupNode::evaluate(const Env& e
 }
 
 string IntegralExpression::ChallengeCompletionLookupNode::str() const {
-  return phosg::string_printf("CC_%s_%hhu", abbreviation_for_episode(this->episode), static_cast<uint8_t>(this->stage_index + 1));
+  return std::format("CC_{}_{}", abbreviation_for_episode(this->episode), static_cast<uint8_t>(this->stage_index + 1));
 }
 
 IntegralExpression::TeamRewardLookupNode::TeamRewardLookupNode(const string& reward_name)
@@ -296,7 +296,7 @@ int64_t IntegralExpression::ConstantNode::evaluate(const Env&) const {
 }
 
 string IntegralExpression::ConstantNode::str() const {
-  return phosg::string_printf("%" PRId64, this->value);
+  return std::format("{}", this->value);
 }
 
 unique_ptr<const IntegralExpression::Node> IntegralExpression::parse_expr(string_view text) {

src/ItemCreator.cc

@@ -34,9 +34,9 @@ ItemCreator::ItemCreator(
     GameMode mode,
     uint8_t difficulty,
     uint8_t section_id,
-    std::shared_ptr<PSOLFGEncryption> opt_rand_crypt,
+    std::shared_ptr<RandomGenerator> rand_crypt,
     shared_ptr<const BattleRules> restrictions)
-    : log(phosg::string_printf("[ItemCreator:%s/%s/%s/%c/%hhu] ", phosg::name_for_enum(stack_limits->version), abbreviation_for_episode(episode), abbreviation_for_mode(mode), abbreviation_for_difficulty(difficulty), section_id), lobby_log.min_level),
+    : log(std::format("[ItemCreator:{}/{}/{}/{}/{}] ", phosg::name_for_enum(stack_limits->version), abbreviation_for_episode(episode), abbreviation_for_mode(mode), abbreviation_for_difficulty(difficulty), section_id), lobby_log.min_level),
       logic_version(stack_limits->version),
       stack_limits(stack_limits),
       episode(episode),
@@ -52,18 +52,14 @@ ItemCreator::ItemCreator(
       common_item_set(common_item_set),
       pt(common_item_set->get_table(this->episode, this->mode, this->difficulty, this->section_id)),
       restrictions(restrictions),
-      opt_rand_crypt(opt_rand_crypt ? make_shared<PSOV2Encryption>(opt_rand_crypt->seed()) : nullptr) {
+      rand_crypt(rand_crypt) {
   this->generate_unit_stars_tables();
 }
 
-void ItemCreator::set_random_crypt(shared_ptr<PSOLFGEncryption> new_random_crypt) {
-  this->opt_rand_crypt = new_random_crypt;
-}
-
 void ItemCreator::set_section_id(uint8_t new_section_id) {
   if (this->section_id != new_section_id) {
     this->section_id = new_section_id;
-    this->log.prefix = phosg::string_printf("[ItemCreator:%s/%s/%s/%c/%hhu] ",
+    this->log.prefix = std::format("[ItemCreator:{}/{}/{}/{}/{}] ",
         phosg::name_for_enum(stack_limits->version),
         abbreviation_for_episode(episode),
         abbreviation_for_mode(mode),
@@ -150,7 +146,7 @@ ItemCreator::DropResult ItemCreator::on_box_item_drop(uint8_t area) {
   try {
     return this->on_box_item_drop_with_area_norm(this->normalize_area_number(area));
   } catch (const exception& e) {
-    this->log.error("Exception in item creation: %s", e.what());
+    this->log.error_f("Exception in item creation: {}", e.what());
     return DropResult();
   }
 }
@@ -159,24 +155,20 @@ ItemCreator::DropResult ItemCreator::on_monster_item_drop(uint32_t enemy_type, u
   try {
     return this->on_monster_item_drop_with_area_norm(enemy_type, this->normalize_area_number(area));
   } catch (const exception& e) {
-    this->log.error("Exception in item creation: %s", e.what());
+    this->log.error_f("Exception in item creation: {}", e.what());
     return DropResult();
   }
 }
 
 ItemCreator::DropResult ItemCreator::on_box_item_drop_with_area_norm(uint8_t area_norm) {
-  this->log.info("Box drop checks for area_norm %02hhX", area_norm);
-  if (this->opt_rand_crypt) {
-    this->log.info("Random state: %08" PRIX32 " %08" PRIX32,
-        this->opt_rand_crypt->seed(), this->opt_rand_crypt->absolute_offset());
-  }
+  this->log.info_f("Box drop checks for area_norm {:02X}", area_norm);
   DropResult res;
   res.item = this->check_rare_specs_and_create_rare_box_item(area_norm);
   if (!res.item.empty()) {
     res.is_from_rare_table = true;
   } else {
     uint8_t item_class = this->get_rand_from_weighted_tables_2d_vertical(this->pt->box_item_class_prob_table, area_norm);
-    this->log.info("Item class is %02hhX", item_class);
+    this->log.info_f("Item class is {:02X}", item_class);
     switch (item_class) {
       case 0: // Weapon
         res.item.data1[0] = 0;
@@ -215,22 +207,18 @@ ItemCreator::DropResult ItemCreator::on_monster_item_drop_with_area_norm(uint32_
   // Note: The original GC implementation uses (enemy_type > 0x58) here; we
   // extend it to the full array size for BB
   if (enemy_type >= 0x64) {
-    this->log.warning("Invalid enemy type: %" PRIX32, enemy_type);
+    this->log.warning_f("Invalid enemy type: {:X}", enemy_type);
     return DropResult();
   }
-  this->log.info("Enemy type: %" PRIX32 "", enemy_type);
-  if (this->opt_rand_crypt) {
-    this->log.info("Random state: %08" PRIX32 " %08" PRIX32,
-        this->opt_rand_crypt->seed(), this->opt_rand_crypt->absolute_offset());
-  }
+  this->log.info_f("Enemy type: {:X}", enemy_type);
 
   uint8_t type_drop_prob = this->pt->enemy_type_drop_probs.at(enemy_type);
   uint8_t drop_sample = this->rand_int(100);
   if (drop_sample >= type_drop_prob) {
-    this->log.info("Drop not chosen (%hhu >= %hhu)", drop_sample, type_drop_prob);
+    this->log.info_f("Drop not chosen ({} >= {})", drop_sample, type_drop_prob);
     return DropResult();
   } else {
-    this->log.info("Drop chosen (%hhu < %hhu)", drop_sample, type_drop_prob);
+    this->log.info_f("Drop chosen ({} < {})", drop_sample, type_drop_prob);
   }
 
   DropResult res;
@@ -258,7 +246,7 @@ ItemCreator::DropResult ItemCreator::on_monster_item_drop_with_area_norm(uint32_
         throw logic_error("invalid item class determinant");
     }
 
-    this->log.info("Rare drop not chosen; item class determinant is %" PRIu32 "; item class is %" PRIu32, item_class_determinant, item_class);
+    this->log.info_f("Rare drop not chosen; item class determinant is {}; item class is {}", item_class_determinant, item_class);
 
     switch (item_class) {
       case 0: // Weapon
@@ -303,27 +291,27 @@ ItemData ItemCreator::check_rare_specs_and_create_rare_box_item(uint8_t area_nor
   for (const auto& spec : rare_specs) {
     item = this->check_rate_and_create_rare_item(spec, area_norm);
     if (!item.empty()) {
-      if (this->log.should_log(phosg::LogLevel::INFO)) {
+      if (this->log.should_log(phosg::LogLevel::L_INFO)) {
         auto hex = spec.data.hex();
-        this->log.info("Box spec %08" PRIX32 " produced item %s", spec.probability, hex.c_str());
+        this->log.info_f("Box spec {:08X} produced item {}", spec.probability, hex);
       }
       break;
     }
-    if (this->log.should_log(phosg::LogLevel::INFO)) {
+    if (this->log.should_log(phosg::LogLevel::L_INFO)) {
       auto hex = spec.data.hex();
-      this->log.info("Box spec %08" PRIX32 " did not produce item %s", spec.probability, hex.c_str());
+      this->log.info_f("Box spec {:08X} did not produce item {}", spec.probability, hex);
     }
   }
   return item;
 }
 
 uint32_t ItemCreator::rand_int(uint64_t max) {
-  return random_from_optional_crypt(this->opt_rand_crypt) % max;
+  return this->rand_crypt->next() % max;
 }
 
 float ItemCreator::rand_float_0_1_from_crypt() {
   // This lacks some precision, but matches the original implementation.
-  return (static_cast<double>(random_from_optional_crypt(this->opt_rand_crypt) >> 16) / 65536.0);
+  return (static_cast<double>(this->rand_crypt->next() >> 16) / 65536.0);
 }
 
 template <size_t NumRanges>
@@ -344,7 +332,7 @@ uint32_t ItemCreator::choose_meseta_amount(
     ret = this->rand_int((max - min) + 1) + min;
   }
 
-  this->log.info("Chose %" PRIu32 " Meseta from range [%hu, %hu]", ret, min, max);
+  this->log.info_f("Chose {} Meseta from range [{}, {}]", ret, min, max);
   return ret;
 }
 
@@ -364,15 +352,15 @@ ItemData ItemCreator::check_rare_spec_and_create_rare_enemy_item(uint32_t enemy_
     for (const auto& spec : rare_specs) {
       item = this->check_rate_and_create_rare_item(spec, area_norm);
       if (!item.empty()) {
-        if (this->log.should_log(phosg::LogLevel::INFO)) {
+        if (this->log.should_log(phosg::LogLevel::L_INFO)) {
           auto hex = spec.data.hex();
-          this->log.info("Enemy spec %08" PRIX32 " produced item %s", spec.probability, hex.c_str());
+          this->log.info_f("Enemy spec {:08X} produced item {}", spec.probability, hex);
         }
         break;
       }
-      if (this->log.should_log(phosg::LogLevel::INFO)) {
+      if (this->log.should_log(phosg::LogLevel::L_INFO)) {
         auto hex = spec.data.hex();
-        this->log.info("Enemy spec %08" PRIX32 " did not produce item %s", spec.probability, hex.c_str());
+        this->log.info_f("Enemy spec {:08X} did not produce item {}", spec.probability, hex);
       }
     }
   }
@@ -454,12 +442,12 @@ void ItemCreator::generate_common_weapon_bonuses(ItemData& item, uint8_t area_no
   for (size_t row = 0; row < 3; row++) {
     uint8_t spec = this->pt->nonrare_bonus_prob_spec.at(row).at(area_norm);
     if (spec == 0xFF) {
-      this->log.info("Bonus %zu is forbidden", row);
+      this->log.info_f("Bonus {} is forbidden", row);
     } else {
       item.data1[(row * 2) + 6] = this->get_rand_from_weighted_tables_2d_vertical(this->pt->bonus_type_prob_table, area_norm);
       int16_t amount = this->get_rand_from_weighted_tables_2d_vertical(this->pt->bonus_value_prob_table, spec);
       item.data1[(row * 2) + 7] = amount * 5 - 10;
-      this->log.info("Bonus %zu generated as %02hhX %02hhX from area_norm %02hhX and spec %02hhX", row, item.data1[(row * 2) + 6], item.data1[(row * 2) + 7], area_norm, spec);
+      this->log.info_f("Bonus {} generated as {:02X} {:02X} from area_norm {:02X} and spec {:02X}", row, item.data1[(row * 2) + 6], item.data1[(row * 2) + 7], area_norm, spec);
     }
     // Note: The original code has a special case here, which divides
     // item.data1[z + 7] by 5 and multiplies it by 5 again if bonus_type is 5
@@ -487,7 +475,7 @@ void ItemCreator::deduplicate_weapon_bonuses(ItemData& item) const {
 
 void ItemCreator::set_item_kill_count_if_unsealable(ItemData& item) const {
   if (this->item_parameter_table->is_unsealable_item(item)) {
-    this->log.info("Item is unsealable; setting kill count to zero");
+    this->log.info_f("Item is unsealable; setting kill count to zero");
     item.set_kill_count(0);
   }
 }
@@ -526,7 +514,7 @@ void ItemCreator::clear_tool_item_if_invalid(ItemData& item) {
 
 void ItemCreator::clear_item_if_restricted(ItemData& item) const {
   if (this->item_parameter_table->is_item_rare(item) && !this->are_rare_drops_allowed()) {
-    this->log.info("Restricted: item is rare, but rares not allowed");
+    this->log.info_f("Restricted: item is rare, but rares not allowed");
     item.clear();
     return;
   }
@@ -537,12 +525,12 @@ void ItemCreator::clear_item_if_restricted(ItemData& item) const {
     // (HP/Resurrection and TP/Resurrection) only exist on BB.
     if (item.data1[0] == 1) {
       if ((item.data1[1] == 3) && (((item.data1[2] >= 0x33) && (item.data1[2] <= 0x38)) || (item.data1[2] == 0x61) || (item.data1[2] == 0x62))) {
-        this->log.info("Restricted: restore units not allowed in Challenge mode");
+        this->log.info_f("Restricted: restore units not allowed in Challenge mode");
         item.clear();
         return;
       }
     } else if (item.data1[0] == 4) {
-      this->log.info("Restricted: meseta not allowed in Challenge mode");
+      this->log.info_f("Restricted: meseta not allowed in Challenge mode");
       item.clear();
       return;
     }
@@ -558,12 +546,12 @@ void ItemCreator::clear_item_if_restricted(ItemData& item) const {
             break;
           case BattleRules::WeaponAndArmorMode::FORBID_RARES:
             if (this->item_parameter_table->is_item_rare(item)) {
-              this->log.info("Restricted: rare weapons and armors not allowed");
+              this->log.info_f("Restricted: rare weapons and armors not allowed");
               item.clear();
             }
             break;
           case BattleRules::WeaponAndArmorMode::FORBID_ALL:
-            this->log.info("Restricted: weapons and armors not allowed");
+            this->log.info_f("Restricted: weapons and armors not allowed");
             item.clear();
             break;
           default:
@@ -572,24 +560,24 @@ void ItemCreator::clear_item_if_restricted(ItemData& item) const {
         break;
       case 2:
         if (this->restrictions->mag_mode == BattleRules::MagMode::FORBID_ALL) {
-          this->log.info("Restricted: mags not allowed");
+          this->log.info_f("Restricted: mags not allowed");
           item.clear();
         }
         break;
       case 3:
         if (this->restrictions->tool_mode == BattleRules::ToolMode::FORBID_ALL) {
-          this->log.info("Restricted: tools not allowed");
+          this->log.info_f("Restricted: tools not allowed");
           item.clear();
         } else if (item.data1[1] == 2) {
           switch (this->restrictions->tech_disk_mode) {
             case BattleRules::TechDiskMode::ALLOW:
               break;
             case BattleRules::TechDiskMode::FORBID_ALL:
-              this->log.info("Restricted: tech disks not allowed");
+              this->log.info_f("Restricted: tech disks not allowed");
               item.clear();
               break;
             case BattleRules::TechDiskMode::LIMIT_LEVEL:
-              this->log.info("Restricted: tech disk level limited to %hhu",
+              this->log.info_f("Restricted: tech disk level limited to {}",
                   static_cast<uint8_t>(this->restrictions->max_tech_level + 1));
               if (this->restrictions->max_tech_level == 0) {
                 item.data1[2] = 0;
@@ -601,13 +589,13 @@ void ItemCreator::clear_item_if_restricted(ItemData& item) const {
               throw logic_error("invalid tech disk mode");
           }
         } else if ((item.data1[1] == 9) && this->restrictions->forbid_scape_dolls) {
-          this->log.info("Restricted: scape dolls not allowed");
+          this->log.info_f("Restricted: scape dolls not allowed");
           item.clear();
         }
         break;
       case 4:
         if (this->restrictions->meseta_mode == BattleRules::MesetaMode::FORBID_ALL) {
-          this->log.info("Restricted: meseta not allowed");
+          this->log.info_f("Restricted: meseta not allowed");
           item.clear();
         }
         break;
@@ -627,10 +615,10 @@ void ItemCreator::generate_common_item_variances(uint32_t area_norm, ItemData& i
         float f1 = 1.0 + this->pt->unit_max_stars_table.at(area_norm);
         float f2 = this->rand_float_0_1_from_crypt();
         uint8_t stars = static_cast<uint32_t>(f1 * f2) & 0xFF;
-        this->log.info("Unit stars: %g * %g = %" PRIu32, f1, f2, stars);
+        this->log.info_f("Unit stars: {:g} * {:g} = {}", f1, f2, stars);
         this->generate_common_unit_variances(stars, item);
         if (item.data1[2] == 0xFF) {
-          this->log.info("Unit subtype not valid; clearing item");
+          this->log.info_f("Unit subtype not valid; clearing item");
           item.clear();
         }
       } else {
@@ -667,7 +655,7 @@ void ItemCreator::generate_common_armor_or_shield_type_and_variances(char area_n
   } else {
     item.data1[2] -= 3;
   }
-  this->log.info("Armor/shield type: max(%02hhX + %02hhX + %02hhX - 3, 0) = %02hhX",
+  this->log.info_f("Armor/shield type: max({:02X} + {:02X} + {:02X} - 3, 0) = {:02X}",
       area_norm, type, this->pt->armor_or_shield_type_bias, item.data1[2]);
 }
 
@@ -696,7 +684,7 @@ void ItemCreator::generate_common_tool_variances(uint32_t area_norm, ItemData& i
   if ((!is_v1_or_v2(this->logic_version) || (this->logic_version == Version::GC_NTE)) && (tool_class == 0x1A)) {
     tool_class = 0x73;
   }
-  this->log.info("Generating tool with class %02hhX", tool_class);
+  this->log.info_f("Generating tool with class {:02X}", tool_class);
 
   // Note: This block was originally a separate function called
   // generate_common_tool_type
@@ -711,7 +699,7 @@ void ItemCreator::generate_common_tool_variances(uint32_t area_norm, ItemData& i
       item.data1[1] = data.first;
       item.data1[2] = data.second;
     } catch (const out_of_range&) {
-      this->log.info("Tool class is missing; skipping item generation");
+      this->log.info_f("Tool class is missing; skipping item generation");
       return;
     }
   }
@@ -744,9 +732,9 @@ void ItemCreator::generate_common_mag_variances(ItemData& item) {
     if (is_pre_v1(this->logic_version)) {
       item.data2[3] = 0x00;
     } else if (is_v1_or_v2(this->logic_version)) {
-      item.data2[3] = random_from_optional_crypt(this->opt_rand_crypt) % 0x0E;
+      item.data2[3] = this->rand_crypt->next() % 0x0E;
     } else {
-      item.data2[3] = random_from_optional_crypt(this->opt_rand_crypt) % 0x12;
+      item.data2[3] = this->rand_crypt->next() % 0x12;
     }
   }
 }
@@ -769,7 +757,7 @@ void ItemCreator::generate_common_weapon_variances(uint8_t area_norm, ItemData&
     }
   }
 
-  this->log.info("Subtype table: %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX",
+  this->log.info_f("Subtype table: {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X}",
       weapon_type_prob_table[0], weapon_type_prob_table[1], weapon_type_prob_table[2], weapon_type_prob_table[3],
       weapon_type_prob_table[4], weapon_type_prob_table[5], weapon_type_prob_table[6], weapon_type_prob_table[7],
       weapon_type_prob_table[8], weapon_type_prob_table[9], weapon_type_prob_table[10], weapon_type_prob_table[11],
@@ -777,19 +765,19 @@ void ItemCreator::generate_common_weapon_variances(uint8_t area_norm, ItemData&
 
   item.data1[1] = this->get_rand_from_weighted_tables_1d(weapon_type_prob_table);
   if (item.data1[1] == 0) {
-    this->log.info("00 chosen from subtype table; skipping item");
+    this->log.info_f("00 chosen from subtype table; skipping item");
     item.clear();
   } else {
     int8_t subtype_base = this->pt->subtype_base_table.at(item.data1[1] - 1);
     uint8_t area_length = this->pt->subtype_area_length_table.at(item.data1[1] - 1);
-    this->log.info("Subtype table yielded %02hhX; subtype base is %hhd with area length %hhu", item.data1[1], subtype_base, area_length);
+    this->log.info_f("Subtype table yielded {:02X}; subtype base is {} with area length {}", item.data1[1], subtype_base, area_length);
     if (subtype_base < 0) {
       item.data1[2] = (area_norm + subtype_base) / area_length;
-      this->log.info("Resulting subtype: (%02hhX + %02hhX) / %02hhX = %02hhX", area_norm, subtype_base, area_length, item.data1[2]);
+      this->log.info_f("Resulting subtype: ({:02X} + {:02X}) / {:02X} = {:02X}", area_norm, subtype_base, area_length, item.data1[2]);
       this->generate_common_weapon_grind(item, (area_norm + subtype_base) - (item.data1[2] * area_length));
     } else {
       item.data1[2] = subtype_base + (area_norm / area_length);
-      this->log.info("Resulting subtype: %02hhX + (%02hhX / %02hhX) = %02hhX", subtype_base, area_norm, area_length, item.data1[2]);
+      this->log.info_f("Resulting subtype: {:02X} + ({:02X} / {:02X}) = {:02X}", subtype_base, area_norm, area_length, item.data1[2]);
       this->generate_common_weapon_grind(item, area_norm - (area_norm / area_length) * area_length);
     }
     this->generate_common_weapon_bonuses(item, area_norm);
@@ -802,7 +790,7 @@ void ItemCreator::generate_common_weapon_grind(ItemData& item, uint8_t offset_wi
   if (item.data1[0] == 0) {
     uint8_t offset = clamp<uint8_t>(offset_within_subtype_range, 0, 3);
     item.data1[3] = this->get_rand_from_weighted_tables_2d_vertical(this->pt->grind_prob_table, offset);
-    this->log.info("Generated grind %02hhX from offset within subtype range %02hhX", item.data1[3], offset_within_subtype_range);
+    this->log.info_f("Generated grind {:02X} from offset within subtype range {:02X}", item.data1[3], offset_within_subtype_range);
   }
 }
 
@@ -811,18 +799,18 @@ void ItemCreator::generate_common_weapon_special(ItemData& item, uint8_t area_no
     return;
   }
   if (this->item_parameter_table->is_item_rare(item)) {
-    this->log.info("Item is rare; skipping special generation");
+    this->log.info_f("Item is rare; skipping special generation");
     return;
   }
   uint8_t special_mult = this->pt->special_mult.at(area_norm);
   if (special_mult == 0) {
-    this->log.info("Special multiplier is zero for area_norm %02hhX; skipping special generation", area_norm);
+    this->log.info_f("Special multiplier is zero for area_norm {:02X}; skipping special generation", area_norm);
     return;
   }
   uint8_t det = this->rand_int(100);
   uint8_t prob = this->pt->special_percent.at(area_norm);
   if (det >= prob) {
-    this->log.info("Special not chosen (%02hhX > %02hhX)", det, prob);
+    this->log.info_f("Special not chosen ({:02X} > {:02X})", det, prob);
     return;
   }
   item.data1[4] = this->choose_weapon_special(special_mult * this->rand_float_0_1_from_crypt());
@@ -830,25 +818,25 @@ void ItemCreator::generate_common_weapon_special(ItemData& item, uint8_t area_no
 
 uint8_t ItemCreator::choose_weapon_special(uint8_t det) {
   if (det >= 4) {
-    this->log.info("Special not chosen (det %02hhX >= 4)", det);
+    this->log.info_f("Special not chosen (det {:02X} >= 4)", det);
     return 0;
   }
 
   static const uint8_t maxes[4] = {8, 10, 11, 11};
   uint8_t det2 = this->rand_int(maxes[det]);
-  this->log.info("Choosing special with det %02hhX and det2 %02hhX", det, det2);
+  this->log.info_f("Choosing special with det {:02X} and det2 {:02X}", det, det2);
   size_t index = 0;
   for (size_t z = 1; z < this->item_parameter_table->num_specials; z++) {
     if (det + 1 == this->item_parameter_table->get_special_stars(z)) {
       if (index == det2) {
-        this->log.info("Chose special %02zX", z);
+        this->log.info_f("Chose special {:02X}", z);
         return z;
       } else {
         index++;
       }
     }
   }
-  this->log.info("No special was eligible");
+  this->log.info_f("No special was eligible");
   return 0;
 }
 
@@ -922,7 +910,7 @@ void ItemCreator::generate_common_unit_variances(uint8_t stars, ItemData& item)
 
   const auto& results = this->unit_results_by_star_count.at(stars);
   if (results.empty()) {
-    this->log.info("There are no available units with %hhu stars", stars);
+    this->log.info_f("There are no available units with {} stars", stars);
     return;
   }
 
@@ -934,7 +922,7 @@ void ItemCreator::generate_common_unit_variances(uint8_t stars, ItemData& item)
     const auto& def = this->item_parameter_table->get_unit(result.unit);
     item.set_unit_bonus(def.modifier_amount * result.modifier);
   }
-  this->log.info("Generated unit %02hhX with modifier %hhd, from %zu choices with %hhu stars",
+  this->log.info_f("Generated unit {:02X} with modifier {}, from {} choices with {} stars",
       result.unit, result.modifier, results.size(), stars);
 }
 
@@ -1076,7 +1064,7 @@ void ItemCreator::generate_armor_shop_armors(vector<ItemData>& shop, size_t play
       pt.push(src_table.first[z].value);
     }
   }
-  pt.shuffle(this->opt_rand_crypt);
+  pt.shuffle(this->rand_crypt);
 
   for (size_t items_generated = 0; items_generated < num_items;) {
     ItemData item;
@@ -1120,7 +1108,7 @@ void ItemCreator::generate_armor_shop_shields(vector<ItemData>& shop, size_t pla
       pt.push(src_table.first[z].value);
     }
   }
-  pt.shuffle(this->opt_rand_crypt);
+  pt.shuffle(this->rand_crypt);
 
   for (size_t items_generated = 0; items_generated < num_items;) {
     ItemData item;
@@ -1163,7 +1151,7 @@ void ItemCreator::generate_armor_shop_units(vector<ItemData>& shop, size_t playe
       pt.push(src_table.first[z].value);
     }
   }
-  pt.shuffle(this->opt_rand_crypt);
+  pt.shuffle(this->rand_crypt);
 
   for (size_t items_generated = 0; items_generated < num_items;) {
     ItemData item;
@@ -1266,7 +1254,7 @@ void ItemCreator::generate_rare_tool_shop_recovery_items(
       pt.push(e.value);
     }
   }
-  pt.shuffle(this->opt_rand_crypt);
+  pt.shuffle(this->rand_crypt);
 
   size_t effective_num_items = num_items;
   size_t items_generated = 0;
@@ -1309,7 +1297,7 @@ void ItemCreator::generate_tool_shop_tech_disks(vector<ItemData>& shop, size_t p
       pt.push(e.value);
     }
   }
-  pt.shuffle(this->opt_rand_crypt);
+  pt.shuffle(this->rand_crypt);
 
   static const array<uint8_t, 0x13> tech_num_map = {
       0x00, 0x03, 0x06, 0x0F, 0x10, 0x0D, 0x0A, 0x0B, 0x0C, 0x01, 0x04, 0x07,
@@ -1410,7 +1398,7 @@ vector<ItemData> ItemCreator::generate_weapon_shop_contents(size_t player_level)
       pt.push(e.value);
     }
   }
-  pt.shuffle(this->opt_rand_crypt);
+  pt.shuffle(this->rand_crypt);
 
   vector<ItemData> shop;
   while (shop.size() < num_items) {
@@ -1608,7 +1596,7 @@ void ItemCreator::generate_weapon_shop_item_special(ItemData& item, size_t playe
 
   // Note: The original code shuffles pt and then pops a single value from it.
   // For simplicity, we just sample a single value (and don't pop it) instead.
-  switch (pt.sample(this->opt_rand_crypt)) {
+  switch (pt.sample(this->rand_crypt)) {
     case 0:
       item.data1[4] = 0;
       break;
@@ -1660,7 +1648,7 @@ void ItemCreator::generate_weapon_shop_item_bonus1(
 
   // Note: The original code shuffles pt and then pops a single value from it.
   // For simplicity, we just sample a single value (and don't pop it) instead.
-  item.data1[6] = pt.sample(this->opt_rand_crypt);
+  item.data1[6] = pt.sample(this->rand_crypt);
   if (item.data1[6] == 0) {
     item.data1[7] = 0;
 
@@ -1701,7 +1689,7 @@ void ItemCreator::generate_weapon_shop_item_bonus2(ItemData& item, size_t player
       pt.push(e.value);
     }
   }
-  pt.shuffle(this->opt_rand_crypt);
+  pt.shuffle(this->rand_crypt);
 
   do {
     item.data1[8] = pt.pop();
@@ -1718,10 +1706,10 @@ void ItemCreator::generate_weapon_shop_item_bonus2(ItemData& item, size_t player
 }
 
 ItemCreator::DropResult ItemCreator::on_specialized_box_item_drop(
-    uint8_t area, float def_z, uint32_t def0, uint32_t def1, uint32_t def2) {
+    uint8_t area, float param3, uint32_t param4, uint32_t param5, uint32_t param6) {
   DropResult res;
-  res.item = this->base_item_for_specialized_box(def0, def1, def2);
-  if (def_z == 0.0f) {
+  res.item = this->base_item_for_specialized_box(param4, param5, param6);
+  if (param3 == 0.0f) {
     uint16_t type = res.item.data1w[0];
     res.item.clear();
     res.item.data1w[0] = type;
@@ -1730,39 +1718,39 @@ ItemCreator::DropResult ItemCreator::on_specialized_box_item_drop(
   return res;
 }
 
-ItemData ItemCreator::base_item_for_specialized_box(uint32_t def0, uint32_t def1, uint32_t def2) const {
+ItemData ItemCreator::base_item_for_specialized_box(uint32_t param4, uint32_t param5, uint32_t param6) const {
   ItemData item;
-  item.data1[0] = (def0 >> 0x18) & 0x0F;
-  item.data1[1] = (def0 >> 0x10) + ((item.data1[0] == 0x00) || (item.data1[0] == 0x01));
-  item.data1[2] = def0 >> 8;
+  item.data1[0] = (param4 >> 0x18) & 0x0F;
+  item.data1[1] = (param4 >> 0x10) + ((item.data1[0] == 0x00) || (item.data1[0] == 0x01));
+  item.data1[2] = param4 >> 8;
 
   switch (item.data1[0]) {
     case 0x00:
-      item.data1[3] = (def1 >> 0x18) & 0xFF;
-      item.data1[4] = def0 & 0xFF;
-      item.data1[6] = (def1 >> 8) & 0xFF;
-      item.data1[7] = def1 & 0xFF;
-      item.data1[8] = (def2 >> 0x18) & 0xFF;
-      item.data1[9] = (def2 >> 0x10) & 0xFF;
-      item.data1[10] = (def2 >> 8) & 0xFF;
-      item.data1[11] = def2 & 0xFF;
+      item.data1[3] = (param5 >> 0x18) & 0xFF;
+      item.data1[4] = param4 & 0xFF;
+      item.data1[6] = (param5 >> 8) & 0xFF;
+      item.data1[7] = param5 & 0xFF;
+      item.data1[8] = (param6 >> 0x18) & 0xFF;
+      item.data1[9] = (param6 >> 0x10) & 0xFF;
+      item.data1[10] = (param6 >> 8) & 0xFF;
+      item.data1[11] = param6 & 0xFF;
       break;
     case 0x01:
-      item.data1[3] = (def1 >> 0x18) & 0xFF;
-      item.data1[4] = (def1 >> 0x10) & 0xFF;
-      item.data1[5] = def0 & 0xFF;
+      item.data1[3] = (param5 >> 0x18) & 0xFF;
+      item.data1[4] = (param5 >> 0x10) & 0xFF;
+      item.data1[5] = param4 & 0xFF;
       break;
     case 0x02:
       item.assign_mag_stats(ItemMagStats());
       break;
     case 0x03:
       if (item.data1[1] == 0x02) {
-        item.data1[4] = def0 & 0xFF;
+        item.data1[4] = param4 & 0xFF;
       }
       item.set_tool_item_amount(*this->stack_limits, 1);
       break;
     case 0x04:
-      item.data2d = ((def1 >> 0x10) & 0xFFFF) * 10;
+      item.data2d = ((param5 >> 0x10) & 0xFFFF) * 10;
       break;
 
     default:
@@ -1782,14 +1770,14 @@ ssize_t ItemCreator::apply_tekker_deltas(ItemData& item, uint8_t section_id) {
   bool favored = item.data1[1] == favored_weapon_by_section_id[section_id];
   ssize_t luck = 0;
 
-  this->log.info("Applying tekker deltas for %s weapon", favored ? "favored" : "non-favored");
+  this->log.info_f("Applying tekker deltas for {} weapon", favored ? "favored" : "non-favored");
 
   // Adjust the weapon's special
   {
     const auto& prob_table = this->tekker_adjustment_set->get_special_upgrade_prob_table(section_id, favored);
-    uint8_t delta_index = prob_table.sample(this->opt_rand_crypt);
+    uint8_t delta_index = prob_table.sample(this->rand_crypt);
     int8_t delta = delta_table.at(delta_index);
-    this->log.info("(Special) Delta index %hhu, delta %hhd", delta_index, delta);
+    this->log.info_f("(Special) Delta index {}, delta {}", delta_index, delta);
     // Note: The original code checks specifically for -1 and +1 here, but the
     // data files only include delta_indexes 4, 5, and 6 (which correspond to -1,
     // 0, and 1) anyway, so we just check for positive and negative numbers
@@ -1809,29 +1797,29 @@ ssize_t ItemCreator::apply_tekker_deltas(ItemData& item, uint8_t section_id) {
             this->item_parameter_table->get_special(new_special).type) {
           item.data1[4] = new_special;
         } else {
-          this->log.info("(Special) Delta canceled because it would change special category");
+          this->log.info_f("(Special) Delta canceled because it would change special category");
         }
       }
     } catch (const out_of_range&) {
       // Invalid special number passed to get_special; just ignore it
     }
     luck += this->tekker_adjustment_set->get_luck_for_special_upgrade(delta_index);
-    this->log.info("(Special) Luck is now %zd", luck);
+    this->log.info_f("(Special) Luck is now {}", luck);
   }
 
   // Adjust the weapon's grind if it's not rare
   if (!this->item_parameter_table->is_item_rare(item)) {
     const auto& weapon_def = this->item_parameter_table->get_weapon(item.data1[1], item.data1[2]);
     const auto& prob_table = this->tekker_adjustment_set->get_grind_delta_prob_table(section_id, favored);
-    uint8_t delta_index = prob_table.sample(this->opt_rand_crypt);
+    uint8_t delta_index = prob_table.sample(this->rand_crypt);
     int8_t delta = delta_table.at(delta_index);
-    this->log.info("(Grind) Delta index %hhu, delta %hhd", delta_index, delta);
+    this->log.info_f("(Grind) Delta index {}, delta {}", delta_index, delta);
     int16_t new_grind = static_cast<int16_t>(item.data1[3]) + static_cast<int16_t>(delta);
     item.data1[3] = clamp<int16_t>(new_grind, 0, weapon_def.max_grind);
     luck += this->tekker_adjustment_set->get_luck_for_grind_delta(delta_index);
-    this->log.info("(Grind) Luck is now %zd", luck);
+    this->log.info_f("(Grind) Luck is now {}", luck);
   } else {
-    this->log.info("(Grind) Item is rare; skipping grind adjustment");
+    this->log.info_f("(Grind) Item is rare; skipping grind adjustment");
   }
 
   // Adjust the weapon's bonuses
@@ -1839,9 +1827,9 @@ ssize_t ItemCreator::apply_tekker_deltas(ItemData& item, uint8_t section_id) {
     const auto& prob_table = this->tekker_adjustment_set->get_bonus_delta_prob_table(section_id, favored);
     // Note: The original code really does use the same delta for all three
     // bonuses.
-    uint8_t delta_index = prob_table.sample(this->opt_rand_crypt);
+    uint8_t delta_index = prob_table.sample(this->rand_crypt);
     int8_t delta = delta_table.at(delta_index);
-    this->log.info("(Bonuses) Delta index %hhu, delta %hhd", delta_index, delta);
+    this->log.info_f("(Bonuses) Delta index {}, delta {}", delta_index, delta);
     // Note: The original code doesn't check if there's actually a bonus in each
     // slot before incrementing the values. Presumably there's a check later
     // that will clear any invalid bonuses, but we don't have such a check, so
@@ -1852,7 +1840,7 @@ ssize_t ItemCreator::apply_tekker_deltas(ItemData& item, uint8_t section_id) {
       }
     }
     luck += this->tekker_adjustment_set->get_luck_for_bonus_delta(delta_index);
-    this->log.info("(Bonuses) Luck is now %zd", luck);
+    this->log.info_f("(Bonuses) Luck is now {}", luck);
   }
 
   return luck;

src/ItemCreator.hh

@@ -24,12 +24,10 @@ public:
       GameMode mode,
       uint8_t difficulty,
       uint8_t section_id,
-      std::shared_ptr<PSOLFGEncryption> opt_rand_crypt,
+      std::shared_ptr<RandomGenerator> rand_crypt,
       std::shared_ptr<const BattleRules> restrictions = nullptr);
   ~ItemCreator() = default;
 
-  void set_random_crypt(std::shared_ptr<PSOLFGEncryption> new_random_crypt);
-
   struct DropResult {
     ItemData item;
     bool is_from_rare_table = false;
@@ -37,9 +35,9 @@ public:
 
   DropResult on_monster_item_drop(uint32_t enemy_type, uint8_t area);
   DropResult on_box_item_drop(uint8_t area);
-  DropResult on_specialized_box_item_drop(uint8_t area, float def_z, uint32_t def0, uint32_t def1, uint32_t def2);
-
-  ItemData base_item_for_specialized_box(uint32_t def0, uint32_t def1, uint32_t def2) const;
+  // Note: param3-6 refer to the corresponding fields of the object definition
+  DropResult on_specialized_box_item_drop(uint8_t area, float param3, uint32_t param4, uint32_t param5, uint32_t param6);
+  ItemData base_item_for_specialized_box(uint32_t param4, uint32_t param5, uint32_t param6) const;
 
   std::vector<ItemData> generate_armor_shop_contents(size_t player_level);
   std::vector<ItemData> generate_tool_shop_contents(size_t player_level);
@@ -98,10 +96,10 @@ private:
   //   [0x0B] - unit modifiers
   //   [0x0C] - common armor DFP bonuses
   //   [0x0D] - common armor EVP bonuses
-  //   [0x0E] - apparently unused
+  //   [0x0E] - unit stars
   //   [0x0F] - which common weapon special to generate
   //   [0x10] - apparently unused
-  std::shared_ptr<PSOLFGEncryption> opt_rand_crypt;
+  std::shared_ptr<RandomGenerator> rand_crypt;
 
   bool are_rare_drops_allowed() const;
   uint8_t normalize_area_number(uint8_t area) const;

src/ItemData.cc

@@ -254,9 +254,14 @@ size_t ItemData::max_stack_size(const StackLimits& limits) const {
   return limits.get(this->data1[0], this->data1[1]);
 }
 
-void ItemData::enforce_min_stack_size(const StackLimits& limits) {
-  if (this->stack_size(limits) == 0) {
-    this->data1[5] = 1;
+void ItemData::enforce_stack_size_limits(const StackLimits& limits) {
+  if (this->data1[0] == 0x03) {
+    size_t max_stack_size = this->max_stack_size(limits);
+    if (max_stack_size > 1) {
+      this->data1[5] = std::clamp<uint8_t>(this->data1[5], 1, max_stack_size);
+    } else {
+      this->data1[5] = 0;
+    }
   }
 }
 
@@ -797,13 +802,13 @@ ItemData ItemData::from_primary_identifier(const StackLimits& limits, uint32_t p
 }
 
 string ItemData::hex() const {
-  return phosg::string_printf("%08" PRIX32 " %08" PRIX32 " %08" PRIX32 " (%08" PRIX32 ") %08" PRIX32,
-      this->data1db[0].load(), this->data1db[1].load(), this->data1db[2].load(), this->id.load(), this->data2db.load());
+  return std::format("{:08X} {:08X} {:08X} ({:08X}) {:08X}",
+      this->data1db[0], this->data1db[1], this->data1db[2], this->id, this->data2db);
 }
 
 string ItemData::short_hex() const {
-  auto ret = phosg::string_printf("%08" PRIX32 "%08" PRIX32 "%08" PRIX32 "%08" PRIX32,
-      this->data1db[0].load(), this->data1db[1].load(), this->data1db[2].load(), this->data2db.load());
+  auto ret = std::format("{:08X}{:08X}{:08X}{:08X}",
+      this->data1db[0], this->data1db[1], this->data1db[2], this->data2db);
   size_t offset = ret.find_last_not_of('0');
   if (offset != string::npos) {
     offset += (offset & 1) ? 1 : 2;

src/ItemData.hh

@@ -118,7 +118,7 @@ struct ItemData {
   // sending where needed.
   // Related note: PSO V2 has an annoyingly complicated format for mags that
   // doesn't match the above table. We decode this upon receipt and encode it
-  // imemdiately before sending when interacting with V2 clients; see the
+  // immediately before sending when interacting with V2 clients; see the
   // implementation of decode_for_version() for details.
 
   union {
@@ -127,7 +127,7 @@ struct ItemData {
     parray<be_uint16_t, 6> data1wb;
     parray<le_uint32_t, 3> data1d;
     parray<be_uint32_t, 3> data1db;
-  } __packed__;
+  } __attribute__((packed));
   le_uint32_t id;
   union {
     parray<uint8_t, 4> data2;
@@ -135,7 +135,7 @@ struct ItemData {
     parray<be_uint16_t, 2> data2wb;
     le_uint32_t data2d;
     be_uint32_t data2db;
-  } __packed__;
+  } __attribute__((packed));
 
   ItemData();
   ItemData(const ItemData& other);
@@ -163,7 +163,7 @@ struct ItemData {
   bool is_stackable(const StackLimits& limits) const;
   size_t stack_size(const StackLimits& limits) const;
   size_t max_stack_size(const StackLimits& limits) const;
-  void enforce_min_stack_size(const StackLimits& limits);
+  void enforce_stack_size_limits(const StackLimits& limits);
 
   static bool is_common_consumable(uint32_t primary_identifier);
   bool is_common_consumable() const;

src/ItemNameIndex.cc

@@ -97,9 +97,12 @@ const array<const char*, 0x11> name_for_s_rank_special = {
     "King\'s",
 };
 
-std::string ItemNameIndex::describe_item(const ItemData& item, bool include_color_escapes, bool hide_mag_stats) const {
+std::string ItemNameIndex::describe_item(const ItemData& item, uint8_t flags) const {
+  bool include_color_escapes = flags & ItemNameIndex::Flag::INCLUDE_PSO_COLOR_ESCAPES;
+  bool name_only = flags & ItemNameIndex::Flag::NAME_ONLY;
+
   if (item.data1[0] == 0x04) {
-    return phosg::string_printf("%s%" PRIu32 " Meseta", include_color_escapes ? "$C7" : "", item.data2d.load());
+    return std::format("{}{} Meseta", include_color_escapes ? "$C7" : "", item.data2d);
   }
 
   vector<string> ret_tokens;
@@ -108,36 +111,38 @@ std::string ItemNameIndex::describe_item(const ItemData& item, bool include_colo
   bool is_unidentified = false;
   if ((item.data1[0] == 0x00) && (item.data1[4] != 0x00) && !item.is_s_rank_weapon()) {
     is_unidentified = item.data1[4] & 0x80;
-    bool is_present = item.data1[4] & 0x40;
     uint8_t special_id = item.data1[4] & 0x3F;
-    if (is_present) {
-      ret_tokens.emplace_back("Wrapped");
-    }
-    if (is_unidentified) {
-      ret_tokens.emplace_back("????");
+    if (!name_only) {
+      if (item.data1[4] & 0x40) {
+        ret_tokens.emplace_back("Wrapped");
+      }
+      if (is_unidentified) {
+        ret_tokens.emplace_back("????");
+      }
     }
     if (special_id) {
       try {
         ret_tokens.emplace_back(name_for_weapon_special.at(special_id));
       } catch (const out_of_range&) {
-        ret_tokens.emplace_back(phosg::string_printf("!SP:%02hhX", special_id));
+        ret_tokens.emplace_back(std::format("!SP:{:02X}", special_id));
       }
     }
   }
-  if ((item.data1[0] == 0x00) && (item.data1[2] != 0x00) && item.is_s_rank_weapon()) {
+  if (!name_only && (item.data1[0] == 0x00) && (item.data1[2] != 0x00) && item.is_s_rank_weapon()) {
     try {
       ret_tokens.emplace_back(name_for_s_rank_special.at(item.data1[2]));
     } catch (const out_of_range&) {
-      ret_tokens.emplace_back(phosg::string_printf("!SSP:%02hhX", item.data1[2]));
+      ret_tokens.emplace_back(std::format("!SSP:{:02X}", item.data1[2]));
     }
   }
 
   // Armors, shields, and units (0x01) can be wrapped, as can mags (0x02) and
   // non-stackable tools (0x03). However, each of these item classes has its
   // flags in a different location.
-  if (((item.data1[0] == 0x01) && (item.data1[4] & 0x40)) ||
-      ((item.data1[0] == 0x02) && (item.data2[2] & 0x40)) ||
-      ((item.data1[0] == 0x03) && !item.is_stackable(*this->limits) && (item.data1[3] & 0x40))) {
+  if (!name_only &&
+      (((item.data1[0] == 0x01) && (item.data1[4] & 0x40)) ||
+          ((item.data1[0] == 0x02) && (item.data2[2] & 0x40)) ||
+          ((item.data1[0] == 0x03) && !item.is_stackable(*this->limits) && (item.data1[3] & 0x40)))) {
     ret_tokens.emplace_back("Wrapped");
   }
 
@@ -149,34 +154,40 @@ std::string ItemNameIndex::describe_item(const ItemData& item, bool include_colo
       technique_name = tech_id_to_name.at(item.data1[4]);
       technique_name[0] = toupper(technique_name[0]);
     } catch (const out_of_range&) {
-      technique_name = phosg::string_printf("!TD:%02hhX", item.data1[4]);
+      technique_name = std::format("!TD:{:02X}", item.data1[4]);
     }
     // Hide the level for Reverser and Ryuker, unless the level isn't 1
     if ((item.data1[2] == 0) && ((item.data1[4] == 0x0E) || (item.data1[4] == 0x11))) {
-      ret_tokens.emplace_back(phosg::string_printf("Disk:%s", technique_name.c_str()));
+      ret_tokens.emplace_back(std::format("Disk:{}", technique_name));
     } else {
-      ret_tokens.emplace_back(phosg::string_printf("Disk:%s Lv.%d", technique_name.c_str(), item.data1[2] + 1));
+      ret_tokens.emplace_back(std::format("Disk:{} Lv.{}", technique_name, item.data1[2] + 1));
     }
   } else {
     try {
       auto meta = this->primary_identifier_index.at(primary_identifier);
       ret_tokens.emplace_back(meta->name);
     } catch (const out_of_range&) {
-      ret_tokens.emplace_back(phosg::string_printf("!ID:%08" PRIX32, primary_identifier));
+      ret_tokens.emplace_back(std::format("!ID:{:08X}", primary_identifier));
     }
   }
 
   if (item.data1[0] == 0x00) {
     // For weapons, add the grind and bonuses, or S-rank name if applicable
-    if (item.data1[3] > 0) {
-      ret_tokens.emplace_back(phosg::string_printf("+%hhu", item.data1[3]));
+    if (!name_only && item.data1[3] > 0) {
+      ret_tokens.emplace_back(std::format("+{}", item.data1[3]));
     }
 
     if (item.is_s_rank_weapon()) {
-      // S-rank (has name instead of percent bonuses)
+      // S-rank weapons have names instead of percent bonuses. The name is
+      // encoded as 9 5-bit characters in the bytes where the bonuses usually
+      // go. The first character does not appear when the name is rendered;
+      // instead, it's used to determine if the weapon type name should appear
+      // or not. Unlike the client, we check the first character directly and
+      // don't bother decoding it.
       uint16_t be_data1w3 = phosg::bswap16(item.data1w[3]);
       uint16_t be_data1w4 = phosg::bswap16(item.data1w[4]);
       uint16_t be_data1w5 = phosg::bswap16(item.data1w[5]);
+      bool hide_type_name = ((be_data1w3 & 0x7C00) == 0x0800);
       uint8_t char_indexes[8] = {
           static_cast<uint8_t>((be_data1w3 >> 5) & 0x1F),
           static_cast<uint8_t>(be_data1w3 & 0x1F),
@@ -197,22 +208,30 @@ std::string ItemNameIndex::describe_item(const ItemData& item, bool include_colo
         name += ch;
       }
       if (!name.empty()) {
-        ret_tokens.emplace_back("(" + name + ")");
+        if (hide_type_name) {
+          ret_tokens.emplace_back("\"" + name + "\"");
+        } else {
+          ret_tokens.emplace_back("(" + name + ")");
+        }
+      }
+
+    } else if (!name_only) { // Not S-rank (extended name bits not set)
+      size_t num_bonuses = 3;
+
+      if (item.data1[10] & 0x80) {
+        ret_tokens.emplace_back(std::format("K:{}", item.get_kill_count()));
+        num_bonuses = 2;
       }
 
-    } else { // Not S-rank (extended name bits not set)
       parray<int8_t, 5> bonuses(0);
-      for (size_t x = 0; x < 3; x++) {
+      for (size_t x = 0; x < num_bonuses; x++) {
         uint8_t which = item.data1[6 + 2 * x];
         uint8_t value = item.data1[7 + 2 * x];
         if (which == 0) {
           continue;
         }
-        if (which & 0x80) {
-          uint16_t kill_count = ((which << 8) & 0x7F00) | (value & 0xFF);
-          ret_tokens.emplace_back(phosg::string_printf("K:%hu", kill_count));
-        } else if (which > 5) {
-          ret_tokens.emplace_back(phosg::string_printf("!PC:%02hhX%02hhX", which, value));
+        if (which > 5) {
+          ret_tokens.emplace_back(std::format("!PC:{:02X}{:02X}", which, value));
         } else {
           bonuses[which - 1] = value;
         }
@@ -222,11 +241,11 @@ std::string ItemNameIndex::describe_item(const ItemData& item, bool include_colo
         bool should_highlight_hit = include_color_escapes && (bonuses[4] > 0);
         const char* color_prefix = include_color_escapes ? "$C7" : "";
         if (should_include_hit) {
-          ret_tokens.emplace_back(phosg::string_printf("%s%hhd/%hhd/%hhd/%hhd/%s%hhd",
+          ret_tokens.emplace_back(std::format("{}{}/{}/{}/{}/{}{}",
               color_prefix, bonuses[0], bonuses[1], bonuses[2], bonuses[3],
               (should_highlight_hit ? "$C6" : ""), bonuses[4]));
         } else {
-          ret_tokens.emplace_back(phosg::string_printf("%s%hhd/%hhd/%hhd/%hhd",
+          ret_tokens.emplace_back(std::format("{}{}/{}/{}/{}",
               color_prefix, bonuses[0], bonuses[1], bonuses[2], bonuses[3]));
         }
       }
@@ -245,30 +264,34 @@ std::string ItemNameIndex::describe_item(const ItemData& item, bool include_colo
       } else if (modifier <= -3) {
         ret_tokens.back().append("--");
       } else if (modifier != 0) {
-        ret_tokens.emplace_back(phosg::string_printf("!MD:%04hX", modifier));
+        ret_tokens.emplace_back(std::format("!MD:{:04X}", modifier));
       }
 
-    } else { // Armor/shields
+      if (!name_only && (item.data1[10] & 0x80)) {
+        ret_tokens.emplace_back(std::format("K:{}", item.get_kill_count()));
+      }
+
+    } else if (!name_only) { // Armor/shields
       if (item.data1[5] > 0) {
         if (item.data1[5] == 1) {
           ret_tokens.emplace_back("(1 slot)");
         } else {
-          ret_tokens.emplace_back(phosg::string_printf("(%hhu slots)", item.data1[5]));
+          ret_tokens.emplace_back(std::format("({} slots)", item.data1[5]));
         }
       }
       if (item.data1w[3] != 0) {
-        ret_tokens.emplace_back(phosg::string_printf("+%hdDEF",
-            static_cast<int16_t>(item.data1w[3].load())));
+        ret_tokens.emplace_back(std::format("+{}DEF",
+            static_cast<int16_t>(item.data1w[3])));
       }
       if (item.data1w[4] != 0) {
-        ret_tokens.emplace_back(phosg::string_printf("+%hdEVP",
-            static_cast<int16_t>(item.data1w[4].load())));
+        ret_tokens.emplace_back(std::format("+{}EVP",
+            static_cast<int16_t>(item.data1w[4])));
       }
     }
 
-  } else if (!hide_mag_stats && (item.data1[0] == 0x02)) {
+  } else if (!name_only && (item.data1[0] == 0x02)) {
     // For mags, add tons of info
-    ret_tokens.emplace_back(phosg::string_printf("LV%hhu", item.data1[2]));
+    ret_tokens.emplace_back(std::format("LV{}", item.data1[2]));
 
     uint16_t def = item.data1w[2];
     uint16_t pow = item.data1w[3];
@@ -278,16 +301,16 @@ std::string ItemNameIndex::describe_item(const ItemData& item, bool include_colo
       uint16_t level = stat / 100;
       uint8_t partial = stat % 100;
       if (partial == 0) {
-        return phosg::string_printf("%hu", level);
+        return std::format("{}", level);
       } else if (partial % 10 == 0) {
-        return phosg::string_printf("%hu.%hhu", level, static_cast<uint8_t>(partial / 10));
+        return std::format("{}.{}", level, static_cast<uint8_t>(partial / 10));
       } else {
-        return phosg::string_printf("%hu.%02hhu", level, partial);
+        return std::format("{}.{:02}", level, partial);
       }
     };
     ret_tokens.emplace_back(format_stat(def) + "/" + format_stat(pow) + "/" + format_stat(dex) + "/" + format_stat(mind));
-    ret_tokens.emplace_back(phosg::string_printf("%hhu%%", item.data2[0]));
-    ret_tokens.emplace_back(phosg::string_printf("%hhuIQ", item.data2[1]));
+    ret_tokens.emplace_back(std::format("{}%", item.data2[0]));
+    ret_tokens.emplace_back(std::format("{}IQ", item.data2[1]));
 
     uint8_t flags = item.data2[2];
     if (flags & 7) {
@@ -322,15 +345,15 @@ std::string ItemNameIndex::describe_item(const ItemData& item, bool include_colo
     }
 
     try {
-      ret_tokens.emplace_back(phosg::string_printf("(%s)", name_for_mag_color.at(item.data2[3])));
+      ret_tokens.emplace_back(std::format("({})", name_for_mag_color.at(item.data2[3])));
     } catch (const out_of_range&) {
-      ret_tokens.emplace_back(phosg::string_printf("(!CL:%02hhX)", item.data2[3]));
+      ret_tokens.emplace_back(std::format("(!CL:{:02X})", item.data2[3]));
     }
 
   } else if (item.data1[0] == 0x03) {
     // For tools, add the amount (if applicable)
     if (item.max_stack_size(*this->limits) > 1) {
-      ret_tokens.emplace_back(phosg::string_printf("x%hhu", item.data1[5]));
+      ret_tokens.emplace_back(std::format("x{}", item.data1[5]));
     }
   }
 
@@ -364,16 +387,16 @@ ItemData ItemNameIndex::parse_item_description(const std::string& desc) const {
         ret = ItemData::from_data(phosg::parse_data_string(desc));
       } catch (const exception& ed) {
         if (strcmp(e1.what(), e2.what())) {
-          throw runtime_error(phosg::string_printf("cannot parse item description \"%s\" (as text 1: %s) (as text 2: %s) (as data: %s)",
-              desc.c_str(), e1.what(), e2.what(), ed.what()));
+          throw runtime_error(std::format("cannot parse item description \"{}\" (as text 1: {}) (as text 2: {}) (as data: {})",
+              desc, e1.what(), e2.what(), ed.what()));
         } else {
-          throw runtime_error(phosg::string_printf("cannot parse item description \"%s\" (as text: %s) (as data: %s)",
-              desc.c_str(), e1.what(), ed.what()));
+          throw runtime_error(std::format("cannot parse item description \"{}\" (as text: {}) (as data: {})",
+              desc, e1.what(), ed.what()));
         }
       }
     }
   }
-  ret.enforce_min_stack_size(*this->limits);
+  ret.enforce_stack_size_limits(*this->limits);
   return ret;
 }
 
@@ -384,13 +407,13 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
   ret.data2d = 0;
 
   string desc = phosg::tolower(description);
-  if (phosg::ends_with(desc, " meseta")) {
+  if (desc.ends_with(" meseta")) {
     ret.data1[0] = 0x04;
     ret.data2d = stol(desc, nullptr, 10);
     return ret;
   }
 
-  if (phosg::starts_with(desc, "disk:")) {
+  if (desc.starts_with("disk:")) {
     auto tokens = phosg::split(desc, ' ');
     tokens[0] = tokens[0].substr(5); // Trim off "disk:"
     if ((tokens[0] == "reverser") || (tokens[0] == "ryuker")) {
@@ -403,7 +426,7 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
       if (tokens.size() != 2) {
         throw runtime_error("invalid tech disk format");
       }
-      if (!phosg::starts_with(tokens[1], "lv.")) {
+      if (!tokens[1].starts_with("lv.")) {
         throw runtime_error("invalid tech disk level");
       }
       uint8_t tech = technique_for_name(tokens[0]);
@@ -416,11 +439,11 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
     return ret;
   }
 
-  bool is_wrapped = phosg::starts_with(desc, "wrapped ");
+  bool is_wrapped = desc.starts_with("wrapped ");
   if (is_wrapped) {
     desc = desc.substr(8);
   }
-  bool is_unidentified = phosg::starts_with(desc, "?");
+  bool is_unidentified = desc.starts_with("?");
   if (is_unidentified) {
     size_t z;
     for (z = 1; z < desc.size(); z++) {
@@ -440,7 +463,7 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
       }
       string prefix = phosg::tolower(name_for_weapon_special[z]);
       prefix += ' ';
-      if (phosg::starts_with(desc, prefix)) {
+      if (desc.starts_with(prefix)) {
         weapon_special = z;
         desc = desc.substr(prefix.size());
         break;
@@ -454,7 +477,7 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
   // then we'll see Sange & Yasha first, which we should skip.
   size_t lookback = 0;
   while (lookback < 4) {
-    if (name_it != this->name_index.end() && phosg::starts_with(desc, name_it->first)) {
+    if (name_it != this->name_index.end() && desc.starts_with(name_it->first)) {
       break;
     } else if (name_it == this->name_index.begin()) {
       throw runtime_error("no such item");
@@ -468,7 +491,7 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
   }
 
   desc = desc.substr(name_it->first.size());
-  if (phosg::starts_with(desc, " ")) {
+  if (desc.starts_with(" ")) {
     desc = desc.substr(1);
   }
 
@@ -489,7 +512,7 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
       if (token.empty()) {
         continue;
       }
-      if (phosg::starts_with(token, "+")) {
+      if (token.starts_with("+")) {
         token = token.substr(1);
         ret.data1[3] = stoul(token, nullptr, 10);
 
@@ -503,7 +526,7 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
           char ch = toupper(token[z]);
           const char* pos = strchr(s_rank_name_characters, ch);
           if (!pos) {
-            throw runtime_error(phosg::string_printf("s-rank name contains invalid character %02hhX (%c)", ch, ch));
+            throw runtime_error(std::format("s-rank name contains invalid character {:02X} ({})", ch, ch));
           }
           char_indexes[z] = (pos - s_rank_name_characters);
         }
@@ -512,6 +535,9 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
         ret.data1w[4] = phosg::bswap16(0x8000 | (char_indexes[4] & 0x1F) | ((char_indexes[3] & 0x1F) << 5) | ((char_indexes[2] & 0x1F) << 10));
         ret.data1w[5] = phosg::bswap16(0x8000 | (char_indexes[7] & 0x1F) | ((char_indexes[6] & 0x1F) << 5) | ((char_indexes[5] & 0x1F) << 10));
 
+      } else if (token.starts_with("k:")) {
+        ret.set_kill_count(stoul(token.substr(2), nullptr, 0));
+
       } else {
         auto p_tokens = phosg::split(token, '/');
         if (p_tokens.size() > 5) {
@@ -553,12 +579,12 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
       for (const auto& token : phosg::split(desc, ' ')) {
         if (token.empty()) {
           continue;
-        } else if (!phosg::starts_with(token, "+")) {
+        } else if (!token.starts_with("+")) {
           throw runtime_error("invalid armor/shield modifier");
         }
-        if (phosg::ends_with(token, "def")) {
+        if (token.ends_with("def")) {
           ret.data1w[3] = static_cast<uint16_t>(stol(token.substr(1, token.size() - 4), nullptr, 10));
-        } else if (phosg::ends_with(token, "evp")) {
+        } else if (token.ends_with("evp")) {
           ret.data1w[4] = static_cast<uint16_t>(stol(token.substr(1, token.size() - 4), nullptr, 10));
         } else {
           ret.data1[5] = stoul(token.substr(1), nullptr, 10);
@@ -574,7 +600,7 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
     for (const auto& token : phosg::split(desc, ' ')) {
       if (token.empty()) {
         continue;
-      } else if (phosg::starts_with(token, "pb:")) { // Photon blasts
+      } else if (token.starts_with("pb:")) { // Photon blasts
         auto pb_tokens = phosg::split(token.substr(3), ',');
         if (pb_tokens.size() > 3) {
           throw runtime_error("too many photon blasts specified");
@@ -592,9 +618,9 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
         for (const auto& pb_token : pb_tokens) {
           ret.add_mag_photon_blast(name_to_pb_num.at(pb_token));
         }
-      } else if (phosg::ends_with(token, "%")) { // Synchro
+      } else if (token.ends_with("%")) { // Synchro
         ret.data2[0] = stoul(token.substr(0, token.size() - 1), nullptr, 10);
-      } else if (phosg::ends_with(token, "iq")) { // IQ
+      } else if (token.ends_with("iq")) { // IQ
         ret.data2[1] = stoul(token.substr(0, token.size() - 2), nullptr, 10);
       } else if (!token.empty() && isdigit(token[0])) { // Stats
         auto s_tokens = phosg::split(token, '/');
@@ -626,7 +652,7 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
     }
   } else if (ret.data1[0] == 0x03) {
     if (ret.max_stack_size(*this->limits) > 1) {
-      if (phosg::starts_with(desc, "x")) {
+      if (desc.starts_with("x")) {
         ret.data1[5] = stoul(desc.substr(1), nullptr, 10);
       } else {
         ret.data1[5] = 1;
@@ -652,11 +678,12 @@ ItemData ItemNameIndex::parse_item_description_phase(const std::string& descript
 void ItemNameIndex::print_table(FILE* stream) const {
   auto pmt = this->item_parameter_table;
 
-  fprintf(stream, "WEAPON => ---ID--- TYPE SKIN POINTS FLAG ATPLO ATPHI ATPRQ MSTRQ ATARQ -MST- GND PH SP ATA SB PJ 1X 1Y 2X 2Y CL A1 A2 A3 A4 A5 TB CT V1 ST* USL ---DIVISOR--- NAME\n");
+  phosg::fwrite_fmt(stream, "WEAPONS\n");
+  phosg::fwrite_fmt(stream, "  CODE   => ---ID--- TYPE SKIN POINTS FLAG ATPLO ATPHI ATPRQ MSTRQ ATARQ -MST- GND PH SP ATA SB(S1:AMT1,S2:AMT2) PJ 1X 1Y 2X 2Y CL A1 A2 A3 A4 A5 TB BF V1 ST* USL ---DIVISOR--- NAME\n");
   for (size_t data1_1 = 0; data1_1 < pmt->num_weapon_classes; data1_1++) {
     uint8_t v1_replacement = pmt->get_weapon_v1_replacement(data1_1);
     float sale_divisor = pmt->get_sale_divisor(0x00, data1_1);
-    string divisor_str = phosg::string_printf("%g", sale_divisor);
+    string divisor_str = std::format("{:g}", sale_divisor);
     divisor_str.resize(13, ' ');
 
     size_t data1_2_limit = pmt->num_weapons_in_class(data1_1);
@@ -671,25 +698,30 @@ void ItemNameIndex::print_table(FILE* stream) const {
       item.data1[2] = data1_2;
       string name = this->describe_item(item);
 
-      fprintf(stream, "00%02zX%02zX => %08" PRIX32 " %04hX %04hX %6" PRIu32 " %04hX %5hu %5hu %5hu %5hu %5hu %5hu %3hhu %02hhX %02hhX %3hhu %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %2hhu* %s %s %s\n",
+      auto& stat_boost = pmt->get_stat_boost(w.stat_boost_entry_index);
+      phosg::fwrite_fmt(stream, "  00{:02X}{:02X} => {:08X} {:04X} {:04X} {:6} {:04X} {:5} {:5} {:5} {:5} {:5} {:5} {:3} {:02X} {:02X} {:3} {:02X}({:02X}:{:04X},{:02X}:{:04X}) {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:2}* {} {} {}\n",
           data1_1,
           data1_2,
-          w.base.id.load(),
-          w.base.type.load(),
-          w.base.skin.load(),
-          w.base.team_points.load(),
-          w.class_flags.load(),
-          w.atp_min.load(),
-          w.atp_max.load(),
-          w.atp_required.load(),
-          w.mst_required.load(),
-          w.ata_required.load(),
-          w.mst.load(),
+          w.base.id,
+          w.base.type,
+          w.base.skin,
+          w.base.team_points,
+          w.class_flags,
+          w.atp_min,
+          w.atp_max,
+          w.atp_required,
+          w.mst_required,
+          w.ata_required,
+          w.mst,
           w.max_grind,
           w.photon,
           w.special,
           w.ata,
-          w.stat_boost,
+          w.stat_boost_entry_index,
+          stat_boost.stats[0],
+          stat_boost.amounts[0],
+          stat_boost.stats[1],
+          stat_boost.amounts[1],
           w.projectile,
           w.trail1_x,
           w.trail1_y,
@@ -702,19 +734,20 @@ void ItemNameIndex::print_table(FILE* stream) const {
           w.unknown_a4,
           w.unknown_a5,
           w.tech_boost,
-          w.combo_type,
+          w.behavior_flags,
           v1_replacement,
           stars,
           is_unsealable ? "YES" : " no",
-          divisor_str.c_str(),
-          name.c_str());
+          divisor_str,
+          name);
     }
   }
 
-  fprintf(stream, "ARMOR  => ---ID--- TYPE SKIN POINTS -DFP- -EVP- BP BE FLAG LVL EFR ETH EIC EDK ELT DFR EVR SB TB -A2- ST* ---DIVISOR--- NAME\n");
+  phosg::fwrite_fmt(stream, "ARMORS\n");
+  phosg::fwrite_fmt(stream, "  CODE   => ---ID--- TYPE SKIN POINTS -DFP- -EVP- BP BE FLAG LVL EFR ETH EIC EDK ELT DFR EVR SB(S1:AMT1,S2:AMT2) TB FT A4 ST* ---DIVISOR--- NAME\n");
   for (size_t data1_1 = 1; data1_1 < 3; data1_1++) {
     float sale_divisor = pmt->get_sale_divisor(0x01, data1_1);
-    string divisor_str = phosg::string_printf("%g", sale_divisor);
+    string divisor_str = std::format("{:g}", sale_divisor);
     divisor_str.resize(13, ' ');
 
     size_t data1_2_limit = pmt->num_armors_or_shields_in_class(data1_1);
@@ -728,18 +761,19 @@ void ItemNameIndex::print_table(FILE* stream) const {
       item.data1[2] = data1_2;
       string name = this->describe_item(item);
 
-      fprintf(stream, "01%02zX%02zX => %08" PRIX32 " %04hX %04hX %6" PRIu32 " %5hu %5hu %02hhX %02hhX %04hX %3hhu %3hhu %3hhu %3hhu %3hhu %3hhu %3hhu %3hhu %02hhX %02hhX %04hX %2hhu* %s %s\n",
+      auto& stat_boost = pmt->get_stat_boost(a.stat_boost_entry_index);
+      phosg::fwrite_fmt(stream, "  01{:02X}{:02X} => {:08X} {:04X} {:04X} {:6} {:5} {:5} {:02X} {:02X} {:04X} {:3} {:3} {:3} {:3} {:3} {:3} {:3} {:3} {:02X}({:02X}:{:04X},{:02X}:{:04X}) {:02X} {:02X} {:02X} {:2}* {} {}\n",
           data1_1,
           data1_2,
-          a.base.id.load(),
-          a.base.type.load(),
-          a.base.skin.load(),
-          a.base.team_points.load(),
-          a.dfp.load(),
-          a.evp.load(),
+          a.base.id,
+          a.base.type,
+          a.base.skin,
+          a.base.team_points,
+          a.dfp,
+          a.evp,
           a.block_particle,
           a.block_effect,
-          a.class_flags.load(),
+          a.class_flags,
           static_cast<uint8_t>(a.required_level + 1),
           a.efr,
           a.eth,
@@ -748,19 +782,25 @@ void ItemNameIndex::print_table(FILE* stream) const {
           a.elt,
           a.dfp_range,
           a.evp_range,
-          a.stat_boost,
+          a.stat_boost_entry_index,
+          stat_boost.stats[0],
+          stat_boost.amounts[0],
+          stat_boost.stats[1],
+          stat_boost.amounts[1],
           a.tech_boost,
-          a.unknown_a2.load(),
+          a.flags_type,
+          a.unknown_a4,
           stars,
-          divisor_str.c_str(),
-          name.c_str());
+          divisor_str,
+          name);
     }
   }
 
-  fprintf(stream, "UNIT   => ---ID--- TYPE SKIN POINTS STAT COUNT ST-MOD ST* ---DIVISOR--- NAME\n");
+  phosg::fwrite_fmt(stream, "UNITS\n");
+  phosg::fwrite_fmt(stream, "  CODE   => ---ID--- TYPE SKIN POINTS STAT COUNT ST-MOD ST* ---DIVISOR--- NAME\n");
   {
     float sale_divisor = pmt->get_sale_divisor(0x01, 0x03);
-    string divisor_str = phosg::string_printf("%g", sale_divisor);
+    string divisor_str = std::format("{:g}", sale_divisor);
     divisor_str.resize(13, ' ');
 
     size_t data1_2_limit = pmt->num_units();
@@ -774,30 +814,30 @@ void ItemNameIndex::print_table(FILE* stream) const {
       item.data1[2] = data1_2;
       string name = this->describe_item(item);
 
-      fprintf(stream, "0103%02zX => %08" PRIX32 " %04hX %04hX %6" PRIu32 " %04hX %5hu %6hd %2hhu* %s %s\n",
+      phosg::fwrite_fmt(stream, "  0103{:02X} => {:08X} {:04X} {:04X} {:6} {:04X} {:5} {:6} {:2}* {} {}\n",
           data1_2,
-          u.base.id.load(),
-          u.base.type.load(),
-          u.base.skin.load(),
-          u.base.team_points.load(),
-          u.stat.load(),
-          u.stat_amount.load(),
-          u.modifier_amount.load(),
+          u.base.id,
+          u.base.type,
+          u.base.skin,
+          u.base.team_points,
+          u.stat,
+          u.stat_amount,
+          u.modifier_amount,
           stars,
-          divisor_str.c_str(),
-          name.c_str());
+          divisor_str,
+          name);
     }
   }
 
-  fprintf(stream, "MAG    => ---ID--- TYPE SKIN POINTS FTBL PB AC E1 E2 E3 E4 C1 C2 C3 C4 FLAG ST* ---DIVISOR--- NAME\n");
+  phosg::fwrite_fmt(stream, "MAGS\n");
+  phosg::fwrite_fmt(stream, "  CODE   => ---ID--- TYPE SKIN POINTS FTBL PB AC E1 E2 E3 E4 C1 C2 C3 C4 FLAG ---DIVISOR--- NAME\n");
   {
     size_t data1_1_limit = pmt->num_mags();
     for (size_t data1_1 = 0; data1_1 < data1_1_limit; data1_1++) {
       const auto& m = pmt->get_mag(data1_1);
-      uint8_t stars = pmt->get_item_stars(m.base.id);
 
       float sale_divisor = pmt->get_sale_divisor(0x02, data1_1);
-      string divisor_str = phosg::string_printf("%g", sale_divisor);
+      string divisor_str = std::format("{:g}", sale_divisor);
       divisor_str.resize(13, ' ');
 
       ItemData item;
@@ -806,13 +846,13 @@ void ItemNameIndex::print_table(FILE* stream) const {
       item.data1[2] = 0x00;
       string name = this->describe_item(item);
 
-      fprintf(stream, "02%02zX00 => %08" PRIX32 " %04hX %04hX %6" PRIu32 " %04hX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %02hhX %04hX %2hhu* %s %s\n",
+      phosg::fwrite_fmt(stream, "  02{:02X}00 => {:08X} {:04X} {:04X} {:6} {:04X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:04X} {} {}\n",
           data1_1,
-          m.base.id.load(),
-          m.base.type.load(),
-          m.base.skin.load(),
-          m.base.team_points.load(),
-          m.feed_table.load(),
+          m.base.id,
+          m.base.type,
+          m.base.skin,
+          m.base.team_points,
+          m.feed_table,
           m.photon_blast,
           m.activation,
           m.on_pb_full,
@@ -823,23 +863,22 @@ void ItemNameIndex::print_table(FILE* stream) const {
           m.on_low_hp_flag,
           m.on_death_flag,
           m.on_boss_flag,
-          m.class_flags.load(),
-          stars,
-          divisor_str.c_str(),
-          name.c_str());
+          m.class_flags,
+          divisor_str,
+          name);
     }
   }
 
-  fprintf(stream, "TOOL   => ---ID--- TYPE SKIN POINTS COUNT TECH -COST- ITEMFLAG ST* ---DIVISOR--- NAME\n");
+  phosg::fwrite_fmt(stream, "TOOLS\n");
+  phosg::fwrite_fmt(stream, "  CODE   => ---ID--- TYPE SKIN POINTS COUNT TECH -COST- ITEMFLAG ---DIVISOR--- NAME\n");
   for (size_t data1_1 = 0; data1_1 < pmt->num_tool_classes; data1_1++) {
     float sale_divisor = pmt->get_sale_divisor(0x03, data1_1);
-    string divisor_str = phosg::string_printf("%g", sale_divisor);
+    string divisor_str = std::format("{:g}", sale_divisor);
     divisor_str.resize(13, ' ');
 
     size_t data1_2_limit = pmt->num_tools_in_class(data1_1);
     for (size_t data1_2 = 0; data1_2 < data1_2_limit; data1_2++) {
       const auto& t = pmt->get_tool(data1_1, data1_2);
-      uint8_t stars = pmt->get_item_stars(t.base.id);
 
       ItemData item;
       item.data1[0] = 0x03;
@@ -848,108 +887,105 @@ void ItemNameIndex::print_table(FILE* stream) const {
       item.set_tool_item_amount(*this->limits, 1);
       string name = this->describe_item(item);
 
-      fprintf(stream, "03%02zX%02zX => %08" PRIX32 " %04hX %04hX %6" PRIu32 " %5hu %04hX %6" PRId32 " %08" PRIX32 " %2hhu* %s %s\n",
+      phosg::fwrite_fmt(stream, "  03{:02X}{:02X} => {:08X} {:04X} {:04X} {:6} {:5} {:04X} {:6} {:08X} {} {}\n",
           data1_1,
           data1_2,
-          t.base.id.load(),
-          t.base.type.load(),
-          t.base.skin.load(),
-          t.base.team_points.load(),
-          t.amount.load(),
-          t.tech.load(),
-          t.cost.load(),
-          t.item_flags.load(),
-          stars,
-          divisor_str.c_str(),
-          name.c_str());
+          t.base.id,
+          t.base.type,
+          t.base.skin,
+          t.base.team_points,
+          t.amount,
+          t.tech,
+          t.cost,
+          t.item_flags,
+          divisor_str,
+          name);
     }
   }
 
-  fprintf(stream, "CLASS     =>  F GF RF  B GB RB  Z GZ RZ GR DB JL ZL SH RY RS AT RV MG\n");
+  phosg::fwrite_fmt(stream, "MAX TECH LEVELS\n");
+  phosg::fwrite_fmt(stream, "  CLASS     =>  F GF RF  B GB RB  Z GZ RZ GR DB JL ZL SH RY RS AT RV MG\n");
   for (size_t char_class = 0; char_class < 12; char_class++) {
-    fprintf(stream, "%9s =>", name_for_char_class(char_class));
+    phosg::fwrite_fmt(stream, "  {:9} =>", name_for_char_class(char_class));
     for (size_t tech_num = 0; tech_num < 0x13; tech_num++) {
       uint8_t max_level = pmt->get_max_tech_level(char_class, tech_num) + 1;
       if (max_level == 0x00) {
-        fprintf(stream, "   ");
+        phosg::fwrite_fmt(stream, "   ");
       } else {
-        fprintf(stream, " %2hhu", max_level);
+        phosg::fwrite_fmt(stream, " {:2}", max_level);
       }
     }
-    fprintf(stream, "\n");
-  }
-
-  fprintf(stream, "CLASS     =>  F GF RF  B GB RB  Z GZ RZ GR DB JL ZL SH RY RS AT RV MG\n");
-  for (size_t char_class = 0; char_class < 12; char_class++) {
-    fprintf(stream, "%9s =>", name_for_char_class(char_class));
-    for (size_t tech_num = 0; tech_num < 0x13; tech_num++) {
-      uint8_t max_level = pmt->get_max_tech_level(char_class, tech_num) + 1;
-      if (max_level == 0x00) {
-        fprintf(stream, "   ");
-      } else {
-        fprintf(stream, " %2hhu", max_level);
-      }
-    }
-    fprintf(stream, "\n");
+    phosg::fwrite_fmt(stream, "\n");
   }
 
+  phosg::fwrite_fmt(stream, "MAG FEED TABLES\n");
   for (size_t table_index = 0; table_index < 8; table_index++) {
     static const char* names[11] = {
         "Monomate", "Dimate", "Trimate", "Monofluid",
         "Difluid", "Trifluid", "Antidote", "Antiparalysis",
         "Sol Atomizer", "Moon Atomizer", "Star Atomizer"};
-    fprintf(stream, "TABLE %02zX       => -DEF -POW -DEX MIND -IQ- SYNC\n", table_index);
+    phosg::fwrite_fmt(stream, "  TABLE {:02X}         => -DEF -POW -DEX MIND -IQ- SYNC\n", table_index);
     for (size_t which = 0; which < 11; which++) {
       const auto& res = pmt->get_mag_feed_result(table_index, which);
-      fprintf(stream, "%14s => %4hhd %4hhd %4hhd %4hhd %4hhd %4hhd\n",
+      phosg::fwrite_fmt(stream, "    {:14} => {:4} {:4} {:4} {:4} {:4} {:4}\n",
           names[which], res.def, res.pow, res.dex, res.mind, res.iq, res.synchro);
     }
   }
 
-  fprintf(stream, "SPECIAL => TYPE COUNT ST*\n");
+  phosg::fwrite_fmt(stream, "SPECIAL DEFINITIONS\n");
+  phosg::fwrite_fmt(stream, "  SPECIAL => TYPE COUNT ST* NAME\n");
   for (size_t index = 0; index < pmt->num_specials; index++) {
     const auto& sp = pmt->get_special(index);
     uint8_t stars = pmt->get_special_stars(index);
-    fprintf(stream, "     %02zX => %04hX %5hu %2hu*\n", index, sp.type.load(), sp.amount.load(), stars);
+    const char* name = "";
+    if (index) {
+      try {
+        name = name_for_weapon_special.at(index);
+      } catch (const out_of_range&) {
+      }
+    }
+    phosg::fwrite_fmt(stream, "       {:02X} => {:04X} {:5} {:2}* {}\n", index, sp.type, sp.amount, stars, name);
   }
 
-  fprintf(stream, "---USE + -EQUIP => RESULT MLV GND LVL CLS\n");
+  phosg::fwrite_fmt(stream, "ITEM COMBINATIONS\n");
+  phosg::fwrite_fmt(stream, "  ---USE + -EQUIP => RESULT MLV GND LVL CLS\n");
   for (const auto& combo_list_it : pmt->get_all_item_combinations()) {
     for (const auto& combo : combo_list_it.second) {
-      fprintf(stream, "%02hhX%02hhX%02hhX + %02hhX%02hhX%02hhX => %02hhX%02hhX%02hhX",
+      phosg::fwrite_fmt(stream, "  {:02X}{:02X}{:02X} + {:02X}{:02X}{:02X} => {:02X}{:02X}{:02X}",
           combo.used_item[0], combo.used_item[1], combo.used_item[2],
           combo.equipped_item[0], combo.equipped_item[1], combo.equipped_item[2],
           combo.result_item[0], combo.result_item[1], combo.result_item[2]);
       if (combo.mag_level != 0xFF) {
-        fprintf(stream, " %3hu", combo.mag_level);
+        phosg::fwrite_fmt(stream, " {:3}", combo.mag_level);
       } else {
-        fprintf(stream, "    ");
+        phosg::fwrite_fmt(stream, "    ");
       }
       if (combo.grind != 0xFF) {
-        fprintf(stream, " %3hu", combo.grind);
+        phosg::fwrite_fmt(stream, " {:3}", combo.grind);
       } else {
-        fprintf(stream, "    ");
+        phosg::fwrite_fmt(stream, "    ");
       }
       if (combo.level != 0xFF) {
-        fprintf(stream, " %3hu", combo.level);
+        phosg::fwrite_fmt(stream, " {:3}", combo.level);
       } else {
-        fprintf(stream, "    ");
+        phosg::fwrite_fmt(stream, "    ");
       }
       if (combo.char_class != 0xFF) {
-        fprintf(stream, " %3hu\n", combo.char_class);
+        phosg::fwrite_fmt(stream, " {:3}\n", combo.char_class);
       } else {
-        fprintf(stream, "    \n");
+        phosg::fwrite_fmt(stream, "    \n");
       }
     }
   }
 
+  phosg::fwrite_fmt(stream, "EVENT ITEMS\n");
   size_t num_events = pmt->num_events();
   for (size_t event_number = 0; event_number < num_events; event_number++) {
-    fprintf(stream, "EV %3zu => PRB\n", event_number);
+    phosg::fwrite_fmt(stream, "  EV {:3} => PRB\n", event_number);
     auto events_list = pmt->get_event_items(event_number);
     for (size_t z = 0; z < events_list.second; z++) {
       const auto& event_item = events_list.first[z];
-      fprintf(stream, "%02hhX%02hhX%02hhX => %3hhu\n",
+      phosg::fwrite_fmt(stream, "  {:02X}{:02X}{:02X} => {:3}\n",
           event_item.item[0], event_item.item[1], event_item.item[2], event_item.probability);
     }
   }

src/ItemNameIndex.hh

@@ -38,7 +38,12 @@ public:
   inline bool exists(const ItemData& item) const {
     return this->primary_identifier_index.count(item.primary_identifier());
   }
-  std::string describe_item(const ItemData& item, bool include_color_escapes = false, bool hide_mag_stats = false) const;
+
+  enum Flag : uint8_t {
+    INCLUDE_PSO_COLOR_ESCAPES = 0x01,
+    NAME_ONLY = 0x02,
+  };
+  std::string describe_item(const ItemData& item, uint8_t flags = 0) const;
   ItemData parse_item_description(const std::string& description) const;
 
   void print_table(FILE* stream) const;

src/ItemParameterTable.cc

@@ -175,27 +175,27 @@ ItemParameterTable::WeaponV4 ItemParameterTable::WeaponV1V2::to_v4() const {
   ret.photon = this->photon;
   ret.special = this->special;
   ret.ata = this->ata;
-  ret.stat_boost = this->stat_boost;
+  ret.stat_boost_entry_index = this->stat_boost_entry_index;
   return ret;
 }
 
 ItemParameterTable::WeaponV4 ItemParameterTable::WeaponGCNTE::to_v4() const {
   WeaponV4 ret;
-  ret.base.id = this->base.id.load();
-  ret.base.type = this->base.type.load();
-  ret.base.skin = this->base.skin.load();
-  ret.class_flags = this->class_flags.load();
-  ret.atp_min = this->atp_min.load();
-  ret.atp_max = this->atp_max.load();
-  ret.atp_required = this->atp_required.load();
-  ret.mst_required = this->mst_required.load();
-  ret.ata_required = this->ata_required.load();
-  ret.mst = this->mst.load();
+  ret.base.id = this->base.id;
+  ret.base.type = this->base.type;
+  ret.base.skin = this->base.skin;
+  ret.class_flags = this->class_flags;
+  ret.atp_min = this->atp_min;
+  ret.atp_max = this->atp_max;
+  ret.atp_required = this->atp_required;
+  ret.mst_required = this->mst_required;
+  ret.ata_required = this->ata_required;
+  ret.mst = this->mst;
   ret.max_grind = this->max_grind;
   ret.photon = this->photon;
   ret.special = this->special;
   ret.ata = this->ata;
-  ret.stat_boost = this->stat_boost;
+  ret.stat_boost_entry_index = this->stat_boost_entry_index;
   ret.projectile = this->projectile;
   ret.trail1_x = this->trail1_x;
   ret.trail1_y = this->trail1_y;
@@ -211,21 +211,21 @@ ItemParameterTable::WeaponV4 ItemParameterTable::WeaponGCNTE::to_v4() const {
 template <bool BE>
 ItemParameterTable::WeaponV4 ItemParameterTable::WeaponV3T<BE>::to_v4() const {
   WeaponV4 ret;
-  ret.base.id = this->base.id.load();
-  ret.base.type = this->base.type.load();
-  ret.base.skin = this->base.skin.load();
-  ret.class_flags = this->class_flags.load();
-  ret.atp_min = this->atp_min.load();
-  ret.atp_max = this->atp_max.load();
-  ret.atp_required = this->atp_required.load();
-  ret.mst_required = this->mst_required.load();
-  ret.ata_required = this->ata_required.load();
-  ret.mst = this->mst.load();
+  ret.base.id = this->base.id;
+  ret.base.type = this->base.type;
+  ret.base.skin = this->base.skin;
+  ret.class_flags = this->class_flags;
+  ret.atp_min = this->atp_min;
+  ret.atp_max = this->atp_max;
+  ret.atp_required = this->atp_required;
+  ret.mst_required = this->mst_required;
+  ret.ata_required = this->ata_required;
+  ret.mst = this->mst;
   ret.max_grind = this->max_grind;
   ret.photon = this->photon;
   ret.special = this->special;
   ret.ata = this->ata;
-  ret.stat_boost = this->stat_boost;
+  ret.stat_boost_entry_index = this->stat_boost_entry_index;
   ret.projectile = this->projectile;
   ret.trail1_x = this->trail1_x;
   ret.trail1_y = this->trail1_y;
@@ -238,7 +238,7 @@ ItemParameterTable::WeaponV4 ItemParameterTable::WeaponV3T<BE>::to_v4() const {
   ret.unknown_a4 = this->unknown_a4;
   ret.unknown_a5 = this->unknown_a5;
   ret.tech_boost = this->tech_boost;
-  ret.combo_type = this->combo_type;
+  ret.behavior_flags = this->behavior_flags;
   return ret;
 }
 
@@ -277,23 +277,24 @@ ItemParameterTable::ArmorOrShieldV4 ItemParameterTable::ArmorOrShieldV1V2::to_v4
   ret.elt = this->elt;
   ret.dfp_range = this->dfp_range;
   ret.evp_range = this->evp_range;
-  ret.stat_boost = this->stat_boost;
+  ret.stat_boost_entry_index = this->stat_boost_entry_index;
   ret.tech_boost = this->tech_boost;
-  ret.unknown_a2 = this->unknown_a2;
+  ret.flags_type = this->flags_type;
+  ret.unknown_a4 = this->unknown_a4;
   return ret;
 }
 
 template <bool BE>
 ItemParameterTable::ArmorOrShieldV4 ItemParameterTable::ArmorOrShieldV3T<BE>::to_v4() const {
   ArmorOrShieldV4 ret;
-  ret.base.id = this->base.id.load();
-  ret.base.type = this->base.type.load();
-  ret.base.skin = this->base.skin.load();
-  ret.dfp = this->dfp.load();
-  ret.evp = this->evp.load();
+  ret.base.id = this->base.id;
+  ret.base.type = this->base.type;
+  ret.base.skin = this->base.skin;
+  ret.dfp = this->dfp;
+  ret.evp = this->evp;
   ret.block_particle = this->block_particle;
   ret.block_effect = this->block_effect;
-  ret.class_flags = this->class_flags.load();
+  ret.class_flags = this->class_flags;
   ret.required_level = this->required_level;
   ret.efr = this->efr;
   ret.eth = this->eth;
@@ -302,9 +303,10 @@ ItemParameterTable::ArmorOrShieldV4 ItemParameterTable::ArmorOrShieldV3T<BE>::to
   ret.elt = this->elt;
   ret.dfp_range = this->dfp_range;
   ret.evp_range = this->evp_range;
-  ret.stat_boost = this->stat_boost;
+  ret.stat_boost_entry_index = this->stat_boost_entry_index;
   ret.tech_boost = this->tech_boost;
-  ret.unknown_a2 = this->unknown_a2.load();
+  ret.flags_type = this->flags_type;
+  ret.unknown_a4 = this->unknown_a4;
   return ret;
 }
 
@@ -328,12 +330,12 @@ ItemParameterTable::UnitV4 ItemParameterTable::UnitV1V2::to_v4() const {
 template <bool BE>
 ItemParameterTable::UnitV4 ItemParameterTable::UnitV3T<BE>::to_v4() const {
   UnitV4 ret;
-  ret.base.id = this->base.id.load();
-  ret.base.type = this->base.type.load();
-  ret.base.skin = this->base.skin.load();
-  ret.stat = this->stat.load();
-  ret.stat_amount = this->stat_amount.load();
-  ret.modifier_amount = this->modifier_amount.load();
+  ret.base.id = this->base.id;
+  ret.base.type = this->base.type;
+  ret.base.skin = this->base.skin;
+  ret.stat = this->stat;
+  ret.stat_amount = this->stat_amount;
+  ret.modifier_amount = this->modifier_amount;
   return ret;
 }
 
@@ -375,10 +377,10 @@ ItemParameterTable::MagV4 ItemParameterTable::MagV2::to_v4() const {
 template <bool BE>
 ItemParameterTable::MagV4 ItemParameterTable::MagV3T<BE>::to_v4() const {
   MagV4 ret;
-  ret.base.id = this->base.id.load();
-  ret.base.type = this->base.type.load();
-  ret.base.skin = this->base.skin.load();
-  ret.feed_table = this->feed_table.load();
+  ret.base.id = this->base.id;
+  ret.base.type = this->base.type;
+  ret.base.skin = this->base.skin;
+  ret.feed_table = this->feed_table;
   ret.photon_blast = this->photon_blast;
   ret.activation = this->activation;
   ret.on_pb_full = this->on_pb_full;
@@ -389,7 +391,7 @@ ItemParameterTable::MagV4 ItemParameterTable::MagV3T<BE>::to_v4() const {
   ret.on_low_hp_flag = this->on_low_hp_flag;
   ret.on_death_flag = this->on_death_flag;
   ret.on_boss_flag = this->on_boss_flag;
-  ret.class_flags = this->class_flags.load();
+  ret.class_flags = this->class_flags;
   return ret;
 }
 
@@ -406,13 +408,13 @@ ItemParameterTable::ToolV4 ItemParameterTable::ToolV1V2::to_v4() const {
 template <bool BE>
 ItemParameterTable::ToolV4 ItemParameterTable::ToolV3T<BE>::to_v4() const {
   ToolV4 ret;
-  ret.base.id = this->base.id.load();
-  ret.base.type = this->base.type.load();
-  ret.base.skin = this->base.skin.load();
-  ret.amount = this->amount.load();
-  ret.tech = this->tech.load();
-  ret.cost = this->cost.load();
-  ret.item_flags = this->item_flags.load();
+  ret.base.id = this->base.id;
+  ret.base.type = this->base.type;
+  ret.base.skin = this->base.skin;
+  ret.amount = this->amount;
+  ret.tech = this->tech;
+  ret.cost = this->cost;
+  ret.item_flags = this->item_flags;
   return ret;
 }
 
@@ -520,25 +522,22 @@ const ItemParameterTable::ArmorOrShieldV4& ItemParameterTable::get_armor_or_shie
     }
     return ret;
   } catch (const std::out_of_range&) {
-    ArmorOrShieldV4 def_v4;
-
-    if (this->offsets_dc_protos) {
-      def_v4 = indirect_lookup_2d<ArmorOrShieldDCProtos, false>(this->r, this->offsets_dc_protos->armor_table, data1_1 - 1, data1_2).to_v4();
-    } else if (this->offsets_v1_v2) {
-      def_v4 = indirect_lookup_2d<ArmorOrShieldV1V2, false>(this->r, this->offsets_v1_v2->armor_table, data1_1 - 1, data1_2).to_v4();
-    } else if (this->offsets_gc_nte) {
-      def_v4 = indirect_lookup_2d<ArmorOrShieldV3BE, true>(this->r, this->offsets_gc_nte->armor_table, data1_1 - 1, data1_2).to_v4();
-    } else if (this->offsets_v3_le) {
-      def_v4 = indirect_lookup_2d<ArmorOrShieldV3, false>(this->r, this->offsets_v3_le->armor_table, data1_1 - 1, data1_2).to_v4();
-    } else if (this->offsets_v3_be) {
-      def_v4 = indirect_lookup_2d<ArmorOrShieldV3BE, true>(this->r, this->offsets_v3_be->armor_table, data1_1 - 1, data1_2).to_v4();
-    } else {
-      throw logic_error("table is not v2, v3, or v4");
+    while (data1_2 >= parsed_vec.size()) {
+      auto& def_v4 = parsed_vec.emplace_back();
+      if (this->offsets_dc_protos) {
+        def_v4 = indirect_lookup_2d<ArmorOrShieldDCProtos, false>(this->r, this->offsets_dc_protos->armor_table, data1_1 - 1, parsed_vec.size() - 1).to_v4();
+      } else if (this->offsets_v1_v2) {
+        def_v4 = indirect_lookup_2d<ArmorOrShieldV1V2, false>(this->r, this->offsets_v1_v2->armor_table, data1_1 - 1, parsed_vec.size() - 1).to_v4();
+      } else if (this->offsets_gc_nte) {
+        def_v4 = indirect_lookup_2d<ArmorOrShieldV3BE, true>(this->r, this->offsets_gc_nte->armor_table, data1_1 - 1, parsed_vec.size() - 1).to_v4();
+      } else if (this->offsets_v3_le) {
+        def_v4 = indirect_lookup_2d<ArmorOrShieldV3, false>(this->r, this->offsets_v3_le->armor_table, data1_1 - 1, parsed_vec.size() - 1).to_v4();
+      } else if (this->offsets_v3_be) {
+        def_v4 = indirect_lookup_2d<ArmorOrShieldV3BE, true>(this->r, this->offsets_v3_be->armor_table, data1_1 - 1, parsed_vec.size() - 1).to_v4();
+      } else {
+        throw logic_error("table is not v2, v3, or v4");
+      }
     }
-    if (data1_2 >= parsed_vec.size()) {
-      parsed_vec.resize(data1_2 + 1);
-    }
-    parsed_vec[data1_2] = def_v4;
     return parsed_vec[data1_2];
   }
 }
@@ -573,24 +572,22 @@ const ItemParameterTable::UnitV4& ItemParameterTable::get_unit(uint8_t data1_2)
     }
     return ret;
   } catch (const std::out_of_range&) {
-    UnitV4 def_v4;
-    if (this->offsets_dc_protos) {
-      def_v4 = indirect_lookup_2d<UnitDCProtos, false>(this->r, this->offsets_dc_protos->unit_table, 0, data1_2).to_v4();
-    } else if (this->offsets_v1_v2) {
-      def_v4 = indirect_lookup_2d<UnitV1V2, false>(this->r, this->offsets_v1_v2->unit_table, 0, data1_2).to_v4();
-    } else if (this->offsets_gc_nte) {
-      def_v4 = indirect_lookup_2d<UnitV3BE, true>(this->r, this->offsets_gc_nte->unit_table, 0, data1_2).to_v4();
-    } else if (this->offsets_v3_le) {
-      def_v4 = indirect_lookup_2d<UnitV3, false>(this->r, this->offsets_v3_le->unit_table, 0, data1_2).to_v4();
-    } else if (this->offsets_v3_be) {
-      def_v4 = indirect_lookup_2d<UnitV3BE, true>(this->r, this->offsets_v3_be->unit_table, 0, data1_2).to_v4();
-    } else {
-      throw logic_error("table is not v2, v3, or v4");
+    while (data1_2 >= this->parsed_units.size()) {
+      auto& def_v4 = this->parsed_units.emplace_back();
+      if (this->offsets_dc_protos) {
+        def_v4 = indirect_lookup_2d<UnitDCProtos, false>(this->r, this->offsets_dc_protos->unit_table, 0, this->parsed_units.size() - 1).to_v4();
+      } else if (this->offsets_v1_v2) {
+        def_v4 = indirect_lookup_2d<UnitV1V2, false>(this->r, this->offsets_v1_v2->unit_table, 0, this->parsed_units.size() - 1).to_v4();
+      } else if (this->offsets_gc_nte) {
+        def_v4 = indirect_lookup_2d<UnitV3BE, true>(this->r, this->offsets_gc_nte->unit_table, 0, this->parsed_units.size() - 1).to_v4();
+      } else if (this->offsets_v3_le) {
+        def_v4 = indirect_lookup_2d<UnitV3, false>(this->r, this->offsets_v3_le->unit_table, 0, this->parsed_units.size() - 1).to_v4();
+      } else if (this->offsets_v3_be) {
+        def_v4 = indirect_lookup_2d<UnitV3BE, true>(this->r, this->offsets_v3_be->unit_table, 0, this->parsed_units.size() - 1).to_v4();
+      } else {
+        throw logic_error("table is not v2, v3, or v4");
+      }
     }
-    if (data1_2 >= this->parsed_units.size()) {
-      this->parsed_units.resize(data1_2 + 1);
-    }
-    this->parsed_units[data1_2] = def_v4;
     return this->parsed_units[data1_2];
   }
 }
@@ -625,28 +622,26 @@ const ItemParameterTable::MagV4& ItemParameterTable::get_mag(uint8_t data1_1) co
     }
     return ret;
   } catch (const std::out_of_range&) {
-    MagV4 def_v4;
-    if (this->offsets_dc_protos) {
-      def_v4 = indirect_lookup_2d<MagV1, false>(this->r, this->offsets_dc_protos->mag_table, 0, data1_1).to_v4();
-    } else if (this->offsets_v1_v2) {
-      if (is_v1(this->version)) {
-        def_v4 = indirect_lookup_2d<MagV1, false>(this->r, this->offsets_v1_v2->mag_table, 0, data1_1).to_v4();
+    while (data1_1 >= this->parsed_mags.size()) {
+      auto& def_v4 = this->parsed_mags.emplace_back();
+      if (this->offsets_dc_protos) {
+        def_v4 = indirect_lookup_2d<MagV1, false>(this->r, this->offsets_dc_protos->mag_table, 0, this->parsed_mags.size() - 1).to_v4();
+      } else if (this->offsets_v1_v2) {
+        if (is_v1(this->version)) {
+          def_v4 = indirect_lookup_2d<MagV1, false>(this->r, this->offsets_v1_v2->mag_table, 0, this->parsed_mags.size() - 1).to_v4();
+        } else {
+          def_v4 = indirect_lookup_2d<MagV2, false>(this->r, this->offsets_v1_v2->mag_table, 0, this->parsed_mags.size() - 1).to_v4();
+        }
+      } else if (this->offsets_gc_nte) {
+        def_v4 = indirect_lookup_2d<MagV3BE, true>(this->r, this->offsets_gc_nte->mag_table, 0, this->parsed_mags.size() - 1).to_v4();
+      } else if (this->offsets_v3_le) {
+        def_v4 = indirect_lookup_2d<MagV3, false>(this->r, this->offsets_v3_le->mag_table, 0, this->parsed_mags.size() - 1).to_v4();
+      } else if (this->offsets_v3_be) {
+        def_v4 = indirect_lookup_2d<MagV3BE, true>(this->r, this->offsets_v3_be->mag_table, 0, this->parsed_mags.size() - 1).to_v4();
       } else {
-        def_v4 = indirect_lookup_2d<MagV2, false>(this->r, this->offsets_v1_v2->mag_table, 0, data1_1).to_v4();
+        throw logic_error("table is not v2, v3, or v4");
       }
-    } else if (this->offsets_gc_nte) {
-      def_v4 = indirect_lookup_2d<MagV3BE, true>(this->r, this->offsets_gc_nte->mag_table, 0, data1_1).to_v4();
-    } else if (this->offsets_v3_le) {
-      def_v4 = indirect_lookup_2d<MagV3, false>(this->r, this->offsets_v3_le->mag_table, 0, data1_1).to_v4();
-    } else if (this->offsets_v3_be) {
-      def_v4 = indirect_lookup_2d<MagV3BE, true>(this->r, this->offsets_v3_be->mag_table, 0, data1_1).to_v4();
-    } else {
-      throw logic_error("table is not v2, v3, or v4");
     }
-    if (data1_1 >= this->parsed_mags.size()) {
-      this->parsed_mags.resize(data1_1 + 1);
-    }
-    this->parsed_mags[data1_1] = def_v4;
     return this->parsed_mags[data1_1];
   }
 }
@@ -718,7 +713,7 @@ pair<uint8_t, uint8_t> ItemParameterTable::find_tool_by_id_t(uint32_t tool_table
       }
     }
   }
-  throw out_of_range(phosg::string_printf("invalid tool class %08" PRIX32, item_id));
+  throw out_of_range(std::format("invalid tool class {:08X}", item_id));
 }
 
 pair<uint8_t, uint8_t> ItemParameterTable::find_tool_by_id(uint32_t item_id) const {
@@ -905,8 +900,8 @@ const ItemParameterTable::Special& ItemParameterTable::get_special(uint8_t speci
         this->parsed_specials.resize(special + 1);
       }
       const auto& sp_be = this->r.pget<SpecialBE>(this->offsets_gc_nte->special_data_table + sizeof(SpecialBE) * special);
-      this->parsed_specials[special].type = sp_be.type.load();
-      this->parsed_specials[special].amount = sp_be.amount.load();
+      this->parsed_specials[special].type = sp_be.type;
+      this->parsed_specials[special].amount = sp_be.amount;
     }
     return this->parsed_specials[special];
   } else if (this->offsets_v3_be) {
@@ -915,8 +910,8 @@ const ItemParameterTable::Special& ItemParameterTable::get_special(uint8_t speci
         this->parsed_specials.resize(special + 1);
       }
       const auto& sp_be = this->r.pget<SpecialBE>(this->offsets_v3_be->special_data_table + sizeof(SpecialBE) * special);
-      this->parsed_specials[special].type = sp_be.type.load();
-      this->parsed_specials[special].amount = sp_be.amount.load();
+      this->parsed_specials[special].type = sp_be.type;
+      this->parsed_specials[special].amount = sp_be.amount;
     }
     return this->parsed_specials[special];
   } else if (this->offsets_v4) {
@@ -926,6 +921,38 @@ const ItemParameterTable::Special& ItemParameterTable::get_special(uint8_t speci
   }
 }
 
+const ItemParameterTable::StatBoost& ItemParameterTable::get_stat_boost(uint8_t entry_index) const {
+  if (this->offsets_dc_protos) {
+    return this->r.pget<StatBoost>(this->offsets_dc_protos->stat_boost_table + sizeof(StatBoost) * entry_index);
+  } else if (this->offsets_v1_v2) {
+    return this->r.pget<StatBoost>(this->offsets_v1_v2->stat_boost_table + sizeof(StatBoost) * entry_index);
+  } else if (this->offsets_v3_le) {
+    return this->r.pget<StatBoost>(this->offsets_v3_le->stat_boost_table + sizeof(StatBoost) * entry_index);
+  } else if (this->offsets_gc_nte) {
+    while (entry_index >= this->parsed_stat_boosts.size()) {
+      const auto& sb_be = this->r.pget<StatBoostBE>(this->offsets_gc_nte->stat_boost_table + sizeof(StatBoostBE) * this->parsed_stat_boosts.size());
+      auto& sb = this->parsed_stat_boosts.emplace_back();
+      sb.stats = sb_be.stats;
+      sb.amounts[0] = sb_be.amounts[0];
+      sb.amounts[1] = sb_be.amounts[1];
+    }
+    return this->parsed_stat_boosts[entry_index];
+  } else if (this->offsets_v3_be) {
+    while (entry_index >= this->parsed_stat_boosts.size()) {
+      const auto& sb_be = this->r.pget<StatBoostBE>(this->offsets_v3_be->stat_boost_table + sizeof(StatBoostBE) * this->parsed_stat_boosts.size());
+      auto& sb = this->parsed_stat_boosts.emplace_back();
+      sb.stats = sb_be.stats;
+      sb.amounts[0] = sb_be.amounts[0];
+      sb.amounts[1] = sb_be.amounts[1];
+    }
+    return this->parsed_stat_boosts[entry_index];
+  } else if (this->offsets_v4) {
+    return this->r.pget<StatBoost>(this->offsets_v4->stat_boost_table + sizeof(StatBoost) * entry_index);
+  } else {
+    throw logic_error("table is not v2, v3, or v4");
+  }
+}
+
 uint8_t ItemParameterTable::get_max_tech_level(uint8_t char_class, uint8_t tech_num) const {
   if (char_class >= 12) {
     throw out_of_range("invalid character class");

src/ItemParameterTable.hh

@@ -28,18 +28,18 @@ public:
     // item's name in the text archive (e.g. TextEnglish) collection 0.
     /* 00 */ U32T<BE> id = 0xFFFFFFFF;
     /* 04 */
-  } __packed__;
+  } __attribute__((packed));
   template <bool BE>
   struct ItemBaseV3T : ItemBaseV2T<BE> {
     /* 04 */ U16T<BE> type = 0; // "Model" in Soly's ItemPMT editor
     /* 06 */ U16T<BE> skin = 0; // "Texture" in Soly's ItemPMT editor
     /* 08 */
-  } __packed__;
+  } __attribute__((packed));
   template <bool BE>
   struct ItemBaseV4T : ItemBaseV3T<BE> {
     /* 08 */ U32T<BE> team_points = 0;
     /* 0C */
-  } __packed__;
+  } __attribute__((packed));
 
   struct WeaponV4;
   struct WeaponDCProtos {
@@ -71,7 +71,7 @@ public:
     /* 11 */ uint8_t photon = 0;
     /* 12 */ uint8_t special = 0;
     /* 13 */ uint8_t ata = 0;
-    /* 14 */ uint8_t stat_boost = 0; // TODO: This could be larger (16 or 32 bits)
+    /* 14 */ uint8_t stat_boost_entry_index = 0; // TODO: This could be larger (16 or 32 bits)
     /* 15 */ parray<uint8_t, 3> unknown_a9;
     /* 18 */
 
@@ -91,7 +91,7 @@ public:
     /* 17 */ uint8_t photon = 0;
     /* 18 */ uint8_t special = 0;
     /* 19 */ uint8_t ata = 0;
-    /* 1A */ uint8_t stat_boost = 0;
+    /* 1A */ uint8_t stat_boost_entry_index = 0;
     /* 1B */ uint8_t projectile = 0;
     /* 1C */ int8_t trail1_x = 0;
     /* 1D */ int8_t trail1_y = 0;
@@ -120,7 +120,7 @@ public:
     /* 17 */ uint8_t photon = 0;
     /* 18 */ uint8_t special = 0;
     /* 19 */ uint8_t ata = 0;
-    /* 1A */ uint8_t stat_boost = 0;
+    /* 1A */ uint8_t stat_boost_entry_index = 0;
     /* 1B */ uint8_t projectile = 0;
     /* 1C */ int8_t trail1_x = 0;
     /* 1D */ int8_t trail1_y = 0;
@@ -133,11 +133,16 @@ public:
     /* 24 */ uint8_t unknown_a4 = 0;
     /* 25 */ uint8_t unknown_a5 = 0;
     /* 26 */ uint8_t tech_boost = 0;
-    /* 27 */ uint8_t combo_type = 0;
+    // Flags in this field:
+    //   01 = disable combos (weapon can only be used once in a row)
+    //   02 = TODO (sets TItemWeapon flag 40000; used in TItemWeapon_v1E)
+    //   04 = TODO (sets TItemWeapon flag 80000; used in TItemWeapon_v1E)
+    //   08 = weapon cannot have attributes (they are ignored if present)
+    /* 27 */ uint8_t behavior_flags = 0;
     /* 28 */
 
     WeaponV4 to_v4() const;
-  } __packed__;
+  } __attribute__((packed));
 
   using WeaponV3 = WeaponV3T<false>;
   using WeaponV3BE = WeaponV3T<true>;
@@ -157,7 +162,7 @@ public:
     /* 1B */ uint8_t photon = 0;
     /* 1C */ uint8_t special = 0;
     /* 1D */ uint8_t ata = 0;
-    /* 1E */ uint8_t stat_boost = 0;
+    /* 1E */ uint8_t stat_boost_entry_index = 0;
     /* 1F */ uint8_t projectile = 0;
     /* 20 */ int8_t trail1_x = 0;
     /* 21 */ int8_t trail1_y = 0;
@@ -170,7 +175,7 @@ public:
     /* 28 */ uint8_t unknown_a4 = 0;
     /* 29 */ uint8_t unknown_a5 = 0;
     /* 2A */ uint8_t tech_boost = 0;
-    /* 2B */ uint8_t combo_type = 0;
+    /* 2B */ uint8_t behavior_flags = 0;
     /* 2C */
   } __packed_ws__(WeaponV4, 0x2C);
 
@@ -192,15 +197,23 @@ public:
     /* 12 */ uint8_t dfp_range = 0;
     /* 13 */ uint8_t evp_range = 0;
     /* 14 */
-  } __packed__;
+  } __attribute__((packed));
 
   template <typename BaseT, bool BE>
   struct ArmorOrShieldFinalT : ArmorOrShieldT<BaseT, BE> {
-    /* 14 */ uint8_t stat_boost = 0;
+    /* 14 */ uint8_t stat_boost_entry_index = 0;
     /* 15 */ uint8_t tech_boost = 0;
-    /* 16 */ U16T<BE> unknown_a2 = 0;
+    // TODO: Figure out what this does. Only a few values appear to do anything:
+    // Shields:
+    //   01 sets item->flags |= 4 (used in TItemProShield_v10)
+    //   03 sets item->flags |= 8 (used in TItemProShield_v1A)
+    // Armors:
+    //   01 sets item->flags |= 1 (used in TItemProArmor_v10)
+    //   02 constructs TItemProArmorParticle instead of TItemProArmor
+    /* 16 */ uint8_t flags_type = 0;
+    /* 17 */ uint8_t unknown_a4 = 0;
     /* 18 */
-  } __packed__;
+  } __attribute__((packed));
   using ArmorOrShieldV4 = ArmorOrShieldFinalT<ItemBaseV4T<false>, false>;
   check_struct_size(ArmorOrShieldV4, 0x20);
   struct ArmorOrShieldDCProtos : ArmorOrShieldT<ItemBaseV2T<false>, false> {
@@ -213,7 +226,7 @@ public:
   template <bool BE>
   struct ArmorOrShieldV3T : ArmorOrShieldFinalT<ItemBaseV3T<BE>, BE> {
     ArmorOrShieldV4 to_v4() const;
-  } __packed__;
+  } __attribute__((packed));
   using ArmorOrShieldV3 = ArmorOrShieldV3T<false>;
   using ArmorOrShieldV3BE = ArmorOrShieldV3T<true>;
   check_struct_size(ArmorOrShieldV3, 0x1C);
@@ -226,14 +239,14 @@ public:
     /* 04 */ U16T<BE> stat = 0;
     /* 06 */ U16T<BE> stat_amount = 0;
     /* 08 */
-  } __packed__;
+  } __attribute__((packed));
 
   template <typename BaseT, bool BE>
   struct UnitFinalT : UnitT<BaseT, BE> {
     /* 08 */ S16T<BE> modifier_amount = 0;
     /* 0A */ parray<uint8_t, 2> unused;
     /* 0C */
-  } __packed__;
+  } __attribute__((packed));
   using UnitV4 = UnitFinalT<ItemBaseV4T<false>, false>;
   check_struct_size(UnitV4, 0x14);
   struct UnitDCProtos : UnitT<ItemBaseV2T<false>, false> {
@@ -245,7 +258,7 @@ public:
   template <bool BE>
   struct UnitV3T : UnitFinalT<ItemBaseV3T<BE>, BE> {
     UnitV4 to_v4() const;
-  } __packed__;
+  } __attribute__((packed));
   using UnitV3 = UnitV3T<false>;
   using UnitV3BE = UnitV3T<true>;
   check_struct_size(UnitV3, 0x10);
@@ -282,7 +295,7 @@ public:
     /* 0E */ uint8_t on_death_flag = 0;
     /* 0F */ uint8_t on_boss_flag = 0;
     /* 10 */
-  } __packed__;
+  } __attribute__((packed));
 
   struct MagV4 : MagT<ItemBaseV4T<false>, false> {
     le_uint16_t class_flags = 0x00FF;
@@ -305,7 +318,7 @@ public:
     /* 14 */
 
     MagV4 to_v4() const;
-  } __packed__;
+  } __attribute__((packed));
   using MagV3 = MagV3T<false>;
   using MagV3BE = MagV3T<true>;
   check_struct_size(MagV3, 0x18);
@@ -329,7 +342,7 @@ public:
     //   00000080 - is rare (renders as red box; V3+)
     /* 0C */ U32T<BE> item_flags = 0;
     /* 10 */
-  } __packed__;
+  } __attribute__((packed));
 
   using ToolV4 = ToolT<ItemBaseV4T<false>, false>;
   check_struct_size(ToolV4, 0x18);
@@ -339,7 +352,7 @@ public:
   template <bool BE>
   struct ToolV3T : ToolT<ItemBaseV3T<BE>, BE> {
     ToolV4 to_v4() const;
-  } __packed__;
+  } __attribute__((packed));
   using ToolV3 = ToolV3T<false>;
   using ToolV3BE = ToolV3T<true>;
   check_struct_size(ToolV3, 0x14);
@@ -360,7 +373,7 @@ public:
   template <bool BE>
   struct MagFeedResultsListOffsetsT {
     parray<U32T<BE>, 8> offsets; // Offsets of MagFeedResultsList objects
-  } __packed__;
+  } __attribute__((packed));
   using MagFeedResultsListOffsets = MagFeedResultsListOffsetsT<false>;
   using MagFeedResultsListOffsetsBE = MagFeedResultsListOffsetsT<true>;
   check_struct_size(MagFeedResultsListOffsets, 0x20);
@@ -370,7 +383,7 @@ public:
   struct SpecialT {
     U16T<BE> type = 0xFFFF;
     U16T<BE> amount = 0;
-  } __packed__;
+  } __attribute__((packed));
   using Special = SpecialT<false>;
   using SpecialBE = SpecialT<true>;
   check_struct_size(Special, 4);
@@ -378,11 +391,31 @@ public:
 
   template <bool BE>
   struct StatBoostT {
-    uint8_t stat1 = 0;
-    uint8_t stat2 = 0;
-    U16T<BE> amount1 = 0;
-    U16T<BE> amount2 = 0;
-  } __packed__;
+    // Only the first of these stat/amount pairs is used in most versions of
+    // the game. In DC 11/2000 Sega apparently changed the loop from
+    // `for (z = 0; z != 2; z++)` to `for (z = 0; z != 1; z++)`, so only the
+    // first stat/amount pair is used on all versions after DC NTE.
+    // Values for stats:
+    //   01 = ATP bonus
+    //   02 = ATA bonus
+    //   03 = EVP bonus
+    //   04 = DFP bonus
+    //   05 = MST bonus
+    //   06 = HP bonus
+    //   07 = LCK bonus
+    //   08 = all of the above bonuses except HP
+    //   09 = ATP penalty
+    //   0A = ATA penalty
+    //   0B = EVP penalty
+    //   0C = DFP penalty
+    //   0D = MST penalty
+    //   0E = HP penalty
+    //   0F = LCK penalty
+    //   10 = all of the above penalties except HP
+    //   Anything else (including 00) = no bonus or penalty
+    parray<uint8_t, 2> stats = 0;
+    parray<U16T<BE>, 2> amounts;
+  } __attribute__((packed));
   using StatBoost = StatBoostT<false>;
   using StatBoostBE = StatBoostT<true>;
   check_struct_size(StatBoost, 6);
@@ -403,18 +436,18 @@ public:
   } __packed_ws__(ItemCombination, 0x10);
 
   template <bool BE>
-  struct TechniqueBoostT {
-    U32T<BE> tech1 = 0;
-    F32T<BE> boost1 = 0.0f;
-    U32T<BE> tech2 = 0;
-    F32T<BE> boost2 = 0.0f;
-    U32T<BE> tech3 = 0;
-    F32T<BE> boost3 = 0.0f;
-  } __packed__;
-  using TechniqueBoost = TechniqueBoostT<false>;
-  using TechniqueBoostBE = TechniqueBoostT<true>;
-  check_struct_size(TechniqueBoost, 0x18);
-  check_struct_size(TechniqueBoostBE, 0x18);
+  struct TechniqueBoostEntryT {
+    uint8_t tech_num = 0;
+    // It appears that only one bit in the flags field is used:
+    //   01 = enable piercing (for Megid)
+    uint8_t flags = 0;
+    parray<uint8_t, 2> unused;
+    F32T<BE> amount = 0.0f;
+  } __attribute__((packed));
+  using TechniqueBoostEntry = TechniqueBoostEntryT<false>;
+  using TechniqueBoostEntryBE = TechniqueBoostEntryT<true>;
+  check_struct_size(TechniqueBoostEntry, 0x08);
+  check_struct_size(TechniqueBoostEntryBE, 0x08);
 
   struct EventItem {
     parray<uint8_t, 3> item;
@@ -432,7 +465,7 @@ public:
     F32T<BE> shield_divisor = 0.0f;
     F32T<BE> unit_divisor = 0.0f;
     F32T<BE> mag_divisor = 0.0f;
-  } __packed__;
+  } __attribute__((packed));
   using NonWeaponSaleDivisors = NonWeaponSaleDivisorsT<false>;
   using NonWeaponSaleDivisorsBE = NonWeaponSaleDivisorsT<true>;
   check_struct_size(NonWeaponSaleDivisors, 0x10);
@@ -463,6 +496,7 @@ public:
   uint8_t get_item_stars(uint32_t id) const;
   uint8_t get_special_stars(uint8_t special) const;
   const Special& get_special(uint8_t special) const;
+  const StatBoost& get_stat_boost(uint8_t entry_index) const;
   uint8_t get_max_tech_level(uint8_t char_class, uint8_t tech_num) const;
   uint8_t get_weapon_v1_replacement(uint8_t data1_1) const;
 
@@ -557,7 +591,7 @@ protected:
     /* 40 / 69D8 */ be_uint32_t max_tech_level_table; // -> MaxTechniqueLevels
     /* 44 / 737C */ be_uint32_t combination_table; // -> {count, offset -> [ItemCombination]}
     /* 48 / 68B0 */ be_uint32_t unknown_a1;
-    /* 4C / 6B1C */ be_uint32_t tech_boost_table; // -> [TechniqueBoost] (always 0x2C of them? from counts struct?)
+    /* 4C / 6B1C */ be_uint32_t tech_boost_table; // -> [TechniqueBoostEntry[3]]
   } __packed_ws__(TableOffsetsGCNTE, 0x50);
 
   template <bool BE>
@@ -582,11 +616,11 @@ protected:
     /* 40 / DF88 / 12894 */ U32T<BE> max_tech_level_table; // -> MaxTechniqueLevels
     /* 44 / F5D0 / 14FF4 */ U32T<BE> combination_table; // -> {count, offset -> [ItemCombination]}
     /* 48 / DE48 / 12754 */ U32T<BE> unknown_a1;
-    /* 4C / EB8C / 14278 */ U32T<BE> tech_boost_table; // -> [TechniqueBoost] (always 0x2C of them? from counts struct?)
+    /* 4C / EB8C / 14278 */ U32T<BE> tech_boost_table; // -> [TechniqueBoost[3]]
     /* 50 / F5F0 / 15014 */ U32T<BE> unwrap_table; // -> {count, offset -> [{count, offset -> [EventItem]}]}
     /* 54 / F5F8 / 1501C */ U32T<BE> unsealable_table; // -> {count, offset -> [UnsealableItem]}
     /* 58 / F600 / 15024 */ U32T<BE> ranged_special_table; // -> {count, offset -> [4-byte structs]}
-  } __packed__;
+  } __attribute__((packed));
   using TableOffsetsV3V4 = TableOffsetsV3V4T<false>;
   using TableOffsetsV3V4BE = TableOffsetsV3V4T<true>;
   check_struct_size(TableOffsetsV3V4, 0x5C);
@@ -611,6 +645,7 @@ protected:
   mutable std::vector<MagV4> parsed_mags;
   mutable std::unordered_map<uint16_t, ToolV4> parsed_tools;
   mutable std::vector<Special> parsed_specials;
+  mutable std::vector<StatBoost> parsed_stat_boosts;
 
   // Key is used_item. We can't index on (used_item, equipped_item) because
   // equipped_item may contain wildcards, and the matching order matters.

src/ItemTranslationTable.cc

@@ -23,12 +23,12 @@ ItemTranslationTable::ItemTranslationTable(
       if (is_canonical(id)) {
         has_any_canonical_id = true;
         if (!this->entry_index_for_version[v_s].emplace(id, z).second) {
-          throw runtime_error(phosg::string_printf("(row %zu) duplicate canonical ID %08" PRIX32, z, id));
+          throw runtime_error(std::format("(row {}) duplicate canonical ID {:08X}", z, id));
         }
       }
     }
     if (!has_any_canonical_id) {
-      throw runtime_error(phosg::string_printf("(row %zu) no canonical ID present in row", z));
+      throw runtime_error(std::format("(row {}) no canonical ID present in row", z));
     }
   }
 
@@ -46,25 +46,25 @@ ItemTranslationTable::ItemTranslationTable(
       uint32_t e_id = this->entries[z].id_for_version[v_s];
       if (is_canonical(e_id)) {
         if (!entry_index.count(e_id)) {
-          throw logic_error(phosg::string_printf("(row %zu version %s) canonical ID %" PRIX32 " is missing from the index", z, phosg::name_for_enum(v), e_id));
+          throw logic_error(std::format("(row {} version {}) canonical ID {:X} is missing from the index", z, phosg::name_for_enum(v), e_id));
         }
         try {
           item_parameter_table->definition_for_primary_identifier(e_id);
         } catch (const out_of_range&) {
-          throw runtime_error(phosg::string_printf("(row %zu version %s) ID %" PRIX32 " not defined in item parameter table", z, phosg::name_for_enum(v), e_id));
+          throw runtime_error(std::format("(row {} version {}) ID {:X} not defined in item parameter table", z, phosg::name_for_enum(v), e_id));
         }
         if (!remaining_identifiers.erase(e_id)) {
-          throw runtime_error(phosg::string_printf("(row %zu version %s) ID %" PRIX32 " not in item parameter table's primary identifier list", z, phosg::name_for_enum(v), e_id));
+          throw runtime_error(std::format("(row {} version {}) ID {:X} not in item parameter table's primary identifier list", z, phosg::name_for_enum(v), e_id));
         }
       } else if (!entry_index.count(make_canonical(e_id))) {
-        throw runtime_error(phosg::string_printf("(row %zu version %s) ID %" PRIX32 " refers to nonexistent canonical ID", z, phosg::name_for_enum(v), e_id));
+        throw runtime_error(std::format("(row {} version {}) ID {:X} refers to nonexistent canonical ID", z, phosg::name_for_enum(v), e_id));
       }
     }
 
     if (!remaining_identifiers.empty()) {
-      string missing_str = phosg::string_printf("(version %s) not all identifiers in the item parameter table are defined in the translation table; missing:", phosg::name_for_enum(v));
+      string missing_str = std::format("(version {}) not all identifiers in the item parameter table are defined in the translation table; missing:", phosg::name_for_enum(v));
       for (uint32_t id : remaining_identifiers) {
-        missing_str += phosg::string_printf(" %08" PRIX32, id);
+        missing_str += std::format(" {:08X}", id);
       }
       throw runtime_error(missing_str);
     }

src/Items.cc

@@ -6,7 +6,7 @@
 
 using namespace std;
 
-void player_use_item(shared_ptr<Client> c, size_t item_index, shared_ptr<PSOLFGEncryption> opt_rand_crypt) {
+void player_use_item(shared_ptr<Client> c, size_t item_index, shared_ptr<RandomGenerator> rand_crypt) {
   auto s = c->require_server_state();
 
   // On PC (and presumably DC), the client sends a 6x29 after this to delete the
@@ -177,7 +177,7 @@ void player_use_item(shared_ptr<Client> c, size_t item_index, shared_ptr<PSOLFGE
     // they could end up thinking the unwrapped item is something completely
     // different. (They don't even use a fixed random seed, like for rares;
     // they just call rand().) How does this actually work on console PSO?
-    size_t det = random_from_optional_crypt(opt_rand_crypt) % sum;
+    size_t det = rand_crypt->next() % sum;
     for (size_t z = 0; z < table.second; z++) {
       const auto& entry = table.first[z];
       if (det > entry.probability) {

src/Items.hh

@@ -12,7 +12,7 @@
 #include "ServerState.hh"
 #include "StaticGameData.hh"
 
-void player_use_item(std::shared_ptr<Client> c, size_t item_index, std::shared_ptr<PSOLFGEncryption> opt_rand_crypt);
+void player_use_item(std::shared_ptr<Client> c, size_t item_index, std::shared_ptr<RandomGenerator> rand_crypt);
 void player_feed_mag(std::shared_ptr<Client> c, size_t mag_item_index, size_t fed_item_index);
 
 void apply_mag_feed_result(

src/LevelTable.cc

@@ -129,7 +129,7 @@ LevelTableV3BE::LevelTableV3BE(const string& data, bool encrypted) {
       dest_delta.ata = src_delta.ata;
       dest_delta.lck = src_delta.lck;
       dest_delta.tp = src_delta.tp;
-      dest_delta.experience = src_delta.experience.load();
+      dest_delta.experience = src_delta.experience;
     }
   }
 }

src/LevelTable.hh

@@ -24,16 +24,16 @@ struct CharacterStatsT {
 
   operator CharacterStatsT<!BE>() const {
     CharacterStatsT<!BE> ret;
-    ret.atp = this->atp.load();
-    ret.mst = this->mst.load();
-    ret.evp = this->evp.load();
-    ret.hp = this->hp.load();
-    ret.dfp = this->dfp.load();
-    ret.ata = this->ata.load();
-    ret.lck = this->lck.load();
+    ret.atp = this->atp;
+    ret.mst = this->mst;
+    ret.evp = this->evp;
+    ret.hp = this->hp;
+    ret.dfp = this->dfp;
+    ret.ata = this->ata;
+    ret.lck = this->lck;
     return ret;
   }
-} __packed__;
+} __attribute__((packed));
 using CharacterStats = CharacterStatsT<false>;
 using CharacterStatsBE = CharacterStatsT<true>;
 check_struct_size(CharacterStats, 0x0E);
@@ -53,15 +53,15 @@ struct PlayerStatsT {
   operator PlayerStatsT<!BE>() const {
     PlayerStatsT<!BE> ret;
     ret.char_stats = this->char_stats;
-    ret.esp = this->esp.load();
-    ret.height = this->height.load();
-    ret.unknown_a3 = this->unknown_a3.load();
-    ret.level = this->level.load();
-    ret.experience = this->experience.load();
-    ret.meseta = this->meseta.load();
+    ret.esp = this->esp;
+    ret.height = this->height;
+    ret.unknown_a3 = this->unknown_a3;
+    ret.level = this->level;
+    ret.experience = this->experience;
+    ret.meseta = this->meseta;
     return ret;
   }
-} __packed__;
+} __attribute__((packed));
 using PlayerStats = PlayerStatsT<false>;
 using PlayerStatsBE = PlayerStatsT<true>;
 check_struct_size(PlayerStats, 0x24);
@@ -89,7 +89,7 @@ struct LevelStatsDeltaT {
     ps.mst += this->mst;
     ps.lck += this->lck;
   }
-} __packed__;
+} __attribute__((packed));
 using LevelStatsDelta = LevelStatsDeltaT<false>;
 using LevelStatsDeltaBE = LevelStatsDeltaT<true>;
 check_struct_size(LevelStatsDelta, 0x0C);

src/Lobby.cc

@@ -7,6 +7,7 @@
 #include "Compression.hh"
 #include "Loggers.hh"
 #include "SendCommands.hh"
+#include "ServerState.hh"
 #include "Text.hh"
 
 using namespace std;
@@ -16,7 +17,7 @@ bool Lobby::FloorItem::visible_to_client(uint8_t client_id) const {
 }
 
 Lobby::FloorItemManager::FloorItemManager(uint32_t lobby_id, uint8_t floor)
-    : log(phosg::string_printf("[Lobby:%08" PRIX32 ":FloorItems:%02hhX] ", lobby_id, floor), lobby_log.min_level),
+    : log(std::format("[Lobby:{:08X}:FloorItems:{:02X}] ", lobby_id, floor), lobby_log.min_level),
       next_drop_number(0) {}
 
 bool Lobby::FloorItemManager::exists(uint32_t item_id) const {
@@ -57,8 +58,8 @@ void Lobby::FloorItemManager::add(shared_ptr<Lobby::FloorItem> fi) {
       this->queue_for_client[z].emplace(fi->drop_number, fi);
     }
   }
-  this->log.info("Added floor item %08" PRIX32 " at %g, %g with drop number %" PRIu64 " with flags %03hX",
-      fi->data.id.load(), fi->pos.x.load(), fi->pos.z.load(), fi->drop_number, fi->flags);
+  this->log.info_f("Added floor item {:08X} at {:g}, {:g} with drop number {} with flags {:03X}",
+      fi->data.id, fi->pos.x, fi->pos.z, fi->drop_number, fi->flags);
 }
 
 std::shared_ptr<Lobby::FloorItem> Lobby::FloorItemManager::remove(uint32_t item_id, uint8_t client_id) {
@@ -76,8 +77,8 @@ std::shared_ptr<Lobby::FloorItem> Lobby::FloorItemManager::remove(uint32_t item_
     }
   }
   this->items.erase(item_it);
-  this->log.info("Removed floor item %08" PRIX32 " at %g, %g with drop number %" PRIu64 " with flags %03hX",
-      fi->data.id.load(), fi->pos.x.load(), fi->pos.z.load(), fi->drop_number, fi->flags);
+  this->log.info_f("Removed floor item {:08X} at {:g}, {:g} with drop number {} with flags {:03X}",
+      fi->data.id, fi->pos.x, fi->pos.z, fi->drop_number, fi->flags);
   return fi;
 }
 
@@ -88,7 +89,7 @@ std::unordered_set<std::shared_ptr<Lobby::FloorItem>> Lobby::FloorItemManager::e
       ret.emplace(this->remove(this->queue_for_client[z].begin()->second->data.id, 0xFF));
     }
   }
-  this->log.info("Evicted %zu items", ret.size());
+  this->log.info_f("Evicted {} items", ret.size());
   return ret;
 }
 
@@ -102,7 +103,7 @@ void Lobby::FloorItemManager::clear_inaccessible(uint16_t remaining_clients_mask
   for (uint32_t item_id : item_ids_to_delete) {
     this->remove(item_id, 0xFF);
   }
-  this->log.info("Deleted %zu inaccessible items", item_ids_to_delete.size());
+  this->log.info_f("Deleted {} inaccessible items", item_ids_to_delete.size());
 }
 
 void Lobby::FloorItemManager::clear_private() {
@@ -115,7 +116,7 @@ void Lobby::FloorItemManager::clear_private() {
   for (uint32_t item_id : item_ids_to_delete) {
     this->remove(item_id, 0xFF);
   }
-  this->log.info("Deleted %zu private items", item_ids_to_delete.size());
+  this->log.info_f("Deleted {} private items", item_ids_to_delete.size());
 }
 
 void Lobby::FloorItemManager::clear() {
@@ -125,7 +126,7 @@ void Lobby::FloorItemManager::clear() {
     queue.clear();
   }
   this->next_drop_number = 0;
-  this->log.info("Deleted %zu items", num_items);
+  this->log.info_f("Deleted {} items", num_items);
 }
 
 uint32_t Lobby::FloorItemManager::reassign_all_item_ids(uint32_t next_item_id) {
@@ -143,7 +144,7 @@ uint32_t Lobby::FloorItemManager::reassign_all_item_ids(uint32_t next_item_id) {
 
 Lobby::Lobby(shared_ptr<ServerState> s, uint32_t id, bool is_game)
     : server_state(s),
-      log(phosg::string_printf("[%s:%" PRIX32 "] ", is_game ? "Game" : "Lobby", id), lobby_log.min_level),
+      log(std::format("[{}:{:X}] ", is_game ? "Game" : "Lobby", id), lobby_log.min_level),
       lobby_id(id),
       min_level(0),
       max_level(0xFFFFFFFF),
@@ -157,6 +158,7 @@ Lobby::Lobby(shared_ptr<ServerState> s, uint32_t id, bool is_game)
       exp_share_multiplier(0.5),
       challenge_exp_multiplier(1.0f),
       random_seed(phosg::random_object<uint32_t>()),
+      rand_crypt(make_shared<DisabledRandomGenerator>()),
       drop_mode(DropMode::CLIENT),
       event(0),
       block(0),
@@ -164,10 +166,8 @@ Lobby::Lobby(shared_ptr<ServerState> s, uint32_t id, bool is_game)
       max_clients(12),
       enabled_flags(0),
       idle_timeout_usecs(0),
-      idle_timeout_event(
-          event_new(s->base.get(), -1, EV_TIMEOUT | EV_PERSIST, &Lobby::dispatch_on_idle_timeout, this),
-          event_free) {
-  this->log.info("Created");
+      idle_timeout_timer(*s->io_context) {
+  this->log.info_f("Created");
   if (is_game) {
     this->set_flag(Flag::GAME);
   }
@@ -175,7 +175,7 @@ Lobby::Lobby(shared_ptr<ServerState> s, uint32_t id, bool is_game)
 }
 
 Lobby::~Lobby() {
-  this->log.info("Deleted");
+  this->log.info_f("Deleted");
 }
 
 void Lobby::reset_next_item_ids() {
@@ -249,6 +249,12 @@ void Lobby::create_item_creator(Version logic_version) {
       throw logic_error("invalid lobby base version");
   }
 
+  shared_ptr<RandomGenerator> rand_crypt;
+  if (s->use_psov2_rand_crypt) {
+    rand_crypt = make_shared<PSOV2Encryption>(this->rand_crypt->seed());
+  } else {
+    rand_crypt = make_shared<MT19937Generator>(this->rand_crypt->seed());
+  }
   this->item_creator = make_shared<ItemCreator>(
       common_item_set,
       rare_item_set,
@@ -262,7 +268,7 @@ void Lobby::create_item_creator(Version logic_version) {
       (this->mode == GameMode::SOLO) ? GameMode::NORMAL : this->mode,
       this->difficulty,
       this->effective_section_id(),
-      this->opt_rand_crypt,
+      rand_crypt,
       this->quest ? this->quest->battle_rules : nullptr);
 }
 
@@ -290,19 +296,26 @@ uint16_t Lobby::quest_version_flags() const {
   return ret;
 }
 
+uint8_t Lobby::client_extension_flags() const {
+  for (auto lc : this->clients) {
+    if (lc && !lc->check_flag(Client::Flag::HAS_ENEMY_DAMAGE_SYNC_PATCH)) {
+      return 0x01;
+    }
+  }
+  return 0x81;
+}
+
 void Lobby::load_maps() {
   auto rare_rates = this->rare_enemy_rates ? this->rare_enemy_rates : MapState::DEFAULT_RARE_ENEMIES;
 
-  if (this->episode == Episode::EP3) {
-    this->map_state = make_shared<MapState>();
-  } else if (this->quest) {
+  if (this->quest) {
     this->map_state = make_shared<MapState>(
         this->lobby_id,
         this->difficulty,
         this->event,
         this->random_seed,
         this->rare_enemy_rates,
-        this->opt_rand_crypt,
+        this->rand_crypt,
         this->quest->get_supermap(this->random_seed));
   } else {
     auto s = this->require_server_state();
@@ -312,9 +325,13 @@ void Lobby::load_maps() {
         this->event,
         this->random_seed,
         this->rare_enemy_rates,
-        this->opt_rand_crypt,
+        this->rand_crypt,
         s->supermaps_for_variations(this->episode, this->mode, this->difficulty, this->variations));
   }
+
+  if (this->check_flag(Lobby::Flag::DEBUG)) {
+    this->map_state->print(stderr);
+  }
 }
 
 [[nodiscard]] bool Lobby::is_ep3_nte() const {
@@ -329,9 +346,9 @@ void Lobby::load_maps() {
 void Lobby::create_ep3_server() {
   auto s = this->require_server_state();
   if (!this->ep3_server) {
-    this->log.info("Creating Episode 3 server state");
+    this->log.info_f("Creating Episode 3 server state");
   } else {
-    this->log.info("Recreating Episode 3 server state");
+    this->log.info_f("Recreating Episode 3 server state");
   }
   auto tourn = this->tournament_match ? this->tournament_match->tournament.lock() : nullptr;
 
@@ -341,7 +358,7 @@ void Lobby::create_ep3_server() {
       .map_index = s->ep3_map_index,
       .behavior_flags = s->ep3_behavior_flags,
       .opt_rand_stream = nullptr,
-      .opt_rand_crypt = this->opt_rand_crypt,
+      .rand_crypt = this->rand_crypt,
       .tournament = tourn,
       .trap_card_ids = s->ep3_trap_card_ids,
   };
@@ -374,9 +391,9 @@ bool Lobby::any_client_loading() const {
     if (!lc.get()) {
       continue;
     }
-    if (lc->config.check_flag(Client::Flag::LOADING) ||
-        lc->config.check_flag(Client::Flag::LOADING_QUEST) ||
-        lc->config.check_flag(Client::Flag::LOADING_RUNNING_JOINABLE_QUEST)) {
+    if (lc->check_flag(Client::Flag::LOADING) ||
+        lc->check_flag(Client::Flag::LOADING_QUEST) ||
+        lc->check_flag(Client::Flag::LOADING_RUNNING_JOINABLE_QUEST)) {
       return true;
     }
   }
@@ -417,7 +434,7 @@ void Lobby::add_client(shared_ptr<Client> c, ssize_t required_client_id) {
     this->clients[required_client_id] = c;
     index = required_client_id;
 
-  } else if (c->config.check_flag(Client::Flag::DEBUG_ENABLED) && (this->mode != GameMode::SOLO)) {
+  } else if (c->check_flag(Client::Flag::DEBUG_ENABLED) && (this->mode != GameMode::SOLO)) {
     for (index = this->max_clients - 1; index >= min_client_id; index--) {
       if (!this->clients[index].get()) {
         this->clients[index] = c;
@@ -478,7 +495,7 @@ void Lobby::add_client(shared_ptr<Client> c, ssize_t required_client_id) {
   // On BB, we send artificial flag state to fix an Episode 2 bug where the
   // CCA door lock state is overwritten by quests.
   if (this->is_game() && (c->version() == Version::BB_V4)) {
-    c->config.set_flag(Client::Flag::SHOULD_SEND_ARTIFICIAL_FLAG_STATE);
+    c->set_flag(Client::Flag::SHOULD_SEND_ARTIFICIAL_FLAG_STATE);
   }
 
   // If the lobby is recording a battle record, add the player join event
@@ -508,17 +525,16 @@ void Lobby::add_client(shared_ptr<Client> c, ssize_t required_client_id) {
   }
 
   // There is a player in the lobby, so it is no longer idle
-  if (event_pending(this->idle_timeout_event.get(), EV_TIMEOUT, nullptr)) {
-    event_del(this->idle_timeout_event.get());
-    this->log.info("Idle timeout cancelled");
+  if (this->idle_timeout_timer.cancel()) {
+    this->log.info_f("Idle timeout cancelled");
   }
 }
 
 void Lobby::remove_client(shared_ptr<Client> c) {
   if (this->clients.at(c->lobby_client_id) != c) {
     auto other_c = this->clients[c->lobby_client_id].get();
-    throw logic_error(phosg::string_printf(
-        "client\'s lobby client id (%hhu) does not match client list (%u)",
+    throw logic_error(std::format(
+        "client\'s lobby client id ({}) does not match client list ({})",
         c->lobby_client_id,
         static_cast<uint8_t>(other_c ? other_c->lobby_client_id : 0xFF)));
   }
@@ -578,9 +594,18 @@ void Lobby::remove_client(shared_ptr<Client> c) {
       (this->idle_timeout_usecs > 0)) {
     // If the lobby is persistent but has an idle timeout, make it expire after
     // the specified time
-    auto tv = phosg::usecs_to_timeval(this->idle_timeout_usecs);
-    event_add(this->idle_timeout_event.get(), &tv);
-    this->log.info("Idle timeout scheduled");
+    this->idle_timeout_timer.expires_after(std::chrono::microseconds(this->idle_timeout_usecs));
+    this->idle_timeout_timer.async_wait([this](std::error_code ec) {
+      if (!ec) {
+        if (this->count_clients() == 0) {
+          this->log.info_f("Idle timeout expired");
+          this->require_server_state()->remove_lobby(this->shared_from_this());
+        } else {
+          this->log.error_f("Idle timeout occurred, but clients are present in lobby");
+        }
+      }
+    });
+    this->log.info_f("Idle timeout scheduled");
   }
 }
 
@@ -629,7 +654,7 @@ Lobby::JoinError Lobby::join_error_for_client(std::shared_ptr<Client> c, const s
   if (this->count_clients() >= this->max_clients) {
     return JoinError::FULL;
   }
-  bool debug_enabled = c->config.check_flag(Client::Flag::DEBUG_ENABLED);
+  bool debug_enabled = c->check_flag(Client::Flag::DEBUG_ENABLED);
   if (!this->version_is_allowed(c->version()) && !debug_enabled) {
     return JoinError::VERSION_CONFLICT;
   }
@@ -647,7 +672,7 @@ Lobby::JoinError Lobby::join_error_for_client(std::shared_ptr<Client> c, const s
       return JoinError::SOLO;
     }
     if (!debug_enabled &&
-        (this->check_flag(Flag::IS_CLIENT_CUSTOMIZATION) != c->config.check_flag(Client::Flag::IS_CLIENT_CUSTOMIZATION))) {
+        (this->check_flag(Flag::IS_CLIENT_CUSTOMIZATION) != c->check_flag(Client::Flag::IS_CLIENT_CUSTOMIZATION))) {
       return JoinError::VERSION_CONFLICT;
     }
     if (!c->login->account->check_flag(Account::Flag::FREE_JOIN_GAMES)) {
@@ -757,15 +782,15 @@ void Lobby::assign_inventory_and_bank_item_ids(shared_ptr<Client> c, bool consum
     this->next_item_id_for_client[c->lobby_client_id] = orig_next_item_id;
   }
 
-  if (c->log.info("Assigned inventory item IDs%s", consume_ids ? "" : " but did not mark IDs as used")) {
-    c->print_inventory(stderr);
+  if (c->log.info_f("Assigned inventory item IDs{}", consume_ids ? "" : " but did not mark IDs as used")) {
+    c->print_inventory();
     auto& bank = c->current_bank();
     if (p->bank.num_items) {
       bank.assign_ids(0x99000000 + (c->lobby_client_id << 20));
-      c->log.info("Assigned bank item IDs");
-      c->print_bank(stderr);
+      c->log.info_f("Assigned bank item IDs");
+      c->print_bank();
     } else {
-      c->log.info("Bank is empty");
+      c->log.info_f("Bank is empty");
     }
   }
 }
@@ -798,18 +823,6 @@ QuestIndex::IncludeCondition Lobby::quest_include_condition() const {
   };
 }
 
-void Lobby::dispatch_on_idle_timeout(evutil_socket_t, short, void* ctx) {
-  auto l = reinterpret_cast<Lobby*>(ctx)->shared_from_this();
-  if (l->count_clients() == 0) {
-    l->log.info("Idle timeout expired");
-    auto s = l->require_server_state();
-    s->remove_lobby(l);
-  } else {
-    l->log.error("Idle timeout occurred, but clients are present in lobby");
-    event_del(l->idle_timeout_event.get());
-  }
-}
-
 bool Lobby::compare_shared(const shared_ptr<const Lobby>& a, const shared_ptr<const Lobby>& b) {
   // Sort keys:
   // 1. Priority class: has free space < empty (persistent) < full < non-joinable (in quest/battle)

src/Lobby.hh

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <event2/event.h>
 #include <inttypes.h>
 
 #include <array>
@@ -135,7 +134,7 @@ struct Lobby : public std::enable_shared_from_this<Lobby> {
   std::string name;
   // This seed is also sent to the client for rare enemy generation
   uint32_t random_seed;
-  std::shared_ptr<PSOLFGEncryption> opt_rand_crypt;
+  std::shared_ptr<RandomGenerator> rand_crypt;
   uint8_t allowed_drop_modes;
   DropMode drop_mode;
   std::shared_ptr<ItemCreator> item_creator; // Always null for lobbies, never null for games
@@ -185,7 +184,7 @@ struct Lobby : public std::enable_shared_from_this<Lobby> {
   // This is only used when the PERSISTENT flag is set and idle_timeout_usecs
   // is not zero
   uint64_t idle_timeout_usecs;
-  std::unique_ptr<struct event, void (*)(struct event*)> idle_timeout_event;
+  asio::steady_timer idle_timeout_timer;
 
   Lobby(std::shared_ptr<ServerState> s, uint32_t id, bool is_game);
   Lobby(const Lobby&) = delete;
@@ -214,6 +213,7 @@ struct Lobby : public std::enable_shared_from_this<Lobby> {
   void create_item_creator(Version logic_version = Version::UNKNOWN);
   uint8_t effective_section_id() const;
   uint16_t quest_version_flags() const;
+  uint8_t client_extension_flags() const;
   void load_maps();
   void create_ep3_server();
 
@@ -287,8 +287,6 @@ struct Lobby : public std::enable_shared_from_this<Lobby> {
 
   std::unordered_map<uint32_t, std::shared_ptr<Client>> clients_by_account_id() const;
 
-  static void dispatch_on_idle_timeout(evutil_socket_t, short, void* ctx);
-
   static bool compare_shared(const std::shared_ptr<const Lobby>& a, const std::shared_ptr<const Lobby>& b);
 };
 

src/Loggers.cc

@@ -4,30 +4,47 @@
 
 using namespace std;
 
-phosg::PrefixedLogger channel_exceptions_log("[Channel] ", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger client_log("", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger command_data_log("[Commands] ", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger config_log("[Config] ", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger dns_server_log("[DNSServer] ", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger function_compiler_log("[FunctionCompiler] ", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger ip_stack_simulator_log("[IPStackSimulator] ", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger lobby_log("", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger patch_index_log("[PatchFileIndex] ", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger player_data_log("", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger proxy_server_log("[ProxyServer] ", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger replay_log("[ReplaySession] ", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger server_log("[Server] ", phosg::LogLevel::USE_DEFAULT);
-phosg::PrefixedLogger static_game_data_log("[StaticGameData] ", phosg::LogLevel::USE_DEFAULT);
+phosg::PrefixedLogger channel_exceptions_log("[Channel] ", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger client_log("", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger command_data_log("[Commands] ", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger config_log("[Config] ", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger dns_server_log("[DNSServer] ", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger function_compiler_log("[FunctionCompiler] ", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger ip_stack_simulator_log("[IPStackSimulator] ", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger lobby_log("", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger patch_index_log("[PatchFileIndex] ", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger player_data_log("", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger proxy_server_log("[ProxyServer] ", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger replay_log("[ReplaySession] ", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger server_log("[Server] ", phosg::LogLevel::L_USE_DEFAULT);
+phosg::PrefixedLogger static_game_data_log("[StaticGameData] ", phosg::LogLevel::L_USE_DEFAULT);
 
 static void set_log_level_from_json(
     phosg::PrefixedLogger& log, const phosg::JSON& d, const char* json_key) {
   try {
     string name = phosg::toupper(d.at(json_key).as_string());
-    log.min_level = phosg::enum_for_name<phosg::LogLevel>(name.c_str());
+    log.min_level = phosg::enum_for_name<phosg::LogLevel>(name);
   } catch (const out_of_range&) {
   }
 }
 
+void set_all_log_levels(phosg::LogLevel level) {
+  channel_exceptions_log.min_level = level;
+  client_log.min_level = level;
+  command_data_log.min_level = level;
+  config_log.min_level = level;
+  dns_server_log.min_level = level;
+  function_compiler_log.min_level = level;
+  ip_stack_simulator_log.min_level = level;
+  lobby_log.min_level = level;
+  patch_index_log.min_level = level;
+  player_data_log.min_level = level;
+  proxy_server_log.min_level = level;
+  replay_log.min_level = level;
+  server_log.min_level = level;
+  static_game_data_log.min_level = level;
+}
+
 void set_log_levels_from_json(const phosg::JSON& json) {
   set_log_level_from_json(channel_exceptions_log, json, "ChannelExceptions");
   set_log_level_from_json(client_log, json, "Clients");

src/Loggers.hh

@@ -18,4 +18,5 @@ extern phosg::PrefixedLogger replay_log;
 extern phosg::PrefixedLogger server_log;
 extern phosg::PrefixedLogger static_game_data_log;
 
+void set_all_log_levels(phosg::LogLevel level);
 void set_log_levels_from_json(const phosg::JSON& json);