Add ACE Arsenal stats #6110

alganthe · 2018-02-01T08:22:32Z

When merged this pull request will:

Add ACE Arsenal stats

Stats documentation as well as a documentation overhaul for ACE Arsenal is coming in an other PR.

Current stats::

Click to expand

Default stats

All tabs:

Mass, kg / lbs (mass)

Left panel "misc" tabs + the right panel tabs only have mass by default

Primary / handgun weapons

Rate of fire, RPM + bar (reloadTime)
Accuracy, MIL / MOA + bar (dispersion)
Range, bar (maxZeroing)
Impact, bar (hit, initspeed)

Launchers

Range, bar (maxZeroing)
Impact, bar (hit, initspeed)

Uniform / vests

Ballistic protection, bar (passthrough)
Explosive resistance, bar (armor)
Load, bar (maximumLoad)

Backpacks

Load, bar (maximumLoad)

Headgear

Ballistic protection, bar (passthrough)
Explosive resistance, bar (armor)

Ballistic stats

These stats will only show up if the ballistics module is loaded.

Primary / handgun

Barrel twist, mm / inches (ACE_barrelTwist)
Barrel length, mm / inches (ACE_barrelLength)

Mags

Ammo, classname (ammo)
Ballistic coefficient, ballistic coef / drag model (ACE_dragModel, ACE_ballisticCoefficients)
Bullet mass, g / gr (ACE_bulletMass)

Hearing stats

These stats will only show up if the hearing module is loaded.

Headgear

Hearing protection, bar (ACE_hearing_protection)
Volume muffling, bar, (ACE_hearing_lowerVolume)

Explosive stat

These stats will only show up if the explosives module is loaded.

Right tab misc

Explosive range, m / ft (ACE_explosive_range)

Close #5964

…tats

Mostly for laucnhers

Reason: add support for conditions, less redundant code, less reasons for dedmen to emasculate me

alganthe · 2018-02-08T16:51:06Z

Added script profiler related macro and code, should be good to go now. (to be removed when ded fixes the profiler)

…tats

PabstMirror · 2018-02-09T01:59:37Z

addons/arsenal/script_component.hpp

@@ -5,6 +5,7 @@
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 // #define ENABLE_PERFORMANCE_COUNTERS
+// #define ENABLE_PERF_PROFILING


maybe add a little note about what this does / requires

…tats

jonpas · 2018-02-10T02:34:31Z

addons/arsenal/CfgACEArsenalStats.hpp

