Extend point_bugbait functionality#229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Blixibon merged 3 commits into from
Oct 25, 2023
Merged

Extend point_bugbait functionality #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1724178
add mins and maxs to point_bugbait
arbabf Feb 19, 2023
1ff5d61
Add new inputs for the new functionality
arbabf Feb 20, 2023
8c33815
Fix existing point_bugbaits not using radius
Blixibon Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 48 additions & 7 deletions sp/src/game/server/hl2/grenade_bugbait.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,9 @@ CBugBaitSensor* GetBugBaitSensorList()
CBugBaitSensor::CBugBaitSensor( void )
{
g_BugBaitSensorList.Insert( this );
#ifdef MAPBASE
m_bUseRadius = true;
#endif
}

CBugBaitSensor::~CBugBaitSensor( void )
Expand All@@ -50,10 +53,24 @@ BEGIN_DATADESC( CBugBaitSensor )
DEFINE_KEYFIELD( m_bEnabled, FIELD_BOOLEAN, "Enabled" ),
DEFINE_KEYFIELD( m_flRadius, FIELD_FLOAT, "radius" ),

#ifdef MAPBASE
DEFINE_KEYFIELD( m_bUseRadius, FIELD_BOOLEAN, "useradius" ),
DEFINE_KEYFIELD( m_vecMins, FIELD_VECTOR, "bmins" ),
DEFINE_KEYFIELD( m_vecMaxs, FIELD_VECTOR, "bmaxs" ),
#endif

DEFINE_INPUTFUNC( FIELD_VOID, "Enable", InputEnable ),
DEFINE_INPUTFUNC( FIELD_VOID, "Disable", InputDisable ),
DEFINE_INPUTFUNC( FIELD_VOID, "Toggle", InputToggle ),

#ifdef MAPBASE
DEFINE_INPUTFUNC( FIELD_VOID, "EnableRadius", InputEnableRadius ),
DEFINE_INPUTFUNC( FIELD_VOID, "DisableRadius", InputDisableRadius ),
DEFINE_INPUTFUNC( FIELD_INTEGER, "SetRadius", InputSetRadius ),
DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMins", InputSetMins ),
DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMaxs", InputSetMaxs ),
#endif

// Function Pointers
DEFINE_OUTPUT( m_OnBaited, "OnBaited" ),

Expand DownExpand Up@@ -267,18 +284,42 @@ bool CGrenadeBugBait::ActivateBugbaitTargets( CBaseEntity *pOwner, Vector vecOri
continue;

//Make sure we're within range of the sensor
if ( pSensor->GetRadius() > ( pSensor->GetAbsOrigin() - vecOrigin ).Length() )
{
//Tell the sensor it's been hit
if ( pSensor->Baited( pOwner ) )
#ifdef MAPBASE
if ( pSensor->UsesRadius() ){
#endif
if ( pSensor->GetRadius() > (pSensor->GetAbsOrigin() - vecOrigin).Length() )
{
//If we're suppressing the call to antlions, then don't make a bugbait sound
if ( pSensor->SuppressCall() )
//Tell the sensor it's been hit
if ( pSensor->Baited( pOwner ) )
{
suppressCall = true;
//If we're suppressing the call to antlions, then don't make a bugbait sound
if ( pSensor->SuppressCall() )
{
suppressCall = true;
}
}
}
#ifdef MAPBASE
}
else{
Vector vMins = pSensor->GetAbsMins();
Vector vMaxs = pSensor->GetAbsMaxs();
bool inBox = ((vecOrigin.x >= vMins.x && vecOrigin.x <= vMaxs.x) &&
(vecOrigin.y >= vMins.y && vecOrigin.y <= vMaxs.y) &&
(vecOrigin.z >= vMins.z && vecOrigin.z <= vMaxs.z));
if ( inBox ){
//Tell the sensor it's been hit
if ( pSensor->Baited( pOwner ) )
{
//If we're suppressing the call to antlions, then don't make a bugbait sound
if ( pSensor->SuppressCall() )
{
suppressCall = true;
}
}
}
}
#endif
}

return suppressCall;
Expand Down
40 changes: 40 additions & 0 deletions sp/src/game/server/hl2/grenade_bugbait.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,28 @@ class CBugBaitSensor : public CPointEntity
m_bEnabled = !m_bEnabled;
}

#ifdef MAPBASE
void InputEnableRadius( inputdata_t &data ){
m_bUseRadius = true;
}

void InputDisableRadius( inputdata_t &data ){
m_bUseRadius = false;
}

void InputSetRadius( inputdata_t &data ){
m_flRadius = data.value.Int();
}

void InputSetMins( inputdata_t &data ){
data.value.Vector3D( m_vecMins );
}

void InputSetMaxs( inputdata_t &data ){
data.value.Vector3D( m_vecMaxs );
}
#endif

bool SuppressCall( void )
{
return ( HasSpawnFlags( SF_BUGBAIT_SUPPRESS_CALL ) );
Expand DownExpand Up@@ -91,10 +113,28 @@ class CBugBaitSensor : public CPointEntity
return !m_bEnabled;
}

