add max attack range to turrets

also increased rpg laser brightness
wootguy · Sep 16, 2024 · c31b4e8 · c31b4e8
1 parent 924d1a4
commit c31b4e8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/dlls/monster/CBaseTurret.cpp b/dlls/monster/CBaseTurret.cpp
@@ -71,6 +71,11 @@ void CBaseTurret::KeyValue(KeyValueData* pkvd)
 		m_iBaseTurnRate = atoi(pkvd->szValue);
 		pkvd->fHandled = TRUE;
 	}
+	else if (FStrEq(pkvd->szKeyName, "attackrange"))
+	{
+		m_flSightRange = atof(pkvd->szValue);
+		pkvd->fHandled = TRUE;
+	}
 	else if (FStrEq(pkvd->szKeyName, "style") ||
 		FStrEq(pkvd->szKeyName, "height") ||
 		FStrEq(pkvd->szKeyName, "value1") ||
@@ -115,7 +120,7 @@ void CBaseTurret::Spawn()
 	SetBoneController(0, 0);
 	SetBoneController(1, 0);
 	m_flFieldOfView = VIEW_FIELD_FULL;
-	// m_flSightRange = TURRET_RANGE;
+	m_flSightRange = m_flSightRange ? m_flSightRange : TURRET_RANGE;
 }
 
 void CBaseTurret::Precache()
@@ -312,7 +317,7 @@ void CBaseTurret::ActiveThink(void)
 	Vector vec = UTIL_VecToAngles(vecMidEnemy - vecMid);
 
 	// Current enmey is not visible.
-	if (!fEnemyVisible || (flDistToEnemy > TURRET_RANGE))
+	if (!fEnemyVisible || (flDistToEnemy > m_flSightRange))
 	{
 		if (!m_flLastSight)
 			m_flLastSight = gpGlobals->time + 0.5;
@@ -589,7 +594,7 @@ void CBaseTurret::SearchThink(void)
 	// Acquire Target
 	if (m_hEnemy == NULL)
 	{
-		Look(TURRET_RANGE);
+		Look(m_flSightRange);
 		m_hEnemy = BestVisibleEnemy();
 	}
 
@@ -648,7 +653,7 @@ void CBaseTurret::AutoSearchThink(void)
 
 	if (m_hEnemy == NULL)
 	{
-		Look(TURRET_RANGE);
+		Look(m_flSightRange);
 		m_hEnemy = BestVisibleEnemy();
 	}
 

diff --git a/dlls/monster/CBaseTurret.h b/dlls/monster/CBaseTurret.h
@@ -96,6 +96,7 @@ class EXPORT CBaseTurret : public CBaseMonster
 	float m_flLastSight;	// Last time we saw a target
 	float m_flMaxWait;		// Max time to seach w/o a target
 	int m_iSearchSpeed;		// Not Used!
+	float m_flSightRange;
 
 	// movement
 	float	m_flStartYaw;

diff --git a/dlls/monster/CMiniTurret.cpp b/dlls/monster/CMiniTurret.cpp
@@ -51,7 +51,8 @@ void CMiniTurret::Precache()
 
 void CMiniTurret::Shoot(Vector& vecSrc, Vector& vecDirToEnemy)
 {
-	FireBullets(1, vecSrc, vecDirToEnemy, TURRET_SPREAD, TURRET_RANGE, BULLET_MONSTER_9MM, 1);
+	float bulletRange = V_max(m_flSightRange, TURRET_RANGE);
+	FireBullets(1, vecSrc, vecDirToEnemy, TURRET_SPREAD, bulletRange, BULLET_MONSTER_9MM, 1);
 
 	switch (RANDOM_LONG(0, 2))
 	{

diff --git a/dlls/monster/CSentry.cpp b/dlls/monster/CSentry.cpp
@@ -71,7 +71,8 @@ void CSentry::DropInit() {
 
 void CSentry::Shoot(Vector& vecSrc, Vector& vecDirToEnemy)
 {
-	FireBullets(1, vecSrc, vecDirToEnemy, TURRET_SPREAD, TURRET_RANGE, BULLET_MONSTER_MP5, 1);
+	float bulletRange = V_max(m_flSightRange, TURRET_RANGE);
+	FireBullets(1, vecSrc, vecDirToEnemy, TURRET_SPREAD, bulletRange, BULLET_MONSTER_MP5, 1);
 
 	switch (RANDOM_LONG(0, 2))
 	{

diff --git a/dlls/monster/CTurret.cpp b/dlls/monster/CTurret.cpp
@@ -90,7 +90,8 @@ const char* CTurret::DisplayName() {
 
 void CTurret::Shoot(Vector& vecSrc, Vector& vecDirToEnemy)
 {
-	FireBullets(1, vecSrc, vecDirToEnemy, TURRET_SPREAD, TURRET_RANGE, BULLET_MONSTER_12MM, 1);
+	float bulletRange = V_max(m_flSightRange, TURRET_RANGE);
+	FireBullets(1, vecSrc, vecDirToEnemy, TURRET_SPREAD, bulletRange, BULLET_MONSTER_12MM, 1);
 	EMIT_SOUND(ENT(pev), CHAN_WEAPON, "turret/tu_fire1.wav", 1, 0.6);
 	PLAY_DISTANT_SOUND(edict(), DISTANT_357);
 	pev->effects = pev->effects | EF_MUZZLEFLASH;

diff --git a/dlls/weapon/CRpg.cpp b/dlls/weapon/CRpg.cpp
@@ -657,7 +657,7 @@ void CRpg::UpdateSpot( void )
 			beam->SetStartAttachment(1);
 			beam->SetColor(255, 32, 32);
 			beam->SetNoise(0);
-			beam->SetBrightness(16);
+			beam->SetBrightness(48);
 			beam->SetScrollRate(64);
 			m_hBeam = beam;
 		}