fixed up achievements/added achievements

Bitl · Bitl · commit d3d447540853 · 2025-07-19T17:58:38.000-07:00
diff --git a/game/quiver/info_changelog.txt b/game/quiver/info_changelog.txt
@@ -2,6 +2,10 @@ Quiver Private Alpha 1.1.0:
 - Disabled stun in most instances, except in MvM where it's crucial against robots.
 - Disabled player glows on spawn and spectator (except in MvM).
 - Fixed a bug where some kill feeds erroneously show the Pyro kill taunt kill icon.
+- Fixed up achievement notifications.
+- Added 2 new achievements:
+	- Onslaught: Kill 3 players in a single life with no armor.
+	- Overdrive: Kill 6 players in a single life with no armor.
 
 Quiver Private Alpha 1.0.1:
 - Whitelisted the Back Scatter and Force-a-Nature.
diff --git a/game/quiver/materials/vgui/achievements/QUIVER_KILL3WITHARMORAT0.vmt b/game/quiver/materials/vgui/achievements/QUIVER_KILL3WITHARMORAT0.vmt
@@ -0,0 +1,4 @@
+"UnlitGeneric"
+{
+	"$baseTexture" "vgui/achievements/QUIVER_KILL3WITHARMORAT0"
+}
diff --git a/game/quiver/materials/vgui/achievements/QUIVER_KILL3WITHARMORAT0.vtf b/game/quiver/materials/vgui/achievements/QUIVER_KILL3WITHARMORAT0.vtf
diff --git a/game/quiver/materials/vgui/achievements/QUIVER_KILL3WITHARMORAT0_BW.vmt b/game/quiver/materials/vgui/achievements/QUIVER_KILL3WITHARMORAT0_BW.vmt
@@ -0,0 +1,4 @@
+"UnlitGeneric"
+{
+	"$baseTexture" "vgui/achievements/QUIVER_KILL3WITHARMORAT0_BW"
+}
diff --git a/game/quiver/materials/vgui/achievements/QUIVER_KILL3WITHARMORAT0_BW.vtf b/game/quiver/materials/vgui/achievements/QUIVER_KILL3WITHARMORAT0_BW.vtf
diff --git a/game/quiver/materials/vgui/achievements/QUIVER_KILL6WITHARMORAT0.vmt b/game/quiver/materials/vgui/achievements/QUIVER_KILL6WITHARMORAT0.vmt
@@ -0,0 +1,4 @@
+"UnlitGeneric"
+{
+	"$baseTexture" "vgui/achievements/QUIVER_KILL6WITHARMORAT0"
+}
diff --git a/game/quiver/materials/vgui/achievements/QUIVER_KILL6WITHARMORAT0.vtf b/game/quiver/materials/vgui/achievements/QUIVER_KILL6WITHARMORAT0.vtf
diff --git a/game/quiver/materials/vgui/achievements/QUIVER_KILL6WITHARMORAT0_BW.vmt b/game/quiver/materials/vgui/achievements/QUIVER_KILL6WITHARMORAT0_BW.vmt
@@ -0,0 +1,4 @@
+"UnlitGeneric"
+{
+	"$baseTexture" "vgui/achievements/QUIVER_KILL6WITHARMORAT0_BW"
+}
diff --git a/game/quiver/materials/vgui/achievements/QUIVER_KILL6WITHARMORAT0_BW.vtf b/game/quiver/materials/vgui/achievements/QUIVER_KILL6WITHARMORAT0_BW.vtf
diff --git a/game/quiver/resource/quiver_english.txt b/game/quiver/resource/quiver_english.txt
diff --git a/src/game/client/achievement_notification_panel.cpp b/src/game/client/achievement_notification_panel.cpp
@@ -21,6 +21,9 @@
 #include "steam/steam_api.h"
 #include "iachievementmgr.h"
 #include "fmtstr.h"
+#ifdef BDSBASE
+#include "baseachievement.h"
+#endif
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
@@ -64,6 +67,12 @@ CAchievementNotificationPanel::CAchievementNotificationPanel( const char *pEleme
 void CAchievementNotificationPanel::Init()
 {
 	ListenForGameEvent( "achievement_event" );
+
+#ifdef BDSBASE
+#ifdef BDSBASE_ACHIEVEMENT_NOTIFICATIONS
+	ListenForGameEvent("achievement_earned");
+#endif
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -234,6 +243,32 @@ void CAchievementNotificationPanel::FireGameEvent( IGameEvent * event )
 		}
 #endif
 	}
