Commit Graph

12389 Commits

Author SHA1 Message Date
Bismarck
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
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
Thomas Kooi
81f1365a41
Merge pull request #6434 from acemod/fix-restructure
Various fixes for the medical restructure branch
2018-07-16 12:34:39 +02:00
Thomas Kooi
e23d1cfe17 Add run deploy job on master branch 2018-07-15 18:31:00 +02:00
Glowbal
2faa3379ae Fix getBloodloss 2018-07-15 18:29:18 +02:00
Glowbal
6576e5d014 Fix linting error 2018-07-15 16:28:39 +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
78d91edae2 Fix statemachine not running 2018-07-15 14:21:41 +02:00
Thomas Kooi
19f3b753f0 Decrease treatment time of medication to 5s 2018-07-15 13:59:47 +02:00
Thomas Kooi
2a721cb8c8 Fix medical item icons not found error 2018-07-15 13:59:21 +02:00
Thomas Kooi
612cf1f01c Upgrade CBA script macros common file 2018-07-15 13:01:39 +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
Thomas Kooi
5e1c3c6da1 Fix duplicate class declarations during start up 2018-07-15 12:33:34 +02: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
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
SilentSpike
e0503129f0 Use blood bolume status macros 2018-05-10 17:44:02 +01:00
SilentSpike
4715a75351 Include all UI files 2018-05-10 16:47:11 +01:00
SilentSpike
65a3c32f9f Fix patient information display 2018-05-10 16:42:33 +01:00
SilentSpike
267c0b5c3c Fix some moved function calls 2018-05-09 16:52:26 +01:00
SilentSpike
dbb538dc56 Fix GVARs moved out of medical 2018-05-09 13:37:07 +01:00
SilentSpike
b81bee2d46 Fix bandage and injector icon paths 2018-05-08 14:55:13 +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
e97e1ed670 Fix more icon paths 2018-05-08 13:57:32 +01:00
SilentSpike
6cb43d61eb Fix icon paths 2018-05-08 13:46:30 +01:00
SilentSpike
a16721a1ea Fix medical statemachine function calls 2018-05-08 11:12:01 +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
6eb9c7e940 Fix medical vitals function calls 2018-05-08 09:17:47 +01:00
SilentSpike
352d8cad31 Fix missing postInit error 2018-05-08 09:09:44 +01:00
SilentSpike
1373e62cd0 Fix stringtable names 2018-05-08 08:52:59 +01:00
SilentSpike
c92fd89c7a Fix pain percieved function calls 2018-05-08 08:47:03 +01:00
SilentSpike
909ae27721 Fix function prep typos 2018-05-08 08:38:00 +01:00
SilentSpike
6559665b8b Use more status macros 2018-04-27 16:03:55 +01:00
SilentSpike
7d55163463 Add missing PREPs 2018-04-27 15:43:41 +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
5206b63d5a Fix medical interaction menu bleeding colours
This makes the bloodloss calculation used for the interaction menu icons
match the calculation used for the body image.
2018-04-20 12:28:18 +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