Add 'Allow use during speech' parameter for scripted_sentence

FreeSlave · Jan 5, 2025 · 95dce68 · 95dce68
1 parent 347c2f2
commit 95dce68
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 2 deletions.
diff --git a/dlls/followingmonster.cpp b/dlls/followingmonster.cpp
@@ -661,6 +661,11 @@ bool CFollowingMonster::InScriptedSentence()
 	return false;
 }
 
+bool CFollowingMonster::AllowUseDuringScriptedSentence()
+{
+	return false;
+}
+
 Schedule_t* CFollowingMonster::GetFollowingSchedule(bool ignoreEnemy)
 {
 	if( (ignoreEnemy || m_hEnemy == 0 || !m_hEnemy->IsFullyAlive()) && IsFollowingPlayer() )
@@ -700,7 +705,11 @@ void CFollowingMonster::FollowerUse( CBaseEntity *pActivator, CBaseEntity *pCall
 		}
 		return;
 	}
-	DoFollowerUse(pCaller, true, USE_TOGGLE);
+	int result = DoFollowerUse(pCaller, true, USE_TOGGLE);
+	if (result == FOLLOWING_NOTREADY && AllowUseDuringScriptedSentence())
+	{
+		DoFollowerUse(pCaller, false, USE_TOGGLE, true);
+	}
 }
 
 bool CFollowingMonster::ShouldDeclineFollowing()

diff --git a/dlls/followingmonster.h b/dlls/followingmonster.h
@@ -94,6 +94,7 @@ class CFollowingMonster : public CSquadMonster
 
 	CFollowingMonster* MyFollowingMonsterPointer() { return this; }
 	virtual bool InScriptedSentence();
+	virtual bool AllowUseDuringScriptedSentence();
 	Schedule_t* GetFollowingSchedule(bool ignoreEnemy = false);
 	void EXPORT FollowerUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value );
 	int DoFollowerUse(CBaseEntity* pCaller, bool saySentence, USE_TYPE useType, bool ignoreScriptedSentence = false);

diff --git a/dlls/scripted.cpp b/dlls/scripted.cpp
@@ -1293,6 +1293,7 @@ class CScriptedSentence : public CBaseDelay
 	short m_searchPolicy;
 	short m_applySearchRadius;
 	string_t m_searchOrigin;
+	short m_allowUse;
 };
 
 #define SF_SENTENCE_ONCE	0x0001
@@ -1330,6 +1331,7 @@ TYPEDESCRIPTION	CScriptedSentence::m_SaveData[] =
 	DEFINE_FIELD( CScriptedSentence, m_searchPolicy, FIELD_SHORT ),
 	DEFINE_FIELD( CScriptedSentence, m_applySearchRadius, FIELD_SHORT ),
 	DEFINE_FIELD( CScriptedSentence, m_searchOrigin, FIELD_STRING ),
+	DEFINE_FIELD( CScriptedSentence, m_allowUse, FIELD_SHORT ),
 };
 
 IMPLEMENT_SAVERESTORE( CScriptedSentence, CBaseDelay )
@@ -1413,6 +1415,11 @@ void CScriptedSentence::KeyValue( KeyValueData *pkvd )
 		m_searchOrigin = ALLOC_STRING( pkvd->szValue );
 		pkvd->fHandled = true;
 	}
+	else if ( FStrEq( pkvd->szKeyName, "allow_use" ) )
+	{
+		m_allowUse = (short)atoi( pkvd->szValue );
+		pkvd->fHandled = true;
+	}
 	else
 		CBaseDelay::KeyValue( pkvd );
 }
@@ -1649,8 +1656,16 @@ bool CScriptedSentence::StartSentence( CBaseToggle *pTarget )
 		}
 	}
 
-	pTarget->PlayScriptedSentence( STRING( m_iszSentence ), m_flDuration,  m_flVolume, m_flAttenuation, bConcurrent, pListener );
 	CBaseMonster* pMonster = pTarget->MyMonsterPointer();
+	if (pMonster)
+	{
+		CTalkMonster* pTalkMonster = pMonster->MyTalkMonsterPointer();
+		if (pTalkMonster)
+		{
+			pTalkMonster->m_allowUseScriptedSentence = m_allowUse != 0;
+		}
+	}
+	pTarget->PlayScriptedSentence( STRING( m_iszSentence ), m_flDuration,  m_flVolume, m_flAttenuation, bConcurrent, pListener );
 	if (pMonster != 0 && m_followAction)
 	{
 		CFollowingMonster* followingMonster = pMonster->MyFollowingMonsterPointer();

diff --git a/dlls/talkmonster.cpp b/dlls/talkmonster.cpp
@@ -62,6 +62,7 @@ TYPEDESCRIPTION	CTalkMonster::m_SaveData[] =
 	DEFINE_FIELD( CTalkMonster, m_flStopLookTime, FIELD_TIME ),
 	DEFINE_FIELD( CTalkMonster, m_flNextFlinch, FIELD_TIME ),
 	DEFINE_FIELD( CTalkMonster, m_painTime, FIELD_TIME ),
+	DEFINE_FIELD( CTalkMonster, m_allowUseScriptedSentence, FIELD_BOOLEAN ),
 };
 
 IMPLEMENT_SAVERESTORE( CTalkMonster, CFollowingMonster )
@@ -734,6 +735,11 @@ bool CTalkMonster::InScriptedSentence()
 	return m_useTime > gpGlobals->time;
 }
 
+bool CTalkMonster::AllowUseDuringScriptedSentence()
+{
+	return m_allowUseScriptedSentence;
+}
+
 void CTalkMonster::PlayUseSentence()
 {
 	if (PlaySentence( SentenceGroup(TLK_USE), RANDOM_FLOAT( 2.8f, 3.2f ), VOL_NORM, ATTN_IDLE ))

diff --git a/dlls/talkmonster.h b/dlls/talkmonster.h
@@ -191,6 +191,7 @@ class CTalkMonster : public CFollowingMonster
 	void			LimitFollowers( CBaseEntity *pPlayer, int maxFollowers );
 	virtual int		TalkFriendCategory() { return TALK_FRIEND_PERSONNEL; }
 	bool	InScriptedSentence();
+	bool AllowUseDuringScriptedSentence() override;
 	virtual void PlayUseSentence();
 	virtual void PlayUnUseSentence();
 	virtual void DeclineFollowing(CBaseEntity* pCaller);
@@ -273,6 +274,8 @@ class CTalkMonster : public CFollowingMonster
 	float m_flNextFlinch;
 	float m_painTime;
 
+	bool m_allowUseScriptedSentence;
+
 	CUSTOM_SCHEDULES
 };
 

diff --git a/fgd/halflife.fgd b/fgd/halflife.fgd
@@ -8045,6 +8045,11 @@
 		1 : "Always"
 	]
 	search_origin(string) : "Speaker Search Origin (blank = here) [LP]" : : "Search the speaker relative to this position instead of the position of scripted_sentence"
+	allow_use(choices) : "Allow use during speech" =
+	[
+		0 : "No"
+		1 : "Yes"
+	]
 ]
 
 @PointClass base(ScriptedSequence) = scripted_sequence : "Scripted Sequence"