From 14248d95ad8c1d1a3d33124c712e7e348948d803 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 25 Dec 2008 14:09:32 +0000 Subject: [PATCH] recalculate bullet parameters git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5307 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 10 +++++----- data/scripts/mandelbrotsky.shader | 14 ++++++++++++++ data/weapons.cfg | 10 +++++----- 3 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 data/scripts/mandelbrotsky.shader diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 572a90bb9..438d3bcc3 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -1252,7 +1252,7 @@ alias records "cmd records" // Quake-Joule: 1 qJ = 1 qN * 1 qu // Quake-Pascal: 1 qPa = 1 qN / 1 qu^2 -set g_ballistics_materialconstant 600060006 // arbitrary: 2^22 +set g_ballistics_materialconstant 1414213562 // unit: qJ / qu^3 (energy needed per volume unit of solid to push/burn away // parameter: bullet constant: mass / area in g/qu^2 // = mass / (pi/4 * caliber^2) @@ -1277,7 +1277,7 @@ set g_ballistics_materialconstant 600060006 // arbitrary: 2^22 // caliber .3, 150 grains, bullet constant 137.7220774221867 set g_ballistics_force 0 // 1: make all bullets use the ballistics code instead of hitscan -set g_ballistics_force_uzi_speed 10000 // speed of uzi bullets if g_ballistics_force is 1 -set g_ballistics_force_uzi_bulletconstant 80 // 6.7 qu -set g_ballistics_force_shotgun_speed 6000 // speed of shotgun bullets if g_ballistics_force is 1 -set g_ballistics_force_shotgun_bulletconstant 50 // 1.5 qu +set g_ballistics_force_uzi_speed 12000 // speed of uzi bullets if g_ballistics_force is 1 +set g_ballistics_force_uzi_bulletconstant 115 // 5.8qu +set g_ballistics_force_shotgun_speed 15000 // speed of shotgun bullets if g_ballistics_force is 1 +set g_ballistics_force_shotgun_bulletconstant 50 // 3.9qu diff --git a/data/scripts/mandelbrotsky.shader b/data/scripts/mandelbrotsky.shader new file mode 100644 index 000000000..077116e7f --- /dev/null +++ b/data/scripts/mandelbrotsky.shader @@ -0,0 +1,14 @@ +// nebula skybox +// ============= + +textures/skies/mandelbrot +{ + qer_editorimage env/mandelbrot/mandel_up.tga + surfaceparm sky + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nomarks + q3map_skylight 200 3 + q3map_sun 1 .98 .9 0 0 90 + skyparms env/mandelbrot/mandel - - +} diff --git a/data/weapons.cfg b/data/weapons.cfg index 8aff8cd06..b0019e744 100644 --- a/data/weapons.cfg +++ b/data/weapons.cfg @@ -352,20 +352,20 @@ set g_balance_campingrifle_primary_damage 90 set g_balance_campingrifle_primary_headshotaddeddamage 160 set g_balance_campingrifle_primary_spread 0 set g_balance_campingrifle_primary_force 2 -set g_balance_campingrifle_primary_speed 30000 +set g_balance_campingrifle_primary_speed 35000 set g_balance_campingrifle_primary_lifetime 5 set g_balance_campingrifle_primary_refire 0.7 set g_balance_campingrifle_primary_animtime 0.3 set g_balance_campingrifle_primary_ammo 10 -set g_balance_campingrifle_primary_bulletconstant 130 // 97.5 qu +set g_balance_campingrifle_primary_bulletconstant 120 // 51.9qu set g_balance_campingrifle_secondary_damage 60 set g_balance_campingrifle_secondary_headshotaddeddamage 0 -set g_balance_campingrifle_secondary_spread 0.02 +set g_balance_campingrifle_secondary_spread 0.01 set g_balance_campingrifle_secondary_force 1 -set g_balance_campingrifle_secondary_speed 8000 +set g_balance_campingrifle_secondary_speed 18000 set g_balance_campingrifle_secondary_lifetime 5 set g_balance_campingrifle_secondary_refire 0.12 set g_balance_campingrifle_secondary_animtime 0.06 set g_balance_campingrifle_secondary_ammo 10 set g_balance_campingrifle_secondary_health 5 -set g_balance_campingrifle_secondary_bulletconstant 130 // 6.9 qu +set g_balance_campingrifle_secondary_bulletconstant 120 // 13.7qu -- 2.39.2