Merge branch 'release/1.10'

neogeographica · Mar 13, 2020 · 0bba585 · 0bba585
2 parents 8267d77 + 7eb1a24
commit 0bba585
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,8 @@
+**** v1.10 (Mar 2020)
+
+- Updated with the rest of the qualifying releases from 2018. Among "Latest episodes", added: the DLC patch for DM4 Jam, Halloween Jam, and Xmas Jam. Among "Other highly-rated maps", added The Grim Outpost. Will probably add 2019 releases soon-ish but I want to make sure scores have had time to settle.
+
+
 **** v1.9 (Jul 2019)
 
 - Replaced broken soundtrack links.

diff --git a/README_FIRST.txt b/README_FIRST.txt
@@ -15,7 +15,7 @@ You might want to keep an eye out in the future for a newer release of Mark V. Y
 
 The included version of Mark V is 1.99 from May 2018.
 
-As for this whole package of stuff, it's version 1.9. If you want to see what has changed since the previous releases, see "CHANGELOG.txt".
+As for this whole package of stuff, it's version 1.10. If you want to see what has changed since the previous releases, see "CHANGELOG.txt".
 
 If you've been using a previous version of this package, you can overwrite those files with the ones from this new release; that won't hurt whatever Quake configuration you've set up. Do check the changelog though to see if there's anything in particular you need to know about changes between this and previous versions.
 

diff --git a/installers/install_2016_episodes.bat b/installers/install_2016_episodes.bat
@@ -30,6 +30,8 @@ call :installed_check func_mapjam9_2
 call :installed_check qump
 call :installed_check ad_v1_70final
 call :installed_check dm4jam
