New game patches, RTCW SP, and fallback q3 fonts/shaders

Add support for RTCW SP by spliting RTCW into three directions (rtcwcommon, rtcwsp, and rtcwmp). Add patch data for Tremulous, Smokin' Guns, Elite Force 2, and Medal of Honor: Allied Assault.
clover-moe · Jan 10, 2015 · 8b1ad37 · 8b1ad37
1 parent 650cbb9
commit 8b1ad37
Show file tree

Hide file tree

Showing 38 changed files with 4,227 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 spearmint-patch-data
 ====================
 
-Game patch data for Spearmint.
+Game patch data for Spearmint. Only Quake 3, Team Arena, and OpenArena (using Q3 code) are playable. Patch data exists for other games for testing loading their levels, shaders, and other content.
 
 ## Compatibility
 Most of the patch data doesn't cause problems for the original game. So you may be able to share game directory between Spearmint and the original game.
@@ -13,5 +13,31 @@ Game titles and logo designs are copyright id Software or their respectful owner
 
   * Quake III Arena window icons based on quake3.svg image from ioquake3 project.
   * RTCW and ET window icons based on wet.svg image from zenthought.org.
+  * rtcwcommon/scripts/common.shader and ui_wolf.shader are edit versions to fix syntax from RTCW pak0.pk3.
+
+## Games
+| Title                             | Original Game Dir | Spearmint Game Dir | Game code repo for testing |
+| --------------------------------- | ----------------- | ------------------ | ---------- |
+| Quake III Arena                   | baseq3            | baseq3             | mint-arena |
+| Quake III Demo                    | demoq3            | demoq3             | mint-arena |
+| Quake III: Team Arena             | missionpack       | missionpack        | mint-arena |
+| Team Arena Demo                   | tademo            | tademo             | mint-arena |
+| Return to Castle Wolfenstein      | main/pak0.pk3     | rtcwcommon         |            |
+| Return to Castle Wolfenstein (SP) | main/sp*          | rtcwsp             | mint-arena |
+| Return to Castle Wolfenstein (MP) | main/mp*          | rtcwmp             | mint-arena |
+| Return to Castle Wolfenstein Demo | demomain          | demomain           | mint-arena |
+| Wolfenstein Enemy Territory       | etmain            | etmain             | mint-arena |
+| Elite Force                       | baseEF            | baseef             | mint-voyager |
+| Elite Force 2                     | base              | baseef2            | mint-metal |
+| Heavy Metal F.A.K.K.2             | fakk              | fakk               | mint-metal |
+| Medal of Honor: Allied Assault    | main              | basemohaa          | mint-metal |
+| American McGee's Alice            | base              | basealice          | mint-metal |
+| Solder of Fortune 2               | base              | basesof2           | mint-helix |
+| Jedi Outcast                      | base              | basejk2            | mint-helix |
+| Jedi Academy                      | base              | baseja             | mint-helix |
+| OpenArena 0.8.8                   | baseoa            | baseoa             | mint-arena |
+| Tremulous 1.1                     | base              | basetrem           | mint-arena |
+| Smokin' Guns 1.1                  | smokinguns        | smokinguns         | mint-arena |
 
 [![githalytics.com alpha](https://cruel-carlota.pagodabox.com/7817f3e5ff80a73220f4882c3032d235 "githalytics.com")](http://githalytics.com/zturtleman/spearmint-patch-data)
+
diff --git a/basealice/mint-game.settings b/basealice/mint-game.settings
@@ -2,6 +2,9 @@ defaultSound "sound/weapon/shared/bullet_world1.wav"
 cvarDefault r_overBrightBits 0
 cvarDefault r_mapOverBrightBits 0
 
+// fallback data for missing fonts, shaders, and sarge player model
+addGameDir fallback-data
+
 paksums {
 	// nodownload keyword tells server not to allow pk3 to be downloaded
 	pak0			2316122173	nodownload

diff --git a/baseef2/description.txt b/baseef2/description.txt
@@ -0,0 +1 @@
+Elite Force 2
diff --git a/baseef2/mint-game.settings b/baseef2/mint-game.settings
@@ -0,0 +1,20 @@
+defaultSound "sound/feedback/hit.wav"
+addLoadingScreen "menuback" ( 0 0 0 ) 1.333333
+cvarDefault r_shadersDirectory shaders
+
+// fallback data for missing fonts, shaders, and sarge player model
+addGameDir fallback-data
+
+paksums {
+	locpak1		3352313573		nodownload
+	locpak2		2804100764		nodownload
+	pak0		2352539509		nodownload
+	pak10		463168777		nodownload
+	pak15		2210637528		nodownload
+	pak16		3099664436		nodownload
+	pak20		2830703861		nodownload
+	pak30		2644647707		nodownload
+	pak31		3363896022		nodownload
+	pak32		2740094366		nodownload
+}
+
diff --git a/baseja/mint-game.settings b/baseja/mint-game.settings
@@ -3,6 +3,9 @@ addLoadingScreen menu/splash ( 0.003921569 0.007843137 0.129411765 ) 1.333333
 cvarDefault r_shadersDirectory shaders
 cvarDefault r_surfaceFlagNoDraw 2097152 // SURF_NODRAW 0x00200000
 
+// fallback data for missing fonts, shaders, and sarge player model
+addGameDir fallback-data
+
 paksums {
 	// nodownload keyword tells server not to allow pk3 to be downloaded
 	assets0 3246327225	nodownload

diff --git a/basejk2/mint-game.settings b/basejk2/mint-game.settings
@@ -2,6 +2,9 @@ defaultSound "sound/weapons/overchargefast.wav"
 cvarDefault r_shadersDirectory shaders
 cvarDefault r_surfaceFlagNoDraw 2097152 // SURF_NODRAW 0x00200000
 
+// fallback data for missing fonts, shaders, and sarge player model
+addGameDir fallback-data
+
 paksums {
 	// nodownload keyword tells server not to allow pk3 to be downloaded
 	assets0 3246002833	nodownload

diff --git a/basemohaa/description.txt b/basemohaa/description.txt
@@ -0,0 +1 @@
+Medal of Honor: Allied Assault
diff --git a/basemohaa/mint-game.settings b/basemohaa/mint-game.settings
@@ -0,0 +1,16 @@
+defaultSound "sound/feedback/hit.wav"
+addLoadingScreen "menuback" ( 0 0 0 ) 1.333333
+
+// fallback data for missing fonts, shaders, and sarge player model
+addGameDir fallback-data
+
+// note: also need sound and video directories
+paksums {
+	Pak0	26400568	nodownload
+	Pak1	1602474736	nodownload
+	Pak2	3674983257	nodownload
+	Pak3	2766457535	nodownload
+	Pak4	2072486096	nodownload
+	Pak5	694932018	nodownload
+}
+
diff --git a/basesof2/mint-game.settings b/basesof2/mint-game.settings
@@ -2,6 +2,9 @@ defaultSound "sound/weapons/drop.wav"
 cvarDefault r_shadersDirectory shaders
 cvarDefault r_surfaceFlagNoDraw 2097152 // SURF_NODRAW 0x00200000
 
+// fallback data for missing fonts, shaders, and sarge player model
+addGameDir fallback-data
+
 paksums {
 	// nodownload keyword tells server not to allow pk3 to be downloaded
 	maps			3777314092	nodownload

diff --git a/basetrem/description.txt b/basetrem/description.txt
@@ -0,0 +1 @@
+Tremulous
diff --git a/basetrem/mint-game.settings b/basetrem/mint-game.settings
@@ -0,0 +1,19 @@
+defaultSound "sound/feedback/hit.wav"
+addLoadingScreen "gfx/2d/load_screen" ( 0 0 0 ) 1.333333
+
+// fallback data for missing fonts, shaders, and sarge player model
+addGameDir fallback-data
+
+paksums {
+	data-1.1.0.pk3				2812325321
+	map-arachnid2-1.1.0.pk3		627090456
+	map-atcs-1.1.0.pk3			1869817167
+	map-karith-1.1.0.pk3		414067189
+	map-nexus6-1.1.0.pk3		2137637707
+	map-niveus-1.1.0.pk3		3656601972
+	map-transit-1.1.0.pk3		3648091582
+	map-tremor-1.1.0.pk3		2194825325
+	map-uncreation-1.1.0.pk3	544813384
+	vms-1.1.0.pk3				3536809584
+}
+
diff --git a/demomain/mint-game.settings b/demomain/mint-game.settings
@@ -1,5 +1,8 @@
 defaultSound "sound/multiplayer/hurt_barbwire.wav"
 
+// fallback data for missing fonts, shaders, and sarge player model
+addGameDir fallback-data
+
 paksums {
 	// nodownload keyword tells server not to allow pk3 to be downloaded
 	pak0	1731729369	nodownload

diff --git a/etmain/mint-game.settings b/etmain/mint-game.settings
@@ -2,6 +2,9 @@ defaultSound "sound/player/hurt_barbwire.wav"
 cvarDefault r_overBrightBits 0
 cvarDefault r_defaultFogParmsType linear
 
+// fallback data for missing fonts, shaders, and sarge player model
+addGameDir fallback-data
+
 paksums {
 	// nodownload keyword tells server not to allow pk3 to be downloaded
 	pak0	1627565872	nodownload

diff --git a/fakk/mint-game.settings b/fakk/mint-game.settings
@@ -1,6 +1,9 @@
 defaultSound "sound/weapons/gun/nobullets.wav"
 cvarDefault r_overBrightBits 0
 
+// fallback data for missing fonts, shaders, and sarge player model
+addGameDir fallback-data
+
 paksums {
 	// nodownload keyword tells server not to allow pk3 to be downloaded
 	pak0			2121461025	nodownload

diff --git a/fallback-data/gfx/2d/bigchars.png b/fallback-data/gfx/2d/bigchars.png
diff --git a/fallback-data/menu/art/font1_prop.png b/fallback-data/menu/art/font1_prop.png
diff --git a/fallback-data/menu/art/font1_prop_glo.png b/fallback-data/menu/art/font1_prop_glo.png
diff --git a/fallback-data/menu/art/font2_prop.png b/fallback-data/menu/art/font2_prop.png
diff --git a/fallback-data/scripts/aaa-fallback.shader b/fallback-data/scripts/aaa-fallback.shader
@@ -0,0 +1,32 @@
+// Some games are missing these
+console {
+	{
+		map $whiteimage
+		rgbGen const ( 0.0 0.2 0.0 )
+		alphaGen const 0.5
+		blendfunc blend
+	}
+}
+
+menuback {
+	{
+		map $whiteimage
+		rgbGen const ( 0.0 0.0 0.0 )
+	}
+}
+
+white {
+	{
+		map $whiteimage
+		rgbGen vertex
+	}
+}
+
+levelShotDetail {
+	{
+		map $whiteimage
+		alphaGen const 0.0
+		blendfunc blend
+	}
+}
+
diff --git a/fallback-data/shaders/aaa-fallback.shader b/fallback-data/shaders/aaa-fallback.shader
@@ -0,0 +1,32 @@
+// Some games are missing these
+console {
+	{
+		map $whiteimage
+		rgbGen const ( 0.0 0.2 0.0 )
+		alphaGen const 0.5
+		blendfunc blend
+	}
+}
+
+menuback {
+	{
+		map $whiteimage
+		rgbGen const ( 0.0 0.0 0.0 )
+	}
+}
+
+white {
+	{
+		map $whiteimage
+		rgbGen vertex
+	}
+}
+
+levelShotDetail {
+	{
+		map $whiteimage
+		alphaGen const 0.0
+		blendfunc blend
+	}
+}
+
diff --git a/fallback-data/sound/feedback/hit.wav b/fallback-data/sound/feedback/hit.wav
diff --git a/main/description.txt b/main/description.txt
diff --git a/main/mint-game.settings b/main/mint-game.settings
diff --git a/main/gfx/rtcw_default_image.tga → rtcwcommon/gfx/rtcw_default_image.tga b/main/gfx/rtcw_default_image.tga → rtcwcommon/gfx/rtcw_default_image.tga
diff --git a/rtcwcommon/mint-game.settings b/rtcwcommon/mint-game.settings
@@ -0,0 +1,12 @@
+// NOTE: This game direction is not playable by itself, you must use rtcwsp or rtcwmp
+
+// fallback data for missing fonts, shaders, and sarge player model
+// NOTE: this is only used when loading rtcwcommon, not rtcwsp/mp.
+//       it provides a hit sound so that if it's loaded from mods menu
+//       the game soft errors back to previous game instead of crashing...
+addGameDir fallback-data
+
+paksums {
+	pak0	1787286276	nodownload
+}
+