Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,961 Commits 73 Branches 88 Tags 752 MiB
295ad3b037
Commit Graph

824 Commits

Author SHA1 Message Date
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
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
PabstMirror
c3e6990d00 #2528 (6) - Move bandage log before basic exit 
In advanced medical without enableFor AI. Bandaging an AI would exit
before adding log.
 2015-11-12 01:06:29 -06:00
Thomas Kooi
ec1187e79b Merge pull request #2830 from acemod/mixedMedicalDisplay 
Display basicMed wounds for AI in mixed mode
 2015-11-10 08:33:21 +01:00
PabstMirror
c326bc2f87 #2772 - Display basicMed wounds for AI in mixed mode 2015-11-06 01:05:25 -06:00
PabstMirror
1cebe613fa Fix Capitialzation 2015-11-04 14:38:32 -06:00
PabstMirror
c5da32e470 Medical Handle Damage - check hitpoints if selection is weird 2015-11-04 14:36:26 -06:00
PabstMirror
a3443cae43 Merge pull request #2780 from acemod/fixTimeInComments 
Changed ACE_time back to time in comments where appropriate
 2015-11-04 13:04:05 -06:00
Glowbal
8f6e9be636 Add method to deal with new hitpoints 
This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names.

This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.
 2015-11-01 16:35:25 +01:00
Glowbal
b5539db27f Merge pull request #2767 from acemod/canTreatLocation 
Fix medical location check when set to disabled for PAK/Surgical
 2015-10-24 00:55:51 +02:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
Glowbal
57abe3b885 Merge pull request #2743 from acemod/medicalStuff 
Medical Menu Fixes
 2015-10-19 22:47:13 +02:00
PabstMirror
cfde11d2fa Fix medic treatment location check as well 2015-10-19 01:45:30 -05:00
PabstMirror
aad6cab896 #2765 - Fix location check when set to disabled 2015-10-19 01:20:11 -05:00
Glowbal
76efdbcc1c Merge pull request #2257 from jonpas/parseList 
Parse List Common Function
 2015-10-18 12:14:18 +02:00
PabstMirror
4ba0d72bfd #2580 (1) - Fix bandages always created at terrain level. 2015-10-10 23:09:52 -05:00
Glowbal
58ea8d5e2c Merge pull request #2543 from alef/feature/death_short_diagnose 
Remove: pain diagnosis on dead patients
 2015-10-04 09:34:10 +02:00
Glowbal
e36df978ec Merge pull request #2646 from DerekSauer/FixArmaInjury 
Fix healHitPointAfterAdvBandage - Issue #2498.
 2015-10-04 09:28:47 +02:00
PabstMirror
b0b755720c #2672 - Use ACE_gameTime for triage card 2015-10-03 12:28:54 -05:00
commy2
573279bd30 add selection, collision, fall and drowning damage events 2015-10-02 23:19:14 +02:00
Derek Sauer
f9352de489 Clarified comment slightly. 2015-09-30 20:34:51 -04:00
Derek Sauer
0a788a282e Improved efficiency of wound counting. 
Using a switch/case conditional since it offers early termination if a
matching condition is found before all conditions are checked. It also
unnecessary to use a conditional to confirm whether a limb is wounded or
not. Number of Wounds multiplied by Blood loss will return zero for
a fully bandaged body part, not incrementing the wound counter; or it will
return some other number which will increment the wound counter.
 2015-09-30 20:27:40 -04:00
Derek Sauer
f69f4066e9 Fix capitalization on forEach and getVariable. 2015-09-30 06:17:54 -04:00
Derek Sauer
2824009317 Incorrectly retrieving list of current wounds. 
Used the wrong method to retrieve the target's current wounds and was
getting an empty array. This caused bandaging any wound even once to
completely heal the target on the Arma side.
 2015-09-29 17:00:49 -04:00
Derek Sauer
8d05214eb0 Resolve merge conflict from upstream pull. 2015-09-29 16:24:17 -04:00
Derek Sauer
954fad615a Reformatted to follow ACE3 coding guidelines. 2015-09-29 06:36:36 -04:00
Derek Sauer
8619f02538 Take into account wounds that do no cause blood loss. 2015-09-29 06:19:49 -04:00
Derek Sauer
a864a3411c Clarified a comment. 2015-09-28 21:32:04 -04:00
Derek Sauer
488541bba6 Fix for Arma wounds not being healed with healHitPointAfterAdvBandage. 2015-09-28 20:08:07 -04:00
jonpas
4521df0a57 Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter 2015-09-28 16:17:12 +02:00
jonpas
db2572acfd Merge branch 'master' into parseList 
Conflicts:
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
 2015-09-28 16:06:32 +02:00
