Commit Graph

15434 Commits

Author SHA1 Message Date
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
9b5c5bc866 Fix QGVAR medical variables 2018-07-16 15:35:34 +02:00
81f1365a41 Merge pull request #6434 from acemod/fix-restructure
Various fixes for the medical restructure branch
2018-07-16 12:34:39 +02:00
e23d1cfe17 Add run deploy job on master branch 2018-07-15 18:31:00 +02:00
2faa3379ae Fix getBloodloss 2018-07-15 18:29:18 +02:00
6576e5d014 Fix linting error 2018-07-15 16:28:39 +02:00
f552acd7da Fix incorrect macro usages with whitespace 2018-07-15 16:25:14 +02:00
9d2e76e67a More component name fixes and small clean up 2018-07-15 16:24:04 +02:00
14db38e0f0 Fix various namespace issues with medical 2018-07-15 15:00:16 +02:00
78d91edae2 Fix statemachine not running 2018-07-15 14:21:41 +02:00
19f3b753f0 Decrease treatment time of medication to 5s 2018-07-15 13:59:47 +02:00
2a721cb8c8 Fix medical item icons not found error 2018-07-15 13:59:21 +02:00
612cf1f01c Upgrade CBA script macros common file 2018-07-15 13:01:39 +02:00
9c00c6ffb5 Fix bunch of script errors related to getVars on start up of game 2018-07-15 13:01:26 +02:00
5e1c3c6da1 Fix duplicate class declarations during start up 2018-07-15 12:33:34 +02:00
f4a0747493 Explosives - Increase defuse range for underwater mines (#6429)
Fix #6427
2018-07-13 12:36:21 -05:00
fa7b2ed73d Fix unit info base class (#6430) 2018-07-13 12:35:56 -05:00
5fe82662e5 ace_infoDisplayChanged will now trigger also for mods (#6422)
* add RscUnitInfo to DisplayLoad eh

* delete all ace_infoDisplayChanged that also have initDisplay with RscUnitInfo
2018-07-13 12:19:58 -05:00
a84daca959 Explosives - Optimize interactEH function (#6406)
* Optimize explosives interactEH

* Use local player variable and distanceSqr
2018-07-13 12:04:55 -05:00
def05b9cf1 Wire cutter - Various improvements and cleanup (#6389)
* Optimize and cleanup interactEH function

* Add missing fences and improve formatting

* Improve cutDownFence function

* Remove unused sound files and cleanup

* Multi-line condition and fix examples

* Increase PFH delay and use distanceSqr
2018-07-13 11:30:13 -05:00
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
4b1672eaa0 its now possible to set rearm vehicles in the editor && pylons now look also for non-config rearm vehicles 2018-07-09 19:20:55 +02:00
29726946f6 Disposable - Fix nlaw picture popup error (#6419)
Fix #6410
2018-07-06 00:13:23 -05:00
80e648938a Speed limit scroll (#6384)
Vehicles - Set speed limited with mouse scroll wheel
2018-07-05 11:32:40 -05:00
5495bd5a1f Pylons - Add ACE prefix to settings category (#6388) 2018-07-05 11:29:51 -05:00
a8c1846a37 Logistics - Move to CBA settings and organize in subcategories (#6284) 2018-07-05 11:29:32 -05:00
14b08bafe6 Merge pull request #6415 from markooff/patch-1
Add link to a polish version of the vector manual
2018-07-05 18:02:11 +02:00
8e71d51956 Update vector.md 2018-07-04 20:23:31 +02:00
ea4533fc7f Update vector.md 2018-07-03 17:26:36 +02:00
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
e5a15d200f Traditional Chinese update (#6408)
Traditional Chinese update
2018-06-27 14:16:11 -05:00
74efc9c428 Merge pull request #6405 from acemod/fixExplosiveKilledDialogs
don't make Explosives close one display at death
2018-06-25 08:43:44 +02:00