Commit Graph

755 Commits

Author SHA1 Message Date
PabstMirror
44b526ab6d bodybag - hide player corpse and delete later
Fix #1301
2016-02-19 15:41:13 -06:00
Thomas Kooi
95532ea521 Merge pull request #3333 from acemod/medicalEvents
Replace execRemoteFnc in ace_medical
2016-02-19 12:00:00 +01:00
commy2
be8f7f9cc0 Merge pull request #3276 from acemod/156selectapply
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
esteldunedain
88eae19646 Replace execRemoteFnc in ace_medical 2016-02-17 22:54:43 -03:00
PabstMirror
be742c13cd Merge branch 'master' into 155selectRandom 2016-02-17 15:58:19 -06:00
Thomas Kooi
26cb6bd6a3 Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant
Make wound assignment consistent for dll/sqf
2016-02-17 18:34:28 +01:00
PabstMirror
40396fc69e Remove debug 2016-02-17 09:37:08 -06:00
PabstMirror
f1797feead Make wound assignment consistent for dll/sqf
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
2016-02-16 12:19:18 -06:00
PabstMirror
5c9dfd7dc5 Handle enemy causing veh explode, fix revive unload
Fix #3269
2016-02-15 22:23:37 -06:00
PabstMirror
9441b548be Fix vehicle crashes not being fatal to non-drivers
Fix #3306
2016-02-15 17:11:04 -06:00
Ivan Krouglyi
0a226b5ee9 Update fnc_treatment_success.sqf
Error at 84 line - you forget ";"
2016-02-13 03:29:42 +03:00
commy2
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
commy2
ac007e6995 replace more map with apply 2016-02-06 12:08:04 +01:00
PabstMirror
35333cbe9d Merge branch 'cargoCleanup' 2016-02-04 12:51:52 -06:00
PabstMirror
336184dfaa Change medication removal from array 2016-02-04 10:00:33 -06:00
PabstMirror
3cc10a27ce Tourniquets block medication until released
Close #2704
2016-02-03 14:40:26 -06:00
PabstMirror
c0eccc67c3 Change all SCALAR to NUMBER in headers 2016-01-28 18:19:15 -06:00
PabstMirror
17a882fe4d Add findUnloadPosition integration 2016-01-26 18:01:01 -06:00
PabstMirror
04bccf47d7 Replace all use of deprecated commands 2016-01-19 09:39:07 -06:00
PabstMirror
c2f780e95f #1259 - Medical Locations Boost Training 2016-01-09 23:54:48 -06:00
Glowbal
c042703786 Merge branch 'release' 2016-01-05 22:55:34 +01:00
commy2
7eaa55f9df Merge pull request #3022 from acemod/bodybagevent
add event for placing units in body bags
2016-01-05 21:59:47 +01:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
Glowbal
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
PabstMirror
74aec45921 Fix medical menu not closing on range, litter dir
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
2015-12-19 20:50:57 -06:00
PabstMirror
886c13f6a9 Merge pull request #3013 from acemod/bloodyLitter
Fix litter for adv - Add bloody p3d for Pack/qClot
2015-12-14 19:23:51 -06:00
commy2
7f63d51ccb add event for placing units in body bags 2015-12-12 18:21:11 +01:00
PabstMirror
db50b5313d getName can return raw or sanatized html tags 2015-12-11 12:01:50 -06:00
PabstMirror
e9be05209a Fix litter for adv - Add bloody p3d for Pack/qClot
Fix #2950
Get correct bloodLossOnSelection for both basic and advanced
Adds bloody versions of packing bandage and quickClot
2015-12-10 22:58:44 -06:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
PabstMirror
b13656e54b addDamageToUnit - Disable debug / testing code 2015-12-05 12:19:34 -06:00
PabstMirror
875b3980ac Don't update openWounds if not bandaged
Fix #2921
2015-12-03 15:23:38 -06:00
commy2
411a8d58f3 fix more setVariable and getVariable capitalization 2015-11-30 17:53:57 +01:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +01:00
commy2
2b05f6f451 fix isNil capitalization 2015-11-30 17:22:16 +01:00
commy2
5e41643cff fix pushBack capitalization 2015-11-30 17:21:28 +01:00
commy2
d9b90258bc fix typeOf capitalization 2015-11-30 17:19:57 +01:00
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
commy2
ff4406e411 manual merge, more selectRandom command useage 2015-11-29 16:48:23 +01:00
commy2
e5c4d35969 1.55 use new selectRandom command 2015-11-29 16:33:25 +01:00
Thomas Kooi
5282e95668 Merge pull request #2876 from acemod/medicalTranslateHP
Medical Fixes
2015-11-28 20:58:08 +01:00
Thomas Kooi
cef01baf0b Merge pull request #2856 from acemod/isEqualTypeRepalcement
1.54 - Replace typeName with isEqualType
2015-11-28 20:36:07 +01:00
PabstMirror
5850f78c1f Merge branch 'master' into isEqualTypeRepalcement 2015-11-27 21:08:21 -06:00
PabstMirror
6031eb8c6e Add all wound types to bandage treatment configs
Fix by adding all config entries;
instead of trying to modify classname
2015-11-27 14:19:26 -06:00
PabstMirror
e51f658ce0 Try base wound class in bandage treatment configs
Gets the correct wound for the bandage treatment config
Used for selecting most effective bandage and reopening
_className was something like "velocityWoundMedium"
but configs only had base class "velocityWound"
2015-11-26 23:18:39 -06:00
PabstMirror
a5c45c137f Medical - addDamageToUnit Helper 2015-11-26 09:53:12 -06:00
PabstMirror
988a5c76bb Medical - 1.54 Changes
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset

Cache hitpointIndex to reset damage

Normalize Limb Armor to 1.54

Cleanup

Cleanup
2015-11-25 11:49:20 -06:00
Thomas Kooi
801120fb39 Merge pull request #2841 from acemod/medicalAiBandage
Move bandage log before basic exit
2015-11-20 22:28:55 +01:00