Glowbal
74805caa5d Merge pull request #2565 from acemod/medVehAssignFix 
assign vehicle module fix for prefilled veh
 2015-09-28 15:02:48 +02:00
commy2
07774647e9 delay setUnconscious until the settings are inited, fix #148 2015-09-26 19:30:13 +02:00
PabstMirror
f93538eb9a #2423 - assign vehicle module fix for prefilled veh 2015-09-21 21:44:52 -05:00
PabstMirror
079d88ded7 Merge pull request #2509 from acemod/miscFixNilFunctions 
Fix some nil functions
 2015-09-21 20:36:09 -05:00
PabstMirror
45e44251b6 Merge branch 'release' 
Conflicts:
	addons/repair/stringtable.xml
 2015-09-21 17:14:53 -05:00
jonpas
2e3014daa3 Merge branch 'master' into parseList 
Conflicts:
	addons/common/functions/fnc_assignObjectsInList.sqf
 2015-09-21 22:46:01 +02:00
PabstMirror
1d5217d165 Medical - delayedUnconsicous fix waitAndExecute 2015-09-21 12:43:35 -05:00
PabstMirror
86fae2c251 #2528 - addToLog date / missing string fullHeal 2015-09-20 13:19:51 -05:00
Alessandro Foresi
aabc437314 Remove: pain diagnosis on dead patients 2015-09-20 17:37:33 +02:00
PabstMirror
5f0d73bab6 Cleanup more stuff 2015-09-18 14:24:20 -05:00
PabstMirror
c62ea5e406 Fix some nil functions 2015-09-18 13:47:19 -05:00
commy2
7336e694c1 Merge pull request #2480 from acemod/340doanim2tweak 
tweak doAnimation switchMove to do no akward camera jumps whenever possible
 2015-09-17 22:46:54 +02:00
PabstMirror
5fc127e94c #2491 - fix params 2015-09-17 11:34:32 -05:00
commy2
a09ca8fb80 tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474 2015-09-17 12:23:56 +02:00
Glowbal
7b7ad6eea8 fixed tweak to basic bandage 2015-09-14 23:18:20 +02:00
Glowbal
10ac127159 Fixed incorrect new damage value in handleDamage advanced. 
The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.
 2015-09-14 21:15:57 +02:00
Glowbal
33ac78dbac Addresses the large amount of bandages required in basic medical 
This should restore the bandaging behavior back to how it is before the adjustments made to basic medical
 2015-09-14 21:14:56 +02:00
Glowbal
8c60e76979 Tweaks made to improve determine if fatal algorithm 2015-09-14 21:13:58 +02:00
Glowbal
37639066c2 Include missing frame in the caching execution 2015-09-14 15:19:58 +02:00
Glowbal
6d4744b9ea Increased duration of knock down for basic medical 2015-09-14 15:19:18 +02:00
bux578
9748abdb48 change order of BloodPressure readout, fix #2400 2015-09-12 10:58:29 +02:00
jonpas
e07b71faf0 Merge branch 'master' into parseList 
Conflicts:
	addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
 2015-09-09 19:13:04 +02:00
