diff --git a/tools/github-actions/dmm-tools-para b/tools/github-actions/dmm-tools-para new file mode 100755 index 00000000000..f7623fadd32 Binary files /dev/null and b/tools/github-actions/dmm-tools-para differ diff --git a/tools/github-actions/nanomap-renderer b/tools/github-actions/nanomap-renderer deleted file mode 100755 index bd655ccb1f7..00000000000 Binary files a/tools/github-actions/nanomap-renderer and /dev/null differ diff --git a/tools/github-actions/nanomap-renderer-invoker.sh b/tools/github-actions/nanomap-renderer-invoker.sh index 14067585615..af98264985c 100755 --- a/tools/github-actions/nanomap-renderer-invoker.sh +++ b/tools/github-actions/nanomap-renderer-invoker.sh @@ -1,21 +1,14 @@ #!/bin/bash set -e # Generate maps -tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/boxstation.dmm" -tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/deltastation.dmm" -tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/metastation.dmm" -tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/cerestation.dmm" -tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/emeraldstation.dmm" +tools/github-actions/dmm-tools-para minimap --enable nanomaps --width 2040 --height 2040 "./_maps/map_files/stations/boxstation.dmm" +tools/github-actions/dmm-tools-para minimap --enable nanomaps --width 2040 --height 2040 "./_maps/map_files/stations/deltastation.dmm" +tools/github-actions/dmm-tools-para minimap --enable nanomaps --width 2040 --height 2040 "./_maps/map_files/stations/metastation.dmm" +tools/github-actions/dmm-tools-para minimap --enable nanomaps --width 2040 --height 2040 "./_maps/map_files/stations/cerestation.dmm" +tools/github-actions/dmm-tools-para minimap --enable nanomaps --width 2040 --height 2040 "./_maps/map_files/stations/emeraldstation.dmm" # Move and rename files so the game understands them -cd "data/nanomaps" -mv "boxstation_nanomap_z1.png" "BoxStation_nanomap_z1.png" -mv "deltastation_nanomap_z1.png" "DeltaStation_nanomap_z1.png" -mv "metastation_nanomap_z1.png" "MetaStation_nanomap_z1.png" -mv "cerestation_nanomap_z1.png" "CereStation_nanomap_z1.png" -mv "emeraldstation_nanomap_z1.png" "EmeraldStation_nanomap_z1.png" -cd "../../" -cp "data/nanomaps/BoxStation_nanomap_z1.png" "icons/_nanomaps" -cp "data/nanomaps/DeltaStation_nanomap_z1.png" "icons/_nanomaps" -cp "data/nanomaps/MetaStation_nanomap_z1.png" "icons/_nanomaps" -cp "data/nanomaps/CereStation_nanomap_z1.png" "icons/_nanomaps" -cp "data/nanomaps/EmeraldStation_nanomap_z1.png" "icons/_nanomaps" +mv "data/minimaps/boxstation-1.png" "icons/_nanomaps/BoxStation_nanomap_z1.png" +mv "data/minimaps/deltastation-1.png" "icons/_nanomaps/DeltaStation_nanomap_z1.png" +mv "data/minimaps/metastation-1.png" "icons/_nanomaps/MetaStation_nanomap_z1.png" +mv "data/minimaps/cerestation-1.png" "icons/_nanomaps/CereStation_nanomap_z1.png" +mv "data/minimaps/emeraldstation-1.png" "icons/_nanomaps/EmeraldStation_nanomap_z1.png" diff --git a/tools/github-actions/render_nanomaps.py b/tools/github-actions/render_nanomaps.py index 474f03f95d5..1df38e8026f 100644 --- a/tools/github-actions/render_nanomaps.py +++ b/tools/github-actions/render_nanomaps.py @@ -1,9 +1,11 @@ +# this is only ran locally, not part of github actions + from pathlib import Path import subprocess from avulto import DMM, DME -RENDERER = Path("tools/github-actions/nanomap-renderer") +RENDERER = Path("tools/github-actions/dmm-tools-para") SCALE = 8 @@ -22,8 +24,8 @@ if __name__ == "__main__": dmm = DMM.from_file(map_path) width = dmm.size.x * SCALE height = dmm.size.y * SCALE - commands.append([str(RENDERER), "minimap", "-w", str(width), "-h", str(height), str(map_path)]) - commands.append(["mv", f"data/nanomaps/{dmm.filepath.stem}_nanomap_z1.png", f"icons/_nanomaps/stations/{technical_name}_nanomap_z1.png"]) + commands.append([str(RENDERER), "minimap", "--enable", "nanomaps", "--width", str(width), "--height", str(height), str(map_path)]) + commands.append(["mv", f"data/minimaps/{dmm.filepath.stem}-1.png", f"icons/_nanomaps/stations/{technical_name}_nanomap_z1.png"]) print("inspecting ruins...") for pth in dme.subtypesof("/datum/map_template/ruin"): @@ -38,8 +40,8 @@ if __name__ == "__main__": dmm = DMM.from_file(map_path) width = dmm.size.x * SCALE height = dmm.size.y * SCALE - commands.append([str(RENDERER), "minimap", "-w", str(width), "-h", str(height), str(map_path)]) - commands.append(["mv", f"data/nanomaps/{dmm.filepath.stem}_nanomap_z1.png", f"icons/_nanomaps/ruins/{ruin_id}_nanomap_z1.png"]) + commands.append([str(RENDERER), "minimap", "--enable", "nanomaps", "--width", str(width), "--height", str(height), str(map_path)]) + commands.append(["mv", f"data/minimaps/{dmm.filepath.stem}-1.png", f"icons/_nanomaps/ruins/{ruin_id}_nanomap_z1.png"]) print("executing...") for command in commands: