Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,154 Commits 73 Branches 88 Tags 752 MiB
a3aef6a066
Commit Graph

220 Commits

Author SHA1 Message Date
PabstMirror
a3aef6a066
General - Cleanup spaces in macros (#9769) 
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-02-05 14:04:24 -03:00
BrettMayson
1e404cf85b
General - SQF Improvements (#9698) 
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-04 14:50:24 -03:00
Grim
7bc3fab533
Medical - Fix getting no pulse on a dead patient receiving CPR (#9756) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-01-22 19:44:42 -03:00
Grim
6741822480
Interaction - Allow unloading patients, bodies, and captives from inside vehicles (#9645) 
* add unloading from inside vehicles

* Update addons/common/functions/fnc_findUnloadPosition.sqf

* Update fnc_findUnloadPosition.sqf
 2023-11-22 19:38:52 -03:00
johnb432
ac9044f2d6
Zeus - Add medical menu module (#9367) 
* open medical menu from Zeus

* fix function header

* Zeus can use every action, add room for more buttons in medical menu

* Update addons/medical_treatment/functions/fnc_treatment.sqf

* Added zeus treatment time coeff

* Update addons/medical_gui/functions/fnc_canOpenMenu.sqf

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

* Update fnc_canOpenMenu.sqf

* Update initSettings.sqf

* Update fnc_moduleMedicalMenu.sqf

* Added check + documentation

* Update fnc_canTreat.sqf

---------

Authored-by: Brett <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-11-20 13:52:29 -08:00
Grim
b8a9376a65
Medical Treatment - Use Laws of War bodybag model and add colored bodybags (#9371) 
* add colored bodybags

* fix dogtags, add icons, revert item model to original

* Retexture ace's item model

* Keep original vehicle classname

* Update fnc_placeInBodyBagOrGrave.sqf

* fix displayName

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-24 15:16:52 -04:00
Grim
642ca3c14d
Medical - Make dug graves respect terrain slope (#9545) 
* slope dug graves

* remove parentheses
 2023-10-20 02:40:48 +00:00
Grim
f088d9bfa1
General - uiNamespace cleanup (#9425) 
* fix clear trauma on stitch

* add compileFinal and move to hashmap

* add missin param

* fix captives

* explosives/medtreat

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-04 14:09:05 -04:00
PabstMirror
3c9d7733e8
Medical Treatment - Fix grave digging (#9455) 2023-10-02 11:05:56 -04:00
Drofseh
8bf0772558
Medical Treatement - Add Grave Digging To Body Bags (#9442) 
* add grave digging to body bags

* move buryBodyBag action to config, change grave ui icon to headstone

* improvements from code review

* switch direction check to man instead of bodybag, nominally allowing anything to be buried

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-10-01 14:55:13 -04:00
BrettMayson
66deb59037
Medical Treatment - Add event and setting for grave creation (#9441) 
graves: event and setting for markers

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-10-01 14:31:38 -04:00
Drofseh
b9580a0349
Medical Treatment - Change isAwake check for grave digging to only apply to CAManBase (#9451) 
* Move awake check for bodybag grave

* Apply suggestions from code review

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-01 13:42:07 -04:00
Marstruc
a8bd08136e
Medical Treatment - Add new Grave model (#9444) 
* Added Grave model, swapped Grave classnames

* Change p3d name of Grave model

* Update addons/medical_treatment/CfgVehicles.hpp

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

* Updated grave model, textures, classname.

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-01 08:48:31 -04:00
Drofseh
dbf288851e
Medical Treatement - Don't allow conscious patients to be buried (#9448) 
Don't allow conscious patients to be buried
 2023-09-30 11:32:06 -04:00
Drofseh
94f3b301e0
Medical Treatment - Add Grave Digging for Corpse Disposal (#9276) 
* Add grave digging

* Update fnc_placeInBodyBagOrGrave.sqf

* Update fnc_placeInBodyBagOrGrave.sqf

* Update fnc_placeInBodyBagOrGrave.sqf

* Update addons/medical_treatment/functions/fnc_placeInBodyBag.sqf

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

* Add setting to enable/disable

* improvements

- fix flipped bool in fnc_canDigGrave
- improve fnc_placeInBodyBagOrGrave.sqf by splitting out some checks and item assignment into separate bodybag and grave functions

* fix typo in variable

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* add to XEH_PREP and fix event for non-local patient

* Add interaction to check name on headstone

* Update addons/medical_treatment/XEH_postInit.sqf

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

* Simplify Setting

* Apply suggestions from code review

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

* Update addons/medical_treatment/stringtable.xml

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

* Make placeInBodyBagOrGrave more generic and use any grave class

* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf

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

* Update medical-treatment-framework.md

* Update docs/wiki/framework/medical-treatment-framework.md

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

* update docs

* Update addons/medical_treatment/functions/fnc_placeInBodyBagOrGrave.sqf

* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf

* fix includes

---------

Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-09-24 15:57:08 -04:00
Grim
ec96cdf12c
Medical Treatment - Fix clearing trauma after stitch with multiple wounds (#9420) 
fix clear trauma on stitch
 2023-09-23 12:59:10 -04:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-12 20:58:10 +02:00
Grim
de8940af9b
Medical Treatment - Add setting to rollover bandage effectiveness (#8426) 
* use leftover bandage effectiveness on other wounds in same limb

variable naming

* Comments

Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>

* variable naming, fix part index check in findMostEffectiveWound

trace 4

* fix function header

* Account for multiple wounds in time calculation

* fix trace, remove systemChat

* update for hashmaps

* compile cache

* Update addons/medical_treatment/functions/fnc_findMostEffectiveWounds.sqf

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

* add bandage effectiveness setting

* stupid

* remove limit on bandageRemaining

* Update addons/medical_treatment/functions/fnc_bandageLocal.sqf

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

* Update fnc_getBandageTime.sqf

* Update fnc_bandageLocal.sqf

* fix header / debug

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-10 02:06:15 -04:00
Grim
aa107ed517
Medical - Add treating with items from vehicle inventory (#9286) 
* allow pulling items from vehicle inventory

* use vehicle items first
 2023-09-05 11:20:56 -03:00
johnb432
6bc1ae453b
Update fnc_loadUnit.sqf (#9300) 2023-08-01 11:35:55 -05:00
Grim
39e4f9340b
Common/Medical - Change vehicle checks to objectParent (#9281) 
* switch to objectParent

* use objectParent in unloadUnit

* fix derp

* allow unload patient on dead units
 2023-07-22 09:11:58 +03:00
Grim
31e1ad0cff
Arsenal - Add Tools category and moveOnOverwrite parameter to FUNC(addCustomRightPanelButton) (#9247) 
* add tools tab and setting

* move to preinit

* fix icon, add restart warning

* derp

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

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

* remove setting

* add keepIfOverriden parameter

* docs again

* documentation whitespace

* docs grammar, change parameter name

* fix docs

* more docs fixes

* magazine support

* deprecate spare barrel item

* more docs, improve condition

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-21 22:39:48 +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
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
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
Kam
1e6073c467
give tourniquet to patient or medic depending on setting (#9206) 2023-06-22 04:26:28 -03:00
KJW
fd3c9c967d
Medical Treatment - Improve Medical Actions underwater (#9096) 2023-05-15 23:47:00 -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
Brett
90d63475d5
Medical Treatment - Add preferred seats for loading patients (#8789) 
* Medical Treatment - Add preferred seats for loading patients

* load patients in reverse order

* add option for reverse fill

* Update addons/medical_treatment/functions/fnc_loadUnit.sqf

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

* Update docs/wiki/framework/medical-treatment-framework.md

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-02-17 11:14:39 -06:00
GhostIsSpooky
a9296f66d5
Medical - Update setDead to use setHitpointDamage instigator param (#8397) 
* Redoing this

* Revert "Redoing this"

This reverts commit 80ff709676.

* Do this properly

* Update fnc_handleKilled.sqf

* use setDead function directly

* Handle scripted camera

* redo #8387

I'm dumb.

* try this

* if construct outside of ctrlSetEventHandler

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

* tweak disableUserInput / handleKilled

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-11-15 09:31:56 -06:00
Crowdedlight
5bf4167d3e
Medical - Add check to FullHealLocal in case unit is burning then extinguish before healing (#8622) 
* added check if burning in fullheal and then extinguish

* Add check if fire module is loaded as PabstMirror showed

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-11-04 16:36:53 -05:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
GhostIsSpooky
374a5b632f
Medical - Refactor Clear Trauma Setting (#8345) 
* Refactor Clear Trauma

Add in setting for clearing trauma after stitching a wound, make clearing trauma after bandage clear trauma of individual wounds as they're bandaged instead of all at once when fully bandaged.

* Make git diff slightly prettier.

* Update fnc_bandageLocal.sqf

* Style pass

* once more for the diff

* fix stupid

* Ddd trauma/visuals on bandage reopening
 2021-10-12 10:08:10 +02:00
GhostIsSpooky
e92ea53385
Medical - Return tourniquets after PAK (#8419) 2021-10-11 00:34:28 +02:00
PabstMirror
cdd7b6d81b
Medical Treatment - Allow diagnosing death/CA (invalidates old setting) (#8162) 
* Medical Treatment - Allow diagnosing death/CA

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-09-03 14:50:54 -05:00
∂ω∂
f7126383fe
Medical - Add treatment status events (#8385) 
* Medical: Add item params to ace_treatmentSucceded

* Medical: Add treatment[Started,Failed] events
 2021-09-03 14:37:48 -05:00
pterolatypus
c81f371f5d
Medical Treatment - Allow variable CPR chance based on blood volume (invalidates old setting) (#7983) 2021-07-23 15:59:32 +02:00
Brett
d5bc7f10f5
fix my name, add it to contributers (#8295) 2021-06-27 07:01:12 +02:00
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929) 
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:05:05 -06:00
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup (#8100) 
* configOf

* replace some use of CBA_fnc_getObjectConfig
 2021-02-18 12:58:08 -06:00
PabstMirror
5ffcac9c88
Misc - Fix minor macro usage (#8091) 2021-02-03 17:56:18 -06:00
Dystopian
9dc82ee187
Fix fnc_common_addToInventory using (#8013) 2020-11-25 13:22:25 -06:00
mharis001
171fbf1e9e
Medical Treatment - Settings cleanup (#7973) 2020-10-30 23:40:10 -05:00
diwako
2b0db19807
Medical - Adjustable times for many treatment actions (#7951) 
* adjustable times for most constant treatment times

* add new line, formatting

* cleanup merge

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-10-29 11:37:44 -05:00
Brett
9e3409fc6e
Medical - Allow placing unconscious in a body bag (#7941) 
* medical: allow placing unconscious in a bodybag

* Always show body bag action on non-awake units

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-10-29 11:37:36 -05:00
Daniel Gibson
185c15de0e
Medical - Add Global Wound Reopen Chance Modifer (#7747) 
* Added Bandage Reopening Chance Modifier

* Added Wound Reopen Chance Addon Setting

* Fixed dumb error in localization setup

* Credit!

* Resolved issue with Addon Settings definition & removed testing values.

* PR Feedback #1

- Removed unnecessary whitespace on LN 46
- Call global var directly at LN 87
- Updated Wound Reopen Chance localized name & description

* PR Feedback #2

- Increased reopen coefficient upper limit from 2 to 5.

* Changed author credit to reflect GitHub email.
 2020-06-13 15:52:30 -05:00
PabstMirror
a9a69ac4ff
Headers - Fix function names in examples (#7663) 2020-04-25 08:41:45 +02:00
jonpas
c42a004ab3
General - Fix preprocessor issues (#7563) 
* Fix preprocessor issues

* Fix more preprocessor issues
 2020-02-29 16:09:31 -06:00
commy2
754a9e09af values, simplify 2020-02-23 14:25:11 +01:00