Skip to content

Commit

Permalink
ASDF
Browse files Browse the repository at this point in the history
move background image to be an internal thing instead of relying on HUD layouts
additional guitar_tweak (JUST FOR A MOD)
visual fixes when changing lefty flip (on the fly)
workflow stupidity
  • Loading branch information
donnaken15 committed Sep 8, 2024
1 parent c734ad1 commit 0b5601e
Show file tree
Hide file tree
Showing 33 changed files with 184 additions and 206 deletions.
97 changes: 20 additions & 77 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ jobs:
#cygenv:
# ${{vars.CYGENV == 'CYGWIN' && 'cygwin' || 'msys2'}}
# # value can be either CYGWIN or MSYS
node:
${{vars.BUN == 'true' && 'bun' || 'nodejs'}}
node: ${{vars.BUN == 'true' && 'bun' || 'nodejs'}}
# use Bun if true, Node.js if false
BUILD: ${{vars.BUILD}} # bitflags to indicate which types of builds to create
#NSIS: 'C:\Program Files (x86)\NSIS\makensis.exe'
Expand All @@ -42,55 +41,40 @@ jobs:
"C:\Program Files\Git\bin\" | Out-File -FilePath $env:GITHUB_PATH -Append
"C:\Program Files\Git\usr\" | Out-File -FilePath $env:GITHUB_PATH -Append
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
sleep 2
#-
# name: Install Cygwin or MSYS2
# run: |
# $path = $null
# where.exe git /q; if ($?) {
# $path = "C:\Program Files\Git"
# "Using Git Bash as it is already installed"
# } else {
# where.exe $env:cygenv /q; if (-not $?) {
# choco install $env:cygenv -y
# } else { "Unix environment is already installed" }
# $path = $(if ($env:cygenv -eq 'cygwin') {"Cygwin"} else {"msys2\usr"})
# }
# v FIX LOL
# "SH=C:\tools\${path}\bin\sh.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
sleep 8
-
name: Install Node.js or Bun
run: |
where.exe $env:node /q; if (-not $?) {
choco install $env:node -y --no-progress
} else { "Node environment is already installed" }
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
sleep 2
sleep 8
-
name: Install UPX
run: |
choco install upx
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
sleep 2
sleep 8
# i need functions
-
name: Install NSIS
run: |
choco install nsis -y --no-progress
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
sleep 2
sleep 8
-
name: Install 7-Zip
run: |
choco install 7zip -y --no-progress
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
sleep 2
sleep 8
-
name: Install Resource Hacker
run: |
choco install resourcehacker.portable -y --no-progress
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
sleep 2
sleep 8
-
name: Install DotNetCompressor
env:
Expand All @@ -107,7 +91,7 @@ jobs:
run: |
choco install mpress -y --no-progress
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
sleep 2
sleep 8
-
name: Install stripreloc
env:
Expand All @@ -132,35 +116,7 @@ jobs:
#with:
# vs-version: 'latest'
run: | # this whole thing should probably be a for loop, AND CHECK IF ALREADY INSTALLED ANY OF THESE!!!!!!!!!!!!
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
""
"Visual C# 2015 Build Tools:"
"Downloading..."
iwr -Uri "https://download.microsoft.com/download/E/E/D/EEDF18A8-4AED-4CE0-BEBE-70A83094FC5A/BuildTools_Full.exe" -OutFile "BuildTools_Full.exe"
"Installing..."
start -NoNewWindow -Wait -FilePath "BuildTools_Full.exe" -Args "/q /passive /norestart /full"
del "BuildTools_Full.exe"
".NET Framework 4.6.2 Targeting Pack for .NET Framework 4.0:"
"Downloading..."
iwr -Uri "https://download.microsoft.com/download/e/e/c/eec79116-8305-4bd0-aa83-27610987eec6/NDP462-DevPack-KB3151934-ENU.exe" -OutFile "NDP462.exe"
"Installing..."
start -NoNewWindow -Wait -FilePath "NDP462.exe" -Args "/install /passive /norestart"
del "NDP462.exe"
if ($env:GH3PLUS) {
"Visual C++ 2015 Build Tools:"
"Downloading..."
iwr -Uri "https://aka.ms/vs/17/release/vs_BuildTools.exe" -OutFile "vc15bt_full.exe"
"Installing..."
start -NoNewWindow -Wait -FilePath "vc15bt_full.exe" -Args "install --add Microsoft.VisualStudio.Component.VC.140,Microsoft.VisualStudio.Component.Windows10SDK.18362 --passive --norestart --nickname stupid --theme Light"
"DirectX SDK:"
"Downloading..."
iwr -Uri "https://archive.org/download/dxsdk_jun10/DXSDK_Jun10.exe" -OutFile "DXSDK_Jun10.exe"
"Installing..."
start -NoNewWindow -Wait -FilePath "DXSDK_Jun10.exe" -Args "/U"
del "DXSDK_Jun10.exe"
"Downloading ntdll.lib..."
iwr -Uri "https://drive.google.com/uc?id=16TzuL2DLDfs_cGts4QjUBjZ60KIUMlgf" -OutFile "SOURCE\GH3Plus\src\ntdll.lib"
}
.\.github\workflows\visualDeps.ps1
#choco install microsoft-build-tools netfx-4.6.2-devpack visualcpp-build-tools -y
# NOPE: visualcpp-build-tools
# NOPE: VisualCppBuildTools
Expand All @@ -175,47 +131,34 @@ jobs:
name: Build project
env:
conf: ${{vars.GH3PLUS == true && 'Release' || 'NoVC++'}}
STUPID: true # STRIPRELOC BREAKS EXE ON SELF HOSTED RUNNER SOMEHOW
GH3PLUS: ${{vars.GH3PLUS}}
NORELOC: ${{vars.NORELOC}} # run stripreloc if true, need to override from here to the event script, glhf
RCASSETS: ${{vars.RCASSETS}} # recompile assets, NOT WORKING RIGHT NOW!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
VCTargetsPath: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\v140
run: |
& "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" SOURCE\FastGH3.sln /p:Configuration=$env:conf
& "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" SOURCE\FastGH3.sln /p:Configuration=$env:conf /t:Rebuild
if ($env:RCASSETS) {
cmd.exe /c "SOURCE\build-assets.bat"
}
# ERRORS AT 'DO' IN FOR BLOCK WTF
test:
runs-on: self-hosted
#env:
# EXTRACFG: ${{vars.EXTRACFG}} # custom INI properties
env:
EXTRACFG: ${{vars.EXTRACFG}} # custom INI properties
environment: Playtest env
steps:
#-
# name: Checkout repository
# uses: actions/checkout@v2
# with:
# submodules: recursive
-
name: Playtest
name: Playtest songs
run: |
echo Test 123
cmd /c dir
cmd /c register.bat
"Testing songs:"
$songs = @(
,@("fastgh3://drive.google.com/uc?id=1EQ8rvcxhv-Xq7T0FT62ZLOZ3rR2gcx9O","[ZIP] Squarepusher - Dark Steering")
,@("fastgh3://drive.google.com/uc?id=13gt3k5WsiRkIthf9V5i6dAAmFK5poyFX","[ZIP] Kommisar - Springtime")
,@("fastgh3://drive.google.com/uc?id=16Ipd-4SV1IqBzAVDA26P-42tWN4twvL7"," [7Z] The Used - Take It Away")
,@("fastgh3://drive.google.com/uc?id=1_F-7Hv7YbF-sw9l_tS3FyjRmpKICa8lp"," [7Z] QOTSA - 3's & 7's (Metal Track Pack)")
,@("fastgh3://drive.google.com/uc?id=16thK1ivFdKqsxd5TscRVh6DYZcQn23dA","[SNG] Fearofdark - TABNY (Fearofdark)")
)
for ($i = 0; $i -lt $songs.length; $i++) {
"* "+($songs[$i][1].ToString())
$arg = "dl "+($songs[$i][0].ToString()) # STUPID CRINGE THING WHY
start -Wait "FastGH3.exe" -WorkingDirectory "." -Args $arg
sleep 5
Wait-Process -Name "game.exe" -WorkingDirectory "." -Timeout 600 -ErrorAction SilentlyContinue -ErrorVariable to
if ($to) {
kill -Name "game.exe" -Force
}
sleep 15
}
.\.github\workflows\testSongs.ps1
# TODO: write configs to test
# TODO: CHECK IF BUILD TOOLS ARE INSTALLED
# TODO: should be made more cleanly by putting songs to test in this YAML
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/testSongs.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"Setting configuration"
(@"
[Player]
AutoStart=1
Hyperspeed=5
ExitOnSongEnd=1
[Launcher]
SongCaching=0
[Player1]
Bot=1
Device=3
[Misc]
Debug=1
"@)+$env:EXTRACFG > "settings.ini"
"Testing songs:"
$songs = @(
,@("1EQ8rvcxhv-Xq7T0FT62ZLOZ3rR2gcx9O","[ZIP] Squarepusher - Dark Steering")
,@("13gt3k5WsiRkIthf9V5i6dAAmFK5poyFX","[ZIP] Kommisar - Springtime")
,@("16Ipd-4SV1IqBzAVDA26P-42tWN4twvL7"," [7Z] The Used - Take It Away")
,@("1_F-7Hv7YbF-sw9l_tS3FyjRmpKICa8lp"," [7Z] QOTSA - 3's & 7's (Metal Track Pack)")
,@("16thK1ivFdKqsxd5TscRVh6DYZcQn23dA","[SNG] Fearofdark - TABNY (Jarvis)")
)
for ($i = 0; $i -lt $songs.length; $i++) {
"* "+($songs[$i][1].ToString())
$arg = "dl fastgh3://drive.google.com/uc?id="+($songs[$i][0].ToString()) # STUPID CRINGE THING WHY
start -Wait "FastGH3.exe" -WorkingDirectory "." -Args $arg
sleep 5
Wait-Process -Name "game.exe" -Timeout 600 -ErrorAction SilentlyContinue -ErrorVariable to
if (-not $to) {
kill -Name "game.exe" -Force
}
sleep 15
}
37 changes: 37 additions & 0 deletions .github/workflows/visualDeps.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# my first powershell script i guess, i hate it already
$pkg = @(
,@("Visual C# 2015 Build Tools", "BuildTools_Full.exe", "/q /full /passive /norestart /log C:\tmp.log", $true, $true, 0,
"https://download.microsoft.com/download/E/E/D/EEDF18A8-4AED-4CE0-BEBE-70A83094FC5A/BuildTools_Full.exe")
,@(".NET Framework 4.6.2 Targeting Pack for .NET Framework 4.0", "NDP462.exe", "/install /passive /norestart /log C:\tmp.log", $true, $true, 0,
"https://download.microsoft.com/download/e/e/c/eec79116-8305-4bd0-aa83-27610987eec6/NDP462-DevPack-KB3151934-ENU.exe")
,@("Visual C++ 2015 Build Tools", "vc15bt_full.exe",
"install --add Microsoft.VisualStudio.Component.VC.140,Microsoft.VisualStudio.Component.Windows10SDK.18362 --passive --norestart --nickname stupid --theme Light",
$env:GH3PLUS, $false, 600, "https://aka.ms/vs/17/release/vs_BuildTools.exe")
,@("DirectX SDK", "DXSDK_Jun10.exe", "/U", $env:GH3PLUS, $false, 600, "https://archive.org/download/dxsdk_jun10/DXSDK_Jun10.exe")
)
for ($i = 0; $i -lt $pkg.length; $i++) {
if (-not $pkg[$i][3]) {
continue
}
($pkg[$i][0])+':'
"Downloading..."
iwr -Uri $pkg[$i][6] -OutFile $pkg[$i][1]
"Installing..."
if ($pkg[$i][4]) {
$null > "C:\tmp.log"
$vsi = start -NoNewWindow -FilePath $pkg[$i][1] -WorkingDirectory "." -Args $pkg[$i][2] -PassThru
$killorbekilled = sajb {
if ($pkg[$i][5] -gt 0) {
$vsi | Wait-Process -Timeout $pkg[$i][5] -ErrorAction SilentlyContinue -ErrorVariable to
if ($to) {
$vsi | kill -Force
}
} else {
$vsi | Wait-Process
}
del "C:\tmp.log" -Force -Confirm
}
#Get-Content -Path "C:\tmp.log" -Wait
$killorbekilled | Wait-Job
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ disabled/
!/DATA/MODS/disabled
/SOURCE/q/test
/SOURCE/Misc/verify_build.sh
/FINALPKG.*

stats_*.txt
/DATA/HIGHWAYS
Expand Down
2 changes: 1 addition & 1 deletion DATA/MUSIC/TOOLS/bt.bin
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f�[~
fݼR
Binary file modified DATA/MUSIC/TOOLS/c128ks.exe
Binary file not shown.
Binary file modified DATA/PAK/dbg.pak.xen
Binary file not shown.
Binary file modified DATA/PAK/qb.pab.xen
Binary file not shown.
Binary file modified DATA/PAK/qb.pak.xen
Binary file not shown.
Binary file removed FINALPKG.exe
Binary file not shown.
Binary file removed FINALPKG.zip
Binary file not shown.
Binary file removed FINALPKG_LITE.exe
Binary file not shown.
Binary file modified FastGH3.exe
Binary file not shown.
Binary file modified FastGH3.pdb
Binary file not shown.
Loading

0 comments on commit 0b5601e

Please sign in to comment.