diff --git a/.github/workflows/main.yml b/.github/workflows/gsc-tool.yml similarity index 75% rename from .github/workflows/main.yml rename to .github/workflows/gsc-tool.yml index 8dc1d14..34acb35 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/gsc-tool.yml @@ -1,10 +1,10 @@ -name: main +name: gsc-tool on: [push] jobs: main-win: - name: Test on Windows + name: Compile on Windows runs-on: windows-latest steps: @@ -18,4 +18,4 @@ jobs: - name: Run script run: | - ci/main.bat + ci/gsc-tool.bat diff --git a/.github/workflows/pregsc.yml b/.github/workflows/pregsc.yml new file mode 100644 index 0000000..f841683 --- /dev/null +++ b/.github/workflows/pregsc.yml @@ -0,0 +1,16 @@ +name: pregsc + +on: [push] + +jobs: + main-win: + name: Run on Windows + runs-on: windows-latest + + steps: + - name: Check out files + uses: actions/checkout@main + + - name: Run script + run: | + ci/pregsc.bat diff --git a/.gitignore b/.gitignore index 3f641b9..46ddfac 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ logs/ demos/ missingasset.csv -*.exe -compiled/ diff --git a/README.md b/README.md index 2c10cc7..c81f334 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,8 @@ You can find the ModDB release post [here](https://www.moddb.com/mods/bot-warfar - apdonato - http://rsebots.blogspot.ca/ - Ability - Salvation +- Xensik - https://github.com/xensik/gsc-tool +- KristofMorva - https://github.com/KristofMorva/preGSC ### Waypoint Creators - FragsAreUs - https://github.com/FragsAreUs diff --git a/ci/gsc-tool.bat b/ci/gsc-tool.bat new file mode 100644 index 0000000..35d24e9 --- /dev/null +++ b/ci/gsc-tool.bat @@ -0,0 +1,6 @@ +@echo off + +xcopy /y .\ci\*.gscbin .\ +rm .\scripts\mp\bots_adapter_piw5.gsc + +gsc-tool.exe -m comp -g iw5 -s pc .\ diff --git a/ci/main.bat b/ci/main.bat deleted file mode 100644 index 603c0c0..0000000 --- a/ci/main.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off - -xcopy /y ci . -rm scripts\mp\bots_adapter_piw5.gsc - -gsc-tool.exe -m comp -g iw5 -s pc . diff --git a/ci/preGSC.exe b/ci/preGSC.exe new file mode 100644 index 0000000..0f56aa5 Binary files /dev/null and b/ci/preGSC.exe differ diff --git a/ci/pregsc.bat b/ci/pregsc.bat new file mode 100644 index 0000000..0a69d91 --- /dev/null +++ b/ci/pregsc.bat @@ -0,0 +1,11 @@ +@echo off + +pushd .\ci\ +if not exist ".\source\" mkdir .\source\ +if not exist ".\source\scripts\" mkdir .\source\scripts\ +if not exist ".\source\maps\" mkdir .\source\maps\ + +xcopy /y /s /e ..\scripts\ .\source\scripts\ +xcopy /y /s /e ..\maps\ .\source\maps\ + +preGSC.exe -noforeach -nopause diff --git a/scripts/mp/bots_adapter_piw5.gsc b/scripts/mp/bots_adapter_piw5.gsc deleted file mode 100644 index 878dd9e..0000000 --- a/scripts/mp/bots_adapter_piw5.gsc +++ /dev/null @@ -1,53 +0,0 @@ -init() -{ - level.bot_builtins["printconsole"] = ::do_printconsole; - level.bot_builtins["filewrite"] = ::do_filewrite; - level.bot_builtins["fileread"] = ::do_fileread; - level.bot_builtins["fileexists"] = ::do_fileexists; - level.bot_builtins["botaction"] = ::do_botaction; - level.bot_builtins["botstop"] = ::do_botstop; - level.bot_builtins["botmovement"] = ::do_botmovement; - level.bot_builtins["botmeleeparams"] = ::do_botmeleeparams; -} - -do_printconsole( s ) -{ - println( s ); -} - -do_filewrite( file, contents, mode ) -{ - file = "scriptdata/" + file; -} - -do_fileread( file ) -{ - file = "scriptdata/" + file; - return undefined; -} - -do_fileexists( file ) -{ - file = "scriptdata/" + file; - return false; -} - -do_botaction( action ) -{ - self botaction( action ); -} - -do_botstop() -{ - self botstop(); -} - -do_botmovement( forward, right ) -{ - self botmovement( forward, right ); -} - -do_botmeleeparams( entNum, dist ) -{ - self botmeleeparams( entNum, dist ); -}