v13

voicemxil · Aug 5, 2023 · 21572df · 21572df
1 parent 2e6074e
commit 21572df
Show file tree

Hide file tree

Showing 8 changed files with 842 additions and 8 deletions.
diff --git a/bin/Standalone Installer/TS2StarterPack-StandaloneInstaller.x32.exe b/bin/Standalone Installer/TS2StarterPack-StandaloneInstaller.x32.exe
diff --git a/bin/Standalone Installer/TS2StarterPack-StandaloneInstaller.x64.exe b/bin/Standalone Installer/TS2StarterPack-StandaloneInstaller.x64.exe
diff --git a/bin/Web Installer/TS2StarterPack-WebInstaller.x32.exe b/bin/Web Installer/TS2StarterPack-WebInstaller.x32.exe
diff --git a/bin/Web Installer/TS2StarterPack-WebInstaller.x64.exe b/bin/Web Installer/TS2StarterPack-WebInstaller.x64.exe
diff --git a/src/Standalone_Installer.nsi b/src/Standalone_Installer.nsi
@@ -227,17 +227,10 @@ SectionGroup /e "Graphical Fixes\Tweaks"
 		SectionInstType ${IT_FULL} ${IT_AMD}
 
 		SetOutPath "$INSTDIR\temp"
-		${If} ${RunningX64}
 			File "..\components\GraphicsRulesMaker-2.3.0-win64.exe"
 			Pop $0 # return value = exit code, "OK" means OK
 			Rename GraphicsRulesMaker-2.3.0-win64.exe grm_install.exe
 			DetailPrint "GRM extract status: $0. Executing installer..." 
-		${Else}
-			File "..\components\GraphicsRulesMaker-2.3.0-win32.exe"
-			Pop $0 
-			Rename GraphicsRulesMaker-2.3.0-win32.exe grm_install.exe
-			DetailPrint "GRM extract status: $0. Executing installer..." 
-		${EndIf}
 		Execwait $INSTDIR\temp\grm_install.exe
 		Delete $INSTDIR\temp\grm_install.exe
 	SectionEnd

diff --git a/src/Standalone_Installer_32.nsi b/src/Standalone_Installer_32.nsi
diff --git a/src/Web_Installer.nsi b/src/Web_Installer.nsi
@@ -316,7 +316,7 @@ SectionGroupEnd
 
 Section "Store & Preorder/Bonus Content" Section9
 	AddSize 360000
-	SetOutPath "$INSTDIR/temp"
+	SetOutPath "$INSTDIR\temp"
 		NScurl::http GET "https://github.com/voicemxil/TS2-Starter-Pack/raw/v13/components/Store_Content/Install_Folder.7z" "$INSTDIR\temp\Install_Folder.7z" /RESUME /END
 		Pop $0
 		DetailPrint "Install_Folder.7z download result: $0"		
@@ -424,6 +424,7 @@ SectionEnd
 
 Section
 	RMDir /r "$INSTDIR\temp"
+	sleep 20000
 	ExecShell "open" "$INSTDIR\Fun with Pets\SP9\TSBin"
 SectionEnd
 

diff --git a/src/Web_Installer_32.nsi b/src/Web_Installer_32.nsi