Merge branch 'release/3.1.0' into main

docsource/conf.py

@@ -59,7 +59,7 @@
 # built documents.
 #
 # The full version, including any pre-release tag.
-release = '3.0.0'
+release = '3.1.0'
 # And without that tag.
 version = release.split('-')[0]
 

docsource/other_stuff/changelog.rst

@@ -1,6 +1,31 @@
 Changelog
 =========
 
+.. rubric:: v3.1.0 (Jun 2022)
+
+This release is purely about updating the lists of installables. Four 2022 releases have popped up just over the ratings threshold, but interestingly so have several older releases all the way back to 1997. For this release I'm experimenting with doing a little blurb for each addition, so here's a rundown from newest to oldest.
+
+In the New Hotness menus (Episodes and Other):
+
+* Speedmap event #217 was themed on `Remaster Textures`_ (2022, in Episodes) from the Quake re-release; this new coat of paint got the creative juices flowing for some old hands and new blood.
+* `Slip Tripping`_ (2022, in Other) is a polished bite-sized gem from Markie_, the multi-talented mapper behind the `Quake Builder`_ and `Markie Music`_ channels.
+* Waldsterben_ (2022, in Other) from `Paul Lawitzki`_ is a unique Copper_-based offering that shows off one of the best "forest" environments you'll see in Quake.
+* `January Jump Jam 2`_ (2022, in Episodes) takes the "jump boots" powerup out for a shakedown cruise, using the Alkaline_ mod.
+
+And in the other menus:
+
+* `The Elder Reality`_ (2016, in Other - The Age of Jams) is an artful tribute to the maps of Episode 4, from PuLSaR_ who is no stranger to these lists.
+* `Deathmatch Classics Vol. 3`_ (2011, in Episodes - Modern) -- returning from its exile in the "legacies" menu -- brings together heavy hitters to spin SP interpretations of DM maps from id and the community.
+* `A Roman Wilderness Of Pain`_ (2009, in Other - Post-Quoth), also returning from "legacies", delivers epic scale like only Tronyn_ can. Check out the `retrospective about this mapset`_ while you're here!
+* `This Onion`_ (2007, in Other - Post-Quoth) from `Mike Woodham`_, a moody and quirky adventure, is the final entry here to escape from "legacies" with a ratings boost. (Curiously `its sequel/remake`_ is still a hair short of doing likewise.)
+* Antediluvian_ (2005, in Other - Classic) is a classic wind-tunnels-inspired level from Rubicon_ mapper, `Quake engine`_ coder, and func_msgboard_ host (whew) John Fitzgibbons. 
+* `Quake Condensed`_ (2004, in Episodes - Modern) by `R.P.G.`_ is a neat recapitulation of the original Quake campaign map themes in five small pieces.
+* Biotoxin_ (2001, in Other - Classic) is yet another czg_ creation for our lists, notable for being constructed out of only 100 brushes.
+* Arcane_ (1997, in Other - Classic) is our earliest entry. It's also the last and probably best release from `Matt Sefton`_, who was not only a standout 1996/97 mapper but was also among the first reputable Quake map reviewers.
+
+Also of course a few bugfixes have snuck in. Deathmatch Classics Vol. 3 and Paradise Sickness (in "legacies") have added patches. Also I've eliminated a warning message that would show when Quakestarter looked for pakfiles/music on a system that didn't have Steam library folders configured.
+
+
 .. rubric:: v3.0.0 (Apr 2022)
 
 Some interesting high-visibility changes here, and some changes to the file structure, so let's do a major version bump. Welcome to Quakestarter 3.0.0!
@@ -292,6 +317,35 @@ OK, let's get to the changelist.
 For older changelog entries, see the `1.x changelog`_ archived on GitHub.
 
 
