Commit Graph

13165 Commits

Author SHA1 Message Date
240046ceee Medical Menu - Check cursorObject if cursorTarget is invalid (#6496)
Should fix #6488
2018-08-02 14:42:44 -05:00
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
60a8158246 Fix GUI bodypart string names (#6490)
* Fixed new names in stringtable
* Removed duplicated entries from stringtable
* Fixed comma
2018-08-02 09:43:30 +01:00
6ae7c28025 Dragging - Add compatibilty for 1.84 static weapons and radars (#6494)
* Dragging - Add compatibilty for 1.84 static weapons and radars

* Reload - Disable check ammo keybind when in UAV
2018-08-01 15:29:54 -05:00
9f85a53711 Fix error in setupExplosive with CBA 3.8.0 (#6476)
* Fix error in setupExplosive with CBA 3.8.0

getFov has a param check now, this function was passing args to it and causing an error.

* Fix getFov call in attach and viewDistance modules
2018-07-31 17:36:22 -05:00
7cf483d598 Removed icon from legacy modules (#6486) 2018-07-30 14:11:18 -05:00
6bd8542eed Move #includes before function headers (#6484) 2018-07-30 10:22:14 +01:00
c9ad92e92d Disable debugging (#6482) 2018-07-30 00:07:30 +02:00
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
9e26833b94 fix(medical): make sure vitals handling works properly again (#6481) 2018-07-29 23:16:06 +02:00
2ea7c349ca Add possibility for lethal organ damage (#6277)
* Change fatal injury to emulate lethal organ damage
2018-07-29 21:19:04 +01:00
2767fddd92 Update goggles.md (#6479) 2018-07-29 13:53:16 -05:00
a44411c666 Wire cutter - Allow use when unit has RHS Engineer UMBTS backpack (#6462)
* Allow wirecutter use when unit has RHS Engineer UMBTS backpack

* Move flag from code to config
2018-07-27 12:26:26 -05:00
4e0df9b90e Minor fixes (#6465)
* Fix example in ace_map_fnc_simulateMapLight

* Make fnc_addActionToObject public

* Repair - Delete unnecessary condition
2018-07-27 12:24:56 -05:00
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
9349179213 Fix and use hemorrhage stringtable descriptions (#6472)
* Fix hemorrhage stringtable descriptions
* Use hemorrhage descriptions always
2018-07-25 18:42:53 +01:00
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
39b1d144e1 Vary time taken to bandage based on circumstances (#6467) 2018-07-25 09:35:04 +01:00
5ad9641ee6 Line endings on fortify.md 2018-07-24 20:59:35 +02:00
10a988836d Ignore interaction distance with zeus cargo load module (#6396) 2018-07-21 18:07:16 -05:00
2203cb7b16 Common - Update showHud function for new elements (#6459)
Showhud command has been updated to 10 elements
2018-07-21 18:03:00 -05:00
78ee7d4677 simplify animations config 2018-07-21 09:16:05 +02:00
3b5747423a Improve unconscious volume handling (#6455)
* Lower player hearing upon entering unconscious
* Fix potential for unconscious units to use radio
* Evaluate player's volume upon changing unit
* Reset player volume on death
* Remove unnecessary public variable
2018-07-20 22:23:48 +01:00
8a37b6093d Arsenal - Fix locality issue for adding weapons/backpacks and remove unnecessary check in scanConfig (#6456)
* Remove unnecessary itemInfo check in scanConfig

I got the best tests folks, believe me, the best.
I made sure this didn't break anything by making sure the array had the same number of elements before and after removing those, best tests folks.

* Change onSelChangedLeft to use global variant of addWeapon and addBackpack

Fix a possible locality issue when opening ace arsenal on other players.
2018-07-20 15:54:04 -05:00
b8cd85135e Changes unit vitals rw (#6449)
* Some changes to UnitVitals

* increase to 40% chance

* Added bloodpressure L above limits cardiac arrest
2018-07-20 22:49:55 +02:00
cde22a675a Fix ladder dismount animation bug (#6454)
Not sure of the original reason we interpolate to this ACE unconscious
animation, but removing it seemingly has no effect and fixes all the
other animations that were broken by it.
2018-07-20 22:48:48 +02:00
0b19a8d527 Arsenal - 3DEN Attribute (#6257)
* Initial commit

* Add/remove items and switching between categories

* Add ability to change mode

* Save attribute and clear button

* Search bar and double click to toggle

* Add export button

* Add attribute init function

* Fix multiple selection with different items

* Correct bad code and remove unneeded include

* Update stringtable.xml

From common pbo whitelist (modified) and a3 stringtables

* Disable attribute on humans

* Move includes to top

ref #6407
2018-07-20 12:35:44 -05:00
8a81e3b675 Geforce, RHS Geforce adjustments and MH6M can now fastrope (#6439) 2018-07-19 22:54:06 -05:00
c33fc6106d Fix Rearming Pylon Magazines (#6378)
* Update fnc_keyPress.sqf

* Update fnc_keyPress.sqf

* Update fnc_rearmSuccessLocal.sqf

* Update fnc_rearmSuccessLocal.sqf
2018-07-19 18:40:04 -05:00
f7f89725fe Fix respawn not resetting variables (#6453) 2018-07-20 00:09:08 +02:00
bf2cbaab79 added new fences to wirecutter (#6423)
* added apex and tacops fences

informations from #6420

* added new p3d fences

infos by #6420

* tabs fix

* tabs fix2

* fix tabs3

* Remove comments from macro

* Fix merge

* Update script_component.hpp
2018-07-19 16:59:46 -05:00
ac5fedff44 Fix cardiac arrest timeout death (#6451) 2018-07-19 19:12:59 +02:00
13cdb76dce Fix some more stringtable usage 2018-07-18 23:20:31 +02:00
245a18599e Fix stringtable references 2018-07-18 23:19:27 +02:00
259afc169b Line endings 2018-07-18 22:51:53 +02:00
604fa0e4cb Fix some script errors on medical rewrite (#6450) 2018-07-18 22:50:03 +02:00
6497f6c9d4 Fix missing include 2018-07-18 21:17:44 +01:00
5c768f7784 Fix duplicate entry (#6448) 2018-07-18 21:53:54 +02:00
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
e8f00fbe7c Merge remote-tracking branch 'origin/master' into medical-rewrite 2018-07-18 20:42:41 +02:00
0e50aca9d8 Add support to toggle allowDamage (#6266) 2018-07-18 19:31:29 +01:00
3bbc1d21e4 Merge pull request #6301 from acemod/medical-rewrite-restructure
Restructure medical rewrite
2018-07-18 20:25:02 +02:00
34eb5553ea Move scream and moan sounds to medical feedback (#6438)
* Move scream and moan sounds to medical feedback
* Move vanilla feedback overrides to medical feedback
* Update all function calls
* Use events to avoid a dependency
2018-07-18 19:21:27 +01:00
ec7a9a133e Fix required addons in medical restructure (#6441) 2018-07-18 19:19:28 +01:00
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
68ff7575eb Move medical facility, vehicle and unit functions (#6440) 2018-07-18 11:09:48 +01:00
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
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
e566cbf35a Fixes damage redirection issues (#6231)
Units accumulate damage in the local variables
"ACE_Medical_Engine_$HitXXXX", but these are never reset. The way these
vars are used is as a single-damage-event tracker, and the end result of
not resetting their value when they're done being used is that a
specific $HitXXXX can accumulate enough damage to cause the "select
wound with highest damage" code to always select _it_ for the next wound
event, even if it wasn't the primary target of the last wound event.

I.E. I get shot in the right leg badly. If I then get winged in the left
arm, that wound will end up on my right leg, because when the code runs,
it finds QGVAR($HitRightLeg) > QGVAR($HitLeftArm), and so it applies the
wound to the right leg.
2018-07-16 23:49:06 +02:00
3bf3629047 Fixes state machine (#6435) 2018-07-16 23:25:54 +02:00