Regroup every idTech version (#740)

SteamDatabase · Mar 26, 2024 · 96a9650 · 96a9650
1 parent 6753331
commit 96a9650
Show file tree

Hide file tree

Showing 22 changed files with 55 additions and 65 deletions.
diff --git a/descriptions/Engine.idTech.md b/descriptions/Engine.idTech.md
@@ -0,0 +1,2 @@
+[**id Tech**](https://en.wikipedia.org/wiki/Id_Tech) is a game engine developed by id Software, first used to power [Wolfenstein 3D](https://steamdb.info/app/2270/) released in 1992.
+It has since seen multiples upgrades over the years.
diff --git a/descriptions/Engine.idTech0.md b/descriptions/Engine.idTech0.md
diff --git a/descriptions/Engine.idTech1.md b/descriptions/Engine.idTech1.md
diff --git a/descriptions/Engine.idTech2.md b/descriptions/Engine.idTech2.md
diff --git a/descriptions/Engine.idTech2_5.md b/descriptions/Engine.idTech2_5.md
diff --git a/descriptions/Engine.idTech3.md b/descriptions/Engine.idTech3.md
diff --git a/descriptions/Engine.idTech4.md b/descriptions/Engine.idTech4.md
diff --git a/descriptions/Engine.idTech5.md b/descriptions/Engine.idTech5.md
diff --git a/descriptions/Engine.idTech6.md b/descriptions/Engine.idTech6.md
diff --git a/descriptions/Engine.idTech7.md b/descriptions/Engine.idTech7.md
diff --git a/rules.ini b/rules.ini
@@ -104,13 +104,13 @@ GZDoom[] = (?:^|/)gzdoom\.pk3$
 GZDoom[] = (?:^|/)gzdoom\.sf2$
 HaemimontSol = ^Local/English\.hpk$
 HashLink = (?:^|/)libhl\.(?:dll|so)$
-idTech2 = (?:^|/)gl(?:quake|hexen)(?:$|/)
-idTech2_5 = (?:^|/)baseq2(?:$|/)
-idTech4 = \.pk4$
-idTech5 = \.streamed$
-idTech6[] = \.mega2$
-idTech6[] = \.texdb$
-idTech7 = \.streamdb$
+idTech[] = (?:^|/)gl(?:quake|hexen)(?:$|/)
+idTech[] = (?:^|/)baseq2(?:$|/)
+idTech[] = \.pk4$
+idTech[] = \.streamed$
+idTech[] = \.mega2$
+idTech[] = \.texdb$
+idTech[] = \.streamdb$
 Irrlicht = (?:^|/)Irrlicht\.dll$
 Kex = \.kpf$
 KiriKiri = (?:^|/)data\.xp3$

diff --git a/tests/FileDetector.php b/tests/FileDetector.php
@@ -210,15 +210,10 @@ private static function TryDeduceEngine( array $Files, array $Matches ) : ?strin
 				//If it matches the pattern of a Build engine game (Duke Nukem 3D engine)
 				return 'Engine.Build';
 			}
-			else if( $has( 'Evidence.VSWAP' ) )
+			else if( $has( 'Evidence.VSWAP' ) || ( $has( 'Evidence.CFG' ) && $has( 'Evidence.WAD' ) ) )
 			{
-				//If it's got VSWAP files it's probably idTech0 (Wolf3D engine)
-				return 'Engine.idTech0';
-			}
-			else if( $has( 'Evidence.CFG' ) && $has( 'Evidence.WAD' ) )
-			{
-				//If it's got CFG and WAD files it's probably idTech1 (DOOM engine)
-				return 'Engine.idTech1';
+				//If it's got VSWAP files or CFG and WAD files it's probably idTech
+				return 'Engine.idTech';
 			}
 		}
 
@@ -261,7 +256,7 @@ private static function TryDeduceEngine( array $Files, array $Matches ) : ?strin
 		//If I have matched nothing so far and I have a PK3 file, it's likely idTech3 (Quake3 engine)
 		if( $has( 'Evidence.PK3' ) )
 		{
-			return 'Engine.idTech3';
+			return 'Engine.idTech';
 		}
 
 		return null;

diff --git a/tests/filelists/Engine.idTech0.txt → tests/filelists/Engine.idTech.0.txt b/tests/filelists/Engine.idTech0.txt → tests/filelists/Engine.idTech.0.txt
diff --git a/tests/filelists/Engine.idTech1.txt → tests/filelists/Engine.idTech.1.txt b/tests/filelists/Engine.idTech1.txt → tests/filelists/Engine.idTech.1.txt
diff --git a/tests/types/Engine.idTech.txt b/tests/types/Engine.idTech.txt
@@ -0,0 +1,42 @@
+/baseq2
+/baseq2/
+baseq2
+baseq2/
+baseq2/models
+baseq2/pak0.pk3
+baseq2/pak1.pk3
+baseq2/pics
+baseq2/st
+/glhexen
+/glhexen/
+/glquake
+/glquake/
+Id1/glquake
+Id1/glquake/15to8.pal
+Id1/glquake/armor.ms2
+Id1/glquake/backpack.ms2
+data1/glhexen
+data1/glhexen/NFarrow.ms2
+data1/glhexen/a_blast.ms2
+glhexen
+glhexen/
+glquake
+glquake/
+baseq3/pak0.pk3
+.pk4
+something.pk4
+sub/dir/something.pk4
+.streamed
+something.streamed
+sub/dir/something.streamed
+.mega2
+.texdb
+base/chunk_2.texdb
+base/gameresources.texdb
+chunk_2.texdb
+gameresources.texdb
+something.mega2
+sub/dir/something.mega2
+.streamdb
+
+
diff --git a/tests/types/Engine.idTech2.txt b/tests/types/Engine.idTech2.txt
diff --git a/tests/types/Engine.idTech2_5.txt b/tests/types/Engine.idTech2_5.txt
diff --git a/tests/types/Engine.idTech3.txt b/tests/types/Engine.idTech3.txt
diff --git a/tests/types/Engine.idTech4.txt b/tests/types/Engine.idTech4.txt
diff --git a/tests/types/Engine.idTech5.txt b/tests/types/Engine.idTech5.txt
diff --git a/tests/types/Engine.idTech6.txt b/tests/types/Engine.idTech6.txt
diff --git a/tests/types/Engine.idTech7.txt b/tests/types/Engine.idTech7.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[id Tech](https://en.wikipedia.org/wiki/Id_Tech) is a game engine developed by id Software, first used to power [Wolfenstein 3D](https://steamdb.info/app/2270/) released in 1992.
		It has since seen multiples upgrades over the years.