+call :installed_check hwjam
+call :installed_check xmasjam2018
 echo(
 echo Custom episodes released in 2016 or later:
 echo %dopa_installed%  1: dopa - Dimension of the Past ^(2016^)
@@ -38,6 +40,8 @@ echo %func_mapjam9_2_installed%  3: func_mapjam9_2 - Func Map Jam 9 - Contract R
 echo %qump_installed%  4: qump - Quake Upstart Mapping Project ^(2017^)
 echo %ad_v1_70final_installed%  5: ad_v1_70final - Arcane Dimensions 1.7 ^(2017^)
 echo %dm4jam_installed%  6: dm4jam - DM4 Jam ^(2018^)
+echo %hwjam_installed%  7: hwjam - Halloween Jam 2018 ^(2018^)
+echo %xmasjam2018_installed%  8: xmasjam2018 - Xmas Jam 2018 - 1024^^3 theme ^(2018^)
 echo(
 set menu_choice=menu_exit
 set /p menu_choice=choose a number or just press Enter to exit:
@@ -138,15 +142,63 @@ pause
 goto :menu
 
 :6
+REM for DM4 Jam also install the "DLC"
+set dm4jam_dlc_patch_success=
 if not exist dm4jam (
   call "%~dp0\_mod_install.cmd" dm4jam
+  if exist dm4jam (
+    call "%~dp0\_mod_patch_install.cmd" http://www.quaddicted.com/filebase/dm4jam_dlc_patch.zip dm4jam
+  )
+)
+if "%dm4jam_dlc_patch_success%"=="false" (
+  rd /q /s dm4jam
+  echo Failed to apply the "DLC" patch; rolled back the mod install. Maybe try
+  echo again? If you really want to install just the unpatched mod, you can
+  echo enter "install dm4jam" in the Mark V console.
+  echo(
+  pause
+  goto :menu
 )
 if exist dm4jam (
   call "%~dp0\_mod_launch.cmd" dm4jam start
 )
 pause
 goto :menu
 
+:7
+if not exist hwjam (
+  call "%~dp0\_mod_install.cmd" hwjam
+)
+if exist hwjam (
+  call "%~dp0\_mod_launch.cmd" hwjam start
+)
+pause
+goto :menu
+
+:8
+REM for Xmas Jam 2018 also install the patch for Shotro's map
+set xmasjam2_shotro_success=
+if not exist xmasjam2018 (
+  call "%~dp0\_mod_install.cmd" xmasjam2018
+  if exist xmasjam2018 (
+    call "%~dp0\_mod_patch_install.cmd" http://neogeographica-downloads.s3.amazonaws.com/tools/quakestarter/xmasjam2_shotro.zip xmasjam2018
+  )
+)
+if "%xmasjam2_shotro_success%"=="false" (
+  rd /q /s xmasjam2018
+  echo Failed to apply patch; rolled back the mod install. Maybe try again?
+  echo If you really want to install just the unpatched mod, you can enter
+  echo "install xmasjam2018" in the Mark V console.
+  echo(
+  pause
+  goto :menu
+)
+if exist xmasjam2018 (
+  call "%~dp0\_mod_launch.cmd" xmasjam2018 start
+)
+pause
+goto :menu
+
 :menu_exit
 popd
 goto :eof

diff --git a/installers/install_other_picks_2.bat b/installers/install_other_picks_2.bat
@@ -34,6 +34,7 @@ call :installed_check func_mapjam1
 call :installed_check func_mapjam2
 call :installed_check func_mapjam3
 call :installed_check retrojam6
+call :installed_check grim_rezipped
 echo(
 echo A selection of other maps ^(part 2^):
 echo %honey_installed% 17: honey - Honey ^(2012^)
@@ -47,6 +48,7 @@ echo %func_mapjam1_installed% 24: func_mapjam1 - Func Map Jam 1 - Honey Theme ^(
 echo %func_mapjam2_installed% 25: func_mapjam2 - Func Map Jam 2 - IKblue/IKwhite Theme ^(2014^)
 echo %func_mapjam3_installed% 26: func_mapjam3 - Func Map Jam 3 - Zerstoerer theme ^(2014^)
 echo %retrojam6_installed% 27: retrojam6 - Retro Jam 6 - Egyptian theme ^(2017^)
+echo %grim_rezipped_installed% 28: grim_rezipped - The Grim Outpost ^(2018^)
 echo(
 set menu_choice=menu_exit
 set /p menu_choice=choose a number or just press Enter to exit:
@@ -215,6 +217,16 @@ if exist retrojam6 (
 pause
 goto :menu
 
+:28
+if not exist grim_rezipped (
+  call "%~dp0\_mod_install.cmd" grim_rezipped
+)
+if exist grim_rezipped (
+  call "%~dp0\_mod_launch.cmd" grim_rezipped grim
+)
+pause
+goto :menu
+
 :menu_exit
 popd
 goto :eof

diff --git a/installers/mod_extras/grim_rezipped/quake.rc b/installers/mod_extras/grim_rezipped/quake.rc
@@ -0,0 +1,10 @@
+// load the base configuration
+exec default.cfg
+// load the last saved configuration
+exec config.cfg
+// run a user script file if present
+exec autoexec.cfg
+// stuff command line statements
+stuffcmds
+// no special demos to run
+//startdemos demo1 demo2 demo3
diff --git a/installers/mod_extras/hwjam/quake.rc b/installers/mod_extras/hwjam/quake.rc
@@ -0,0 +1,10 @@
+// load the base configuration
+exec default.cfg
+// load the last saved configuration
+exec config.cfg
+// run a user script file if present
+exec autoexec.cfg
+// stuff command line statements
+stuffcmds
+// no special demos to run
+//startdemos demo1 demo2 demo3
diff --git a/readmes/maps_and_mods/1_installing.txt b/readmes/maps_and_mods/1_installing.txt
@@ -14,7 +14,7 @@ The installer choices are:
 
 * Other highly-rated maps - Other content not covered by the other choices above.
 
-This is NOT all the worthwhile Quake singleplayer content, not by a long shot. If you enjoy Quake SP I really recommend checking out other things at quaddicted.com, as described in the "3_explore_more.txt" file.
+This is NOT all the worthwhile Quake singleplayer content, not by a long shot. If you enjoy Quake SP I really recommend checking out other things at quaddicted.com, as described in the "3_explore_more.txt" file. Especially if you want to get the most recent releases, as the list of top-rated stuff here is updated infrequently.
 
 
 **** Mod folders