From f944852d526750723e1b78fe796da0da2e4e1e80 Mon Sep 17 00:00:00 2001 From: Notex Date: Wed, 17 Jul 2024 23:51:19 +1000 Subject: [PATCH] feat: look for gfxexport in application directory instead of working directory by default --- .github/workflows/build.yml | 2 +- G2GFxDataTool/G2GFxDataTool.csproj | 1 + G2GFxDataTool/Options.cs | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12e3f53..36569c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: name: win-x64 - name: Download ResourceTool - uses: robinraju/release-downloader@v1.9 + uses: robinraju/release-downloader@v1.11 with: repository: "OrfeasZ/ZHMTools" latest: true diff --git a/G2GFxDataTool/G2GFxDataTool.csproj b/G2GFxDataTool/G2GFxDataTool.csproj index 8b28c85..33de311 100644 --- a/G2GFxDataTool/G2GFxDataTool.csproj +++ b/G2GFxDataTool/G2GFxDataTool.csproj @@ -6,6 +6,7 @@ enable disable Copyright (C) Glacier 2 Modding Organisation + 1.1.0 false diff --git a/G2GFxDataTool/Options.cs b/G2GFxDataTool/Options.cs index d77c2f0..86d59ed 100644 --- a/G2GFxDataTool/Options.cs +++ b/G2GFxDataTool/Options.cs @@ -13,8 +13,8 @@ public class Options [Option('b', "base-assembly-path", SetName = "export", Required = false, HelpText = "Base assembly path (defaults to /ui/controls/).")] public string baseAssemblyPath { get; set; } = "/ui/controls/"; - [Option('g', "gfxexport", SetName = "export", Required = false, HelpText = "Path to gfxexport.exe (defaults to \"gfxexport.exe\").")] - public string gfxexportPath { get; set; } = "gfxexport.exe"; + [Option('g', "gfxexport", SetName = "export", Required = false, HelpText = "Path to gfxexport.exe (defaults to \"gfxexport.exe\" in the folder where G2GFxDataTool.exe is located).")] + public string gfxexportPath { get; set; } = AppDomain.CurrentDomain.BaseDirectory + "gfxexport.exe"; [Option('s', "save-paths", SetName = "export", Required = false, HelpText = "Saves Scaleform GFx, UIControl and aspect paths to scaleformgfx.txt, uicontrol.txt and aspect.txt text files in the output directory.")] public bool savePaths { get; set; }