add BLU wallpaper and other wallpaper options.

Bitl · Bitl · commit e4bdd12523e3 · 2025-07-24T20:33:35.000-07:00
diff --git a/game/quiver/materials/console/background03.vmt b/game/quiver/materials/console/background03.vmt
@@ -0,0 +1,10 @@
+"UnlitGeneric"
+{
+	"$baseTexture" "console/background03"
+	"$vertexcolor" 1
+	"$vertexalpha" 1
+	"$ignorez" 1
+	"$no_fullbright" "1"
+	"$nolod" "1"
+	"%keywords" "tf"
+}
diff --git a/game/quiver/materials/console/background03.vtf b/game/quiver/materials/console/background03.vtf
diff --git a/game/quiver/materials/console/background03_widescreen.vmt b/game/quiver/materials/console/background03_widescreen.vmt
@@ -0,0 +1,10 @@
+"UnlitGeneric"
+{
+	"$baseTexture" "console/background03_widescreen"
+	"$vertexcolor" 1
+	"$vertexalpha" 1
+	"$ignorez" 1
+	"$no_fullbright" "1"
+	"$nolod" "1"
+	"%keywords" "tf"
+}
diff --git a/game/quiver/materials/console/background03_widescreen.vtf b/game/quiver/materials/console/background03_widescreen.vtf
diff --git a/game/quiver/resource/GameMenu.res b/game/quiver/resource/GameMenu.res
@@ -9,103 +9,110 @@
 	}
 	"2"
 	{
-		"label" "#GameUI_GameMenu_Disconnect"
+		"label" "#GameUI_GameMenu_ReturnToMainMenu"
 		"command" "engine disconnect;map_background background01"
 		"OnlyInGame" "1"
 		"OnlyInLegacyMode"	"1"
 	}
 	"3"
+	{
+		"label" "#GameUI_GameMenu_Disconnect"
+		"command" "Disconnect"
+		"OnlyInGame" "1"
+		"OnlyInLegacyMode"	"1"
+	}
+	"4"
 	{
 		"label" "#GameUI_GameMenu_PlayerList"
 		"command" "OpenPlayerListDialog"
 		"OnlyInGame" "1"
 		"OnlyInLegacyMode"	"1"
 	} 
 	
-	"4"
+	"5"
 	{
 		"label" "------------------------"
 		"OnlyInGame" "1"
 		"OnlyInLegacyMode"	"1"
 	}
 	
-	"5"
+	"6"
 	{
 		"label" "#GameUI_GameMenu_CharacterSetup"
 		"command" "engine open_charinfo"
 		"OnlyInLegacyMode"	"1"
 	}
-	"6"
+	"7"
 	{
 		"label" "#GameUI_GameMenu_Achievements"
 		"command" "OpenAchievementsDialog"
 		"OnlyInLegacyMode"	"1"
 	}
-	"7"
+	"8"
 	{
 		"label" "#GameUI_GameMenu_Options"
 		"command" "OpenOptionsDialog"
 		"OnlyInLegacyMode"	"1"
 	}
-	"8"
+	"9"
 	{
 		"label" "#GameUI_GameMenu_AdvancedOptions"
 		"command" "engine opentf2options"
 		"OnlyInLegacyMode"	"1"
 	}
 	
-	"9"
+	"10"
 	{
 		"label" "------------------------"
 		"OnlyInLegacyMode"	"1"
 	}
 	
-	"10"
+	"11"
 	{
 		"label" "#GameUI_GameMenu_FindServers" 
 		"command" "OpenServerBrowser"
 		"OnlyInLegacyMode"	"1"
 	} 
-	"11"
+	"12"
 	{
 		"label" "#GameUI_GameMenu_CreateServer"
 		"command" "OpenCreateMultiplayerGameDialog"
 		"OnlyInLegacyMode"	"1"
 	}
-	"12"
+	"13"
 	{
 		"label"	"#GameUI_GameMenu_OfflinePractice"
 		"command" "engine training_showdlg"
 		"OnlyInLegacyMode"	"1"
 	}
