Commit Graph

61 Commits

Author SHA1 Message Date
Nilia119
d66c3904d0
Translation - Add Missing German (#9975)
* Added Missing German Translation

* Improved German Translation

* Update Medical_treatment

* Update Medical_treatment stringtable.xml

* Update addons/common/stringtable.xml

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update addons/arsenal/stringtable.xml

---------

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
2024-06-09 18:21:36 -05:00
Abogado
6972f02bc4
Translation - Add Missing Spanish (#10001)
Translation to Spanish

Translation to Spanish
2024-05-10 20:42:55 -05:00
Hexo
020d21d562
Translate - French (#9908)
* Translate - French

* Translate - French - overheating

* Translate -French - compat_sog

* Update stringtable.xml

* Translate - French

* Fix - Translate French

Minor correction
2024-04-02 23:04:56 -05:00
Psycool
cbb160c1e0
Korean translation updated (#9883)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml

* Korean Translation Added

Added Korean translation related to Cargo Refuel

* Merge branch 'master' of https://github.com/Psycool3695/ACE3

* Korean translation Add/Updated

* Fixed wrong strings

* Korean translation improved

* Korean translation updated

* Korean translation updated

* Fix Merge

* Update stringtable.xml

* Update stringtable.xml

* Korean translation updated

* Korean translation minor fix

* Korean translation fixed

* Korean translation updated

* Update stringtable.xml

* Spacing fixed

* Korean translation updated

* Spacing fixed

* Korean translation updated

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-03-28 13:58:02 -05:00
Fabio Schick
d54ba4ddcf
Translations - Complete Italian (#9844)
* Arsenal Italian Translations

* Cargo Italian Translations

* Hearing Italian Translations

* Killtracker Italian Translations

* Map Tools Italian Translations

* Markers Italian Translations

* Medical GUI Italian Translations

* Medical Treatment Italian Translations

* Medical Vitals Italian Translations

* Overheating Italian Translations
2024-03-09 17:58:15 -06:00
V1nsyara
a3b9c53fd8
Translations - Russian - Fix (#9841)
Russian Translate - Fix
2024-03-09 16:56:33 -06:00
Apricot
b828a14afa
Translations - Improve Japanese localization (#9812)
* update japanese

* update

* Update stringtable.xml

* dogtag wording to ID tag
2024-03-01 19:23:33 -06:00
V1nsyara
4d487dc33e
Translations - Russian (#9802)
Update Russian Translate
2024-02-20 19:22:38 -06:00
BrettMayson
1649422cbd
Medical Vitals - Add SPO2 (#9360)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-07 17:50:18 -03:00
BrettMayson
95e06254eb
Tools: HEMTT ignore has_include (#9613)
* Tools: HEMTT ignore has_include

* Fix make.py and sqfvmChecker.py for changes

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-11-03 12:30:20 -05:00
PabstMirror
902e365536
Tools - Update addon.toml to HEMTT 1.9.1 (#9511)
Tools - Update addon.toml to hemtt1.91
2023-10-18 14:19:20 -05:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
Dystopian
10ffcea9b7
Optionals - Add No Medical and No Realistic Names components (#8187)
* Add nomedical and norealisticnames components

* Add fire component disabling

* Make it work

* remove headlight skipping

* update preprocess syntax

* fix git screwup

* Apply suggestions from code review

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-03 21:56:54 -04:00
pterolatypus
67842a2656
Medical Vitals - Add event to vitals loop (#8891)
* Added event to vitals loop

* Pass deltaT to event

* Added event to documentation
2022-05-03 18:04:58 -05:00
PabstMirror
efe09682cc
Add SQFC support (#8235)
* sqfc

compile_script
cba 3.15.5 and update make.py

* \n

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

* Update make.py

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-09-03 19:08:34 -05:00
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929)
* Utilize isNotEqualTo

* undo changes to some files

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

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-02-27 11:05:05 -06:00
Rutger "RedBery" Meijering
7de6196c52
Fixes typo in medication adjustment check (#7759) 2020-06-15 09:53:25 -05:00
diwako
35d99ddc7e Fix suppression for basic medication 2020-01-07 20:35:22 +01:00
PabstMirror
654feca3a1
Medical Feedback - Change pain scream frequency based on intensity (#7238)
* Add setting for pain scream frequency

* Apply suggestions from code review

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* remove setting

* Update stringtable.xml

* Update script_component.hpp
2019-12-17 11:17:49 -06: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
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
8483a4bcdc Medical - Fix severity of wound bleeding and adjust cardiac output calculations (#7010)
* Fix severity of wound bleeding

I'm simplifying the nastiness calculations so that the wound config
specifies the worst wound and we scale it between 25% to 100% based
on the wound damage and number of wounds recieved.

Similarly I've updated the wound configs to more reasonable maximum
bleeding values based on the fact that they're percentages of cardiac
output being bled.

* Limit variance of pain modifier

This is to avoid unexpectedly high pain for small wounds or unexpectedly
small pain for large wounds

* Make more wounds increase chance for nastiness

Rather than guarantee

* Adjust worst damage scaling

This handles torso wounds better as they're typically around 0.3-0.6 for
6.5mm shots which makes them roughly medium sized.

* Fix cardiac output calculation

Previously the calculation didn't make sense as it wasn't outputting
a value in l/s. This method of calculation makes more logical sense and
provides a point of reference for what the bleeding values actually
represent (percentage of the blood being pumped that is lost - which now
has an actual volumetric value).

* Fix blood pressure after change to cardiac output

* Fix heartrate skyrocketing between 5l and 4l blood

Pretty sure someone accidnentally got these conditions the wrong way
around. This way blood pressure will first drop and then heart rate will
later go up to compensate.

* Fix comment typo

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-06-10 11:23:21 -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
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
Rutger "RedBery" Meijering
15036d7fd8 Fixes to unconsciousness and damageTypes systems (#6589)
* Fixes BleedingCoef having impact on bloodloss KO
Fixes incorrect var in setUnconscious

* Changes method for checking if typeOfDamage is valid
Adds check for if typeOfDamage is valid to extension version of woundsHandler

* Changes collision wound location select to a weighted system to make it more lethal at faster collisions
Adds collision and drowning damage types to config (drowning has no related wounds to prevent wounds being added while drowning).

* Fixes unneeded space

* Fixes minor mistake (body damage chance should go from 1 to 0 without ever becoming negative)
2019-03-21 19:33:51 +01:00
Rutger "RedBery" Meijering
5fbaf426a8 Fix various bugs (#6523)
* Fix medical menu not reopening regardless of setting
* Ensure no heartrate or bloodpressure on death
* Fix status variables not being reset on respawn
* Fix JIP resetting status variables for all units
* Fix heart rate adjustment overflow and
2018-08-14 21:34:35 +01:00
Rutger "RedBery" Meijering
0a97ef3cc8 Fix event name overlap and macros (#6514) 2018-08-11 11:40:06 +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
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
9e26833b94
fix(medical): make sure vitals handling works properly again (#6481) 2018-07-29 23:16:06 +02: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
TheMagnetar
b8cd85135e Changes unit vitals rw (#6449)
* Some changes to UnitVitals

* increase to 40% chance

* Added bloodpressure L above limits cardiac arrest
2018-07-20 22:49:55 +02:00
TheMagnetar
5c768f7784 Fix duplicate entry (#6448) 2018-07-18 21:53:54 +02:00
TheMagnetar
3054803e44 Improvements to vitals and display (#6444)
- Improvements to vitals and display
- Fixes some undeclared variables
- Adds advanced diagnose: hemorrhage classes.
- Original idea for displaying hemorrhage classes belongs to @Arcanum417
2018-07-18 21:38:00 +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
Thomas Kooi
c9c8d25017 Move vitals loop statemachine events into switch statement (#6443)
- Induce cardiac arrest if unit blood volume drops below half
2018-07-18 11:09:09 +01:00
Glowbal
f552acd7da Fix incorrect macro usages with whitespace 2018-07-15 16:25:14 +02:00
Thomas Kooi
14db38e0f0 Fix various namespace issues with medical 2018-07-15 15:00:16 +02:00
Thomas Kooi
78d91edae2 Fix statemachine not running 2018-07-15 14:21:41 +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
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
267c0b5c3c Fix some moved function calls 2018-05-09 16:52:26 +01:00