@@ -0,0 +1,96 @@
+class CfgACEArsenalStats {


Should be renamed to class ACE_Arsenal_Stats (GVAR(Stats)) to fit other configs we have (ACE_detector, ACE_UI, ACE_Settings, ACE_Extensions, etc.).

jonpas · 2018-02-10T02:34:54Z

addons/arsenal/CfgACEArsenalStats.hpp

+        scope = 1;
+        priority = 0;
+        stats[]= {};
+        displayName= "";


Spacing around =, rest of this file and other config files too.

jonpas · 2018-02-10T02:36:47Z

addons/arsenal/CfgACEArsenalStats.hpp

+        condition = "true";
+        tabs[]= {{}, {}};
+    };
+    class bananaPotassium: statBase {


We should prefix those too, this config will be public API.

I think it's best to prefix all, but some base ones that have nothing to do with ACE features could be left unprefixed.

what kind of prefix tho.

jonpas · 2018-02-10T02:39:33Z

addons/ballistics/functions/fnc_statTextStatement_weaponMuzzleVelocity.sqf

+    private _barrelLengthTable = getArray (_ammoCfg >> "ACE_barrelLengths");
+
+    if (_barrelLength != 0 && {count _muzzleVelocityTable > 0} && {count _barrelLengthTable > 0}) then {
+            private _muzzleVelocity = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift);


Indentation much?

jonpas · 2018-02-10T02:39:54Z

addons/ballistics/functions/fnc_statTextStatement_weaponMuzzleVelocity.sqf

+    if (count _primaryMag > 0) then {
+        [handgunWeapon EGVAR(arsenal,center), _primaryMag select 0]
+    } else {
+        [handgunWeapon EGVAR(arsenal,center), ""]


Couldn't just use param?

jonpas · 2018-02-10T02:41:05Z

addons/arsenal/functions/fnc_onSelChangedRight.sqf

@@ -14,6 +14,10 @@
 #include "script_component.hpp"
 #include "..\defines.hpp"

+#ifdef ENABLE_PERF_PROFILING
+    private _scopeOnSelChangedRight= createProfileScope QFUNC(onSelChangedRight);


What's with your spaces around =.

jonpas · 2018-02-10T02:41:11Z

addons/arsenal/functions/fnc_onSelChangedRightListnBox.sqf

@@ -14,6 +14,10 @@
 #include "script_component.hpp"
 #include "..\defines.hpp"

+#ifdef ENABLE_PERF_PROFILING
+    private _scopeOnSelChangedRightLNB= createProfileScope QFUNC(onSelChangedRightListnBox);


Spaces around =.

alganthe · 2018-02-13T20:29:53Z

Todo: fix scaling on 4:3 for the stats box, it's fucked right now.

PabstMirror

Should be good to go

alganthe · 2018-02-13T21:03:47Z

yep.

* Add test class * Add stats mockup * Merge branch 'master' of https://github.com/acemod/ACE3 into arsenalStats * Finish mockup, add basic hide/show logic * Add base for stats * Use CBA EHs for stats to allow 3rd party mods of it * Add handleStats and most of the UI behaviors for stats * Continue work on stats * Add container stats * Add page support for stats * Add text for the ROF stat * Add accuracy in MOA for the accuracy stat * Change accuracy shown number to 1 decimal instead of 2 * Add MIL in the dispersion stat text * Change stats layout, remove dummy text strings * Add some AB stats * Remove last test string * Replace configExtremes by normal lookup where it's relevant * Add "undefined value" string when AB stat isn't present Mostly for laucnhers * Fix typo in preInit * Change drag model stat to ballistic coef * Fix issue with unused stats, change text to white when bar is present * Rewrite some part of handleStats Reason: add support for conditions, less redundant code, less reasons for dedmen to emasculate me * Re-add _hideUnusedFnc, handle empty stats arrays * Pass args to stat conditions, add test condition stat * Add hearing related stats * Remove the padding between stats and the stat bar / text * Add strings for stats * Change stats window to fit baer's suggestion * Algin the close stats button, add missing strings * Finish code review * Add missing newline * Remove duplicate strings * Add explosive range stat * Use proper string for the explo range stat * Fix capitalization for ctrlParent * Fix conditional stats blocking other stats * Add better integration for ballistics, hearing and explosive stats * Replace the private array in handleStat by params * Add backblast stats * Add backblast stat strings * Add flashlight map color and g-force reduction stats * Shorten preInit * Change stats close button to fit arsenal design * Improve stats page indicator look * Rework how stats are stored and retrieved * Remove args config entry, add priority entry, add vanilla weapon stats * Add vanilla container stats * Remove some lines in preInit * Add ballistics stats * Add hearing stats * Remove uneeded config entries * Add explosive range stat * Add backblast stats * Add spaces after semicolons in statements To make JJ happy because I don't care. * Add flashlights map color stat * Add gforce reduction stat FINALLY FUCKING DONE * Fix headers for the new stats funcs * Add add / remove stat API * Fix typo in removeStat header * Remove uneeded inline func * Clean up add / remove stat * Move all CfgACEArsenalStats entries to their own file * Replace STR_ACE_Ballistics_statAmmo by a BI string * Add script profiler related macro and code * Use the highest ballistic coef instead of first one defined * Add support for future ammo displayname * Add ACE_standardAtmosphere for ballistic coef * Add mag muzzle velocity stat * Add weapon muzzle velocity stat * Add comment explaining the ENABLE_PERF_PROFILING macro * Change cfgACEArsenalStats to ACE_Arsenal_Stats * Make JJ less pissy about spaces around = * Fix indentation in weaponMuzzleVelocity, use param * Use GVAR and EGVAR when appropriate * Prefix all stats except the base class * Fix Merge * Fix aspect ratio scaling of stats panel * Minor fixes

alganthe added 30 commits December 24, 2017 02:34

Add test class

b7dab73

Add stats mockup

d92532e

Merge branch 'master' of https://github.com/acemod/ACE3 into arsenalS…

77f7b33

…tats

Finish mockup, add basic hide/show logic

1041ffc

Add base for stats

327ec0e

Use CBA EHs for stats to allow 3rd party mods of it

1ccad3f

Add handleStats and most of the UI behaviors for stats

78ac754

Continue work on stats

16d878e

Add container stats

28cbcd7

Add page support for stats

9a2ec02

Add text for the ROF stat

75e6ccd

Add accuracy in MOA for the accuracy stat

d95fbee

Change accuracy shown number to 1 decimal instead of 2

6be8222

Add MIL in the dispersion stat text

65fa210

Change stats layout, remove dummy text strings

cf8d94b

Add some AB stats

6aaab2f

Remove last test string

6a868ca

Replace configExtremes by normal lookup where it's relevant

699d963

Add "undefined value" string when AB stat isn't present

daccf1a

Mostly for laucnhers

Fix typo in preInit

e8de8ba

Change drag model stat to ballistic coef

2eb1302

Fix issue with unused stats, change text to white when bar is present

de1d167

Rewrite some part of handleStats

26d7452

Reason: add support for conditions, less redundant code, less reasons for dedmen to emasculate me

Re-add _hideUnusedFnc, handle empty stats arrays

944c1e2

Pass args to stat conditions, add test condition stat

6c6c5e9

Add hearing related stats

6e25dd6

Remove the padding between stats and the stat bar / text

c3a9ede

Add strings for stats

eba0a25

Change stats window to fit baer's suggestion

7faa636

Algin the close stats button, add missing strings

ec9604c

Add script profiler related macro and code

3c0a052

alganthe added 6 commits February 8, 2018 18:29

Use the highest ballistic coef instead of first one defined

f302726

Add support for future ammo displayname

283ac4c

Add ACE_standardAtmosphere for ballistic coef

c986270

Add mag muzzle velocity stat

ec329f8

Add weapon muzzle velocity stat

d757885

Merge branch 'master' of https://github.com/acemod/ACE3 into arsenalS…

fca65b2

…tats

PabstMirror reviewed Feb 9, 2018

View reviewed changes

alganthe added 2 commits February 9, 2018 09:53

Add comment explaining the ENABLE_PERF_PROFILING macro

afaf372

Merge branch 'master' of https://github.com/acemod/ACE3 into arsenalS…

9a228c9

…tats

jonpas requested changes Feb 10, 2018

View reviewed changes

alganthe and others added 7 commits February 10, 2018 18:13

Change cfgACEArsenalStats to ACE_Arsenal_Stats

dc9facd

Make JJ less pissy about spaces around =

a3ddc77

Fix indentation in weaponMuzzleVelocity, use param

2f67688

Use GVAR and EGVAR when appropriate

0889493

Prefix all stats except the base class

d4b06f4

Merge branch 'master' into arsenalStats

7840557

Fix Merge

dbd8f26

Fix aspect ratio scaling of stats panel

88e271e

PabstMirror approved these changes Feb 13, 2018

View reviewed changes

Minor fixes

eb64f5d

jonpas approved these changes Feb 15, 2018

View reviewed changes

PabstMirror merged commit 1d6e07d into acemod:master Feb 15, 2018

PabstMirror modified the milestones: 3.13.0, 3.12.2 Apr 2, 2018

dedmen mentioned this pull request Apr 24, 2018

Feature Request: ACE Arsenal Xeno69/Domination#1

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ACE Arsenal stats #6110

Add ACE Arsenal stats #6110

alganthe commented Feb 1, 2018 •

edited

Loading

alganthe commented Feb 8, 2018 •

edited

Loading

PabstMirror Feb 9, 2018

alganthe Feb 9, 2018

jonpas Feb 10, 2018

jonpas Feb 10, 2018

jonpas Feb 10, 2018

alganthe Feb 10, 2018

jonpas Feb 10, 2018

jonpas Feb 10, 2018

jonpas Feb 10, 2018

jonpas Feb 10, 2018

jonpas Feb 10, 2018

alganthe commented Feb 13, 2018

PabstMirror left a comment

alganthe commented Feb 13, 2018

Add ACE Arsenal stats #6110

Add ACE Arsenal stats #6110

Conversation

alganthe commented Feb 1, 2018 • edited Loading

Current stats::

Default stats

Primary / handgun weapons

Launchers

Uniform / vests

Backpacks

Headgear

Ballistic stats

Primary / handgun

Mags

Hearing stats

Headgear

Explosive stat

Right tab misc

alganthe commented Feb 8, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alganthe commented Feb 13, 2018

PabstMirror left a comment

Choose a reason for hiding this comment

alganthe commented Feb 13, 2018

alganthe commented Feb 1, 2018 •

edited

Loading

alganthe commented Feb 8, 2018 •

edited

Loading