Commit 868bbe00 authored by Max Maton's avatar Max Maton

Merge branch 'feature/shotgun_cycle_time' into 'develop'

Shotgun slightly faster cycle time & inconsistency fix.

See merge request !124
parents b1134fe3 e9e546fa
......@@ -3,7 +3,7 @@ WeaponData
// Weapon characteristics:
"Damage" "12" // damage per bullet
"Bullets" "9" // bullets per shoot //was 8 in RC1
"CycleTime" "0.9" // time between shoots
"CycleTime" "0.85" // time between shoots
"FalloffStart" "0" // Distance at which bullet falloff starts - (Max bullet distance 10000 units) - Default 5000
"FalloffEnd" "3250" // Distance at which bullet falloff ends - (Distance that damage is at MinimalDamage) - Default 10000
"MinimalDamage" "9" // bullet will always deal this amount of damage even after damage decrease //was 3 in RC3
......@@ -48,26 +48,26 @@ WeaponData
"AccuracyUpgradeModifier" "0.90"
//Weapon Spread
//When at rest
"JumpingSpread" "0.3" //was 0.2 in RC3
"StandingSpread" "0.05" //was 0.08 in RC3
"DuckingSpread" "0.05" //was 0.05 in RC3
"ProneSpread" "0.05" // was 0.035 in RC3
"JumpingSpread" "0.06"
"StandingSpread" "0.05"
"DuckingSpread" "0.05"
"ProneSpread" "0.05"
//When moving at full speed (sv_maxspeed) // was 0.3,0.1,0.07,0.035 respectively in RC3. Brought into line with NF shotgun
"JumpingSpreadModifier" "0.15"
"JumpingSpreadModifier" "0.07"
"StandingSpreadModifier" "0.05"
"DuckingSpreadModifier" "0.05"
"ProneSpreadModifier" "0.05"
//Maximum the spread can become due to spread increment per shot below //was 0.7, 0.3, 0.2, 0.2 in RC3, now same as BE shotty
"JumpingSpreadMax" "0.151"
"StandingSpreadMax" "0.061"
"DuckingSpreadMax" "0.041"
"ProneSpreadMax" "0.0351"
"JumpingSpreadMax" "0.08"
"StandingSpreadMax" "0.06"
"DuckingSpreadMax" "0.06"
"ProneSpreadMax" "0.06"
//Increment spread by this amount for every shot fired to maximum of moving at full speed spread
"JumpingSpreadIncrement" "0.01"
"StandingSpreadIncrement" "0.0022"
"StandingSpreadIncrement" "0.001"
"DuckingSpreadIncrement" "0.001"
"ProneSpreadIncrement" "0.001"
......
......@@ -3,9 +3,9 @@ WeaponData
// Weapon characteristics:
"Damage" "12" // damage per bullet
"Bullets" "9" // bullets per shoot //was 8 in RC1
"CycleTime" "0.9" // time between shoots
"CycleTime" "0.85" // time between shoots
"FalloffStart" "0" // Distance at which bullet falloff starts - (Max bullet distance 10000 units) - Default 5000
"FalloffEnd" "3000" // Distance at which bullet falloff ends - (Distance that damage is at MinimalDamage) - Default 10000
"FalloffEnd" "3250" // Distance at which bullet falloff ends - (Distance that damage is at MinimalDamage) - Default 10000
"MinimalDamage" "9" // bullet will always deal this amount of damage even after damage decrease //was 3 in RC3
"SemiAutomatic" "1"
"Fire Interrupts Reload" "1"
......@@ -48,26 +48,26 @@ WeaponData
"AccuracyUpgradeModifier" "0.90"
//Weapon Spread
//When at rest
"JumpingSpread" "0.3" //was 0.2 in RC3
"StandingSpread" "0.05" //was 0.08 in RC3
"DuckingSpread" "0.05" //was 0.05 in RC3
"ProneSpread" "0.05" // was 0.035 in RC3
"JumpingSpread" "0.06"
"StandingSpread" "0.05"
"DuckingSpread" "0.05"
"ProneSpread" "0.05"
//When moving at full speed (sv_maxspeed) // was 0.3,0.1,0.07,0.035 respectively in RC3. Brought into line with NF shotgun
"JumpingSpreadModifier" "0.15"
"JumpingSpreadModifier" "0.07"
"StandingSpreadModifier" "0.05"
"DuckingSpreadModifier" "0.05"
"ProneSpreadModifier" "0.05"
//Maximum the spread can become due to spread increment per shot below //was 0.7, 0.3, 0.2, 0.2 in RC3, now same as BE shotty
"JumpingSpreadMax" "0.151"
"StandingSpreadMax" "0.061"
"DuckingSpreadMax" "0.041"
"ProneSpreadMax" "0.0351"
"JumpingSpreadMax" "0.08"
"StandingSpreadMax" "0.06"
"DuckingSpreadMax" "0.06"
"ProneSpreadMax" "0.06"
//Increment spread by this amount for every shot fired to maximum of moving at full speed spread
"JumpingSpreadIncrement" "0.01"
"StandingSpreadIncrement" "0.0022"
"StandingSpreadIncrement" "0.001"
"DuckingSpreadIncrement" "0.001"
"ProneSpreadIncrement" "0.001"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment