20676a2f03
Translations - Improve Japanese Medical Localization ( #9611 )
2023-11-01 19:40:42 +01:00
e2154439a8
Medical Treatment - Add separate actions for colored body bags ( #9598 )
...
* medical treatment: separate actions for each bodybag
* remove extra icons
2023-10-30 16:54:29 -04:00
37c4420da5
Configs - Fix case ( #9592 )
2023-10-27 20:55:42 -04:00
d53bc62e27
Translation - German Addition/Improvement ( #9587 )
...
* Added German Translation
* 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
* Update stringtable.xml
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de >
* Update stringtable.xml
* Update stringtable.xml
---------
Co-authored-by: Jo David <github@jonathandavid.de >
2023-10-26 15:33:41 -05:00
c52c543f4b
Medical Treatment - Fix missing semicolon ( #9591 )
...
Fix missing semicolon
2023-10-26 20:04:58 +00:00
0a83b6e840
Translations - Add missing french translations ( #9577 )
...
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com >
2023-10-24 16:47:24 -04:00
b8a9376a65
Medical Treatment - Use Laws of War bodybag model and add colored bodybags ( #9371 )
...
* add colored bodybags
* fix dogtags, add icons, revert item model to original
* Retexture ace's item model
* Keep original vehicle classname
* Update fnc_placeInBodyBagOrGrave.sqf
* fix displayName
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-10-24 15:16:52 -04:00
0f38de2bd0
Translations - Portuguese ( #9576 )
...
Fixed Portuguese typos
2023-10-24 13:59:21 -04:00
eefa53221d
Translations - Korean ( #9573 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-10-24 14:23:12 +02:00
12f0cbbef9
Translations - Add French Translations ( #9557 )
...
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com >
2023-10-22 14:44:37 -05:00
c7bf57c71c
Medical Treatment - Add missing sutures to advanced crate ( #9553 )
...
add missing sutures to advanced crate
2023-10-21 11:01:33 -04:00
642ca3c14d
Medical - Make dug graves respect terrain slope ( #9545 )
...
* slope dug graves
* remove parentheses
2023-10-20 02:40:48 +00:00
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
c92eca7751
Medical Treatment - Improve display name for arsenal tab ( #9525 )
...
* add new display name for arsenal tab
* german language added
* Update stringtable.xml
* Update stringtable.xml
2023-10-18 15:02:30 -04:00
124baca84b
Korean translation improved ( #9500 )
...
* 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
2023-10-16 01:48:08 -05:00
fb55508c99
Translations - Add Polish Translations ( #9489 )
...
* Translations - Add Polish Translations
**When merged this pull request will:**
- Add missing polish translations
- Remove russian translation from polish - ace_common
### IMPORTANT
- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs ), please include your changes in this pull request so the documentation will appear on the [website](https://ace3.acemod.org/ ).
- [x] [Development Guidelines](https://ace3.acemod.org/wiki/development/ ) are read, understood and applied.
- [x] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* Update stringtable.xml
* Update addons/fieldmanual/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* Apply suggestions from code review
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com >
2023-10-16 00:21:02 -05:00
78bb0514d1
Medical GUI - Reformat injury list to clarify global vs. limb-specific information ( #9468 )
...
* Reorder injury list to clarify global vs. local
* Add non-issue entries and deemphasize with color
* Give non-issue color to "No injuries..." entry
* Hook up to string tables
* move bleeding above blood volume lost
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com >
2023-10-07 12:25:41 -04:00
f088d9bfa1
General - uiNamespace cleanup ( #9425 )
...
* fix clear trauma on stitch
* add compileFinal and move to hashmap
* add missin param
* fix captives
* explosives/medtreat
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-10-04 14:09:05 -04:00
3c9d7733e8
Medical Treatment - Fix grave digging ( #9455 )
2023-10-02 11:05:56 -04:00
8bf0772558
Medical Treatement - Add Grave Digging To Body Bags ( #9442 )
...
* add grave digging to body bags
* move buryBodyBag action to config, change grave ui icon to headstone
* improvements from code review
* switch direction check to man instead of bodybag, nominally allowing anything to be buried
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com >
2023-10-01 14:55:13 -04:00
66deb59037
Medical Treatment - Add event and setting for grave creation ( #9441 )
...
graves: event and setting for markers
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com >
2023-10-01 14:31:38 -04:00
b9580a0349
Medical Treatment - Change isAwake check for grave digging to only apply to CAManBase ( #9451 )
...
* Move awake check for bodybag grave
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-10-01 13:42:07 -04:00
38c79347ae
Misc - Config caplitzation fixes ( #9452 )
2023-10-01 12:09:02 -05:00
a8bd08136e
Medical Treatment - Add new Grave model ( #9444 )
...
* Added Grave model, swapped Grave classnames
* Change p3d name of Grave model
* Update addons/medical_treatment/CfgVehicles.hpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* Updated grave model, textures, classname.
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-10-01 08:48:31 -04:00
dbf288851e
Medical Treatement - Don't allow conscious patients to be buried ( #9448 )
...
Don't allow conscious patients to be buried
2023-09-30 11:32:06 -04:00
08d0bd09c4
Translations - Add Polish Translations ( #9437 )
...
* Translations - Add Polish Translations
When merged this pull request will:
**When merged this pull request will:**
- Add missing polish translations
- Fix spelling in existing translations
### IMPORTANT
- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs ), please include your changes in this pull request so the documentation will appear on the [website](https://ace3.acemod.org/ ).
- [x] [Development Guidelines](https://ace3.acemod.org/wiki/development/ ) are read, understood and applied.
- [x] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
* Update stringtable.xml
---------
2023-09-27 13:54:12 -05:00
94ceed201c
Korean translation Updated ( #9436 )
...
* 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
2023-09-27 13:28:04 -05:00
94f3b301e0
Medical Treatment - Add Grave Digging for Corpse Disposal ( #9276 )
...
* Add grave digging
* Update fnc_placeInBodyBagOrGrave.sqf
* Update fnc_placeInBodyBagOrGrave.sqf
* Update fnc_placeInBodyBagOrGrave.sqf
* Update addons/medical_treatment/functions/fnc_placeInBodyBag.sqf
Co-authored-by: BrettMayson <brett@mayson.io >
* Add setting to enable/disable
* improvements
- fix flipped bool in fnc_canDigGrave
- improve fnc_placeInBodyBagOrGrave.sqf by splitting out some checks and item assignment into separate bodybag and grave functions
* fix typo in variable
* Apply suggestions from code review
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
* add to XEH_PREP and fix event for non-local patient
* Add interaction to check name on headstone
* Update addons/medical_treatment/XEH_postInit.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
* Simplify Setting
* Apply suggestions from code review
Co-authored-by: jonpas <jonpas33@gmail.com >
* Update addons/medical_treatment/stringtable.xml
Co-authored-by: jonpas <jonpas33@gmail.com >
* Make placeInBodyBagOrGrave more generic and use any grave class
* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
* Update medical-treatment-framework.md
* Update docs/wiki/framework/medical-treatment-framework.md
Co-authored-by: jonpas <jonpas33@gmail.com >
* update docs
* Update addons/medical_treatment/functions/fnc_placeInBodyBagOrGrave.sqf
* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf
* fix includes
---------
Co-authored-by: BrettMayson <brett@mayson.io >
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
Co-authored-by: jonpas <jonpas33@gmail.com >
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com >
2023-09-24 15:57:08 -04:00
ec96cdf12c
Medical Treatment - Fix clearing trauma after stitch with multiple wounds ( #9420 )
...
fix clear trauma on stitch
2023-09-23 12:59:10 -04:00
742626ff1a
General - Relative script_component.hpp includes ( #9378 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-09-12 20:58:10 +02:00
4a12f61352
Translations - Add Polish Translations ( #9391 )
...
Translation - Add Polish Translation
When merged this pull request will:
Add Missing Polish Translations
Fix Spelling in existing translations
2023-09-11 21:33:48 -05:00
4ce6fcb3cc
Translation - Add German Translation ( #9390 )
...
Added German Translation
2023-09-11 20:37:20 -05:00
de8940af9b
Medical Treatment - Add setting to rollover bandage effectiveness ( #8426 )
...
* use leftover bandage effectiveness on other wounds in same limb
variable naming
* Comments
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com >
* variable naming, fix part index check in findMostEffectiveWound
trace 4
* fix function header
* Account for multiple wounds in time calculation
* fix trace, remove systemChat
* update for hashmaps
* compile cache
* Update addons/medical_treatment/functions/fnc_findMostEffectiveWounds.sqf
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
* add bandage effectiveness setting
* stupid
* remove limit on bandageRemaining
* Update addons/medical_treatment/functions/fnc_bandageLocal.sqf
Co-authored-by: BrettMayson <brett@mayson.io >
* Update fnc_getBandageTime.sqf
* Update fnc_bandageLocal.sqf
* fix header / debug
---------
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com >
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com >
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
Co-authored-by: BrettMayson <brett@mayson.io >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-09-10 02:06:15 -04:00
aa107ed517
Medical - Add treating with items from vehicle inventory ( #9286 )
...
* allow pulling items from vehicle inventory
* use vehicle items first
2023-09-05 11:20:56 -03:00
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
c1c1433c44
Translations - Improve and Add Japanese ( #9357 )
...
* update japanese
* full-width to half-width
* more tweak
2023-08-31 11:24:35 -05:00
6bc1ae453b
Update fnc_loadUnit.sqf ( #9300 )
2023-08-01 11:35:55 -05:00
39e4f9340b
Common/Medical - Change vehicle checks to objectParent ( #9281 )
...
* switch to objectParent
* use objectParent in unloadUnit
* fix derp
* allow unload patient on dead units
2023-07-22 09:11:58 +03:00
31e1ad0cff
Arsenal - Add Tools category and moveOnOverwrite parameter to FUNC(addCustomRightPanelButton) ( #9247 )
...
* add tools tab and setting
* move to preinit
* fix icon, add restart warning
* derp
Co-authored-by: Dystopian <sddex@ya.ru >
* Update addons/arsenal/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* remove setting
* add keepIfOverriden parameter
* docs again
* documentation whitespace
* docs grammar, change parameter name
* fix docs
* more docs fixes
* magazine support
* deprecate spare barrel item
* more docs, improve condition
---------
Co-authored-by: Dystopian <sddex@ya.ru >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-07-21 22:39:48 +03:00
45af0cdca0
Medical Treatment - Remove early exit when stitching with sutures ( #9243 )
2023-07-07 08:19:45 +03:00
0e26755b88
Medical - Add arsenal category ( #9220 )
...
* add medical category to arsenal
* function header
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* move to preinit, protect list
* improve macro
* documentation
* add config property
* add CfgMagazines
* Revert "add CfgMagazines"
Arsenal doesn't support magazines in custom categories
---------
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-07-07 07:14:44 +03:00
f434549faf
Medical Treatment - Change stitching action to be per-body-part ( #9005 )
...
* Make stitching action per-body-part
* Apply suggestions from code review
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com >
---------
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com >
Co-authored-by: Salluci <salluci.lovi@gmail.com >
2023-06-28 01:43:45 +03:00
02365609b5
Medical - Change medical to use hashmaps for wound storage ( #8926 )
...
* Refactor medical to use hashmaps for wound storage
- We most frequently want to access wounds by body part, so this makes
that a constant time lookup.
- The body part index is no longer stored in every wound since it's
inherent in the wound storage.
- Using body part names as the keys of the hashmap to improve code
clarity (no more magic numbers).
closes #6468
* Add deserilization migration from old wound arrays
Will migrate from old form array wound storage to the new hashmap
strucutre during deserlization. This is relevant for communities piping
medical state out to a database or similar between sessions.
* fix issue with suture stitching
* change version number in comment
---------
Co-authored-by: Salluci <salluci.lovi@gmail.com >
2023-06-24 08:11:56 +03:00
1e6073c467
give tourniquet to patient or medic depending on setting ( #9206 )
2023-06-22 04:26:28 -03:00
3d3aa8d877
Update Spanish translation ( #9203 )
...
An update of the spanish to the text strings that have been added lately.
2023-05-29 18:22:37 -05:00
fd3c9c967d
Medical Treatment - Improve Medical Actions underwater ( #9096 )
2023-05-15 23:47:00 -06:00
e252ef67d6
Medical Treatment - Suture ( #9020 )
...
Co-authored-by: Walthzer <19926813+Walthzer@users.noreply.github.com >
2023-03-06 14:17:01 -06:00
a40b0d48f2
HEMTT v10 Compatibility ( #9105 )
...
* HEMTT v10 Compatibility
* Update addons/field_rations/CfgUIGrids.hpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* fix PabstMirror review
* optionals
* End empty macro definitions with semi-colon (HEMTT v0.10)
* Adapt to HEMTT v0.10.0-a14
* Revert End empty macro definitions with semi-colon
* Disable old HEMTT build step in CI
* Add missing include and fix macro usage and include casings
* End empty macro definitions with semi-colon (HEMTT v0.10)
* Update addons/disarming/functions/fnc_showItemsInListbox.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* cleanup test code
* arty - keep style same as before
* fix fire screams
* Update script_component.hpp
* Keep old hemtt/workflow/sqfc
* Update arma.yml
* Update arma.yml
* Update CfgUIGrids.hpp
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
Co-authored-by: jonpas <jonpas33@gmail.com >
2023-02-01 23:28:55 -06:00
dc9a3eb064
Translations - Russian ( #9095 )
...
* Add missed & fix existed
* Fix russian translation when renaming
2022-12-03 13:57:43 -06:00
57893f311d
KoreanTranslation ( #8937 )
...
Someone has returned all the translations in Korean to English. there is no need to return them.
2022-06-21 13:35:06 -05:00
