Salluci
ef93a61e13
fix derp
2023-07-14 00:37:27 +03:00
Salluci
87586459bc
fix stupid, add turretPath bool
2023-07-14 00:12:18 +03:00
Salluci
4e8c69e08a
make public
2023-07-13 20:01:33 +03:00
Salluci
7647123683
add forcedMag and ai_unloadMagazines
2023-07-13 19:53:57 +03:00
Salluci
cafe1f40e8
compile cache
2023-07-13 19:53:10 +03:00
Salluci
73bc331701
function header
2023-07-13 19:52:56 +03:00
Salluci
078857b5a9
add getAvailableAmmo
2023-07-13 14:51:26 +03:00
Salluci
17156d5480
missing semicolon
2023-07-13 13:56:40 +03:00
Salluci
e5a9fadcec
add check for invalid proxyWeapon
2023-07-13 13:53:50 +03:00
Salluci
4b92ef2ade
remove systemChat
2023-07-13 13:48:11 +03:00
Salluci
aa8fff3041
fix case sensitivy, move container creation
2023-07-13 13:45:52 +03:00
Salluci
ed44c0d445
more headers
2023-07-13 13:20:21 +03:00
Salluci
6c2a8a2117
add container property
2023-07-13 13:16:15 +03:00
Salluci
c46dc339c5
_staticWeapon > _vehicle, StaticWeapon > CSW
2023-07-13 13:01:28 +03:00
Salluci
c96a9daf7b
remove unnecessary change
2023-07-13 10:50:06 +03:00
Salluci
d00c9ca2a0
all the things
2023-07-13 10:42:30 +03:00
Salluci
3b42998f7b
Merge remote-tracking branch 'upstream' into csw-fix-belt-linking
2023-07-12 23:42:16 +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
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
Salluci
5d62ab4125
fix undefined variable
2023-07-02 19:48:01 +03:00
Salluci
76a20760f5
cache nearby ammo sources
2023-07-01 20:33:42 +03:00
Salluci
f3c393f50c
fix TRACE
2023-07-01 18:52:29 +03:00
Salluci
aca90fb187
this took way too long
2023-07-01 18:39:42 +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
Salluci
01dffca9c1
progress bar text changes
2023-06-30 04:06:50 +03:00
Salluci
78800be9ab
fix unloading to units with full inventory
2023-06-30 03:57:20 +03:00
Salluci
39f200b941
fix belt linking issues
2023-06-30 03:43:09 +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
2571550bbc
Intel Items - Change scope for better Arsenal filtering ( #9228 )
...
* scope changes
* review change
2023-06-27 10:46:56 +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
