Commit 4c8275d4 authored by Smithy's avatar Smithy
Browse files

Merge branch 'feature/additional_2.31.3_changes' into 'develop'

Additional 2.31.3 changes

See merge request !214
parents 80fbdb11 5f2a6760
This diff is collapsed.
......@@ -48,12 +48,12 @@ Vehicle_armor
"Weight" "15"
"Cost" "40"
"Health" "100"
"Regeneration" "0.02"
"Regeneration" "0.015"
"Angle Modifier" "0.35"
"Speed To Damage Modifier" "-0.00005"
"Damage Modifier" "1"
"Damage To Heat Absorbed" "-0.04"
"Bioweapon Damage Modifier" "1"
"Bioweapon Damage Modifier" "0.8"
//Sounds
"Sound Impact" ""
......@@ -147,7 +147,7 @@ Vehicle_armor
"Weight" "15"
"Cost" "12"
"Health" "75"
"Regeneration" "0.07"
"Regeneration" "0.05334"
"Angle Modifier" "0.10"
"Speed To Damage Modifier" "0"
"Damage Modifier" "1"
......
......@@ -509,7 +509,7 @@ Vehicle_Weapons
"Reload Amount" "5" //number of projectiles gained per reload "tick" if not using clips
"Projectile Spread" "1" //spread (default: 0.001)
"Heat to Target" "0" //heat added to target on hit (default: 0.1)
"Explosion Radius" "275" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Radius" "300" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Force" "100" //force of explosion (default: 0)
"Explosion Sprite" "1"
"Muzzle Flash" "muzzle_std_cn"
......@@ -543,7 +543,7 @@ Vehicle_Weapons
"Reload Amount" "5" //number of projectiles gained per reload "tick" if not using clips
"Projectile Spread" "0.1" //spread (default: 0.001)
"Heat to Target" "0" //heat added to target on hit (default: 0.1)
"Explosion Radius" "150" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Radius" "250" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Force" "100" //force of explosion (default: 0)
"Explosion Sprite" "7"
"Muzzle Flash" "muzzle_lr_cn"
......@@ -762,9 +762,9 @@ Vehicle_Weapons
}
"Railgun"
{
"Name" "#emp_vehicle_weapons_Overcharged_Rail_Gun_name" //name given when selecting weapons
"HUD Name" "#emp_vehicle_weapons_Overcharged_Rail_Gun_HUD_name" //name displayed in the weapon area of the vehicle HUD
"Description" "#emp_vehicle_weapons_Overcharged_Rail_Gun_description" //description given when selecting weapons
"Name" "#emp_vehicle_weapons_Rail_Gun_name" //name given when selecting weapons
"HUD Name" "#emp_vehicle_weapons_Rail_Gun_HUD_name" //name displayed in the weapon area of the vehicle HUD
"Description" "#emp_vehicle_weapons_Rail_Gun_description" //description given when selecting weapons
"Icon" "vehicles/gui/weapons/cn_rail_hvy" //icon drawn in the GUI
"HUD Icon" "vehicles/gui/weapons/cn"
......@@ -789,7 +789,7 @@ Vehicle_Weapons
"Reload Amount" "5" //number of projectiles gained per reload "tick" if not using clips
"Projectile Spread" "0.1" //spread (default: 0.001)
"Heat to Target" "0" //heat added to target on hit (default: 0.1)
"Explosion Radius" "100" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Radius" "200" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Force" "50" //force of explosion (default: 0)
"Explosion Sprite" "6"
"Muzzle Flash" "muzzle_rail_cn"
......@@ -1039,7 +1039,7 @@ Vehicle_Weapons
"Reload Time" "3.0" //time to load one clip
"Projectile Spread" "1.5" //spread (default: 0.001)
"Heat to Target" "0" //heat added to target on hit (default: 0.1)
"Explosion Radius" "100" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Radius" "200" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Force" "50" //force of explosion (default: 0)
"Explosion Sprite" "10"
"Muzzle Flash" "muzzle_default_ml"
......@@ -1074,7 +1074,7 @@ Vehicle_Weapons
"Reload Time" "3.8" //time to load one clip
"Projectile Spread" "0.5" //spread (default: 0.001)
"Heat to Target" "0" //heat added to target on hit (default: 0.1)
"Explosion Radius" "150" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Radius" "250" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Force" "50" //force of explosion (default: 0)
"Explosion Sprite" "8"
"Muzzle Flash" "muzzle_default_ml"
......@@ -1142,7 +1142,7 @@ Vehicle_Weapons
"Clip Size" "5" //ammo loaded per reloads (default: 10)
"Total Ammo Clips" "3" //max ammo clips carried (0 is the same as not using clips) (default: 1)
"Reload Time" "6.0" //time to load one clip
"Projectile Spread" "0.5" //spread (default: 0.001)
"Projectile Spread" "1" //spread (default: 0.001)
"Heat to Target" "0" //heat added to target on hit (default: 0.1)
"Explosion Radius" "300" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Force" "50" //force of explosion (default: 0)
......@@ -1231,7 +1231,7 @@ Vehicle_Weapons
"Total Ammo Clips" "0" //max ammo clips carried (0 is the same as not using clips) (default: 1)
"Reload Time" "0" //time to load one clip
"Reload Amount" "2"
"Projectile Spread" "1.25" //spread (default: 0.001)
"Projectile Spread" "1" //spread (default: 0.001)
"Heat to Target" "10" //heat added to target on hit (default: 0.1)
"Explosion Radius" "1550" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Force" "70000" //force of explosion (default: 0)
......@@ -1342,7 +1342,7 @@ Vehicle_Weapons
"Reload Time" "5" //time to load one clip
"Projectile Spread" "1" //spread (default: 0.001)
"Heat to Target" "0" //heat added to target on hit (default: 0.1)
"Explosion Radius" "100" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Radius" "200" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Force" "40" //force of explosion (default: 0)
"Explosion Sprite" "19"
"Muzzle Flash" "muzzle_default_ml"
......@@ -1466,7 +1466,7 @@ Vehicle_Weapons
"Speed" "2500" //speed of projectile (requires "type" 1, 2, 3 or 4)(default: 100)
//area of effect
"Explosion Radius" "100" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Radius" "200" //radius of damage sphere to hurt surrounding entities (default: 0)
"Explosion Force" "40" //force of explosion (default: 0)
//missile launchers (requires "type" 3)
......
......@@ -2,15 +2,15 @@ WeaponData
{
// Weapon characteristics:
"Damage" "130" // damage
"Bullets" "1" // bullets per shoot
"CycleTime" "3" // time between shoots
"Bullets" "1" // bullets per shoot
"CycleTime" "3" // time between shoots
//Explosive-specific values
"Velocity" "2000" // Rocket velocity
"Turning Speed" "1.75" // Turning speed (0-1)
"Explosion Force" "100" // Explosion push force
"Explosion Radius" "75" // Explosion radius
"Explosion Sprite" "9" // Explosion Sprite
"Explosion Radius" "100" // Explosion radius
"Explosion Sprite" "9" // Explosion Sprite
"Max Travel Time" "60"
// Weapon data is loaded by both the Game and Client DLLs.
......
......@@ -2,15 +2,15 @@ WeaponData
{
// Weapon characteristics:
"Damage" "130" // damage
"Bullets" "1" // bullets per shoot
"CycleTime" "3" // time between shoots
"Bullets" "1" // bullets per shoot
"CycleTime" "3" // time between shoots
//Explosive-specific values
"Velocity" "2000" // Rocket velocity
"Turning Speed" "1.75" // Turning speed (0-1)
"Explosion Force" "100" // Explosion push force
"Explosion Radius" "75" // Explosion radius
"Explosion Sprite" "9" // This number is converted into a particle name in game_particles.txt
"Explosion Radius" "100" // Explosion radius
"Explosion Sprite" "9" // This number is converted into a particle name in game_particles.txt
"Max Travel Time" "60"
// Weapon data is loaded by both the Game and Client DLLs.
......
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