+#ifdef BDSBASE
+#ifdef BDSBASE_ACHIEVEMENT_NOTIFICATIONS
+	else if (0 == Q_strcmp(name, "achievement_earned"))
+	{
+		int iID = event->GetInt("achievement");
+
+		IAchievementMgr* pAchievementMgr = engine->GetAchievementMgr();
+		if (!pAchievementMgr)
+			return;
+
+		CBaseAchievement* pAchievement = pAchievementMgr->GetAchievementByID(iID);
+		if (!pAchievement)
+			return;
+
+		wchar_t szLocalizedName[256] = L"";
+
+		const wchar_t* pchLocalizedName = ACHIEVEMENT_LOCALIZED_NAME(pAchievement);
+		Assert(pchLocalizedName);
+		if (!pchLocalizedName || !pchLocalizedName[0])
+			return;
+		Q_wcsncpy(szLocalizedName, pchLocalizedName, sizeof(szLocalizedName));
+
+		AddNotification(pAchievement->GetName(), g_pVGuiLocalize->Find("#GameUI_Achievement_Unlocked"), szLocalizedName);
+	}
+#endif
+#endif
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/game/shared/achievementmgr.cpp b/src/game/shared/achievementmgr.cpp
@@ -943,6 +943,15 @@ void CAchievementMgr::AwardAchievement( int iAchievementID )
 
 	if ( IsPC() )
 	{		
+#ifdef BDSBASE
+#ifdef BDSBASE_ACHIEVEMENT_NOTIFICATIONS
+#ifndef GAME_DLL
+		//No steam connection? send it ourselves.
+		KeyValues* kv = new KeyValues("AchievementEarned");
+		kv->SetInt("achievementID", pAchievement->GetAchievementID());
+		engine->ServerCmdKeyValues(kv);
+#endif
+#else
 #ifndef NO_STEAM
 		if ( steamapicontext->SteamUserStats() )
 		{
@@ -955,6 +964,22 @@ void CAchievementMgr::AwardAchievement( int iAchievementID )
 				m_AchievementsAwarded.AddToTail( iAchievementID );
 			}
 		}
+#endif
+#endif
+#else
+#ifndef NO_STEAM
+		if (steamapicontext->SteamUserStats())
+		{
+			VPROF_BUDGET("AwardAchievement", VPROF_BUDGETGROUP_STEAM);
+			// set this achieved in the Steam client
+			bool bRet = steamapicontext->SteamUserStats()->SetAchievement(pAchievement->GetName());
+			//		Assert( bRet );
+			if (bRet)
+			{
+				m_AchievementsAwarded.AddToTail(iAchievementID);
+			}
+		}
+#endif
 #endif
     }
 	else if ( IsX360() )
diff --git a/src/game/shared/multiplay_gamerules.cpp b/src/game/shared/multiplay_gamerules.cpp
@@ -1696,6 +1696,9 @@ ConVarRef suitcharger( "sk_suitcharger" );
 
 	static const std::unordered_set<int> g_ValidAchiementIdxs = {{
 		#include "achievements_tf_list.inc"
+#if defined(QUIVER_DLL)
+		#include "quiver/achievements_quiver_list.inc"
+#endif
 	}};
 
 	#undef ACHIEVEMENT_LIST
diff --git a/src/game/shared/quiver/achievements_quiver.cpp b/src/game/shared/quiver/achievements_quiver.cpp
@@ -22,5 +22,71 @@
 //======================================================================================================================================
 // QUIVER ACHIEVEMENT PACK
 //======================================================================================================================================
