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

458 Commits

Author SHA1 Message Date
johnb432
9f0ba6a759 Take setting into account 2024-08-04 15:38:42 +02:00
johnb432
8e8d7dca36 Merge branch 'master' into medical-enable-setting 2024-08-03 10:56:40 +02:00
Enrico Machado
4e56d58210
Translations - Add and Improve Portuguese (#10155) 2024-07-30 20:45:31 -05:00
johnb432
066ea1424e Stop messing with type of healing items 2024-07-28 15:50:39 +02:00
johnb432
6d65fc42e8 Use variable to enable/disable aspects 2024-07-17 21:49:23 +02:00
johnb432
96501b0087 Merge branch 'master' into medical-enable-setting 2024-07-17 17:05:20 +02:00
V1nsyara
ec5b84c278
Translation - Small update Russian (#10115) 
* Translation - Update Russian for new features

* Up to date translate RU

* Small update medical treatment

* resolve problem

* i`m cry

i hate this conflict
 2024-07-14 21:46:14 -05:00
johnb432
b7d1bc5bb6 Minor tweaks 2024-07-14 11:10:53 +02:00
johnb432
77e55021d0 Merge branch 'master' into medical-enable-setting 2024-07-14 10:54:58 +02:00
Fabio Schick
b013ab81d5
Translations - Italian and German (#10087) 
* Grenades italian+german translation

* Fix english typo in MicroDAGR

* Medical Treatment italian+german translations

* Realisticnames italian+german translations

* Hitreactions italian+german translations

* Fix italian typo in 3 addons

* Cookoff italian+german translations

* Killtracker italian+german translations

* Zeus italian+german translations

* Overpressure italian+german translations

* Compat RF italian+german translations

* Realisticnames Fix italian+german oversight

* Compat WS italian+german translations

* Compat CUP-CSW italian translations

* Compat CUP-NVG italian translations

* Fixup overpressure
 2024-06-24 16:44:41 -05:00
V1nsyara
05d6327e5e
Translation - Update Russian for small features (#10085) 
* Translation - Update Russian for new features

* Up to date translate RU
 2024-06-22 20:24:00 -05:00
Psycool
c9e82afff7
Korean translation updated (#10077) 
* 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

* Korean translation updated

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-06-22 14:47:23 -05:00
Mike-MF
1c6c4d6bff
All - Fix parentheses around code (#10073) 
* Fix Brackets around code

* Update fnc_handleFired.sqf

* Shouldn't have changed this one

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-06-18 14:08:03 +00:00
Grim
59af3e1f6d
General - Change CBA Namespaces to HashMap (#8801) 
* medical_treatment

* advanced_throwing

* common, csw

* Update fnc_replaceRegisteredItems.sqf

* Sanitised numerous components

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* FUNC -> LINKFUNC

* Changed tagging hashmap

* Reverted some changes

* Reverted some changes

* Update XEH_clientInit.sqf

* Tweaks and fixes

* Fix number replacements

* Minor cleanup

* Update fnc_getMagazineName.sqf

* Update fnc_getMagazineName.sqf

* Minor improvement

* Made factions case-sensitive and added `toLowerANSI` to be safe

* Update fnc_getDetectedObject.sqf

* Update addons/common/functions/fnc_actionKeysNamesConverted.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Throw error if item doesn't exist

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-06-11 12:34:32 -03:00
V1nsyara
41d6cae93b
Translation - Update Russian for new features (#10060) 2024-06-10 21:28:30 -05:00
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
Apricot
46e840b5a2
Translations and Compat - Improve Japanese and CDLC WS/RF localization (#10058) 
* Update Japanese

* rename smoke

* Leo2SG

* Rename FAL Para to FAL OSW Para

* Fix wood as woodland in japanese

* change camo to aaf camo in jp

* Rename RF R1 to equalize with WS R1

* Add dedicated name config VRCO-S

* Add stringtable for VRCO-S
 2024-06-09 18:21:00 -05:00
PabstMirror
05ebe1f48f
Medical Treatment - Allow diagnosing cardiac arrest with clear language (#9997) 2024-05-23 17:25:59 -05:00
Abogado
6972f02bc4
Translation - Add Missing Spanish (#10001) 
Translation to Spanish

Translation to Spanish
 2024-05-10 20:42:55 -05:00
johnb432
2a3ff8e185
Medical Treatment - Fix low SpO2 making units go into cardiac arrest again (#10003) 
* Set SpO2 after successful CPR

* Update fnc_cprLocal.sqf

* Add API

* Update fnc_cprLocal.sqf
 2024-05-10 20:39:41 -05:00
johnb432
60b87f0b41
Medical - Add _createLitter to medical events (#9959) 
Added `_createLitter` to medical events
 2024-04-26 17:35:57 -05:00
Apricot
b513a110f5
Translations - Improve Japanese localization (3.17.1) (#9977) 
Tweaks
 2024-04-26 17:34:11 -05:00
johnb432
4329302a65 Merge branch 'master' into medical-enable-setting 2024-04-19 22:30:56 +02:00
Tim Beswick
23842aab39
Medical - Fix script error when bandaging (#9956) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-04-19 16:57:41 -03:00
johnb432
dda6b9d2dc
Medical Treatment - Enforce bandage effectiveness variable type (#9950) 
Enforce bandage effectiveness variable type
 2024-04-16 13:33:40 -07:00
V1nsyara
32707dd860
Language Russian - Update translation (#9947) 
Russian
 2024-04-13 14:53:50 -05:00
PlayerBotPro
6165b46ab6
Medical Treatment - Fix Painkiller has no effect when Advanced Medication is off (#9942) 
* fix: Painkiller has no effect when Advanced Medication is off

* Change PainKillers_PAIN_SUPPRESSION to uppercase

* Update addons/medical_treatment/functions/fnc_medicationLocal.sqf

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-04-11 12:58:50 -03:00
PabstMirror
5ca3465b8a
Medical Treatment - Only create litter on empty container (#9924) 2024-04-06 22:11:51 -03: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
BrettMayson
3c5b46c42d
Medical - Support Magazine Treatment Items (#9816) 
* count treatment items

* getCountofItem

Co-Authored-By: Blue <itzblueman@gmail.com>

* getCountofItem fix

Co-Authored-By: Blue <itzblueman@gmail.com>

* convert painkillers to magazine

* use isclass

Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>

* forget to change variable

* Update addons/medical_treatment/functions/fnc_hasItem.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* better magazine adjustment

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

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

* Update addons/medical_treatment/functions/fnc_medication.sqf

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

* Update addons/medical_treatment/functions/fnc_treatmentFailure.sqf

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

* Update docs/wiki/framework/arsenal-framework.md

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

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

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

* Header

* use switch statement in fnc_useItem

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

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

* only check adding to mags that are not full

Co-Authored-By: LinkIsGrim <salluci.lovi@gmail.com>

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Update fnc_getCountOfItem.sqf

* Optimisations & header fix

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Fixed vehicle implementation

---------

Co-authored-by: Blue <itzblueman@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-03-21 22:56:24 +01:00
BrettMayson
c5b54c65a8
Medical Treatment - Fix bandage effectiveness (#9865) 
* fix broken bandages

* update params
 2024-03-19 08:56:05 +01:00
Apricot
e7827813ee
Translations - Improve Japanese localization 3 (#9864) 
Japanese
 2024-03-18 21:59:54 -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
Grim
8e975a6b91
Medical Treatment - Add hook to modify bandaging treatment (#9814) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-09 14:15:24 -03:00
Grim
e06c6f7835
General - Replace toLower with toLowerANSI where applicable (#9790) 
* General - Replace toLower with toLowerANSI where applicable

* whoops

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

* Update addons/repair/functions/fnc_setHitPointDamage.sqf

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

* Update addons/repair/dev/draw_showRepairInfo.sqf

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

* Update addons/tagging/XEH_preStart.sqf

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

* Update addons/vehicle_damage/functions/fnc_handleCookoff.sqf

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

* Update addons/tagging/XEH_preStart.sqf

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

* comparment -> compartment

* Update fnc_showHud.sqf

* Update fnc_registerObjects.sqf

* Update addons/common/functions/fnc_cbaSettings_settingChanged.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-07 22:08:13 +01:00
BrettMayson
67fa53fd2c
General - Events for Mods (#9813) 
* full heal local

* update body image

* log list

* better _enable in categories

* update injury list

* cardiac output internal variable

* typo

* remove duplicate event

* rename event

* add docs

* Update docs/wiki/framework/events-framework.md

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-03-04 15:08:12 -06:00
BrettMayson
fd22ff04c5
Medical GUI - Display IV Type (#9817) 
Co-authored-by: MisczczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-03-03 19:45:12 -03: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
BAXENdev
a0f3933bf0
Medical - Change max medication dosage behavior (#9746) 
* Consistentency Update with Overdosing

* Added Description to Condition Cases

* Updated to CASE 2

Overdose behavior:
ODs on uses `_maxDose + {1 or 2 or 3}` from `_maxDose + {0 or 1 or 2}`

* Update fnc_onMedicationUsage.sqf

* Update fnc_onMedicationUsage.sqf

* Added riskDose range and updated medications

* maxDose -> maxSafeDose | riskDose -> chanceDoses

* Fixed maxDose reference in trace

* Added chanceDoses to trace

* Fixed use of TRACE macro

* Updated comments and variable maxSafeDose -> maxDose

* Updated comment and overdose formula

* chanceDoses -> maxDoseDeviation

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

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

* Update addons/medical_treatment/ACE_Medical_Treatment.hpp

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-13 02:45:04 -08: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
PabstMirror
a3aef6a066
General - Cleanup spaces in macros (#9769) 
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-02-05 14:04:24 -03:00
Grim
4bb9d6c42c
Medical - Add Painkillers (#9720) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-05 10:56:25 -03:00
BrettMayson
1e404cf85b
General - SQF Improvements (#9698) 
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-04 14:50:24 -03:00
Apricot
a97a8dbb73
Translations - Improve/Add Japanese localization (#9760) 2024-02-04 05:57:39 -03:00
Grim
7bc3fab533
Medical - Fix getting no pulse on a dead patient receiving CPR (#9756) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-01-22 19:44:42 -03:00
johnb432
7f998c3234
Inventory - Improve multiple aspects (#9706) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-01-06 18:26:46 -03:00
Psycool
508693f152
Translations - Korean updated (#9678) 
* 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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-12-12 09:44:51 -06:00