Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/psprecomp-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-<platform> (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
172 changes: 94 additions & 78 deletions README.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions psprecomp/games/dissidia/docs/steamdeck.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -241,15 +241,15 @@ 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
`~/dissidia/work/play.sh`; then Properties > name it, and set the pictures with right-click > Manage > Set custom
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:

Expand Down
8 changes: 4 additions & 4 deletions psprecomp/games/dissidia/tools/deck_gui.sh
Original file line number Diff line number Diff line change
@@ -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]}")"
Expand Down
8 changes: 4 additions & 4 deletions psprecomp/games/dissidia/tools/deck_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -233,7 +233,7 @@ echo "+ write $LAUNCH"
if [ "$DRY" = 0 ]; then
cat > "$LAUNCH" <<EOF
#!/usr/bin/env bash
# Dissidia Trēdecim (the native Dissidia 012 build) launcher: runs the game inside the '$NAME' container. This file
# Dissidia 012 Duodecim Recompiled (the native Dissidia 012 build) launcher: runs the game inside the '$NAME' container. This file
# is what the Steam entry starts (deck_setup.sh --add-to-steam, see games/dissidia/docs/steamdeck.md).
# Written by deck_setup.sh.
#
Expand Down Expand Up @@ -262,7 +262,7 @@ EOF
fi
}
add_to_steam() {
# The Steam entry ("Dissidia Trēdecim") and its library artwork; host python3, standard library only.
# The Steam entry ("Dissidia 012 Duodecim Recompiled") and its library artwork; host python3, standard library only.
local args=("$WORK/play.sh" --art "$HERE/../steam" --match-dir "$WORK" --match-dir "$(dirname "$REPO")")
[ "$DRY" = 0 ] || args+=(--dry-run)
[ "$CLOSE_STEAM" = 0 ] || args+=(--yes)
Expand Down Expand Up @@ -374,6 +374,6 @@ LAUNCH="$WORK/play.sh"
cat <<EOF

Done. Play from Desktop Mode with: $LAUNCH (look: $PRESET; "$LAUNCH --retro" or "--crisp" for the other)
Add it to Steam (Game Mode): $0 --launcher-only --add-to-steam (as "Dissidia Trēdecim", with artwork)
Add it to Steam (Game Mode): $0 --launcher-only --add-to-steam (as "Dissidia 012 Duodecim Recompiled", with artwork)
Saves: $WORK/ms0/PSP/SAVEDATA (back this folder up)
EOF
2 changes: 1 addition & 1 deletion psprecomp/games/dissidia/tools/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ step "Python packages for the character mods"
LAUNCH="$WORK/play.sh"
cat > "$LAUNCH" <<EOS
#!/usr/bin/env bash
# Dissidia Trēdecim launcher, written by install.sh. Any run.sh flag works: --crisp, --fullscreen, --swap-ab ...
# Dissidia 012 Duodecim Recompiled launcher, written by install.sh. Any run.sh flag works: --crisp, --fullscreen, --swap-ab ...
exec "$HERE/run.sh" "$WORK" "\$@"
EOS
chmod +x "$LAUNCH"
Expand Down
20 changes: 12 additions & 8 deletions psprecomp/games/dissidia/tools/steam_art.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
"""steam_art.py - draw the Steam library artwork for the native build ("Dissidia Trēdecim").
"""steam_art.py - draw the Steam library artwork for the native build ("Dissidia 012 Duodecim Recompiled").

steam_art.py --pic1 <disc0>/PSP_GAME/PIC1.PNG [--out DIR]

Expand All @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
7 changes: 4 additions & 3 deletions psprecomp/games/dissidia/tools/steam_shortcut.py
Original file line number Diff line number Diff line change
@@ -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 <launcher> [--name NAME] [--art DIR] [--match-dir DIR ...] [--launch-options OPTS]
[--steam-dir DIR] [--yes] [--dry-run]
Expand Down Expand Up @@ -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}}
Expand Down
8 changes: 4 additions & 4 deletions psprecomp/release/make_notes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading