Commit Graph

33 Commits

Author SHA1 Message Date
PabstMirror
916346ae59
General - Format config class defines to coding guidelines (+tool) (#8520)
* General - Format config class defines to coding guidelines (+tool)

* Update tools/config_style_checker.py

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update tools/config_style_checker.py

Co-authored-by: jonpas <jonpas33@gmail.com>

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-15 13:47:05 -05:00
GhostIsSpooky
63d7419066
Ballistics - Cleanup & add missing magazine variants (#8410)
* change 7.62x67 to .300 WM

* initial commit

* stringtables, add LM suffix to .338 magazines, strings for 12.7x99 10Rnd mags

* use correct strings for .50 BMG 10rnd mags

* Remove 6.5C mags from inappropriate side boxes

* remove duplicate stringtable entrys

* add MX 6.5C color variants, add MSBS 6.5C mags, move 6.5C to marksman rifles only, add new mags to boxes, switch DMR_03 to sr25 magwell

* Fix UBC

* fix stupid

* add space before 'mm' in strings

* add missing 762x51 10Rnd mags

* Revert "add space before 'mm' in strings"

This reverts commit fca5fa9f14.

* redo add space before mm in strings
2021-10-12 13:08:13 -05:00
Laid3acK
2f9c4b6b41
Ballistics - Add a 5.8mm magazine with the CMR-76 (QBU-88) (#7820)
* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag
2020-08-18 12:44:58 -05:00
Laid3acK
d8a3eab499
Ballistics - Fix DMR_03 (SIG556) initSpeed (#7567)
* ballistics_fix

* ballistics_fix

* ballistics_fix

* ballistics_fix

* ballistics_fix

* ballistics_fix
2020-06-13 15:58:42 -05:00
Laid3acK
cf3b0467ac
Ballistics - B_50BW_Ball_F updated (#7572)
* 50bw_noformat

* 50bw_noformat

* 50bw_noformat

* 50bw_noformat

* 50bw_noformat
2020-04-06 10:27:39 -05:00
Laid3acK
e1f6db8a69
Ballistics - B_93x64_Ball updated (#7474)
* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk
2020-02-22 14:15:39 -06:00
Drofseh
240c7333e3 Ballistics - Add shotgun shell projectile magazine variety (#7119)
* Add multiple projectile types for shotguns

* remove extra blank line

* fix classname whitepace issue

* reduce trigger time

* Verbose names and No4 Bird

- Change classnames and string keys to be more verbose
- Change No7 Birdshot to No4 Birdshot
While No7 is one of the most common loads for target shooting and hunting small birds the extreme number of pellets is just too hard on FPS.
No4 is not typically used in target shooting, but it is a common load for hunting various birds so I think it's realistic to have it for civlian purposes and the number of pellets is substatially less so the FPS hit isn't so bad.
If someone else could test the No4 to see how it feels to them I'd appreciate it.

* add/change penetration

* fix indentation
2019-12-17 10:10:31 -06:00
Laid3acK
2e4e59f6e0 Ballistics - Contact DLC rifles added (#7156)
* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added
2019-09-03 19:09:12 -05:00
ulteq
734c68d723 Ballistics - Regenerated vanilla 'initSpeed' config entries
* Updated all vanilla 'initSpeed' config values to match our Advanced Ballistics muzzle velocities (ammo temperature simulation: off)
2017-11-19 15:10:16 +01:00
ulteq
25344deb80
Ballistics - 7.62x54R muzzle velocity correction (#5711)
* Closes: https://github.com/acemod/ACE3/pull/5470
* Reference: https://github.com/acemod/ACE3/files/1272583/mousin.barrel.experiment.pdf
2017-10-31 10:58:12 +01:00
Laid3acK
958471cb0c AB : same values for the both 127x108 bullets (#5588)
* 127x108 apds fix

* fix 127x108 apds initspeed mag
2017-10-11 14:07:13 -05:00
ulteq
2e81f7c104 Ballistics - Overworked .408 CheyTac based on new JBM Ballistics data
* Added 419gr and 305gr variants (vanilla ammo == 419gr)
* Muzzle velocities from http://www.cheytac.com
* G7 BCs from http://www.jbmballistics.com/
2016-11-14 21:01:04 +01:00
ulteq
0580bdcc8e Added 20rnd 6.5 Creedmor and 6.5 Lapua Scenar mags
* Fixed incorrect QBU-88 (DMR_07_base_F) initSpeed
2016-11-08 09:34:48 +01:00
William Giokas
8c2b88da85 ballistics: Added 20 round 6.5 Lapua and Creedmoor 2016-11-08 09:34:48 +01:00
PabstMirror
ace24d0282 Fix ubc 2016-10-30 18:46:55 -05:00
ulteq
14af5577c6 Updates the ballistics module to support Apex
* Made the new ammo types ready for advanced ballistics
* Made the new weapons ready for advanced ballistics
* Recalculated all initSpeed coefficients
* Updated the airFrictionAnalysis report
2016-10-30 09:02:55 +01:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
jonpas
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
ulteq
21f4fcada3 Updated all airFriction values to minimize the drop difference when AB is disabled. 2015-05-25 00:53:41 +02:00
ulteq
a80e11d025 Fixed some 7.62 tracer magazines:
*Made use of the ACE_20Rnd_762x51_Mag_Tracer magazine
*Fixed ACE_10Rnd_762x54_Tracer_mag (inheritance, stringtable, tracersEvery)
2015-04-29 01:33:26 +02:00
ulteq
b1521345c2 Added magazines for the new AP rounds:
*Fixed some stringtable inconsistencies
*Removed some obsolete stringtable entries
2015-04-23 13:35:57 +02:00
ulteq
1d108f42a7 Added a magazine for the new 6.5 Creedmor cartridge
*Fixed the 65x47mm short name
2015-04-22 11:53:22 +02:00
ulteq
e479557f8a Some magazine Stringtable fixes 2015-04-22 10:48:45 +02:00
PabstMirror
c0c5af2957 ballistics - fix ubc 2015-04-15 17:07:06 -05:00
ulteq
3cff85e85d Added Mk319 Mod 0 ammo and magazines 2015-04-15 19:51:34 +02:00
ulteq
f8061922f7 Added ACE_10Rnd_338_API526_Mag, ACE_5Rnd_127x99_Mag, ACE_5Rnd_127x99_AMAX_Mag 2015-04-15 18:59:41 +02:00
ulteq
42dbd8f5d2 Continued work on the magazine classes:
*Fixed Katiba using the wrong magazine
*Added ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim
*Added ACE_10Rnd_338_300gr_HPBT_Mag
*Changed some of the .338 magazine initSpeeds to match the new Mar-10 barrel length
*Added the new caseless green ir dim magazine to the ammo crates
*Allowed the Mar-10 to shoot .300 Win Mag
2015-04-15 12:30:48 +02:00
ulteq
e214511e36 Added new magazine classes:
*ACE_100Rnd_65x39_caseless_mag_Tracer_Dim
*ACE_200Rnd_65x39_cased_Box_Tracer_Dim
*ACE_30Rnd_556x45_Stanag_Mk262_mag
*ACE_30Rnd_556x45_Stanag_Mk318_mag
*ACE_10Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x67_Mk248_Mod_0_Mag
*ACE_20Rnd_762x67_Mk248_Mod_1_Mag
*ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag
*ACE_30Rnd_65x47_Scenar_mag
*ACE_10Rnd_762x54_Tracer_mag
2015-04-14 22:19:51 +02:00
ulteq
8edb2d2c49 Complete overhaul of all ammo/magazine and weapon classes:
*Merged the magazines- into the ballistics module
*Adjusted all magazine class initSpeeds
*Adjusted all weapon class initSpeeds
2015-04-13 21:08:31 +02:00
commy2
6ca84c3d31 delete obsolete ammo configs 2015-03-29 14:25:13 +02:00
commy2
b9551f6ad8 split mags from ballistic 2015-01-20 22:40:15 +01:00
commy2
9c99eee461 port ballistics 2015-01-14 04:02:48 +01:00