Commit 5526e923 authored by Smithy's avatar Smithy
Browse files

Merge branch 'TricksterMay2020' into 'develop'

2.32.2 Changes (Infantry weapons)

See merge request !217
parents 2bda5b81 4c2f63a9
WeaponData
{
// Weapon characteristics:
"Damage" "22" // damage per bullet
"Damage" "25" // damage per bullet
"Bullets" "1" // bullets per shoot
"CycleTime" "0.5" // time between shoots
"ReloadTime" "2.777778" // Reload animation duration (DISPLAY ONLY, CHANGING THIS HAS NO EFFECT)
......
......@@ -2,7 +2,7 @@ WeaponData
{
// Weapon characteristics:
"Damage" "15" // damage per bullet
"Bullets" "9" // bullets per shoot //was 8 in RC1
"Bullets" "10" // bullets per shoot
"CycleTime" "0.9" // time between shoots
"ReloadTime" "1.333333" // Reload animation duration (DISPLAY ONLY, CHANGING THIS HAS NO EFFECT)
"FalloffStart" "0" // Distance at which bullet falloff starts - (Max bullet distance 10000 units) - Default 5000
......
......@@ -117,25 +117,25 @@ WeaponData
"StandingKick_Y_NoSpread_Max" "1"
"StandingKick_Y_NoSpread_Min" "-1"
"DuckingKick_X_FullSpread_Max" "4"
"DuckingKick_X_FullSpread_Min" "3.5"
"DuckingKick_X_NoSpread_Max" "3"
"DuckingKick_X_NoSpread_Min" "2"
"DuckingKick_X_FullSpread_Max" "3"
"DuckingKick_X_FullSpread_Min" "2"
"DuckingKick_X_NoSpread_Max" "2"
"DuckingKick_X_NoSpread_Min" "1"
"DuckingKick_Y_FullSpread_Max" "1"
"DuckingKick_Y_FullSpread_Min" "-1"
"DuckingKick_Y_FullSpread_Max" "1.5"
"DuckingKick_Y_FullSpread_Min" "-1.5"
"DuckingKick_Y_NoSpread_Max" "0.5"
"DuckingKick_Y_NoSpread_Min" "-0.5"
"ProneKick_X_FullSpread_Max" "3"
"ProneKick_X_FullSpread_Min" "2.5"
"ProneKick_X_NoSpread_Max" "2"
"ProneKick_X_NoSpread_Min" "1.5"
"ProneKick_X_FullSpread_Max" "2"
"ProneKick_X_FullSpread_Min" "1"
"ProneKick_X_NoSpread_Max" "1"
"ProneKick_X_NoSpread_Min" "0.5"
"ProneKick_Y_FullSpread_Max" "1.5"
"ProneKick_Y_FullSpread_Min" "-1.5"
"ProneKick_Y_NoSpread_Max" "0.5"
"ProneKick_Y_NoSpread_Min" "-0.5"
"ProneKick_Y_FullSpread_Max" "1"
"ProneKick_Y_FullSpread_Min" "-1"
"ProneKick_Y_NoSpread_Max" "0.25"
"ProneKick_Y_NoSpread_Min" "-0.25"
//End Weapon Spread
......
......@@ -2,7 +2,7 @@ WeaponData
{
// Weapon characteristics:
"Damage" "20" // damage per bullet
"Bullets" "7" // bullets per shoot
"Bullets" "8" // bullets per shoot
"CycleTime" "0.6" // time between shoots
"ReloadTime" "2.285714" // 3.6 for both shell reload anim - Reload animation duration (DISPLAY ONLY, CHANGING THIS HAS NO EFFECT)
"FalloffStart" "0" // Distance at which bullet falloff starts - (Max bullet distance 10000 units) - Default 5000
......
WeaponData
{
// Weapon characteristics:
"Damage" "20" // damage per bullet
"Bullets" "9" // bullets per shoot //was 8 in RC1
"Damage" "15" // damage per bullet
"Bullets" "10" // bullets per shoot
"CycleTime" "0.9" // time between shoots
"ReloadTime" "1.333333" // Reload animation duration (DISPLAY ONLY, CHANGING THIS HAS NO EFFECT)
"FalloffStart" "0" // Distance at which bullet falloff starts - (Max bullet distance 10000 units) - Default 5000
......
......@@ -3,7 +3,7 @@ WeaponData
// Weapon characteristics:
"Damage" "27" // damage per bullet
"Bullets" "1" // bullets per shoot
"CycleTime" "0.15" // time between shoots
"CycleTime" "0.12" // time between shoots
"ReloadTime" "3.111111" // Reload animation duration (DISPLAY ONLY, CHANGING THIS HAS NO EFFECT)
"FalloffStart" "0" // Distance at which bullet falloff starts - (Max bullet distance 10000 units) - Default 5000
"FalloffEnd" "10000" // Distance at which bullet falloff ends - (Distance that damage is at MinimalDamage) - Default 10000
......@@ -67,9 +67,9 @@ WeaponData
//Increment spread by this amount for every shot fired to maximum of moving at full speed spread
"JumpingSpreadIncrement" "0.01"
"StandingSpreadIncrement" "0.006"
"DuckingSpreadIncrement" "0.005"
"ProneSpreadIncrement" "0.004"
"StandingSpreadIncrement" "0.004"
"DuckingSpreadIncrement" "0.003"
"ProneSpreadIncrement" "0.002"
//Decrease spread by this amount for every second not fired down to minimum rest spread
"JumpingSpreadDecrement" "0.09"
......
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