Skip to content
This repository has been archived by the owner on Apr 15, 2024. It is now read-only.

Commit

Permalink
add ctsj2 to Latest Greatest
Browse files Browse the repository at this point in the history
This also involves adding support for downloads not (yet) hosted at Quaddicted.

Some minor changelog tweaks here too.
  • Loading branch information
neogeographica committed Aug 8, 2022
1 parent fd306a0 commit d1d38c9
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docsource/basic/running.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Once you get to a page that shows a list of addons, each item in the list will h

After that sequence has finished (or if you select an already-installed addon from the menu), Quakestarter will give you options that allow you to launch or uninstall the addon, or return to the previous menu. These options should be pretty self-explanatory, but they're covered in more detail in the :doc:`Running With Quakestarter<../maps_and_mods/running_with_quakestarter>` chapter.

**Note:** If you use Shift+Enter to submit your choice, rather than just Enter, then Quakestarter will open the Quaddicted review page for that choice rather than going into the usual install/manage/launch process. If you do this, keep Shift pressed down until the web page opens. (This will happen quickly, so don't sit around forever jamming on that Shift key if something goes wrong.) The web page will be opened with whatever web browser is registered with Windows as the default.
**Note:** If you use Shift+Enter to submit your choice, rather than just Enter, then Quakestarter will open the Quaddicted review page for that choice rather than going into the usual install/manage/launch process -- or in the Latest Greatest menu, it may show some other webpage if the release is not on Quaddicted yet. If you do this, keep Shift pressed down until the web page opens. (This will happen quickly, so don't sit around forever jamming on that Shift key if something goes wrong.) The web page will be opened with whatever web browser is registered with Windows as the default.

Using Quakestarter is the easiest way to correctly launch these addons, but it can only run the same addons that it knows how to install. Once you branch out into playing other stuff, you'll need to use Simple Quake Launcher 2 or other methods.

Expand Down
6 changes: 4 additions & 2 deletions docsource/other_stuff/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Changelog

.. rubric:: v3.3.0 (Aug 2022)

This release introduces an autoupdate feature for Quakestarter, as well as the ability to trigger the update process using a manually downloaded zipfile if you'd rather do that. These features are discussed in detail in the :doc:`Updating Quakestarter<upgrading_quakestarter>` chapter (under Other Topics).
This release introduces an autoupdate feature for Quakestarter, as well as the ability to trigger the update process using a manually downloaded zipfile if you'd rather do that. Autoupdate covers not only the Quakestarter scripts but also vkQuake and Ironwail (unless you are using a "noengine" bundle). These features are discussed in detail in the :doc:`Updating Quakestarter<upgrading_quakestarter>` chapter (under Other Topics).

If you're updating *to* v3.3.0 from an earlier release, you don't have this feature yet! You'll still have to do the manual "overwrite your current files with the contents of the zip" kind of update process one last time. (And actually you can still continue to do Quakestarter updates that way in the future, if you want.)

Expand All @@ -13,10 +13,11 @@ Assuming the autoupdate feature is a keeper, it will be more reasonable to promp

Other stuff in this release:

* Update docs to reflect that the Windows version of Quake Injector no longer relies on a system Java installation.
* Update the docs here and there with various improvements. Probably the most significant change is to note that the Windows version of Quake Injector no longer relies on a system Java installation.
* `Quake Sewer Jam`_ has had a bit of a ratings bump that brings it out of the "legacies" menu and back into the Post-AD episodes menu.
* Rename the "The Age of Jams" category to "The Coming of the Jams", since obviously we still have a lot of jams going on! Also rename "The New Hotness" to "The Next Generation" since it's become more of a standard "era" category now rather than just sort-of-recent-stuff.
* Speaking of which: add a new "The Latest Greatest" category which is specifically for recent high-profile releases (as determined by me, I guess). Check out that menu page for more explanation on how it works.
* Inaugrate "The Latest Greatest" with a few recent releases that are still less than six months old, and also add the super-new release of `Coppertone Summer Jam 2`_ there.


.. rubric:: v3.2.0 (Jul 2022)
Expand Down Expand Up @@ -358,6 +359,7 @@ For older changelog entries, see the `1.x changelog`_ archived on GitHub.

.. _quakestarter.com: http://quakestarter.com
.. _Quake Sewer Jam: https://www.quaddicted.com/reviews/sewerjam.html
.. _Coppertone Summer Jam 2: https://www.slipseer.com/index.php?resources/coppertone-summer-jam-2.103
.. _vkQuake: https://github.com/Novum/vkQuake
.. _Ironwail: https://github.com/andrei-drexler/ironwail
.. _Slipgate Sightseer: https://www.slipseer.com/
Expand Down
16 changes: 13 additions & 3 deletions quakestarter_scripts/_handle_mod_choice.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
REM Helper "subroutine" script to process a mod-installer menu choice.

REM On the commandline, the addon_name arg is required.
REM On the commandline, the addon_name arg is required. A second argument
REM specifying the download URL is optional; if omitted (as usual) then the
REM URL is implicitly for the named addon at Quaddicted.

REM The caller is also required to set the basedir and quake_exe variables.

Expand Down Expand Up @@ -70,13 +72,21 @@ if %errorlevel% equ 0 (
if "%review_page%"=="" (
start /b https://www.quaddicted.com/reviews/%addon_name%.html
) else (
start /b https://www.quaddicted.com/reviews/%review_page%.html
if not "%review_page%"=="%review_page:https://=%" (
start /b %review_page%
) else (
start /b https://www.quaddicted.com/reviews/%review_page%.html
)
)
goto :eof
)

set archive=%addon_name%.zip
set url=https://www.quaddicted.com/filebase/%archive%
if "%2"=="" (
set url=https://www.quaddicted.com/filebase/%archive%
) else (
set url=%~2
)
if "%renamed_gamedir%"=="" (
set gamedir=%1
) else (
Expand Down
4 changes: 2 additions & 2 deletions quakestarter_scripts/_install_mod.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ set destfile=%basedir%\%download_subdir%\%~nx1
set gamedir=%~2
if "%gamedir%"=="%~n1" (
if not "%less_chatty_install%"=="true" (
echo Installing mod "%gamedir%"...
echo Installing "%gamedir%"...
)
) else (
if not "%less_chatty_install%"=="true" (
echo Installing mod "%~n1" as "%gamedir%"...
echo Installing "%~n1" as "%gamedir%"...
)
)

Expand Down
14 changes: 12 additions & 2 deletions quakestarter_scripts/recent.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ cls
call :installed_check plaw02
call :installed_check markiesm1v2
call :installed_check sm_217
call :installed_check ctsj2
echo.
echo This menu is a selection of high-profile releases from the past six months. A
echo release in this category can also eventually appear in one of the "The Next
Expand All @@ -63,11 +64,12 @@ echo.
echo %is_plaw02_installed% 1: plaw02 - Waldsterben
echo %is_markiesm1v2_installed% 2: markiesm1v2 - Slip Tripping
echo %is_sm_217_installed% 3: sm_217 - Remaster Textures
echo %is_ctsj2_installed% 4: ctsj2 - Coppertone Summer Jam 2
echo.
echo Enter a number to install/launch/manage one of the releases above.
echo.
echo Or, to just view its Quaddicted page, use Shift+Enter to submit your
echo choice; keep holding shift until the webpage opens.
echo Or, to just view its webpage (at Quaddicted or elsewhere), use Shift+Enter to
echo submit your choice; keep holding shift until the webpage opens.
echo.
set menu_choice=:eof
set /p menu_choice=enter your choice or just press Enter to exit:
Expand Down Expand Up @@ -100,6 +102,14 @@ set skip_quakerc_gen=true
call "%scriptspath%_handle_mod_choice.cmd" sm_217
goto :menu

REM Coppertone Summer Jam 2 should age out after 2/8/2023
:4
set review_page=https://www.slipseer.com/index.php?resources/coppertone-summer-jam-2.103
set start_map=start
set skip_quakerc_gen=true
call "%scriptspath%_handle_mod_choice.cmd" ctsj2 https://www.slipseer.com/index.php?resources/coppertone-summer-jam-2.103/download
goto :menu


REM functions used above

Expand Down

0 comments on commit d1d38c9

Please sign in to comment.