Commit Graph

459 Commits

Author SHA1 Message Date
Elgin675
daa8a05ab8 Translations: fix medical_treatment order introduce on #7430 (#7435)
Moves `AllowSelfPAK_Description` below the display name.
2020-01-09 22:29:26 -06:00
PabstMirror
57932ce04f restore strings lost in merge 2020-01-09 14:51:07 -06:00
PabstMirror
a999a5e997 Merge branch 'master' into combine-bandage-settings 2020-01-09 14:48:36 -06:00
Elgin675
36a6c9c2b3 Translations: French (#7414)
* Add french translation of 'ClearTraumaAfterBandage_Description' key

* Add french translation of 'GatlingDescriptions' keys

* Add french translation of 'AllowSelfPAK' keys

* Update french translation on medical_treatment module
- AdvancedDiagnose_Description
- AdvancedMedication_Description
- LitterCleanupDelay_Description

* Fix french translation on medical_treatment module

- 'AllowLitterCreation_Description' key
- 'LitterCleanupDelay_Description' key

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-09 12:36:51 -06:00
dfr1238
9833bfd37d Update tchinese string (#7433)
Update tchinese on aircraft,medical_treatment
2020-01-09 09:38:11 -06:00
jonpas
34c24dbc76
Medical Treatment - Fix Checking Pulse progress bar text (#7406) 2020-01-09 07:40:53 +01:00
Jo David
91c40e4407
Changed: German translation for Medical Rewrite (#7430)
* Changes to be committed:
Updated german stringtables for new med_rewrite

* Changes to be committed:
Updated german stringtables for new med_rewrite

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_feedback/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update stringtable.xml

Stell ein

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update stringtable.xml

added a missing string

* Update stringtable.xml

* Update stringtable.xml

* remove and merge duplicate keys

Co-authored-by: padddyyy <50599448+padddyyy@users.noreply.github.com>
2020-01-09 07:35:57 +01:00
Italiandrache
05e99c5154 Changed: Updated italian translation (#7405)
* Updated italian translation

* Minor corrections

* Some corrections

* Other corrections

* Minor translation
2020-01-09 06:02:41 +01:00
Keewayz
e908345eae Additions to Polish Translation (#7374)
* Addition to Polish translation

*added missing polish translation up to adv_ballistic, adv_fatigue, ballistics, common, cookoff, explosives, grenades, medical_statemachine, medical_treatment, rearm, spectator, switchunits, weather

* Next Addition to Polish translation

#some missing stuff

* Apply Code Review Suggestions

Co-Authored-By: Filip Maciejewski <veteran29q+github@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2020-01-07 13:53:02 -06:00
mharis001
770860fe1a
Improve German translation
Co-Authored-By: Jo David <github@jonathandavid.de>
2020-01-05 03:29:57 -05:00
mharis001
2d1f166f5a Medical - Combine advancedBandages and woundReopening settings 2020-01-04 15:43:51 -05:00
mharis001
62fccd6ff0 Medical Treatment - Add self PAK setting (#7382) 2020-01-04 12:42:51 +00:00
mharis001
e00cb53911 Fix incorrect reopening chance for QuikClot on large abrasions (#7383) 2020-01-04 12:33:49 +00:00
classic
1aec991f54 Update Japanese translation (#7371)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2020-01-03 10:07:52 -06:00
Toni Vicente
77ce88e1ac Update spanish translation (#7366)
* Update spanish translation

Added spanish translation entries

* Update spanish translation

Added spanish translation entries

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-02 21:56:02 -06:00
D3L7A01
14b1ca5b83 Italian Translations (#7346)
* Add some translation eng to ita

* Translation eng-ita completed

Translation completed from English to Italian finally completed, I hope there is no problem but I would like to communicate that during the translation I carelessly "translated" and placed two names in objects, I leave you the id
1. STR_ACE_Medical_Blood_EnabledFor_Description
2. STR_ACE_Tracers_100Rnd_580x42_Drum_yellow
I hope I haven't done any damage :)
PS: Thanks again for this wonderful mod
Good luck with all upcoming updates

* Some erros(?)

Some erros(?) Rows 3 to 5 are highlighted red I hope there is no problem XD

* fix tabs first

* re-add moved

* fix merge

* Update stringtable.xml

* fix STR_ACE_Medical_Blood_EnabledFor_Description

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-02 21:52:40 -06:00
IllidanS4
1716006f4d Czech medical typos and grammar (#7359) 2020-01-02 16:26:25 +01:00
mharis001
f1cd3551f8 Medical Treatment - Settings cleanup (#7345) 2020-01-02 11:14:39 +00:00
Elgin675
50f64eef20 French translation of the latest updates (#7321)
* Add description for 'showCheckAirTemperature' setting (weather)

* Add french translation for '(show)CheckAirTemperature' in weather module

* Add description for 'SettingShowClearGlasses' setting (goggles module)

* Add french translation for 'SettingShowClearGlasses' in goggles module

* Add localization for 'rangetables' categoriy settings (artillerytables module)

* Add french translation for artillerytables module

* Add french translation for Shotguns ammunition in ballistics module

* Add french translation for CTS 7290 in grenades module

* Minor modification of french translation for medical_treatment module

* Add french translation for 'SettingShowCheckAmmoSelf' in reload module

* French translation : correction of a typing error in advanced_throwing module

* Minor modifications of french translation for chemlights module
Homogenization of presentation, to be absolutely identical to the presentation of the vanilla glow sticks.

* French translation : reformulation of the overheating module menu text, which was redundant with the title.

* Changing the order of the overheating menu (logical grouping).

* Add description tooltip on 'quickmount' settings

* Add localization for 'fastrope' subcategory settings (Uncategorized Menu)

* Minor modifications/corrections of french translation :

- fastroping module
- magazinerepack module
- microdagr module
- overheating module
- switchunits module

* FIXED Previous commit ==> Add description tooltip on 'quickmount' settings

* Add french translation for quickmount tooltip menu

* move showActionInSelfInteraction to common

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-28 09:58:52 -06:00
dfr1238
02f5bfa980 [Tchinese]Medical - Group Bandage Items (#7329)
like title.
-make all bandage name on tch look like : bandage (%Type) 
-make all iv name on tch look live :IV(%Type %amount)
2019-12-25 20:39:32 -06:00
Brett
6a89bd5ee4 Medical - Group Bandage Items (#7324) 2019-12-24 23:41:53 +01:00
Dominik Butschek
331d47c04e Addition to Czech translation (#7319)
* czech translation up to exlosives

* The rest of czech translation

* restore some lost in merge

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-20 13:38:53 -06:00
Elgin675
bd0ecd7edf French translation (#7298)
* Cleaning and reorganizing of some stringtable files (WIP) :

- Duplicate entries have been removed, and the arrangement improved, to help future translators.
- Some ACE_Settings.hpp files have been modified because they were not up to date.
- Minor french translation correction.

* Added French translation and / or correction for :

- Weaponselect module,
- Weather module,
- Winddeflection module,
- Yardage450 module,
- Zeus module.

* Convert Tabs to Spaces

* Minor corrections ; arrangement improved for few stringtable.xml files.

* Improved French translation, and adjust fews settings.

- Nombreuses corrections mineures, en vérifiant chaque menu un à un, puis chaque
  option dans le jeu lui-même. Ca m'a permit de constater qu'il y a certaines
  absurdités, y compris en anglais, qui ont donc été retraduites dans toutes les
  langues, mais qui ne correspondent pas vraiment à l'option telle qu'implémentée.
  Par exemple, le système de réarmement dans Eden est traduit de manière très
  étrange.

- Modification du fichier "addons/overheating/ACE_Settings.hpp", afin de changer
  l'ordre du menu "ACE Surchauffe". En effet la case "activé" était tout en bas,
  aussi je l'ai mise tout en haut (comme c'est déjà le cas pour toutes les options).

- Modification du fichier "addons/finger/ACE_Settings.hpp", concernant le pointage
  du doigt ACE, afin d'y ajouter une description dans les réglages des addons.
  Il y en avait déjà une (peu utile) dans les paramètres des commandes, mais pas
  dans les options des addons, ce qui rend l'option peu explicite pour un débutant.

* Corrections mineures

* correction erreurs

* correction erreurs (nametags)

* correction erreurs et modules obsolètes (nametags)

* correction erreurs et modules obsolètes (common)

* Mise en commentaire d'éléments obsolètes

* correction key error

* Added Vdauphin suggestions :).

* French translation - Replaced "Faction" (faction) to "Camp" (side)

addons/captives/stringtable.xml
addons/switchunits/stringtable.xml
addons/zeus/stringtable.xml

* Minor correction of french Concertina_wire translation

* - (PabstMirror suggestions) Replace tabs by spaces, in addons/common/stringtable.xml
- (PabstMirror suggestions) Replace xml comments by french plain text, in addons/common/stringtable.xml

- Replace xml comments by french plain text, addons/explosives/stringtable.xml
- Replace xml comments by french plain text, addons/nametags/stringtable.xml

* Removed accented capital letters for objects in french translation :

Capital accented letters were a problem because they were not classified alphabetically.
Thus in Eden or in the arsenal, objects starting with a capital accented letter were systematically at the top of the list.

modified:   addons/chemlights/stringtable.xml
modified:   addons/huntir/stringtable.xml

* Correction of a typing error (french concertina_wire translation
2019-12-19 11:08:31 -06:00
classic
15fad1e41b Update Japanese translation (#7316) 2019-12-19 16:36:06 +01:00
mharis001
b874a1f618 Medical Treatment - Fix bodyCleanupLoop typo (#7308) 2019-12-17 09:50:59 -06:00
PabstMirror
9b8cfc27af
Medical Treatment - Reset canTreatCached on treatment (#7253)
* Medical Treatment - Reset canTreatCached on treatment

* Reset conditionCaches of nearby units

* CAManBase
2019-12-12 10:25:21 -06:00
Elgin675
ec27cee1ac French translation Update / Added (#7213)
* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French MicroDAGR Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* Update French Explosives Translation Update

* Update addons/advanced_ballistics/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/cargo/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update frag/gestures/goggles/grenades/gunbag french translation

* Update hearing french translation

* Added French update translation and / or correction for :

- Frag Module
- Gestures Module
- Goggles Module
- Grenades Module
- Gunbag Module
- Hearing Module
- Hellfire Module
- Hitreactions Module
- Hot Module
- Interact_Menu Module
- Interaction Module
- Inventory Module
- Laser Module
- Laserpointer Module
- Magazinerepack Module
- Map Module
- Map_gesture Module
- Maptools Module
- Markers Module
- Maverick Module

* Added French update translation and / or correction for :

- Interaction Module
- Medical Module
- Medical_damage Module
- Medical_feedback Module
- Medical_gui Module
- Medical_statemachine Module
- Medical_treatment Module
- Microdagr Module

* Added French update translation and / or correction for :

- Missileguidance Module
- Missionmodules Module
- Nametags Module
- Nightvision Module
- Nlaw Module
- Noradio Module
- Optionsmenu Module

* Added French update translation and / or correction for :

- Overheating Module
- Overpressure Module
- Parachute Module
- Pylons Module
- Quickmount Module
- Rangecard Module
- Realisticnames Module
- Rearm Module
- Refuel Module
- Reload Module

* Adding French translation and correction for the Repair Module

* Correction typo mineure

* Adding French translation and / or correction for :

- Respawn Module
- Safemode Module
- Sandbag Module
- Scopes Module

* Minor corrections of the French translation for the ACE arsenal

* Minor corrections of the French translation for the Medical_treatment Module

* Correction de quelques anomalies dans les options ACE pour Eden.

Remplacement de la mention "Est infirmier" par "Qualification médicale", dans les options ACE de l'éditeur de mission.
En effet, il n'y a pas (plus ?) de case à cocher, mais un menu "direct", avec les choix "Par défaut/Aucune/Infirmier/Médecin.
Cela est donc bien plus approprié ;).

De même pour la mention "Est ingénieur", remplacée par "Qualification technique", là aussi bien plus appropriée.

Il a également fallu que je remplace la valeur "Ingénieur avancé" par "Ing. avancé" (Adv. Engineer en anglais), pour des raisons de place : la dénomination complète déborderait de la case / serait tronquée.

* Added French translation and / or correction for :

- Slideshow Module,
- Spectator Module,
- Spottingscope Module,
- Swichunits Module,

Minor correction on Nametags Module

* Correction ponctuation

* Added French translation and / or correction for :

- Tacticalladder Module,
- Tagging Module,
- Trenches Module,
- Tripod Module.

* Added French translation and / or correction for :

- UI Module,
- Vehiclelock Module,
- Vehicles Module.

Minor correction on Tacticalladder Module

* Added French update translation and / or correction for Viewdistance Module
2019-12-07 13:48:47 -06:00
dfr1238
00118445c1
Update Stringtable.xml
make it change from crlf to lf
2019-11-30 16:45:04 +08:00
dfr1238
318e931974
add final missing string on tchinese translate 2019-11-29 23:16:53 +08:00
dfr1238
59bc8b6dcc
Update /medical_treatment/stringtable.xml
Translate a lot string to tchinese
2019-11-29 01:42:54 +08:00
classic
f3535e436c Update Japanese translation (#7262)
* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* Update stringtable.xml
2019-11-26 14:08:14 -06:00
PabstMirror
40a66f0bde
Add some editor previews (#7254) 2019-10-29 17:10:40 -05:00
PabstMirror
c37783de0b
Medical - Change WoundReopening default setting (#7246) 2019-10-20 16:46:30 -05:00
BaerMitUmlaut
bb0461be16 Fast medical item replacement (#7224)
* Add item replacement framework

* Correctance of English

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Remove unecessary code

* Use new item replacement framework for medical items

* minor fixes, support GVAR(convertItems) setting

* use forEach, convert atropine to epi

* replace with adenosine
2019-10-11 15:00:25 -05:00
PabstMirror
4eeac9f649
Medical - Death from sum of trauma (#7195)
* Medical - Death from sum of trauma

* fixes

* Update fnc_determineIfFatal.sqf
2019-10-08 10:45:09 -05:00
Daniel Lee
f4dbe5229e Medical - Option for treatment to require holstering/lowering weapon. (#7063)
* Option for medical treatment to require holstering/lowering weapon, with an option for examine category items to still be available.

* Vehicles cause holster settings to be ignored.

Unsure whether to expand this into it's own setting (disallow all medical in vehicles? only allow if both medic and patient are in the same vehicle? what about people in the back of transports healing those in the cab?), but just going to leave it as is for now.

* Replace !isEqualTo with != in for performance reasons.

Resolves line 33 PR review.

* Merge settings, short circuit

* move logic to new file
2019-10-08 10:44:36 -05:00
mharis001
9474250975 Change medical item masses to be same as old medical (#7200) 2019-10-05 22:25:38 +02:00
Josuan Albin
aec7a78a58 Remove Atropine (#7212)
* Change items to scope 1 to keep mission backwards compatibility
2019-10-05 22:25:29 +02:00
mharis001
35a4ffbad6 Expand advanced diagnose setting tooltip (#7197) 2019-09-28 16:25:29 -05:00
PabstMirror
d6507cf119
Medical - epiBoostsSpontaneousWakeUp (#7076)
* Medical - epiBoostsSpontaneousWakeUp

* Update initSettings.sqf

* Move setting, add strings

* Update initSettings.sqf

* Update addons/medical/stringtable.xml

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-09-28 16:11:32 -05:00
mharis001
ec9e6c088b Medical - Only stitch wounds on not bleeding body parts (#7044)
* Only stitch wounds on not bleeding body parts
2019-09-28 21:48:19 +01:00
EckoMoire
f98aee7a98 Portugues Language Updated 2019-09-14 15:36:28 -03:00
LachlanSneddon
b4c1d0cb57 Minor logic fixes (#7174) 2019-09-07 12:18:12 -05:00
PabstMirror
0880ea25a3
Medical Treatment - Add logging for splints (#7170)
* Medical Treatment - Add logging for splints

* addToTriageCard
2019-09-06 21:47:20 -05:00
PabstMirror
edd5c44853
Medical - Improve loading/unloading of unconc patients (#7109)
* Medical - Improve loading/unloading of unconc patients

* Update fnc_loadPersonLocal.sqf

* Multi-line

* Formating

* Update fnc_loadUnit.sqf
2019-09-05 15:56:53 -05:00
barman75
3cb10e0aa4 Translations - Russian (medical) (#7093)
* Missing RUS translation (medical)

* Minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* authors
2019-08-28 10:28:56 -05:00
Elgin675
d7bf026a00 Corections mineures 2019-08-14 14:56:26 +02:00
Elgin675
5754d6c506 Fixed an error on the last commit (merge incorrectly). 2019-08-13 02:38:54 +02:00
Elgin675
7f71980c85 Modifications demandées effectuées 2019-08-13 01:32:16 +02:00
Elgin675
927e051ea7 Addition / modification of the French translation 2019-08-12 22:47:16 +02:00
Josuan Albin
df8814e344 Add self stitching setting (#7134) 2019-08-12 20:05:59 +01:00
PabstMirror
f5782fd1ff
Medical - Various debugging and fix cpr anim speed (#7122)
* Medical - Various debugging and fix cpr anim speed

* Update fnc_setCardiacArrest.sqf
2019-08-06 08:10:33 -05:00
classic
a7723b793b Update Japanese translation (#7111)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2019-07-22 09:49:54 -05:00
PabstMirror
e1c650d56e
Medical - add dummy cfgVehicle entries for old modules (#7091)
* Medical - add dummy cfgVehicle entries for old modules

* add medical_menu

* Update addons/medical/CfgVehicles.hpp

Co-Authored-By: jonpas <jonpas33@gmail.com>
2019-07-05 15:32:19 -05:00
PabstMirror
fa910a7fd8
Small med stuff (#7084)
* Small med stuff

* update adv fatigue comment

* disable medical debug by default

* Fix tourniquet call to addToTriageCard
2019-07-03 10:40:42 -05:00
mharis001
b2f4b8ea20 Medical - Cleanup settings (#7057)
* Cleanup medical settings

* Fix extra [

* Allow giving IV/blood to self by default

* Medical Blood - Settings improvements and cleanup (#7069)

* Add more blood settings and cleanup

* Fix include before header

* Update addons/medical_blood/functions/fnc_init.sqf

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

* Disable debug

* Cleanup moved settings

* Fix remaining setting descriptions
2019-06-28 11:50:11 -05:00
PabstMirror
de13ab0f47
Medical - Rework CPR and Bleeding in cardiac arrest (#7060)
* Medical - Rework CPR and Bleeding in cardiac arrest

* remove cprCreatesPulse, add cprSuccessChance

* hide cpr for basic diagnose

* Update addons/medical_statemachine/functions/fnc_enteredStateCardiacArrest.sqf

Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>
2019-06-27 19:01:20 -05:00
PabstMirror
f04b26b93e
Medical - Finish splint/fracture (#7045)
* Medical - Finish splint/fracture

- Add replacement items

* Add splint models

* Add fracture sound effects

* Add treatment interaction icon
2019-06-22 16:47:35 -05:00
Katalam
d26fcb6f1a Changed animation for cpr (#6918) 2019-06-22 15:55:42 -05:00
mharis001
08a7d2706e Add wounds var macros (#7058) 2019-06-22 13:36:27 -05:00
PabstMirror
d52fedf39f
Medical Treatment - Scale bandage time based on amount of wound treated (#7049)
* Medical Treatment - Scale bandage time based on amount of wound treated

* ignore basic bandage?

* add debug trace
2019-06-16 11:04:51 -05:00
mharis001
1998bf3eb6 Medical Treatment - Add medical facility classes config (#7047)
* Add medical facility classes config

* Convert to configCase and filter non-existant buildings
2019-06-11 20:02:40 -05:00
PabstMirror
2fc11d38e0
Medical - Fix unconsicous problems with minWaitingTime and fullHealLocal (#7030)
* Medical - Fix setUnconsicous minWaitingTime

* Fix fullHeallocal restoring unconscious with unstable vitals
2019-06-11 19:25:05 -05:00
SilentSpike
aff2cea0fb Unblacklist vanilla medical items from arsenal (#7017)
- The replacement setting may be disabled so we shouldn't prevent their
addition
- If it isn't, they will be replaced with suitable items which is fine
(and someone may want to design a mission that works either way)
2019-06-09 08:16:55 -04:00
mharis001
9315dbebd9 Fix medication and ivBagLocal typos (#7048) 2019-06-08 16:54:54 -05:00
C0kkie
f6b35a63ab Translations - German (#6920)
* Add all missing german translations for the ace medical system

* RHS Compat - Add 2 round hellfire to pylon options (#6893)

* RHS Compat - Add 2 rnd hellfire pylon

Close #5957

* change magwell name

* gvar->addon

* Fastroping - Add user setting to confirm cutting ropes (#6876)

* Fastroping - Add user setting to confirm cutting ropes

* always confirm

* fix

* Update stringtable.xml

* compatibility with CBA scripted 2d optics framework

* compatibility with CBA scripted 2d optics framework

* Bewusstlosstatus -> Bewusstlosigkeit

* Verblutungseffekt -> Blutungs effekt

* Aktivitere ACE Sanitäter Aktionen -> Aktiviere Sanitäter Aktionen

* Sanitätermenüs -> Sanitätsmenü

* kritsche -> kritische

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Add missing german translations for advanced fatigue, ai, arsenal & ballistics

* Update addons/ai/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Add missing german translations for ace cargo

* Add missing german translation for vehicles

* Add missing german translation for weaponselect

* Add missing german translations für ace repair

* Add missing german translations for ace quickmount

* Add missing german translations for ace explosives

* Add missing german translations for ace common

* Ace flashlight missing german translation

* Add missing german translations for ace scopes

* add missing translations for ace respawn

* Add missing german translations for ace overpressure

* ACE Nametags german translation

* .

* ace magazinerepack german translation

* ace interaktion german translations

* add missing german translation for ace interaction menu

* ACE Hearing german translations

* Update stringtable.xml

* Update stringtable.xml

* Missing german translation in ace dogtags

* Missing german translations ace hot

* ace pylons missing german translations

* ACE Cook off German Translations

* zeus german translations

* Fast roping german translations

* gforces german translations

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Map - Don't enable map light for parachutes (#6961)

* Refuel - Drop nozzle at unit's feet if no valid pos found (#6957)

* Refuel - Drop nozzle at unit's feet if no valid pos found

Fix #6944

* Update fnc_dropNozzle.sqf

* Update addons/refuel/functions/fnc_dropNozzle.sqf

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

* Common - Don't add UAV AI to localUnits array (#6951)

* Common - Don't add UAV AI to localUnits array

* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf

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

* Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries (#6932)

* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion

* Prevent FRIES from clipping into Ghost Hawk right door

* UNequipFRIES

* Remove fastroping checkVehicleThread

* Document FRIES equip and unequip functions

* Update stringtable.xml

* Nightvision german translations

* Update stringtable.xml

* remove non-stringtable stuff ???
2019-06-08 10:35:42 -05:00
PabstMirror
9b2c8c84e8 Medical - fix canTreat (#7041)
* Update fnc_canTreat.sqf

* Update fnc_canTreat.sqf
2019-06-08 06:17:00 -04:00
mharis001
44050df98b Medical Treatment - Modernize and Cleanup (#6933)
* Modernize and cleanup medical_treatment

* One line for each old public function

* Fix litterCleanupDelay name

* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

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

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* fix merge for renamed files

* Fixes and code review changes

* Move medical logs clearing to treatment

* More cleanup work

* cleanup

* Apply suggestions from code review

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

* formating, rename bone images

* Fix args for setDead call in actionPlaceInBodyBag

* Apply suggestions from code review

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

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn

* Fix merge

* Add PAK time coefficient setting

* Fix medication

* Add ace_medical_replacementItems config array

* checkItems performance improvement

* Treatment - cap max animation speed (#6995)

* Treatment - cap max animation speed

and add lock to prevent AF from reseting anim

* Update fnc_getBandageTime.sqf

* Use local version of setAnimSpeedCoef

* Revert "Use local version of setAnimSpeedCoef"

This reverts commit 36c22a9047.

* Move replacementItems compiling to preInit

* Improve replacementItems compiling

* Cleanup splint functions, use macros for fractures

* Rename splintCondition to canSplint

* Add cprCreatesPulse setting

* Cleanup remaining functions

* Capitalize stringtable entry names

* getStitchTime function and fix treatment locations

* Update addons/medical_treatment/functions/fnc_getHealTime.sqf

Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>
2019-06-03 10:31:46 -05:00
barman75
d684a8042e Russian translations (#7005)
* Russian translation is done

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration, still WIP

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration 2, still WIP, sorry

Co-Authored-By: Dystopian <sddex@ya.ru>

* re-translation in /captives and small fixes in /explosives

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

small fixes

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* /arsenal and /captives resolve

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor changes in /scopes, almost done

Co-Authored-By: Dystopian <sddex@ya.ru>

* Some strings shortened for menu

Co-Authored-By: Dystopian <sddex@ya.ru>
2019-06-03 09:59:13 -05:00
classic
7b44138282 Update Japanese translation (#6980)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* fix
2019-05-11 23:33:49 -05:00
PabstMirror
e56cc0d74e
Limping / Splint Treatment (#6947)
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

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

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* cleanup

* Apply suggestions from code review

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

* formating, rename bone images

* Apply suggestions from code review

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

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn
2019-05-11 23:13:59 -05:00
PabstMirror
847d2d4179
Medical - Improve adjustment calcs / wound blood loss / medications (#6910)
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

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

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-27 14:12:11 -05:00
Dedmen Miller
50e3d8b3fe Fix macro argument counts (#6962) 2019-04-27 06:05:29 -07:00
Rutger "RedBery" Meijering
c392236843 Medical activity to non local units is not logged (#6925)
* Fixes medical events not appearing in MP (when unit is non local)
Adds name to AUTHORS.txt (forgot to do this in other PRs)

* Fixes missing oef line

* Update addons/medical_treatment/XEH_postInit.sqf

Co-Authored-By: redbery <rutger@meijering.me>

* delete rogue character
2019-04-07 17:41:28 -05:00
PabstMirror
9588b13942 Zeus/Medical - Fix modules for rewrite (#6914)
* Zeus/Medical - Fix modules for rewrite

* move wakeup logic to medical_treatment
2019-04-03 06:17:17 -07:00
Katalam
55a7d53437 Medical - Add condition for surgicial kit (#6916)
* Added condition canStitch

* Update XEH_PREP.hpp

* Update addons/medical_treatment/functions/fnc_canStitch.sqf

Co-Authored-By: Katalam <39590058+Katalam@users.noreply.github.com>

* Added example, removed arguments information and changed > to isEqualTo

* Added example in canBandage too
2019-04-03 04:36:37 -07:00
mharis001
30b99fa20a Medical Rewrite - Remove dropDownTriageCard function (#6907)
* Remove dropDownTriageCard function

* Delete fnc_updateTourniquets.sqf
2019-03-30 16:06:36 -05:00
SilentSpike
ac1651c6db Prevent bandaging when not bleeding (#6532) 2019-03-30 15:44:58 -05:00
PabstMirror
f2b9bf3a17 Update headers 2019-03-30 11:07:54 -05:00
PabstMirror
7f2ac32180 Fix event for items conversion 2019-03-30 09:56:21 -05:00
PabstMirror
751ddb64ac
Handle old public funcs, fix strings (#6890)
* Handle old public funcs, fix strings

* Update addons/medical/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-03-24 22:17:46 -05:00
mharis001
8d2bba4b35
Rewrite Medical GUI (#6831)
* Add a macro for the bloodloss scaling factor

* Adjust bloodloss threshold for red icon

* Remove bloodloss color scaling factor

The issue is actually the other way round, the factor of 20 would
instantly make bodyparts red on taking a wound.

* Implemet 10 color steps provided by ShackTac

This replaces the old method of colouring the interaction menu icons
and body image selections with a new method that has 10 distinct color
steps (matching across the icons and the body image).

* Use macros for constants

* Implement blue damage colouring

This re-adds visualisation for colouring based on damage. The case where
a limb has a tourniquet will hopefully be handled by an overlayed icon.

* Tidy up file structure

* Move patient information display to medical_ui

* Make common colour conversion code into functions

* Add tourniquet icon overlay to body image

* Fix mispelling I forgot to commit

* Update icon paths to new white cross icon

* Clean mess after rebase

* Add new medical menu gui

* Add updating injury list and body image

* Add updating treatment category buttons

* Update onMenuClose function

* Delete unused functions

* Add action buttons and triage card to menu

* Move medical menu PFH to separate function

* Move setTriageStatus to treatment

* Add triage select dropdown

* Add toggle button action

* Fix mouse moving randomly when opening

* Add logs list update and remove unused functions

* Hide tourniquet icons by default

* Remove CfgInGameUI (already in feedback)

* Update patient info display

* Update triage card display

* Add settings to control interact menu actions

* Cleanup files/paths

* Move triage status update to common function

* Add icons for interact menu actions

* Modify icon color for interact menu actions

* Update canOpenMenu for new setting

* Hide pain information for unconscious

* Stringtable cleanup

* Use switch for pain text

* Change minor triage status to minimal

* Fix injury list to use new stringtable entry names

* Fix medical actions check when disabled

* Skip distance check in same vehicle

* More cleanup

* Fix CI error

* Requested changes

* Fix INJURIES string

* Fix include after comment block

* Fix missing ;

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-03-24 18:17:48 -04:00
PabstMirror
f23927d84a Fix some strings 2019-03-24 00:50:36 -05:00
PabstMirror
2d0090422c move settings to sqf 2019-03-24 00:37:39 -05:00
Magnetar
cc11ad051d Formatting. Lazy eval 2019-03-21 14:34:51 +01:00
Magnetar
89927a8b94 Missing privates. Lazy evaluation. 2019-03-17 21:26:15 +01:00
Magnetar
99f5d2ea0a
Rewrite rectify convert option (#6825)
* Rewrite Rectify - Adding option to convert vanilla medical gear

* Oops
2019-03-17 17:59:49 +01:00
Magnetar
1d34cc4cc0
Rewrite rectify. Medical - Add vehicle hint when loading unconscious (#6822)
* Rewrite rectify. Medical - Add vehicle hint when loading unconscious

* Fix copy paste
2019-03-17 17:54:50 +01:00
Magnetar
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
SilentSpike
0e8ed5315e
Remove patient treatment animations (#6524)
* Prevent treatment animation on dead bodies

This was causing bodies to glitch out on dedicated servers according to
feedback

* Remove patient animation logic and setting
2018-08-12 12:28:48 +01:00
SilentSpike
923c25163f Fix missing boolean return in CPR 2018-08-12 11:50:47 +01:00
Zakant
14d52ee77e Remove CPR alive check (#6492) 2018-08-12 08:57:23 +01:00
Dedmen Miller
c1c5d6d63c Remove collision of bandage litter (#6495)
* Remove littergeneric collision
* Remove collision/shadow from non-litter items
* Remove quik clot litter shadow
* Add empty shadowLOD to litter
2018-08-11 17:52:26 +01:00
Rutger "RedBery" Meijering
0a97ef3cc8 Fix event name overlap and macros (#6514) 2018-08-11 11:40:06 +01:00
Zakant
88238dd0b5 Fix wrong macro (#6509) 2018-08-08 09:54:17 +01:00
SilentSpike
9e5c4a7ed9
Move medical settings into their respective components (#6493)
* Transfer medical AI to CBA setting
* Neuter the old settings module

I've left the entry in CfgVehicles so that it doesn't cause errors on
older missions, but it's just a dumb logic now and does nothing.

* Remove medic setting
* Move increaseTraining setting
* Move fnc_adjustPainlevel to medical_status
* Move pain and bleed coefficients to medical_status
* Move advanced bandages to medical_treatment
* Move advanced medication to medical_treatment
* Move advanced diagnose to medical_treatment
* Move wound reopening and screams settings
* Move damage threshold settings
* Move showPain setting
* Move statemachine settings
* Move pain visualisation setting
* Move all treatment usage settings
* Move self IV setting
* Move remaining settings
* Sort treatment setting string categories
2018-08-06 17:08:43 +01:00
Dedmen Miller
7a0a00ea09 Cleanup using SQFLint (#6485)
* Use private
* Fix wrong spacing
* Fix wrong variable being used
* Cleanup empty line after header
* ace_common_fnc_getCountOfItem
* Remove useless _return variable
* Naming
2018-08-02 15:02:10 +01:00
Zakant
60a8158246 Fix GUI bodypart string names (#6490)
* Fixed new names in stringtable
* Removed duplicated entries from stringtable
* Fixed comma
2018-08-02 09:43:30 +01:00
Dedmen Miller
6bd8542eed Move #includes before function headers (#6484) 2018-07-30 10:22:14 +01:00
Thomas Kooi
c9ad92e92d
Disable debugging (#6482) 2018-07-30 00:07:30 +02:00
Thomas Kooi
36f2c5fcc9 Minor code clean up (#6474)
* Minor code clean up
* refactor(medical): shorten some code
* refactor(medical): use macros for tourniquets
* refactor(medical): pull cache expiry values into script_macros_medical
2018-07-29 22:43:14 +01:00
Thomas Kooi
e22f35da37 Remove medkit (#6473)
Due to be replaced by an alternative treatment option such as a split
2018-07-26 17:14:11 +01:00
SilentSpike
873ed90cc1
Introduce bleedout condition and fix IV hemorrhage (#6470)
* Introduce bleedout condition and fix IV hemorrhage
* Update patient info display hemorrhage values
* Update UI info hemorrhage values
2018-07-25 11:40:37 +01:00
SilentSpike
39b1d144e1
Vary time taken to bandage based on circumstances (#6467) 2018-07-25 09:35:04 +01:00
Glowbal
13cdb76dce Fix some more stringtable usage 2018-07-18 23:20:31 +02:00
Thomas Kooi
245a18599e Fix stringtable references 2018-07-18 23:19:27 +02:00
SilentSpike
ec7a9a133e
Fix required addons in medical restructure (#6441) 2018-07-18 19:19:28 +01:00
SilentSpike
4466f9e785
Strip medical component (#6442)
* Move litter to `treatment`
* Move eden object attributes to `treatment`
* Move treatment items to `treatment`
* Move bodybag handling to `treatment`
* Move state conditions to `statemachine`
* Move radio addon handling to `feedback`
* Move medical macros to `engine`
* Move medical extension to `damage`
* Fix texture and material paths after move
* Remove duplicate medical menu config
* Remove old faction class
* Remove a bunch of old code
2018-07-18 19:13:25 +01:00
SilentSpike
68ff7575eb
Move medical facility, vehicle and unit functions (#6440) 2018-07-18 11:09:48 +01:00
Glowbal
9d2e76e67a More component name fixes and small clean up 2018-07-15 16:24:04 +02:00
Thomas Kooi
78d91edae2 Fix statemachine not running 2018-07-15 14:21:41 +02:00
Thomas Kooi
19f3b753f0 Decrease treatment time of medication to 5s 2018-07-15 13:59:47 +02:00
Thomas Kooi
9c00c6ffb5 Fix bunch of script errors related to getVars on start up of game 2018-07-15 13:01:26 +02:00
SilentSpike
54c398a007 Use macros for peripheral resistance 2018-05-23 10:52:47 +01:00
SilentSpike
de2d7f2fb8 Use macros for hemorrhage class tracking 2018-05-22 18:25:50 +01:00
SilentSpike
c9e11e62a1 Use macros for status state variables 2018-05-22 18:06:28 +01:00
SilentSpike
ff33f8e954 Use macro for unconscious variable 2018-05-22 17:21:24 +01:00
SilentSpike
563742bdd8 Fix heart rate and pain suppression adjustments 2018-05-11 16:11:01 +01:00
SilentSpike
1dc934e1b1 Use macros for unit variables
Improves the way medical is storing variables in object space by having
a common list of variables names as macros. Makes the code a bit cleaner
and ensured consistency across components. Also a handy reference for
when working on medical to see what values are all stored.
2018-05-11 15:28:25 +01:00
SilentSpike
e0503129f0 Use blood bolume status macros 2018-05-10 17:44:02 +01:00
SilentSpike
4303a340de Fix stringtable duplicates and missing Key tag 2018-05-08 14:37:54 +01:00
SilentSpike
a16721a1ea Fix medical statemachine function calls 2018-05-08 11:12:01 +01:00
SilentSpike
697aa5dc08 Fix medical status function calls 2018-05-08 10:45:30 +01:00
SilentSpike
65f57361a4 Add blood pressure status macro 2018-05-08 09:28:16 +01:00
SilentSpike
7d55163463 Add missing PREPs 2018-04-27 15:43:41 +01:00
SilentSpike
895f08a215
Reset triage card on full heal (#6243) 2018-04-11 20:34:32 +01:00
commy2
b9d792ebcd merge 2018-01-02 15:08:10 +01:00
commy2
68228e9fef merge 2018-01-02 15:06:53 +01:00
Ľuboš Lendáč
38e7913caf Add HealTime modifiers to medical settings (#5188)
* Add modifiers of TreatmentTime of PAK and Medkit to settings

* Fix indents and stringtable tags

* Fix Healtime vars

* Absolute time for PAK to settings

* Add Medkit Healtime setting
2017-12-30 12:01:23 +00:00
commy2
4db844e596 merge 2017-12-23 01:47:43 +01: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
PabstMirror
4c28c4de22 Reset isLimping var 2017-09-26 17:43:54 -05:00
PabstMirror
0ff9a5bf64 Add error logging 2017-09-23 12:09:35 -05:00
PabstMirror
04db4add26 Remove unused addUnloadPatientActions 2017-09-23 11:58:49 -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
PabstMirror
9e1a9b9af9 Fix bad var names 2017-05-14 15:14:22 -05:00
PabstMirror
690e415ffe Minor cleanup 2017-03-25 11:36:37 -05:00
Zakant
1fb6521021 Added checkItem on loadout change (#5021) 2017-03-25 11:08:47 -05:00
Zakant
14e146cbeb Added missing dot 2017-03-23 18:44:45 +01:00
Zakant
7bd2725f29 Fixed space after if 2017-03-23 18:40:18 +01:00
Zakant
f8a2d404e2 Fixed more typos 2017-03-23 18:17:38 +01:00
Zakant
b5a48bb4dc Fixed newline after include 2017-03-23 17:32:03 +01:00
Zakant
ff823e0590 Fixed space 2017-03-23 17:27:53 +01:00
Zakant
ad1e233a29 Fixed indentation 2017-03-23 17:27:11 +01:00
Zakant
89cf679af3 Replaces return by 2017-03-23 17:26:16 +01:00
Zakant
07033061e3 Fixed function headers 2017-03-23 17:23:18 +01:00
Zakant
d47d183119 Fixed typo 2017-03-23 16:55:00 +01:00
Zakant
2cfeb5a10e Fixed missing bracket 2017-03-23 15:30:08 +01:00
Zakant
6ed90496a2 Added calculateBlood function 2017-03-23 15:30:03 +01:00
Zakant
327124003c Fixed condition expression 2017-03-23 15:30:01 +01:00
Zakant
58ed8a6c81 Modified cpr condition 2017-03-23 13:41:49 +01:00
Zakant
59c4485ef9 Only create pulse if their isn't any 2017-03-23 13:36:57 +01:00
Zakant
86bf9f4262 Fixed progress callback 2017-03-23 13:34:25 +01:00
Zakant
c790d0eb3e Added failure callback 2017-03-23 13:32:49 +01:00
Zakant
918a62ebce Implemented cpr failure function 2017-03-23 13:32:14 +01:00
Zakant
d815bd8bdc Added cpr failure function and fixed PREP mistake 2017-03-23 13:30:40 +01:00
Zakant
a570a6862c Modified CPR success to work with pulse 2017-03-23 13:28:01 +01:00
Zakant
d9aab91f97 Implemented cpr progress function 2017-03-23 13:26:06 +01:00
Zakant
b1dc4e0c52 Added progress function, reorganized PREPs 2017-03-23 13:21:36 +01:00
Zakant
0cad7d0da6 Fixed arguments and function header 2017-03-23 13:19:25 +01:00
Zakant
5714374a99 Added function to PREP 2017-03-23 13:17:04 +01:00
Zakant
477496e4f6 Added cpr start callback and function 2017-03-23 13:15:17 +01:00
Zakant
c1238501d3 Added CPRcreatePulse setting 2017-03-23 13:14:38 +01:00
Zakant
0d329e0f63 Added startCallback config entry 2017-03-23 13:03:19 +01:00
ulteq
0ddfd5eb16 Disable wound reopening when advanced bandages are disabled 2016-12-15 14:51:24 +01:00
ulteq
cc19499e8f fieldDressing -> FieldDressing 2016-12-15 14:06:09 +01:00
ulteq
9ddaa01462 Always allow the use of tourniquets
* Even when advanced bandages are turned off
2016-12-15 14:05:08 +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
0d0cf38028 Fix bandage reopening classname/category lookup 2016-12-14 21:17:39 +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
ulteq
dafefda04a Fixed typo
Closes: https://github.com/acemod/ACE3/pull/4697
2016-12-14 18:33:36 +01: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
6b611ffbbd Cleanup: 'handleBandageOpening' 2016-12-10 16:36:36 +01:00
ulteq
a3fd916d21 Do not restore blood volume in partial heal 2016-12-10 16:30:05 +01:00
ulteq
1bc1865313 Minor cleanup: 'treatmentBandageLocal' 2016-12-10 15:39:03 +01:00
PabstMirror
b87bdfe14a Fix body-bag action / cleanup 2016-12-09 21:03:52 -06:00
ulteq
ada43148e9 Removed deprecated revive settings 2016-12-09 17:07:05 +01:00
ulteq
82e88061fc Added 'DEFAULT_HEART_RATE' constant 2016-12-09 12:57:27 +01:00
ulteq
c486f17539 Implemented Medkit (works like in ACE2) 2016-12-08 18:11:24 +01:00
ulteq
b81a5adcb9 Renamed 'healTime' calculation helper 2016-12-08 12:30:59 +01:00
ulteq
9dee5a9083 Don't remove wounds on partial heal 2016-12-08 12:16:11 +01:00
ulteq
beb1c7036c Removed todo flag 2016-12-08 11:55:38 +01:00
ulteq
280943cb4d Fixed occluded medication (tourniquet removal logic) 2016-12-08 11:54:59 +01:00
ulteq
78bfc0c26d Simplified damage storage 2016-12-08 11:38:43 +01:00
ulteq
6ce1910a96 Fix partial heal 2016-12-07 18:53:12 +01:00
ulteq
8c5da66c43 Increase "basic medication" effectiveness of morphine 2016-12-07 18:41:42 +01:00
ulteq
0c8ebd6441 Slightly increase Tourniquet 'treatmentTime' 2016-12-07 17:56:59 +01:00
ulteq
09f6f2284b Tweaked morphine config 2016-12-07 17:46:16 +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
b2838557fa Removed dead code 'hrCallback' 2016-12-06 18:55:54 +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
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
a88be4f458 Fixed 'displayPatientInformation' 2016-12-05 23:00:02 +01:00
ulteq
624315524e Fixed typo 2016-12-05 21:39:47 +01:00
ulteq
a5ce5b4a34 Medical Rewrite - Continued (#4744) 2016-12-05 21:34:20 +01: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
519ea25fc7 cleanup 2016-10-15 13:48:13 +02:00
commy2
633c6f0ce4 formating 2016-10-13 21:21:42 +02:00
commy2
6b84bd1ff6 fix misc. treatment actions 2016-10-13 21:11:13 +02:00
commy2
e03614757e fix misc. treatment actions 2016-10-13 21:08:41 +02:00
commy2
03fe2826dd remove some debug 2016-10-13 20:31:39 +02:00
commy2
f2dfc6dc0e fixes, tweaks 2016-10-13 20:17:21 +02:00
commy2
ba2d6fda8a treatment tweaks 2016-10-13 17:39:01 +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
2d243d45f3 fix tourniquets 2016-10-13 10:28:28 +02:00
commy2
e1cbeeea16 fix tourniquets 2016-10-13 10:12:28 +02:00
commy2
5965326ca1 merge basic and adv. bandage actions 2016-10-13 09:47:52 +02:00
commy2
b1f0af7e1c merge basic and adv. bandage actions 2016-10-13 09:10:08 +02:00
commy2
68d199c5b2 merge basic and adv. bandage actions 2016-10-13 02:05:14 +02:00
commy2
4a06d19ce4 merge basic and adv. bandage actions 2016-10-13 01:55:10 +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
3438ea0946 use liters for blood volume variable 2016-10-10 17:30:42 +02:00
commy2
4bc1c1db56 handle blood visuals 2016-10-07 04:21:01 +02:00
commy2
b698a88dc1 move modifyAction func to menu component 2016-10-07 01:58:40 +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
feac296f9c use a new macro 2016-10-02 13:06:47 +02:00
commy2
f185742e68 manual merge 2016-10-02 12:51:29 +02:00
commy2
490155270b QEGVAR vs QGVAR 2016-09-30 12:18:59 +02:00
commy2
1196cbb210 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-09-30 10:39:06 +02:00
commy2
96a1e74c85 synch anim speed acceleration 2016-09-30 10:38:27 +02:00
PabstMirror
60a7490b7e Fix some moved funcs/strings 2016-09-29 15:08:36 -05:00
commy2
03e24d8fd9 improve checkItems function 2016-09-29 21:32:54 +02:00
commy2
f53d324c0d simplifications in the treatment config 2016-09-29 20:29:44 +02:00
commy2
20a544e549 remove debug mode 2016-09-29 19:45:03 +02:00
commy2
ef8ad21446 fix inconsistencies in treatment time between basic and adv, fix item usage 2016-09-29 19:43:50 +02:00
commy2
e418cc05e9 cleanup, fix headers treatment has/use item functions 2016-09-29 19:31:48 +02:00
commy2
d3f6f040cd fix some problems with transitions from lowered weapon animations 2016-09-29 19:15:16 +02:00
commy2
2c7864c02b implement custom treatment sounds 2016-09-29 18:45:18 +02:00
commy2
ecd77630f5 some more animation time tweaks 2016-09-29 18:12:51 +02:00
commy2
36d244a868 'modernize' primary treatment functions, fix animation issues, add anim speed scaling 2016-09-29 16:00:19 +02:00
commy2
410c5f1d5f treatment debug 2016-09-28 20:46:46 +02:00
commy2
0decd72063 manual merge 2016-09-28 08:37:39 +02:00
commy2
7470d1f0f5 cleanup/improve parseConfigForinjuries 2016-09-27 11:05:38 +02:00
PabstMirror
39fa0b5d0e #4366 - Fix treatment animion with no weapon equiped 2016-09-21 15:55:29 -05:00
commy2
8937a27b96 port litter settings to treatment, stringtable fixes 2016-09-19 18:20:56 +02:00
commy2
c2f8007d36 port litter settings to treatment 2016-09-19 18:05:49 +02:00
commy2
10d4047b4c fix problems with ported treatment 2016-09-19 17:52:16 +02:00
commy2
158b1eed69 add server only event handler only on server machine 2016-09-19 10:05:16 +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
Glowbal
1c1e47c039 Enable treatmnet actions 2016-09-18 19:48:49 +02:00