commy2
adb1a11211 increase leg and arm armor value, more TRACE debug 2015-09-06 11:49:08 +02:00
ViperMaul
98202f4f38 Additional debug statements for caching and wounds. 2015-09-05 15:31:14 -07:00
jonpas
8fc061bfd6 Merge branch 'master' into parseList 2015-09-05 20:16:59 +02:00
Glowbal
dad96822be Only add 1/4 of the new damage to pain instead of everything. 2015-09-05 13:27:02 +02:00
Glowbal
f15a1c033d Added allowSelfTreatment attribute to treatment actions 2015-09-05 13:20:19 +02:00
Glowbal
a4e406658f Reduced initial knockdown time for basic medical 2015-09-05 13:02:19 +02:00
Glowbal
17ad7ecb8c replaced diag_logs by trace 2015-09-05 12:59:09 +02:00
Glowbal
9c0288cd3f Removed debug message 2015-09-05 12:55:49 +02:00
Glowbal
c673ea2cbb Restored uniqueIds 2015-09-05 12:38:12 +02:00
Glowbal
17648739dd Removed more deprecated wound sync code 2015-09-05 12:37:01 +02:00
Glowbal
268220bbae Possible fix for weird unconscious behavior in basic medical 2015-09-05 12:20:40 +02:00
Glowbal
4122b32dba Removed deprecated wound sync code 2015-09-05 12:02:09 +02:00
Glowbal
e0db571e13 Minor adjustment to fatality change on torso damage 2015-09-05 12:00:45 +02:00
Glowbal
130569c485 Made basic medical bleeding information work with new damage system 2015-09-05 11:57:17 +02:00
Glowbal
4514812523 Basic bandaging now works with new damage system 2015-09-05 11:51:46 +02:00
Glowbal
cd9e5df782 Clean up of handleDamage. Fixes some debug code 2015-09-05 11:25:56 +02:00
Glowbal
df3dbc9772 Removed deprecated fire handling 2015-09-05 11:25:31 +02:00
Glowbal
a25f640614 fixes #2114 No CPR available in basic medical when revive is enabled 2015-09-05 11:07:10 +02:00
Glowbal
3d342ece20 Fixes #2156 Animation is still played even if you cancel any treatment 2015-09-05 11:04:11 +02:00
ViperMaul
4c0c7bc290 debug change 2015-09-04 10:21:10 -07:00
ViperMaul
7f58d5a94d Revert "Adding same ADV special case to BASIC handle damage." -Not Needed 
This reverts commit bf267246bf.
 2015-09-04 10:20:34 -07:00
jonpas
644460ed96 Merge branch 'master' into parseList 
Conflicts:
	addons/slideshow/functions/fnc_makeList.sqf
 2015-09-04 18:40:35 +02:00
ViperMaul
bf267246bf Adding same ADV special case to BASIC handle damage. 2015-09-04 07:48:16 -07:00
ViperMaul
2bc20501bc Adding more debug 2015-09-04 07:46:35 -07:00
ViperMaul
813e54a668 Fixing Debug for object variable hasPain 2015-09-04 07:37:20 -07:00
ViperMaul
89b0c05929 Fixed a debug statement. 2015-09-03 13:17:59 -07:00
commy2
b737f42777 fix error when opening triage card 2015-09-03 18:30:29 +02:00
commy2
795b7a893f Merge branch 'medical-adjustments2' of https://github.com/acemod/ACE3 into medical-adjustments2 2015-09-03 17:18:32 +02:00
ViperMaul
6d28214287 Add some debug values. 2015-09-03 08:18:37 -07:00
commy2
0bd92af072 fix variables not inited, csat armor scaleing 2015-09-03 17:17:54 +02:00
commy2
a84be46ed4 fix errors from cleanup 2015-09-03 15:49:49 +02:00
Glowbal
f38d245771 fixed bloodloss for basic medical 2015-09-02 21:56:00 +02:00
commy2
f939f9215e stop flickering of wounds, fix #346 2015-09-02 20:49:17 +02:00
commy2
7d2f1f52a4 remove protection, hitpoint config (fix ubc), some debug stuff 2015-09-02 20:13:51 +02:00
commy2
dc5e6b7c3c Merge branch '323medicalstrcturaldamage' into medical-adjustments 2015-09-02 20:02:19 +02:00
commy2
f15805d1f3 setStructuralDamage function 2015-08-31 20:05:38 +02:00
Glowbal
8c6f896164 fixed script error when canceling treatment actions 2015-08-31 13:00:17 +02:00
Glowbal
4bde554854 Merge branch 'master' into medical-adjustments 
Conflicts:
	addons/medical/functions/fnc_actionCheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulse.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
 2015-08-29 23:49:58 +02:00
