Commit Graph

14938 Commits

Author SHA1 Message Date
PabstMirror
efe1ecd4cd
workflow/tools - trivial cleanup (#9274)
* workflow - trivial cleanup

* Add Validate headers to vscode tasks
2023-07-20 16:15:21 -05:00
Grim
aead9a8eb4
fix nvg stat detection (#9254) 2023-07-16 12:45:33 -05:00
Grim
b54a5463ee
RHS Compat - Improve macro usage (#9262)
* macro usage, swap barrel on PKP

* revert barrel swap
2023-07-16 12:27:09 -05:00
Dystopian
510d35497f
Sitting - Fix setting and keys in documentation (#9264)
* Sitting - Fix setting and keys in documentation

* Update docs/wiki/feature/sitting.md

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-16 01:29:47 +03:00
Dystopian
d64c09cbdd
Vehicles - Document Resume/Set speed control functionality (#9263)
* Vehicles - Document Resume/Set

* Update docs/wiki/feature/vehicles.md

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-16 01:29:03 +03:00
johnb432
8d107776c4
Overpressure - Fix invulnerable units taking backblast damage when firing launchers (#9256) 2023-07-14 22:33:54 +03:00
Grim
cdbf572462
Mk6 Mortar - Fix AI usage (#9258) 2023-07-13 19:54:39 +03:00
Grim
535662b883
Dragging - Add limping check to carrier and improve limping check for target unit (#9251)
* fix limping damage threshold

* add check for carrier not limping
2023-07-10 06:45:53 +03:00
Grim
8032ccacfc
Common - Add FUNC(hasZeusAccess) (#9252)
* add fnc_hasZeusAccess

* header

* Update addons/common/functions/fnc_hasZeusAccess.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-10 06:45:22 +03:00
Dystopian
1b8c56f0be
Interaction - Add actions to access and allow carrying inventory holders (#6029)
* Add interaction to inventory holders

* Add Take Weapon action

* Add Drag/Carry actions

* Fix menu position

* Add Inventory action also to unconscious

* Underwater: Fix menu position, disable gear action

* Add dead body weapons carrying with workaround

* Disable man gear action in water

* Optimize position code

* Fix macro using

* Use macro and power

* Restrict max dragged items count

* Remove superfluous condition, Add Take action to all holders

* Cleanup XEH

* Remove weapon carry-drop workaround

* code style changes

* code style changes

* brackets, isEqualTo, vehicle check

* code style changes

* brackets, isEqualTo, vehicle check

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-07-10 05:49:37 +03:00
johnb432
e181ba5aa1
Gunbag - Fix arsenal caching conflicting with CBA_fnc_setLoadout (#9250)
* Update XEH_preInit.sqf

* Update addons/gunbag/XEH_preInit.sqf

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-10 00:13:43 +03:00
johnb432
1aa7eb2a1a
Update fnc_codeToString.sqf (#9249) 2023-07-09 23:41:12 +03:00
Will
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
Will
05c9e4247b
Logistics Wirecutter - Add modded class support (#9235)
* Update script_component.hpp

Change check for wire cutters for all child classes in addition to current class

* Update script_component.hpp

fix bracket

* Change isKindOf for alt syntax

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

* Update addons/logistics_wirecutter/script_component.hpp

Better performing searching for wirecutter

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

* Update XEH_postInit.sqf

Index all possible wirecutters

* Update script_component.hpp

arrayIntersect with possible wirecutters

* Update XEH_postInit.sqf

Incorrect quotes

* Update CfgWeapons.hpp

Add iswirecutter to wirecutter

* Update XEH_postInit.sqf

Remove pointless parentheses

* Update addons/logistics_wirecutter/script_component.hpp

fix for incorrect arrayintersect check

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

* Update addons/logistics_wirecutter/XEH_postInit.sqf

Incorrect quoting

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

* use configClasses and cache at preStart

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-07-09 19:37:30 +03:00
Tim Beswick
29b5eb97a9
Medical - Handle wound hashmaps deserialized as CBA_namespaces (#9245) 2023-07-09 17:33:51 +03:00
Grim
45af0cdca0
Medical Treatment - Remove early exit when stitching with sutures (#9243) 2023-07-07 08:19:45 +03:00
Grim
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
Grim
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
Grim
04e41a4d5a
Repair - Make Full Repair Time dependent on vehicle damage (#8417)
* add variable full repair time

* enable compile cache

* Fix stupid

* whoops

* incremental full repair

* cleanup function header

* ignore hitpoints inFullRepairProgress

* fix getHitPointsToIgnore

* final cleanup

* don't show repair hint while doing full repair

* make this all work

* fix stupid

put this back in place

* Add setting for speedup when near repair facility/vehicle

enable compile cache

* refactor near repair facility/vehicle checks

* remove skipping hint from do_repair

better for feedback this way

* git diff stuff

* use functions directly in ACE_Repair.hpp

* add check for vehicle proximity

* add a new line

* switch to multiply by setting instead

* speed boost settings, remove exit addRepairActions

* stringtable

* remove speed boost settings

* fix things, add forceDisplayName

* name in function header

* fix TRACE

* add animation looping

* remove systemChat

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

* add time coefficient setting

* move to repair category

* time coefficient max and default values

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-07-06 06:52:04 +03:00
Grim
50430e47ef
Medical - Change Epinephrine Wake Up Boost setting description (#9240)
* change stringtable

* keep old translations
2023-07-06 06:51:25 +03:00
Grim
cc1636c14f
Repair - Change Repair Threshold setting descriptions (#9242)
* change stringtable

* change setting to % slider

* keep old translations
2023-07-06 06:51:00 +03:00
Grim
c7e13ca4c7
Repair - Move to separate settings menu (#9236)
* Repair - Move from logistics settings menu

* Repair - Move from logistics settings menu
2023-07-03 16:00:46 +03:00
Grim
ba4fcf615d
Medical GUI - Add setting to show Damage (#8444)
* use pain variable for severe pain and use threshold in damage color calculation

show % of damage threshold in medical menu

* use damage taken instead of damage left

* Add setting and switch to separate tooltip

* tooltip -> entry

* Change display names and tooltip

* switch to qualitative

* remove newlines

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
2023-07-01 01:37:08 +03:00
Dystopian
22b93e2d03
Vehicles - Add Resume/Set functionality to speed control (#8967)
* Add Resume/Set functionality to speed control

* Apply suggestions from code review

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

---------

Co-authored-by: BrettMayson <brett@mayson.io>
2023-06-28 17:17:14 +03:00
Dystopian
8b94d765aa
Dragging - Allow run when carrying light-weight objects (#8338)
* Allow run when carrying light-weight objects

* Use global var instead of macro

* Update addons/common/XEH_postInit.sqf

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
2023-06-28 14:43:10 +03:00
PabstMirror
f812daa095
Javelin - Fix weapon being in top-attack when loading AP magazine (#9161)
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-28 12:55:45 +02:00
JonBons
055503928c
Vehicle Damage - Fix incoming damage from blank hit selection resulting in absurd damage values (#9194) 2023-06-28 13:39:33 +03:00
BrettMayson
10c1085aba
Repair - Add wheel patching (#8835)
* patch wheels on vehicles

* all tire patching working

Co-authored-by: mp-singh <mandeep@mandeepsingh.ca>

* doc

* remove unused string

* Update CfgVehicles.hpp

* use strintable

* setting for where the wheel can be patched

* localize

* Update stringtable.xml

* can't patch a missing tire

* removal > replacement

* Update addons/repair/initSettings.sqf

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* patch icon

* use PATCH_WHEEL_STEP_TIME

* fix wheel translation

---------

Co-authored-by: mp-singh <mandeep@mandeepsingh.ca>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-06-28 13:39:08 +03:00
pterolatypus
f434549faf
Medical Treatment - Change stitching action to be per-body-part (#9005)
* Make stitching action per-body-part

* Apply suggestions from code review

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

---------

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-06-28 01:43:45 +03:00
PabstMirror
4f0577ce5f
Medical Engine - Ignore Reflector Hitpoints (#9131) 2023-06-27 19:41:10 +03:00
pterolatypus
4a3ad40c04
Adv Fatigue - Make stamina penalty for weapon raised/ready scale with weapon inertia (#8669)
* Stamina penalty for weapon raised/ready is scaled by weapon inertia

* Newline

* Tabs

my editor hates me

* Use format

* Improved item validation and caching
2023-06-27 19:40:07 +03:00
Grim
8319dafcba
add icons for SOG csw (#9230) 2023-06-27 10:47:33 +03:00
Grim
2571550bbc
Intel Items - Change scope for better Arsenal filtering (#9228)
* scope changes

* review change
2023-06-27 10:46:56 +03:00
Grim
d0f43abbb2
add dlc config entry (#9229) 2023-06-27 01:01:09 +03:00
Cyruz
aa21ba50a9
Cookoff - Improve destroying vehicle post cookoff (#9029)
* Have vehicle explode when cookoff completes

* Adjust strings

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-25 01:06:26 -03:00
Kyle Mckay
02365609b5
Medical - Change medical to use hashmaps for wound storage (#8926)
* Refactor medical to use hashmaps for wound storage

- We most frequently want to access wounds by body part, so this makes
  that a constant time lookup.
- The body part index is no longer stored in every wound since it's
  inherent in the wound storage.
- Using body part names as the keys of the hashmap to improve code
  clarity (no more magic numbers).

closes #6468

* Add deserilization migration from old wound arrays

Will migrate from old form array wound storage to the new hashmap
strucutre during deserlization. This is relevant for communities piping
medical state out to a database or similar between sessions.

* fix issue with suture stitching

* change version number in comment

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-06-24 08:11:56 +03:00
Crowdedlight
6181616cc3
Fire - Fix fire spread to invincible units and not being able to be put on fire by proximity if multiple units are on fire (#8632)
* fire do not propagate to close unit if allowDamage is disable don that unit

* change burnCounter so it works with multiple instances of fires

* fixed exiting burning not resetting burn counter

* changed !isEqualTo to isNotEqualTo

* changed !isEqualTo to isNotEqualTo

* lazy eval, respect old allowDamage variable

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-06-24 05:34:31 +03:00
Mathew Horner
78c1ce3ae9
Logistics Wirecutter - Check if fence model is in FENCE_P3DS even if config check fails. (#9201)
* Check if fence model is in FENCE_P3DS even if config check fails.

* Fix early return condition

* Simplify condition
2023-06-24 05:10:04 +03:00
Wakbub
117c3092f8
Common - Fix added throwables not being throwable (#9186)
Replace
- addMagazineCargoGlobal with addItemTo(Uniform/Vest/Backpack to make added throwables throwable.
2023-06-24 05:09:30 +03:00
Filip Maciejewski
beffc7660c
Fire - Loop "Pat down" action until patient is put out of fire (#9017)
* Adjust burn intensity defines and move to shared

* Loop "Pat down" action until patient is put out of fire

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-24 05:08:23 +03:00
BaerMitUmlaut
728f556ae4
Medical AI - Use suppressed EH to determine safety of AI (#8242)
* Use suppressed EH to determine safety of AI

* Require CBA 3.15.3

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: BrettMayson <brett@mayson.io>
2023-06-23 18:59:11 -03:00
Ampersand
e5654914cc
Dragging - Improve carrying by allowing carried object to be loaded into vehicle by key or mouse (#9138)
* load carried object

* check for medical loaded

* space

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

* consolidate mouse hint in pfh

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-06-23 15:11:16 +03:00
Laid3acK
b75d20634b
Ballistics - Add 12.7x108mm APDS AB values (#9191)
* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-22 16:01:09 +03:00
Laid3acK
4aacbb960f
Ballistics - Improve B_127x108_Ball values (#9192)
* 127x108_compat_ace3

* 127x108_compat_ace3

* 127x108_compat_ace3
2023-06-22 04:35:44 -03:00
Kam
1e6073c467
give tourniquet to patient or medic depending on setting (#9206) 2023-06-22 04:26:28 -03:00
Grim
34c5988333
Frag/Medical Damage - Treat shrapnel as grenade damage (#9218)
* treat shrapnel as grenades

* switch to frag
2023-06-22 04:06:52 -03:00
Laid3acK
626d886b3b
Hearing - Remove outdated 12.7x108mm audibleFire value (#9193)
* 127x108_hearing

* 127x108_hearing
2023-06-22 04:06:07 -03:00
Grim
793ef7bba5
Dragging - Use improved loadAbs for weight calculation (#8457)
* use improved loadAbs for weight calculation

* fix double counted backpack cargo

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
2023-06-22 04:04:19 -03:00
Zachary Dunn
864d2e9eee
Explosives - Add "ace_explosives_setup" CBA Event (#9197) 2023-06-20 13:36:57 -06:00
Grim
49f4ea23e7
Docs - Add Grim to maintainers (#9223)
* secret handshake?

* fix my name

* new github username
2023-06-19 16:31:17 +03:00