Commit Graph

1971 Commits

Author SHA1 Message Date
PabstMirror
e56cc0d74e
Limping / Splint Treatment (#6947)
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* cleanup

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, rename bone images

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn
2019-05-11 23:13:59 -05:00
PabstMirror
847d2d4179
Medical - Improve adjustment calcs / wound blood loss / medications (#6910)
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-27 14:12:11 -05:00
PabstMirror
0d7709673a
Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS (#6966)
* Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS

* Keep compatibilty with old ace_medical_lastDamageSource var name
2019-04-27 14:04:31 -05:00
PabstMirror
56811403f2
Medical - add eh for setUnconscious helper func (#6937) 2019-04-16 16:47:13 -05:00
PabstMirror
9588b13942 Zeus/Medical - Fix modules for rewrite (#6914)
* Zeus/Medical - Fix modules for rewrite

* move wakeup logic to medical_treatment
2019-04-03 06:17:17 -07:00
mharis001
30b99fa20a Medical Rewrite - Remove dropDownTriageCard function (#6907)
* Remove dropDownTriageCard function

* Delete fnc_updateTourniquets.sqf
2019-03-30 16:06:36 -05:00
PabstMirror
f2b9bf3a17 Update headers 2019-03-30 11:07:54 -05:00
PabstMirror
751ddb64ac
Handle old public funcs, fix strings (#6890)
* Handle old public funcs, fix strings

* Update addons/medical/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-03-24 22:17:46 -05:00
PabstMirror
f23927d84a Fix some strings 2019-03-24 00:50:36 -05:00
PabstMirror
2d0090422c move settings to sqf 2019-03-24 00:37:39 -05:00
PabstMirror
c492f184b4 move dev funcs to folder 2019-03-23 19:55:04 -05:00
Magnetar
cc11ad051d Formatting. Lazy eval 2019-03-21 14:34:51 +01:00
Magnetar
934339d1df Fix missing INJURY string 2019-03-17 18:38:31 +01:00
Magnetar
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
markooff
b4639ed758 tlumaczenie_12_03_2019 (#6865)
Translations - Polish
2019-03-13 00:18:33 -05:00
Matsuo Yutani
842f9e5d3b Update stringtable.xml (#6860)
Updated <Portuguese> values for the Saline quantity.
2019-03-11 10:12:14 -05:00
classic
c37b7644af Update Japanese translation (#6838)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml
2019-02-28 13:36:34 -06:00
chaot3ch
5f4dd9de5e Fixed Typo from change to chance (#6789)
Change to change change into chance
2019-01-24 20:20:49 +01:00
PabstMirror
2f3fd06fcf
Medical - Fix stringtable (#6774) 2019-01-14 11:41:29 -06:00
PabstMirror
188aabe699
Medical - Add new setting to hide self-interaction actions (#6756)
* Medical - Hide self interaction menu if disabled

* Add new setting
2019-01-11 20:58:13 -06:00
Cyruz143
a18f4180ac Medical - Adding option to convert vanilla medical gear (#6680)
* Adding option to convert vanilla medical gear

* Better wording on setting description

* Shortern var names

* Shorter settings title

* 3 options (enabled, just remove, disabled)
2019-01-03 14:26:22 -06:00
PabstMirror
f57d5ac180
Medical - Skip distance check if in same vehicle (#6757)
* Medical - Skip distance check if in same vehicle

* Update addons/medical/functions/fnc_displayPatientInformation.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-01-02 09:56:26 -06:00
PabstMirror
f4f67e262d
Medical - Add vehicle hint when loading unconc (#6759) 2019-01-02 09:55:25 -06:00
Jakub Ochalski
91182482db Polish Translation (#6730)
Did the missing parts of the Polish translation.
2018-12-11 16:50:36 -06:00
diwako
88eb743485 Medical - Show tourniquets in Medical and Patient information (#6681)
* Show tourniquets in Medical and Patient information

* Ace styling

* Move tourniquet update function to medical
2018-12-06 13:41:23 -06:00
Dedmen Miller
b3e0135e32 Fix Armake problems (#6697)
* Armake model.cfg fix

* Spaces!

* Case sensitive filenames fix
2018-11-29 11:18:22 +01:00
jonpas
0745e249fc Merge branch 'master' into armake 2018-11-14 18:32:47 +01:00
diwako
3e5995ee3d Updated treatment time (#6670) 2018-11-11 12:25:29 -06:00
commy2
8541716bee Medical - optimize handle damage caching (#6657)
* optimize handle damage caching

* delete some rogue code

* it was 2 all along

* add calls
2018-11-01 13:05:56 -05:00
Filip Maciejewski
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
commy2
5aa8c1dca0 make setUnconscious not reset firing mode (#6519) 2018-09-18 11:35:40 -05:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
SilentSpike
7fcd12c792
Reset default state on respawn (#6518)
* Reset default state on respawn
* Remove old getUnitState function
* Add locality check
2018-08-12 10:14:48 +01:00
SilentSpike
9e5c4a7ed9
Move medical settings into their respective components (#6493)
* Transfer medical AI to CBA setting
* Neuter the old settings module

I've left the entry in CfgVehicles so that it doesn't cause errors on
older missions, but it's just a dumb logic now and does nothing.

* Remove medic setting
* Move increaseTraining setting
* Move fnc_adjustPainlevel to medical_status
* Move pain and bleed coefficients to medical_status
* Move advanced bandages to medical_treatment
* Move advanced medication to medical_treatment
* Move advanced diagnose to medical_treatment
* Move wound reopening and screams settings
* Move damage threshold settings
* Move showPain setting
* Move statemachine settings
* Move pain visualisation setting
* Move all treatment usage settings
* Move self IV setting
* Move remaining settings
* Sort treatment setting string categories
2018-08-06 17:08:43 +01:00
Thomas Kooi
21eb5e3df6
Merge branch 'master' into armake 2018-08-02 21:49:35 +02:00
Dedmen Miller
7a0a00ea09 Cleanup using SQFLint (#6485)
* Use private
* Fix wrong spacing
* Fix wrong variable being used
* Cleanup empty line after header
* ace_common_fnc_getCountOfItem
* Remove useless _return variable
* Naming
2018-08-02 15:02:10 +01:00
Zakant
7cf483d598 Removed icon from legacy modules (#6486) 2018-07-30 14:11:18 -05:00
Dedmen Miller
6bd8542eed Move #includes before function headers (#6484) 2018-07-30 10:22:14 +01:00
Thomas Kooi
c9ad92e92d
Disable debugging (#6482) 2018-07-30 00:07:30 +02:00
Thomas Kooi
36f2c5fcc9 Minor code clean up (#6474)
* Minor code clean up
* refactor(medical): shorten some code
* refactor(medical): use macros for tourniquets
* refactor(medical): pull cache expiry values into script_macros_medical
2018-07-29 22:43:14 +01:00
Thomas Kooi
e22f35da37 Remove medkit (#6473)
Due to be replaced by an alternative treatment option such as a split
2018-07-26 17:14:11 +01:00
SilentSpike
873ed90cc1
Introduce bleedout condition and fix IV hemorrhage (#6470)
* Introduce bleedout condition and fix IV hemorrhage
* Update patient info display hemorrhage values
* Update UI info hemorrhage values
2018-07-25 11:40:37 +01:00
Thomas Kooi
f7f89725fe
Fix respawn not resetting variables (#6453) 2018-07-20 00:09:08 +02:00
TheMagnetar
3054803e44 Improvements to vitals and display (#6444)
- Improvements to vitals and display
- Fixes some undeclared variables
- Adds advanced diagnose: hemorrhage classes.
- Original idea for displaying hemorrhage classes belongs to @Arcanum417
2018-07-18 21:38:00 +02:00
SilentSpike
ec7a9a133e
Fix required addons in medical restructure (#6441) 2018-07-18 19:19:28 +01:00
SilentSpike
4466f9e785
Strip medical component (#6442)
* Move litter to `treatment`
* Move eden object attributes to `treatment`
* Move treatment items to `treatment`
* Move bodybag handling to `treatment`
* Move state conditions to `statemachine`
* Move radio addon handling to `feedback`
* Move medical macros to `engine`
* Move medical extension to `damage`
* Fix texture and material paths after move
* Remove duplicate medical menu config
* Remove old faction class
* Remove a bunch of old code
2018-07-18 19:13:25 +01:00
Thomas Kooi
c9c8d25017 Move vitals loop statemachine events into switch statement (#6443)
- Induce cardiac arrest if unit blood volume drops below half
2018-07-18 11:09:09 +01:00
TheMagnetar
bf4f54bce6 Fix settings in medical rewrite (#6436)
* Fix settings in medical rewrite
* Raise spontaneousWakeUpChance to 0.05
2018-07-17 15:49:14 +01:00
TheMagnetar
3bf3629047 Fixes state machine (#6435) 2018-07-16 23:25:54 +02:00
Magnetar
9b5c5bc866 Fix QGVAR medical variables 2018-07-16 15:35:34 +02:00
Glowbal
f552acd7da Fix incorrect macro usages with whitespace 2018-07-15 16:25:14 +02:00
Glowbal
9d2e76e67a More component name fixes and small clean up 2018-07-15 16:24:04 +02:00
Thomas Kooi
14db38e0f0 Fix various namespace issues with medical 2018-07-15 15:00:16 +02:00
Thomas Kooi
2a721cb8c8 Fix medical item icons not found error 2018-07-15 13:59:21 +02:00
Thomas Kooi
9c00c6ffb5 Fix bunch of script errors related to getVars on start up of game 2018-07-15 13:01:26 +02:00
alef
3673a6f56a Italian Translation Update (#6425)
* Fix wrong order shown in addon category list

Just put 'ACE' at begin

* Typo

* Add/Fix: arsenal, nightvision and others.

common, explosives, maverick, gforces, pylons, hearing, marksers, repair,
flashlights, nametags, interaction, vehicles, medical_menu, medical_ai,
interact_menu, medical
2018-07-11 10:17:13 -05:00
Josuan Albin
09855f133a Fix typo in med and issue related to unconsciousness (#6411)
* Fix adenosine displayname being wrong in some medical interactions

* Fix unconscious units waking up while being carried staying muted
2018-06-28 00:06:12 -05:00
Dissyu
e5a15d200f Traditional Chinese update (#6408)
Traditional Chinese update
2018-06-27 14:16:11 -05:00
maike1860
e3c5396593 Add Chinese translation Modify grammar (#6400)
Translations-  Chinese: Modify grammar
2018-06-22 19:14:11 -05:00
mharis001
f3f57c6a38 Cleanup unused priority entry for interact menu actions (#6372) 2018-05-30 16:48:19 -05:00
SilentSpike
54c398a007 Use macros for peripheral resistance 2018-05-23 10:52:47 +01:00
SilentSpike
52dbef84ab Fix incorrect macro variable 2018-05-23 10:27:12 +01:00
SilentSpike
de2d7f2fb8 Use macros for hemorrhage class tracking 2018-05-22 18:25:50 +01:00
SilentSpike
c9e11e62a1 Use macros for status state variables 2018-05-22 18:06:28 +01:00
SilentSpike
ff33f8e954 Use macro for unconscious variable 2018-05-22 17:21:24 +01:00
Thomas Kooi
58f4ca4581
Merge branch 'master' into armake 2018-05-20 11:08:58 +02:00
SilentSpike
563742bdd8 Fix heart rate and pain suppression adjustments 2018-05-11 16:11:01 +01:00
SilentSpike
1dc934e1b1 Use macros for unit variables
Improves the way medical is storing variables in object space by having
a common list of variables names as macros. Makes the code a bit cleaner
and ensured consistency across components. Also a handy reference for
when working on medical to see what values are all stored.
2018-05-11 15:28:25 +01:00
classic
2cd4615d5d Update Japanese translations (#6340)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2018-05-11 08:39:32 -05:00
SilentSpike
e0503129f0 Use blood bolume status macros 2018-05-10 17:44:02 +01:00
SilentSpike
33a5fb46f5 Fix patient information display 2018-05-08 14:51:32 +01:00
SilentSpike
4303a340de Fix stringtable duplicates and missing Key tag 2018-05-08 14:37:54 +01:00
SilentSpike
697aa5dc08 Fix medical status function calls 2018-05-08 10:45:30 +01:00
SilentSpike
65f57361a4 Add blood pressure status macro 2018-05-08 09:28:16 +01:00
SilentSpike
c92fd89c7a Fix pain percieved function calls 2018-05-08 08:47:03 +01:00
SilentSpike
6559665b8b Use more status macros 2018-04-27 16:03:55 +01:00
SilentSpike
5bc57cd793 Remove missing function PREPs 2018-04-27 15:32:11 +01:00
SilentSpike
d08cf4bdb7 Fix preprocessor includes 2018-04-27 15:21:49 +01:00
SilentSpike
5bd4cfcf59 Fix status macros 2018-04-24 20:19:47 +01:00
SilentSpike
e065ee239e Merge branch 'medical-rewrite' into medical-rewrite-restructure 2018-04-24 20:07:05 +01:00
SilentSpike
535e285c2c
Fix cardiac arrest time scale (#6244)
This was changed from minutes to seconds at some point, but not
everywhere. Just making it consistent.
2018-04-18 23:25:44 +01:00
SilentSpike
895f08a215
Reset triage card on full heal (#6243) 2018-04-11 20:34:32 +01:00
PabstMirror
85cf4424f9
Fix german medical translation (#6223) 2018-04-02 00:59:47 -05:00
lugubrioushatchling
e1241da4a9 Fixes for portuguese translation of ACE medical (#6222)
* Update stringtable.xml

* Update AUTHORS.txt

* Update stringtable.xml

* Update stringtable.xml
2018-04-02 00:35:27 -05:00
Orbis2358
5bb27a28a7 Korean translations fix (#6151)
* Korean translations fixed

Avulsion: 적출상
Laceration: 열상
Crush: 압궤상
Puncture Wound: 자상

* Update AUTHORS.txt
2018-02-18 02:31:34 +01:00
Whigital
f214b884a2 Settings strings (#6136)
* [hearing] Update strings

* [medical] Update strings

* [medical_ai] Update strings

* [medical_menu] Update strings

* [nametags] Update strings

* [nametags] Use existing DisplayName entries

* [medical_menu] Correct spelling

* [medical] Disable unreferenced setting

* [medical] Overdosing strings

* [medical_menu] Correct key IDs

* [repair] Update strings

* [medical] Correct spelling
2018-02-13 13:30:38 -06:00
jonpas
2ac412a406 Merge branch 'master' into armake 2018-02-06 14:34:07 +01:00
PabstMirror
4379346b2f Medical - Increase revive max time to 60 min (#5992) 2018-01-05 18:55:27 +01:00
SilentSpike
1f818981ed
Fix unconscious hidden status not being reset on respawn (#6006) 2018-01-02 16:18:44 +00:00
commy2
6520fdb624 implement pr #5385 2018-01-02 16:34:13 +01:00
commy2
5c9d1ada84
Merge pull request #5191 from Arcanum417/medical-rewrite-kill-ai
[Medical Rewrite] Options to enable insta-death for AI
2018-01-02 15:09:47 +01:00
commy2
68228e9fef merge 2018-01-02 15:06:53 +01:00
commy2
7797d9906b fix a crash 2017-12-23 02:19:53 +01:00
commy2
4db844e596 merge 2017-12-23 01:47:43 +01:00
commy2
801afb3061 update extension check (#5899) 2017-12-20 15:41:06 -06:00
PabstMirror
e6683e8077
Add slider settings (#5920)
* Add slider settings

* WARNING to INFO

* tweak scopes / adv fatigue
2017-12-16 11:51:15 -06:00
Andrea Verano
2ecc835438 Italian Translation Update (#5914)
Added new strings in:
-Advanced ballistics
-Arsenal
-Common
-Cookoof
-Interaction
-Nightvision
-Parachute
-Repair
-Scopes

Fixed some strings in:
-Medical
-Scopes
2017-12-14 23:32:51 -06:00
classic
51f29b7b37 Update Japanese translation (#5891)
* Update Jpn translation

* Update Jpn translation

* Add Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn tranlastion

* Update Jpn tranlation

* Update Jpn translation

* Updatr Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* fix for incorrect indentation

* re-fix incorrect indentation
2017-12-12 17:17:51 +01:00
commy2
2ca398ea71
Merge branch 'master' into avoid-setCaptive 2017-12-07 19:11:09 +01:00
Josuan Albin
2bde515aaa Add ACE_Arsenal (#5734)
* Add CBA setting for modIcons

* Add CBA settings for camera control

* Merge the 2 inverted settings into one

There's no man crazy enough to need one inverted and the other normal

* Add back missing newline

* Change rscCommon, don't redefine base classes

* Change anim to "civil" when not in a weapon or special tab

* Fix current handgun ending up in launchers tab and vice versa

* Change back virtualItems first index to primary secondary handgun

* Add ace_arsenal_hide config check and config entry

* Add dogtags handling in postInit

* Add CBA setting for fontHeight for left and right panel

* magazineGroups

* Add base layout for loadouts GUI

* Prepare the SQF base for the loadouts display

* Continue laying the base for the SQF of the loadouts display

* Add CBA settings for the loadouts display

* Implement button logic for loadouts display

* Finish button logic, start adding filling and button funcs

* Add editBox for loadout names

* Add loadout saving and deleting

* Add loadouts loading

* Add select current after list is refreshed after saving

* Redo button layout, Add rename button, Add messages

* Add double click loading

* Fix loadout deleting not triggering curSel change

* Keep cursor at same index when deleting loadouts

Woops

* Reload pictures when saving over old loadout

* Fix loadout save not updating the pictures properly (again)

* Add close button for loadouts dialog

* Fix weight not updating when using arrows to add / remove items

* Make the arsenal layout a bit prettier

* Start adding non available items and missing mods for loadouts

* Remove useless lines in fillLoadouts

* Move buttonHide above panel fill in loadoutsClose

* Change the way weapons are checked in fillLoadoutsList

* Add weapon in container support for fillLoadoutsList

* Add mag in container check for fillLoadoutsList

* Add item check for containers in fillLoadoutsList

* Fix item duplication when loadout loadouts

* Switch anim to civil for the rest of the tabs that need it

* Make extra sure item duplication won't happen

* Fix right panel hiding issues

* Fix remove all button, use QGVAR for EHs names, add isMP check to share tab

* Fix initBox erroring out if the object is null

* Move loadout checking to it's own func

* Force panel reload every time loadoutList change

I'm forced to do this, I can't save arrays in listnboxes

* Change how loadouts are retrived from the listnbox

* Fix save overwriting existing loadout not updating right row

* Fix indentation in buttonLoadoutsSave

* Fix reserved var error

* Fix fillLoadoutlist tab check

* Fix accessories in containers not being checked properly via verifyLoadout

* Fix binos not being detected properly by verifyLoadout

* Fix pre-filled backpacks not behaving properly

* Add mine detector check in configScan and onArsenalOpen

* Add extra traces

* Add mine detector check in non cached part of addVirtualItems

* Move right panel greying to it's own func

* Fix right panel listnbox for items with mass under 1

* Redo unique items sorting in onArsenalOpen

* Add loadoutSaved EH, handle empty name box for loadout saving

* Reapply inisgnia after loadout is loaded

* Change LoadoutSaved to loadoutSaved

* Rename savedLoadout to onLoadoutSave

* Change buttonLoadoutsSave layout to prepare base weapon saving

* Save base class for weapons when saving loadouts

* Remove unused profiling code related code

* Add not implemented warning messages for export and import

* Fix error when saving with a container or weapon slot being empty

* Remove dogtags from loadout upon loadout saving

* Change how misc item mass is retrieved

* Remove vanilla "NoVoice" from voices to avoid an error related to it

* Use tolower for currentData and itemsToCheck in fillLeftPanel

Avoid camelCase issues with the commands that don't fucking respect it.

* Remove redundant check in postInit

* Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic

* Prepare sharedLoadouts addition

* Add loadout sharing

* Add proper saving and loading for shared loadouts

* Change loadout deleted / unshared EH name, add said EH to unsharing

* Remove shared loadouts from disconnected players

* Fix error in buttonLoadoutsSave, add row when other share a loadout

* Change sharedLoadouts tab curSel selection to lnbData instead of lnbText

* Add data when adding a new row via CBA EH

* Remove mode, add arg to openBox to have arsenal prefilled

* Cleanup buttonClearAll code

* Fix itemInfo behavior when switching between items that don't have logos

Fix #23

* Add copy paste and arrow key support for searchbars

Close #22

* Add back newline at EOF for onKeyDown

* Change default camera setting from non inverted to inverted

* Fix import and export "not implemented" message

* Rename share button to Unshare when loadout selected is shared

* Improve missing items logging, cache verifyLoadout check

* Remove unused var

* Add full 3DEN support

* Remove 3DEN sphere and grid, set helper center dir properly

* Change 3DEN lightsource intensity

* Save 3DEN inventory properly

* Rewrite onArsenalClose 3DEN comment

* Fix sharedLoadouts check

* Add 3DEN support for defaultTab

* Add new event for 3rd parties in buttonCargo

* Move weight update to updateRightPanel for buttonCargo and selChangedListnBox

* Fix defaultLoadout save button

* Remove unallowed command

* Fix arsenal messages not working in 3DEN

* Add export current loadout, Add export defaultLoadoutsList

Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>

* Add import button functionality

* Change export / import messages

* Change message to use scheduled only

* Attempt to sanitize data in import func

* Add a 3DEN attribute to save defaultLoadoutsList, fix shared loadout check

* Replace 2 last traces in verifyLoadout

* Change defaultLoadoutsList export format and add a 3DEN check for it's default value

* Fix original array being modified in fillLoadoutsList

* Improve shared loadout check

* Fix removeVirtualItems not removing Accs, nil virtualItems var in removeBox

* Add zeus support for arsenal rewrite, fix openBox camera check

* Add isPlayer check to arsenal rewrite part of bi module

Arsenal rewrite does not seem to work on remote players, welp, I tried at least

* Fix shared loadouts loadout index being null

Forgot to change that one getVar

* Hide shared column if sharing is disabled on My loadouts tab

* Remove trace from loadoutsLoad, add trace to shared and unshared EHs

* Fix postInit trace

* Fix sharing EHs being broken, remove traces in them, prevent possible issue

yeah, _x params doesn't work there :p

* Fix fillLoadoutsList error

* Start translating and code reviewing

* Add editing vehicle crew loadout support for arsenal

* Move left panel filling above 3DEN handling to avoid float crew members

* Fix onArsenalClose EOF, add header for it

* Move onButton EHs to config, remove placeholder stats func

* Add headers for onLoadouts funcs and verifyLoadout

* Clean up buttonClearAll

* Fix assigned items not being added properly to currentItems on loadout load

* Add more function headers

* Make rename work in default loadouts tab in 3DEN

* Add more functions headers, continue code review

* Add more functions headers, finish code review

* Fix loadout saving to profile from an other tab than my loadouts

* Fix loadout saving even more

* Attempt to fix loadouts handling

From totally broken to somewhat usable.

* Even more fixing

* Add back onLoadoutSave EH

* Add back author message in loadoutSave

* Add back EOF newline

* Add back loadout caching

* Remove unique items from saved and loaded loadouts

* Add unique item support for the remaining container tabs

* Fix mag check for magazine type in container

* Add support for CfgVehicles and CfgGlasses in miscItems

* Add button highlighting for loadouts display, fix mag put and throw check

* Change shared column to show a proper icon

* Revert "Move onButton EHs to config, remove placeholder stats func"

This reverts commit 1be5d92426.

* Add back EOL newline in prep, remove stats placeholder again

* Add part of the german translation

* Add more translations, change how shared button text is managed

* Add scheduled check in openBox to avoid issues with people using addaction

Because you know they will.

* Add translations for import and export messages

* Fix comms tab defaulting to empty

* Align buttons perfectly for loadouts display, translation for delete action

* Add loadout saved translations

* Add load and rename messages translations

* localized interaction name in initBox

* Fix issue when admins deleted a loadout didn't change the icon status for authors

* Fix loadout import, update unique items list after import / loadout load

* Beautify UI a bit

* Add setting to toggle missing / unavailable items RPT logging

* Add settings strings

* Increase button size for main display

* Change DLC logo side in infoBox

* Change loadouts display buttons spacing, change deleteLoadout button active color

* Remove camera rotation limit

* Add polish translation

* German translation by @bux

* Order

* Fix typo in buttonExport, add credits in handleMouse

* Fix right panel item count not updating properly in certain scenarios

* Add loadoutName check when importing default loadouts, change assignedItems check

* Improve onSelChangedRight, fix typos in onSelChangedLeft and handleSearchbar

* Fix syntax check in removeVirtualItems count

* Shorten onSelChangedRightListnbox by improving current tab check

* Improve fillLeftPanel weapon tab filling

* Move lnbSetPicture occurences for the loadouts display to a define

* scan config opti

* Fix RPT logging check in fillLoadoutsList, use picture macro for shared tab

* Fix sharing and RPT logging settings having the same var

* Add newline at EOF for funcs that are missing it

* Move GVAR(sharedLoadoutsVars) to sharedLoadoutsNamespace

* newline eof

commy contributed too!

* Fix delete button not working as intended in public tab

* Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig

* Revert "Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig"

This reverts commit 496e6f8223.

* Add new Cfg entry for handling unique items saving, add entry to chemlight shields

* Fix currentMag tab not detecting current mag properly (still experimental)

* Improve left and right filled EHs, add "Dog Tags:" for dogtag uniques

* Change how the right panel first update works

* Fix updateRightPanel very obscure bug and header typo

* Move postInit EHs for medical and dogtags to their respective postInit

* Fix medical postInit typo

* Add currentMag tabs for primary and secondary muzzles properly

* Fix container compatible mags tab not showing anything

* Replace an inline if to select in fillRightPanel

* Attempt to fix accs recognition when switching weapons

* Improve currentMag2 tab show / hide logic

Secondary and handguns can't have a secondary mauzzle

* Add strings for currentMag and currentMag2 tabs

* Readd strings that tabler accidentally removed

* Make sorting for the right panel stay the same when switching items / tabs

* Replace bis_fnc_addWeapon by the addWeapon command

bis_fnc_addWeapon failed when a weapon with the same classname was in one of the player's containers
Add mag for primary muzzle after the weapon is added, is possibly replaced by current mag(s) saved in curentItems

* Replace BIS_fnc_overviewAuthor in itemInfo

It works better

* Display itemInfo box properly for currentMag1 and 2 tabs

* Don't reset arsenal vision mode after quitting arsenal

* Improve showItem

* Remove trace from showItem

* Move getWeight and weight string from movement to common

* Fix typos in addVirtualItems

* Comment back compile cache for common

(Not yet for arsenal, not until it's validated for a merge)

* Replace secondaryMuzzleMag tab icon by @Max255PL 's

* Update @Max255PL 's icon

* Add missing author strings

* Add debug trace for a specific issue

* Add more traces in loadoutsSave

* Fix bug in loadoutsSave, remove debug traces

* Fix typo in loadoutsSave

* Fix uniqueBase cfg check for all cases in loadoutsSave

* Improve whitelisting for current weapon accs and mags

* Update CBA settings strings, change RPT logging to be turned off by default

* Update polish translation by @max255PL

* Fix saving loadouts when no loadout has ever been saved

* Make loadout screen lighter

* Save camera position and view mode for ace arsenal

* Improve loadouts screen presentation

* Improve loadouts screen readability

* Improve camera angle in loadout screen

* Improve loadout renaming, Fix bug linked to renaming

* Fix wrong loadout being used while renaming and color not being reapplied

* Fix other possible issue with renaming

* Change missing items color to be more colorblind friendly

* Fix typo and improve return check in getWeight

* Disable debug and re-enable compile cache for common and arsenal

* Remove uneccessary newline in arsenal's script_component.hpp
2017-12-07 08:48:10 +01:00
commy2
eba99f4707 only use for medical, keep setCaptive for captives 2017-12-06 17:22:07 +01:00
commy2
617a54201d Merge branch 'master' of https://github.com/acemod/ACE3 into buildingLitter 2017-12-04 13:19:31 +01:00
commy2
7d4bc85f75 tweak radius, and med junk height check 2017-12-04 13:18:56 +01:00
commy2
7cfb2b865c Fix enum errors (#5834)
* Fix enum errors

* Update fnc_paradropItem.sqf

* Update fnc_actionPlaceInBodyBag.sqf

* Update fnc_compat_spectatorBI.sqf

* Update ACE_ZeusActions.hpp
2017-12-01 10:34:27 -06:00
PabstMirror
5f062caaea
fix medical enableAdvancedWounds setting (#5826) 2017-11-29 12:19:26 -06:00
Dystopian
a0e9b752e9 Add ability to pull dead body out of vehicle (#5630)
* Add ability to pull dead body out of vehicle

* Fix interaction not in vehicle

* Fix interaction with crew of dead vehicle

* Fix medical unload patient when he is dead

* Cleanup

* Fix cargo index, fix menu visible in vehicle
2017-11-17 16:47:58 -06:00
Josuan Albin
765d36b4bc Add / Fix missing author entries (#5763)
* Add missing author strings

* Fix dagr author entry
2017-11-13 16:54:34 -06:00
PabstMirror
cd30b09b4f Convert ACE_settings to CBA_settings (#4895)
* Convert ACE_settings to CBA_settings

* Run Modules Globaly, BWC for SetSetting

* Add support for string settings

* ACE_ServerSettings warning

* Add handler for global setting being changed

* Add deprecated and replaced not to Settings Framework doc

* Remove options menu UI, Move Debug and HeadBug Fix to Options in Pause Menu

* Change modules scope to 1

* Disable debug
2017-11-11 20:21:55 +01:00
Dedmen Miller
bacb7d069b Don't recompile XEH EH's before every call (#5728)
* Fix medical respawn/init

* Medical use CBA addClassEH

* Movement inventoryDisplayLoad

* Medical handleRespawn header typo

* Parachute handleRespawn

* Rearm and parachute handleRespawn

* concertina_wire handleInit

* Fix header

* use XEH function instead of config

* use XEH function instead of config

* remove unneeded init eh
2017-11-07 15:21:58 -06:00
sbng-PAPA
a3e9879cec korean translation (#5730)
Misfit taxt Modified, translate for 3.11
2017-11-06 15:54:35 -06:00
PabstMirror
5c4dbdcbda Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/XEH_postInit.sqf
	addons/medical/functions/fnc_adjustPainLevel.sqf
	addons/medical/functions/fnc_copyDeadBody.sqf
	addons/medical/functions/fnc_getTriageStatus.sqf
	addons/medical/functions/fnc_handleBandageOpening.sqf
	addons/medical/functions/fnc_handleCollisionDamage.sqf
	addons/medical/functions/fnc_handleDamage_fractures.sqf
	addons/medical/functions/fnc_handleDamage_woundsOld.sqf
	addons/medical/functions/fnc_init.sqf
	addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
	addons/medical/functions/fnc_parseConfigForInjuries.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setHitPointDamage.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
	addons/medical/stringtable.xml
	addons/medical_ai/functions/fnc_healUnit.sqf
	addons/medical_ai/functions/fnc_isInjured.sqf
	addons/medical_menu/functions/fnc_handleUI_DisplayOptions.sqf
2017-10-24 16:13:12 -05:00
God of Monkeys
72e48c04f0 Update Chinese stringtable content (#5637)
Update Chinese stringtable content
2017-10-18 12:01:29 -05:00
BaerMitUmlaut
a95c380dcc Remove legacy medical settings (#5609) 2017-10-11 22:23:12 +02:00
Joko
3a0fd5cae3 fix the delay timing when a unit switch to Captive (#5338) 2017-10-10 11:30:31 -05:00
AkiraforARMA
ed1e95106d Priority ERROR units never die possibility (#5526)
* Priority ERROR units never die possibility

Cases when _lifesLeft goes below 0. 
Low or limb damage, then recovered with PAK from unconcious & revivestate.

* Update fnc_setDead.sqf
2017-10-10 11:06:07 -05:00
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598)
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
2017-10-10 09:39:59 -05:00
classic
d5aeec11ea Update the Jpn translation (#5586)
* Update the Jpn translation

few tweak to translation

* Update the Jpn translation

couple tweak

* Update the Jpn translation

added more simplify translation

* Update the Jpn translation

few tweak and fix miss translation

* Update the Jpn translation

Added missing symbol and few tweak

* Update the Jpn translation

added shortest word because text is protruding the button

* Update the Jpn translation

fix miss translation and some tweaks

* Update the Jpn translation

just few tweak

* Update the Jpn translation

fix miss translation

* Update the Jpn translation

just a little tweak

* Update the Jpn translation

just a tweak

* Update the Jpn translation

added more simply translation

* Update the Jpn translation

tweaked to some entry

* Update the Jpn translation

tweak to few entry

* Update the Jpn translation

fix for miss translation

* Update the Jpn translation

fix miss translation

* Update the Jpn translation

some tweaks to translation

* Update the Jpn translation

fix miss translation

* fix the Jpn translation

fix the kanji
2017-10-04 16:30:11 +02:00
PabstMirror
32e73fa1b3 Fix addLoadPatientActions 2017-10-02 22:37:22 -05:00
PabstMirror
af48c6a86c Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/ACE_Medical_SelfActions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/XEH_PREP.hpp
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical_treatment/functions/fnc_actionLoadUnit.sqf
2017-10-02 22:29:30 -05:00
jonpas
711e1fc026 Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521)
* Fix Magazine Repack underwater - fix #5513
Also prevent common goKneeling function underwater

* Fix loading patients underwater - fix #5515

* Fix load object underwater

* Fix take nozzle on jerry can underwater

* Fix refuel underwater conditions further

* Use isTouchingGround, Make refuel semi-compatible
 reports false if head is out of the water, we want true even if we are not diving

* Less interact exceptions duplication

* Use animationState to determine if unit is swimming, create common function and use it instead of isTouchingGround

* Fix condition

* Support dragging underwater
No carrying due to animation timing issues and other misc things

* Allow Medical Legs SelfActions underwater

* Fix fixPosition function underwater (use getPosATL instead of getPos)

* Fix fixPosition's slope adjustment for non-gravity objects, Do the same for objects without simulation as well
2017-10-01 13:38:11 -05:00
Ozan Eğitmen
45a66ccfa1 Medical & Captive Load Menu Overhaul (#5519)
* Add load in child actions to medical & captive

* Add actions with proper structure

* Move vehicles actions code to common function

* Simplify code in config, Fix docs

* Remove unused vars

* Fix header example

* Add _distance param to fnc_nearestVehiclesFreeSeat

* Change docs

* Fix spacing
2017-09-29 22:00:47 +02:00
classic
9dfc76b6d5 Update the Japanese translation (#5565)
* Update the Jpn translation

following to official localization.

* Update the Jpn translation

fix for miss translation

* Update the Jpn translation

added more natural words and fix miss translation.

* Update the Jpn translation

fixed for miss translation.

* Update the Jpn translation

just tweaks

* Update the Jpn translation

added to new entry. fixed or tweaked to few entry.

* Update the Jpn translation

added the jpn translation to new entry

* Update the Jpn translation

Added the Jpn translation to new entry.

* Update the Jpn translation

tweak to jpn translation

* Update the Jpn translation

following to official Japanese localization

* Update the Jpn translation

support to new entrys and few fix

* Update the Jpn translation

just tweaks to few entrys
2017-09-28 16:04:24 +02:00
jonpas
a48db26996 Fix Load Patient/Captive actions (#5544)
* Disable (un)load patient action if unit is dead but was uncoscious before

* Remove handcuffs on death (prevents stand-up ragoll restart), Don't show load patient and captive at the same time

* Only allow unloading from outside - fix #5525 as discussed

* Also prevent unloading captives from inside

* Add debug logging
2017-09-27 15:41:05 -05:00
PabstMirror
b0d68b1011 Add respawn/state logging 2017-09-27 12:06:03 -05:00
KoffeinFlummi
32b2d99887 Merge remote-tracking branch 'sbng/master' 2017-09-27 18:57:24 +02:00
PabstMirror
4c28c4de22 Reset isLimping var 2017-09-26 17:43:54 -05:00
jonpas
4de7953316 Remove deprecated addToInjuredCollection function (#5559) 2017-09-26 11:23:20 -05:00
Ľuboš Lendáč
b292cbf8c6 Merge branch 'medical-rewrite' into medical-rewrite-kill-ai 2017-09-25 23:36:49 +02:00
sbng-PAPA
37dcb562a7 korean translation for 3.10 2017-09-26 00:54:27 +09:00
PabstMirror
ddf72d5878 Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/ACE_Medical_SelfActions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/CfgWeapons.hpp
	addons/medical/data/model.cfg
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/stringtable.xml
2017-09-23 11:25:58 -05:00
Andrea Verano
e47212ea9c Italian translation update (#5531)
Added:
-Advanced Fatigue
-Interactions
-Medical
-Refuel
-Spectator
-Fully translated markers and maverick

Fixed:
-Next Unit
-Previous Unit
2017-09-19 16:22:11 +02:00
KoffeinFlummi
fa02d0d993 Merge tag 'v3.10.2' into armake 2017-09-19 02:13:24 +02:00
PabstMirror
30a8d2db7b Use CBA Misc Items (#5502)
* Use CBA Misc Items

* Set required CBA to 3.4.1
2017-09-12 23:23:45 -05:00
Broström.A | Evul
e0f3b393d7 Added missing semicolon (#5487) 2017-09-10 14:44:26 +02:00
classic
98c140bb64 Jpn translate 2f93c40 (#5476)
* update the Jpn translation

Add translation for new words and small changes.

* Update Jpn translation

add translation for new words and some tweaks.

* Update Jpn translation

fix miss translation and minor tweak.
2017-09-07 00:06:00 -05:00
jonpas
e11e102a76 Underwater actions support (#4984)
* Enable majority of actions underwater

* Remove log

* Add logistics_wirecutter support (don't play kneel animations underwater - looks silly)

* Don't perform kneel animations when repairing or medicaling underwater

* Fix interaction menu rendering underwater (was moving based on player eye level due to height max used for large vehicles)

* Fix attach underwater (LIW does not work underwater, LIS does), Add attach scan drawing define

* Remove left-over systemChat

* Remove vehiclelock from Plane, Disallow linking belt underwater, Allow checking ammo when sitting via action (was already possible via keybind), Use param for LIS
2017-08-22 13:30:56 -05:00
BaerMitUmlaut
b7e42cb7a4 New medical box (#5278)
* Replaced medical box

* Added ElTyranos as author

* RVMAT code style

* Added ground contact points, fixed broken face
2017-08-22 12:55:14 -05:00
Joko
d9ea680afa Fix adenosine self injection displaying incorrect action (#5430) 2017-08-14 19:47:58 +01:00
PabstMirror
d81e943590 Delete medical litter on building explosion 2017-08-09 12:13:29 -05:00
classic
8b7a862611 Update the Jpn translate fd48c7f (#5381)
* Update the Jpn translation

Support to new entry

* Update the Jpn translation

for more Natural words.

* Update the Jpn translation

Unification of words.

* Update the Jpn translation

tweaks to words.

* Update the Jpn translation

Fix to wrong translation.

* Update the Jpn translation

added translation to Proper noun

* Update to Jpn translation

Fix to wrong translation.
2017-07-23 14:27:50 +02:00
Dissyu
a7954368f4 Fix Chinese content & missing string (#5375)
* Fix missing string with stringtable

Fix Advanced Fatigue & QuickMount

* Fix Chinese content & missing string

* Fix Gestures & DAGR missing string

* Fix quickmount string with vanilla string

* Remove adr97 unnecessary string
2017-07-19 20:57:20 +02:00
jonpas
fa3743ca54 Correct new Chinese stringtable identifiers (#5334) 2017-07-10 16:47:26 +02:00
classic
dc303aa29f Japanese translation d02dacf (#5309)
* add the Jpn translation for repair

add the Japanese translation for repair

* minor fix to Jpn translation for medical

minor fix to Jpn translation for medical
2017-07-10 16:46:25 +02:00
GodofMonkeys
0ccbeb25e9 Add Chinese Traditional & Simplified Localization (#5295)
Add Chinese Traditional & Simplified Localization
2017-07-10 16:45:22 +02:00
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
classic
98ccd879f3 Japanese translation d02dacf (#5309)
* add the Jpn translation for repair

add the Japanese translation for repair

* minor fix to Jpn translation for medical

minor fix to Jpn translation for medical
2017-06-23 11:39:06 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295)
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +02:00
Arcanum
fe16b72837 Fix AI can get to CA from injured 2017-06-18 12:43:39 +02:00
Arcanum
f86420c0d7 Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite-kill-ai 2017-06-18 12:30:03 +02:00
Zakant
bdea0fcdba [Medical Rewrite] Adding respawn compatibility (#5020)
* Added respawn transition

* Removed respawn transition from statemachine and added manual transition comment

* Changed transiton to manual. Added easy way to get current status as well

* Updated event reference

* Fixed manualTransition call

* Minor headers changes
2017-06-17 18:28:16 -05:00