Init: New cones: Vidicator, Shotgun, Autogun

Author: Kitsune44

reactivedrop/resource/swarmopedia.txt

@@ -907,6 +907,11 @@
 			"StoppingPower" {}
 			"BulletSpread" {
 				"Base" "7"
+				"Flattened" "1"
+			}
+			"Generic" {
+				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
+				"Caption" "#rd_weapon_fact_more_accurate_while_crouching"
 			}
 			"FireRate" {}
 			"Ammo" {}
@@ -963,6 +968,10 @@
 			"BulletSpread" {
 				"Base" "22"
 			}
+			"Generic" {
+				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
+				"Caption" "#rd_weapon_fact_more_accurate_while_crouching"
+			}
 			"FireRate" {}
 			"Ammo" {}
 			"ReloadTime" {}
@@ -1342,6 +1351,10 @@
 			"BulletSpread" {
 				"Base" "22"
 			}
+			"Generic" {
+				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
+				"Caption" "#rd_weapon_fact_more_accurate_while_crouching"
+			}
 			"FireRate" {}
 			"Ammo" {}
 			"ReloadTime" {}
@@ -2145,6 +2158,10 @@
 			"BulletSpread" {
 				"Base" "11"
 			}
+			"Generic" {
+				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
+				"Caption" "#rd_weapon_fact_more_accurate_while_crouching"
+			}
 			"Piercing" {
 				"Precision" "1"
 				"Skill" "ASW_MARINE_SKILL_STOPPING_POWER"
@@ -2153,10 +2170,6 @@
 			"FireRate" {}
 			"Ammo" {}
 			"ReloadTime" {}
-			"Generic" {
-				"Icon" "swarm/swarmopedia/fact/accurate_crouch"
-				"Caption" "#rd_weapon_fact_more_accurate_while_crouching"
-			}
 			"Generic" {
 				"Icon" "swarm/swarmopedia/fact/heavy"
 				"Caption" "#rd_weapon_fact_slow_movement_while_held"

src/game/shared/swarm/asw_weapon_autogun_shared.cpp

@@ -177,7 +177,16 @@ int CASW_Weapon_Autogun::GetWeaponSubSkillId()
 
 const Vector& CASW_Weapon_Autogun::GetBulletSpread( void )
 {
-	static const Vector cone = VECTOR_CONE_7DEGREES;
+	static const Vector cone = Vector( 0.06105, 0.06105, 0.02);			// VECTOR_CONE_7DEGREES with flattened Z
+    static const Vector cone_duck = Vector( 0.03490, 0.03490, 0.01 );	// VECTOR_CONE_4DEGREES with flattened Z
+
+	CASW_Marine *marine = GetMarine();
+
+	if ( marine )
+	{
+		if ( marine->GetLocalVelocity().IsZero() && marine->m_bWalking )
+			return cone_duck;
+	}
 	return cone;
 }
 

src/game/shared/swarm/asw_weapon_shotgun_shared.cpp

@@ -138,6 +138,37 @@ CASW_Weapon_Shotgun::~CASW_Weapon_Shotgun()
 
 }
 
+
+const Vector &CASW_Weapon_Shotgun::GetBulletSpread( void )
+{
+	static const Vector cone = VECTOR_CONE_20DEGREES;
+	static const Vector cone_duck = VECTOR_CONE_15DEGREES;
+
+	CASW_Marine *marine = GetMarine();
+
+	if ( marine )
+	{
+		if ( marine->GetLocalVelocity().IsZero() && marine->m_bWalking )
+			return cone_duck;
+	}
+	return cone;
+}
+
+const Vector &CASW_Weapon_Shotgun::GetAngularBulletSpread( void )
+{
+	static const Vector cone( 22, 22, 12 );
+	static const Vector cone_duck( 16, 16, 6 );
+
+	CASW_Marine *marine = GetMarine();
+
+	if ( marine )
+	{
+		if ( marine->GetLocalVelocity().IsZero() && marine->m_bWalking )
+			return cone_duck;
+	}
+	return cone;
+}
+
 Activity CASW_Weapon_Shotgun::GetPrimaryAttackActivity( void )
 {
 	return ACT_VM_PRIMARYATTACK;

src/game/shared/swarm/asw_weapon_shotgun_shared.h

@@ -53,17 +53,8 @@ class CASW_Weapon_Shotgun : public CASW_Weapon
 	virtual bool ShouldFlareAutoaim() { return true; }
 	virtual bool SupportsDamageModifiers() { return true; }
 
-	virtual const Vector& GetBulletSpread()
-	{
-		static const Vector cone = VECTOR_CONE_20DEGREES;
-		return cone;
-	}
-
-	virtual const Vector& GetAngularBulletSpread()
-	{
-		static const Vector cone(22,22,22);
-		return cone;
-	}
+	virtual const Vector &GetBulletSpread( void );
+	virtual const Vector &GetAngularBulletSpread( void );
 
 	#ifndef CLIENT_DLL
 		DECLARE_DATADESC();