Ľuboš Lendáč
b292cbf8c6
Merge branch 'medical-rewrite' into medical-rewrite-kill-ai
2017-09-25 23:36:49 +02:00
sbng-PAPA
37dcb562a7
korean translation for 3.10
2017-09-26 00:54:27 +09:00
PabstMirror
ddf72d5878
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/ACE_Medical_SelfActions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/CfgWeapons.hpp
addons/medical/data/model.cfg
addons/medical/functions/fnc_treatment.sqf
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
addons/medical/stringtable.xml
2017-09-23 11:25:58 -05:00
Andrea Verano
e47212ea9c
Italian translation update ( #5531 )
...
Added:
-Advanced Fatigue
-Interactions
-Medical
-Refuel
-Spectator
-Fully translated markers and maverick
Fixed:
-Next Unit
-Previous Unit
2017-09-19 16:22:11 +02:00
KoffeinFlummi
fa02d0d993
Merge tag 'v3.10.2' into armake
2017-09-19 02:13:24 +02:00
PabstMirror
30a8d2db7b
Use CBA Misc Items ( #5502 )
...
* Use CBA Misc Items
* Set required CBA to 3.4.1
2017-09-12 23:23:45 -05:00
Broström.A | Evul
e0f3b393d7
Added missing semicolon ( #5487 )
2017-09-10 14:44:26 +02:00
classic
98c140bb64
Jpn translate 2f93c40 ( #5476 )
...
* update the Jpn translation
Add translation for new words and small changes.
* Update Jpn translation
add translation for new words and some tweaks.
* Update Jpn translation
fix miss translation and minor tweak.
2017-09-07 00:06:00 -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
BaerMitUmlaut
b7e42cb7a4
New medical box ( #5278 )
...
* Replaced medical box
* Added ElTyranos as author
* RVMAT code style
* Added ground contact points, fixed broken face
2017-08-22 12:55:14 -05:00
Joko
d9ea680afa
Fix adenosine self injection displaying incorrect action ( #5430 )
2017-08-14 19:47:58 +01:00
PabstMirror
d81e943590
Delete medical litter on building explosion
2017-08-09 12:13:29 -05:00
classic
8b7a862611
Update the Jpn translate fd48c7f ( #5381 )
...
* Update the Jpn translation
Support to new entry
* Update the Jpn translation
for more Natural words.
* Update the Jpn translation
Unification of words.
* Update the Jpn translation
tweaks to words.
* Update the Jpn translation
Fix to wrong translation.
* Update the Jpn translation
added translation to Proper noun
* Update to Jpn translation
Fix to wrong translation.
2017-07-23 14:27:50 +02:00
Dissyu
a7954368f4
Fix Chinese content & missing string ( #5375 )
...
* Fix missing string with stringtable
Fix Advanced Fatigue & QuickMount
* Fix Chinese content & missing string
* Fix Gestures & DAGR missing string
* Fix quickmount string with vanilla string
* Remove adr97 unnecessary string
2017-07-19 20:57:20 +02:00
jonpas
fa3743ca54
Correct new Chinese stringtable identifiers ( #5334 )
2017-07-10 16:47:26 +02:00
classic
dc303aa29f
Japanese translation d02dacf ( #5309 )
...
* add the Jpn translation for repair
add the Japanese translation for repair
* minor fix to Jpn translation for medical
minor fix to Jpn translation for medical
2017-07-10 16:46:25 +02:00
GodofMonkeys
0ccbeb25e9
Add Chinese Traditional & Simplified Localization ( #5295 )
...
Add Chinese Traditional & Simplified Localization
2017-07-10 16:45:22 +02:00
jonpas
5cf7569711
Correct new Chinese stringtable identifiers ( #5334 )
2017-07-08 09:48:39 -05:00
classic
98ccd879f3
Japanese translation d02dacf ( #5309 )
...
* add the Jpn translation for repair
add the Japanese translation for repair
* minor fix to Jpn translation for medical
minor fix to Jpn translation for medical
2017-06-23 11:39:06 -05:00
GodofMonkeys
60131ee589
Add Chinese Traditional & Simplified Localization ( #5295 )
...
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +02:00
Arcanum
fe16b72837
Fix AI can get to CA from injured
2017-06-18 12:43:39 +02: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
PabstMirror
a31037bd45
Merge branch 'medical-rewrite' into medical-rewrite-restructure
2017-05-23 13:46:15 -05:00
Arcanum
22e1cdfe35
Add myself as Author
2017-05-22 22:49:27 +02:00
Arcanum
2e856063cb
Fix option in setting module
2017-05-22 22:43:03 +02: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
Arcanum
d055845201
Add vars for separate AI fatalInjuty condition
2017-05-22 19:57:02 +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
31a81c4407
Merge branch 'master' into medical-rewrite
2017-05-06 12:01:58 -05:00
classic
777d0e6fb0
Improve Japanese translation ( #5133 )
...
* Add the Japanese translation for cargo
Add the Japanese translation for cargo, fix to html tag and few improvement
* fix the Japanese transltion
Fix the Japanese translation for attach. it was used wrong html tag.
* changed The Japanese translation
Changed the Japanese translation of azimuth angle
* fix The Japanese translation
Fix the Japanese translation for chemlights. it was used wrong html tag.
* fix The Japanese translation
Fix the Japanese translation for laserpointer. it was used wrong html tag.
* Fix the Japanese translation
Fix the Japanese translation for medical_blood. it was used wrong translation.
* Fix the Japanese translation
Fix the Japanese translation for rearm. it was used wrong translation.
* add The Japanese translation
add The Japanese translation to new words
* Improve The Japanese translation
Improve, fix and change The Japanese translation
* minor fix to Japanese translation
minor fix to Japanese translation. see b1b07c5
2017-05-06 12:01:31 -05:00
PabstMirror
dab9772d03
Don't let flumi see these
2017-04-29 14:18:31 -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
BaerMitUmlaut
67f557de6a
Added status macro functions
2017-04-27 19:11:48 +02:00
BaerMitUmlaut
f12d69e231
Added proper addon basics to status, moved more functions into status
2017-04-26 22:05:40 +02: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
d93269304d
Merge branch 'master' into medical-rewrite
2017-04-15 10:09:50 -05:00
11RDP-LoupVert
a0e1205e54
(Medical) French text - minor changes ( #5043 )
...
Minor changes due to users feedback
2017-04-12 08:40:31 +02:00
BaerMitUmlaut
b89bc86e00
Added seperate vitals component
2017-04-02 00:27:50 +02:00
BaerMitUmlaut
54291b3b3b
Renamed menu to gui, moved more gui stuff into it
2017-04-01 20:45:05 +02:00
BaerMitUmlaut
676c9a5451
Added seperate status component
2017-04-01 20:41:45 +02:00
BaerMitUmlaut
c4863c756c
Moved statemachine into seperate component
2017-04-01 19:50:26 +02: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
PabstMirror
169df1ed3b
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/stringtable.xml
2017-03-25 11:03:50 -05:00
11RDP-LoupVert
fc860e7b43
French loc improvement ( #5017 )
...
* French loc improvement
(French) text as it is clutters the interface interface, making it
uneasy for medic to use the it smoothly.
https://i.gyazo.com/8d7a5bb2f15dd1332cec36f2eef510c8.png
Hopefully suggested changes fixes that.
There were a few typos and, in my opinion, unaccurate or missing
translation.
Based on French Army Field Manual, actual paramedical personnel and past
work on XMedSys.
* Pull 5017 with spaces instead of tabs
https://github.com/acemod/ACE3/pull/5017
* Fixes a minor typo
Selectioner -> Sélectionner
* Duplicate entry (French)
Removes a duplicate entry, didn't saw first time
2017-03-25 10:52:37 -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
46be89eda6
Cleanup
2017-03-18 11:55:40 -05:00
PabstMirror
e3af1b55a5
Merge branch 'medical-rewrite' into medical-rewrite-effects
2017-03-18 09:56:42 -05:00
PabstMirror
c49e5bcfa0
Reload medical configs into extension on save load ( #4941 )
2017-03-08 19:33:28 +01:00
PabstMirror
d403f20d71
Adjust addDamageToUnit for rewrite
2017-03-06 15:06:01 -06:00
PabstMirror
2e47bad280
Merge branch 'medical-rewrite' into medical-rewrite-effects
2017-03-02 18:01:40 -06:00
PabstMirror
8ad3571d19
Merge branch 'master' into medical-rewrite
2017-03-02 18:00:34 -06:00
sbng-PAPA
e2c04a80c4
More accurate Korean translate for medical ( #4897 )
2017-03-02 17:48:48 -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
PabstMirror
34f87f89bb
Merge branch 'medical-rewrite' into medical-rewrite-effects
2017-02-18 18:24:03 -06:00
PabstMirror
c7b60d1777
Merge branch 'master' into medical-rewrite
2017-02-18 18:17:37 -06:00
Mark Ruffner
0900bf964b
Medical/Repair 3den Toolbox State Fix (Bug fix for #4902 ) ( #4905 )
...
* Update medical/repair 3den away from missionNamespace
* Simplify save
2017-02-18 12:27:36 -06:00
NorXAengell
1be278fbda
French translation to "Advanced throwing" and "Advanced fatigue" ( #4415 )
...
* French translation of "Advanced fatigue" and "Advanced throwing"
Full translation of "Advanced fatigue" and "Advanced throwing".
* New batch of translation/correction
2017-02-11 15:16:56 -06:00
jonpas
b2986cea8a
Merge branch 'master' into armake
2017-02-07 03:51:29 +01: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
BaerMitUmlaut
0c6eec8485
Merge branch 'medical-rewrite' into medical-rewrite-effects
2017-01-30 21:34:51 +01:00
BaerMitUmlaut
60c57a7f20
Fix unconscious state in cardiac arrest
2017-01-30 21:22:10 +01:00
BaerMitUmlaut
20cf30a7c6
Moved heart beat sounds to medical ui
2017-01-29 21:59:24 +01:00
BaerMitUmlaut
9eba2bd448
Added visual effects
2017-01-29 21:59:24 +01:00
ViperMaul
ba810a22e6
Tab clean up.
2017-01-19 18:38:51 -06:00
ViperMaul
567c9129b2
cleanup
2017-01-19 17:23:54 -06:00
ViperMaul
59c58b1269
Add settings function handler
2017-01-19 17:19:54 -06:00
ViperMaul
8db5d8f2ae
Change Setting from Basic to Normal and Stringtable moves
2017-01-19 15:46:44 -06:00
ViperMaul
6972af9d0b
Settings and string changes
2017-01-19 15:30:27 -06:00
ViperMaul
1078913d2a
Stringtable changes.
2017-01-19 15:29:33 -06:00
ViperMaul
69dc3ba12e
Add Settings to Medical Settings Module
2017-01-19 11:48:34 -06:00
jonpas
3ac00f2e21
Fix medical typo 'to' -> 'too' ( #4824 )
2017-01-17 15:26:07 -06:00
PabstMirror
a32478adfb
Merge branch 'master' into medical-rewrite
2017-01-17 13:10:18 -06:00
jtj5283449
d4855a7ff3
Korean Translation v1.0 ( #4794 )
...
* Add files via upload
* Add files via upload
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.
* Fix encoding
2017-01-02 17:52:01 -06:00
ulteq
1e79f35e43
Always visualize bandaged wounds
...
* Even when GVAR(advancedBandages) or GVAR(woundReopening) are disabled
2016-12-15 15:01:02 +01:00
ulteq
0ddfd5eb16
Disable wound reopening when advanced bandages are disabled
2016-12-15 14:51:24 +01:00
ulteq
70a2dc30e7
Refactored 'showPainInMenu' setting
...
* showPainInMenu -> on/off switch
* medicSetting_PainVisualization -> 3 way switch on who can see it
2016-12-15 14:45:58 +01:00
ulteq
91cbc0e4d4
Added new setting 'advancedDiagnose'
...
* Which allows to choose between the old basic- and advanced diagnose actions
2016-12-15 14:00:09 +01:00
ulteq
0de405fe2a
Fix morphine when advanced medication is disabled
2016-12-15 12:58:06 +01:00
ulteq
65f0f56474
Implemented 'showPainInMenu'
2016-12-14 21:30:28 +01:00
ulteq
8146cb427e
Revert "Implemented 'showPainInMenu' logic"
...
This reverts commit 964711a38b
2016-12-14 21:23:26 +01:00
ulteq
964711a38b
Implemented 'showPainInMenu' logic
2016-12-14 20:55:03 +01:00
ulteq
196a3999a4
Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite
2016-12-14 20:44:22 +01:00
ulteq
151d4a4bfe
Settings overhaul
...
New settings:
* allowSelfIV
* showPainInMenu
Converted CBA -> ACE Settings:
* advancedBandages
* advancedMedication
* fatalInjuryCondition
* cardiacArrestTime
Fixed settings:
* useLocation_Epi
* medicSetting_Epi
* painCoefficient
2016-12-14 20:44:06 +01:00
PabstMirror
af4b3e31e1
Minor iv optimization
2016-12-14 11:50:31 -06:00
ulteq
a2b964a993
Fixed bandage config lookup
2016-12-14 18:04:56 +01:00
ulteq
5d3f97ace7
Fix IV Bags work on limbs with a tourniquet applied
2016-12-14 12:36:51 +01:00
ulteq
852f78b801
Classify the perceived pain intensity on all patient information outputs
...
Fixes : #2117
2016-12-10 15:24:20 +01:00
PabstMirror
a451ad356e
Close patient display when interaction menu closes
2016-12-09 21:35:26 -06:00
PabstMirror
3907d2dc9f
Cleanup moved functions
2016-12-09 21:27:42 -06:00
PabstMirror
b87bdfe14a
Fix body-bag action / cleanup
2016-12-09 21:03:52 -06:00
PabstMirror
ee864b2c46
Fix medkit string, fix overpressure
2016-12-09 13:48:54 -06:00
ulteq
05b9208d3c
Change debug
2016-12-09 18:43:32 +01:00
ulteq
03f9ba1bad
Improved simulation of tourniquet pain:
...
* Made use of the new pain level helper function
2016-12-09 17:48:27 +01:00
ulteq
ada43148e9
Removed deprecated revive settings
2016-12-09 17:07:05 +01:00
ulteq
bfda932384
Different max. bleeding rates for different body parts
2016-12-09 15:54:33 +01:00
ulteq
a809047ac4
Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite
2016-12-09 12:57:42 +01:00
ulteq
82e88061fc
Added 'DEFAULT_HEART_RATE' constant
2016-12-09 12:57:27 +01:00
PabstMirror
cc6150303f
Add setting for blood bag flow rate ( #4751 )
2016-12-09 11:33:01 +01:00
ulteq
c486f17539
Implemented Medkit (works like in ACE2)
2016-12-08 18:11:24 +01:00
BaerMitUmlaut
a48d271368
Merge pull request #4668 from acemod/medical-rewrite-cardiacArrestLimits
...
Introduce small variation to length of cardiac arrest
2016-12-08 14:22:11 +01:00
ulteq
3b82510751
Merge new wounds into existing wounds whenever possible
...
* Todo: separate 'amountOf' into two variables (wound count and bandage percentage)
2016-12-08 12:59:30 +01:00
ulteq
78bfc0c26d
Simplified damage storage
2016-12-08 11:38:43 +01:00
ulteq
627ea0ebdc
Dynamically translate different wound types
...
* Brings back minor, medium, large wounds
2016-12-07 21:56:13 +01:00
ulteq
89c68364ef
Fix pain suppression not affecting 'setCustomAimCoef'
2016-12-07 19:51:28 +01:00
ulteq
66803a4b4d
Fix damage coloring
2016-12-07 18:53:04 +01:00
ulteq
74fefb6f69
New body part colors:
...
* Red bleeding
* Blue tourniquet
* Yellow/Orange damage
2016-12-07 18:28:35 +01:00
ulteq
7f1678b7e6
Increased wake up chance
2016-12-07 18:19:35 +01:00
ulteq
03f7451c99
Fixed incorrect debug output
2016-12-07 11:41:58 +01:00
ulteq
5db75ac746
Fixed check blood pressure did not always account for tourniquets
2016-12-07 11:32:01 +01:00
ulteq
ab7af04530
Overhauled the medication system:
...
* Refactored the old code
* Introduced 'timeTillMaxEffect' config entry for medication
2016-12-06 20:42:10 +01:00
ulteq
02ac4c4084
Fixed minor bug in the heart rate calculation
2016-12-06 17:40:05 +01:00
ulteq
faa2b619ab
Removed overly verbose debug logs
2016-12-06 17:35:52 +01:00
ulteq
fa77fb7194
Various fixes:
...
* Fixed medication (morphine, epinephrine, ...)
* Fixed CPR
* Improved heart rate simulation
* Removed deprecated ace settings
2016-12-06 17:26:11 +01:00
ulteq
978a81fb0a
Removed dead code
2016-12-06 14:37:48 +01:00
ulteq
92da5c80a0
Partly fixed Medication
...
* Brings the heart rate adjustment (due to medication) back to life
* Restores the medication effect loop (needs testing)
2016-12-06 12:58:12 +01:00
ulteq
db547a53b7
Increased unconsciousness wake up interval
2016-12-06 10:58:43 +01:00
PabstMirror
c47772eddc
Fix stringtables
2016-12-05 19:40:26 -06:00
ulteq
a88be4f458
Fixed 'displayPatientInformation'
2016-12-05 23:00:02 +01:00
ulteq
a5ce5b4a34
Medical Rewrite - Continued ( #4744 )
2016-12-05 21:34:20 +01:00
commy2
9cba0baade
manual merge
2016-12-05 20:18:15 +01:00
commy2
a83267b2ff
manual merge
2016-12-05 20:15:16 +01:00
BaerMitUmlaut
ac28bce578
Fixed state machine not running for units
2016-11-29 12:35:26 +01:00
PabstMirror
a3c50a6c76
Add dev macro to quickly recompile functions ( #4699 )
2016-11-23 13:35:25 -06:00
SilentSpike
39582914f7
Add 10% variation to cardiac arrest time
...
Gaussian distribution favours the average time setting. This introduces some unpredictability to cardiac arrest, but not enough to make users confused. Keeps the settings simple to again reduce confusion and improve overall UX.
2016-11-15 17:00:22 +00:00
SilentSpike
24ada4dab3
Clarify the maximumCardiacArrestTime setting
2016-11-13 21:45:38 +00:00
SilentSpike
27728172ed
Clarify the allowDeathMode setting
2016-11-13 21:27:40 +00:00
BaerMitUmlaut
b4569f0a96
Fix bracket
2016-11-13 18:11:18 +01:00
BaerMitUmlaut
27916e8455
Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite
2016-11-13 18:03:12 +01:00
PabstMirror
5463e9dff8
Merge branch 'master' into medical-rewrite
2016-11-09 13:12:42 -06:00
Karan Singh
09b89a0bbc
Fix typo in Eden Options ( #4615 )
...
* Fix typo in Eden Options
This fixes a typo in line 25, ace_isMeidc_temp to ace_isMedic_temp
* Fix L13
2016-11-09 13:07:29 -06:00
BaerMitUmlaut
dac4a4dc42
Merged instant death and execution into one setting
2016-11-09 19:01:55 +01:00
BaerMitUmlaut
08a378bb2d
Added execution system, improved instant death
2016-11-08 19:37:56 +01:00
BaerMitUmlaut
928ded0e66
Fixed instant death and PREP
2016-11-07 23:46:10 +01:00
BaerMitUmlaut
ba9fc9240c
Removed traces of old state machine
2016-11-07 23:44:33 +01:00
BaerMitUmlaut
0427814961
Started transition to CBA state machine, removed revive in favour of extended cardiac arrest
2016-11-07 22:21:07 +01:00
BaerMitUmlaut
a65f1d19fa
Added state machine debug functionality
2016-11-07 22:19:55 +01:00
commy2
fc39ac14b7
don't knock out if pain is removed
2016-10-20 13:49:52 +02:00
commy2
be56b4d806
knock out due to pain
2016-10-20 13:46:28 +02:00
commy2
370faf9b48
cleanup
2016-10-20 13:38:26 +02:00
commy2
7e498ab762
setting for basic/advanced syringes
2016-10-20 02:14:11 +02:00
commy2
f2dfc6dc0e
fixes, tweaks
2016-10-13 20:17:21 +02:00
commy2
bc4c1787f9
show tourniquets in 3d menu
2016-10-13 19:05:29 +02:00
commy2
fe2c6e8d85
basic <-> advanced
2016-10-13 17:14:43 +02:00
commy2
68d75beae6
manual merge
2016-10-13 16:56:57 +02:00
commy2
e1cbeeea16
fix tourniquets
2016-10-13 10:12:28 +02:00
commy2
18907adcd5
increase medical item mass to at least 100 grams
2016-10-13 09:48:58 +02:00
commy2
b1f0af7e1c
merge basic and adv. bandage actions
2016-10-13 09:10:08 +02:00
commy2
e38845bf45
add ace_kill event handler
2016-10-12 23:20:22 +02:00
commy2
92fc4ec14b
add a setting for 'basic' blood bags
2016-10-12 22:38:58 +02:00
commy2
a5d070f829
blood and unconsciousness fixes
2016-10-12 21:59:32 +02:00
commy2
be71e6fa7b
Merge branch 'medical-rewrite-blood' into medical-rewrite
2016-10-12 04:05:50 +02:00
commy2
b0b9037f24
simplify lost some/much blood macros
2016-10-11 19:44:20 +02:00
commy2
d1df47919d
support neg numbers to remove pain in addPain
2016-10-11 19:36:04 +02:00
commy2
1ea2a72f20
don't play scream by addPain function
2016-10-11 19:29:44 +02:00
commy2
d0df141cf7
add comment explaining why 6.0 were chosen
2016-10-10 18:22:46 +02:00
commy2
e2d174837a
move IV transufsion rate macro to blood config
2016-10-10 18:20:58 +02:00
commy2
c2f7366d32
blood volume unit vitals
2016-10-10 17:46:17 +02:00
commy2
3438ea0946
use liters for blood volume variable
2016-10-10 17:30:42 +02:00
commy2
fc079abd46
function header
2016-10-10 16:53:25 +02:00
commy2
2ad7c4c4ea
add addPain function, cap pain
2016-10-10 16:44:03 +02:00
commy2
4bc1c1db56
handle blood visuals
2016-10-07 04:21:01 +02:00
commy2
d4dd1626a5
delete some unused/moved functions from medical main component
2016-10-07 00:19:51 +02:00
commy2
50eeebd30d
add weapon sway by pain
2016-10-07 00:09:58 +02:00
commy2
e9586ebccc
use common header file for medical components
2016-10-06 22:40:36 +02:00
commy2
5613ec5d5a
treatment functions and unconsciousness rework
2016-10-06 00:54:57 +02:00
commy2
56882a9bcb
manual merge
2016-10-02 13:04:20 +02:00
commy2
f4d4c521d7
manual merge
2016-10-02 13:02:17 +02:00
commy2
05d30c5573
convert log macros to cba versions ( #4282 )
...
* convert log macros to cba versions
* Add changes to AB
* remove obsolete macro
2016-10-02 12:55:31 +02:00
commy2
f185742e68
manual merge
2016-10-02 12:51:29 +02:00
PabstMirror
1bc5669c95
Merge branch 'master' into cba-log-macros
2016-09-30 11:18:58 -05:00
commy2
c93e9e3f3b
fix playSoundInjured wrong args
2016-09-30 13:03:43 +02:00
PabstMirror
60a7490b7e
Fix some moved funcs/strings
2016-09-29 15:08:36 -05:00
commy2
2c7864c02b
implement custom treatment sounds
2016-09-29 18:45:18 +02:00
commy2
0decd72063
manual merge
2016-09-28 08:37:39 +02:00
commy2
20d00d7cd9
make units scream when they're hit
2016-09-27 21:21:44 +02:00
KoffeinFlummi
72899643bd
Merge branch 'master' into japanesestringtables
2016-09-27 20:54:17 +02:00
commy2
a913054b57
fix error with out of bounds blood loss
2016-09-27 20:00:58 +02:00
classicarma
eaf00c8340
translate medical
2016-09-28 01:15:38 +09:00
commy2
5e35204811
woundHandler(SQF), fixes, improvements, more consistent variable naming
2016-09-27 17:29:49 +02:00
commy2
7470d1f0f5
cleanup/improve parseConfigForinjuries
2016-09-27 11:05:38 +02:00
commy2
9f6baca424
port injury parse fnc to medical damage
2016-09-26 20:25:14 +02:00
PabstMirror
3c53a314d4
Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros
2016-09-22 15:10:30 -05:00
commy2
236d1f9669
Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite
2016-09-19 18:23:37 +02:00
commy2
729ba9178b
Merge remote-tracking branch 'origin/master' into medical-rewrite
2016-09-19 18:23:26 +02:00
commy2
c2f8007d36
port litter settings to treatment
2016-09-19 18:05:49 +02:00
commy2
81d962f0d5
port litter to treatment
2016-09-19 09:55:30 +02:00
Glowbal
27314c34b1
fix treatment functionality
2016-09-18 22:58:56 +02:00
Grzegorz
a63dcb49d0
PL Translation 3.7.1 ( #4395 )
...
* translate advanced fatigue
* translate advanced throwing
* translate cargo
* translate chemlights
* translate cookoff
* translate explosives
* translate fastroping
* translate gforce
* translate googles
* translate grenades
* translate gunbag
* translate maptools
* translate medical
* translate medical_ai
* translate minedetector
* translate nametags
* translate overheating
* translate repair
* translate tagging
* translate ui
* translate zeus
2016-09-18 22:00:13 +02:00
Glowbal
b74245c323
Merged branch medical-rewrite into medical-rewrite
2016-09-18 19:48:58 +02:00
Glowbal
1c1e47c039
Enable treatmnet actions
2016-09-18 19:48:49 +02:00
commy2
031bb1ec91
Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite
2016-09-18 15:17:01 +02:00
commy2
a5dcdf102f
use TRACE macros for parseConfig function
2016-09-18 14:17:18 +02:00
Glowbal
9263cb0f7d
Fix handleDamage not working
2016-09-18 14:05:05 +02:00
Glowbal
7691af47f3
Further clean up
2016-09-18 13:33:22 +02:00
Glowbal
811e1cd598
First set up clean up for medical rewrite
2016-09-18 12:05:36 +02:00
Glowbal
0c43c83b3d
Merge branch 'master'
...
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/XEH_postInit.sqf
addons/medical/XEH_preInit.sqf
addons/medical/functions/fnc_actionDiagnose.sqf
addons/medical/functions/fnc_actionLoadUnit.sqf
addons/medical/functions/fnc_addDamageToUnit.sqf
addons/medical/functions/fnc_createLitter.sqf
addons/medical/functions/fnc_displayPatientInformation.sqf
addons/medical/functions/fnc_handleCreateLitter.sqf
addons/medical/functions/fnc_handleDamage.sqf
addons/medical/functions/fnc_handleDamage_advanced.sqf
addons/medical/functions/fnc_handleDamage_airway.sqf
addons/medical/functions/fnc_handleDamage_caching.sqf
addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
addons/medical/functions/fnc_handleDamage_wounds.sqf
addons/medical/functions/fnc_isBeingCarried.sqf
addons/medical/functions/fnc_isBeingDragged.sqf
addons/medical/functions/fnc_litterCleanupLoop.sqf
addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
addons/medical/functions/fnc_setCardiacArrest.sqf
addons/medical/functions/fnc_showBloodEffect.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf
addons/medical/functions/fnc_treatmentBasic_epipen.sqf
addons/medical/functions/fnc_treatmentIV.sqf
addons/medical/functions/fnc_treatmentIVLocal.sqf
2016-09-18 11:51:21 +02:00
PabstMirror
1caea46d60
Medical - Fix adv wound not stacking ( #4353 )
2016-09-07 20:54:54 +02:00
Glowbal
89a5f28772
Merge pull request #4192 from acemod/medical-rewrite-engine-component
...
merge medical engine component into medical rewrite branch
2016-09-05 22:31:37 +02:00
PabstMirror
4fd5d6be6c
Fix handleDamage params for addDamageToUnit ( #4344 )
2016-09-05 22:27:00 +02:00
Glowbal
b489750d5b
Minor optimizations using private, params, and isEqualType ( #4323 )
...
* Optimizations with private, params, and isEqualType
* Fixed tab being used instead of space
* Fixed tabs inserted by notepad++
* More usage of new private syntax and params
- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax
* clean up and formatting
2016-09-04 16:44:22 +02:00
PabstMirror
1c5761f845
Bundle fire damage into larger chunks ( #4223 )
2016-09-03 22:00:45 +02:00
PabstMirror
c4d2383005
Increase blood bag flow rate for basic medical ( #4306 )
...
* Change blood bags
- Increase flow rate for basic medical
- Don't queue bags
* change to ivBags, reset var on init / fullHeal
2016-09-01 12:46:08 +02:00
commy2
2ac52fb430
remove static fix from vmedical component
2016-08-27 08:50:55 +02:00
Joko
927d8ead8f
add Hiddenselection camo to bodybag for Retexturing ( #4276 )
...
* add Hiddenselection camo to bodybag
* Add default texture
* Use macro
2016-08-24 12:42:32 -05:00
commy2
f76457f48f
convert log macros to cba versions
2016-08-22 21:06:52 +02:00
Glowbal
83e78f1021
Merge pull request #4258 from acemod/reviveTimer
...
Clear reviveState when calling setUnconscious
2016-08-20 11:57:51 +02:00
Glowbal
167dc7735d
Merge pull request #4197 from acemod/litterSimpleObject
...
Use createSimpleObject for medical litter
2016-08-20 11:53:43 +02:00
PabstMirror
b02e91e02e
Clear reviveState when calling setUnconscious
...
#4250
2016-08-18 01:59:40 -05:00
[OMCB]kaban
8fc2cbd0ef
Russian Translations - Update ( #4217 )
2016-08-13 11:25:43 +02:00
PabstMirror
f12feae7fe
Fix some efuncs
2016-08-09 12:47:59 -05:00
PabstMirror
6c63d3c23a
Merge branch 'master' into medical-rewrite
2016-08-09 12:11:30 -05:00
PabstMirror
c46b2d09cf
Heal hitpoint after bandage sets bodyPartStatus
2016-08-07 13:58:09 -05:00
PabstMirror
82cf18575c
Minor tweaks to medical
...
- decrease needed blood loss on selection to turn icon red. (Largest
wound bleedingRate is only 0.1)
- Don't print warning for basic medical bandage not having sub configs
2016-08-03 13:14:12 -05:00
PabstMirror
02c308e141
Use createSimpleObject for medical litter
2016-08-01 16:20:13 -05:00
commy2
8a8bc6a336
remove hitpoint config from medical-main component
2016-07-30 17:23:08 +02:00
Ozan Eğitmen
8f80cd59c8
Use GVAR where applicable
2016-07-20 07:15:18 +03:00
Glowbal
ddb4ef42f3
Add stringtables and items
2016-07-15 12:21:56 +02:00
Glowbal
e4c36d9fa0
Change injuries include to ACE_Medical_Injuries
2016-07-15 12:10:18 +02:00
Glowbal
565da090bc
Add missing bracket
2016-07-15 11:53:57 +02:00
Glowbal
ab2075c328
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/CfgEden.hpp
addons/medical/functions/fnc_reviveStateLoop.sqf
addons/medical/functions/fnc_serverRemoveBody.sqf
addons/medical/functions/fnc_unconsciousPFH.sqf
2016-07-15 11:50:58 +02:00
Glowbal
c8a54fd090
Merge branch 'release'
2016-07-15 02:03:42 +02:00
PabstMirror
1213c08e4b
Fix cached call events
2016-07-14 13:06:45 -05:00
PabstMirror
0281bc8f3d
Fix 3den attribute layout for 1.62
2016-07-12 17:54:16 +02:00
Glowbal
ee8e03a1ae
Merge pull request #3916 from acemod/merge-basic-and-advanced
...
Merge basic and advanced injury systems
2016-07-12 13:36:02 +02:00
Glowbal
0e740f00c3
Merge branch 'release'
2016-07-11 23:42:03 +02:00
Glowbal
d0c30577af
Remove usage of setUnconscious
2016-07-11 19:18:40 +02:00
jonpas
fd39ee9e6b
Merge branch 'master' into armake
2016-07-11 16:27:37 +02:00
Glowbal
f86d8d113c
Merge branch 'release'
2016-07-09 11:36:49 +02:00
Glowbal
da661afe9b
Improve syntax
2016-07-07 17:22:08 +02:00
Glowbal
7157fcf420
Clean up unconscious and revive states
2016-07-07 12:57:21 +02:00
