Commit Graph

151 Commits

Author SHA1 Message Date
0cef0ba6e9 Fastroping - Add Auto add FRIES setting (#9319)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-08-16 14:16:44 +02:00
5e6476aa5a Arsenal - Make Zeuses able to save, delete, and edit Default Loadouts (#9278)
* allow zeus to edit default loadouts

* typo
2023-07-28 07:55:10 +03:00
174841751c Arsenal - Improve support for unique equipment (#9287)
* work on arsenal actions

* cycle through pages

* docs

* cleanup

* Update addons/gunbag/functions/fnc_weaponName.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* missing fil

* Update addons/arsenal/functions/fnc_itemInfo.sqf

* Update addons/arsenal/functions/fnc_refresh.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* remove CBA_loadoutSet gunbag cache

* update fnc_refresh

* Added unique item support for left panel items

* Cleanup

* fix 3den

* add scopeEditor

---------

Co-authored-by: Brett <brett@mayson.io>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-25 09:41:15 +03:00
3edeff217a Arsenal - Action Buttons (#9069)
* work on arsenal actions

* cycle through pages

* docs

* cleanup

* Update addons/gunbag/functions/fnc_weaponName.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* missing fil

* Update addons/arsenal/functions/fnc_itemInfo.sqf

* Update addons/arsenal/functions/fnc_refresh.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* remove CBA_loadoutSet gunbag cache

* update fnc_refresh

* fix 3den

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-25 09:30:49 +03:00
31e1ad0cff Arsenal - Add Tools category and moveOnOverwrite parameter to FUNC(addCustomRightPanelButton) (#9247)
* add tools tab and setting

* move to preinit

* fix icon, add restart warning

* derp

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

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

* remove setting

* add keepIfOverriden parameter

* docs again

* documentation whitespace

* docs grammar, change parameter name

* fix docs

* more docs fixes

* magazine support

* deprecate spare barrel item

* more docs, improve condition

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-21 22:39:48 +03:00
c8404f496e Arsenal - Add/Fix/Improve/Change numerous aspects (#9040)
* Arsenal update

* Fixes

* Update fnc_onSelChangedLeft.sqf

* Update fnc_updateUniqueItemsList.sqf

* Header fixes

* Fix for defines.hpp

Co-authored-by: Dystopian <sddex@ya.ru>

* Moved fnc_baseWeapon, filtered invalid items

* Update addons/arsenal/functions/fnc_scanConfig.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Fixes and tweaks

- Sorting is guaranteed to give a fixed order
- Dog tags no longer throw errors when reloading the ACE arsenal mission when you had some saved in your loadout before quitting the last time you played.

* Cleanup, bug fixes and additions

- Added the ability to add items from "CfgMagazines" into the "Misc. items" or custom tabs.
- Added "baseWeapon" class support for weapon attachments. If a weapon attachment has the config property "baseWeapon" defined, it will take that item and show that in the arsenal.
- Added stronger filtering on item scopes (scope > 0 at least for every item)
- Added "descending" (default, as it is now) and "ascending" sort order as a drop down menu,
- Unique backpacks in containers can now be removed with either the "-" or "clear all items" button.
- When sorting by a number, 2 decimal points have been added, so that when you sort by weight it returns the correct order.

* More fixes and tweaks

- Converted the arsenal to partially work with hashmaps instead of arrays (for configItems and virtualItems, currentItems is still an array).
- Because of the above, performance of FUNC(addVirtualItems) and FUNC(removeVirtualItems) has improved immensely.
- Sorting now caches results, reducing repeated sorting times drastically.
- CBA disposable launchers are handled differently now: Within the arsenal, you can change weapon attachments on disposable launchers, but you can't change their magazines (primary or secondary). Item info on the right and the stats show correct information.
- FUNC(addSort) now checks if the new sorting method already exists and doesn't add it if it does.
- FUNC(removeSort) now exists. You can't remove the default sort type (alphabetically) to avoid problems with the arsenal.
- Both FUNC(addStat) and FUNC(compileStats) actually taken priority into account now. Because of that priority on several stats needed to be tweaked.
- FUNC(removeStat) ensures that there are no gaps within the stat array (so if there is an empty spot in the stats page, it's because there is a stat, but the condition for it being shown hasn't been met).

* Update fnc_replaceUniqueItemsLoadout.sqf

* Update fnc_onSelChangedLeft.sqf

* Update fnc_scanConfig.sqf

* Update docs/wiki/framework/arsenal-framework.md

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Minor cleanup

* Baseweapon filtering

* Improvements + better unique items support

* Update fnc_fillRightPanel.sqf

* Update fnc_onSelChangedLeft.sqf

Fixed: Switching between weapons with incompatible primary magazines while a compatible secondary magazine is loaded doesn't equip the new weapon's primary magazine.

* Update addons/common/functions/fnc_uniqueUnitItems.sqf

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

* undefined variable

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

* fix undefined loadout var

* Update fnc_fillLoadoutsList.sqf

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-21 21:25:25 +03:00
ab2207924f Logistics Wirecutter - Add documentation (#9248)
* Create wirecutter-framework.md

* Update docs/wiki/framework/wirecutter-framework.md

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-09 21:14:54 +03:00
0e26755b88 Medical - Add arsenal category (#9220)
* add medical category to arsenal

* function header

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

* move to preinit, protect list

* improve macro

* documentation

* add config property

* add CfgMagazines

* Revert "add CfgMagazines"

Arsenal doesn't support magazines in custom categories

---------

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-07 07:14:44 +03:00
30a0e55843 Field Rations - Add arsenal category (#9221)
* add field rations category

* improve macro

* second verse same as the first

* account for empty items

* switch to configClasses

* documentation

* add API variable

* Update docs/wiki/framework/field-rations-framework.md
2023-07-07 07:14:35 +03:00
864d2e9eee Explosives - Add "ace_explosives_setup" CBA Event (#9197) 2023-06-20 13:36:57 -06:00
2e54ee7bee Explosives - Add getVar to disable setShotParents (#9190)
* Explosives - Add getVar to disable setShotParents

* Update docs/wiki/framework/explosives-framework.md
2023-05-03 11:55:02 -05:00
c4c4156c0a Documentation - Only split the wanted ul into columns 2023-05-01 17:25:29 +02:00
76e1aafb33 Use function documentation script (#6897)
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
2023-04-30 23:03:35 +02:00
bcbd762748 Fortify - Categories (#9167)
* Fortify - Categories

* Update fnc_registerObjects.sqf

* Apply suggestions from code review

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Apply suggestions from code review

* Update docs/wiki/framework/fortify-framework.md

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/fortify/ACEX_Fortify_Presets.hpp

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* just use flat objects array

* Update fnc_getPlaceableSet.sqf

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-03-18 19:23:20 -05:00
0a2e7d1202 Rearm - Improve framework documentation (#9114)
* Added scripted way of creating a rearm source to framework documentation

* Fixed indentation level

* More verbosity

* Updated phrasing

* * Fixed bad copy paste job
* Changed introduction version to more likely candidate
* Reordered `makeSource` under `Functions` and applied hopefully more sensible order of "create source > ammo specifics"

* Wording fix and further reorder

* Fixed wording to be in line with rest of document
* Further updated order

* Update docs/wiki/framework/rearm-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update docs/wiki/framework/rearm-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update docs/wiki/framework/rearm-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update docs/wiki/framework/rearm-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update docs/wiki/framework/rearm-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Added execution hint to makeSource

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-03-05 18:12:58 -06:00
27a2a7c131 Refuel - Improve framework documentation (#9122)
* Refuel framework doc update

* Fixed one explanation
* Unified terminology
* Changed order to mirror that of rearm-doc update in PR #9114

* Added execution hints for makeSource and makeJerryCan
2023-03-05 18:12:38 -06:00
eef506b7eb Update repair framework docs (#9123)
* Hopefully improved usability and appeal
2023-03-05 18:12:23 -06:00
1693e6834d Added ace_rearm_sourceInitialized event (#9134) 2023-02-17 20:59:23 -06:00
28e8e7d4ca Refuel - Add events for fuel source and jerry can creation (#9133)
* Refuel - Added events

* Added ´ace_refuel_fuelSourceInitialized´ and `ace_refuel_jerryCanInitalized´ events
* Updated documentation

* Cleaner implementation && more coherent with analog rearm event

* Rebase merging is weird
2023-02-17 20:49:57 -06:00
5693edc96d Update fortify wiki (#9092) 2022-12-02 19:08:00 -06:00
95a5fb040a Arsenal - Add init/remove local events to Arsenal creation/destruction (#9064)
* Added two local events to arsenal

* onInitArsenal fired when Arsenal got initiated
* onRemoveArsenal fired when Arsenal got removed

* added them to the arsenal event listing in the docs

* Update addons/arsenal/functions/fnc_removeBox.sqf

Co-authored-by: BrettMayson <brett@mayson.io>

* Update addons/arsenal/functions/fnc_removeBox.sqf

Co-authored-by: BrettMayson <brett@mayson.io>

* Renamed events in accordance with event naming patterns sans "on"

* Apply suggestions from code review

Co-authored-by: BrettMayson <brett@mayson.io>

* Improved Docs

Co-authored-by: BrettMayson <brett@mayson.io>
2022-10-21 19:28:10 -05:00
accba4dd34 Update hunterkiller-framework.md (#9026) 2022-09-08 21:20:11 +02:00
5b06a1f882 Docs/Cargo - Include missing "unload type" param (#9010)
* Docs/Cargo - Include missing "unload type" param

There's a LOT of pages that are still missing documentation on listenable events entirely, maybe I'll get around to fixing that at some point.

* Update events-framework.md

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-09-06 15:20:44 -05:00
f734fa9e86 Field Rations - Basic CfgMagazines support (#9008)
* Add basic CfgMagazines support for field_rations

* Update headers

* Fix CBA context menu

* Add backward compatiblity to fnc_consumeItem

* Fix item refill not finishing

Whoopsie.

* Revert "Add backward compatiblity to fnc_consumeItem"

In hindsight it's not necessary, this is not public function.
2022-09-06 13:21:45 +02:00
508e669e05 Trenches - Add modded Entrenching Tools support (#8999)
* Add support for other entrenching tools

* Docs

* Remove unused variable

* Check unit weapons for entrenching tool

`weapons` returns weapons in weapon slots and from all containers.

* Update addons/trenches/README.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Support for shovel Backpacks

* Update XEH_preStart.sqf

* Add Arsenal "Entrenching Tool" stat

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-09-05 00:21:29 +02:00
b97056f527 Add Budget update to wiki (#9024) 2022-09-04 16:38:53 -05:00
3872eb0647 Add a way to block auto carry after unload on classes (#9013) 2022-09-01 14:06:24 -05:00
cc3bad3c56 XM157 (NGSW-FC Smart Scope) Framework (#8897)
* XM157 (NGSW-FC Smart Scope)

* Update addons/common/functions/fnc_rscObjectHelper.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/xm157/functions/fnc_weaponInfo_draw.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Headers

* Handle prone-deploy weapon bank

* Disable Reticle picker for now

* some localizations

* Change font

looks like CUP modifies EtelkaMonospaceProBold for some reason??

* Create xm157-framework.md

* Formating

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2022-09-01 13:44:19 -05:00
981a8ea352 Hunter Killer (Commander Override) (#8496)
* Hunter Killer (Commander Override) - Initial Demo

* Just do a one-time slew

* Update fnc_eachFrame.sqf

* Update addons/hunterkiller/functions/script_component.hpp

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

* Update for ArmA 2.08

* cleanup

* Rework Observe / Control configs

* Add to all 2035 tanks

* Update script_component.hpp

* Use eyeDirection on commander turrets

* Update docs/wiki/framework/hunterkiller-framework.md

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Add to all 2035, support ture/false setVars

* remove from apcs because mods don't know how to do inheritance

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-09-01 13:38:22 -05:00
ecb7721c77 Medical - Disable blood spurts for fire, burn and drown damage types (#9001) 2022-08-25 12:05:50 -05:00
438a90b63d Common - Add CBA extended loadout (#8923)
* extended loadouts - earplugs, gunbag, and arsenal identity

* arsenal - maintain default loadout size check

* restore comment

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

* fix forgotten example

Co-authored-by: jonpas <jonpas33@gmail.com>
2022-08-25 11:56:54 -05:00
a421a63eea Trenches - Add "placed" and "finished" events (#8998)
* Add trench placed and finished global events

* Docs
2022-08-20 15:43:50 -05:00
fc17697ef7 Overpressure - Fix backblast originating at projectile (#8985)
* Overpressure - Fix backblast originating at the projectile

* RHSUSF - Improve backblast for shoulder launchers

* RHSAFRF - Improve backblast for shoulder launchers

* RHSGREF - Improve backblast for shoulder launchers

* RHSSAF - Improve backblast for shoulder launchers

* Overpressure - Simplify projectile offset and cache lookups

* Overpressure - Remove parentheses and use array as hash key

* Overpressure - Rename caching function and move lookup
2022-08-01 18:32:02 +01:00
15deea56cb Cookoff - Removed references to unused ignoreTurret parameter 2022-07-14 21:27:07 +01:00
df13db5958 Documentation - Fix Viewports versions (#8919) 2022-05-22 22:51:36 +02:00
86f08af250 Common - Add keybind and function to unload unit's weapon/muzzle (#8735)
* add keybind and function to unload unit's weapon/muzzle

- add keybind and function to unload unit's weapon/muzzle
- requires https://github.com/CBATeam/CBA_A3/pull/1527

* change function name

* rename the file too

* Create common-framework.md

* Set REQUIRED_CBA_VERSION to 3.15.7

* Update required CBA version

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

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-18 13:07:47 -05:00
a4258f3587 Viewports (#8480)
* Viewports

* Support mem-points

* Update CfgVehicles.hpp

* Add some docs

* Cleanup Debugging

* Update addons/viewports/dev/debugPoints.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/viewports/dev/debugPoints.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/viewports/functions/fnc_eachFrame.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* configProperties / 3den macro

* Update viewports-framework.md

* Update viewports-framework.md

* Add compats for rhs btrs

* Update addons/viewports/dev/debugPoints.sqf

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
2022-05-17 11:55:09 -05:00
53c0348a15 Overheating - Add barrel mass config value (#8906) 2022-05-11 18:21:05 -05:00
67842a2656 Medical Vitals - Add event to vitals loop (#8891)
* Added event to vitals loop

* Pass deltaT to event

* Added event to documentation
2022-05-03 18:04:58 -05:00
bdeb347ea9 medical_damage - cleanup woundHandler naming (#8824)
* medical_damage - cleanup woundHandler naming

* woundsHandlerBase
2022-02-20 17:23:56 -06:00
dcdb241836 Documentation - Fix Medical Framework page parsing (#8823) 2022-02-17 22:07:33 +00:00
73a7dbdc1e Medical - Rework wound handling (#8278)
- Add stackable wound handler system for easy 3rd party extensibility and overriding of default wound handler.
- Change mapping from wound type -> damage types, to damage type -> wound types. Improves the semantics and makes configuration easier to reason about.
- Allow damage types to influence wound properties (bleed, size, etc.) with configurable variance parameters.
- Allow configuration of wound type variance per damage type. Enabling more logically driven variance for sensible but still varied end results.
- Improve handling of non-selection-specific damage events. The wound handler now receives all incoming damages and may apply damage to multiple selections (previously only ever one) if the damage type is not configured to be selection specific (with new config property `selectionSpecific`).
- Add debug script for testing explosion damage events at varied ranges.
- Add custom fire wound handler.
2022-02-17 20:03:12 +00:00
90d63475d5 Medical Treatment - Add preferred seats for loading patients (#8789)
* Medical Treatment - Add preferred seats for loading patients

* load patients in reverse order

* add option for reverse fill

* Update addons/medical_treatment/functions/fnc_loadUnit.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update docs/wiki/framework/medical-treatment-framework.md

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-02-17 11:14:39 -06:00
00f35a3dae Cargo - Add ability to disabled rename on object level (#8740)
* Rename can be disabled on object level

- Added ability to stop renaming on object level

_Needs testing_

* Fixed extra ()

* Forgot one of the )

* Update cargo-framework.md

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-01-30 12:04:39 -06:00
2f2280494f Slideshow - Add support for texture selections (#8702)
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-11-28 02:11:46 +01:00
67cad5120e Documentation - Improve documentation for Rearm & Vehicle Damage (#8588) 2021-11-18 20:26:31 +01:00
ec2028cc8a Documentation - Add Arsenal custom sub-item categories (#8678)
* New Info: Adding custom sub item categories

* typo fix

* Custom sub item categories

* Update arsenal.md
2021-11-15 12:18:54 +01:00
4a3051df54 use md extension (#8680) 2021-11-14 07:45:33 +01:00
3c59523361 Documentation - Rework arsenal docs (#8650) 2021-11-11 13:12:09 +01:00
422c47aae6 Fortify - Add Progress Bar (#8585)
* Fortify - Add Progress Bar

* Misc Fixes

* Add animation loop

* Adjust default values to make larger objects take longer to build

* Fix merge conflict additional

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-11-08 12:01:39 -06:00