From 4ed4fa556c45e7871c51767523351ef86d260898 Mon Sep 17 00:00:00 2001
From: Richard Wheeler <2762690+zephyris@users.noreply.github.com>
Date: Sat, 29 Mar 2025 22:31:30 +0000
Subject: [PATCH] Change: Package OpenGFX2 for Windows Store and GOG

---
 .github/workflows/release-windows-store.yml | 12 ++++++------
 .github/workflows/upload-gog.yml            | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release-windows-store.yml b/.github/workflows/release-windows-store.yml
index 93aaafd799..5dc8f779f1 100644
--- a/.github/workflows/release-windows-store.yml
+++ b/.github/workflows/release-windows-store.yml
@@ -74,16 +74,16 @@ jobs:
         mkdir -p builds/common-binaries/baseset
         cd builds/common-binaries/baseset
 
-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip -o opengfx-all.zip
+        echo "::group::Download OpenGFX2"
+        curl -L https://github.com/OpenTTD/OpenGFX2/releases/download/v0.7/opengfx2_8.tar -o opengfx2_8.tar
         echo "::endgroup::"
 
-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
-        tar xf opengfx-*.tar
+        echo "::group::Unpack OpenGFX2"
+        tar xf opengfx2_8.tar
+        mv opengfx2_8 OpenGFX2_Classic-0.7
         echo "::endgroup::"
 
-        rm -f opengfx-all.zip opengfx-*.tar
+        rm -f opengfx2_8.tar
 
     - name: Install OpenMSX
       shell: bash
diff --git a/.github/workflows/upload-gog.yml b/.github/workflows/upload-gog.yml
index 66d3520404..7f1af8693a 100644
--- a/.github/workflows/upload-gog.yml
+++ b/.github/workflows/upload-gog.yml
@@ -56,16 +56,16 @@ jobs:
         mkdir -p gog/opengfx/baseset
         cd gog/opengfx/baseset
 
-        echo "::group::Download OpenGFX"
-        curl -L https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip -o opengfx-all.zip
+        echo "::group::Download OpenGFX2"
+        curl -L https://github.com/OpenTTD/OpenGFX2/releases/download/v0.7/opengfx2_8.tar -o opengfx2_8.tar
         echo "::endgroup::"
 
-        echo "::group::Unpack OpenGFX"
-        unzip opengfx-all.zip
-        tar xf opengfx-*.tar
+        echo "::group::Unpack OpenGFX2"
+        tar xf opengfx2_8.tar
+        mv opengfx2_8 OpenGFX2_Classic-0.7
         echo "::endgroup::"
 
-        rm -f opengfx-all.zip opengfx-*.tar
+        rm -f opengfx2_8.tar
 
     - name: Install OpenMSX
       shell: bash
@@ -77,7 +77,7 @@ jobs:
         curl -L https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip -o openmsx-all.zip
         echo "::endgroup::"
 
-        echo "::group::Unpack OpenGFX"
+        echo "::group::Unpack OpenMSX"
         unzip openmsx-all.zip
         tar xf openmsx-*.tar
         echo "::endgroup::"