commy2
5c9d1ada84
Merge pull request #5191 from Arcanum417/medical-rewrite-kill-ai
...
[Medical Rewrite] Options to enable insta-death for AI
2018-01-02 15:09:47 +01:00
commy2
68228e9fef
merge
2018-01-02 15:06:53 +01:00
commy2
4db844e596
merge
2017-12-23 01:47:43 +01:00
commy2
eba99f4707
only use for medical, keep setCaptive for captives
2017-12-06 17:22:07 +01:00
commy2
7cfb2b865c
Fix enum errors ( #5834 )
...
* Fix enum errors
* Update fnc_paradropItem.sqf
* Update fnc_actionPlaceInBodyBag.sqf
* Update fnc_compat_spectatorBI.sqf
* Update ACE_ZeusActions.hpp
2017-12-01 10:34:27 -06:00
Dedmen Miller
bacb7d069b
Don't recompile XEH EH's before every call ( #5728 )
...
* Fix medical respawn/init
* Medical use CBA addClassEH
* Movement inventoryDisplayLoad
* Medical handleRespawn header typo
* Parachute handleRespawn
* Rearm and parachute handleRespawn
* concertina_wire handleInit
* Fix header
* use XEH function instead of config
* use XEH function instead of config
* remove unneeded init eh
2017-11-07 15:21:58 -06:00
PabstMirror
5c4dbdcbda
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/XEH_postInit.sqf
addons/medical/functions/fnc_adjustPainLevel.sqf
addons/medical/functions/fnc_copyDeadBody.sqf
addons/medical/functions/fnc_getTriageStatus.sqf
addons/medical/functions/fnc_handleBandageOpening.sqf
addons/medical/functions/fnc_handleCollisionDamage.sqf
addons/medical/functions/fnc_handleDamage_fractures.sqf
addons/medical/functions/fnc_handleDamage_woundsOld.sqf
addons/medical/functions/fnc_init.sqf
addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
addons/medical/functions/fnc_parseConfigForInjuries.sqf
addons/medical/functions/fnc_setDead.sqf
addons/medical/functions/fnc_setHitPointDamage.sqf
addons/medical/functions/fnc_setUnconscious.sqf
addons/medical/functions/fnc_showBloodEffect.sqf
addons/medical/functions/fnc_unconsciousPFH.sqf
addons/medical/stringtable.xml
addons/medical_ai/functions/fnc_healUnit.sqf
addons/medical_ai/functions/fnc_isInjured.sqf
addons/medical_menu/functions/fnc_handleUI_DisplayOptions.sqf
2017-10-24 16:13:12 -05:00
Joko
3a0fd5cae3
fix the delay timing when a unit switch to Captive ( #5338 )
2017-10-10 11:30:31 -05:00
AkiraforARMA
ed1e95106d
Priority ERROR units never die possibility ( #5526 )
...
* Priority ERROR units never die possibility
Cases when _lifesLeft goes below 0.
Low or limb damage, then recovered with PAK from unconcious & revivestate.
* Update fnc_setDead.sqf
2017-10-10 11:06:07 -05:00
Dedmen Miller
81e02a7336
Refactor private ARRAY to private keyword ( #5598 )
...
* Everything
* Fixed missing ;
* Fix missing ; and double private
* Fixed cannot isNull on number
* Turn _temparture back to isNil
* Fix error from merge
2017-10-10 09:39:59 -05:00
PabstMirror
32e73fa1b3
Fix addLoadPatientActions
2017-10-02 22:37:22 -05:00
PabstMirror
af48c6a86c
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/ACE_Medical_SelfActions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/XEH_PREP.hpp
addons/medical/functions/fnc_treatment.sqf
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
addons/medical_treatment/functions/fnc_actionLoadUnit.sqf
2017-10-02 22:29:30 -05:00
jonpas
711e1fc026
Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) ( #5521 )
...
* Fix Magazine Repack underwater - fix #5513
Also prevent common goKneeling function underwater
* Fix loading patients underwater - fix #5515
* Fix load object underwater
* Fix take nozzle on jerry can underwater
* Fix refuel underwater conditions further
* Use isTouchingGround, Make refuel semi-compatible
reports false if head is out of the water, we want true even if we are not diving
* Less interact exceptions duplication
* Use animationState to determine if unit is swimming, create common function and use it instead of isTouchingGround
* Fix condition
* Support dragging underwater
No carrying due to animation timing issues and other misc things
* Allow Medical Legs SelfActions underwater
* Fix fixPosition function underwater (use getPosATL instead of getPos)
* Fix fixPosition's slope adjustment for non-gravity objects, Do the same for objects without simulation as well
2017-10-01 13:38:11 -05:00
Ozan Eğitmen
45a66ccfa1
Medical & Captive Load Menu Overhaul ( #5519 )
...
* Add load in child actions to medical & captive
* Add actions with proper structure
* Move vehicles actions code to common function
* Simplify code in config, Fix docs
* Remove unused vars
* Fix header example
* Add _distance param to fnc_nearestVehiclesFreeSeat
* Change docs
* Fix spacing
2017-09-29 22:00:47 +02:00
PabstMirror
b0d68b1011
Add respawn/state logging
2017-09-27 12:06:03 -05:00
PabstMirror
4c28c4de22
Reset isLimping var
2017-09-26 17:43:54 -05:00
jonpas
4de7953316
Remove deprecated addToInjuredCollection function ( #5559 )
2017-09-26 11:23:20 -05:00
jonpas
e11e102a76
Underwater actions support ( #4984 )
...
* Enable majority of actions underwater
* Remove log
* Add logistics_wirecutter support (don't play kneel animations underwater - looks silly)
* Don't perform kneel animations when repairing or medicaling underwater
* Fix interaction menu rendering underwater (was moving based on player eye level due to height max used for large vehicles)
* Fix attach underwater (LIW does not work underwater, LIS does), Add attach scan drawing define
* Remove left-over systemChat
* Remove vehiclelock from Plane, Disallow linking belt underwater, Allow checking ammo when sitting via action (was already possible via keybind), Use param for LIS
2017-08-22 13:30:56 -05:00
Arcanum
f86420c0d7
Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite-kill-ai
2017-06-18 12:30:03 +02:00
Zakant
bdea0fcdba
[Medical Rewrite] Adding respawn compatibility ( #5020 )
...
* Added respawn transition
* Removed respawn transition from statemachine and added manual transition comment
* Changed transiton to manual. Added easy way to get current status as well
* Updated event reference
* Fixed manualTransition call
* Minor headers changes
2017-06-17 18:28:16 -05:00
Zakant
b5f6169341
Remove legacy code ( #4960 )
2017-06-17 14:01:59 -05:00
PabstMirror
bec55114fa
Add load,unload and radial actions ( #5270 )
...
- Add radial actions
- Revert back to using 'ACE_isUnconscious'
2017-06-15 14:35:33 -05:00
PabstMirror
356a8f640a
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_actionCheckBloodPressure.sqf
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
addons/medical/functions/fnc_actionCheckPulse.sqf
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
addons/medical/functions/fnc_actionDiagnose.sqf
addons/medical/functions/fnc_actionRemoveTourniquet.sqf
addons/medical/functions/fnc_addHeartRateAdjustment.sqf
addons/medical/functions/fnc_addToInjuredCollection.sqf
addons/medical/functions/fnc_addUnconsciousCondition.sqf
addons/medical/functions/fnc_addVitalLoop.sqf
addons/medical/functions/fnc_canTreat.sqf
addons/medical/functions/fnc_copyDeadBody.sqf
addons/medical/functions/fnc_createLitter.sqf
addons/medical/functions/fnc_determineIfFatal.sqf
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_getBloodPressure.sqf
addons/medical/functions/fnc_getBloodVolumeChange.sqf
addons/medical/functions/fnc_getCardiacOutput.sqf
addons/medical/functions/fnc_getHeartRateChange.sqf
addons/medical/functions/fnc_getTriageStatus.sqf
addons/medical/functions/fnc_getUnconsciousCondition.sqf
addons/medical/functions/fnc_handleBandageOpening.sqf
addons/medical/functions/fnc_handleCollisionDamage.sqf
addons/medical/functions/fnc_handleDamage.sqf
addons/medical/functions/fnc_handleDamage_advanced.sqf
addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf
addons/medical/functions/fnc_handleDamage_airway.sqf
addons/medical/functions/fnc_handleDamage_caching.sqf
addons/medical/functions/fnc_handleDamage_fractures.sqf
addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
addons/medical/functions/fnc_handleDamage_wounds.sqf
addons/medical/functions/fnc_handleDamage_woundsOld.sqf
addons/medical/functions/fnc_hasMedicalEnabled.sqf
addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf
addons/medical/functions/fnc_isInStableCondition.sqf
addons/medical/functions/fnc_isMedicalVehicle.sqf
addons/medical/functions/fnc_itemCheck.sqf
addons/medical/functions/fnc_medicationEffectLoop.sqf
addons/medical/functions/fnc_modifyMedicalAction.sqf
addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf
addons/medical/functions/fnc_moduleReviveSettings.sqf
addons/medical/functions/fnc_parseConfigForInjuries.sqf
addons/medical/functions/fnc_playInjuredSound.sqf
addons/medical/functions/fnc_reviveStateLoop.sqf
addons/medical/functions/fnc_selectionNameToNumber.sqf
addons/medical/functions/fnc_setDead.sqf
addons/medical/functions/fnc_setHitPointDamage.sqf
addons/medical/functions/fnc_setStructuralDamage.sqf
addons/medical/functions/fnc_setUnconscious.sqf
addons/medical/functions/fnc_showBloodEffect.sqf
addons/medical/functions/fnc_treatment.sqf
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
addons/medical/functions/fnc_treatmentBasic_epipen.sqf
addons/medical/functions/fnc_treatmentBasic_morphine.sqf
addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
addons/medical/functions/fnc_treatmentIV.sqf
addons/medical/functions/fnc_treatmentIVLocal.sqf
addons/medical/functions/fnc_treatmentTourniquet.sqf
addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
addons/medical/functions/fnc_unconsciousPFH.sqf
addons/medical/functions/fnc_useItem.sqf
addons/medical/functions/fnc_vitalLoop.sqf
addons/medical_blood/functions/fnc_hit.sqf
addons/medical_treatment/functions/fnc_hasItem.sqf
addons/medical_treatment/functions/fnc_useItems.sqf
2017-06-10 10:21:18 -05:00
SilentSpike
a53f68a347
Use getUnitTrait for medics, engineers and EOD ( #5246 )
2017-06-10 11:41:01 +01:00
Phyma
ffaa195fe5
Conform function headers to coding guidelines ( #5255 )
...
* Fixed headers to work with silentspike python script
* Fixed rest of the files
* Fixed ace-team
2017-06-08 15:31:51 +02:00
Ľuboš Lendáč
b91e892710
Merge branch 'medical-rewrite' into medical-rewrite-kill-ai
2017-06-05 22:54:03 +02:00
PabstMirror
f715edabc9
Fix debug
2017-06-05 12:30:54 -05:00
PabstMirror
f98b268419
Split setUnconscious func, add spontaneousWakeUpChance setting ( #5114 )
2017-06-05 11:42:46 -05:00
Cuel
5b9c70a738
Fix zeus RC units using player damage treshold ( #5219 )
...
* Fix zeus RC units using player damage treshold
Closes #5218
* add pabstmirrors suggestion
use gvar
2017-06-02 11:21:57 -05:00
PabstMirror
7bccf2f6be
Fix IVs not showing in patient display ( #5230 )
...
Fix #5192 for 3.10
2017-06-01 10:28:47 -05:00
Arcanum
9895881ad9
Add options to disable AI going unconscious and for AI to die instantly
2017-05-22 22:16:18 +02:00
Arcanum
e3f9e65fb7
Revert "Add function to check if AI and condition from fatal"
...
This reverts commit 31e1e2964b
2017-05-22 21:11:25 +02:00
Arcanum
31e1e2964b
Add function to check if AI and condition from fatal
2017-05-22 20:53:00 +02:00
PabstMirror
9e1a9b9af9
Fix bad var names
2017-05-14 15:14:22 -05:00
PabstMirror
0cdb2ce238
Increase max weapon index for large modsets ( #5054 )
2017-05-12 13:12:39 -05:00
PabstMirror
fdb14cea20
Fix IvBags in displayPatientInformation
2017-04-29 13:05:39 -05:00
PabstMirror
e667931626
More debug monitor stuff
2017-04-29 12:58:35 -05:00
PabstMirror
c6fc4d0a13
Clenaup / Debug
2017-04-26 10:16:09 -05:00
PabstMirror
9139a52a38
Add more debug
2017-04-22 13:45:56 -05:00
PabstMirror
6464883852
misc cleanup, 1 sec min delay for vital loop
2017-04-22 10:57:32 -05:00
PabstMirror
690e415ffe
Minor cleanup
2017-03-25 11:36:37 -05:00
PabstMirror
80d7ef5b67
blood effects moved to UI
2017-03-25 11:27:18 -05:00
Zakant
f1fbf6a8eb
Removed legacy code
2017-03-23 15:29:52 +01:00
Zakant
5c89232306
Removed cardiac arrest check
2017-03-23 12:59:40 +01:00
PabstMirror
e3af1b55a5
Merge branch 'medical-rewrite' into medical-rewrite-effects
2017-03-18 09:56:42 -05:00
PabstMirror
d403f20d71
Adjust addDamageToUnit for rewrite
2017-03-06 15:06:01 -06:00
Dedmen Miller
512592b79d
Prevent starting additional vital loops on full heal ( #4885 )
2017-03-02 17:22:16 -06:00
PabstMirror
97ec22bd9a
Switch heartbeat to waitAndExec, allow switching pain settings
2017-02-18 22:11:40 -06:00
commy2
9d68fbf987
fix script error caused by new arguments passed to handleDamage ( #4866 )
...
* fix script error caused by new arguments passed to handleDamage
* Copy array to not break other handleDamage ehs
* Resize to 7
2017-02-02 13:03:13 -06:00
ViperMaul
59c58b1269
Add settings function handler
2017-01-19 17:19:54 -06:00
