From 83058450631685de4e053e47aa097cfabf5ada45 Mon Sep 17 00:00:00 2001 From: Furior <68264134+Furrior@users.noreply.github.com> Date: Wed, 20 Sep 2023 23:24:21 +0700 Subject: [PATCH] Fix: nanomap render for 220 maps (#208) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает ## Почему это хорошо для игры ## Изображения изменений ## Тестирование ## Changelog :cl: fix: Наномапы теперь рендерятся для наших карт /:cl: --- modular_ss220/maps220/_maps220.dme | 1 + modular_ss220/maps220/code/Station/cyberiad.dm | 2 +- modular_ss220/maps220/code/Station/delta.dm | 2 +- modular_ss220/maps220/code/nanomap.dm | 6 ++++++ .../github-actions/nanomap-renderer-invoker.sh | 18 ++++++------------ 5 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 modular_ss220/maps220/code/nanomap.dm diff --git a/modular_ss220/maps220/_maps220.dme b/modular_ss220/maps220/_maps220.dme index 2ca1c8702986..a193ce01e38e 100644 --- a/modular_ss220/maps220/_maps220.dme +++ b/modular_ss220/maps220/_maps220.dme @@ -11,5 +11,6 @@ #include "code/helpers.dm" #include "code/misc.dm" #include "code/mobs.dm" +#include "code/nanomap.dm" #include "code/spawners.dm" #include "code/walls.dm" diff --git a/modular_ss220/maps220/code/Station/cyberiad.dm b/modular_ss220/maps220/code/Station/cyberiad.dm index e3d60416372c..b9b1042c128e 100644 --- a/modular_ss220/maps220/code/Station/cyberiad.dm +++ b/modular_ss220/maps220/code/Station/cyberiad.dm @@ -1,5 +1,5 @@ /datum/map/cyberiad fluff_name = "ИСН Кибериада" - technical_name = "Кибериада" + technical_name = "Cyberiad220" map_path = "_maps/map_files220/cyberiad/cyberiad.dmm" webmap_url = "https://affectedarc07.github.io/SS13WebMap/Paradise/Cyberiad/" diff --git a/modular_ss220/maps220/code/Station/delta.dm b/modular_ss220/maps220/code/Station/delta.dm index 898988a68922..91930695ae49 100644 --- a/modular_ss220/maps220/code/Station/delta.dm +++ b/modular_ss220/maps220/code/Station/delta.dm @@ -1,5 +1,5 @@ /datum/map/delta fluff_name = "ИСН Керберос" - technical_name = "Керберос" + technical_name = "Delta220" map_path = "_maps/map_files220/delta/delta.dmm" webmap_url = "https://affectedarc07.github.io/SS13WebMap/Paradise/Delta/" diff --git a/modular_ss220/maps220/code/nanomap.dm b/modular_ss220/maps220/code/nanomap.dm new file mode 100644 index 000000000000..f20672ec8f6c --- /dev/null +++ b/modular_ss220/maps220/code/nanomap.dm @@ -0,0 +1,6 @@ +/datum/asset/simple/nanomaps/New() + . = ..() + assets |= list( + "Cyberiad220_nanomap_z1.png" = 'icons/_nanomaps/Cyberiad220_nanomap_z1.png', + "Delta220_nanomap_z1.png" = 'icons/_nanomaps/Delta220_nanomap_z1.png', + ) diff --git a/tools/github-actions/nanomap-renderer-invoker.sh b/tools/github-actions/nanomap-renderer-invoker.sh index f46dac10d5c3..41432588c470 100755 --- a/tools/github-actions/nanomap-renderer-invoker.sh +++ b/tools/github-actions/nanomap-renderer-invoker.sh @@ -1,18 +1,12 @@ #!/bin/bash set -e # Generate maps -tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/cyberiad/cyberiad.dmm" -tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/Delta/delta.dmm" -tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/MetaStation/MetaStation.dmm" -tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/cerestation/cerestation.dmm" +tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files220/cyberiad/cyberiad.dmm" +tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files220/delta/delta.dmm" # Move and rename files so the game understands them cd "data/nanomaps" -mv "cyberiad_nanomap_z1.png" "Cyberiad_nanomap_z1.png" -mv "delta_nanomap_z1.png" "Delta_nanomap_z1.png" -#mv "MetaStation_nanomap_z1.png" "MetaStation_nanomap_z1.png" # What's even the point of this? -mv "cerestation_nanomap_z1.png" "CereStation_nanomap_z1.png" +mv "cyberiad_nanomap_z1.png" "Cyberiad220_nanomap_z1.png" +mv "delta_nanomap_z1.png" "Delta220_nanomap_z1.png" cd "../../" -cp "data/nanomaps/Cyberiad_nanomap_z1.png" "icons/_nanomaps" -cp "data/nanomaps/Delta_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/Cyberiad220_nanomap_z1.png" "icons/_nanomaps" +cp "data/nanomaps/Delta220_nanomap_z1.png" "icons/_nanomaps"