Unify the changes of #3130 and #3343

This commit is contained in:
esteldunedain 2016-02-20 17:05:47 -03:00
parent 63056ef47a
commit 4f62e56004

View File

@ -14,12 +14,6 @@ class CfgAmmo {
ACE_muzzleVelocities[]={780, 880, 920};
ACE_barrelLengths[]={254.0, 414.02, 508.0};
};
class rhs_B_545x39_7U1_Ball: rhs_B_545x39_Ball {
//Subsonic - ToDo need full config for this bullet
ACE_ammoTempMuzzleVelocityShifts[]={-8.85,-8.49,-7.61667,-6.70667,-5.66,-4.26667,-2.54667,-0.51,1.98667,5.05667,8.73}; //Just Scaled Down Normal?
ACE_muzzleVelocities[] = {303};
ACE_barrelLengths[] = {200};
};
class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball {
ACE_caliber=5.588;
ACE_bulletLength=21.59;
@ -81,12 +75,6 @@ class CfgAmmo {
ACE_muzzleVelocities[]={650, 716, 750};
ACE_barrelLengths[]={254.0, 414.02, 508.0};
};
class rhs_B_762x39_U_Ball: rhs_B_762x39_Ball {
//Subsonic - ToDo need full config for this bullet
ACE_ammoTempMuzzleVelocityShifts[]={-8.85,-8.49,-7.61667,-6.70667,-5.66,-4.26667,-2.54667,-0.51,1.98667,5.05667,8.73}; //Just Scaled Down Normal?
ACE_muzzleVelocities[] = {295};
ACE_barrelLengths[] = {414};
};
class rhs_B_762x39_Tracer: rhs_B_762x39_Ball {
ACE_caliber=7.823;
ACE_bulletLength=28.956;
@ -125,20 +113,25 @@ class CfgAmmo {
ACE_barrelLengths[]={96.52, 127.0, 228.6};
};
class rhs_B_545x39_7U1_Ball: rhs_B_545x39_Ball {
// @todo: Provide _barrelLengths coefficients for this subsonic ammo
// @todo: Provide accurate coefficients for this subsonic ammo
// In the meantime, prevent it inheriting from its supersonic parent
ACE_muzzleVelocities[]={};
ACE_barrelLengths[]={};
};
class rhs_B_9x39_SP5: rhs_B_762x39_Ball {
// @todo: Provide _barrelLengths coefficients for this subsonic ammo
// In the meantime, prevent it inheriting from its supersonic parent
ACE_muzzleVelocities[]={};
ACE_barrelLengths[]={};
// ammoTempMuzzleVelocityShifts scaled down from normal
ACE_ammoTempMuzzleVelocityShifts[]={-8.85,-8.49,-7.61667,-6.70667,-5.66,-4.26667,-2.54667,-0.51,1.98667,5.05667,8.73};
ACE_muzzleVelocities[] = {};
ACE_barrelLengths[] = {};
};
class rhs_B_762x39_U_Ball: rhs_B_762x39_Ball {
// @todo: Provide _barrelLengths coefficients for this subsonic ammo
// @todo: Provide accurate coefficients for this subsonic ammo
// In the meantime, prevent it inheriting from its supersonic parent
// ammoTempMuzzleVelocityShifts scaled down from normal
ACE_ammoTempMuzzleVelocityShifts[]={-8.85,-8.49,-7.61667,-6.70667,-5.66,-4.26667,-2.54667,-0.51,1.98667,5.05667,8.73}; //Just Scaled Down Normal?
ACE_muzzleVelocities[] = {};
ACE_barrelLengths[] = {};
};
class rhs_B_9x39_SP5: rhs_B_762x39_Ball {
// @todo: Provide accurate coefficients for this subsonic ammo
// In the meantime, prevent it inheriting from its supersonic parent
ACE_ammoTempMuzzleVelocityShifts[]={};
ACE_muzzleVelocities[]={};
ACE_barrelLengths[]={};
};