Commit Graph

14592 Commits

Author SHA1 Message Date
SilentSpike
11547d7ff8
Fix environmental damage sources (#6515)
* Tidy handle damage code
* Fix environmental damage conditions

- Vehicle damage would never occur because it doesn't fire all the
hitpoints
- Missing sanity check on fall damage to check that unit isn't in a
vehicle
- Getting hit by a vehicle while on foot can be detected by checking for
a shooter

* Improve collision handling

- All collisions have a `_shooter` so we simply first check for that because burning doesn't and it could happen at any velocity
- We don't actually care what caused the collision because they should all cause the same type of wounding
- The exception is fall damage because we want to prioritise wounding the legs, we assume if the `_unit` had downward velocity and `_shooter == _unit` that it was fall damage (not necessarily always true, but almost always is and there doesn't look to be a more specific way to check).
2018-08-15 07:57:11 +01:00
Rutger "RedBery" Meijering
5fbaf426a8 Fix various bugs (#6523)
* Fix medical menu not reopening regardless of setting
* Ensure no heartrate or bloodpressure on death
* Fix status variables not being reset on respawn
* Fix JIP resetting status variables for all units
* Fix heart rate adjustment overflow and
2018-08-14 21:34:35 +01:00
Thomas Kooi
ced45b2a4d
Remove play with six launch method (#6528)
PWS is no longer active.
2018-08-13 12:29:22 +02:00
SilentSpike
0e8ed5315e
Remove patient treatment animations (#6524)
* Prevent treatment animation on dead bodies

This was causing bodies to glitch out on dedicated servers according to
feedback

* Remove patient animation logic and setting
2018-08-12 12:28:48 +01:00
SilentSpike
a182336880
Ignore playable logic hitpoints (#6517) 2018-08-12 12:21:06 +01:00
SilentSpike
923c25163f Fix missing boolean return in CPR 2018-08-12 11:50:47 +01: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
Zakant
14d52ee77e Remove CPR alive check (#6492) 2018-08-12 08:57:23 +01:00
Dedmen Miller
c1c5d6d63c Remove collision of bandage litter (#6495)
* Remove littergeneric collision
* Remove collision/shadow from non-litter items
* Remove quik clot litter shadow
* Add empty shadowLOD to litter
2018-08-11 17:52:26 +01:00
Drofseh
b3134d00dc remove comments from rvmat files 2018-08-11 08:58:50 -07:00
Rutger "RedBery" Meijering
0a97ef3cc8 Fix event name overlap and macros (#6514) 2018-08-11 11:40:06 +01:00
Cuel
d8f0de1a5d acex fortify deploy handler and event docs (#6282) 2018-08-09 11:01:35 -05:00
Josuan Albin
0696875175 Wiki - Add new Arsenal EHs and stat indexes to arsenal framework doc (#6497)
* Add new EHs and stat tab index to wiki

* Add added-in collumn for new arsenal EHs
2018-08-09 11:01:01 -05:00
PabstMirror
cd980dc28d 3.12.3 - Build 36 2018-08-09 09:42:36 -05:00
PabstMirror
21de7138a7 Merge branch 'master' into release-3.12.3 2018-08-08 09:49:17 -05:00
jonpas
48c3900507 Fix Japanese stringtable (#6511) 2018-08-08 07:17:22 -05:00
jonpas
f6737f0c6e Bump required Arma 3 version to 1.84 and CBA to 3.8.0 (#6508) 2018-08-08 09:56:33 +01:00
Zakant
88238dd0b5 Fix wrong macro (#6509) 2018-08-08 09:54:17 +01:00
PabstMirror
9d24cebb9b Build 35 2018-08-06 11:49:21 -05:00
PabstMirror
dd519f1bed Merge branch 'master' into release-3.12.3 2018-08-06 11:34:00 -05:00
Dystopian
2d5892f285 Fix facility is like vehicle (#6478) 2018-08-06 11:27:14 -05:00
classic
d31f004ac2 Update Japanese translation (#6503)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2018-08-06 11:18:59 -05: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
Josuan Albin
29d11bc752 Fix terminals not being properly added to currentItems (#6504) 2018-08-05 23:15:49 -05:00
Josuan Albin
bac4156d1a Arsenal - Fix weapon without mag showing weird velocity (#6500)
* Fix weapon without mag showing weird velocity

* Update stringtable.xml

* Change string to str_empty
2018-08-05 22:22:39 -05:00
Thomas Kooi
21eb5e3df6
Merge branch 'master' into armake 2018-08-02 21:49:35 +02:00
PabstMirror
d48e336915 v3.12.3 2018-08-02 14:48:41 -05:00
PabstMirror
240046ceee
Medical Menu - Check cursorObject if cursorTarget is invalid (#6496)
Should fix #6488
2018-08-02 14:42:44 -05: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
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
PabstMirror
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
Josuan Albin
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
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
9e26833b94
fix(medical): make sure vitals handling works properly again (#6481) 2018-07-29 23:16:06 +02:00
SilentSpike
2ea7c349ca
Add possibility for lethal organ damage (#6277)
* Change fatal injury to emulate lethal organ damage
2018-07-29 21:19:04 +01:00
PabstMirror
2767fddd92
Update goggles.md (#6479) 2018-07-29 13:53:16 -05:00
Dystopian
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
Dystopian
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
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
9349179213
Fix and use hemorrhage stringtable descriptions (#6472)
* Fix hemorrhage stringtable descriptions
* Use hemorrhage descriptions always
2018-07-25 18:42:53 +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
SilentSpike
39b1d144e1
Vary time taken to bandage based on circumstances (#6467) 2018-07-25 09:35:04 +01:00
Glowbal
5ad9641ee6 Line endings on fortify.md 2018-07-24 20:59:35 +02:00
Tim Beswick
10a988836d Ignore interaction distance with zeus cargo load module (#6396) 2018-07-21 18:07:16 -05:00
PabstMirror
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
commy2
78ee7d4677
simplify animations config 2018-07-21 09:16:05 +02:00
SilentSpike
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