Commit Graph

12695 Commits

Author SHA1 Message Date
johnb432
066ea1424e Stop messing with type of healing items 2024-07-28 15:50:39 +02:00
johnb432
a22946c149 Merge branch 'master' into medical-enable-setting 2024-07-28 15:49:15 +02: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
5807705f08 Merge branch 'master' into medical-enable-setting 2024-07-24 17:37:16 +02: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
Dart
8f84df77d0
Sitting - Add config overwrite for random animation pool (#10120)
* Add config property animation overwrite

* Update addons/sitting/functions/fnc_getRandomAnimation.sqf

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

* Fix header

* Update addons/sitting/functions/fnc_getRandomAnimation.sqf

* Update function call

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-07-18 16:53:34 -05:00
johnb432
6d65fc42e8 Use variable to enable/disable aspects 2024-07-17 21:49:23 +02:00
johnb432
96501b0087 Merge branch 'master' into medical-enable-setting 2024-07-17 17:05:20 +02:00
johnb432
f4272f0e36
Spectator - Remove spectator lights when exiting spectator (#10114)
Remove spectator lights when exiting spectator
2024-07-17 10:42:37 +02:00
Dart
66c31928ab
General - Fix case in event handler commands (#10121) 2024-07-17 01:12:01 -05:00
johnb432
583c182df1 Update script_macros_medical.hpp 2024-07-15 19:30:30 +02:00
johnb432
df60c744c1 Use HandleHeal instead
Return value of HandleHeal is ignored, but AISFinishHeal works
2024-07-15 19:28:56 +02:00
V1nsyara
ec5b84c278
Translation - Small update Russian (#10115)
* Translation - Update Russian for new features

* Up to date translate RU

* Small update medical treatment

* resolve problem

* i`m cry

i hate this conflict
2024-07-14 21:46:14 -05:00
johnb432
b7d1bc5bb6 Minor tweaks 2024-07-14 11:10:53 +02:00
johnb432
77e55021d0 Merge branch 'master' into medical-enable-setting 2024-07-14 10:54:58 +02:00
Apricot
63d1ab82a7
Translations - Improve Japanese (#10112)
* Improve Japanese

* Tweaks

* bit tweak

* even more tweak

* Update stringtable.xml

* Update stringtable.xml
2024-07-13 19:22:06 -05:00
johnb432
f65138f65e
Casings - Fix settings (#10110) 2024-07-07 11:41:10 -03:00
johnb432
edc7e9af3e
Dogtags - Add context menu action to check dog tag (#10101)
* Broadcast dogtag info globally so that arsenal can use it

* Broadcast changes incrementally

* Add context menu option for dogtags
2024-07-04 00:39:08 -07:00
johnb432
3745305323
Dogtags - Fix arsenal not showing dogtag info in multiplayer (#10095)
* Broadcast dogtag info globally so that arsenal can use it

* Broadcast changes incrementally

* Update addons/dogtags/XEH_postInit.sqf

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

* Update addons/dogtags/functions/fnc_getDogtagItem.sqf

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

* Add EH only on necessary machines

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-07-04 00:32:37 -07:00
johnb432
4d0641abb8
Dogtags - Improve displaying dogtags from bodies with no name (#10096)
Improve displaying dogtags from bodies with no name
2024-07-03 09:50:08 -07:00
johnb432
dae2c5b465
Common - Clean up ace_common_fnc_hasItem & ace_common_fnc_hasMagazine functions (#10108)
* Clean up hasItem & hasMagazine functions

* Replace EFUNC

* Update fnc_hasItem.sqf
2024-07-03 08:39:04 -07:00
johnb432
7b0e5b6416
Common - Fix ace_common_fnc_uniqueItems (#10107)
Fix `ace_common_fnc_uniqueItems`
2024-07-03 08:30:41 -07:00
johnb432
b714c8bce2
Nametags - Only display talking waves when unit is alive and conscious (#10106)
Only display waves when unit is alive and conscious
2024-07-03 02:02:43 -07:00
johnb432
ee0e947611
General - Use ace_common_fnc_isAwake where possible (#10098)
* Use `ace_common_fnc_isAwake` where possible

* Revert bad change
2024-07-02 12:38:14 -07:00
johnb432
516eb48c93
Dogtags - Stop throwing error when trying to take dog tags (#10103)
Stop throwing error
2024-07-02 11:16:28 -07:00
Psycool
45f9301019
Korean translation updated (#10104)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml

* Korean Translation Added

Added Korean translation related to Cargo Refuel

* Merge branch 'master' of https://github.com/Psycool3695/ACE3

* Korean translation Add/Updated

* Fixed wrong strings

* Korean translation improved

* Korean translation updated

* Korean translation updated

* Fix Merge

* Update stringtable.xml

* Update stringtable.xml

* Korean translation updated

* Korean translation minor fix

* Korean translation fixed

* Korean translation updated

* Update stringtable.xml

* Spacing fixed

* Korean translation updated

* Spacing fixed

* Korean translation updated

* Korean translation updated

* Korean translation updated

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-07-02 13:14:19 -05:00
Fabio Schick
aecafe673b
Aircraft - Drone "Follow Unit" Waypoint Action (#9889)
* Fix "Recharge" interaction showing on destroyed drone

* Add "Follow Unit" action

* Improve condition check

* UGV Following via PFH that updates WP Pos

* Use HOLD WP for all Follow Actions

Since FOLLOW WP would stop working on AI Soldiers after some time.

* Allow selecting a follow distance

* Follow Distance under separate interaction, just like Loiter Alt

Only visible when a HOLD waypoint is selected, which is pretty much always going to have been created by the "Follow" interaction.

* Localize "Follow" Interaction

* Show structuredText Hint when following/changing distance

* Variable for cursorTarget Reuse

* Better isKindOf condition use

* Make "Ship"-kind vehicles followable

* Clean up Comments and systemChat Debugs

* Comment explanation for custom PFH solution over vanilla "Follow"-WP

* Trim excess brackets from setWaypointPosition argument

Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>

* Broader determination for UGV follow distances

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Prevent infinite PFH loop if follow target is deleted

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Delete Follow WP when PFH terminates

* The ternary rules

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

* Various requested changes

Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-07-02 02:16:48 -07:00