Commit Graph

15648 Commits

Author SHA1 Message Date
d7c98ea366 Medical AI - Fix specific treatment items not being removed (#10179)
Fix treatment items not being removed

Bug introduced in #10158
2024-08-10 10:19:36 -07:00
9e4bcc5d72 Explosives - Remove delayTime for explosives, as it no longer serves any purpose (#10181)
Remove `delayTime` for explosives, as it no longer serves any purpose
2024-08-10 10:06:45 -07:00
22c71ba80e CSW - Fix round count in GMG belt description (#10180)
* Correct round count in GMG belt

* Fixed failing CI
2024-08-10 06:48:34 -07:00
9a52511222 Use turret events, fixed invalid param 2024-08-10 15:31:08 +02:00
71dcfb512c Reverted changes for hostile crew (now in a separate PR) 2024-08-10 14:57:36 +02:00
6656aa624c Added some suggestions 2024-08-10 14:57:12 +02:00
dc52f7a362 Update addons/csw/functions/fnc_getAvailableAmmo.sqf 2024-08-10 05:44:45 -07:00
46c484e0f0 Update addons/csw/functions/fnc_reload_handleReturnAmmo.sqf 2024-08-10 05:44:31 -07:00
18948e4cea Update addons/csw/functions/fnc_unloadMagazines.sqf 2024-08-10 05:43:59 -07:00
b2a3fac4b6 Medical Feedback - Add parameters to fnc_playInjuredSound (#10175)
* Additional parameters

- added parameters to allow changing distances for sounds for each severity.
- added parameter to allow unconscious units to do sounds.

* fix conditio

* Updated header formatting + minor tweaks

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-08-09 16:35:35 -05:00
4db0f7de24 Interaction - Improve FUNC(switchWeaponAttachment) (#10145)
* Improve swtichWeaponAttachment

* change interact_SWA to use common_SAM (#10176)

* change interact_SWA to use common_SAM

* Directly call

* exit on bad arg

* Update fnc_switchAttachmentMode.sqf

* Minor optimisations

* Cleanup leftover code, use unit instead of target

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/interaction/functions/fnc_switchWeaponAttachment.sqf

* Revert some unnecessary changes

* Remove sound, as it was part of the CBA attachment switching & pass missing parameter

* Add sound back, to indicate new attachment

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-08-09 14:08:07 -07:00
5afe06999f Chemlights - Add pretty name for addon (#10174)
Add pretty name for chemlights addon
2024-08-08 12:27:27 -03:00
0b2a8f23e6 Vehicle Damage - Let AP trigger ERA/SLAT (#10169)
Let AP trigger ERA/SLAT
2024-08-08 12:26:52 -03:00
7838dea543 Common - Improve persistent lights/lasers (#10118)
* Improve persistent lasers

* Update addons/common/functions/fnc_switchPersistentLaser.sqf

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

* Fix inventory changes toggling laser, removed alignment code

* Update addons/common/functions/fnc_switchPersistentLaser.sqf

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

* Added API for setting weapon lights/lasers

* Fix undefined variables

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-08-08 01:01:39 -07:00
80a310d4c6 Vehicles - Remove unneeded magazines (#10172)
Remove unneeded magazines
2024-08-08 00:29:41 -07:00
b9a361fd39 Vehicle damage - Fix ERA/SLAT not being detected (#10168)
* Fix ERA/SLAT not being detected
2024-08-06 11:15:01 -05:00
973cfdd1c4 Common - Move missing compats warning to pre start (#10162)
* Remove missing compats warning

* move to common/preStart

* ?

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-08-06 00:48:10 -07:00
92e10bc578 Fix overlapping CSW interaction position for SPG-9, improve positions for Mk19 and DSHKM (#10165)
Fix overlappting CSW interaction position for SPG-9, improve Mk19 and DSHKM
2024-08-06 00:33:52 -07:00
f4f2dbaad9 Docs - Add missing info to Interaction Menu Framework (#10160)
* Interaction Exceptions

* Additional Action Parameters
2024-08-05 17:33:00 -05:00
c31ef9e16b Medical AI - Add command actions to heal injured units (#10164)
* Add AI command menu for healing

* Moved actions to separate function

* Minor cleanup
2024-08-05 02:39:35 -07:00
cd678c5b90 Medical AI - Add tourniquet support (#10158)
Add tourniquet support for Medical AI
2024-08-05 02:39:01 -07:00
4226cd383e Interact Menu - Add inheritance support to removeActionFromClass (#8396)
* Add inheritance & exclusion support

* Update documentation in wiki

* additional check for parent class in findIf

* forEach instead of count

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

* condition for children of excluded classes

* touch everything but the params check

* apply configName in same line

* fix param data type for _excludedClasses

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

* Update addons/interact_menu/functions/fnc_removeActionFromClass.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Fix & formatting

* Fix missing _x & headers, remove invalid classes

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-08-05 02:38:46 -07:00
c491b78468 Recoil - Tweak launcher recoil to be more realistic (#9528)
* First pass at RPG recoil tweaks

* Crank up camera shake when using launcher

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-08-05 02:38:26 -07:00
2db56cc4bb Advanced Ballistics/Field Rations - Notify restart requirement (#10161)
Add notification for settings requiring restart
2024-08-03 10:16:46 +02:00
90d855c2c5 Nightvision - Improve NVG Brightness adjustment limits (#10136)
* Update fnc_changeNVGBrightness.sqf

* Update XEH_postInit.sqf

* Update addons/nightvision/XEH_postInit.sqf

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

* Update XEH_postInit.sqf

* Update fnc_changeNVGBrightness.sqf

* Update nightvision-framework.md

* load order independence

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-08-02 09:52:44 -03:00
6a25e9365a Safemode - Refactor (#10111)
* Refactor safemode

* Further improvements and fixes

* Update XEH_postInit.sqf

* Don't allow binoculars to be set to safe

* Add API for getting weapon safety status

* Update fnc_jamWeapon.sqf

* Added doc

* Update fnc_playChangeFiremodeSound.sqf

* Update addons/overheating/functions/fnc_jamWeapon.sqf

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

* Update addons/weaponselect/functions/fnc_selectWeaponMode.sqf

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-08-02 13:59:18 +02:00
4e56d58210 Translations - Add and Improve Portuguese (#10155) 2024-07-30 20:45:31 -05:00
98da279e8f Medical AI - Give blood in Cardiac Arrest before doing CPR (#10154)
Give blood in CA if needed before doing CPR
2024-07-29 15:04:59 +02:00
7e93715bcc Medical - Gracefully handle bad configs in testHitpoints (#10156) 2024-07-29 15:04:36 +02:00
a6ab050a07 Dogtags - Rename inventory items via CBA (#10130)
* Dogtags - Rename inventory items via CBA

* Update addons/dogtags/XEH_postInit.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-07-28 11:43:03 -05:00
66e417ba46 Update addons/csw/functions/fnc_getAvailableAmmo.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-07-28 12:30:14 -03:00
89491c13b4 drop redundant null check
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-07-28 12:29:30 -03:00
b0504d7ba0 Use getOrDefaultCall 2024-07-28 11:41:25 +02:00
1388f443cd Update fnc_unloadMagazines.sqf 2024-07-27 20:57:40 +02:00
3c3790e06d Use macro for radius, minor code cleanup & optimisation 2024-07-27 20:52:18 +02:00
76628c1fc2 Remove space in macro 2024-07-27 20:02:01 +02:00
a5d4a51dc7 Merge branch 'master' into pr/9234 2024-07-27 19:55:33 +02:00
56eae4060c CSW - Improve function headers & comments (#10149)
Code formatting changes from 9234
2024-07-27 19:42:31 +02:00
e3d8f40538 Interaction - Show all possible modes for an attachment (#8154)
* Interaction - Show all possible modes for an attachement

* Move attach & detach actions under item action

* Remove switching from PIP to regular 2D

* Remove attachment name from attach/detach actions

* Fixed typo in variable name

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-07-27 19:37:33 +02:00
aa6e5c30ec Fire - Fix medical macros in compiled sqfc (#10147)
* Fire - Fix medical macros in compiled sqfc

* Update addons/fire/functions/fnc_burnSimulation.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-07-27 19:16:49 +02:00
b7cd72e936 CSW - Fix belt linking (#10148)
* fix unloading to units with full inventory

* fix belt linking issues

* Enhance workaround

* Use unit instead if magSource is null

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
2024-07-27 19:15:50 +02:00
ba22c407e3 Common - Add ace_common_fnc_switchAttachmentMode (#10135)
* Common - Add `ace_common_fnc_switchAttachmentMode`

* Update addons/common/functions/fnc_switchAttachmentMode.sqf

* Update addons/common/functions/fnc_switchAttachmentMode.sqf

* playSound only for ACE_player

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-07-27 19:15:28 +02:00
8eefffe811 Recoil - Code cleanup (#10150)
* Recoil code cleanup

* Store recoil values as numbers in config, only `compile` if needed

* Updated header

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-07-27 14:43:07 +02:00
7fc4c42954 Update fnc_ai_reload.sqf 2024-07-26 18:11:42 +02:00
757710b002 Minor fixes 2024-07-26 17:41:41 +02:00
179d713473 Merge branch 'master' into pr/9234 2024-07-26 17:41:04 +02:00
b85150e6eb Explosives - Only add "detonate all" action for dead man switch when necessary (#10146)
Only add detonate all when necessary
2024-07-25 20:34:26 +02:00
e99d6d9381 Medical AI - Make AI take tourniquets into account when medicing (#10142)
* Make AI take tourniquets into account when medicing

* Update fnc_healingLogic.sqf
2024-07-25 07:49:45 +02:00
bfbaae65e1 Arsenal - Fix mission and campaign insignia (#10143) 2024-07-24 20:17:22 -03:00
74de646a02 Medical AI - Fix splints not being applied in special circumstance & setting adding multiple EH (#10141)
Several medical AI fixes

- Not applying splints if too many medications were taken
- Potential nil for _target
- Setting could add multiple EH, require mission restart
2024-07-24 15:04:53 +02:00