Commit Graph

67 Commits

Author SHA1 Message Date
Brett
d72555ab0c
Arsenal - Add Sorting Algorithms (#7719)
* support per tab sorting, and external algorithms

* improved sub sorting

* improve alphabetical search

* update mod sorting

* sort by accuracy

* sort right panel

* more sorts

* sort right tab

* fix empty

* stringtables

* Apply suggestions from code review

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* more suggestions

* suggestions

* remember last sort

* Fix missing throw and put names

* bad copy paste in stringtable

* Update addons/arsenal/functions/fnc_sortPanel.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-18 12:43:35 -05:00
shukari
b77324ec58
Arsenal - add custom right panel misc items buttons (#7596)
* added medical, food and roleplay categories to arsenal

* decreased wound stitch time

* added custom rightPanelButtons

* stuff that doesnt belong here

* fix

* commys wishes

* commys wishes part2

* Update addons/arsenal/defines.hpp

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* infinitely better SPEED

* changes

* delete unused stuff

* my own 3 white dots

* fixed fillRightPanel IDC_MISC

* commy fixes

* background first

Co-authored-by: Schwaggot <tom.ryan@posteo.de>
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2020-06-29 10:43:33 -05:00
mharis001
99df791c43
Arsenal - Add grenade fuse time stat (#7694)
* Arsenal - Add grenade fuse time stat

* Add German translation

Co-authored-by: Jo David <github@jonathandavid.de>

* Add French translations

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Improve IR grenades handling

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Get ammo config once

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-07 19:58:55 -05:00
jonpas
f6af95b4a1
Arsenal - Optimize non-scope 2 mags filtering (#7543) 2020-02-22 22:26:55 +01:00
PabstMirror
1ee2e6adb2
Arsenal - Filter non-scope 2 mags from being auto-added (#7445) 2020-02-22 22:15:09 +01:00
Whigital
78d79f2761 More excessive brackets 2020-02-13 17:16:35 +01:00
Whigital
57b411b8a4 conform isnil checking: arsenal 2020-02-12 17:27:39 +01:00
Josuan Albin
b8fcd92536 Fix default loadout public func not checking base items (#7280) 2019-12-04 14:12:00 -06:00
PabstMirror
0e485ce5fc
Arsenal - Fix script error for weapons with 3+ muzzles (#7256) 2019-10-29 17:10:03 -05:00
Dedmen Miller
07be4bd9da Don't force Camera position in Arsenal Loadouts list (#7209) 2019-10-04 19:57:06 -05:00
Josuan Albin
2950a48447 Fix statBarStatement still using AI values for firemodes 2019-09-03 15:32:27 +02:00
PabstMirror
5da1308151
Disposable - Add warning for addons using ace_disposable (#6963)
* Disposable - Add warning for addons using ace_disposable

* update arsenal code and cba version
2019-05-06 10:05:04 -05:00
Josuan Albin
8fe02a455f Fix #6935 2019-04-12 14:39:28 +02:00
Dedmen Miller
d034324e88 More trivial code cleanup (#6859)
* Added a3 include pboprefix

* Add defineDIKCodes header

* defineDIKCodes include case correct

* Use ui_f dikcodes

* Fix fnc_checkfiles macro and dll condition

* Incorrect macro usage in fnc_getVehiclePos

* Incorrect macro usage in fnc_getVehiclePosComplex

* Add defineResincl ui_f include

* Remove include guard from defineResincl

* Incorrect macro usage in fnc_handleMouseButton

* Incorrect macro usage in fnc_setMarkerJIP

* Semicolon after include

* Add defineResinclDesign ui_f include

* Incorrect macro usage fnc_rearmSuccessLocal

* Incorrect macro usage fnc_rearmSuccessLocal

* Stray backslash in fnc_camshake

* Incorrect macro usage in fnc_startNozzleInHandsPFH

* Incorrect amcro usage in fnc_tag

* Incorrect macro usage in fnc_moduleGlobalSetSkill

* Reenable linux checkFiles

* Non-captialized requiredAddons

* Non-captialized requiredAddons
2019-03-21 08:52:32 -05:00
mharis001
695416dfe7 Arsenal - Improvements to 3DEN attribute (#6849)
* Improvements to arsenal 3DEN attribute

* Better alignment of button

* Remove magazineGroups copy
2019-03-12 11:26:40 -05:00
Dedmen Miller
564fc8aa99 Trivial code fixes (#6858) 2019-03-10 21:42:08 -05:00
PiZZAD0X
9e609b3394 Arsenal - Add Ability to Transfer a Loadout from Saved to Default (#6793)
* Added weight override parameter to ace_dragging_fnc_setCarryable/setDraggable

- Additional optional parameter that ignores the `startCarry`/`startDrag` weight checks.
- Minor `==` to `isEqualto` replacements

* `count crew _target isEqualto -1` to `count crew _target isEqualto 0`

* Tab Replacement

- remove \t

* Reverted UAV check, Params formatting, Lazy Eval

* Update addons/dragging/functions/fnc_startCarry.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Update fnc_startDrag.sqf

* Remove beta suggestion extra line additions

* Update addons/dragging/functions/fnc_startDrag.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Added ability to export loadout to defaultloadouts

Shift + LMB on save button can export the selected saved loadout to the mission loadouts. Experimental Test. Warrants a separate button if there is enough demand.

* Update fnc_buttonLoadoutsSave.sqf

* Update addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Add usage info to tooltip
2019-02-23 19:35:13 -06:00
Josuan Albin
8450555f0c Arsenal - Fix arsenal not working reliably on remote AI units. (#6784)
* Fix 6701

* Update addons/arsenal/functions/fnc_onArsenalClose.sqf

Co-Authored-By: alganthe <alganthe@live.fr>
2019-01-26 14:13:38 -06:00
PabstMirror
3df805306b
Arsenal - Fix script stat script errors for odd weapons (#6794) 2019-01-26 14:13:19 -06:00
PabstMirror
03e01f02df
Arsenal - Fix script error from hide changes (#6699)
https://github.com/acemod/ACE3/pull/6694/files#r234542372
2018-11-19 13:05:44 -06:00
PabstMirror
e3421cbf8f
Arsenal - Add config to force show (mortars) (#6694)
* Arsenal - Add config to force show (mortars)

* Update CfgMagazines.hpp

* Update arsenal-framework.md
2018-11-18 23:04:50 -06:00
Dedmen Miller
efb53ed181 Arsenal - Add Night Vision support stat for scopes (#6671)
* Add Night Vision support Arsenal stat for scopes

* contrive correct configClasses camel case compliance

* Change priority
2018-11-14 10:36:10 -06:00
Josuan Albin
69a67ff4e2 Arsenal - Fix NVG overlay appearing in ace arsenal (#6673)
* Fix NVG overlay appearing in ace arsenal

* Change center to ACE_Player in nvg check to avoid edge case
2018-11-11 11:22:53 -06:00
Josuan Albin
25b6e73985 Chemlight and IR strobe improvements (#6645)
* Make IR chemlight brighter

* Improve IR strobe light visibility

* Make chemlights more realistic

* Tweak IR strobe light to make it brighter

* Increase chemlight TTL to realistic durations

* Add blue and green hi chemlights, replace orange hi by orange utlra-hi

* Add ACE chemlights to 3DEN chemlight module

* Add zeus chemlight modules for ACE chemlights

* Add time to live stat for hand smokes and chemlights

* Add hi blue and hi green pictures by @Drofseh
2018-11-01 12:49:46 -05:00
mharis001
50e233c22c Add key handling to 3DEN attribute (#6622) 2018-10-14 08:54:51 -05:00
mharis001
e54e8d0f8c Fix blacklist not working in multiplayer (#6598) 2018-10-07 22:49:29 -05:00
Ozan Eğitmen
a6d40549dc Fix findIf typo, Don't deep copy arrays (#6587) 2018-09-19 08:24:57 -05:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
Ozan Eğitmen
db6a40f91d Arsenal - Add Default Loadouts API (#6558)
* Add addDefaultLoadout function

* Initialize defaultLoadoutsList by default

* Close params bracket

* Revert "Initialize defaultLoadoutsList by default"

This reverts commit a53d21046e.

* Add isNil check

* Remove tab

* Overwrite loadout if it exists

* Fix file name typo

* Use findIf and copy array

* Add override note to header

* Make btnImport use new function instead of duplicating code

* Use GVAR

* Use findIf

* Fix spacing

* Add documentation

* Improve documentation
2018-09-17 13:22:04 -05:00
Blutze
3ee94d3aca [Arsenal] Filter firemodes for precision display by showToPlayer (#6572) 2018-09-14 15:01:50 -05:00
Dystopian
0e980907fe Fix some item type magic numbers (#6487)
* Fix item type magic numbers

* Add weapon and magazine macros
2018-09-12 22:29:56 -05:00
Josuan Albin
eab84e0d09 Arsenal - Fix sort by value not sorting properly (#6570)
* Fix sort by value not sorting properly

* Change single to double quotes

* Remove uneeded space
2018-09-12 14:59:36 -05:00
alganthe
d13641d670 Add author support for mission defined unitInsignias 2018-08-31 18:35:12 +02:00
alganthe
04aeaa0912 Add support for mission defined unitInsignias 2018-08-31 18:20:55 +02:00
Josuan Albin
29d11bc752 Fix terminals not being properly added to currentItems (#6504) 2018-08-05 23:15:49 -05:00
PabstMirror
2203cb7b16
Common - Update showHud function for new elements (#6459)
Showhud command has been updated to 10 elements
2018-07-21 18:03:00 -05:00
Josuan Albin
8a37b6093d Arsenal - Fix locality issue for adding weapons/backpacks and remove unnecessary check in scanConfig (#6456)
* Remove unnecessary itemInfo check in scanConfig

I got the best tests folks, believe me, the best.
I made sure this didn't break anything by making sure the array had the same number of elements before and after removing those, best tests folks.

* Change onSelChangedLeft to use global variant of addWeapon and addBackpack

Fix a possible locality issue when opening ace arsenal on other players.
2018-07-20 15:54:04 -05:00
mharis001
0b19a8d527 Arsenal - 3DEN Attribute (#6257)
* Initial commit

* Add/remove items and switching between categories

* Add ability to change mode

* Save attribute and clear button

* Search bar and double click to toggle

* Add export button

* Add attribute init function

* Fix multiple selection with different items

* Correct bad code and remove unneeded include

* Update stringtable.xml

From common pbo whitelist (modified) and a3 stringtables

* Disable attribute on humans

* Move includes to top

ref #6407
2018-07-20 12:35:44 -05:00
Josuan Albin
3917092540 Fix possible issue with weapons without firemodes (#6386)
Apparently that's a thing
2018-06-10 00:14:14 -05:00
Josuan Albin
11df315ce4 Arsenal - Fix Rate Of Fire stat (#6385)
* Fix the ROF stat in ace arsenal

Previous one was wrong when the ROF set as default was different than the one in firemodes

* Add missing )
2018-06-09 12:43:53 -05:00
Dedmen Miller
f5cd682ce3 Arsenal - Add magazineWell support (#6355)
* ACE Arsenal magazineWell support

* Fix case sensitivity problems
as
2018-05-31 20:46:48 -05:00
Josuan Albin
9618c2de95 Various ACE Arsenal additions and fixes (#6347)
Arsenal - Various additions and fixes
2018-05-31 18:00:29 -05:00
mharis001
fa98316424 Correct arsenal openBox center check (#6329) 2018-05-07 22:44:15 +01:00
PabstMirror
d68f67a1ef
Arsenal - Fix weight stat for NVGs (#6325)
Fix #6320
2018-05-04 16:13:42 -05:00
Josuan Albin
1994e301fd More various ace arsenal fixes (#6192)
* Compile stats on preInit

* Remove uneeded check in add/removeStat

* Remove perf profiler vars

They aren't required anymore

* Fix case issue in verifyLoadout, remove uneeded line

* Fix ace arsenal cam not working porperly underwater

By removing those checks the cam is allowed to clip through objects and work properly underwater, sounds like features to me :D

* Fix gunbag behavior in ace arsenal

Switching between gunbags will keep the weapon, switching to another backpack then back to a gunbag will also keep the weapon.

* Fix text scaling in the searchbars and loadout name edit boxes

Also made the text bigger by default
2018-04-12 10:44:23 -05:00
Josuan Albin
859b6a16f6 Fix error in ACE Arsenal stats (#6175)
* Fix the camera on remote units ending after ace arsenal closes

* Shorten handleStats, fix error with face, voice, insignia tabs

* Remove uneccessary code

You saw nothiiiiing.
2018-03-03 18:34:24 +01:00
mharis001
8ee7c1b132 Shorten handleStats window resize (#6176) 2018-03-03 18:33:29 +01:00
PabstMirror
f70dfaf160
Arsenal - Compile stats on first use (#6159)
* Arsenal - Compile stats on first use

* fix )
2018-02-23 23:30:15 -06:00
PabstMirror
741407f6e1 Arsenal - Add stat for scope magnification (#6150) 2018-02-18 02:32:19 +01:00
Josuan Albin
1d6e07d18f Add ACE Arsenal stats (#6110)
* 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
2018-02-15 10:03:22 -06:00