Glowbal
2fd30ba20c fixes #2274 2015-08-29 22:57:52 +02:00
Glowbal
ce42f5864f fix #2155 2015-08-29 22:53:08 +02:00
Glowbal
b291141d11 Should Be a better fix for #2298 2015-08-29 22:51:42 +02:00
Glowbal
183e872f1f Possible fix for #2298 2015-08-29 22:44:52 +02:00
PabstMirror
321ca815a2 semi-colon 2015-08-29 09:52:28 -05:00
jokoho48
8916b70fe1 Improve some Code 2015-08-29 15:29:02 +02:00
Glowbal
1e08244f21 Removed debug output 2015-08-29 12:59:11 +02:00
Glowbal
1a4736e663 Clean up 2015-08-29 12:01:00 +02:00
Glowbal
d56f3cea81 Added pain and unconsciousness handling for new basic medical code 2015-08-29 11:58:03 +02:00
Glowbal
0cfb492916 Fixes and removal of duplicate code 2015-08-26 10:04:51 +02:00
Glowbal
7a48f595be Merge branch 'basic-medical-test' into medical-adjustments 2015-08-26 09:13:12 +02:00
gienkov
6a123020d2 fail to find BP on limbs with TQ on 2015-08-26 08:55:50 +02:00
Grzegorz
b8a29bfd44 @jokoho482 suggestion 2015-08-26 03:00:43 +02:00
gienkov
cae5f828fb run check only on arms 2015-08-26 02:51:05 +02:00
gienkov
c3af5e81e7 fix my error 2015-08-26 02:41:12 +02:00
gienkov
5a9817322b remove tabs 2015-08-26 02:39:34 +02:00
gienkov
8498589920 pulse zero on limb with TQ on 2015-08-26 02:37:51 +02:00
jonpas
5b6429f23e Made more modules use assignObjectsInList common function 2015-08-24 21:55:48 +02:00
jokoho48
260b048da4 some more Improvements 2015-08-23 14:13:55 +02:00
jokoho48
fab4c6a67f fix Spelling Issues 2015-08-22 21:32:36 +02:00
jokoho48
19dd55147a Code Cleanup Medical Module (Part 4). 2015-08-22 19:47:23 +02:00
jokoho48
2d4ef16429 fix CTD 2015-08-22 18:54:51 +02:00
jokoho48
ff6c8a31be Code Cleanup Medical Module (Part 3). 2015-08-22 18:33:06 +02:00
jokoho48
10127ed957 Fix Typo 2015-08-22 17:10:19 +02:00
jokoho48
d09ca9ec8b Code Cleanup Medical Module (Part 1). 2015-08-22 16:25:10 +02:00
Glowbal
bf8318530e Merge pull request #2081 from acemod/close-med-menus-distance 
Fixed #1893 - Menu closes when patient is more as 10 meters away
 2015-08-21 14:20:41 +02:00
Glowbal
20918f2c70 Merge pull request #2183 from acemod/treatmentWhileDeployed 
Fix treatment when weapon deployed
 2015-08-21 14:04:51 +02:00
SilentSpike
33ef60266b Fix medical CPR code and log message 
Performing CPR would never succeed when the patient was in revive state because the code was accidentally using `exitWith` instead of `then`. The log message string was also incorrect.
 2015-08-19 23:30:13 +01:00
PabstMirror
dd58eef415 Fix double weapon switch for standing treatment 2015-08-16 14:12:26 -05:00
PabstMirror
21f46f4401 #2178 - Fix treatment when weapon deployed 2015-08-16 13:58:58 -05:00
Glowbal
17115b8846 test switch to adv medical handleDamage 2015-08-11 20:58:00 +02:00
Glowbal
9c8a03b0b3 fixes #2070 - medication is not translated on activity log 2015-08-09 20:12:31 +02:00
Glowbal
298f64a7bf fixes #2078 
1. Fixed incorrect activity string for tourniquet
2. Fixed incorrect macro usage, should have grabbed variables from medical module.
 2015-08-09 20:07:06 +02:00
Glowbal
3cac137851 Fixed #1893 - Menu closes when patient is more as 10 meters away 2015-08-09 09:14:42 +02:00
Glowbal
364e0455ee Merge branch 'master' into medical-menu 2015-08-08 17:55:43 +02:00
Glowbal
be00f7ffe4 Merge pull request #2000 from acemod/treatmentResetWeaponMode 
Treatment reset weapon mode
 2015-08-08 14:20:10 +02:00
Glowbal
f21023b4ee Added logs for quick view and activity view separate from the activity log for medical menu 2015-08-07 19:11:57 +02:00
Glowbal
f21da3ead6 Merge pull request #2026 from acemod/cleanBandages 
Clean bandages if no damage on hitpoint
 2015-08-07 15:46:44 +02:00
Glowbal
abaf43be11 Selection restrictions 2015-08-07 00:09:40 +02:00
Glowbal
5ac2972573 Added local event upon successful treatment. 2015-08-06 23:50:44 +02:00
PabstMirror
e45bd43e5e CreateLitter / syncEvents performance fixes 2015-08-06 00:28:43 -05:00