Commit Graph

80 Commits

Author SHA1 Message Date
Glowbal
1c066a0b3f Merge pull request #1586 from acemod/dynamicPAKtreatmentTime
PAK treatment time based on total amount of damage.
2015-06-13 20:14:57 +02:00
ulteq
84d20f9794 Further improved the handling of falling damage:
* Makes sure _projectile is always "falling"
* Enables the creation of wounds in multiple body parts at once
* Caches the initial impact velocity for later damage calculation
* Adjusts the maxDamage value of Large Abrasions
2015-06-13 11:53:30 +02:00
ulteq
46a73f3177 Added a function to calculate the PAK treatmentTime 2015-06-12 11:42:49 +02:00
ulteq
99b13a584a PAK treatment time based on total amount of damage. 2015-06-11 22:54:08 +02:00
jonpas
5496333c26 Merge branch 'master' into macroSTR
Conflicts:
	addons/nametags/ACE_Settings.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nametags/stringtable.xml
2015-06-02 22:22:51 +02:00
ulteq
048e5b6f6d Body bag cleanup:
* Increased the treatment time to match the animation duration
* Fixed the body bag alignment with the dead unit
2015-06-01 22:33:25 +02:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
Glowbal
9135d956f0 Merge branch 'surgicalkit' 2015-05-28 20:54:52 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
BaerMitUmlaut
30df0e8dc9 Switched to callbackPogress for treatment 2015-05-27 00:45:50 +02:00
PabstMirror
d752dd50d0 Basic - Bloodbag size matters 2015-05-23 01:16:18 -05:00
Glowbal
0a2679846c Changed: morphine works 15 minutes 2015-05-20 17:15:24 +02:00
Glowbal
e8d169248f Made atropine less effective 2015-05-20 17:15:23 +02:00
Glowbal
82260e5090 Changed: Made Morphine suppress more pain 2015-05-20 17:15:23 +02:00
Josuan Albin
dd2ea99d15 pak
pak anim
2015-05-05 19:26:11 +02:00
Josuan Albin
f063e45e60 medical advanced added
animations added for advanced
2015-05-05 19:04:08 +02:00
Josuan Albin
b781264212 New anim update
new healing animation added to animationCaller, animationCallerSelf
stays the same
2015-05-05 18:53:17 +02:00
Glowbal
e8ccddfc2c Added missing progress bar display text 2015-05-01 22:29:52 +02:00
KoffeinFlummi
270c3adc1e Do it again, but properly this time 2015-04-30 22:06:10 +02:00
KoffeinFlummi
85669a9e92 Convert Medical stringtable key names to lowercase 2015-04-30 22:01:09 +02:00
PabstMirror
3eb2bdfc84 Display Name Progress Text 2015-04-28 21:17:29 -05:00
bux578
b3c461b9da last few translations 2015-04-26 14:02:14 +02:00
bux578
dec47dade8 ups, remove test code 2015-04-26 09:38:56 +02:00
bux578
171cea998e add most of the translations 2015-04-26 09:36:51 +02:00
esteldunedain
cce9e1f04c Simple diagnose 2015-04-17 19:38:03 -03:00
KoffeinFlummi
6062128436 Remove tourniquet option, add check pulse/response 2015-04-12 18:01:29 +02:00
Glowbal
12493f8595 Improved wounds configuration (missing maxDamage values added) 2015-04-07 00:57:05 +02:00
Glowbal
c7549a13a4 Improved pain reduction 2015-04-07 00:41:53 +02:00
Glowbal
661d93e82c Working commit 2015-04-06 14:51:17 +02:00
Glowbal
8e176eff55 Fixed treatment locations 2015-04-06 14:32:37 +02:00
Glowbal
10a1108aae Added support for customizable treatment location limitation 2015-04-06 14:11:10 +02:00
Glowbal
0f52059249 Fixed CPR script error 2015-04-05 19:27:09 +02:00
Glowbal
1d33ce52b3 added support for adjustable settings for consumeItem and medicalLevel 2015-04-04 21:20:24 +02:00
Glowbal
2420db78a1 CreateLitter now supports conditions and is selection specific.
Format:
litter[] = {
   {"SelectionName", "Condition", {"litterClassname"} },
   ...
};

The array with litter classnames also support 2d arrays. ie:
{"SelectionName", "Condition", {{"litterClassname"}} }
Of array entries it will select a random classname.
2015-04-04 20:20:29 +02:00
Glowbal
08e1949078 Improved patient unconscious animation 2015-04-04 18:08:41 +02:00
Glowbal
31b7ade057 Support unconscious animation for patient upon treatment 2015-04-04 17:33:20 +02:00
Glowbal
d81dcba543 Added more litter variants 2015-04-04 12:13:42 +02:00
Glowbal
7f45d25ee5 Added litter for medical treatment 2015-04-04 01:42:13 +02:00
Glowbal
5e0f5b8b94 Added full heal/PAK for basic 2015-04-04 00:31:12 +02:00
Glowbal
36288fce43 Updated medical action config.
Added bodybag action
Added Tourniquet action to basic.
Added more displayNameProgress entries.
Removed deadcode
2015-04-03 22:59:28 +02:00
Glowbal
045ea02da0 Changed: CPR is now only possible when a unit is in cardiac arrest (Adv) 2015-04-03 00:10:12 +02:00
Glowbal
57b093f845 Added minimum lethal damage for injury types in adv medical 2015-04-02 22:57:35 +02:00
Glowbal
635f3e31c9 Disable medical carry and drag 2015-04-01 19:56:00 +02:00
Glowbal
5063e9cff9 fixed config duplicate entry 2015-03-22 11:21:08 +01:00
Glowbal
ac4309237b Added drag/carry actions 2015-03-22 10:28:41 +01:00
Glowbal
a7d8914884 Removed GVAR/QGVAR from items 2015-03-21 22:22:28 +01:00
KoffeinFlummi
88fb2765e3 Standardize actions across basic and advanced 2015-03-21 00:21:30 +01:00
KoffeinFlummi
33d4bf2f5a Add localization for basic treatments and actions 2015-03-20 18:21:03 +01:00
KoffeinFlummi
17fd051c79 Rename Bloodbag action to BloodIV 2015-03-17 07:53:35 +01:00
PabstMirror
5ab9ad87f9 QGVAR typo 2015-03-11 13:33:45 -05:00