Commit Graph

11993 Commits

Author SHA1 Message Date
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
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
Mike-MF
888ac6c9bc
Arsenal - Fix null comparison (#9213) 2023-06-10 18:59:13 +02:00
Abogado
3d3aa8d877
Update Spanish translation (#9203)
An update of the spanish to the text strings that have been added lately.
2023-05-29 18:22:37 -05:00
KJW
fd3c9c967d
Medical Treatment - Improve Medical Actions underwater (#9096) 2023-05-15 23:47:00 -06:00
PabstMirror
2e54ee7bee
Explosives - Add getVar to disable setShotParents (#9190)
* Explosives - Add getVar to disable setShotParents

* Update docs/wiki/framework/explosives-framework.md
2023-05-03 11:55:02 -05:00
PabstMirror
fedefd5799
SOG Compat - Fix compatibility with grad trenches (__has_include) (#9189) 2023-05-01 19:40:16 +02:00
Ellis Nielsen
cd41594a60
Towing - Add CBA event for towing start and cancel (#9178)
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-05-01 19:39:22 +02:00
jonpas
d279a8e607 Documentation - Cleanup function documentation output 2023-05-01 17:38:27 +02:00
jonpas
48a4e9682c Forbit use of (optional) in function headers, always require a value 2023-05-01 17:33:07 +02:00
Cre8or
19e72d7b71
Explosives - Fix incorrect shotParents (#9171)
* Update fnc_setupExplosive.sqf

- Added `setShotParents` to the resulting explosive, enabling support for kill tracking

* Add setShotParents to fnc_placeExplosive

* Remove setShotParents from fnc_setupExplosive

* Move setShotParents into place event

* fix tabs

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-04-30 17:06:44 -05:00
PabstMirror
52842b6f14
Scopes - Add tool to diagnose scope height (#9152)
* Scopes - Add tool to diagnose scope height

* fix ico_01, tws_mg scopes
2023-04-30 16:57:34 -05:00
PabstMirror
79925b2f76
Interaction - Fix opening locked doors for GM buildings (#9154)
* Interaction - Fix opening locked doors for GM buildings

Fix #9143

* Update addons/interaction/functions/fnc_openDoor.sqf
2023-04-30 16:56:39 -05:00
PabstMirror
19e88aa8e7
Common - Fix script error in fnc_getVehicleCargo (#9156)
* Update fnc_getVehicleCargo.sqf

Close #9155

* change var name

Co-Authored-By: commy2 <6576312+commy2@users.noreply.github.com>

---------

Co-authored-by: commy2 <6576312+commy2@users.noreply.github.com>
2023-04-30 16:56:26 -05:00
PabstMirror
fbe23ee45f
Optionals - Load dynamically based on presence of mod (__has_include) (#9116)
* Optionals - Load dynamically

* Update XEH_preStart.sqf

* Update pboproject.yml

* Update script_macros.hpp

* use addon.toml for hemtt

* Update pboproject.yml

* update all actions

ref
Node.js 12 actions are deprecated. Please update the following actions to use Node.js 16: actions/checkout@v2, actions/upload-artifact@v2.

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Apply suggestions from code review

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update settings.json

* cleanup interm hemtt changes

* Update .github/workflows/arma.yml

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>

---------

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-04-30 16:53:43 -05:00
jonpas
76e1aafb33
Use function documentation script (#6897)
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
2023-04-30 23:03:35 +02:00
PabstMirror
9e42c53196
xm157 - Fix latitude calc for maps not in getMapData (#9188) 2023-04-27 20:18:12 -05:00
PabstMirror
b78f8684b7
Common - switch getTurretConfigPath to use cba func (#9180) 2023-04-14 17:42:57 -05:00
Enrico Machado
1bf3d5086c
Fixed wrong portuguese translation of "head" (#9183)
"Caebça" is wrong, the correct would be "Cabeça"
2023-04-14 17:41:32 -05:00
BaerMitUmlaut
4aa8d59701
Use polyline marker for straight lines (#9174) 2023-04-03 12:18:47 -05:00
PabstMirror
f1fc0df6ef
Respawn - fix script error (#9166) 2023-03-20 13:18:57 -05:00
PabstMirror
bcbd762748
Fortify - Categories (#9167)
* Fortify - Categories

* Update fnc_registerObjects.sqf

* Apply suggestions from code review

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

* Apply suggestions from code review

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

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

* Update addons/fortify/ACEX_Fortify_Presets.hpp

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

* just use flat objects array

* Update fnc_getPlaceableSet.sqf

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-03-18 19:23:20 -05:00
Whigital
50100b8178
Viewdistance - Fix viewdistance from videosettings (#9140) 2023-03-18 14:28:27 -05:00
Cyruz
2092d4fd71
Cookoff - Remove flares from cookoff (#9146)
* Framework for removing flares

* Seperate fnc and strings etc

* Improvements from @mharis001

* Fix incorrect header fnc

* Clean-up return

* Remove setting
2023-03-18 14:24:27 -05:00
Filip Maciejewski
4997a4c102
Explosives - Fix mine defuse exclusion not workin before postInit is executed (#9170) 2023-03-16 08:52:29 +00:00
PabstMirror
169dbdfee0
Field Rations - Add water supply to well from Contact DLC (#9168)
* Field Rations - Add water supply to well from contact dlc

* Update addons/field_rations/CfgVehicles.hpp

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

---------

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2023-03-15 23:43:53 -05:00
Psycool
d87e16e87e
Korean Translation Improved (#9164)
* 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
2023-03-10 19:17:36 -06:00
BrettMayson
e252ef67d6
Medical Treatment - Suture (#9020)
Co-authored-by: Walthzer <19926813+Walthzer@users.noreply.github.com>
2023-03-06 14:17:01 -06:00
Zman6258
56348e70fa
Added missing vanilla casing types (#9162)
Super minor change, but I noticed not every vanilla casing had a corresponding ace3 casing defined. Most noticeable with 7.62x39, where they swap from steel to brass casings on landing.
2023-03-01 12:42:46 -06:00
Psycool
434820d8dd
Added Korean Translation (#9160)
* 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
2023-02-27 14:42:10 -06:00
BaerMitUmlaut
60cc8fbe88
Fix respawn when letting AI take over playable units (#9145) 2023-02-23 23:28:06 -06:00
PabstMirror
4de8487db0
Update fnc_makeJerryCan.sqf (#9153) 2023-02-17 22:19:31 -06:00
TACHarsis
1693e6834d
Added ace_rearm_sourceInitialized event (#9134) 2023-02-17 20:59:23 -06:00
TACHarsis
28e8e7d4ca
Refuel - Add events for fuel source and jerry can creation (#9133)
* Refuel - Added events

* Added ´ace_refuel_fuelSourceInitialized´ and `ace_refuel_jerryCanInitalized´ events
* Updated documentation

* Cleaner implementation && more coherent with analog rearm event

* Rebase merging is weird
2023-02-17 20:49:57 -06:00
Samuel Deutsch
edf4a70ed6
Refuel - Added ability to refuel fuel sources (#8981)
* Simplify main fuel loop

* Remove unecessary action macro

* Add container refueling

* Fuel counter behaviour is now consistent for both limited and unlimited fuel sources

* Update maxFuel and refuelContainer whenever fueling begins

* Update maxFuel and refuelContainer whenever fueling begins

* Prevent loading of fuel sources into cargo when they have a nozzle connected to them

* Added action to check how much fuel is left in a jerry can

* Prevent jerry cans from being picked up if they have a nozzle connected to them

* Added function to check if a nozzle can be connected to an object

* Prevent fuel sources which have their nozzle deployed from being loaded

* Compute both tank volumes inside of refuel instead of durring turn on

* Didn't mean to delete these

* Allow for user defined fuel capacities

* Handle more edge cases with infinite fuel sources

* Refuel - Prevent fuel sources from being dragged while they're refueling other things

* Refuel - Added flow rate multiplier for refueling fuel sources

* Refuel - Use FUNC instead of DFUNC for nozzle actions

* Refuel - getCapacity should return REFUEL_DISABLED_FUEL instead of 0 when argument is not a fuel source

* Refuel - Correctly reset fuel counter when fueling a new target

* Refuel - Implemented all suggested changes

* Refuel - Added newlines to end of files

* Refuel - Added missing newline at end of XEH_PREP

* Only setFuel once per jerry can creation

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

* Calling getFuel will initialize the fuel source

* Refuel - Add newline to end of file

---------

Co-authored-by: BaerMitUmlaut <baermitumlaut@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-16 20:06:11 -06:00