Commit Graph

15151 Commits

Author SHA1 Message Date
amsteadrayle
f2ae068e9f
Medical GUI - Fix action button width (#9497)
Fix action button width
2023-10-15 18:58:48 -04:00
amsteadrayle
9ecb35250d
Medical GUI - Use selected color when triage category selected (#9495)
Show selected color for triage category
2023-10-15 18:45:52 -04:00
amsteadrayle
863d88ff41
Medical GUI - Add divider bars for triage and toggle category buttons (#9496)
* Add divider bars for triage and toggle category buttons

* Tweak vertical position of category icons

* Fix spacing
2023-10-15 18:45:45 -04:00
Grim
8104c8f465
Common - Increase sway update frequency (#9490)
increase sway update frequency
2023-10-14 20:21:08 -04:00
amsteadrayle
c54a26cc42
Medical GUI - Show warning if tourniquet will interfere with medical menu action (#9475)
* Warn if tourniquet will interfere with medical action

* Add setting to enable, default to off

* Tweak tooltip message

* Tweak code style, missing semicolon

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

* Use localize macro

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-14 19:28:22 -04:00
amsteadrayle
b54be029df
Medical GUI - Move target name to middle header (#9483)
* Switch "status" header to player name

* Set title to "Medical Menu"

* Remove unused STATUS strings

* Switch to existing MedicalMenu string

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

* Revert "Remove unused STATUS strings"

This reverts commit 62c1ced06a.

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-14 19:27:57 -04:00
amsteadrayle
f774eaf787
Medical GUI - Fix asymmetry in the medical menu (#9486)
* Fix assymmetry in the medical menu

* Add center divider in Activity/Quick View panel
2023-10-13 16:33:19 -04:00
amsteadrayle
503373bb83
Medical GUI - Improve toggle button icon and tooltip (#9485)
Improve toggle button icon and tooltip
2023-10-13 07:46:42 -04:00
Grim
5a2fd70075
Field Manual - Add Medical Menu entry (#9482)
* add medical menu

* add R/L note

* Translate display name

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-12 23:19:07 -04:00
amsteadrayle
1e3d9cc22a
Medical GUI - Show number of available treatment items in medical menu (#9474)
* Initial implementation of item count display

* Put everything inside function, add padding

* Extract and explain null string

* Fix tab in config file

* Add function header

* Use ACE item counting function

* Extract column width to variable

* Move constants declaration closer to usage

* Add special case for sutures

* Add setting to enable/disable

* Expand to allow showing in tooltip

* Split into counting and formatting function

* Fix incorrect check for case with no items

* Remove ineffective padding from tooltip

* Check for surgical kit item instead of display name

* Update return description in header

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

* Add `private` keyword for inline functions

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

* capitalization/vars

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

* nil checks, localize macro

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

* Remove button text mode and setting

* possessive

* Update addons/medical_gui/functions/fnc_formatItemCounts.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-10-12 22:39:23 -04:00
amsteadrayle
e52594112d
Medical GUI - Add keybinds to navigate the Medical Menu (#9477)
* Add keybinds to select categories and body parts

* Add some comments, rearrange, remove debug prints

* Remove unneeded escape key handling

* Replace function with inline code
2023-10-12 12:50:48 -04:00
PabstMirror
58cedab493
Repair - Fix script error if vehicle is null (#9479) 2023-10-12 12:47:59 -04:00
Tim Beswick
bd377c49fc
Repair - Allow setting spare wheels/tracks count in config (#9481)
* Allow setting spare wheels/tracks count in config

* Update repair framework docs
2023-10-12 12:45:56 -04:00
amsteadrayle
2eb914836c
Medical GUI - Add R and L labels on body image (#9480)
Add R and L labels on body image
2023-10-12 12:44:13 -04:00
PabstMirror
b818f9f6e4 Prep 3.16.0 Build 71 2023-10-11 16:01:11 -05:00
PabstMirror
0b22c981e9 Merge branch 'master' into release-3.16.0 2023-10-11 16:00:33 -05:00
Hypoxic
176482381a
Field Manual - Add Framework (#9320)
* Field Manual Framework

Created barebones framework for addition of the Field Manual

* Created Stringtable.xml

Created Stringtable.xml

Created a few strings... more to come

* Update addons/fieldmanual/config.cpp

Moved opening brace

Co-authored-by: Mike-MF <TyroneMF@hotmail.com>

* Update addons/fieldmanual/config.cpp

new lines at end of file

Co-authored-by: Mike-MF <TyroneMF@hotmail.com>

* update stringtable.xml

Added arguments to ACE_Field_Rations_Base
Added strings for descriptions of subclasses

* update stringtable.xml

Added medical item documentation
Added field ration documentation

* Update stringtable.xml

Added fortify tool documentation

* updated stringtable.xml and cfgHints.hpp

Added item documentation
Cleaned up other strings
Added additional arguments and made them universal

* updated/reordered contents. added images

Reordered CfgHints.hpp
Added Range Tables string
Reordered stringtable
Added images for inline use

* changed indentation style

changed indentation style to guidelines
added empty line to the end of each file

* Update addons/fieldmanual/CfgHints.hpp

remove redundant includes

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

* Update addons/fieldmanual/CfgHintCategories.hpp

remove redundant includes

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

* Update stringtable.xml

added explosives string - no image yet

* Update stringtable.xml

added dead man's switch - no image as of yet

* Update addons/fieldmanual/script_component.hpp

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

* Update addons/fieldmanual/script_component.hpp

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

* Update addons/fieldmanual/stringtable.xml

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

* Update stringtable.xml

Removed containers
Modified table to 4 space indentation
Started using Tabler

* update cfghints and stringtable

moved the fortify tool to items and removed it's specialized class
added DAGR and MicroDAGR strings - no image

* restructure

CfgHints.cpp - added additional arguments + placeholders for forward compatibility
Removed images and img from strings - will add in a different PR
Stringtable.xml - added 99% of content

* update strings

updated stringtables
consolidated cfghint base classes

* cfghints

fixed multiline string code

* Update CfgHints.hpp

Missed trailing \

* update cfghints.hpp

fixed leading \
still trying to get the pboproject to like it

* Update stringtable.xml

deleted original stringtable entry due to error with
Arma/Vlidate (pull_request)

* Update addons/fieldmanual/script_component.hpp

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/fieldmanual/CfgHintCategories.hpp

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Apply suggestions from code review

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

* Update stringtable.xml

changed structures for spray paint to surfaces

* Apply suggestions from code review

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

* Dynamically get item names

* stringtables, better unbound key handling

* disable preprocess (rip tools)

* bound key change

* standardize on medical keybinds

* fix medial menu keybind

---------

Co-authored-by: Hypoxic <amartini@martinicreations.com>
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-10-11 15:53:10 -05:00
amsteadrayle
119d8bce5d
Medical GUI - Change default body color to improve contrast (#9476)
Change default body color to improve contrast
2023-10-11 07:40:13 -04:00
amsteadrayle
008cd5a851
Medical GUI - Add outline to selected body part in Medical Menu (#9471)
* Add functionality to show selected body part on body image

* Add controls for patient information display

* Receive selected body part through argument

* Improve selected check

* Add body part outline textures

* Second pass at outline textures

* Third pass at outline textures

* Add setting for outline color

* Fix capitalization

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

* Fix capitalization

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-11 05:25:28 -04:00
amsteadrayle
c407aebe6a
Medical GUI - Display qualitative bleed rate in injury list (#9469)
* Display qualitative bleed rate in injury list

* Remove debug print

* Reference existing vitals metrics in bleed rates

* Use `default` case for highest bleed rate

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-11 05:23:31 -04:00
PabstMirror
60143be55f
Arsenal - Add stats for buddy-loading launchers and belt linking (#9470)
* reload launchers - show if enable arsenal stat

* Apply suggestions from code review

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

* Add ACE_isBelt stat

* buddy

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-10-09 19:20:23 -04:00
Fabio Schick
b4c72d8255
Captives - Allow disarming and blindfolding captives in vehicles (#9463)
* Can disarm captives in vehicles

* Can blindfold captives in vehicles

* Fix dropping goggles/blindfold into large vehicles

* Apply suggestions from code review

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-09 14:58:49 -03:00
amsteadrayle
941207c45c
Medical GUI - Peek Medical Info on Hit (#9467)
* Basic implementation of medical status peek on hit

* Fix flickering on repeated hits

* Overhaul to show damaged body part

* Add setting to enable/disable

* Add setting for duration

* Fix capitalization

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

* Use recommended equality check

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

* Default to off

* change setting limits

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-09 14:57:47 -03:00
PabstMirror
97febbe574
Laser - Fix LST conditions (#9472) 2023-10-09 13:58:00 -03:00
amsteadrayle
0e2c7167a5
Medical GUI - Add keybind to show player's patient information display (#9464)
* Add keybind to show patient information display

* Return false

* Add fadeout delay and associated setting

* Switch to CBA setting rounding

* Change setting type to time

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

* Fix incorrect behavior on repeated key presses

* Tweak setting name and description

* Tweak to prevent overlapping WUAE

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-08 17:34:51 -04:00
amsteadrayle
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
PabstMirror
7b32cb76f8
Interact Menu - Fix zeus cursor menu closing (#9466) 2023-10-06 19:39:11 -05:00
PabstMirror
e8d1695c83
Zeus - Show where trench will go (#9462)
* Zeus - Show where trench will go

* Update fnc_moduleLayTrench.sqf
2023-10-04 17:10:21 -05:00
PabstMirror
bd43c32334
Trenches - Terrain Trenching (#9148)
* Common - Use hashmap variable for canDig surfaces

* Update XEH_preInit.sqf

* Trenches - Terrain Trenching (simple blocks)

* Update fnc_canDig.sqf

* Update fnc_canDig.sqf

* Handle locality

* move code around, stringtable

* use third block for floor

* cleanup debug

* update includes, add tooltip
2023-10-04 14:21:50 -04:00
PabstMirror
98e189bfb4
Arsenal - Always show muzzle velocity even if not configured for AB (#9457) 2023-10-04 14:21:07 -04:00
PabstMirror
8143cdc1da
Medical AI - Add setting to replace gear for AI (#9458) 2023-10-04 14:19:10 -04:00
Grim
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
PabstMirror
50fba4545f
Zeus - Fix bis_fnc_activateaddons error in moduleCurator (#9459)
Close #9445
2023-10-03 08:08:04 -03:00
LorenLuke
a5a8b5387a
Laser - Add Individual Laser Code Digit Control (#9434)
* Initial Commit

* Use DIK Codes

* Update headers and dev code for new default frequency

---------
2023-10-02 12:29:38 -05:00
PabstMirror
3c9d7733e8
Medical Treatment - Fix grave digging (#9455) 2023-10-02 11:05:56 -04:00
PabstMirror
3626b37c01
Tagging - Fix stringtable (#9456) 2023-10-02 11:05:13 -04:00
Drofseh
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
BrettMayson
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
Grim
31a64a33b6
Compat SOG - Add explosives support to 1.3 mines (#9450)
* add fuse claymore

* add WP mines

* missing semicolon

* add dummy
2023-10-01 14:30:24 -04:00
Apricot
6429d0639f
Tagging - Add new colors and filled square tag (#9443)
* Adds yellow and white tags and filled square tag

Add:
Yellow Splay
White Splay
Filled Square tag for all colors

Change (and remove):
Remove color variations from the "X" strings and unify it.
Tweak some Japanese strings.

* tweak japanese
2023-10-01 13:43:03 -04:00
Drofseh
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
PabstMirror
38c79347ae
Misc - Config caplitzation fixes (#9452) 2023-10-01 12:09:02 -05:00
Marstruc
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
Drofseh
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
PabstMirror
6cebdd8fef
Tools - Modify HEMTT ASC exclude to match (#9447)
hemtt - modify asc exclude to match
2023-09-29 18:22:01 -05:00
Psycool
c49c5afcba
Fixed wrong strings (#9446)
* 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
2023-09-29 12:27:51 -05:00
Assanali Mukhanov
537487522f
Compat SOG - Add barrel swap for MGs and belt linking for drum magazines (#9439)
* Add barrel swap support to SOG MGs

* Set SOG MG drum mags as belts, allow belt linking

* Remove tracer mag configs

Since they inherit from the "normal" magazines, these config entries, indeed, seem pointless.

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

* Remove barrel swap from RPD and M1918

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-28 15:20:46 -04:00
Grim
8e464744a1
Medical - Increase pain from bullet-inflicted bruises (#9438)
increase bruise pain
2023-09-28 15:17:42 -04:00
Krzyciu
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
Psycool
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