mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 19:39:57 -04:00
Add a Mods screen to the launcher and build the mods' code patches into the launcher's game.
Mods, on the home screen, opens the game's mods folder, adds a downloaded mod from its .zip, .7z or .rar file or its folder, switches each mod on or off, and sets the load order (mods_disabled and mods_order in nx2navi.ini, written as the game writes them). Each mod's description says what it changes, which other mod changes the same files and which of the two wins, and why the game leaves it off when it does. Before the game starts, Play puts the mods folder in order (launcher/mods.py prepare): an archive in it is unpacked into a folder of its name and kept, a mod whose files sit a folder or more down has them moved up, and a romfs, exefs or cheats folder put straight into the mods folder becomes a mod of its own. An archive that would write outside its folder is refused, and nothing is deleted. The launcher's build (tools/make_game.py) left the mods' code cheats and ExeFS patch files out, so those mods stayed off. The lift now turns them into patch sets first, as the setup does, with the files in the lift's key and build-cache/mod-code.json recording what it took up. Play builds the game again before it starts when an enabled mod brings code no build has seen. The shaders' key names the lift and the compile without the mods' code, so such a build compiles only what the patches change and leaves the shaders prepared. tools/mod_files.py is the one place the tools, the build and the launcher find a mod's parts. Tested: a zipped mod holding its own folder, put into a mods folder, was unpacked and moved up by the launcher's code, and the game served its file in place of the game's. The lifter took a code cheat and a pchtxt patch made for the game's main as patch sets. The launcher's and the setup's tests pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -30,7 +30,7 @@ hash: the same over the cheat's words, so the runtime sees an edited cheat that
|
||||
A code cheat that calls or jumps into a code cave it writes (words where main has zeros) gets the cave's body inlined
|
||||
at the call site; a conditional skip of one store in the body (cbz wN, +8; str wN, ...) is dropped.
|
||||
|
||||
Standard library and recomp/ only.
|
||||
Standard library, recomp/ and tools/mod_files.py only.
|
||||
"""
|
||||
import argparse
|
||||
import struct
|
||||
@@ -38,9 +38,11 @@ import sys
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / 'recomp'))
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent))
|
||||
import flags # noqa: E402
|
||||
from lifter import Lifter, Unsupported # noqa: E402
|
||||
from nso import Nso # noqa: E402
|
||||
from mod_files import cheat_files # noqa: E402
|
||||
|
||||
BASE = 0x7000000000 # main's base in the layout (recomp/layout.py); only pc-relative decoding sees it
|
||||
NOP = 0xD503201F
|
||||
@@ -90,25 +92,6 @@ def parse(text, mod):
|
||||
return out
|
||||
|
||||
|
||||
TITLE = '0400486024DEC000' # the game's title id: a mod's Atmosphere folders are named after it
|
||||
|
||||
|
||||
def cheat_files(mods, bid):
|
||||
"""[(mod folder name, cheat file)] of the folders of mods, by name: <mod>/cheats/<bid>.txt or its Atmosphere places
|
||||
(runtime/mods.c find_root), the file name in any case."""
|
||||
out = []
|
||||
for mod in sorted((d for d in mods.iterdir() if d.is_dir()), key=lambda d: d.name) if mods.is_dir() else []:
|
||||
for where in ('cheats', f'atmosphere/contents/{TITLE}/cheats', f'contents/{TITLE}/cheats', f'{TITLE}/cheats'):
|
||||
folder = mod / where
|
||||
if folder.is_dir():
|
||||
f = next((p for p in sorted(folder.iterdir()) if p.is_file() and p.name.lower() == f'{bid}.txt'.lower()),
|
||||
None)
|
||||
if f:
|
||||
out.append((mod.name, f))
|
||||
break
|
||||
return out
|
||||
|
||||
|
||||
def ops(words):
|
||||
"""[(type, [words])] of a cheat; type is the opcode nibble, 0xC0.. for the extended ones. ValueError when the last
|
||||
opcode is cut short."""
|
||||
|
||||
Reference in New Issue
Block a user