From a94eee106ba73983607277c59c36d4d0653cd6bb Mon Sep 17 00:00:00 2001 From: madpat3 Date: Thu, 25 Oct 2018 12:12:38 +0200 Subject: [PATCH 1/4] Update CfgAmmo.hpp Integrated presets for the longrange rifles into the AtragMX --- bwa3_comp_ace/CfgAmmo.hpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/bwa3_comp_ace/CfgAmmo.hpp b/bwa3_comp_ace/CfgAmmo.hpp index 4ebf1eb..61db738 100644 --- a/bwa3_comp_ace/CfgAmmo.hpp +++ b/bwa3_comp_ace/CfgAmmo.hpp @@ -212,3 +212,29 @@ class CfgAmmo { ACE_frag_gurney_k = 1/2; }; }; +class ACE_ATragMX_Presets { + class Preset_G28 { + preset[] = {"G28 (9,5g)", 795, 100, 0.0881522, -0.001035, 7.62, 0, 2, 10, 120, 0, 0, 9.5, 7.82, 30.48, 0.345, 1, "ICAO", {{-15,776},{0,783},{10,790},{15,795},{25,809},{30,818},{35,829}}, {{200,0.25},{300,0.318},{400,0.329},{500,0.332},{600,0.343},{650,0.345},{700,0.347}}}; + }; + class Preset_G28AP { + preset[] = {"G28 (AP)", 905, 100, 0.0807142, -0.000359, 7.62, 0, 2, 10, 120, 0, 0, 8.2, 7.85, 30.48, 0.346, 1, "ICAO", {{-15,886},{0,893},{10,900},{15,905},{25,919},{30,928},{35,939}}, {{300,0.346},{400,0.365},{500,0.351},{600,0.352},{650,0.353},{700,0.358},{800,0.354}}}; + }; + class Preset_G28LR { + preset[] = {"G28 (LR)", 759, 100, 0.0970995, -0.000243, 7.62, 0, 2, 10, 120, 0, 0, 11.3, 7.85, 30.48, 0.483, 1, "ICAO", {{-15,728},{0,734},{10,742},{15,747},{25,760},{30,769},{35,781}}, {{300,0.478},{400,0.462},{500,0.485},{600,0.481},{650,0.473},{700,0.475},{800,0.471}}}; + }; + class Preset_G28SD { + preset[] = {"G28 (SD)", 307, 100, 0.350408, -0.001035, 7.62, 0, 2, 10, 120, 0, 0, 13, 7.81, 30.48, 0.553, 1, "ICAO",{{-15,305},{0,306},{10,307},{15,307},{25,308},{30,309},{35,310}}, {{250,0.553},{300,0.526},{350,0.511},{400,0.522},{450,0.525},{500,0.524},{550,0.52}}}; + }; + class Preset_G29 { + preset[] = {"G29 (16,2g)", 908, 100, 0.0763083, -0.001035, 7.11, 0, 2, 10, 120, 0, 0, 16.2, 8.59, 33.02, 0.631, 1, "ICAO", {{-15,889},{0,896},{10,903},{15,908},{25,922},{30,931},{35,942}}, {{650,0.616},{800,0.628},{950,0.627},{1000,0.627},{1100,0.638},{1250,0.634},{1300,0.631}}}; + }; + class Preset_G82 { + preset[] = {"G82 (41,9g)", 892, 100, 0.0863738, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 41.9, 12.95, 38.1, 0.63, 1, "ICAO",{{-15,873},{0,880},{10,887},{15,892},{25,906},{30,915},{35,926}}, {{600,0.63},{750,0.661},{900,0.661},{1050,0.659},{1200,0.661},{1350,0.656},{1500,0.655}}}; + }; + class Preset_G82AP { + preset[] = {"G82 (AP)", 892, 100, 0.0863382, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 42, 12.96, 38.1, 0.656, 1, "ICAO", {{-15,873},{0,880},{10,887},{15,892},{25,906},{30,915},{35,926}}, {{300,0.552},{500,0.678},{750,0.661},{900,0.661},{1000,0.654},{1250,0.66},{1500,0.656}}}; + }; + class Preset_G82SD { + preset[] = {"G82 (SD)", 329, 100, 0.319747, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 41.9, 12.95, 38.1, 0.474, 1, "ICAO",{{-15,327},{0,328},{10,329},{15,329},{25,331},{30,332},{35,333}}, {{150,0.474},{200,0.642},{250,0.622},{300,0.674},{350,0.641},{400,0.648},{450,0.644}}}; + }; +}; From 4c2718c39cb8d2828feeb203b5fff5aa8d8f1683 Mon Sep 17 00:00:00 2001 From: madpat3 Date: Fri, 26 Oct 2018 02:41:25 +0200 Subject: [PATCH 2/4] Update CfgAmmo.hpp just organizing gaps and spaces within the code --- bwa3_comp_ace/CfgAmmo.hpp | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/bwa3_comp_ace/CfgAmmo.hpp b/bwa3_comp_ace/CfgAmmo.hpp index 61db738..7699f22 100644 --- a/bwa3_comp_ace/CfgAmmo.hpp +++ b/bwa3_comp_ace/CfgAmmo.hpp @@ -213,28 +213,28 @@ class CfgAmmo { }; }; class ACE_ATragMX_Presets { - class Preset_G28 { - preset[] = {"G28 (9,5g)", 795, 100, 0.0881522, -0.001035, 7.62, 0, 2, 10, 120, 0, 0, 9.5, 7.82, 30.48, 0.345, 1, "ICAO", {{-15,776},{0,783},{10,790},{15,795},{25,809},{30,818},{35,829}}, {{200,0.25},{300,0.318},{400,0.329},{500,0.332},{600,0.343},{650,0.345},{700,0.347}}}; - }; - class Preset_G28AP { - preset[] = {"G28 (AP)", 905, 100, 0.0807142, -0.000359, 7.62, 0, 2, 10, 120, 0, 0, 8.2, 7.85, 30.48, 0.346, 1, "ICAO", {{-15,886},{0,893},{10,900},{15,905},{25,919},{30,928},{35,939}}, {{300,0.346},{400,0.365},{500,0.351},{600,0.352},{650,0.353},{700,0.358},{800,0.354}}}; + class Preset_G28 { + preset[] = {"G28 (9,5g)", 795, 100, 0.0881522, -0.001035, 7.62, 0, 2, 10, 120, 0, 0, 9.5, 7.82, 30.48, 0.345, 1, "ICAO", {{-15,776},{0,783},{10,790},{15,795},{25,809},{30,818},{35,829}}, {{200,0.25},{300,0.318},{400,0.329},{500,0.332},{600,0.343},{650,0.345},{700,0.347}}}; + }; + class Preset_G28AP { + preset[] = {"G28 (AP)", 905, 100, 0.0807142, -0.000359, 7.62, 0, 2, 10, 120, 0, 0, 8.2, 7.85, 30.48, 0.346, 1, "ICAO", {{-15,886},{0,893},{10,900},{15,905},{25,919},{30,928},{35,939}}, {{300,0.346},{400,0.365},{500,0.351},{600,0.352},{650,0.353},{700,0.358},{800,0.354}}}; }; class Preset_G28LR { - preset[] = {"G28 (LR)", 759, 100, 0.0970995, -0.000243, 7.62, 0, 2, 10, 120, 0, 0, 11.3, 7.85, 30.48, 0.483, 1, "ICAO", {{-15,728},{0,734},{10,742},{15,747},{25,760},{30,769},{35,781}}, {{300,0.478},{400,0.462},{500,0.485},{600,0.481},{650,0.473},{700,0.475},{800,0.471}}}; - }; - class Preset_G28SD { - preset[] = {"G28 (SD)", 307, 100, 0.350408, -0.001035, 7.62, 0, 2, 10, 120, 0, 0, 13, 7.81, 30.48, 0.553, 1, "ICAO",{{-15,305},{0,306},{10,307},{15,307},{25,308},{30,309},{35,310}}, {{250,0.553},{300,0.526},{350,0.511},{400,0.522},{450,0.525},{500,0.524},{550,0.52}}}; - }; - class Preset_G29 { - preset[] = {"G29 (16,2g)", 908, 100, 0.0763083, -0.001035, 7.11, 0, 2, 10, 120, 0, 0, 16.2, 8.59, 33.02, 0.631, 1, "ICAO", {{-15,889},{0,896},{10,903},{15,908},{25,922},{30,931},{35,942}}, {{650,0.616},{800,0.628},{950,0.627},{1000,0.627},{1100,0.638},{1250,0.634},{1300,0.631}}}; - }; - class Preset_G82 { - preset[] = {"G82 (41,9g)", 892, 100, 0.0863738, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 41.9, 12.95, 38.1, 0.63, 1, "ICAO",{{-15,873},{0,880},{10,887},{15,892},{25,906},{30,915},{35,926}}, {{600,0.63},{750,0.661},{900,0.661},{1050,0.659},{1200,0.661},{1350,0.656},{1500,0.655}}}; - }; - class Preset_G82AP { - preset[] = {"G82 (AP)", 892, 100, 0.0863382, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 42, 12.96, 38.1, 0.656, 1, "ICAO", {{-15,873},{0,880},{10,887},{15,892},{25,906},{30,915},{35,926}}, {{300,0.552},{500,0.678},{750,0.661},{900,0.661},{1000,0.654},{1250,0.66},{1500,0.656}}}; - }; - class Preset_G82SD { - preset[] = {"G82 (SD)", 329, 100, 0.319747, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 41.9, 12.95, 38.1, 0.474, 1, "ICAO",{{-15,327},{0,328},{10,329},{15,329},{25,331},{30,332},{35,333}}, {{150,0.474},{200,0.642},{250,0.622},{300,0.674},{350,0.641},{400,0.648},{450,0.644}}}; - }; + preset[] = {"G28 (LR)", 759, 100, 0.0970995, -0.000243, 7.62, 0, 2, 10, 120, 0, 0, 11.3, 7.85, 30.48, 0.483, 1, "ICAO", {{-15,728},{0,734},{10,742},{15,747},{25,760},{30,769},{35,781}}, {{300,0.478},{400,0.462},{500,0.485},{600,0.481},{650,0.473},{700,0.475},{800,0.471}}}; + }; + class Preset_G28SD { + preset[] = {"G28 (SD)", 307, 100, 0.350408, -0.001035, 7.62, 0, 2, 10, 120, 0, 0, 13, 7.81, 30.48, 0.553, 1, "ICAO",{{-15,305},{0,306},{10,307},{15,307},{25,308},{30,309},{35,310}}, {{250,0.553},{300,0.526},{350,0.511},{400,0.522},{450,0.525},{500,0.524},{550,0.52}}}; + }; + class Preset_G29 { + preset[] = {"G29 (16,2g)", 908, 100, 0.0763083, -0.001035, 7.11, 0, 2, 10, 120, 0, 0, 16.2, 8.59, 33.02, 0.631, 1, "ICAO", {{-15,889},{0,896},{10,903},{15,908},{25,922},{30,931},{35,942}}, {{650,0.616},{800,0.628},{950,0.627},{1000,0.627},{1100,0.638},{1250,0.634},{1300,0.631}}}; + }; + class Preset_G82 { + preset[] = {"G82 (41,9g)", 892, 100, 0.0863738, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 41.9, 12.95, 38.1, 0.63, 1, "ICAO",{{-15,873},{0,880},{10,887},{15,892},{25,906},{30,915},{35,926}}, {{600,0.63},{750,0.661},{900,0.661},{1050,0.659},{1200,0.661},{1350,0.656},{1500,0.655}}}; + }; + class Preset_G82AP { + preset[] = {"G82 (AP)", 892, 100, 0.0863382, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 42, 12.96, 38.1, 0.656, 1, "ICAO", {{-15,873},{0,880},{10,887},{15,892},{25,906},{30,915},{35,926}}, {{300,0.552},{500,0.678},{750,0.661},{900,0.661},{1000,0.654},{1250,0.66},{1500,0.656}}}; + }; + class Preset_G82SD { + preset[] = {"G82 (SD)", 329, 100, 0.319747, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 41.9, 12.95, 38.1, 0.474, 1, "ICAO",{{-15,327},{0,328},{10,329},{15,329},{25,331},{30,332},{35,333}}, {{150,0.474},{200,0.642},{250,0.622},{300,0.674},{350,0.641},{400,0.648},{450,0.644}}}; + }; }; From b311d07c7462cfb1ad4c0d88ad52bc5d2fcf5e89 Mon Sep 17 00:00:00 2001 From: madpat3 Date: Fri, 26 Oct 2018 20:52:47 +0200 Subject: [PATCH 3/4] Update CfgAmmo.hpp changed values to higher ranges for "G82 (SD) --- bwa3_comp_ace/CfgAmmo.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bwa3_comp_ace/CfgAmmo.hpp b/bwa3_comp_ace/CfgAmmo.hpp index 7699f22..9a0567e 100644 --- a/bwa3_comp_ace/CfgAmmo.hpp +++ b/bwa3_comp_ace/CfgAmmo.hpp @@ -235,6 +235,6 @@ class ACE_ATragMX_Presets { preset[] = {"G82 (AP)", 892, 100, 0.0863382, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 42, 12.96, 38.1, 0.656, 1, "ICAO", {{-15,873},{0,880},{10,887},{15,892},{25,906},{30,915},{35,926}}, {{300,0.552},{500,0.678},{750,0.661},{900,0.661},{1000,0.654},{1250,0.66},{1500,0.656}}}; }; class Preset_G82SD { - preset[] = {"G82 (SD)", 329, 100, 0.319747, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 41.9, 12.95, 38.1, 0.474, 1, "ICAO",{{-15,327},{0,328},{10,329},{15,329},{25,331},{30,332},{35,333}}, {{150,0.474},{200,0.642},{250,0.622},{300,0.674},{350,0.641},{400,0.648},{450,0.644}}}; + preset[] = {"G82 (SD)", 329, 100, 0.319747, -0.001035, 8.64, 0, 2, 10, 120, 0, 0, 41.9, 12.95, 38.1, 0.474, 1, "ICAO",{{-15,327},{0,328},{10,329},{15,329},{25,331},{30,332},{35,333}}, {{350,0.641},{450,0.644},{550,0.656},{650,0.656},{700,0.654},{750,0.659},{800,0.659}}}; }; }; From fd83564d84a49f38e793b7bac6d4471186031889 Mon Sep 17 00:00:00 2001 From: madpat3 Date: Sat, 27 Oct 2018 00:21:45 +0200 Subject: [PATCH 4/4] Update CfgAmmo.hpp changed values to higher ranges for G28 (SD) --- bwa3_comp_ace/CfgAmmo.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bwa3_comp_ace/CfgAmmo.hpp b/bwa3_comp_ace/CfgAmmo.hpp index 9a0567e..bebef0b 100644 --- a/bwa3_comp_ace/CfgAmmo.hpp +++ b/bwa3_comp_ace/CfgAmmo.hpp @@ -223,7 +223,7 @@ class ACE_ATragMX_Presets { preset[] = {"G28 (LR)", 759, 100, 0.0970995, -0.000243, 7.62, 0, 2, 10, 120, 0, 0, 11.3, 7.85, 30.48, 0.483, 1, "ICAO", {{-15,728},{0,734},{10,742},{15,747},{25,760},{30,769},{35,781}}, {{300,0.478},{400,0.462},{500,0.485},{600,0.481},{650,0.473},{700,0.475},{800,0.471}}}; }; class Preset_G28SD { - preset[] = {"G28 (SD)", 307, 100, 0.350408, -0.001035, 7.62, 0, 2, 10, 120, 0, 0, 13, 7.81, 30.48, 0.553, 1, "ICAO",{{-15,305},{0,306},{10,307},{15,307},{25,308},{30,309},{35,310}}, {{250,0.553},{300,0.526},{350,0.511},{400,0.522},{450,0.525},{500,0.524},{550,0.52}}}; + preset[] = {"G28 (SD)", 307, 100, 0.350408, -0.001035, 7.62, 0, 2, 10, 120, 0, 0, 13, 7.81, 30.48, 0.553, 1, "ICAO",{{-15,305},{0,306},{10,307},{15,307},{25,308},{30,309},{35,310}}, {{300,0.526},{400,0.522},{500,0.524},{550,0.52},{600,0.515},{650,0.51},{700,0.512}}}; }; class Preset_G29 { preset[] = {"G29 (16,2g)", 908, 100, 0.0763083, -0.001035, 7.11, 0, 2, 10, 120, 0, 0, 16.2, 8.59, 33.02, 0.631, 1, "ICAO", {{-15,889},{0,896},{10,903},{15,908},{25,922},{30,931},{35,942}}, {{650,0.616},{800,0.628},{950,0.627},{1000,0.627},{1100,0.638},{1250,0.634},{1300,0.631}}};