+class CAchievementQuiver_KillsWith0Armor : public CBaseTFAchievement
+{
+	void Init()
+	{
+		SetFlags(ACH_LISTEN_KILL_EVENTS | ACH_SAVE_GLOBAL);
+		SetGoal(1);
+		m_iConsecutiveKills = 0;
+	}
+
+	virtual void ListenForEvents()
+	{
+		ListenForGameEvent("teamplay_round_active");
+		ListenForGameEvent("localplayer_respawn");
+	}
+
+	void FireGameEvent_Internal(IGameEvent* event)
+	{
+		if (FStrEq(event->GetName(), "teamplay_round_active"))
+		{
+			m_iConsecutiveKills = 0;
+		}
+		else if (FStrEq(event->GetName(), "localplayer_respawn"))
+		{
+			m_iConsecutiveKills = 0;
+		}
+	}
+
+	virtual void Event_EntityKilled(CBaseEntity* pVictim, CBaseEntity* pAttacker, CBaseEntity* pInflictor, IGameEvent* event)
+	{
+		C_BasePlayer* pLocalPlayer = C_BasePlayer::GetLocalPlayer();
+		if (pLocalPlayer == pVictim)
+		{
+			m_iConsecutiveKills = 0;
+		}
+		else if (pLocalPlayer == pAttacker)
+		{
+			C_TFPlayer* pTFAttacker = ToTFPlayer(pAttacker);
+			if (pTFAttacker && pTFAttacker->ArmorValue() <= 0)
+			{
+				m_iConsecutiveKills++;
+				if (m_iConsecutiveKills >= GetNumKillsNeeded())
+				{
+					IncrementCount();
+				}
+			}
+		}
+	}
+
+	virtual int GetNumKillsNeeded(void)
+	{
+		return 3;
+	}
+
+private:
+	int m_iConsecutiveKills;
+};
+DECLARE_ACHIEVEMENT(CAchievementQuiver_KillsWith0Armor, ACHIEVEMENT_QUIVER_KILL3WITHARMORAT0, "QUIVER_KILL3WITHARMORAT0", 5);
+
+class CAchievementQuiver_KillsWith0ArmorLarge : public CAchievementQuiver_KillsWith0Armor
+{
+	virtual int GetNumKillsNeeded(void)
+	{
+		return 6;
+	}
+};
+DECLARE_ACHIEVEMENT(CAchievementQuiver_KillsWith0ArmorLarge, ACHIEVEMENT_QUIVER_KILL6WITHARMORAT0, "QUIVER_KILL6WITHARMORAT0", 5);
 
 #endif // CLIENT_DLL
diff --git a/src/game/shared/quiver/achievements_quiver_list.inc b/src/game/shared/quiver/achievements_quiver_list.inc
@@ -0,0 +1,2 @@
+ACHIEVEMENT_LIST(CAchievementQuiver_KillsWith0Armor, ACHIEVEMENT_QUIVER_KILL3WITHARMORAT0, "QUIVER_KILL3WITHARMORAT0", 5)
+ACHIEVEMENT_LIST(CAchievementQuiver_KillsWith0ArmorLarge, ACHIEVEMENT_QUIVER_KILL6WITHARMORAT0, "QUIVER_KILL6WITHARMORAT0", 5)
diff --git a/src/game/shared/tf/achievements_tf.h b/src/game/shared/tf/achievements_tf.h
@@ -99,4 +99,7 @@ extern CAchievementMgr g_AchievementMgrTF;	// global achievement mgr for TF
 #define ACHIEVEMENT_LIST(className, achievementID, achievementName, iPointValue) \
 	static int className##_YouForgotTheAchievementList;
 #include "achievements_tf_list.inc"
+#if defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL)
+#include "quiver/achievements_quiver_list.inc"
+#endif
 #undef ACHIEVEMENT_LIST
diff --git a/src/game/shared/tf/tf_shareddefs.h b/src/game/shared/tf/tf_shareddefs.h
@@ -2573,6 +2573,13 @@ enum MedicCallerType
 #define ACHIEVEMENT_TF_MAPS_POWERHOUSE_KILL_ENEMY_IN_WATER		2805
 #define ACHIEVEMENT_TF_MAPS_POWERHOUSE_END_RANGE				2805
 
+#if defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL)
+#define ACHIEVEMENT_QUIVER_START_RANGE				3001
+#define ACHIEVEMENT_QUIVER_KILL3WITHARMORAT0		3001
+#define ACHIEVEMENT_QUIVER_KILL6WITHARMORAT0		3002
+#define ACHIEVEMENT_QUIVER_END_RANGE				3002
+#endif
+
 const unsigned char *GetTFEncryptionKey( void );
 
 //-----------------------------------------------------------------------------

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +"UnlitGeneric"
 +{
 +	"$baseTexture" "vgui/achievements/QUIVER_KILL3WITHARMORAT0"
 +}