-	"12"
+	"14"
 	{
 		"label"	"#GameUI_LoadCommentary"
 		"command" "OpenLoadSingleplayerCommentaryDialog"
 		"OnlyInLegacyMode"	"1"
 	}
-	"13"
+	"15"
 	{
 		"label" "#GameUI_Controller"
 		"command" "OpenControllerDialog"
 		"ConsoleOnly" "1"
 		"OnlyInLegacyMode"	"1"
 	}
 	
-	"14"
+	"16"
 	{
 		"label" "------------------------"
 		"OnlyInLegacyMode"	"1"
 	}
 	
-	"15"
+	"17"
 	{
 		"label" "#GameUI_GameMenu_CallVote"
 		"command" "engine open_vote"
 		"OnlyInGame" "1"
 		"OnlyInLegacyMode"	"1"
 	} 
-	"16"
+	"18"
 	{
 		"label" "#GameUI_GameMenu_Quit"
 		"command" "Quit"
diff --git a/game/quiver/scripts/chapterbackgrounds.txt b/game/quiver/scripts/chapterbackgrounds.txt
@@ -1,14 +1,14 @@
 "chapters"
 {
 	1	"background01"
-	2	"background01"
-	3	"background01"
+	2	"background02"
+	3	"background03"
 	4	"background01"
 }
 "BackgroundMaps"
 {
 	1	"background01"
-	2	"background01"
-	3	"background01"
+	2	"background02"
+	3	"background03"
 	4	"background01"
 }
diff --git a/game/quiver/scripts/items/items_custom.txt b/game/quiver/scripts/items/items_custom.txt
@@ -174,7 +174,7 @@
 				"armor damage increased on target"
 				{
 					"attribute_class"	"mult_armor_onhit"
-					"value"				"1.30"
+					"value"				"1.50"
 				}
 				"is_a_sword"
 				{
diff --git a/src/game/server/hl2mp/bot/hl2mp_bot_manager.cpp b/src/game/server/hl2mp/bot/hl2mp_bot_manager.cpp
@@ -206,6 +206,11 @@ void CHL2MPBotManager::MaintainBotQuota()
 	// new players can't spawn immediately after the round has been going for some time
 	if ( !GameRules() )
 		return;
+	
+#ifdef BDSBASE
+	if ( gpGlobals->eLoadType == MapLoad_Background )
+		return;
+#endif
 
 	// if it is not time to do anything...
 	if ( gpGlobals->curtime < m_flNextPeriodicThink )
diff --git a/src/game/server/tf/bot/tf_bot_manager.cpp b/src/game/server/tf/bot/tf_bot_manager.cpp
@@ -370,6 +370,11 @@ void CTFBotManager::MaintainBotQuota()
 	if ( TFGameRules()->IsInTraining() )
 		return;
 
+#ifdef BDSBASE
+	if ( gpGlobals->eLoadType == MapLoad_Background )
+		return;
+#endif
+
 	// if it is not time to do anything...
 	if ( gpGlobals->curtime < m_flNextPeriodicThink )
 		return;
diff --git a/src/game/server/tf/tf_gamestats.cpp b/src/game/server/tf/tf_gamestats.cpp
@@ -1352,7 +1352,12 @@ void CTFGameStats::Event_PlayerKilledOther( CBasePlayer *pAttacker, CBaseEntity
 #if defined(QUIVER_DLL)
 	// if we have a frag limit, increment the score of the team
 	// in addition, reduce the score for the victim if its a death.
-	if (fraglimit.GetInt() > 0 && TFGameRules()->IsInTDMMode() && !TFGameRules()->IsInWaitingForPlayers())
+	if (fraglimit.GetInt() > 0 && 
+		TFGameRules()->IsInTDMMode() && 
+		!TFGameRules()->IsInWaitingForPlayers() && 
+			(TFGameRules()->State_Get() != GR_STATE_TEAM_WIN && 
+			TFGameRules()->State_Get() != GR_STATE_RESTART && 
+			TFGameRules()->State_Get() != GR_STATE_STALEMATE))
 	{
 		if (TFTeamMgr() && pPlayerVictim && pPlayerAttacker)
 		{

Original file line number	Diff line number	Diff line change
`@@ -9,103 +9,110 @@`
`9`	`9`	`}`
`10`	`10`	`"2"`
`11`	`11`	`{`
`12`		`- "label" "#GameUI_GameMenu_Disconnect"`
	`12`	`+ "label" "#GameUI_GameMenu_ReturnToMainMenu"`
`13`	`13`	`"command" "engine disconnect;map_background background01"`
`14`	`14`	`"OnlyInGame" "1"`
`15`	`15`	`"OnlyInLegacyMode" "1"`
`16`	`16`	`}`
`17`	`17`	`"3"`
	`18`	`+ {`
	`19`	`+ "label" "#GameUI_GameMenu_Disconnect"`
	`20`	`+ "command" "Disconnect"`
	`21`	`+ "OnlyInGame" "1"`
	`22`	`+ "OnlyInLegacyMode" "1"`
	`23`	`+ }`
	`24`	`+ "4"`
`18`	`25`	`{`
`19`	`26`	`"label" "#GameUI_GameMenu_PlayerList"`
`20`	`27`	`"command" "OpenPlayerListDialog"`
`21`	`28`	`"OnlyInGame" "1"`
`22`	`29`	`"OnlyInLegacyMode" "1"`
`23`	`30`	`}`
`24`	`31`
`25`		`- "4"`
	`32`	`+ "5"`
`26`	`33`	`{`
`27`	`34`	`"label" "------------------------"`
`28`	`35`	`"OnlyInGame" "1"`
`29`	`36`	`"OnlyInLegacyMode" "1"`
`30`	`37`	`}`
`31`	`38`
`32`		`- "5"`
	`39`	`+ "6"`
`33`	`40`	`{`
`34`	`41`	`"label" "#GameUI_GameMenu_CharacterSetup"`
`35`	`42`	`"command" "engine open_charinfo"`
`36`	`43`	`"OnlyInLegacyMode" "1"`
`37`	`44`	`}`
`38`		`- "6"`
	`45`	`+ "7"`
`39`	`46`	`{`
`40`	`47`	`"label" "#GameUI_GameMenu_Achievements"`
`41`	`48`	`"command" "OpenAchievementsDialog"`
`42`	`49`	`"OnlyInLegacyMode" "1"`
`43`	`50`	`}`
`44`		`- "7"`
	`51`	`+ "8"`
`45`	`52`	`{`
`46`	`53`	`"label" "#GameUI_GameMenu_Options"`
`47`	`54`	`"command" "OpenOptionsDialog"`
`48`	`55`	`"OnlyInLegacyMode" "1"`
`49`	`56`	`}`
`50`		`- "8"`
	`57`	`+ "9"`
`51`	`58`	`{`
`52`	`59`	`"label" "#GameUI_GameMenu_AdvancedOptions"`
`53`	`60`	`"command" "engine opentf2options"`
`54`	`61`	`"OnlyInLegacyMode" "1"`
`55`	`62`	`}`
`56`	`63`
`57`		`- "9"`
	`64`	`+ "10"`
`58`	`65`	`{`
`59`	`66`	`"label" "------------------------"`
`60`	`67`	`"OnlyInLegacyMode" "1"`
`61`	`68`	`}`
`62`	`69`
`63`		`- "10"`
	`70`	`+ "11"`
`64`	`71`	`{`
`65`	`72`	`"label" "#GameUI_GameMenu_FindServers"`
`66`	`73`	`"command" "OpenServerBrowser"`
`67`	`74`	`"OnlyInLegacyMode" "1"`
`68`	`75`	`}`
`69`		`- "11"`
	`76`	`+ "12"`
`70`	`77`	`{`
`71`	`78`	`"label" "#GameUI_GameMenu_CreateServer"`
`72`	`79`	`"command" "OpenCreateMultiplayerGameDialog"`
`73`	`80`	`"OnlyInLegacyMode" "1"`
`74`	`81`	`}`
`75`		`- "12"`
	`82`	`+ "13"`
`76`	`83`	`{`
`77`	`84`	`"label" "#GameUI_GameMenu_OfflinePractice"`
`78`	`85`	`"command" "engine training_showdlg"`
`79`	`86`	`"OnlyInLegacyMode" "1"`
`80`	`87`	`}`
`81`		`- "12"`
	`88`	`+ "14"`
`82`	`89`	`{`
`83`	`90`	`"label" "#GameUI_LoadCommentary"`
`84`	`91`	`"command" "OpenLoadSingleplayerCommentaryDialog"`
`85`	`92`	`"OnlyInLegacyMode" "1"`
`86`	`93`	`}`
`87`		`- "13"`
	`94`	`+ "15"`
`88`	`95`	`{`
`89`	`96`	`"label" "#GameUI_Controller"`
`90`	`97`	`"command" "OpenControllerDialog"`
`91`	`98`	`"ConsoleOnly" "1"`
`92`	`99`	`"OnlyInLegacyMode" "1"`
`93`	`100`	`}`
`94`	`101`
`95`		`- "14"`
	`102`	`+ "16"`
`96`	`103`	`{`
`97`	`104`	`"label" "------------------------"`
`98`	`105`	`"OnlyInLegacyMode" "1"`
`99`	`106`	`}`
`100`	`107`
`101`		`- "15"`
	`108`	`+ "17"`
`102`	`109`	`{`
`103`	`110`	`"label" "#GameUI_GameMenu_CallVote"`
`104`	`111`	`"command" "engine open_vote"`
`105`	`112`	`"OnlyInGame" "1"`
`106`	`113`	`"OnlyInLegacyMode" "1"`
`107`	`114`	`}`
`108`		`- "16"`
	`115`	`+ "18"`
`109`	`116`	`{`
`110`	`117`	`"label" "#GameUI_GameMenu_Quit"`
`111`	`118`	`"command" "Quit"`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`"chapters"`
`2`	`2`	`{`
`3`	`3`	`1 "background01"`
`4`		`- 2 "background01"`
`5`		`- 3 "background01"`
	`4`	`+ 2 "background02"`
	`5`	`+ 3 "background03"`
`6`	`6`	`4 "background01"`
`7`	`7`	`}`
`8`	`8`	`"BackgroundMaps"`
`9`	`9`	`{`
`10`	`10`	`1 "background01"`
`11`		`- 2 "background01"`
`12`		`- 3 "background01"`
	`11`	`+ 2 "background02"`
	`12`	`+ 3 "background03"`
`13`	`13`	`4 "background01"`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@`
`174`	`174`	`"armor damage increased on target"`
`175`	`175`	`{`
`176`	`176`	`"attribute_class" "mult_armor_onhit"`
`177`		`- "value" "1.30"`
	`177`	`+ "value" "1.50"`
`178`	`178`	`}`
`179`	`179`	`"is_a_sword"`
`180`	`180`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1352,7 +1352,12 @@ void CTFGameStats::Event_PlayerKilledOther( CBasePlayer *pAttacker, CBaseEntity`
`1352`	`1352`	`#if defined(QUIVER_DLL)`
`1353`	`1353`	`// if we have a frag limit, increment the score of the team`
`1354`	`1354`	`// in addition, reduce the score for the victim if its a death.`
`1355`		`- if (fraglimit.GetInt() > 0 && TFGameRules()->IsInTDMMode() && !TFGameRules()->IsInWaitingForPlayers())`
	`1355`	`+ if (fraglimit.GetInt() > 0 &&`
	`1356`	`+ TFGameRules()->IsInTDMMode() &&`
	`1357`	`+ !TFGameRules()->IsInWaitingForPlayers() &&`
	`1358`	`+ (TFGameRules()->State_Get() != GR_STATE_TEAM_WIN &&`
	`1359`	`+ TFGameRules()->State_Get() != GR_STATE_RESTART &&`
	`1360`	`+ TFGameRules()->State_Get() != GR_STATE_STALEMATE))`
`1356`	`1361`	`{`
`1357`	`1362`	`if (TFTeamMgr() && pPlayerVictim && pPlayerAttacker)`
`1358`	`1363`	`{`