#ifdef MAPBASE
bool UsesRadius( void ) const {
return m_bUseRadius;
}

Vector GetAbsMins( void ) const {
return GetAbsOrigin() + m_vecMins;
}
Vector GetAbsMaxs( void ) const {
return GetAbsOrigin() + m_vecMaxs;
}
#endif

protected:

float m_flRadius;
bool m_bEnabled;
#ifdef MAPBASE
bool m_bUseRadius;
Vector m_vecMins;
Vector m_vecMaxs;
#endif
COutputEvent m_OnBaited;

public:
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Extend point_bugbait functionality#229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Blixibon
merged 3 commits into

from

Oct 25, 2023
 Merged


Extend point_bugbait functionality
#229
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1724178

add mins and maxs to point_bugbait


arbabf Feb 19, 2023
1ff5d61

Add new inputs for the new functionality


arbabf Feb 20, 2023
8c33815

Fix existing point_bugbaits not using radius


Blixibon Oct 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 48 additions & 7 deletions
sp/src/game/server/hl2/grenade_bugbait.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,9 @@ CBugBaitSensor* GetBugBaitSensorList()
CBugBaitSensor::CBugBaitSensor( void )
{
	g_BugBaitSensorList.Insert( this );
#ifdef MAPBASE
	m_bUseRadius = true;
#endif
}

CBugBaitSensor::~CBugBaitSensor( void )
Expand All@@ -50,10 +53,24 @@ BEGIN_DATADESC( CBugBaitSensor )
	DEFINE_KEYFIELD( m_bEnabled, FIELD_BOOLEAN, "Enabled" ),
	DEFINE_KEYFIELD( m_flRadius, FIELD_FLOAT, "radius" ),

#ifdef MAPBASE
	DEFINE_KEYFIELD( m_bUseRadius, FIELD_BOOLEAN, "useradius" ),
	DEFINE_KEYFIELD( m_vecMins, FIELD_VECTOR, "bmins" ),
	DEFINE_KEYFIELD( m_vecMaxs, FIELD_VECTOR, "bmaxs" ),
#endif

	DEFINE_INPUTFUNC( FIELD_VOID, "Enable", InputEnable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Disable", InputDisable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Toggle", InputToggle ),

#ifdef MAPBASE
	DEFINE_INPUTFUNC( FIELD_VOID, "EnableRadius", InputEnableRadius ),
	DEFINE_INPUTFUNC( FIELD_VOID, "DisableRadius", InputDisableRadius ),
	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetRadius", InputSetRadius ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMins", InputSetMins ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMaxs", InputSetMaxs ),
#endif

	// Function Pointers
	DEFINE_OUTPUT( m_OnBaited, "OnBaited" ),

