Merge branch 'zps_tags'

ZeqMacaw · Oct 27, 2019 · 47101a1 · 47101a1
2 parents 40a0981 + ef26f24
commit 47101a1
Show file tree

Hide file tree

Showing 8 changed files with 577 additions and 9 deletions.
diff --git a/Crowbar/Core/SteamAppInfos/SteamAppInfoBase.vb b/Crowbar/Core/SteamAppInfos/SteamAppInfoBase.vb
@@ -61,8 +61,8 @@ Public Class SteamAppInfoBase
 		'steamAppInfos.Add(anAppInfo)
 		'anAppInfo = New SteamAppInfo("Team Fortress 2")
 		'steamAppInfos.Add(anAppInfo)
-		'anAppInfo = New SteamAppInfo("Zombie Panic! Source")
-		'steamAppInfos.Add(anAppInfo)
+		anAppInfo = New ZombiePanicSourceSteamAppInfo()
+		steamAppInfos.Add(anAppInfo)
 
 		Return steamAppInfos
 	End Function

diff --git a/Crowbar/Core/SteamAppInfos/ZombiePanicSourceSteamAppInfo.vb b/Crowbar/Core/SteamAppInfos/ZombiePanicSourceSteamAppInfo.vb
@@ -0,0 +1,26 @@
+Imports System.ComponentModel
+Imports System.IO
+Imports Steamworks
+
+Public Class ZombiePanicSourceSteamAppInfo
+	Inherits SteamAppInfoBase
+
+	Public Sub New()
+		MyBase.New()
+
+		Me.ID = New AppId_t(17500)
+		Me.Name = "Zombie Panic! Source"
+		Me.UsesSteamUGC = True
+		Me.CanUseContentFolderOrFile = False
+		'Me.ContentFileExtensionsAndDescriptions.Add("vpk", "Source Engine VPK Files")
+		Me.TagsControlType = GetType(ZombiePanicSourceTagsUserControl)
+	End Sub
+
+	Public Enum ZombiePanicSourceTypeTags
+		<Description("GameMode")> GameMode
+		<Description("Custom Models")> CustomModels
+		<Description("Custom Sounds")> CustomSounds
+		<Description("Miscellaneous")> Miscellaneous
+	End Enum
+
+End Class
diff --git a/Crowbar/Crowbar.vbproj b/Crowbar/Crowbar.vbproj
@@ -513,6 +513,7 @@
     <Compile Include="Core\SteamAppInfos\GarrysModSteamAppInfo.vb" />
     <Compile Include="Core\SteamAppInfos\Left4Dead2SteamAppInfo.vb" />
     <Compile Include="Core\SteamAppInfos\SteamAppInfoBase.vb" />
+    <Compile Include="Core\SteamAppInfos\ZombiePanicSourceSteamAppInfo.vb" />
     <Compile Include="Core\Steam\BackgroundSteamPipe.vb" />
     <Compile Include="Core\Steam\SteamAppUserInfo.vb" />
     <Compile Include="Core\Steam\SteamPipe.vb" />
@@ -834,6 +835,12 @@
     <Compile Include="Widgets\Publish SteamApp Tags\SourceFilmmakerTagsUserControl.vb">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="Widgets\Publish SteamApp Tags\ZombiePanicSourceTagsUserControl.Designer.vb">
+      <DependentUpon>ZombiePanicSourceTagsUserControl.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Widgets\Publish SteamApp Tags\ZombiePanicSourceTagsUserControl.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Widgets\- Application\AgreementRequiresAcceptanceForm.resx">
@@ -936,6 +943,9 @@
     <EmbeddedResource Include="Widgets\Publish SteamApp Tags\SourceFilmmakerTagsUserControl.resx">
       <DependentUpon>SourceFilmmakerTagsUserControl.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Widgets\Publish SteamApp Tags\ZombiePanicSourceTagsUserControl.resx">
+      <DependentUpon>ZombiePanicSourceTagsUserControl.vb</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="My Project\app.manifest" />

diff --git a/Crowbar/Resources/Crowbar Settings.xml b/Crowbar/Resources/Crowbar Settings.xml
@@ -961,13 +961,13 @@
     <GameSetup>
       <GameName>Zombie Panic! Source</GameName>
       <GameEngine>Source</GameEngine>
-      <GamePathFileName>&lt;library1&gt;\steamapps\common\Source SDK Base 2007\zps\gameinfo.txt</GamePathFileName>
-      <GameAppPathFileName>&lt;library1&gt;\steamapps\common\Source SDK Base 2007\hl2.exe</GameAppPathFileName>
+      <GamePathFileName>&lt;library1&gt;\steamapps\common\Zombie Panic Source\zps\gameinfo.txt</GamePathFileName>
+      <GameAppPathFileName>&lt;library1&gt;\steamapps\common\Zombie Panic Source\zps.exe</GameAppPathFileName>
       <GameAppOptions />
-      <CompilerPathFileName>&lt;library1&gt;\steamapps\common\SourceSDK\bin\source2007\bin\studiomdl.exe</CompilerPathFileName>
-      <ViewerPathFileName>&lt;library1&gt;\steamapps\common\SourceSDK\bin\source2007\bin\hlmv.exe</ViewerPathFileName>
-      <MappingToolPathFileName>&lt;library1&gt;\steamapps\common\SourceSDK\bin\source2007\bin\hammer.exe</MappingToolPathFileName>
-      <PackerPathFileName>&lt;library1&gt;\steamapps\common\Left 4 Dead 2\bin\vpk.exe</PackerPathFileName>
+      <CompilerPathFileName>&lt;library1&gt;\steamapps\common\Zombie Panic Source\bin\studiomdl.exe</CompilerPathFileName>
+      <ViewerPathFileName>&lt;library1&gt;\steamapps\common\Zombie Panic Source\bin\hlmv.exe</ViewerPathFileName>
+      <MappingToolPathFileName>&lt;library1&gt;\steamapps\common\Zombie Panic Source\bin\hammer.exe</MappingToolPathFileName>
+      <PackerPathFileName>&lt;library1&gt;\steamapps\common\Zombie Panic Source\bin\vpk.exe</PackerPathFileName>
     </GameSetup>
   </GameSetups>
 </AppSettings>
diff --git a/Crowbar/Widgets/Publish SteamApp Tags/Base/Base_TagsUserControl.vb b/Crowbar/Widgets/Publish SteamApp Tags/Base/Base_TagsUserControl.vb
@@ -59,7 +59,7 @@ Public Class Base_TagsUserControl
 						Me.theWidgets.Add(widget)
 					End If
 				End If
-			ElseIf TypeOf widget Is GroupBox Then
+			ElseIf TypeOf widget Is GroupBox OrElse TypeOf widget Is Panel Then
 				Me.GetAllWidgets(widget.Controls)
 			End If
 		Next