+.. _Remaster Textures: https://www.quaddicted.com/reviews/sm_217.html
+.. _Slip Tripping: https://www.quaddicted.com/reviews/markiesm1v2.html
+.. _Markie: https://www.quaddicted.com/reviews/?filtered=markie
+.. _Quake Builder: https://www.youtube.com/user/mikedm92
+.. _Markie Music: https://www.youtube.com/c/MarkieMusic
+.. _Waldsterben: https://www.quaddicted.com/reviews/plaw02.html
+.. _Paul Lawitzki: https://www.quaddicted.com/reviews/?filtered=paul+lawitzki
+.. _Copper: http://lunaran.com/copper/
+.. _January Jump Jam 2: https://www.quaddicted.com/reviews/jjj2.html
+.. _Alkaline: https://alkalinequake.wordpress.com/
+.. _The Elder Reality: https://www.quaddicted.com/reviews/retrojam4dlc_pulsar.html
+.. _PuLSaR: https://www.quaddicted.com/reviews/?filtered=pulsar
+.. _Deathmatch Classics Vol. 3: https://www.quaddicted.com/reviews/dmc3.html
+.. _A Roman Wilderness Of Pain: https://www.quaddicted.com/reviews/arwop.html
+.. _Tronyn: https://www.quaddicted.com/reviews/?filtered=tronyn
+.. _retrospective about this mapset: https://www.quaddicted.com/articles/a_history_of_a_roman_wilderness_of_pain_1999-2009_by_tronyn_2009
+.. _This Onion: https://www.quaddicted.com/reviews/fmb_bdg.html
+.. _Mike Woodham: https://www.quaddicted.com/reviews/?filtered=mike+woodham
+.. _its sequel/remake: https://www.quaddicted.com/reviews/fmb_bdg2.html
+.. _Antediluvian: https://www.quaddicted.com/reviews/ant.html
+.. _Rubicon: https://www.quaddicted.com/reviews/?filtered=metlslime+rubicon
+.. _Quake engine: https://celephais.net/fitzquake/
+.. _func_msgboard: https://www.celephais.net/board/forum.php
+.. _Quake Condensed: https://www.quaddicted.com/reviews/rpgsmse.html
+.. _R.P.G.: https://www.quaddicted.com/reviews/?filtered=R.P.G.
+.. _Biotoxin: https://www.quaddicted.com/reviews/czgtoxic.html
+.. _czg: https://www.quaddicted.com/reviews/?filtered=czg
+.. _Arcane: https://www.quaddicted.com/reviews/arcane.html
+.. _Matt Sefton: https://www.quaddicted.com/reviews/?filtered=matt+sefton
 .. _The Castle of Koohoo: https://www.quaddicted.com/reviews/koohoo.html
 .. _Koohoo-themed retrojam: https://www.quaddicted.com/reviews/retrojam7.html
 .. _sm198: https://www.quaddicted.com/reviews/sm198.html

quakestarter_scripts/_handle_mod_choice.cmd

@@ -21,6 +21,7 @@ REM   postlaunch_msg (array of msg lines, must end with blank line)
 REM   skip_quakerc_gen
 REM   modsettings (array of cfg lines, must end with blank line)
 REM   startdemos
+REM   junkdirs
 
 setlocal
 
