* 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>
* 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
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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
* 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
* 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>
* 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
---------
* 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 typo
* Added "Blindfold Captive" interaction
* Changed comment readability as requested
* Better handling of captive goggle replacement
if the capturer's inventory cannot contain the captive's goggles, move them to the captive's inventory, if that also can't fit them, drop them on the ground.
* Removed extra new line
* Make "validBlindfolds" a CBA Setting
* Add remaining localizations
I speak German and Italian fluently and can also infer the proper sentence structure and conjugations in French/Spanish/Portuguese, the other eastern languages are completely foreign to me though and I have to trust Google/DeepL.
* Removed non-verified translations
* Use GVAR(blindfold) config entry
* Remove unused "_state" parameter
* Check if captive isn't already blindfolded before blindfolding
Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>
* Added "remove blindfold" interaction
Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>
* Correct Error Message
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Optimized duplicate code
* Apply suggestion to fix script_component includes
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Move SOG compat to addons/
* Set component to skip loading when SOG not present
* Use skipWhenMissingDependencies for GRAD Trenches compatiblity
* Tools - Add SOG dlc launch config
* move trenches to sub config, handle grad with 2nd subconfig
* fix `Land_vn_b_prop_fueldrum_01` UBC
* use ifndef
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* fix adv fatigue sway interaction with medical
* change medical sway scaling
* move to common
* function header
* number tweaks
* baseline is always at least 1
* Add error msgs and warn if using old ACE_setCustomAimCoef
* Update addons/common/functions/fnc_addSwayFactor.sqf
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* use regex
* remove extra brackets
* add regex pattern, change refill condition
* add missing quote
* change pattern again
* bleh, we'll just go with this
* use pattern quote (thanks veteran)
* remove comment
* use escapeRegex function
* add regex to 3DEN attribute
* Add notifications to reloadLauncher
- Add notifications to reloadLauncher
- Also set _reloadTime to `magazineReloadTime min 2.5` instead of just 2.5 if there is no `buddyReloadTime` set
* Change message format
* Add setting displayStatusText for reloadLaunchers
* reloadlauncher improvements
* Comments
* Updated so it's similar to reload addon
* Added failure message
* Update addons/reloadlaunchers/functions/fnc_reloadLauncher.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Changed reload conditions
* Tweaked notifications
---------
Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Moved ace_cookoff_canHaveFireJet config logic into vehicle_damage as a param passed into cookoff to improve modularity
* Use original arg order
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* delete fries with vehicle
* FUNCK -> FUNC
* Delay 1 frame so setVar won't fail if ran before initpost
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update display name in team
* Update display name everywhere
* order
https://youtu.be/VYycQTm2HrM
---------
Co-authored-by: BrettMayson <brett@mayson.io>
* Medical Engine - Unlock when dead
* Update fnc_unloadPersonLocal.sqf
* Update addons/common/functions/fnc_unloadPersonLocal.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* fix actually unloading people to found emptyPos
* handle deleted units
* handle dead units
ref 179957c39d
* vehicle -> objectParent
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Fix bug in detection for ignoring repair hitpoints
* Use define for array any
* Add warning if hitpoint group would be ignored
* Apply suggestions from code review
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Change ANY to ANY_OF
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Lock seats of unconscious or dead units
* disable pullOutBody if medical is loaded
* fix undefined var and switch to objectParent
---------
Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Allow run when carrying light-weight objects
* Use global var instead of macro
* add weight check, improve getWeight & conditions
* changes from review
* changes from review - postInit
* add param to ignore PhysX mass
* add settings
* BI issue tracker in comment
* change defaults, remove overweight setting
* remove public variable
* setting name changes
* updating case in statusEffect_addType
* move to XEH
* derp
* Add some extra checks for closed events
* Update XEH_postInit.sqf
* conditions
---------
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Arsenal update
* Fixes
* Update fnc_onSelChangedLeft.sqf
* Update fnc_updateUniqueItemsList.sqf
* Header fixes
* Fix for defines.hpp
Co-authored-by: Dystopian <sddex@ya.ru>
* Moved fnc_baseWeapon, filtered invalid items
* Update addons/arsenal/functions/fnc_scanConfig.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Fixes and tweaks
- Sorting is guaranteed to give a fixed order
- Dog tags no longer throw errors when reloading the ACE arsenal mission when you had some saved in your loadout before quitting the last time you played.
* Cleanup, bug fixes and additions
- Added the ability to add items from "CfgMagazines" into the "Misc. items" or custom tabs.
- Added "baseWeapon" class support for weapon attachments. If a weapon attachment has the config property "baseWeapon" defined, it will take that item and show that in the arsenal.
- Added stronger filtering on item scopes (scope > 0 at least for every item)
- Added "descending" (default, as it is now) and "ascending" sort order as a drop down menu,
- Unique backpacks in containers can now be removed with either the "-" or "clear all items" button.
- When sorting by a number, 2 decimal points have been added, so that when you sort by weight it returns the correct order.
* More fixes and tweaks
- Converted the arsenal to partially work with hashmaps instead of arrays (for configItems and virtualItems, currentItems is still an array).
- Because of the above, performance of FUNC(addVirtualItems) and FUNC(removeVirtualItems) has improved immensely.
- Sorting now caches results, reducing repeated sorting times drastically.
- CBA disposable launchers are handled differently now: Within the arsenal, you can change weapon attachments on disposable launchers, but you can't change their magazines (primary or secondary). Item info on the right and the stats show correct information.
- FUNC(addSort) now checks if the new sorting method already exists and doesn't add it if it does.
- FUNC(removeSort) now exists. You can't remove the default sort type (alphabetically) to avoid problems with the arsenal.
- Both FUNC(addStat) and FUNC(compileStats) actually taken priority into account now. Because of that priority on several stats needed to be tweaked.
- FUNC(removeStat) ensures that there are no gaps within the stat array (so if there is an empty spot in the stats page, it's because there is a stat, but the condition for it being shown hasn't been met).
* Update fnc_replaceUniqueItemsLoadout.sqf
* Update fnc_onSelChangedLeft.sqf
* Update fnc_scanConfig.sqf
* Update docs/wiki/framework/arsenal-framework.md
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Minor cleanup
* Baseweapon filtering
* Improvements + better unique items support
* Update fnc_fillRightPanel.sqf
* Update fnc_onSelChangedLeft.sqf
Fixed: Switching between weapons with incompatible primary magazines while a compatible secondary magazine is loaded doesn't equip the new weapon's primary magazine.
* Update addons/common/functions/fnc_uniqueUnitItems.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* undefined variable
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* fix undefined loadout var
* Update fnc_fillLoadoutsList.sqf
---------
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* add field rations category
* improve macro
* second verse same as the first
* account for empty items
* switch to configClasses
* documentation
* add API variable
* Update docs/wiki/framework/field-rations-framework.md
* add variable full repair time
* enable compile cache
* Fix stupid
* whoops
* incremental full repair
* cleanup function header
* ignore hitpoints inFullRepairProgress
* fix getHitPointsToIgnore
* final cleanup
* don't show repair hint while doing full repair
* make this all work
* fix stupid
put this back in place
* Add setting for speedup when near repair facility/vehicle
enable compile cache
* refactor near repair facility/vehicle checks
* remove skipping hint from do_repair
better for feedback this way
* git diff stuff
* use functions directly in ACE_Repair.hpp
* add check for vehicle proximity
* add a new line
* switch to multiply by setting instead
* speed boost settings, remove exit addRepairActions
* stringtable
* remove speed boost settings
* fix things, add forceDisplayName
* name in function header
* fix TRACE
* add animation looping
* remove systemChat
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* add time coefficient setting
* move to repair category
* time coefficient max and default values
---------
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* use pain variable for severe pain and use threshold in damage color calculation
show % of damage threshold in medical menu
* use damage taken instead of damage left
* Add setting and switch to separate tooltip
* tooltip -> entry
* Change display names and tooltip
* switch to qualitative
* remove newlines
---------
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
* Allow run when carrying light-weight objects
* Use global var instead of macro
* Update addons/common/XEH_postInit.sqf
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
* Stamina penalty for weapon raised/ready is scaled by weapon inertia
* Newline
* Tabs
my editor hates me
* Use format
* Improved item validation and caching
* 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>
* fire do not propagate to close unit if allowDamage is disable don that unit
* change burnCounter so it works with multiple instances of fires
* fixed exiting burning not resetting burn counter
* changed !isEqualTo to isNotEqualTo
* changed !isEqualTo to isNotEqualTo
* lazy eval, respect old allowDamage variable
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
* Adjust burn intensity defines and move to shared
* Loop "Pat down" action until patient is put out of fire
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Use suppressed EH to determine safety of AI
* Require CBA 3.15.3
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: BrettMayson <brett@mayson.io>
* load carried object
* check for medical loaded
* space
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* consolidate mouse hint in pfh
---------
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* Update fnc_setupExplosive.sqf
- Added `setShotParents` to the resulting explosive, enabling support for kill tracking
* Add setShotParents to fnc_placeExplosive
* Remove setShotParents from fnc_setupExplosive
* Move setShotParents into place event
* fix tabs
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
