New cones: 50cal, Combat Rifle, PDW, P-Rifle

Author: Kitsune44

reactivedrop/resource/swarmopedia.txt

@@ -833,6 +833,10 @@
 			"BulletSpread" {
 				"Base" "3"
 			}
+			"Generic" {
+				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
+				"Caption" "#rd_weapon_fact_more_accurate_while_crouching"
+			}
 			"FireRate" {
 				"Skill" "ASW_MARINE_SKILL_ENGINEERING"
 				"SubSkill" "ASW_MARINE_SUBSKILL_ENGINEERING_FIRERATE"
@@ -967,6 +971,7 @@
 			"StoppingPower" {}
 			"BulletSpread" {
 				"Base" "22"
+				"Flattened" "1"
 			}
 			"Generic" {
 				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
@@ -1350,6 +1355,7 @@
 			"StoppingPower" {}
 			"BulletSpread" {
 				"Base" "22"
+				"Flattened" "1"
 			}
 			"Generic" {
 				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
@@ -1542,6 +1548,10 @@
 			"BulletSpread" {
 				"Base" "3"
 			}
+			"Generic" {
+				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
+				"Caption" "#rd_weapon_fact_more_accurate_while_crouching"
+			}
 			"FireRate" {}
 			"Ammo" {}
 			"ReloadTime" {}
@@ -2210,6 +2220,13 @@
 				"SubSkill" "ASW_MARINE_SUBSKILL_ACCURACY_RIFLE_DMG"
 			}
 			"StoppingPower" {}
+			"BulletSpread" {
+				"Base"	"3"
+			}
+			"Generic" {
+				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
+				"Caption" "#rd_weapon_fact_more_accurate_while_crouching"
+			}
 			"Ammo" {}
 			"ReloadTime" {}
 			"Secondary" {
@@ -2547,6 +2564,10 @@
 				"Base" "20"
 				"Flattened" "1"
 			}
+			"Generic" {
+				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
+				"Caption" "#rd_weapon_fact_more_accurate_while_crouching"
+			}
 			"FireRate" {}
 			"Ammo" {
 				"UseWeaponInfo" "0"

src/game/shared/swarm/asw_weapon_50calmg_shared.cpp

@@ -79,6 +79,21 @@ void CASW_Weapon_50CalMG::Precache()
 	BaseClass::Precache();
 }
 
+const Vector& CASW_Weapon_50CalMG::GetBulletSpread( void )
+{
+	static const Vector cone( 0.17365, 0.17365, 0.02 );					// VECTOR_CONE_20DEGREES with flattened Z
+	static const Vector cone_duck = Vector( 0.13053, 0.13053, 0.01 );	// VECTOR_CONE_15DEGREES with flattened Z
+
+	CASW_Marine* marine = GetMarine();
+
+	if ( marine )
+	{
+		if ( marine->GetLocalVelocity().IsZero() && marine->m_bWalking )
+			return cone_duck;
+	}
+	return cone;
+}
+
 // just dry fire by default
 void CASW_Weapon_50CalMG::SecondaryAttack()
 {

src/game/shared/swarm/asw_weapon_50calmg_shared.h

@@ -30,11 +30,7 @@ class CASW_Weapon_50CalMG : public CASW_Weapon_Rifle
 		return cone;
 	}
 
-	virtual const Vector& GetBulletSpread( void )
-	{
-		static const Vector cone( 0.17365, 0.17365, 0.02 ); // VECTOR_CONE_20DEGREES with flattened Z
-		return cone;
-	}
+	virtual const Vector& GetBulletSpread( void );
 
 #ifndef CLIENT_DLL
 	DECLARE_DATADESC();

src/game/shared/swarm/asw_weapon_combat_rifle_shared.cpp

@@ -87,6 +87,21 @@ void CASW_Weapon_CombatRifle::Precache()
 	BaseClass::Precache();
 }
 
+const Vector& CASW_Weapon_CombatRifle::GetBulletSpread( void )
+{
+	static const Vector cone = VECTOR_CONE_3DEGREES;
+	static const Vector cone_duck = VECTOR_CONE_1DEGREES;
+
+	CASW_Marine* marine = GetMarine();
+
+	if ( marine )
+	{
+		if ( marine->GetLocalVelocity().IsZero() && marine->m_bWalking )
+			return cone_duck;
+	}
+	return cone;
+}
+
 float CASW_Weapon_CombatRifle::GetWeaponBaseDamageOverride()
 {
 	extern ConVar rd_combat_rifle_dmg_base;

src/game/shared/swarm/asw_weapon_combat_rifle_shared.h

@@ -24,6 +24,8 @@ class CASW_Weapon_CombatRifle : public CASW_Weapon_Rifle
 
 	virtual void SecondaryAttack();
 
+	virtual const Vector& GetBulletSpread( void );
+
 	virtual const Vector& GetAngularBulletSpread()
 	{
 		static const Vector cone(60, 60, 10);

src/game/shared/swarm/asw_weapon_heavy_rifle_shared.cpp

@@ -154,7 +154,7 @@ float CASW_Weapon_Heavy_Rifle::GetFireRate()
 const Vector &CASW_Weapon_Heavy_Rifle::GetBulletSpread( void )
 {
 	const static Vector vec15degrees = Vector( 0.13053, 0.02618, 0.13053 );	// VECTOR_CONE_15DEGREES with y as VECTOR_CONE_3DEGREES
-	const static Vector vec6degrees = Vector( 0.05234, 0.02618, 0.05234 );		// VECTOR_CONE_6DEGREES with y as VECTOR_CONE_3DEGREES
+	const static Vector vec6degrees = Vector( 0.05234, 0.02618, 0.05234 );	// VECTOR_CONE_6DEGREES with y as VECTOR_CONE_3DEGREES
 
 	CASW_Marine *marine = GetMarine();
 

src/game/shared/swarm/asw_weapon_pdw_shared.cpp

@@ -173,6 +173,21 @@ void CASW_Weapon_PDW::Precache()
 	BaseClass::Precache();
 }
 
+const Vector& CASW_Weapon_PDW::GetBulletSpread( void )
+{
+	static const Vector cone = VECTOR_CONE_3DEGREES;
+	static const Vector cone_duck = VECTOR_CONE_1DEGREES;
+
+	CASW_Marine* marine = GetMarine();
+
+	if ( marine )
+	{
+		if ( marine->GetLocalVelocity().IsZero() && marine->m_bWalking )
+			return cone_duck;
+	}
+	return cone;
+}
+
 void CASW_Weapon_PDW::PrimaryAttack()
 {
 	// If my clip is empty (and I use clips) start reload

src/game/shared/swarm/asw_weapon_pdw_shared.h

@@ -30,12 +30,8 @@ class CASW_Weapon_PDW : public CASW_Weapon_Rifle
 	virtual int GetWeaponSubSkillId();
 
 	virtual const float GetAutoAimAmount() { return AUTOAIM_2DEGREES; }	
-	virtual const Vector& GetBulletSpread( void )
-	{
-		static const Vector cone = VECTOR_CONE_3DEGREES; //VECTOR_CONE_20DEGREES;
+	virtual const Vector& GetBulletSpread( void );
 
-		return cone;
-	}
 	virtual bool ShouldFlareAutoaim() { return true; }
 
 	virtual void PrimaryAttack();

src/game/shared/swarm/asw_weapon_prifle_shared.cpp

@@ -78,6 +78,21 @@ void CASW_Weapon_PRifle::Precache()
 	BaseClass::Precache();
 }
 
+const Vector& CASW_Weapon_PRifle::GetBulletSpread( void )
+{
+	static const Vector cone = VECTOR_CONE_3DEGREES;
+	static const Vector cone_duck = VECTOR_CONE_1DEGREES;
+
+	CASW_Marine* marine = GetMarine();
+
+	if ( marine )
+	{
+		if ( marine->GetLocalVelocity().IsZero() && marine->m_bWalking )
+			return cone_duck;
+	}
+	return cone;
+}
+
 float CASW_Weapon_PRifle::GetFireRate()
 {
 	float flRate = BaseClass::GetFireRate();

src/game/shared/swarm/asw_weapon_prifle_shared.h

@@ -29,6 +29,7 @@ class CASW_Weapon_PRifle : public CASW_Weapon_Rifle
 	virtual int GetWeaponSkillId();
 	virtual int GetWeaponSubSkillId();
 	virtual void SecondaryAttack();
+	virtual const Vector& GetBulletSpread( void );
 
 	#ifndef CLIENT_DLL
 		DECLARE_DATADESC();