diff --git a/.github/workflows/psprecomp-release.yml b/.github/workflows/psprecomp-release.yml index 37378a0..127f9da 100644 --- a/.github/workflows/psprecomp-release.yml +++ b/.github/workflows/psprecomp-release.yml @@ -247,4 +247,10 @@ jobs: python3 release/make_notes.py --tag "$VERSION" -o notes.md # The .sha256 / .fp files are build-time leftovers (manifest.json carries the signed hashes and fingerprints): not published, so the # asset list stays short. + # Stable-named copies of the setup files, so .../releases/latest/download/DissidiaRecomp-Setup- (the README's links) + # always reaches the newest one. The versioned files stay: manifest.json points at them. + for f in dist/DissidiaRecomp-Setup-*; do + case "$f" in *.sha256|*.fp) continue ;; esac + cp "$f" "dist/$(basename "$f" | sed -E 's/^DissidiaRecomp-Setup-[0-9][0-9.]*-/DissidiaRecomp-Setup-/')" + done find dist -type f ! -name '*.sha256' ! -name '*.fp' -print0 | xargs -0 gh release create "$VERSION" --repo "${{ github.repository }}" --title "$VERSION" --notes-file notes.md diff --git a/README.md b/README.md index 23cb8a2..49b9718 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,33 @@ -# Dissidia 012 Duodecim: native port and modding toolset +# Dissidia 012 Duodecim Recompiled -Dissidia 012 Duodecim (PSP) running natively on the Steam Deck and Linux, no emulator, plus modding tools for adding new characters, swapping character models and creating new effects and animations. The native build is called **Dissidia Trēdecim**. +Dissidia 012 Duodecim (PSP) recompiled into a native PC and Android game: no emulator. It runs at up to 240 fps, with HD textures, +ray-traced lighting and reflections, Japanese voices, cloud saves, online multiplayer and its own modding tools for new characters. -You need your own copy of the game as an `.iso` or `.cso`. The European PSN release (`ULES01505`) is the one it was built against; the US UMD (`ULUS10566`) works too. +You need **your own copy of the game** as an `.iso` or `.cso` file. Nothing from the game is included here or in the downloads: the +installer builds the game on your device from your disc. -**Put it at `~/dissidia/game.iso`**: make a `dissidia` folder in your home folder and copy the game into it, named `game.iso`. Every command below uses that path. A `.cso` can be named `game.iso` too; it is recognised by its contents. +## Install -## Install and play +Download **one** file for your device. These links always point at the newest release. -### Prebuilt release (Windows, Linux, Android) +| Your device | Download | +|---|---| +| **Windows** PC | [DissidiaRecomp-Setup-windows-x86_64.exe](https://github.com/schindlershadow/dissidia/releases/latest/download/DissidiaRecomp-Setup-windows-x86_64.exe) | +| **Linux** PC / **Steam Deck** | [DissidiaRecomp-Setup-linux-x86_64](https://github.com/schindlershadow/dissidia/releases/latest/download/DissidiaRecomp-Setup-linux-x86_64) | +| **Android** phone / handheld | [DissidiaRecomp-Setup-android.apk](https://github.com/schindlershadow/dissidia/releases/latest/download/DissidiaRecomp-Setup-android.apk) | -Download the latest **Dissidia Recomp** from the [Releases page](https://github.com/schindlershadow/dissidia/releases): a single-file setup (`DissidiaRecomp-Setup-...-windows-x86_64.exe` or `...-linux-x86_64`) that asks for your game file, builds nothing locally and installs the game, with in-app update checks against a signed manifest. Each release lists its changes. Installer details: [psprecomp/docs/installer.md](psprecomp/docs/installer.md). On Android, the release APK has touch controls with an editable layout. The steps below build from source instead. +Then: -### What the runtime adds +1. **Run it.** + - Windows: double-click the `.exe`. If SmartScreen warns you, click **More info > Run anyway**. + - Linux / Steam Deck (Desktop Mode): right-click the file > Properties > Permissions > tick **Is executable**, then double-click it. + Or in a terminal: `chmod +x DissidiaRecomp-Setup-linux-x86_64 && ./DissidiaRecomp-Setup-linux-x86_64` + - Android: open the `.apk` and allow your browser or file manager to install apps when asked. +2. **Pick your game file** (`.iso` or `.cso`) when the setup asks for it. +3. **Choose your extras** (all optional): HD textures, Japanese voices (needs an undub disc image), importing saves, and **Add to Steam**. +4. **Wait while it builds.** It translates your copy of the game and compiles it: a few minutes to half an hour depending on the machine. + Keep the device plugged in and awake. +5. **Play.** Use the shortcut the setup made (Start Menu, application menu, Steam or your Android home screen). - **Frame rates** above the PSP's 30: any multiple of 30 up to 240, with game logic, UI and EX Burst timing scaled to match ([docs/frame-rate.md](psprecomp/games/dissidia/docs/frame-rate.md)). - **HD textures** from community packs (on by default when present) and **undub audio** (Japanese voices and movies extracted from an undub disc) ([texture packs](psprecomp/games/dissidia/docs/texture-packs.md), [audio](psprecomp/games/dissidia/docs/audio.md)). @@ -21,107 +36,108 @@ Download the latest **Dissidia Recomp** from the [Releases page](https://github. - **Cross-region saves** and **internet multiplayer** (below). - A headless battle test harness for checking moves at different frame rates ([docs/testing.md](psprecomp/games/dissidia/docs/testing.md)). -### Steam Deck +Something went wrong? The setup writes `setup.log` into the install folder: attach it to a +[bug report](https://github.com/schindlershadow/dissidia/issues). -No terminal needed. In Desktop Mode (Steam button > Power > Switch to Desktop): +All releases and their change notes: [Releases page](https://github.com/schindlershadow/dissidia/releases). -1. On GitHub, open `psprecomp/games/dissidia/tools/deck_gui.sh` and click **Download raw file**. It lands in your Downloads folder. -2. In Dolphin, right-click it > Properties > Permissions > tick **Is executable**. Then double-click it and choose **Execute**. -3. Follow the dialogs. It downloads the project into `~/dissidia/repo`, asks for your game file (`.iso` or `.cso`, from the Deck, an SD card or a USB stick; it is placed at `~/dissidia/game.iso`), builds the game with a progress bar and adds **Dissidia Trēdecim** to Steam. +### Which game file works -Then switch back to Game Mode and start **Dissidia Trēdecim** from your library. +The European PSN release (`ULES01505`) is the one the project is built against; the US UMD (`ULUS10566`) works too. `.iso` and `.cso` +are read directly. Other formats (ZSO, DAX, `.bin`, PSN `.PBP`) need converting to `.iso` first, for example with +`maxcso --decompress`. -The tool leaves a **Dissidia Trēdecim Setup** icon on the desktop and in the application menu (Games). Double-click it to **Update** (latest code and mods, only what changed is rebuilt), change the look (Retro or Crisp), check the Deck is ready, or read the last log. If you already have `~/dissidia/repo` from before, the downloaded tool brings it up to date and carries on from there. +## Features -Prefer the terminal? `deck_gui.sh` is a front end for `deck_setup.sh`; the same in Konsole: +- **High frame rates**: any multiple of 30 up to 240 fps, with game logic, UI and EX Burst timing scaled to match + ([details](psprecomp/games/dissidia/docs/frame-rate.md)). +- **Any resolution and screen shape**: render scale, widescreen, ultrawide and tall / folding-phone screens with the HUD moved to the edges. +- **HD textures**: LiinkPK's hand-retouched pack or an AI-upscaled pack, picked in the setup + ([texture packs](psprecomp/games/dissidia/docs/texture-packs.md)). +- **Better lighting**: ray-traced shadows and reflections (Vulkan with a ray-tracing GPU), attacks that light up the stage, SSAO, HDR and anti-aliasing. +- **Japanese voices and movies** from an undub disc ([audio](psprecomp/games/dissidia/docs/audio.md)). +- **Cloud save sync** between your devices through a folder, WebDAV or Google Drive + ([cloud sync](psprecomp/games/dissidia/docs/cloud-sync.md)). +- **Saves from any region**: a US, European or Japanese save works with any disc ([savedata](psprecomp/games/dissidia/docs/savedata.md)). +- **Online multiplayer** (experimental), below. +- **Controllers, keyboard and touch**: gamepads work out of the box; Android has touch controls with an editable layout. +- **Settings in the game**: from the title screen, the start menu or the battle pause menu. +- **New characters and moves**: the Move Studio and Blender add-on, below. -```bash -cd ~/dissidia -git clone https://github.com/dissidia-fan/dissidia repo -repo/psprecomp/games/dissidia/tools/deck_setup.sh ~/dissidia/game.iso --install-distrobox --add-to-steam -``` +### Controls -and to update: `~/dissidia/repo/psprecomp/games/dissidia/tools/deck_setup.sh ~/dissidia/game.iso --update` +Gamepads work out of the box. Keyboard: arrow keys to move, **X / Z / A / S** for the face buttons, **Q / W** for the shoulders, +**Space** = Start, **Tab** = Select, **Esc** = Settings (or **Guide** / **L3 + R3** on a pad). -Controls, display options, troubleshooting: [docs/steamdeck.md](psprecomp/games/dissidia/docs/steamdeck.md). +## Multiplayer (experimental) -### Linux PC +Communications mode works over the internet instead of PSP ad-hoc WiFi. The game connects to a party server, so there is no port to +forward: open Communications mode and everyone in the same room shows up in the lobby. The default room is public; set your own room +name under Settings > Network to play with friends only. A LAN mode is on the same page. -Ubuntu/Debian; about 8 GB of disk needed. First put your game at `~/dissidia/game.iso` (a folder called `dissidia` in your home folder, the file renamed `game.iso`). Then, in a terminal: +So far a full match has been played between two copies on one machine; more than two players, real LANs and long distances are untested, +and high latency may make a match unplayable. Everyone in a session runs at the lowest frame rate any player chose. +More: [multiplayer.md](psprecomp/games/dissidia/docs/multiplayer.md). -```bash -git clone https://github.com/dissidia-fan/dissidia ~/dissidia/repo -~/dissidia/repo/psprecomp/games/dissidia/tools/install.sh ~/dissidia/game.iso -``` +## Making characters -The last command does everything: installs the build tools (it asks for your password for `apt`) and Rust, extracts and decrypts the game, and compiles it. It takes a while (tens of minutes; add `--jobs 2` if it runs out of memory). If it stops part-way, run it again; finished steps are skipped. Then play with `~/dissidia/work/play.sh`. +A character is one folder in `mods/`: its menu pictures, moves and models as files you can read and edit. Added characters only run in +this native build (on a PSP or in PPSSPP only changes to the game's own characters work). -To update later: `~/dissidia/repo/psprecomp/games/dissidia/tools/install.sh ~/dissidia/game.iso --update` +1. **Start in the Move Studio.** Open `studio/index.html`, set the mods folder and your game ISO, then pick **+ New character…**. Give + them a name, a series and the retail character they are built on (its skeleton, animations, voice and moves are the starting point). +2. **Make their moves**: copy moves from any character, place events on the timeline, tune each hit's damage and knock-back, edit the + effects, and press **Save**. The **Character** tab sets the name, slot and menu pictures. +3. **Give them a body and animations** in Blender with the add-on: import the character from its folder, model or retarget, then + **Save moves to folder**. +4. **Play.** Every folder in `mods/` is built in when the game starts, and the new character is on the Quick Battle grid. Delete the + folder (or set `"enabled": false` in its `mod.json`) to take them out. +5. **Share** by zipping the folder. It holds data only, no scripts; anything borrowed from the retail game is read from the other + player's own disc. -Gamepads work out of the box. Keyboard: arrows, X/Z/A/S for the face buttons, Q/W shoulders, Space = Start, Tab = Select. Saves are in `~/dissidia/work/ms0/PSP/SAVEDATA/`. +To change one of the game's own characters, pick them in the Studio, edit, and press **Save as mod**. Up to 6 characters can be added. -### Mac +More: [mods/README.md](mods/README.md) (folder layout, command-line tools), [studio/README.md](studio/README.md) (the Move Studio), +[blender/README.md](blender/README.md) (the Blender add-on), [docs/](psprecomp/games/dissidia/docs/README.md) (roster, formats, events, +audio, how the build works). -Needs [Homebrew](https://brew.sh); about 8 GB of disk. First put your game at `~/dissidia/game.iso` (a folder called `dissidia` in your home folder, the file renamed `game.iso`). Then, in Terminal: +## Building from source + +Most people should use the installer above. To build from a checkout instead (Linux or macOS, about 8 GB of disk), put your game at +`~/dissidia/game.iso`, then: ```bash -git clone https://github.com/dissidia-fan/dissidia ~/dissidia/repo +git clone https://github.com/schindlershadow/dissidia ~/dissidia/repo ~/dissidia/repo/psprecomp/games/dissidia/tools/install.sh ~/dissidia/game.iso ``` -The last command does everything: installs the build tools with Homebrew and Rust, extracts and decrypts the game, and compiles it. If Apple's command line tools are missing it opens their installer first; run the command again when that finishes. It takes a while (tens of minutes). If it stops part-way, run it again; finished steps are skipped. Then play with `~/dissidia/work/play.sh`. - -To update later: `~/dissidia/repo/psprecomp/games/dissidia/tools/install.sh ~/dissidia/game.iso --update` - -Gamepads work out of the box. Keyboard: arrows, X/Z/A/S for the face buttons, Q/W shoulders, Space = Start, Tab = Select. Saves are in `~/dissidia/work/ms0/PSP/SAVEDATA/`. - -Character mod folders in `mods/` are built and loaded every time the game starts. What each step does and every runtime option: [docs/native-build.md](psprecomp/games/dissidia/docs/native-build.md). - -## Multiplayer (experimental) +It installs the build tools (with `apt` or Homebrew, plus Rust), extracts and decrypts the game and compiles it; if it stops part-way, run +it again. Play with `~/dissidia/work/play.sh`; update with the same command plus `--update`. Every step and runtime option: +[native-build.md](psprecomp/games/dissidia/docs/native-build.md). The installer and release pipeline: +[installer.md](psprecomp/docs/installer.md). Android builds: [android.md](psprecomp/docs/android.md). -Communications mode works over the internet instead of PSP ad-hoc WiFi. By default the game connects to a party server (`party.schindlershadow.com`), so there is nothing to forward: open Communications mode, and everyone in the same room appears in the lobby (the default is the public room; set a room name under Esc > Network to play with friends only). A LAN mode (players on one network, or listed by address) is on the same page. A full match has been played between two copies on one machine; it is untested with more than two players, on a real LAN between machines, and over the internet, and nothing here delays input, so high latency may make a match unplayable. In a session everyone runs at the lowest frame rate any player chose. Setup, options, the server and how it works: [docs/multiplayer.md](psprecomp/games/dissidia/docs/multiplayer.md). +## About -## Saves from other regions +This started as a fork of [PSPRecomp](https://github.com/wizardengineer/psprecomp) (a static recompiler and runtime for PSP games) and has +grown into its own project; everything Dissidia-specific lives in `psprecomp/games/dissidia/`. It was developed with heavy use of an AI +assistant (Claude, by Anthropic), which did most of the reverse engineering and wrote most of the code, under my direction and testing. +Findings in the docs carry a confidence (confirmed / inferred / medium / low); inferred ones are educated guesses from disassembly. -A save from the US, European or Japanese disc works with any of them. `savemgr` lists the saves in a PSP memory stick or PPSSPP folder, imports them into your install under your disc's ID, and exports yours for another region: `savemgr import --from --workdir ~/dissidia/work`. It only renames the folder and signs `PARAM.SFO` again; the game data is copied untouched. Details and the real-PSP caveat: [docs/savedata.md](psprecomp/games/dissidia/docs/savedata.md). - -## What is not in this repository -No game data (bring your own ISO), no character mods (`mods/_template/` shows the layout), no texture packs (the loader works with the community packs credited below), no third-party mod ports, no game artwork. - -## Making characters - -A character is one folder in `mods/`: its menu pictures, moves and models as files you can read and edit. You need the native build working first (above), since added characters only run there; on a PSP or in PPSSPP only changes to the game's own characters work. - -1. **Start in the Dissidia Move Studio.** Open `studio/index.html`, set the mods folder (the repo's `mods`) and your game ISO, then pick **+ New character…** at the top of the character list. Give them a name, a series and the retail character it is built on (its skeleton, animations, voice and moves are the starting point), and optionally a full-body picture for the menus. -2. **Make their moves** in the Studio: copy moves from any retail or mod character, place events on the timeline, tune each hit's damage and knock-back, edit the effects, and press **Save**. The **Character** tab sets the name, slot and how the menu pictures are cropped. -3. **Give them a body and animations** in Blender with the add-on: import the character from its mod folder, model or retarget, then **Save moves to folder**. Back in the Studio, **Reload** and point moves at the new animations. -4. **Play.** Start the game: every folder in `mods/` is built in before it runs, and the new character is on the Quick Battle grid. Deleting a folder (or `"enabled": false` in its `mod.json`) takes the character out again. -5. **Share** by zipping the folder. It holds data only, no scripts, and whoever gets it unzips it into their own `mods/`; anything it borrows from the retail game is read from their own disc. - -To change one of the game's own characters instead, pick them in the Studio (with the ISO set), edit, and press **Save as mod**. - -Up to 6 characters can be added: the character select screens have no room for a 7th for now. - -More detail: -- [mods/README.md](mods/README.md): what is in a character folder, the command-line tools, sharing. -- [studio/README.md](studio/README.md): the Move Studio, panel by panel. -- [blender/README.md](blender/README.md): installing and using the Blender add-on. -- [docs/](psprecomp/games/dissidia/docs/README.md): everything else (roster, formats, events, audio, how the native build was made). - -## Layout -`psprecomp/` is a fork of [PSPRecomp](https://github.com/wizardengineer/psprecomp) (static recompiler + runtime). Everything Dissidia-specific is in `psprecomp/games/dissidia/`. - -Findings in the docs carry a confidence (confirmed / inferred / medium / low); inferred ones are educated guesses from disassembly, not tested facts. Corrections welcome. The project was developed with heavy use of an AI assistant (Claude, by Anthropic), which did most of the reverse engineering and wrote most of the code, under my direction and testing. +Not in this repository: game data (bring your own disc), texture packs (downloaded by the setup from their authors' releases), +third-party mod ports and game artwork. ## Credits -- [PSPRecomp](https://github.com/wizardengineer/psprecomp): the recompiler and runtime this is forked from (GPL-2.0). + +- [PSPRecomp](https://github.com/wizardengineer/psprecomp): the recompiler and runtime this project grew from (GPL-2.0). - [PPSSPP](https://github.com/hrydgard/ppsspp): VFPU maths (`psprecomp/runtime/src/vfpu_ppsspp`, GPL-2.0+), and the emulator used for every comparison and trace. - [DissDlcToolkit](https://github.com/adriangl/DissDlcToolkit) (adriangl): the object-table format and the DLC route. - [dissidia-012-sora](https://github.com/MatNyaga/dissidia-012-sora) (MatNyaga): notes on effect-package ids and CPU AI. -- D012FFRT and [LiinkPK/Dissidia-012-HD-Textures](https://github.com/LiinkPK/Dissidia-012-HD-Textures) (LiinkPK, ajb3art): HD texture packs. Not included. +- D012FFRT and [LiinkPK/Dissidia-012-HD-Textures](https://github.com/LiinkPK/Dissidia-012-HD-Textures) (LiinkPK, ajb3art): HD texture packs. - [atracdenc](https://github.com/dcherednik/atracdenc): ATRAC3 encoding for new BGM. - Fonts: Cinzel and Crimson Text (SIL Open Font License). - Everyone in the Dissidia modding community without whom this work could never have happened. ## Licence -`psprecomp/` is GPL-2.0 (see `psprecomp/LICENSE`), and so are the changes made to it here. Dissidia 012 Duodecim and Final Fantasy are trademarks of Square Enix; this project is not affiliated with or endorsed by Square Enix. + +GPL-2.0 (see `psprecomp/LICENSE`). Dissidia 012 Duodecim and Final Fantasy are trademarks of Square Enix; this project is not affiliated +with or endorsed by Square Enix. diff --git a/psprecomp/games/dissidia/docs/steamdeck.md b/psprecomp/games/dissidia/docs/steamdeck.md index 0917ab8..b0d9b75 100644 --- a/psprecomp/games/dissidia/docs/steamdeck.md +++ b/psprecomp/games/dissidia/docs/steamdeck.md @@ -69,7 +69,7 @@ if it was downloaded on its own). * **First run.** If it is not inside a checkout (downloaded from GitHub on its own), it clones the project into `~/dissidia/repo`, asking for the address (prefilled). An existing `~/dissidia/repo` that predates the tool is pulled first. Then it starts the copy inside the checkout. -* **Icons.** Every start writes a "Dissidia Trēdecim Setup" launcher to the desktop and to +* **Icons.** Every start writes a "Dissidia 012 Duodecim Recompiled Setup" launcher to the desktop and to `~/.local/share/applications` (Games), pointing at the checkout's copy, with the Steam icon. * **Install** asks for the game file if `~/dissidia/game.iso` is missing (checks it is an ISO9660 or CSO image; hard-links it when it is on the same drive, copies it with a progress bar otherwise, e.g. from an SD card), then @@ -228,7 +228,7 @@ In Desktop Mode (Konsole): (or add `--add-to-steam` to a full or `--update` run). `steam_shortcut.py` then, for every Steam account on the Deck: -* adds a non-Steam shortcut to `~/dissidia/work/play.sh` named **Dissidia Trēdecim**, or renames the entry that is +* adds a non-Steam shortcut to `~/dissidia/work/play.sh` named **Dissidia 012 Duodecim Recompiled**, or renames the entry that is already there for this launcher (an older `play.sh` / `run.sh` / `run.py` / "Dissidia 012 (native)" entry, or any entry pointing into `~/dissidia`), keeping its play time, collections and Launch Options; duplicates are removed. The first change backs up `shortcuts.vdf` to `shortcuts.vdf.before-tredecim` (same folder); @@ -241,7 +241,7 @@ close it (`steam -shutdown`), makes the change and starts Steam again. It refuse Re-running it is harmless (it updates the same entry); after new artwork is pulled, run the same command again. Then: controller (below), return to Game Mode (the "Return to Gaming Mode" icon on the desktop) and start -Dissidia Trēdecim from the library. Do not force a Proton compatibility tool on it; this is a native Linux program. +Dissidia 012 Duodecim Recompiled from the library. Do not force a Proton compatibility tool on it; this is a native Linux program. Launch Options (`--crisp` etc.) are set in the entry's Properties as before. By hand instead: Desktop Mode, Steam: Games > Add a Non-Steam Game to My Library > Browse, filter "All files", pick @@ -249,7 +249,7 @@ By hand instead: Desktop Mode, Steam: Games > Add a Non-Steam Game to My Library artwork (the files in `games/dissidia/steam/`). The artwork is the game's own: `steam_art.py` takes the PSP's XMB background (`PIC1.PNG`, the crystal sea), -paints out its "Duodecim 012" logo and sets the DISSIDIA / TRĒDECIM title over it in Cinzel (SIL OFL, +paints out its "Duodecim 012" logo and sets the DISSIDIA / DUODECIM RECOMPILED title over it in Cinzel (SIL OFL, `games/dissidia/steam/fonts`). It is drawn once on the Mac and the results are committed, so the Deck needs no Pillow. To redraw: diff --git a/psprecomp/games/dissidia/tools/deck_gui.sh b/psprecomp/games/dissidia/tools/deck_gui.sh index 17d2711..84cbb10 100755 --- a/psprecomp/games/dissidia/tools/deck_gui.sh +++ b/psprecomp/games/dissidia/tools/deck_gui.sh @@ -1,20 +1,20 @@ #!/usr/bin/env bash -# Dissidia Trēdecim on the Steam Deck without a terminal: a point-and-click front end for deck_setup.sh. +# Dissidia 012 Duodecim Recompiled on the Steam Deck without a terminal: a point-and-click front end for deck_setup.sh. # # In Desktop Mode, double-click it in Dolphin and choose Execute. Everything is a dialog (zenity, or kdialog): # * first run: if this file is on its own (downloaded from GitHub), it downloads the project into ~/dissidia/repo, # asking for your GitHub login in a dialog if the repository is private; # * Install: pick your game file (linked or copied to ~/dissidia/game.iso), build with a progress bar (the Deck is -# kept awake while it builds), and add "Dissidia Trēdecim" to Steam with its artwork; +# kept awake while it builds), and add "Dissidia 012 Duodecim Recompiled" to Steam with its artwork; # * Update: pull the latest code and mods, rebuild what changed, refresh the Steam entry; # * Look (Retro / Crisp), Check (deck_setup.sh --check) and the last log. -# It puts a "Dissidia Trēdecim Setup" icon on the desktop and in the application menu (Games), so later runs are one +# It puts a "Dissidia 012 Duodecim Recompiled Setup" icon on the desktop and in the application menu (Games), so later runs are one # double-click. Underneath it is deck_setup.sh with the usual flags; its output goes to ~/dissidia/work/setup.log. # # Options (mainly for testing): --repo-url URL (first download), --base DIR (default ~/dissidia). set -uo pipefail -APP="Dissidia Trēdecim" +APP="Dissidia 012 Duodecim Recompiled" BASE="$HOME/dissidia" REPO_URL="https://github.com/schindlershadow/dissidia" SELF="$(readlink -f "${BASH_SOURCE[0]}")" diff --git a/psprecomp/games/dissidia/tools/deck_setup.sh b/psprecomp/games/dissidia/tools/deck_setup.sh index 499877a..5338a51 100755 --- a/psprecomp/games/dissidia/tools/deck_setup.sh +++ b/psprecomp/games/dissidia/tools/deck_setup.sh @@ -9,7 +9,7 @@ # --dry-run print the commands that would run, without running them # --install-distrobox if distrobox is missing, install it into ~/.local (downloads the official install # script from https://raw.githubusercontent.com/89luca89/distrobox/main/install) -# --add-to-steam when finished, put the launcher in the Steam library as "Dissidia Trēdecim" with its artwork +# --add-to-steam when finished, put the launcher in the Steam library as "Dissidia 012 Duodecim Recompiled" with its artwork # (steam_shortcut.py: capsule, banner, hero, logo, icon; an earlier entry for this launcher is # renamed in place, keeping play time and Launch Options). Steam is closed for a moment and # started again if it is running. Desktop Mode only. @@ -233,7 +233,7 @@ echo "+ write $LAUNCH" if [ "$DRY" = 0 ]; then cat > "$LAUNCH" < "$LAUNCH" </PSP_GAME/PIC1.PNG [--out DIR] @@ -15,7 +15,7 @@ (steam_shortcut.py), so it needs no Pillow. Art: the game's own XMB background (PIC1.PNG, the crystal sea) with its "Duodecim 012" logo painted out, enlarged -and softened, plus the DISSIDIA / TRĒDECIM title. Title font: Cinzel (SIL OFL, fonts/ next to the output folder). +and softened, plus the DISSIDIA / DUODECIM RECOMPILED title. Title font: Cinzel (SIL OFL, fonts/ next to the output folder). Requires Pillow and numpy. """ import argparse @@ -33,7 +33,7 @@ HERE = os.path.dirname(os.path.abspath(__file__)) STEAM = os.path.normpath(os.path.join(HERE, "..", "steam")) FONTS = os.path.join(STEAM, "fonts") -TITLE, SUBTITLE = "DISSIDIA", "TRĒDECIM" +TITLE, SUBTITLE = "DISSIDIA", "DUODECIM RECOMPILED" # ------------------------------------------------------------------ background @@ -139,7 +139,7 @@ def _spaced_w(text, font, tracking): def title_block(width, ss=3): - """The title as an RGBA image `width` px wide (height follows): DISSIDIA in a gold bevel over TRĒDECIM in silver, + """The title as an RGBA image `width` px wide (height follows): DISSIDIA in a gold bevel over the subtitle in silver, letterspaced between two fine rules. Drawn at `ss`x and reduced for clean edges.""" W = width * ss big = _font("CinzelDecorative-Bold.ttf", 10) @@ -153,11 +153,15 @@ def title_block(width, ss=3): px += 4 big = _font("CinzelDecorative-Bold.ttf", px) sub_px = int(px * 0.34) - sub = _font("Cinzel-Bold.ttf", sub_px) - tr_sub = sub_px * 0.55 + while True: # shrink a long subtitle until it and its rules fit + sub = _font("Cinzel-Bold.ttf", sub_px) + tr_sub = sub_px * 0.55 + if _spaced_w(SUBTITLE, sub, tr_sub) + 2 * (sub_px * 0.9 + W * 0.16) <= W * 0.98 or sub_px <= 8: + break + sub_px -= 2 asc_b = big.getbbox(TITLE) - asc_s = sub.getbbox("TREDECIM") - mac = sub.getbbox("Ē") + asc_s = sub.getbbox(SUBTITLE) + mac = asc_s top_pad = int(px * 0.12) h_big = asc_b[3] - asc_b[1] gap = int(px * 0.20) diff --git a/psprecomp/games/dissidia/tools/steam_shortcut.py b/psprecomp/games/dissidia/tools/steam_shortcut.py index 280e5de..91482a1 100755 --- a/psprecomp/games/dissidia/tools/steam_shortcut.py +++ b/psprecomp/games/dissidia/tools/steam_shortcut.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -"""steam_shortcut.py - put the native build in the Steam library as "Dissidia Trēdecim", with its artwork. +"""steam_shortcut.py - put the native build in the Steam library as "Dissidia 012 Duodecim Recompiled", with its artwork. steam_shortcut.py [--name NAME] [--art DIR] [--match-dir DIR ...] [--launch-options OPTS] [--steam-dir DIR] [--yes] [--dry-run] @@ -32,8 +32,9 @@ HERE = os.path.dirname(os.path.abspath(__file__)) DEFAULT_ART = os.path.normpath(os.path.join(HERE, "..", "steam")) -NAME = "Dissidia Trēdecim" -OLD_NAMES = {"play.sh", "run.sh", "run.py", "dissidia 012 (native)", "dissidia 012", "dissidia"} +NAME = "Dissidia 012 Duodecim Recompiled" +OLD_NAMES = {"play.sh", "run.sh", "run.py", "dissidia 012 (native)", "dissidia 012", "dissidia", + "dissidia trēdecim"} # the old name: renamed in place, play time kept ART = (("capsule.png", "{id}p.png"), ("wide.png", "{id}.png"), ("hero.png", "{id}_hero.png"), ("logo.png", "{id}_logo.png"), ("icon.png", "{id}_icon.png")) LOGO_POS = {"nVersion": 1, "logoPosition": {"pinnedPosition": "BottomLeft", "nWidthPct": 42, "nHeightPct": 60}} diff --git a/psprecomp/release/make_notes.py b/psprecomp/release/make_notes.py index 2b457f3..61f6756 100644 --- a/psprecomp/release/make_notes.py +++ b/psprecomp/release/make_notes.py @@ -22,13 +22,13 @@ INSTALL = """## Download ONE file | Your device | Download this | |---|---| -| Windows PC | `DissidiaRecomp-Setup-{v}-windows-x86_64.exe` | -| Linux PC | `DissidiaRecomp-Setup-{v}-linux-x86_64` (`chmod +x` it, then run it) | -| Android phone / handheld | `DissidiaRecomp-Setup-{v}-android.apk` | +| Windows PC | `DissidiaRecomp-Setup-windows-x86_64.exe` | +| Linux PC | `DissidiaRecomp-Setup-linux-x86_64` (`chmod +x` it, then run it; also for the Steam Deck) | +| Android phone / handheld | `DissidiaRecomp-Setup-android.apk` | Run it and follow the wizard. You need your own copy of the game (ISO or CSO); the wizard writes `setup.log` into the install folder, so attach that to bug reports. -The other files (`.tar.xz`, `.zip`, `manifest.json`, `manifest.json.sig`) are what the in-app updater downloads. You do not need them, unless you would rather unpack the Windows / Linux release by hand. +The other files (`DissidiaRecomp-Setup-{v}-*` are the same setups with the version in the name; `.tar.xz`, `.zip`, `manifest.json`, `manifest.json.sig`) are what the in-app updater downloads. You do not need them, unless you would rather unpack the Windows / Linux release by hand. """ # Titles / commit subjects that are about the project's own tooling, not the game a player runs.