@@ -131,6 +132,8 @@ if "%multigame_support%"=="auto" (
 
 REM base game check and (in some cases) install
 set saved_skip_quakerc_gen=%skip_quakerc_gen%
+set saved_junkdirs=%junkdirs%
+set junkdirs=
 set last_base_game=%base_game%
 set check_basegame_changed=false
 set basegame_changed=false
@@ -229,6 +232,7 @@ if "%base_game%"=="rogue" (
 )
 
 set skip_quakerc_gen=%saved_skip_quakerc_gen%
+set junkdirs=%saved_junkdirs%
 
 REM mod install and possibly patch(es)
 if not exist "%basedir%\%gamedir%" (

quakestarter_scripts/_install_mod.cmd

@@ -10,6 +10,7 @@ REM Optional args will be specified through these variables:
 REM   skip_quakerc_gen
 REM   modsettings (array of cfg lines, must end with blank line)
 REM   startdemos
+REM   junkdirs
 
 setlocal
 
@@ -128,6 +129,9 @@ if "%cleanup_archive%"=="true" (
 REM now get in that dir and clean it up
 echo ... organizing ...
 pushd "%basedir%\%gamedir%"
+if not "%junkdirs%"=="" (
+  rd /q /s %junkdirs% >nul
+)
 :organizedirs
 REM Delete any configs and old custom-engine stuff.
 del /q *.bat *.cmd *.exe *.dll config.cfg >nul 2>&1

quakestarter_scripts/_install_quakefiles.cmd

@@ -57,7 +57,7 @@ if exist "%dest%" goto :eof
 call :reg_query_path_root_and_copy "HKLM\SOFTWARE\WOW6432Node\Bethesda Softworks\Bethesda.net" installLocation "games\Quake"
 if exist "%dest%" goto :eof
 
-REM also check through all Steam library folders
+REM also check through any Steam library folders
 reg query "HKCU\SOFTWARE\Valve\Steam" /v "SteamPath" > nul 2>&1
 if %errorlevel% neq 0 (
   goto :search
@@ -66,6 +66,9 @@ for /f "tokens=2,* skip=2" %%a in ('reg query "HKCU\SOFTWARE\Valve\Steam" /v "St
   set steampath="%%b"
 )
 set vdfpath=%steampath%\config\libraryfolders.vdf
+if not exist "%vdfpath%" (
+  goto :search
+)
 setlocal EnableDelayedExpansion
 for /f "tokens=*" %%l in ('findstr \"path\" %vdfpath%') do (
   for /f "tokens=* delims= " %%s in ("%%l") do (

quakestarter_scripts/episodes_classic.cmd

@@ -48,6 +48,7 @@ set postlaunch_msg[0]=
 set skip_quakerc_gen=false
 set modsettings[0]=
 set startdemos=
+set junkdirs=
 cls
 call :installed_check prodigy_se
 call :installed_check bbelief

quakestarter_scripts/episodes_latest.cmd

@@ -45,6 +45,7 @@ set postlaunch_msg[0]=
 set skip_quakerc_gen=false
 set modsettings[0]=
 set startdemos=
+set junkdirs=
 cls
 call :installed_check ctsj
 call :installed_check dwellv1p2
@@ -57,8 +58,10 @@ call :installed_check pun
 call :installed_check alkjam
 call :installed_check alkaline1.1
 call :installed_check xmasjam2021
+call :installed_check jjj2
 call :installed_check sm215
 call :installed_check snack2
+call :installed_check sm_217
 echo.
 echo Selected custom episodes/hubs released from 2020 through 2022:
 echo %is_ctsj_installed%  1: ctsj - Coppertone Summer Jam
@@ -72,8 +75,10 @@ echo %is_pun_installed%  8: pun - The Punishment Due
 echo %is_alkjam_installed%  9: alkjam - Alkaline Jam
 echo %is_alkaline1.1_installed% 10: alkaline1.1 - Alkaline 1.1
 echo %is_xmasjam2021_installed% 11: xmasjam2021 - Xmas Jam 2021
-echo %is_sm215_installed% 12: sm215 - Quad Run
-echo %is_snack2_installed% 13: snack2 - Speedmap Snack Pack 2 - Cosmic Hunger
+echo %is_jjj2_installed% 12: jjj2 - January Jump Jam 2
+echo %is_sm215_installed% 13: sm215 - Quad Run
+echo %is_snack2_installed% 14: snack2 - Speedmap Snack Pack 2 - Cosmic Hunger
+echo %is_sm_217_installed% 15: sm_217 - Remaster Textures
 echo.
 echo Enter a number to install/launch/manage one of the releases above.
 echo.
@@ -154,16 +159,29 @@ call "%scriptspath%_handle_mod_choice.cmd" xmasjam2021
 goto :menu
 
 :12
+set patch_url=https://neogeographica-downloads.s3.amazonaws.com/tools/quakestarter/jjj2_ish.zip
 set start_map=start
-call "%scriptspath%_handle_mod_choice.cmd" sm215
+set skip_quakerc_gen=true
+call "%scriptspath%_handle_mod_choice.cmd" jjj2
 goto :menu
 
 :13
 set start_map=start
+call "%scriptspath%_handle_mod_choice.cmd" sm215
+goto :menu
+
+:14
+set start_map=start
 set skip_quakerc_gen=true
 call "%scriptspath%_handle_mod_choice.cmd" snack2
 goto :menu
 
+:15
+set start_map=start
+set skip_quakerc_gen=true
+call "%scriptspath%_handle_mod_choice.cmd" sm_217
+goto :menu
+
 
 REM functions used above
 

quakestarter_scripts/episodes_modern.cmd

@@ -45,17 +45,20 @@ set postlaunch_msg[0]=
 set skip_quakerc_gen=false
 set modsettings[0]=
 set startdemos=
+set junkdirs=
 cls
 call :installed_check oum
 call :installed_check rapture
 call :installed_check soe_full
 call :installed_check contract
+call :installed_check rpgsmse
 call :installed_check terra
 call :installed_check warpspasm
 call :installed_check travail
 call :installed_check rmx-pack
 call :installed_check nsoe2
 call :installed_check arcanum
+call :installed_check dmc3
 call :installed_check unforgiven
 call :installed_check rrp
 call :installed_check mapjam6
@@ -65,15 +68,17 @@ echo %is_oum_installed%  1: oum - Operation: Urth Majik ^(2001^)
 echo %is_rapture_installed%  2: rapture - Rapture ^(2001^)
 echo %is_soe_full_installed%  3: soe_full - Soul of Evil ^(2002^)
 echo %is_contract_installed%  4: contract - Contract Revoked ^(2002^)
-echo %is_terra_installed%  5: terra - Terra ^(2005^)
-echo %is_warpspasm_installed%  6: warpspasm - Warp Spasm ^(2007^)
-echo %is_travail_installed%  7: travail - Travail ^(2007^)
-echo %is_rmx-pack_installed%  8: rmx-pack - Remix Map Pack ^(2008^)
-echo %is_nsoe2_installed%  9: nsoe2 - Soul of Evil: Indian Summer ^(2008^)
-echo %is_arcanum_installed% 10: arcanum - Arcanum ^(2011^)
-echo %is_unforgiven_installed% 11: unforgiven - Unforgiven ^(2011^)
-echo %is_rrp_installed% 12: rrp - Rubicon Rumble Pack ^(2014^)
-echo %is_mapjam6_installed% 13: mapjam6 - Func Map Jam 6 - Fire and Brimstone ^(2015^)
+echo %is_rpgsmse_installed%  5: rpgsmse - Quake Condensed ^(2004^)
+echo %is_terra_installed%  6: terra - Terra ^(2005^)
+echo %is_warpspasm_installed%  7: warpspasm - Warp Spasm ^(2007^)
+echo %is_travail_installed%  8: travail - Travail ^(2007^)
+echo %is_rmx-pack_installed%  9: rmx-pack - Remix Map Pack ^(2008^)
+echo %is_nsoe2_installed% 10: nsoe2 - Soul of Evil: Indian Summer ^(2008^)
+echo %is_arcanum_installed% 11: arcanum - Arcanum ^(2011^)
+echo %is_dmc3_installed% 12: dmc3 - Deathmatch Classics Vol. 3 ^(2011^)
+echo %is_unforgiven_installed% 13: unforgiven - Unforgiven ^(2011^)
+echo %is_rrp_installed% 14: rrp - Rubicon Rumble Pack ^(2014^)
+echo %is_mapjam6_installed% 15: mapjam6 - Func Map Jam 6 - Fire and Brimstone ^(2015^)
 echo.
 echo Enter a number to install/launch/manage one of the releases above.
 echo.
@@ -113,19 +118,24 @@ call "%scriptspath%_handle_mod_choice.cmd" contract
 goto :menu
 
 :5
+set start_map=rpgsmse1
+call "%scriptspath%_handle_mod_choice.cmd" rpgsmse
+goto :menu
+
+:6
 set start_map=terra1
 call "%scriptspath%_handle_mod_choice.cmd" terra
 goto :menu
 
-:6
+:7
 set base_game=quoth
 set start_map=start
 set skip_quakerc_gen=true
 set startdemos=demo1 demo2 demo3
 call "%scriptspath%_handle_mod_choice.cmd" warpspasm
 goto :menu
 
-:7
+:8
 set patch_url=https://neogeographica-downloads.s3.amazonaws.com/tools/quakestarter/quake_travail_soundtrack.zip
 set start_map=start
 set startdemos=demo1 demo2 demo3
@@ -135,37 +145,43 @@ set modsettings[2]=
 call "%scriptspath%_handle_mod_choice.cmd" travail
 goto :menu
 
-:8
+:9
 set start_map=start
 call "%scriptspath%_handle_mod_choice.cmd" rmx-pack
 goto :menu
 
-:9
+:10
 set start_map=start
 set startdemos=demo1 demo2
 call "%scriptspath%_handle_mod_choice.cmd" nsoe2
 goto :menu
 
-:10
+:11
 set patch_url=https://www.quaddicted.com/filebase/drake290111.zip
 REM unlike other patches the Drake mod is really truly always required here
 set patch_required=true
 set start_map=arcstart
 call "%scriptspath%_handle_mod_choice.cmd" arcanum
 goto :menu
 
-:11
+:12
+set patch_url=https://quaketastic.com/files/single_player/maps/dmc3m8_hotfix.zip
+set start_map=dmc3
+call "%scriptspath%_handle_mod_choice.cmd" dmc3
+goto :menu
+
+:13
 set start_map=unfstart
 call "%scriptspath%_handle_mod_choice.cmd" unforgiven
 goto :menu
 
-:12
+:14
 set start_map=start
 set skip_quakerc_gen=true
 call "%scriptspath%_handle_mod_choice.cmd" rrp
 goto :menu
 
-:13
+:15
 set start_map=start
 set startdemos=demo1
 set modsettings[0]=r_wateralpha 1

quakestarter_scripts/episodes_post_ad.cmd

@@ -45,6 +45,7 @@ set postlaunch_msg[0]=
 set skip_quakerc_gen=false
 set modsettings[0]=
 set startdemos=
+set junkdirs=
 cls
 call :installed_check dopa
 call :installed_check gotshun-never-released_levels