diff --git a/.gitignore b/.gitignore index c7fd8ca..9548027 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +archives/ build/ tools/pack/ .gitignore diff --git a/resource/III/CheatMenu/json/animation.json b/resource/CheatMenuIII/json/animation.json similarity index 100% rename from resource/III/CheatMenu/json/animation.json rename to resource/CheatMenuIII/json/animation.json diff --git a/resource/III/CheatMenu/json/mission.json b/resource/CheatMenuIII/json/mission.json similarity index 100% rename from resource/III/CheatMenu/json/mission.json rename to resource/CheatMenuIII/json/mission.json diff --git a/resource/III/CheatMenu/json/ped.json b/resource/CheatMenuIII/json/ped.json similarity index 100% rename from resource/III/CheatMenu/json/ped.json rename to resource/CheatMenuIII/json/ped.json diff --git a/resource/III/CheatMenu/json/teleport.json b/resource/CheatMenuIII/json/teleport.json similarity index 100% rename from resource/III/CheatMenu/json/teleport.json rename to resource/CheatMenuIII/json/teleport.json diff --git a/resource/III/CheatMenu/json/vehicle.json b/resource/CheatMenuIII/json/vehicle.json similarity index 98% rename from resource/III/CheatMenu/json/vehicle.json rename to resource/CheatMenuIII/json/vehicle.json index 25bbe6a..f8afc1c 100644 --- a/resource/III/CheatMenu/json/vehicle.json +++ b/resource/CheatMenuIII/json/vehicle.json @@ -9,7 +9,7 @@ "Aircraft": { "Dodo": "126" }, - "Woker": { + "Worker": { "Firetruk": "97", "Ambulan": "106", "Taxi": "110", diff --git a/resource/III/CheatMenu/json/weapon.json b/resource/CheatMenuIII/json/weapon.json similarity index 100% rename from resource/III/CheatMenu/json/weapon.json rename to resource/CheatMenuIII/json/weapon.json diff --git a/resource/SA/CheatMenu/clothes.txd b/resource/CheatMenuSA/clothes.txd similarity index 100% rename from resource/SA/CheatMenu/clothes.txd rename to resource/CheatMenuSA/clothes.txd diff --git a/resource/SA/CheatMenu/components.txd b/resource/CheatMenuSA/components.txd similarity index 100% rename from resource/SA/CheatMenu/components.txd rename to resource/CheatMenuSA/components.txd diff --git a/resource/SA/CheatMenu/json/animation.json b/resource/CheatMenuSA/json/animation.json similarity index 100% rename from resource/SA/CheatMenu/json/animation.json rename to resource/CheatMenuSA/json/animation.json diff --git a/resource/SA/CheatMenu/json/cheat name.json b/resource/CheatMenuSA/json/cheat name.json similarity index 100% rename from resource/SA/CheatMenu/json/cheat name.json rename to resource/CheatMenuSA/json/cheat name.json diff --git a/resource/SA/CheatMenu/json/cutscene.json b/resource/CheatMenuSA/json/cutscene.json similarity index 100% rename from resource/SA/CheatMenu/json/cutscene.json rename to resource/CheatMenuSA/json/cutscene.json diff --git a/resource/SA/CheatMenu/json/mission.json b/resource/CheatMenuSA/json/mission.json similarity index 100% rename from resource/SA/CheatMenu/json/mission.json rename to resource/CheatMenuSA/json/mission.json diff --git a/resource/SA/CheatMenu/json/ped special.json b/resource/CheatMenuSA/json/ped special.json similarity index 100% rename from resource/SA/CheatMenu/json/ped special.json rename to resource/CheatMenuSA/json/ped special.json diff --git a/resource/SA/CheatMenu/json/ped.json b/resource/CheatMenuSA/json/ped.json similarity index 100% rename from resource/SA/CheatMenu/json/ped.json rename to resource/CheatMenuSA/json/ped.json diff --git a/resource/SA/CheatMenu/json/radar sprite.json b/resource/CheatMenuSA/json/radar sprite.json similarity index 100% rename from resource/SA/CheatMenu/json/radar sprite.json rename to resource/CheatMenuSA/json/radar sprite.json diff --git a/resource/SA/CheatMenu/json/stat.json b/resource/CheatMenuSA/json/stat.json similarity index 100% rename from resource/SA/CheatMenu/json/stat.json rename to resource/CheatMenuSA/json/stat.json diff --git a/resource/SA/CheatMenu/json/teleport.json b/resource/CheatMenuSA/json/teleport.json similarity index 100% rename from resource/SA/CheatMenu/json/teleport.json rename to resource/CheatMenuSA/json/teleport.json diff --git a/resource/SA/CheatMenu/json/weapon.json b/resource/CheatMenuSA/json/weapon.json similarity index 100% rename from resource/SA/CheatMenu/json/weapon.json rename to resource/CheatMenuSA/json/weapon.json diff --git a/resource/SA/CheatMenu/ped.txd b/resource/CheatMenuSA/ped.txd similarity index 100% rename from resource/SA/CheatMenu/ped.txd rename to resource/CheatMenuSA/ped.txd diff --git a/resource/SA/CheatMenu/textures.txd b/resource/CheatMenuSA/textures.txd similarity index 100% rename from resource/SA/CheatMenu/textures.txd rename to resource/CheatMenuSA/textures.txd diff --git a/resource/SA/CheatMenu/vehicles.txd b/resource/CheatMenuSA/vehicles.txd similarity index 100% rename from resource/SA/CheatMenu/vehicles.txd rename to resource/CheatMenuSA/vehicles.txd diff --git a/resource/SA/CheatMenu/weapon.txd b/resource/CheatMenuSA/weapon.txd similarity index 100% rename from resource/SA/CheatMenu/weapon.txd rename to resource/CheatMenuSA/weapon.txd diff --git a/resource/VC/CheatMenu/json/animation.json b/resource/CheatMenuVC/json/animation.json similarity index 100% rename from resource/VC/CheatMenu/json/animation.json rename to resource/CheatMenuVC/json/animation.json diff --git a/resource/VC/CheatMenu/json/mission.json b/resource/CheatMenuVC/json/mission.json similarity index 100% rename from resource/VC/CheatMenu/json/mission.json rename to resource/CheatMenuVC/json/mission.json diff --git a/resource/VC/CheatMenu/json/ped.json b/resource/CheatMenuVC/json/ped.json similarity index 100% rename from resource/VC/CheatMenu/json/ped.json rename to resource/CheatMenuVC/json/ped.json diff --git a/resource/VC/CheatMenu/json/skin.json b/resource/CheatMenuVC/json/skin.json similarity index 100% rename from resource/VC/CheatMenu/json/skin.json rename to resource/CheatMenuVC/json/skin.json diff --git a/resource/VC/CheatMenu/json/teleport.json b/resource/CheatMenuVC/json/teleport.json similarity index 100% rename from resource/VC/CheatMenu/json/teleport.json rename to resource/CheatMenuVC/json/teleport.json diff --git a/resource/VC/CheatMenu/json/vehicle.json b/resource/CheatMenuVC/json/vehicle.json similarity index 100% rename from resource/VC/CheatMenu/json/vehicle.json rename to resource/CheatMenuVC/json/vehicle.json diff --git a/resource/VC/CheatMenu/json/weapon.json b/resource/CheatMenuVC/json/weapon.json similarity index 100% rename from resource/VC/CheatMenu/json/weapon.json rename to resource/CheatMenuVC/json/weapon.json diff --git a/resource/SA/CheatMenu/fonts/header.ttf b/resource/SA/CheatMenu/fonts/header.ttf deleted file mode 100644 index 468cbe0..0000000 Binary files a/resource/SA/CheatMenu/fonts/header.ttf and /dev/null differ diff --git a/resource/SA/CheatMenu/fonts/text.ttf b/resource/SA/CheatMenu/fonts/text.ttf deleted file mode 100644 index 3742457..0000000 Binary files a/resource/SA/CheatMenu/fonts/text.ttf and /dev/null differ diff --git a/resource/SA/CheatMenu/fonts/title.ttf b/resource/SA/CheatMenu/fonts/title.ttf deleted file mode 100644 index 468cbe0..0000000 Binary files a/resource/SA/CheatMenu/fonts/title.ttf and /dev/null differ diff --git a/resource/VC/CheatMenu/fonts/header.ttf b/resource/VC/CheatMenu/fonts/header.ttf deleted file mode 100644 index 468cbe0..0000000 Binary files a/resource/VC/CheatMenu/fonts/header.ttf and /dev/null differ diff --git a/resource/VC/CheatMenu/fonts/text.ttf b/resource/VC/CheatMenu/fonts/text.ttf deleted file mode 100644 index 3742457..0000000 Binary files a/resource/VC/CheatMenu/fonts/text.ttf and /dev/null differ diff --git a/resource/VC/CheatMenu/fonts/title.ttf b/resource/VC/CheatMenu/fonts/title.ttf deleted file mode 100644 index 468cbe0..0000000 Binary files a/resource/VC/CheatMenu/fonts/title.ttf and /dev/null differ diff --git a/resource/III/CheatMenu/fonts/header.ttf b/resource/common/fonts/header.ttf similarity index 100% rename from resource/III/CheatMenu/fonts/header.ttf rename to resource/common/fonts/header.ttf diff --git a/resource/III/CheatMenu/fonts/text.ttf b/resource/common/fonts/text.ttf similarity index 100% rename from resource/III/CheatMenu/fonts/text.ttf rename to resource/common/fonts/text.ttf diff --git a/resource/III/CheatMenu/fonts/title.ttf b/resource/common/fonts/title.ttf similarity index 100% rename from resource/III/CheatMenu/fonts/title.ttf rename to resource/common/fonts/title.ttf diff --git a/tools/DebugAll.bat b/tools/DebugAll.bat index da6f1c0..f4ac903 100644 --- a/tools/DebugAll.bat +++ b/tools/DebugAll.bat @@ -5,3 +5,9 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Debug +%systemroot%\System32\xcopy /s "build\bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "build\bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "build\bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "build\bin\CheatMenuSA.pdb" %SA_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "build\bin\CheatMenuVC.pdb" %VC_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "build\bin\CheatMenuIII.pdb" %III_DIR% /K /D /H /Y \ No newline at end of file diff --git a/tools/DebugIII.bat b/tools/DebugIII.bat index 31a7b5e..62a6413 100644 --- a/tools/DebugIII.bat +++ b/tools/DebugIII.bat @@ -5,3 +5,5 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Debug /t:CheatMenuIII +%systemroot%\System32\xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "bin\CheatMenuIII.pdb" %III_DIR% /K /D /H /Y diff --git a/tools/DebugSA.bat b/tools/DebugSA.bat index 8723665..5ea57f8 100644 --- a/tools/DebugSA.bat +++ b/tools/DebugSA.bat @@ -5,3 +5,5 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Debug /t:CheatMenuSA +%systemroot%\System32\xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "bin\CheatMenuSA.pdb" %SA_DIR% /K /D /H /Y diff --git a/tools/DebugVC.bat b/tools/DebugVC.bat index 5b8d97d..fdcff92 100644 --- a/tools/DebugVC.bat +++ b/tools/DebugVC.bat @@ -5,3 +5,5 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Debug /t:CheatMenuVC +%systemroot%\System32\xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "bin\CheatMenuVC.pdb" %VC_DIR% /K /D /H /Y diff --git a/tools/PackAll.bat b/tools/PackAll.bat index 53f9f5f..eeda263 100644 --- a/tools/PackAll.bat +++ b/tools/PackAll.bat @@ -1,25 +1,19 @@ @echo off @REM Packs all game files into their proper archives (Yes I'm that lazy) -@REM ------------------------------------------------------ -@REM Set game paths below -set "SA_DIR="F:\GTASanAndreas"" -set "VC_DIR="E:\GTA Vice City"" -set "III_DIR="E:\GTA3"" -@REM ------------------------------------------------------ - echo ------------------------------------------------------ echo "CheatMenu Packaging Utility" echo ------------------------------------------------------ +rd /S /Q "archive" /Q cd tools echo Packing SA... -call :copyFiles %SA_DIR% "CheatMenuSA" +call :copyFiles "CheatMenuSA" echo Packing VC... -call :copyFiles %VC_DIR% "CheatMenuVC" +call :copyFiles "CheatMenuVC" echo Packing III... -call :copyFiles %III_DIR% "CheatMenuIII" -cd .. +call :copyFiles "CheatMenuIII" rd /S /Q "pack" /Q +cd .. exit @@ -30,9 +24,9 @@ exit :copyFiles -set "asiPath="%~1\%~2.asi"" -set "folderpath="%~1\CheatMenu"" -set "archivePath="..\%~2.7z"" +set "asiPath="..\build\bin\%~1.asi"" +set "folderpath="..\resource\%~1"" +set "archivePath="..\archive\%~1.7z"" @REM Remove existing files rd /S /Q "pack" /Q @@ -42,6 +36,7 @@ rd /S /Q %archivePath% /Q @REM straight xcopy doesn't seem to work on my system, broken registry? %systemroot%\System32\xcopy /s %asiPath% "pack\" /K /D /H /Y %systemroot%\System32\xcopy /s %folderpath% "pack\CheatMenu\" /K /D /H /Y +%systemroot%\System32\xcopy /s "..\resource\common\" "pack\CheatMenu\" /K /D /H /Y @REM Remove the config and versioninfo files since we don't want to distribute them del "pack\CheatMenu\json\config.json" /Q diff --git a/tools/ReleaseAll.bat b/tools/ReleaseAll.bat index 04ab256..abae4ba 100644 --- a/tools/ReleaseAll.bat +++ b/tools/ReleaseAll.bat @@ -5,3 +5,6 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Release +%systemroot%\System32\xcopy /s "build\bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "build\bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "build\bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y \ No newline at end of file diff --git a/tools/ReleaseIII.bat b/tools/ReleaseIII.bat index 0c7f912..dabe403 100644 --- a/tools/ReleaseIII.bat +++ b/tools/ReleaseIII.bat @@ -5,3 +5,4 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Release /t:CheatMenuIII +%systemroot%\System32\xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y diff --git a/tools/ReleaseSA.bat b/tools/ReleaseSA.bat index 0536c09..c63938a 100644 --- a/tools/ReleaseSA.bat +++ b/tools/ReleaseSA.bat @@ -5,3 +5,4 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Release /t:CheatMenuSA +%systemroot%\System32\xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y diff --git a/tools/ReleaseVC.bat b/tools/ReleaseVC.bat index 77c219f..bb66153 100644 --- a/tools/ReleaseVC.bat +++ b/tools/ReleaseVC.bat @@ -5,3 +5,4 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Release /t:CheatMenuVC +%systemroot%\System32\xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y diff --git a/tools/Setup.bat b/tools/Setup.bat index e7f0613..1a6f7b0 100644 --- a/tools/Setup.bat +++ b/tools/Setup.bat @@ -1,5 +1,11 @@ rem Generate visual studio files and run the devcmd init @echo off + +rem Set game paths below +set "SA_DIR="F:\GTASanAndreas"" +set "VC_DIR="E:\GTA Vice City"" +set "III_DIR="E:\GTA3"" + cd tools premake5.exe vs2022 cd ../build diff --git a/tools/premake5.lua b/tools/premake5.lua index d5dd744..e1595aa 100644 --- a/tools/premake5.lua +++ b/tools/premake5.lua @@ -17,12 +17,6 @@ if (PSDK_DIR == nil) then error("PLUGIN_SDK_DIR environment variable not set") end --- Build directories ----------------------------- -GTASA_DIR = "F:/GTASanAndreas" -GTAVC_DIR = "E:/GTA Vice City" -GTA3_DIR = "E:/GTA3" - ---------------------------- workspace "CheatMenu" @@ -34,10 +28,10 @@ workspace "CheatMenu" characterset "MBCS" staticruntime "On" location "../build" + targetdir "../build/bin" project "Depend" kind "StaticLib" - targetdir "../build/bin" files { "../depned/**.h", @@ -57,7 +51,6 @@ project "Depend" project "CheatMenuIII" kind "SharedLib" - targetdir (GTA3_DIR) targetextension ".asi" files { @@ -151,7 +144,6 @@ project "CheatMenuIII" project "CheatMenuVC" kind "SharedLib" - targetdir (GTAVC_DIR) targetextension ".asi" files { @@ -244,7 +236,6 @@ project "CheatMenuVC" project "CheatMenuSA" kind "SharedLib" - targetdir (GTASA_DIR) targetextension ".asi" files {