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
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
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
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
97febbe574
Laser - Fix LST conditions ( #9472 )
2023-10-09 13:58:00 -03:00
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
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
7b32cb76f8
Interact Menu - Fix zeus cursor menu closing ( #9466 )
2023-10-06 19:39:11 -05:00
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
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
98e189bfb4
Arsenal - Always show muzzle velocity even if not configured for AB ( #9457 )
2023-10-04 14:21:07 -04:00
8143cdc1da
Medical AI - Add setting to replace gear for AI ( #9458 )
2023-10-04 14:19:10 -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
50fba4545f
Zeus - Fix bis_fnc_activateaddons error in moduleCurator ( #9459 )
...
Close #9445
2023-10-03 08:08:04 -03:00
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
3c9d7733e8
Medical Treatment - Fix grave digging ( #9455 )
2023-10-02 11:05:56 -04:00
3626b37c01
Tagging - Fix stringtable ( #9456 )
2023-10-02 11:05:13 -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
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
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
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
6cebdd8fef
Tools - Modify HEMTT ASC exclude to match ( #9447 )
...
hemtt - modify asc exclude to match
2023-09-29 18:22:01 -05:00
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
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
8e464744a1
Medical - Increase pain from bullet-inflicted bruises ( #9438 )
...
increase bruise pain
2023-09-28 15:17:42 -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
03332f0019
Prep 3.16.0 Build 70
2023-09-26 16:09:34 -05:00
5d2c6eb948
Medical GUI - Fix cross_grave.paa building with pboProject ( #9435 )
2023-09-26 17:01:39 +02:00
d2f5c2de02
Spearhead 1944 Compatibility ( #9292 )
...
* compat(spe): initial
* --changed csw/turrets
* disable spe disassemble
* csw: all mortars done
* more cleanup
* add missing hearing protection
* final cleanup
* goofed and removed too much
* ok all done
* formatting
* remove adt
* -+ updated frameworks
- Ballistics Framework Finished (Infantry Weapons)
- Wirecutter & Trench Framework Finished (Vests/Backpacks)
- Explosives Framework Finished (Added backward support for IFA3 Detonator/Firecord)
- Crew Served Weapons Framework Finished (Fixed Assemble/Disassemble)
* formatting
* Require HEMTT v1.7.2
* cleanup tabs / formating
* Apply suggestions from code review
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
Co-authored-by: ZluskeN <pontux@gmail.com >
* split to subcomponents, fix ubcs
* swap has_include for skipWhenMissingDependencies
* fix explosives
* add pdumies for ww2
* Apply suggestions from code review
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
* cleanup sten duplicate configs
* move hearing to macro
* fix macro repaclement
* Use `SUBADDON`
* Move `addonRootClass` to bottom of CfgPatches
* Relative includes
* move config macro includes to config.cpp
* comment off csw changes for now
* Update .hemtt/project.toml
---------
Co-authored-by: Coldfront15 <born2toot2@gmail.com >
Co-authored-by: Brett Mayson <brett@joinoffstreet.com >
Co-authored-by: jonpas <jonpas33@gmail.com >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com >
Co-authored-by: ZluskeN <pontux@gmail.com >
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
2023-09-25 15:37:59 -05:00
cf4fe835c3
Repair - Fix adding actions for hitpoints with the same name ( #9430 )
2023-09-25 20:55:23 +02:00
5283b487ff
Remove Workshop link
2023-09-25 18:45:15 +02:00
ac29287542
Arsenal/Compat RHS - Improve support for RHS attachments ( #9386 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-09-25 18:36:46 +02:00
6029e75aea
Documentation - Remove badge and link to CircleCI ( #9433 )
2023-09-25 18:02:54 +02:00
11bc2695f5
Captives - Blindfold captive units ( #9361 )
...
* 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 >
2023-09-24 17:45:43 -04:00
aee47c9bc6
Medical - Add damage handling for explosive damage while inside vehicles ( #9246 )
...
* Add vehicle explosion handling
* Missing semicolon
* scale armor damage using passthrough
* add - to comment
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
* improve condition
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
* remove extra brackets
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
* remove extra brackets
* fix damage sorting
* whitespace
* comment
* fix function header
* fix infinite armor when no item equipped
* modify condition & handling for vehicle explosion
* add vehiclehit woundHandler
* finalize
* add vehiclehit woundHandler
* finalize
* cleanup
* more cleanup
* name
* randomize hitpoints
* finalize
* don't scale structural damage
* fix undefined var
* remove _i
* fix script error, tone down scaling
* add AVD checks
* Update addons/medical_damage/functions/fnc_woundsHandlerVehiclehit.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* nuke AVD crew damage handling
* get rid of aircraft crash lethality compensation
---------
Co-authored-by: James Woods <pterolatypus@gmail.com >
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com >
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-09-24 15:58:59 -04: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
6fd24c1455
Compat WS RealisticNames - XMS ( #9429 )
...
* Compat WS - XMS
* add modified original translations
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-09-24 14:56:04 -04:00
77a73aee71
Backpacks - Add extra condition for backpack checking ( #9428 )
...
Update fnc_isBackpack.sqf
2023-09-24 12:06:20 -05:00
bf6dc5a7a1
Backpacks - Code cleanup ( #9409 )
...
backpacks
2023-09-24 00:13:33 -04:00
0d9bcdd708
Nightvision - Fix detecting if vehicle's turret has NVGs ( #9421 )
...
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com >
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com >
2023-09-23 21:00:04 +02:00
bd0dfe4b30
compat rhs - fix SUBCSTRING and check_strings.py ( #9424 )
2023-09-23 12:40:48 -05:00
b4940e6fa3
Cargo - Improve cargo space values ( #9418 )
...
Alter Cargo values
2023-09-23 13:08:28 -04:00
ab6dd0164e
Compat WS - Realistic Names ( #9419 )
...
* Compat WS - Realistic Names
* use cba subcstring
* cleanup python
* Update script_macros_common.hpp
---------
Co-authored-by: BrettMayson <brett@mayson.io >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2023-09-23 13:07:52 -04:00
da60a1b39d
Medical Engine - Improve damage calculation for explosive-resistant armor ( #9216 )
...
* scale armor damage using passthrough
* add - to comment
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
* improve condition
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
* remove extra brackets
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
* remove extra brackets
* fix damage sorting
* whitespace
* comment
* fix function header
* fix infinite armor when no item equipped
* cleanup
* more cleanup
* name
* don't scale structural damage
* add setting
* fix key name
* add cap to passThrough
* fix script error in setting
---------
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com >
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com >
2023-09-23 13:07:06 -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
