Commit Graph

13102 Commits

Author SHA1 Message Date
PabstMirror
3ff635f82d
Common - Use hashmap for canInteractWith check (#10189) 2024-08-11 20:29:33 -03:00
Grim
fff66bc27c
Medical - Make Peripheral Resistance affect blood loss (#8420)
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-08-11 20:29:11 -03:00
johnb432
c8e7b6396b
Medical Damage - Improve custom wound handling (#9310) 2024-08-11 20:28:51 -03:00
johnb432
be23ae7ecd
Medical GUI - Make separate file for keybinds (#10190)
* Make separate file for keybinds

* Add missing ;
2024-08-11 14:24:01 -07:00
johnb432
70c8322392
Aegis Compat - Overwrite some Aegis changes (#10173)
* Overwrite some Aegis changes

* Preemptively overwrite upcoming changes to Aegis
2024-08-11 08:10:48 -07:00
johnb432
b7f48a912f
IR Light - Fix bad item replacements and switching to primary weapons (#10119)
* Fix bad item replacements and switching to primary weapons

* Update addons/irlight/functions/fnc_initItemContextMenu.sqf

* Update fnc_initItemContextMenu.sqf

* Remove unused funtions

* Various fixes/tweaks

- Added a weapon parameter to `switchAttachmentMode`
- Made `switchPersistentLaser` take pointer switching into account
- Fixed IR light attachments being added to the wrong weapon
2024-08-11 08:08:50 -07:00
johnb432
ff31bc69a8
Medical AI - Prevent medics from being blocked on treatments they can't complete (#10167)
* Add tourniquet support for Medical AI

* Stop blocking start

* Renamed states, condensed `canHeal`

* Renamed `tooManyMeds` state

* Update addons/medical_ai/functions/fnc_healUnit.sqf

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

* Change states to use singular, add states for autoinjectors & splint

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-08-11 08:06:59 -07:00
PabstMirror
0b4029b12f
Medical AI - AI will remove tourniquets (#10166)
* Medical AI - AI will remove tourniquets

* Medical AI - Improve tourniquet removal (for #10166) (#10178)

* Fixes & tweaks

- Have AI remove tourniquets ASAP
- Fixed bug where AI would not remove tourniquet, because it didn't have any bandages
- Allowed for more multitasking

* Allow healer to administer morphine if out of bandages

* Remove TODO comment

* Allow AI to remove tourniquets from limbs with no open wounds

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-08-11 00:19:35 -07:00
Dystopian
96f81f1c9b
Interaction - Add actions based on animations (#6144)
* Add actions based on animations

* Add setting

* Add ability to set items for users

* Add actions for 1.82 changes

Add actions for backpacks, canisters, entrench tool.
Move items and backpack to WeaponHolder.

* Add RHS 0.4.6 ZIL spare

* Update to new standards

* Handle RHS BTR retread system

* Make init faster: move condition to configClasses

* Fix CUP fake anims

* Refactor

* Rework

* Rename init function

* Decrease number of classes to init

* Fix merge mistake

* Apply suggestions from code review

* Updated code for current mod structure

* Multiple fixes & tweaks

- Made anim setting require a mission restart
- Handle more types of items that can be spawned
- Prioritise adding items to inventory and only drop on ground if no inventory space
- Add more position checks to make certain no valid position are present before stopping
- If 1 item was spawned in, it's considered as success
- Disable RHS' wheel replacement only if ace_repair is loaded

* Update CfgVehicles.hpp

* cache config lookup at preStart

* Fix error

* Add text config entry for progress bar title

* Restructure interactions, improved some locations & added interaction to some missing vehicles

* Reverted preInit change

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-08-10 23:29:50 -05:00
Dart
e36363e8cc
Arsenal - Add ace_arsenal_fnc_saveLoadout as API to save loadouts (#10151)
* Added fnc_saveLoadout

* Changed to toLower for other languages

* GitHub didn't like editing the file in the browser

* Fix case-sensitive _loadoutIndex

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

* Unicode support

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

* setVariable in case no loadouts are saved

* Fix return not happening properly

* Added scripting example

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-08-10 12:01:12 -07:00
PabstMirror
346d56c659
QuickMount - Fix keybind (#10184) 2024-08-10 13:53:01 -05:00
johnb432
e181cffc83
RHS Compats - Remove nametags related functions being called if nametags isn't loaded (#10177)
Don't call nametags related functions if nametags isn't loaded
2024-08-10 12:58:43 -05:00
johnb432
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
johnb432
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
johnb432
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
tuntematonjr
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
johnb432
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
johnb432
5afe06999f
Chemlights - Add pretty name for addon (#10174)
Add pretty name for chemlights addon
2024-08-08 12:27:27 -03:00
johnb432
0b2a8f23e6
Vehicle Damage - Let AP trigger ERA/SLAT (#10169)
Let AP trigger ERA/SLAT
2024-08-08 12:26:52 -03:00
johnb432
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
johnb432
80a310d4c6
Vehicles - Remove unneeded magazines (#10172)
Remove unneeded magazines
2024-08-08 00:29:41 -07:00
johnb432
b9a361fd39
Vehicle damage - Fix ERA/SLAT not being detected (#10168)
* Fix ERA/SLAT not being detected
2024-08-06 11:15:01 -05:00
johnb432
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
johnb432
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
johnb432
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
johnb432
cd678c5b90
Medical AI - Add tourniquet support (#10158)
Add tourniquet support for Medical AI
2024-08-05 02:39:01 -07:00
Grim
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
amsteadrayle
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
johnb432
2db56cc4bb
Advanced Ballistics/Field Rations - Notify restart requirement (#10161)
Add notification for settings requiring restart
2024-08-03 10:16:46 +02:00
Will/KJW
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
johnb432
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
Enrico Machado
4e56d58210
Translations - Add and Improve Portuguese (#10155) 2024-07-30 20:45:31 -05:00
lambdatiger
8c68f131fa Debug sphere conditional was missing in frago 2024-07-30 19:10:50 -05:00
lambdatiger
40921773f9 Removed unused stringtable items 2024-07-30 16:22:53 -05:00
lambdatiger
2e67d5d843 Updated function documentation 2024-07-30 16:08:59 -05:00
lambdatiger
25cc22bf77 removed extra newlines and double spaces 2024-07-30 13:36:56 -05:00
lambdatiger
22ca38fc2c legability formatting 2024-07-30 13:22:52 -05:00
lambdatiger
7b282ec96c add newline and fix blacklist 2024-07-30 13:22:16 -05:00
lambdatiger
61a1770384 missed comma, going to bed, sorry 2024-07-29 23:55:26 -05:00
lambdatiger
ed36b6a4c8 Alternative way to address shot parent self-harm issue 2024-07-29 23:46:21 -05:00
lambdatiger
5059cb283d accidentally committed script_component.hpp w/ debug enabled 2024-07-29 23:17:05 -05:00
lambdatiger
bee8eee8d8 Jank fix so that the unit firing can get hit with it's own fragments 2024-07-29 23:12:21 -05:00
lambdatiger
57454553a0 fixed target sphere visability 2024-07-29 22:49:40 -05:00
lambdatiger
cfdf29154f added target point debug spheres 2024-07-29 22:09:21 -05:00
lambdatiger
0ef399141c command capitalization 2024-07-29 22:09:10 -05:00
lambdatiger
8b29b86924
Merge branch 'acemod:master' into Event-hanlder-replacement 2024-07-29 21:06:55 -05:00
lambdatiger
3659aff634 added debug draw mode to DEBUG_ENABLED_FRAG define check 2024-07-29 21:05:57 -05:00
lambdatiger
72a6cfffcc removed unused variables, implemented fixes from full rewrite PR, and fixed math errors 2024-07-29 21:05:38 -05:00
lambdatiger
33a06535eb fragmenting projectile velocity isn't used anywhere 2024-07-29 21:04:55 -05:00
lambdatiger
5df635cd61 removed _fragCount reference in newly backported debug functions 2024-07-29 21:04:36 -05:00
lambdatiger
613784923d removed "class eventhandler" references 2024-07-29 21:04:11 -05:00
lambdatiger
3efaef09ec removed unused variables & EHs and set defaults in the case debug mode draw isn't used 2024-07-29 20:40:39 -05:00
johnb432
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
PabstMirror
7e93715bcc
Medical - Gracefully handle bad configs in testHitpoints (#10156) 2024-07-29 15:04:36 +02:00
PabstMirror
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
johnb432
56eae4060c
CSW - Improve function headers & comments (#10149)
Code formatting changes from 9234
2024-07-27 19:42:31 +02:00
PabstMirror
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
PabstMirror
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
johnb432
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
PabstMirror
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
johnb432
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
johnb432
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
johnb432
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
johnb432
bfbaae65e1
Arsenal - Fix mission and campaign insignia (#10143) 2024-07-24 20:17:22 -03:00
johnb432
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
johnb432
cb3c18c2fb
Medical AI - Header fixes (#10140)
Header fixes for medical AI
2024-07-23 15:28:40 +02:00
johnb432
43c1f97dfa
Laser - Remove unnecessary EGVAR (#10139)
Remove unnecessary EGVAR
2024-07-22 19:27:26 +02:00
johnb432
db339ab8e3
Cargo - Reenable UAV AI when on ground when paradropped (#10137)
Reenable UAV AI when on ground when paradropped
2024-07-22 19:15:43 +02:00
johnb432
b6e9cabc34
Cargo & Dragging - Disable UAV AI when being dragged, carried or cargo (#10100)
* Disable UAV AI when being dragged, carried or cargo

* Update addons/common/functions/fnc_disableAiUAV.sqf

* Improve dragging/carrying conditions, fixed duplicate JIP
2024-07-22 08:38:39 +02:00
PabstMirror
05c7f84b01
Medical Engine - Allow disabling seat locking on vehicle types (#10123) 2024-07-21 14:31:57 -05:00
johnb432
3f5a2ee64b
RHS Compats - Remove silent ace_hearing dependency from RHS compats (#10134)
Remove hearing silent hearing dependency from RHS compats
2024-07-20 21:19:18 +02:00
johnb432
f6c5425733
RHS Compats - Add common to loadorder (#10133)
Add common to RHS compat loadorder
2024-07-20 21:10:16 +02:00
johnb432
4cb358ebf2
Dogtags - Add missing private (#10132)
Update fnc_getDogtagItem.sqf
2024-07-20 10:26:01 +02:00
johnb432
a7ce63a536
Fire - Remove medical_engine dependency (#10122)
* Remove medical dependency from fire

* Update initSettings.inc.sqf
2024-07-20 08:37:04 +02:00
johnb432
5d133bd793
Dogtags - Code cleanup (#10097)
* Clean up dogtags

* Only allow taking of dogtags if unit has space

* Fixed upper case T

* Stop throwing error

* Reverted to case insensitive method of checking

* Remove unused files

* More cleanup & fixes

- Better check for taking dog tags until 2.18 comes
- Changed parent condition from `canTakeDogtag` to `canCheckDogtag`
- Register EH only where necessary

* Update CfgEventHandlers.hpp

* More header cleanup
2024-07-20 08:29:17 +02:00
johnb432
05ab1bbe99
Dragging - Fix dragging/carrying failing for items in ViV (#10128)
* Unload ViV before dragging/carrying

* Update addons/dragging/functions/fnc_carryObject.sqf

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

* Use lazy eval to check if item was unloaded

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-07-20 08:26:53 +02:00
johnb432
8ab36f64ff
Quickmount - Fix quickmount for vehicle interactions (#10126)
* Fix quickmount for vehicle interactions

* Update addons/quickmount/functions/fnc_getInNearest.sqf
2024-07-20 08:15:15 +02:00
johnb432
5cada7d397
General - Remove "SwitchWeapon" spam (#10113)
* Remove "switchWeapon" spam

* Update fnc_startDragLocal.sqf

* Don't add invalid fire modes

* Tweaks & fix
2024-07-20 08:13:42 +02:00
johnb432
68738316c2
Dragging - Remove weight calculation workaround (#10117)
* loadAbs has been fixed

* Update fnc_getWeight.sqf
2024-07-19 19:13:44 +02:00
johnb432
37d7c4c544
Interaction - Hide push interaction if target is in ViV cargo (#10127)
Hide push interaction for ViV cargo
2024-07-19 18:26:14 +02:00
lambdatiger
160bb15962 Merge remote-tracking branch 'upstream/master' into Event-hanlder-replacement 2024-07-19 10:51:23 -05:00
lambdatiger
e4d36c6819 fixed small errors 2024-07-19 10:47:49 -05:00
lambdatiger
2713acdd38 Optimized loop to find spall position using larger steps and fewer operations per loop 2024-07-19 00:12:14 -05:00
lambdatiger
f57f6f5a06 clarified parts of the spall event chain 2024-07-19 00:01:55 -05:00
lambdatiger
c344130f9b increased code legiblity and optimized some randomizations 2024-07-18 22:58:52 -05:00
lambdatiger
4f251767d7 updated some defne names and usages 2024-07-18 22:33:19 -05:00
lambdatiger
1480715111 fixed timing and other spall issues 2024-07-18 22:28:56 -05:00
lambdatiger
48e299663b fixed errors in frag with downgrade 2024-07-18 21:12:23 -05:00
lambdatiger
437f6c1eef mass must be in grams in this version I guess 2024-07-18 21:10:54 -05:00
lambdatiger
8da5e47dcf changed debug colors 2024-07-18 21:10:20 -05:00
lambdatiger
783c2aa8ce fixed debug def names 2024-07-18 19:36:49 -05:00
lambdatiger
39e7f7f438 unfucked a comma 2024-07-18 19:30:30 -05:00
lambdatiger
3595f827a1 removed more magic numbers 2024-07-18 19:28:11 -05:00
lambdatiger
3fcf6f7100 removed magic numbers and code with no effect 2024-07-18 19:19:43 -05:00
lambdatiger
9c8e9e30a2 removed commented out debug information from nouber 2024-07-18 19:18:52 -05:00
lambdatiger
682568fd87 updated defines to match implementation 2024-07-18 19:16:28 -05:00
lambdatiger
04c4bd4679 updated search pattern to one discussed in PR #9728 2024-07-18 19:07:47 -05:00
lambdatiger
fbca98328e All spalling in current version is local 2024-07-18 18:56:00 -05:00
lambdatiger
842b818aff updated config path to be relevant to post-EH version 2024-07-18 18:55:46 -05:00
lambdatiger
a20274a2c2 made addBlackList remove projectile EHs 2024-07-18 18:55:19 -05:00