From 72185c1da76ccfa7964b9f7f0c802c669028a637 Mon Sep 17 00:00:00 2001 From: izac112 Date: Tue, 30 Mar 2021 14:25:23 +0200 Subject: [PATCH] Attempts to fix nanomap --- code/modules/asset_cache/asset_list_items.dm | 37 ++++++++++++------- .../nanomap-renderer-invoker.sh | 32 ++++++---------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 815d250dcc..620c497c51 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -490,24 +490,33 @@ // It REALLY doesnt matter too much if these arent up to date // They are relatively big assets = list( - // VOREStation Edit: We don't need Southern Cross + // YawnWider Edit: We don't need Southern Cross or tether // "southern_cross_nanomap_z1.png" = 'icons/_nanomaps/southern_cross_nanomap_z1.png', // "southern_cross_nanomap_z10.png" = 'icons/_nanomaps/southern_cross_nanomap_z10.png', // "southern_cross_nanomap_z2.png" = 'icons/_nanomaps/southern_cross_nanomap_z2.png', // "southern_cross_nanomap_z3.png" = 'icons/_nanomaps/southern_cross_nanomap_z3.png', // "southern_cross_nanomap_z5.png" = 'icons/_nanomaps/southern_cross_nanomap_z5.png', // "southern_cross_nanomap_z6.png" = 'icons/_nanomaps/southern_cross_nanomap_z6.png', - "tether_nanomap_z1.png" = 'icons/_nanomaps/tether_nanomap_z1.png', - "tether_nanomap_z2.png" = 'icons/_nanomaps/tether_nanomap_z2.png', - "tether_nanomap_z3.png" = 'icons/_nanomaps/tether_nanomap_z3.png', - "tether_nanomap_z4.png" = 'icons/_nanomaps/tether_nanomap_z4.png', - "tether_nanomap_z5.png" = 'icons/_nanomaps/tether_nanomap_z5.png', - "tether_nanomap_z6.png" = 'icons/_nanomaps/tether_nanomap_z6.png', - "tether_nanomap_z7.png" = 'icons/_nanomaps/tether_nanomap_z7.png', - "tether_nanomap_z8.png" = 'icons/_nanomaps/tether_nanomap_z8.png', - "tether_nanomap_z9.png" = 'icons/_nanomaps/tether_nanomap_z9.png', - "tether_nanomap_z10.png" = 'icons/_nanomaps/tether_nanomap_z10.png', - "tether_nanomap_z13.png" = 'icons/_nanomaps/tether_nanomap_z13.png', - "tether_nanomap_z14.png" = 'icons/_nanomaps/tether_nanomap_z14.png', - // VOREStation Edit End + + //"tether_nanomap_z1.png" = 'icons/_nanomaps/tether_nanomap_z1.png', + //"tether_nanomap_z2.png" = 'icons/_nanomaps/tether_nanomap_z2.png', + //"tether_nanomap_z3.png" = 'icons/_nanomaps/tether_nanomap_z3.png', + //"tether_nanomap_z4.png" = 'icons/_nanomaps/tether_nanomap_z4.png', + //"tether_nanomap_z5.png" = 'icons/_nanomaps/tether_nanomap_z5.png', + //"tether_nanomap_z6.png" = 'icons/_nanomaps/tether_nanomap_z6.png', + //"tether_nanomap_z7.png" = 'icons/_nanomaps/tether_nanomap_z7.png', + //"tether_nanomap_z8.png" = 'icons/_nanomaps/tether_nanomap_z8.png', + //"tether_nanomap_z9.png" = 'icons/_nanomaps/tether_nanomap_z9.png', + //"tether_nanomap_z10.png" = 'icons/_nanomaps/tether_nanomap_z10.png', + //"tether_nanomap_z13.png" = 'icons/_nanomaps/tether_nanomap_z13.png', + //"tether_nanomap_z14.png" = 'icons/_nanomaps/tether_nanomap_z14.png', + "cryogaia_nanomap_z2.png" = 'icons/_nanomaps/cryogaia_nanomap_z2.png', + "cryogaia_nanomap_z3.png" = 'icons/_nanomaps/cryogaia_nanomap_z3.png', + "cryogaia_nanomap_z4.png" = 'icons/_nanomaps/cryogaia_nanomap_z4.png', + "cryogaia_nanomap_z5.png" = 'icons/_nanomaps/cryogaia_nanomap_z5.png', + "cryogaia_nanomap_z6.png" = 'icons/_nanomaps/cryogaia_nanomap_z6.png', + "cryogaia_nanomap_z23.png" = 'icons/_nanomaps/cryogaia_nanomap_z13.png', + "cryogaia_nanomap_z24.png" = 'icons/_nanomaps/cryogaia_nanomap_z14.png', + // YawnWider Edit End + ) \ No newline at end of file diff --git a/tools/github-actions/nanomap-renderer-invoker.sh b/tools/github-actions/nanomap-renderer-invoker.sh index 4aea8cbf55..3e0ed8e0cb 100755 --- a/tools/github-actions/nanomap-renderer-invoker.sh +++ b/tools/github-actions/nanomap-renderer-invoker.sh @@ -1,15 +1,11 @@ #!/bin/bash # Generate maps map_files=( - "./maps/tether/tether-01-surface1.dmm" - "./maps/tether/tether-02-surface2.dmm" - "./maps/tether/tether-03-surface3.dmm" - "./maps/tether/tether-04-transit.dmm" - "./maps/tether/tether-05-station1.dmm" - "./maps/tether/tether-06-station2.dmm" - "./maps/tether/tether-07-station3.dmm" - "./maps/tether/tether-08-mining.dmm" - "./maps/tether/tether-09-solars.dmm" + "./maps/yw/cryogaia-02-mining.dmm" + "./maps/yw/cryogaia-03-transit.dmm" + "./maps/yw/cryogaia-04-maintenance.dmm" + "./maps/yw/cryogaia-05-main.dmm" + "./maps/yw/cryogaia-06-upper.dmm" "./maps/offmap_vr/talon/talon1.dmm" "./maps/offmap_vr/talon/talon2.dmm" ) @@ -19,17 +15,13 @@ tools/github-actions/nanomap-renderer minimap -w 2240 -h 2240 "${map_files[@]}" # Move and rename files so the game understands them cd "data/nanomaps" -mv "talon1_nanomap_z1.png" "tether_nanomap_z13.png" -mv "talon2_nanomap_z1.png" "tether_nanomap_z14.png" -mv "tether-01-surface1_nanomap_z1.png" "tether_nanomap_z1.png" -mv "tether-02-surface2_nanomap_z1.png" "tether_nanomap_z2.png" -mv "tether-03-surface3_nanomap_z1.png" "tether_nanomap_z3.png" -mv "tether-04-transit_nanomap_z1.png" "tether_nanomap_z4.png" -mv "tether-05-station1_nanomap_z1.png" "tether_nanomap_z5.png" -mv "tether-06-station2_nanomap_z1.png" "tether_nanomap_z6.png" -mv "tether-07-station3_nanomap_z1.png" "tether_nanomap_z7.png" -mv "tether-08-mining_nanomap_z1.png" "tether_nanomap_z8.png" -mv "tether-09-solars_nanomap_z1.png" "tether_nanomap_z9.png" +mv "talon1_nanomap_z1.png" "cryogaia_nanomap_z13.png" +mv "talon2_nanomap_z1.png" "cryogaia_nanomap_z14.png" +mv "cryogaia-02-mining_nanomap_z1.png" "cryogaia_nanomap_z2.png" +mv "cryogaia-03-transit_nanomap_z1.png" "cryogaia_nanomap_z3.png" +mv "cryogaia-04-maintenance_nanomap_z1.png" "cryogaia_nanomap_z4.png" +mv "cryogaia-05-main_z1.png" "cryogaia_nanomap_z5.png" +mv "cryogaia-06-upper_nanomap_z1.png" "cryogaia_nanomap_z6.png" cd "../../" cp data/nanomaps/* "icons/_nanomaps/" \ No newline at end of file