From bdb1e687c787d30cc96811799ada7a3b07d0d4bb Mon Sep 17 00:00:00 2001 From: Cadyn <35672377+cadyn@users.noreply.github.com> Date: Wed, 13 Mar 2024 23:38:36 -0700 Subject: [PATCH] Switch nanomap rendering to spacemanDMM (#7951) Co-authored-by: Selis --- .github/workflows/render_nanomaps.yml | 13 +++++- .../nanomap-renderer-invoker.sh | 42 ++++++++++++------- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/.github/workflows/render_nanomaps.yml b/.github/workflows/render_nanomaps.yml index 767eefe400..df2559e633 100644 --- a/.github/workflows/render_nanomaps.yml +++ b/.github/workflows/render_nanomaps.yml @@ -10,6 +10,7 @@ on: - master paths: - 'maps/**' + workflow_dispatch: permissions: {} jobs: @@ -30,7 +31,17 @@ jobs: git branch -f nanomaps_generation git checkout nanomaps_generation git reset --hard origin/master - + - name: Restore SpacemanDMM cache + uses: actions/cache@v4 + with: + path: ~/SpacemanDMM + key: ${{ runner.os }}-spacemandmm-${{ hashFiles('_build_dependencies.sh') }} + restore-keys: | + ${{ runner.os }}-spacemandmm- + - name: Install Tools + run: | + bash tools/ci/install_spaceman_dmm.sh dmm-tools + sudo apt install -y imagemagick - name: Ensure +x on github-actions directory run: chmod -R +x ./tools/github-actions diff --git a/tools/github-actions/nanomap-renderer-invoker.sh b/tools/github-actions/nanomap-renderer-invoker.sh index 2f8414e156..c6056432a2 100755 --- a/tools/github-actions/nanomap-renderer-invoker.sh +++ b/tools/github-actions/nanomap-renderer-invoker.sh @@ -14,24 +14,34 @@ map_files=( "./maps/southern_cross/southern_cross-11.dmm" ) -tools/github-actions/nanomap-renderer minimap -w 2240 -h 2240 "${map_files[@]}" +~/dmm-tools minimap "${map_files[@]}" # Move and rename files so the game understands them -cd "data/nanomaps" +cd "data/minimaps" -mv "talon1_nanomap_z1.png" "tether_nanomap_z13.png" -mv "talon2_nanomap_z1.png" "tether_nanomap_z14.png" -mv "southern_cross-1_nanomap_z1.png" "southern_cross_nanomap_z1.png" -mv "southern_cross-2_nanomap_z1.png" "southern_cross_nanomap_z2.png" -mv "southern_cross-3_nanomap_z1.png" "southern_cross_nanomap_z3.png" -mv "southern_cross-4_nanomap_z1.png" "southern_cross_nanomap_z4.png" -mv "southern_cross-5_nanomap_z1.png" "southern_cross_nanomap_z5.png" -mv "southern_cross-6_nanomap_z1.png" "southern_cross_nanomap_z6.png" -mv "southern_cross-7_nanomap_z1.png" "southern_cross_nanomap_z7.png" -mv "southern_cross-8_nanomap_z1.png" "southern_cross_nanomap_z8.png" -mv "southern_cross-9_nanomap_z1.png" "southern_cross_nanomap_z9.png" -mv "southern_cross-10_nanomap_z1.png" "southern_cross_nanomap_z10.png" -mv "southern_cross-11_nanomap_z1.png" "southern_cross_nanomap_z11.png" +convert "southern_cross-1-1.png" -resize 2240x2240 "southern_cross_nanomap_z1.png" +convert "southern_cross-2-1.png" -resize 2240x2240 "southern_cross_nanomap_z2.png" +convert "southern_cross-3-1.png" -resize 2240x2240 "southern_cross_nanomap_z3.png" +convert "southern_cross-4-1.png" -resize 2240x2240 "southern_cross_nanomap_z4.png" +convert "southern_cross-5-1.png" -resize 2240x2240 "southern_cross_nanomap_z5.png" +convert "southern_cross-6-1.png" -resize 2240x2240 "southern_cross_nanomap_z6.png" +convert "southern_cross-7-1.png" -resize 2240x2240 "southern_cross_nanomap_z7.png" +convert "southern_cross-8-1.png" -resize 2240x2240 "southern_cross_nanomap_z8.png" +convert "southern_cross-9-1.png" -resize 2240x2240 "southern_cross_nanomap_z9.png" +convert "southern_cross-10-1.png" -resize 2240x2240 "southern_cross_nanomap_z10.png" +convert "southern_cross-11-1.png" -resize 2240x2240 "southern_cross_nanomap_z11.png" + +rm -rf "southern_cross-1-1.png" +rm -rf "southern_cross-2-1.png" +rm -rf "southern_cross-3-1.png" +rm -rf "southern_cross-4-1.png" +rm -rf "southern_cross-5-1.png" +rm -rf "southern_cross-6-1.png" +rm -rf "southern_cross-7-1.png" +rm -rf "southern_cross-8-1.png" +rm -rf "southern_cross-9-1.png" +rm -rf "southern_cross-10-1.png" +rm -rf "southern_cross-11-1.png" cd "../../" -cp data/nanomaps/* "icons/_nanomaps/" +cp data/minimaps/* "icons/_nanomaps/"