Expand DownExpand Up@@ -267,18 +284,42 @@ bool CGrenadeBugBait::ActivateBugbaitTargets( CBaseEntity *pOwner, Vector vecOri
 continue;

 //Make sure we're within range of the sensor
 if ( pSensor->GetRadius() > ( pSensor->GetAbsOrigin() - vecOrigin ).Length() )
 {
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
#ifdef MAPBASE
if ( pSensor->UsesRadius() ){
#endif
 if ( pSensor->GetRadius() > (pSensor->GetAbsOrigin() - vecOrigin).Length() )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 suppressCall = true;
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
#ifdef MAPBASE
 }
 else{
 Vector vMins = pSensor->GetAbsMins();
 Vector vMaxs = pSensor->GetAbsMaxs();
 bool inBox = ((vecOrigin.x >= vMins.x && vecOrigin.x <= vMaxs.x) &&
 (vecOrigin.y >= vMins.y && vecOrigin.y <= vMaxs.y) &&
 (vecOrigin.z >= vMins.z && vecOrigin.z <= vMaxs.z));
 if ( inBox ){
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
 }
#endif
	}

	return suppressCall;
Expand Down

40 changes: 40 additions & 0 deletions
sp/src/game/server/hl2/grenade_bugbait.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,28 @@ class CBugBaitSensor : public CPointEntity
 m_bEnabled = !m_bEnabled;
	}

#ifdef MAPBASE
	void InputEnableRadius( inputdata_t &data ){
 m_bUseRadius = true;
	}

	void InputDisableRadius( inputdata_t &data ){
 m_bUseRadius = false;
	}

	void InputSetRadius( inputdata_t &data ){
 m_flRadius = data.value.Int();
	}

	void InputSetMins( inputdata_t &data ){
 data.value.Vector3D( m_vecMins );
	}

	void InputSetMaxs( inputdata_t &data ){
 data.value.Vector3D( m_vecMaxs );
	}
#endif

	bool SuppressCall( void )
	{
 return ( HasSpawnFlags( SF_BUGBAIT_SUPPRESS_CALL ) );
Expand DownExpand Up@@ -91,10 +113,28 @@ class CBugBaitSensor : public CPointEntity
 return !m_bEnabled;
	}

#ifdef MAPBASE
	bool UsesRadius( void ) const {
 return m_bUseRadius;
	}

	Vector GetAbsMins( void ) const {
 return GetAbsOrigin() + m_vecMins;
	}
	Vector GetAbsMaxs( void ) const {
 return GetAbsOrigin() + m_vecMaxs;
	}
#endif

protected:

	float m_flRadius;
	bool m_bEnabled;
#ifdef MAPBASE
	bool m_bUseRadius;
	Vector m_vecMins;
	Vector m_vecMaxs;
#endif
	COutputEvent	m_OnBaited;

public:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Extend point_bugbait functionality#229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Blixibon
merged 3 commits into

from

Oct 25, 2023
 Merged


Extend point_bugbait functionality
#229
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1724178

add mins and maxs to point_bugbait


arbabf Feb 19, 2023
1ff5d61

Add new inputs for the new functionality


arbabf Feb 20, 2023
8c33815

Fix existing point_bugbaits not using radius


Blixibon Oct 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 48 additions & 7 deletions
sp/src/game/server/hl2/grenade_bugbait.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,9 @@ CBugBaitSensor* GetBugBaitSensorList()
CBugBaitSensor::CBugBaitSensor( void )
{
	g_BugBaitSensorList.Insert( this );
#ifdef MAPBASE
	m_bUseRadius = true;
#endif
}

CBugBaitSensor::~CBugBaitSensor( void )
Expand All@@ -50,10 +53,24 @@ BEGIN_DATADESC( CBugBaitSensor )
	DEFINE_KEYFIELD( m_bEnabled, FIELD_BOOLEAN, "Enabled" ),
	DEFINE_KEYFIELD( m_flRadius, FIELD_FLOAT, "radius" ),

#ifdef MAPBASE
	DEFINE_KEYFIELD( m_bUseRadius, FIELD_BOOLEAN, "useradius" ),
	DEFINE_KEYFIELD( m_vecMins, FIELD_VECTOR, "bmins" ),
	DEFINE_KEYFIELD( m_vecMaxs, FIELD_VECTOR, "bmaxs" ),
#endif

	DEFINE_INPUTFUNC( FIELD_VOID, "Enable", InputEnable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Disable", InputDisable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Toggle", InputToggle ),

#ifdef MAPBASE
	DEFINE_INPUTFUNC( FIELD_VOID, "EnableRadius", InputEnableRadius ),
	DEFINE_INPUTFUNC( FIELD_VOID, "DisableRadius", InputDisableRadius ),
	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetRadius", InputSetRadius ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMins", InputSetMins ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMaxs", InputSetMaxs ),
#endif

	// Function Pointers
	DEFINE_OUTPUT( m_OnBaited, "OnBaited" ),

Expand DownExpand Up@@ -267,18 +284,42 @@ bool CGrenadeBugBait::ActivateBugbaitTargets( CBaseEntity *pOwner, Vector vecOri
 continue;

 //Make sure we're within range of the sensor
 if ( pSensor->GetRadius() > ( pSensor->GetAbsOrigin() - vecOrigin ).Length() )
 {
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
#ifdef MAPBASE
if ( pSensor->UsesRadius() ){
#endif
 if ( pSensor->GetRadius() > (pSensor->GetAbsOrigin() - vecOrigin).Length() )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 suppressCall = true;
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
#ifdef MAPBASE
 }
 else{
 Vector vMins = pSensor->GetAbsMins();
 Vector vMaxs = pSensor->GetAbsMaxs();
 bool inBox = ((vecOrigin.x >= vMins.x && vecOrigin.x <= vMaxs.x) &&
 (vecOrigin.y >= vMins.y && vecOrigin.y <= vMaxs.y) &&
 (vecOrigin.z >= vMins.z && vecOrigin.z <= vMaxs.z));
 if ( inBox ){
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
 }
#endif
	}

	return suppressCall;
Expand Down

40 changes: 40 additions & 0 deletions
sp/src/game/server/hl2/grenade_bugbait.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,28 @@ class CBugBaitSensor : public CPointEntity
 m_bEnabled = !m_bEnabled;
	}

#ifdef MAPBASE
	void InputEnableRadius( inputdata_t &data ){
 m_bUseRadius = true;
	}

	void InputDisableRadius( inputdata_t &data ){
 m_bUseRadius = false;
	}

	void InputSetRadius( inputdata_t &data ){
 m_flRadius = data.value.Int();
	}

	void InputSetMins( inputdata_t &data ){
 data.value.Vector3D( m_vecMins );
	}

	void InputSetMaxs( inputdata_t &data ){
 data.value.Vector3D( m_vecMaxs );
	}
#endif

	bool SuppressCall( void )
	{
 return ( HasSpawnFlags( SF_BUGBAIT_SUPPRESS_CALL ) );
Expand DownExpand Up@@ -91,10 +113,28 @@ class CBugBaitSensor : public CPointEntity
 return !m_bEnabled;
	}

#ifdef MAPBASE
	bool UsesRadius( void ) const {
 return m_bUseRadius;
	}

	Vector GetAbsMins( void ) const {
 return GetAbsOrigin() + m_vecMins;
	}
	Vector GetAbsMaxs( void ) const {
 return GetAbsOrigin() + m_vecMaxs;
	}
#endif

protected:

	float m_flRadius;
	bool m_bEnabled;
#ifdef MAPBASE
	bool m_bUseRadius;
	Vector m_vecMins;
	Vector m_vecMaxs;
#endif
	COutputEvent	m_OnBaited;

public:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Extend point_bugbait functionality#229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Blixibon
merged 3 commits into

from

Oct 25, 2023
 Merged


Extend point_bugbait functionality
#229
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1724178

add mins and maxs to point_bugbait


arbabf Feb 19, 2023
1ff5d61

Add new inputs for the new functionality


arbabf Feb 20, 2023
8c33815

Fix existing point_bugbaits not using radius


Blixibon Oct 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 48 additions & 7 deletions
sp/src/game/server/hl2/grenade_bugbait.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,9 @@ CBugBaitSensor* GetBugBaitSensorList()
CBugBaitSensor::CBugBaitSensor( void )
{
	g_BugBaitSensorList.Insert( this );
#ifdef MAPBASE
	m_bUseRadius = true;
#endif
}

CBugBaitSensor::~CBugBaitSensor( void )
Expand All@@ -50,10 +53,24 @@ BEGIN_DATADESC( CBugBaitSensor )
	DEFINE_KEYFIELD( m_bEnabled, FIELD_BOOLEAN, "Enabled" ),
	DEFINE_KEYFIELD( m_flRadius, FIELD_FLOAT, "radius" ),

#ifdef MAPBASE
	DEFINE_KEYFIELD( m_bUseRadius, FIELD_BOOLEAN, "useradius" ),
	DEFINE_KEYFIELD( m_vecMins, FIELD_VECTOR, "bmins" ),
	DEFINE_KEYFIELD( m_vecMaxs, FIELD_VECTOR, "bmaxs" ),
#endif

	DEFINE_INPUTFUNC( FIELD_VOID, "Enable", InputEnable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Disable", InputDisable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Toggle", InputToggle ),

#ifdef MAPBASE
	DEFINE_INPUTFUNC( FIELD_VOID, "EnableRadius", InputEnableRadius ),
	DEFINE_INPUTFUNC( FIELD_VOID, "DisableRadius", InputDisableRadius ),
	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetRadius", InputSetRadius ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMins", InputSetMins ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMaxs", InputSetMaxs ),
#endif

	// Function Pointers
	DEFINE_OUTPUT( m_OnBaited, "OnBaited" ),

Expand DownExpand Up@@ -267,18 +284,42 @@ bool CGrenadeBugBait::ActivateBugbaitTargets( CBaseEntity *pOwner, Vector vecOri
 continue;

 //Make sure we're within range of the sensor
 if ( pSensor->GetRadius() > ( pSensor->GetAbsOrigin() - vecOrigin ).Length() )
 {
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
#ifdef MAPBASE
if ( pSensor->UsesRadius() ){
#endif
 if ( pSensor->GetRadius() > (pSensor->GetAbsOrigin() - vecOrigin).Length() )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 suppressCall = true;
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
#ifdef MAPBASE
 }
 else{
 Vector vMins = pSensor->GetAbsMins();
 Vector vMaxs = pSensor->GetAbsMaxs();
 bool inBox = ((vecOrigin.x >= vMins.x && vecOrigin.x <= vMaxs.x) &&
 (vecOrigin.y >= vMins.y && vecOrigin.y <= vMaxs.y) &&
 (vecOrigin.z >= vMins.z && vecOrigin.z <= vMaxs.z));
 if ( inBox ){
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
 }
#endif
	}

	return suppressCall;
Expand Down

40 changes: 40 additions & 0 deletions
sp/src/game/server/hl2/grenade_bugbait.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,28 @@ class CBugBaitSensor : public CPointEntity
 m_bEnabled = !m_bEnabled;
	}

#ifdef MAPBASE
	void InputEnableRadius( inputdata_t &data ){
 m_bUseRadius = true;
	}

	void InputDisableRadius( inputdata_t &data ){
 m_bUseRadius = false;
	}

	void InputSetRadius( inputdata_t &data ){
 m_flRadius = data.value.Int();
	}

	void InputSetMins( inputdata_t &data ){
 data.value.Vector3D( m_vecMins );
	}

	void InputSetMaxs( inputdata_t &data ){
 data.value.Vector3D( m_vecMaxs );
	}
#endif

	bool SuppressCall( void )
	{
 return ( HasSpawnFlags( SF_BUGBAIT_SUPPRESS_CALL ) );
Expand DownExpand Up@@ -91,10 +113,28 @@ class CBugBaitSensor : public CPointEntity
 return !m_bEnabled;
	}

#ifdef MAPBASE
	bool UsesRadius( void ) const {
 return m_bUseRadius;
	}

	Vector GetAbsMins( void ) const {
 return GetAbsOrigin() + m_vecMins;
	}
	Vector GetAbsMaxs( void ) const {
 return GetAbsOrigin() + m_vecMaxs;
	}
#endif

protected:

	float m_flRadius;
	bool m_bEnabled;
#ifdef MAPBASE
	bool m_bUseRadius;
	Vector m_vecMins;
	Vector m_vecMaxs;
#endif
	COutputEvent	m_OnBaited;

public:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Extend point_bugbait functionality#229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Blixibon
merged 3 commits into

from

Oct 25, 2023
 Merged


Extend point_bugbait functionality
#229
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1724178

add mins and maxs to point_bugbait


arbabf Feb 19, 2023
1ff5d61

Add new inputs for the new functionality


arbabf Feb 20, 2023
8c33815

Fix existing point_bugbaits not using radius


Blixibon Oct 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 48 additions & 7 deletions
sp/src/game/server/hl2/grenade_bugbait.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,9 @@ CBugBaitSensor* GetBugBaitSensorList()
CBugBaitSensor::CBugBaitSensor( void )
{
	g_BugBaitSensorList.Insert( this );
#ifdef MAPBASE
	m_bUseRadius = true;
#endif
}

CBugBaitSensor::~CBugBaitSensor( void )
Expand All@@ -50,10 +53,24 @@ BEGIN_DATADESC( CBugBaitSensor )
	DEFINE_KEYFIELD( m_bEnabled, FIELD_BOOLEAN, "Enabled" ),
	DEFINE_KEYFIELD( m_flRadius, FIELD_FLOAT, "radius" ),

#ifdef MAPBASE
	DEFINE_KEYFIELD( m_bUseRadius, FIELD_BOOLEAN, "useradius" ),
	DEFINE_KEYFIELD( m_vecMins, FIELD_VECTOR, "bmins" ),
	DEFINE_KEYFIELD( m_vecMaxs, FIELD_VECTOR, "bmaxs" ),
#endif

	DEFINE_INPUTFUNC( FIELD_VOID, "Enable", InputEnable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Disable", InputDisable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Toggle", InputToggle ),

#ifdef MAPBASE
	DEFINE_INPUTFUNC( FIELD_VOID, "EnableRadius", InputEnableRadius ),
	DEFINE_INPUTFUNC( FIELD_VOID, "DisableRadius", InputDisableRadius ),
	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetRadius", InputSetRadius ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMins", InputSetMins ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMaxs", InputSetMaxs ),
#endif

	// Function Pointers
	DEFINE_OUTPUT( m_OnBaited, "OnBaited" ),

Expand DownExpand Up@@ -267,18 +284,42 @@ bool CGrenadeBugBait::ActivateBugbaitTargets( CBaseEntity *pOwner, Vector vecOri
 continue;

 //Make sure we're within range of the sensor
 if ( pSensor->GetRadius() > ( pSensor->GetAbsOrigin() - vecOrigin ).Length() )
 {
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
#ifdef MAPBASE
if ( pSensor->UsesRadius() ){
#endif
 if ( pSensor->GetRadius() > (pSensor->GetAbsOrigin() - vecOrigin).Length() )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 suppressCall = true;
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
#ifdef MAPBASE
 }
 else{
 Vector vMins = pSensor->GetAbsMins();
 Vector vMaxs = pSensor->GetAbsMaxs();
 bool inBox = ((vecOrigin.x >= vMins.x && vecOrigin.x <= vMaxs.x) &&
 (vecOrigin.y >= vMins.y && vecOrigin.y <= vMaxs.y) &&
 (vecOrigin.z >= vMins.z && vecOrigin.z <= vMaxs.z));
 if ( inBox ){
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
 }
#endif
	}

	return suppressCall;
Expand Down

40 changes: 40 additions & 0 deletions
sp/src/game/server/hl2/grenade_bugbait.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,28 @@ class CBugBaitSensor : public CPointEntity
 m_bEnabled = !m_bEnabled;
	}

#ifdef MAPBASE
	void InputEnableRadius( inputdata_t &data ){
 m_bUseRadius = true;
	}

	void InputDisableRadius( inputdata_t &data ){
 m_bUseRadius = false;
	}

	void InputSetRadius( inputdata_t &data ){
 m_flRadius = data.value.Int();
	}

	void InputSetMins( inputdata_t &data ){
 data.value.Vector3D( m_vecMins );
	}

	void InputSetMaxs( inputdata_t &data ){
 data.value.Vector3D( m_vecMaxs );
	}
#endif

	bool SuppressCall( void )
	{
 return ( HasSpawnFlags( SF_BUGBAIT_SUPPRESS_CALL ) );
Expand DownExpand Up@@ -91,10 +113,28 @@ class CBugBaitSensor : public CPointEntity
 return !m_bEnabled;
	}

#ifdef MAPBASE
	bool UsesRadius( void ) const {
 return m_bUseRadius;
	}

	Vector GetAbsMins( void ) const {
 return GetAbsOrigin() + m_vecMins;
	}
	Vector GetAbsMaxs( void ) const {
 return GetAbsOrigin() + m_vecMaxs;
	}
#endif

protected:

	float m_flRadius;
	bool m_bEnabled;
#ifdef MAPBASE
	bool m_bUseRadius;
	Vector m_vecMins;
	Vector m_vecMaxs;
#endif
	COutputEvent	m_OnBaited;

public:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Extend point_bugbait functionality#229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Blixibon
merged 3 commits into

from

Oct 25, 2023
 Merged


Extend point_bugbait functionality
#229
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1724178

add mins and maxs to point_bugbait


arbabf Feb 19, 2023
1ff5d61

Add new inputs for the new functionality


arbabf Feb 20, 2023
8c33815

Fix existing point_bugbaits not using radius


Blixibon Oct 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 48 additions & 7 deletions
sp/src/game/server/hl2/grenade_bugbait.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,9 @@ CBugBaitSensor* GetBugBaitSensorList()
CBugBaitSensor::CBugBaitSensor( void )
{
	g_BugBaitSensorList.Insert( this );
#ifdef MAPBASE
	m_bUseRadius = true;
#endif
}

CBugBaitSensor::~CBugBaitSensor( void )
Expand All@@ -50,10 +53,24 @@ BEGIN_DATADESC( CBugBaitSensor )
	DEFINE_KEYFIELD( m_bEnabled, FIELD_BOOLEAN, "Enabled" ),
	DEFINE_KEYFIELD( m_flRadius, FIELD_FLOAT, "radius" ),

#ifdef MAPBASE
	DEFINE_KEYFIELD( m_bUseRadius, FIELD_BOOLEAN, "useradius" ),
	DEFINE_KEYFIELD( m_vecMins, FIELD_VECTOR, "bmins" ),
	DEFINE_KEYFIELD( m_vecMaxs, FIELD_VECTOR, "bmaxs" ),
#endif

	DEFINE_INPUTFUNC( FIELD_VOID, "Enable", InputEnable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Disable", InputDisable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Toggle", InputToggle ),

#ifdef MAPBASE
	DEFINE_INPUTFUNC( FIELD_VOID, "EnableRadius", InputEnableRadius ),
	DEFINE_INPUTFUNC( FIELD_VOID, "DisableRadius", InputDisableRadius ),
	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetRadius", InputSetRadius ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMins", InputSetMins ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMaxs", InputSetMaxs ),
#endif

	// Function Pointers
	DEFINE_OUTPUT( m_OnBaited, "OnBaited" ),

Expand DownExpand Up@@ -267,18 +284,42 @@ bool CGrenadeBugBait::ActivateBugbaitTargets( CBaseEntity *pOwner, Vector vecOri
 continue;

 //Make sure we're within range of the sensor
 if ( pSensor->GetRadius() > ( pSensor->GetAbsOrigin() - vecOrigin ).Length() )
 {
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
#ifdef MAPBASE
if ( pSensor->UsesRadius() ){
#endif
 if ( pSensor->GetRadius() > (pSensor->GetAbsOrigin() - vecOrigin).Length() )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 suppressCall = true;
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
#ifdef MAPBASE
 }
 else{
 Vector vMins = pSensor->GetAbsMins();
 Vector vMaxs = pSensor->GetAbsMaxs();
 bool inBox = ((vecOrigin.x >= vMins.x && vecOrigin.x <= vMaxs.x) &&
 (vecOrigin.y >= vMins.y && vecOrigin.y <= vMaxs.y) &&
 (vecOrigin.z >= vMins.z && vecOrigin.z <= vMaxs.z));
 if ( inBox ){
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
 }
#endif
	}

	return suppressCall;
Expand Down

40 changes: 40 additions & 0 deletions
sp/src/game/server/hl2/grenade_bugbait.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,28 @@ class CBugBaitSensor : public CPointEntity
 m_bEnabled = !m_bEnabled;
	}

#ifdef MAPBASE
	void InputEnableRadius( inputdata_t &data ){
 m_bUseRadius = true;
	}

	void InputDisableRadius( inputdata_t &data ){
 m_bUseRadius = false;
	}

	void InputSetRadius( inputdata_t &data ){
 m_flRadius = data.value.Int();
	}

	void InputSetMins( inputdata_t &data ){
 data.value.Vector3D( m_vecMins );
	}

	void InputSetMaxs( inputdata_t &data ){
 data.value.Vector3D( m_vecMaxs );
	}
#endif

	bool SuppressCall( void )
	{
 return ( HasSpawnFlags( SF_BUGBAIT_SUPPRESS_CALL ) );
Expand DownExpand Up@@ -91,10 +113,28 @@ class CBugBaitSensor : public CPointEntity
 return !m_bEnabled;
	}

#ifdef MAPBASE
	bool UsesRadius( void ) const {
 return m_bUseRadius;
	}

	Vector GetAbsMins( void ) const {
 return GetAbsOrigin() + m_vecMins;
	}
	Vector GetAbsMaxs( void ) const {
 return GetAbsOrigin() + m_vecMaxs;
	}
#endif

protected:

	float m_flRadius;
	bool m_bEnabled;
#ifdef MAPBASE
	bool m_bUseRadius;
	Vector m_vecMins;
	Vector m_vecMaxs;
#endif
	COutputEvent	m_OnBaited;

public:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Extend point_bugbait functionality#229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Blixibon
merged 3 commits into

from

Oct 25, 2023
 Merged


Extend point_bugbait functionality
#229
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1724178

add mins and maxs to point_bugbait


arbabf Feb 19, 2023
1ff5d61

Add new inputs for the new functionality


arbabf Feb 20, 2023
8c33815

Fix existing point_bugbaits not using radius


Blixibon Oct 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 48 additions & 7 deletions
sp/src/game/server/hl2/grenade_bugbait.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,9 @@ CBugBaitSensor* GetBugBaitSensorList()
CBugBaitSensor::CBugBaitSensor( void )
{
	g_BugBaitSensorList.Insert( this );
#ifdef MAPBASE
	m_bUseRadius = true;
#endif
}

CBugBaitSensor::~CBugBaitSensor( void )
Expand All@@ -50,10 +53,24 @@ BEGIN_DATADESC( CBugBaitSensor )
	DEFINE_KEYFIELD( m_bEnabled, FIELD_BOOLEAN, "Enabled" ),
	DEFINE_KEYFIELD( m_flRadius, FIELD_FLOAT, "radius" ),

#ifdef MAPBASE
	DEFINE_KEYFIELD( m_bUseRadius, FIELD_BOOLEAN, "useradius" ),
	DEFINE_KEYFIELD( m_vecMins, FIELD_VECTOR, "bmins" ),
	DEFINE_KEYFIELD( m_vecMaxs, FIELD_VECTOR, "bmaxs" ),
#endif

	DEFINE_INPUTFUNC( FIELD_VOID, "Enable", InputEnable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Disable", InputDisable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Toggle", InputToggle ),

#ifdef MAPBASE
	DEFINE_INPUTFUNC( FIELD_VOID, "EnableRadius", InputEnableRadius ),
	DEFINE_INPUTFUNC( FIELD_VOID, "DisableRadius", InputDisableRadius ),
	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetRadius", InputSetRadius ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMins", InputSetMins ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMaxs", InputSetMaxs ),
#endif

	// Function Pointers
	DEFINE_OUTPUT( m_OnBaited, "OnBaited" ),

Expand DownExpand Up@@ -267,18 +284,42 @@ bool CGrenadeBugBait::ActivateBugbaitTargets( CBaseEntity *pOwner, Vector vecOri
 continue;

 //Make sure we're within range of the sensor
 if ( pSensor->GetRadius() > ( pSensor->GetAbsOrigin() - vecOrigin ).Length() )
 {
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
#ifdef MAPBASE
if ( pSensor->UsesRadius() ){
#endif
 if ( pSensor->GetRadius() > (pSensor->GetAbsOrigin() - vecOrigin).Length() )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 suppressCall = true;
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
#ifdef MAPBASE
 }
 else{
 Vector vMins = pSensor->GetAbsMins();
 Vector vMaxs = pSensor->GetAbsMaxs();
 bool inBox = ((vecOrigin.x >= vMins.x && vecOrigin.x <= vMaxs.x) &&
 (vecOrigin.y >= vMins.y && vecOrigin.y <= vMaxs.y) &&
 (vecOrigin.z >= vMins.z && vecOrigin.z <= vMaxs.z));
 if ( inBox ){
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
 }
#endif
	}

	return suppressCall;
Expand Down

40 changes: 40 additions & 0 deletions
sp/src/game/server/hl2/grenade_bugbait.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,28 @@ class CBugBaitSensor : public CPointEntity
 m_bEnabled = !m_bEnabled;
	}

#ifdef MAPBASE
	void InputEnableRadius( inputdata_t &data ){
 m_bUseRadius = true;
	}

	void InputDisableRadius( inputdata_t &data ){
 m_bUseRadius = false;
	}

	void InputSetRadius( inputdata_t &data ){
 m_flRadius = data.value.Int();
	}

	void InputSetMins( inputdata_t &data ){
 data.value.Vector3D( m_vecMins );
	}

	void InputSetMaxs( inputdata_t &data ){
 data.value.Vector3D( m_vecMaxs );
	}
#endif

	bool SuppressCall( void )
	{
 return ( HasSpawnFlags( SF_BUGBAIT_SUPPRESS_CALL ) );
Expand DownExpand Up@@ -91,10 +113,28 @@ class CBugBaitSensor : public CPointEntity
 return !m_bEnabled;
	}

#ifdef MAPBASE
	bool UsesRadius( void ) const {
 return m_bUseRadius;
	}

	Vector GetAbsMins( void ) const {
 return GetAbsOrigin() + m_vecMins;
	}
	Vector GetAbsMaxs( void ) const {
 return GetAbsOrigin() + m_vecMaxs;
	}
#endif

protected:

	float m_flRadius;
	bool m_bEnabled;
#ifdef MAPBASE
	bool m_bUseRadius;
	Vector m_vecMins;
	Vector m_vecMaxs;
#endif
	COutputEvent	m_OnBaited;

public:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Extend point_bugbait functionality#229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Blixibon
merged 3 commits into

from

Oct 25, 2023
 Merged


Extend point_bugbait functionality
#229
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1724178

add mins and maxs to point_bugbait


arbabf Feb 19, 2023
1ff5d61

Add new inputs for the new functionality


arbabf Feb 20, 2023
8c33815

Fix existing point_bugbaits not using radius


Blixibon Oct 25, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


55 changes: 48 additions & 7 deletions
sp/src/game/server/hl2/grenade_bugbait.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,9 @@ CBugBaitSensor* GetBugBaitSensorList()
CBugBaitSensor::CBugBaitSensor( void )
{
	g_BugBaitSensorList.Insert( this );
#ifdef MAPBASE
	m_bUseRadius = true;
#endif
}

CBugBaitSensor::~CBugBaitSensor( void )
Expand All@@ -50,10 +53,24 @@ BEGIN_DATADESC( CBugBaitSensor )
	DEFINE_KEYFIELD( m_bEnabled, FIELD_BOOLEAN, "Enabled" ),
	DEFINE_KEYFIELD( m_flRadius, FIELD_FLOAT, "radius" ),

#ifdef MAPBASE
	DEFINE_KEYFIELD( m_bUseRadius, FIELD_BOOLEAN, "useradius" ),
	DEFINE_KEYFIELD( m_vecMins, FIELD_VECTOR, "bmins" ),
	DEFINE_KEYFIELD( m_vecMaxs, FIELD_VECTOR, "bmaxs" ),
#endif

	DEFINE_INPUTFUNC( FIELD_VOID, "Enable", InputEnable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Disable", InputDisable ),
	DEFINE_INPUTFUNC( FIELD_VOID, "Toggle", InputToggle ),

#ifdef MAPBASE
	DEFINE_INPUTFUNC( FIELD_VOID, "EnableRadius", InputEnableRadius ),
	DEFINE_INPUTFUNC( FIELD_VOID, "DisableRadius", InputDisableRadius ),
	DEFINE_INPUTFUNC( FIELD_INTEGER, "SetRadius", InputSetRadius ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMins", InputSetMins ),
	DEFINE_INPUTFUNC( FIELD_VECTOR, "SetMaxs", InputSetMaxs ),
#endif

	// Function Pointers
	DEFINE_OUTPUT( m_OnBaited, "OnBaited" ),

Expand DownExpand Up@@ -267,18 +284,42 @@ bool CGrenadeBugBait::ActivateBugbaitTargets( CBaseEntity *pOwner, Vector vecOri
 continue;

 //Make sure we're within range of the sensor
 if ( pSensor->GetRadius() > ( pSensor->GetAbsOrigin() - vecOrigin ).Length() )
 {
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
#ifdef MAPBASE
if ( pSensor->UsesRadius() ){
#endif
 if ( pSensor->GetRadius() > (pSensor->GetAbsOrigin() - vecOrigin).Length() )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 suppressCall = true;
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
#ifdef MAPBASE
 }
 else{
 Vector vMins = pSensor->GetAbsMins();
 Vector vMaxs = pSensor->GetAbsMaxs();
 bool inBox = ((vecOrigin.x >= vMins.x && vecOrigin.x <= vMaxs.x) &&
 (vecOrigin.y >= vMins.y && vecOrigin.y <= vMaxs.y) &&
 (vecOrigin.z >= vMins.z && vecOrigin.z <= vMaxs.z));
 if ( inBox ){
 //Tell the sensor it's been hit
 if ( pSensor->Baited( pOwner ) )
 {
 //If we're suppressing the call to antlions, then don't make a bugbait sound
 if ( pSensor->SuppressCall() )
 {
 suppressCall = true;
 }
 }
 }
 }
#endif
	}

	return suppressCall;
Expand Down

40 changes: 40 additions & 0 deletions
sp/src/game/server/hl2/grenade_bugbait.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,28 @@ class CBugBaitSensor : public CPointEntity
 m_bEnabled = !m_bEnabled;
	}

#ifdef MAPBASE
	void InputEnableRadius( inputdata_t &data ){
 m_bUseRadius = true;
	}

	void InputDisableRadius( inputdata_t &data ){
 m_bUseRadius = false;
	}

	void InputSetRadius( inputdata_t &data ){
 m_flRadius = data.value.Int();
	}

	void InputSetMins( inputdata_t &data ){
 data.value.Vector3D( m_vecMins );
	}

	void InputSetMaxs( inputdata_t &data ){
 data.value.Vector3D( m_vecMaxs );
	}
#endif

	bool SuppressCall( void )
	{
 return ( HasSpawnFlags( SF_BUGBAIT_SUPPRESS_CALL ) );
Expand DownExpand Up@@ -91,10 +113,28 @@ class CBugBaitSensor : public CPointEntity
 return !m_bEnabled;
	}

#ifdef MAPBASE
	bool UsesRadius( void ) const {
 return m_bUseRadius;
	}

	Vector GetAbsMins( void ) const {
 return GetAbsOrigin() + m_vecMins;
	}
	Vector GetAbsMaxs( void ) const {
 return GetAbsOrigin() + m_vecMaxs;
	}
#endif

protected:

	float m_flRadius;
	bool m_bEnabled;
#ifdef MAPBASE
	bool m_bUseRadius;
	Vector m_vecMins;
	Vector m_vecMaxs;
#endif
	COutputEvent	m_OnBaited;

public:
Expand Down