Commit Graph

12737 Commits

Author SHA1 Message Date
johnb432
deea978242 Use handleHeal to intercept healing attempts 2024-08-17 12:10:31 +02:00
johnb432
e5178fe6fd
Explosives - Use full magazine name in interaction menu (#10192)
* Force better names in explosives placing menu

* Revert "Force better names in explosives placing menu"

This reverts commit 29af35ae8b.

* Use `displayName` instead of `displayNameShort`
2024-08-17 00:30:32 -07:00
johnb432
0164b6259f
General - Add missing pretty names to components (#10211)
Add missing pretty names to components
2024-08-16 12:44:37 -07:00
johnb432
8dbad08838
Arsenal - Fix modParams printing messages in RPT (#10213)
Fix modParams printing messages in RPT
2024-08-16 10:17:57 -07:00
commy2
903f046810
Optics - Convert Optics to use CBA Optics (#7273)
* convert ace_optics to use cba_optics

* convert ace optics to cba optics

* Remove duplicate

* Add PIP config

* Use optics index

* Fix pboProject build

* Update CfgWeapons.hpp

* Correct SOS, adjust sizes and fix build issues

* Update addons/optics/script_component.hpp

* Corrected sizes again

* Made the scripted optics the first optics mode, fixed PIP SOS not being able to use irons

* Remove unused test object

* Readd AI stuff

visionMode is already set

* Updated some info on binos

forceOptics also already set

* Overhaul of magnifications

* Adjusted MOS & Nightforce

* Maybe this time the optics sizes will be fine... surely?

* Replace heavy optics blur with CBA one

* Added PIP names back

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-08-15 01:17:46 -07:00
johnb432
4014cd5539
Explosives - Remove replacement explosives (#10206)
Remove replacement explosives
2024-08-15 00:32:17 -07:00
Tim Beswick
f3e2e11693
Headless - Fix unable to transfer groups (#10203)
* Fix headless unable to transfer groups

* Switch events to use `CBA_fnc_ownerEvent`

* Update variable definitions

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-08-15 00:31:51 -07:00
PabstMirror
3728bc4b8b
Hearing - Fix explosions from AI fire (#10204) 2024-08-14 16:30:13 -05:00
johnb432
3229336018
Explosives - Trivial cleanup (#10205)
Explosives trivial cleanup
2024-08-14 10:53:40 -07:00
johnb432
740869e859
Realistic Names - Complete & cleanup (#10202)
Cleanup & complete realistic names
2024-08-13 09:30:42 -07:00
johnb432
a2be42ba57
Realistic Names - Add optics & vehicles compats (#10201)
Add optics & vehicles compats to realistic names
2024-08-13 04:28:24 -07:00
johnb432
62ba5ffe24
Explosives/Realistic Names - Improve CfgVehicles explosives naming (#10200)
* Improve explosives naming

* Move all ACE explosives into compat

* Update CfgMagazines.hpp
2024-08-13 04:12:52 -07:00
PabstMirror
b96d74fb11
Interact Menu - Fix self actions when handcuffed (#10188) 2024-08-13 02:19:18 -07:00
johnb432
a99c78cf87
Compats - Use EGVAR where possible (#10194)
Use `EGVAR` in compats where possible
2024-08-12 14:25:29 -07:00
johnb432
cf3a86ffc7
Medical Treatment - Notify restart requirement (#10197)
Add restart notification for convert items setting
2024-08-12 09:59:48 -07:00
johnb432
72f230a3a2
Hearing - Fix explosions not affecting hearing (#10002)
* Have explosions affect hearing

* Update fnc_explosion.sqf

* Update XEH_postInit.sqf

* Update addons/hearing/functions/fnc_explosion.sqf

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

* Update fnc_explosion.sqf

* Make EH local

* Use sound entry instead

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-08-12 06:45:03 -07:00
johnb432
f3938ba0cc
Explosives - Use triggerAmmo instead of setDamage (#10182)
* Use `triggerAmmo` instead of `setDamage`

* Update docs/wiki/framework/explosives-framework.md
2024-08-12 06:18:21 -07:00
johnb432
5e65e56c5e
Wiki - Fix dependencies list on wiki (#10109)
* Fix dependencies list on wiki

* laser-guided

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

* Update docs/wiki/feature/xm157.md

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

* Moved medical_menu to medical-gui

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2024-08-12 10:16:27 -03:00
johnb432
198c09dccd
CUP Compat - Improve explosives compat (#10193)
Updated CUP explosives compat
2024-08-12 06:15:35 -07:00
johnb432
ada7b93219
General - Use QUOTE(ADDON) for status effects (#10195)
Use ADDON for status effects
2024-08-12 06:15:09 -07:00
johnb432
43d42c85cd
Cookoff - Use triggerAmmo instead of setDamage (#10185) 2024-08-11 20:31:02 -03:00
PabstMirror
285f903b14
General - Optimize some loops with forEachReversed (#10191) 2024-08-11 20:30:08 -03:00
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