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
14,553 Commits 73 Branches 88 Tags 752 MiB
cd9372a8e1
Commit Graph

1949 Commits

Author SHA1 Message Date
Glowbal
437f0fbd8a Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 2015-03-01 00:13:27 +01:00
Glowbal
9d7e94ca09 Added initial UI element for displaying injuries 2015-03-01 00:13:08 +01:00
KoffeinFlummi
e7c0c78e5d Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 2015-02-28 23:36:13 +01:00
KoffeinFlummi
eeb2f6e8bb Fix script error in setUnconscious 2015-02-28 23:35:53 +01:00
Glowbal
69801a65b0 Removed dead code 2015-02-28 23:34:14 +01:00
Glowbal
a29cbf6977 Fixed incorrect config variable name 2015-02-28 22:45:12 +01:00
Glowbal
6310d7b582 Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 2015-02-28 22:38:54 +01:00
Glowbal
8f253620c1 Fixed handleDamage wounds 2015-02-28 22:37:39 +01:00
KoffeinFlummi
1689829f93 Get treatment callback structure working 2015-02-28 22:10:20 +01:00
Glowbal
d50466ac67 Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 2015-02-28 21:09:56 +01:00
Glowbal
68626f54fc Missing semicolon 2015-02-28 21:09:39 +01:00
KoffeinFlummi
309d42f2e6 God damnit 2015-02-28 21:02:15 +01:00
KoffeinFlummi
46cb963630 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
 2015-02-28 20:58:19 +01:00
KoffeinFlummi
f5fe57232c Derp 2: The Rederpening 2015-02-28 20:56:55 +01:00
KoffeinFlummi
aea448efe7 Derp 2015-02-28 20:54:23 +01:00
KoffeinFlummi
7f9daeb2f6 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_init.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
 2015-02-28 20:50:59 +01:00
Glowbal
15afb8846a Fixed private array and added event listener 2015-02-28 20:50:08 +01:00
Glowbal
18998bb619 Split up the openWounds through the ACE event system 
Based upon the suggestions from Jaynus
 2015-02-28 20:48:34 +01:00
KoffeinFlummi
424f156977 Various Cleanups 2015-02-28 20:46:36 +01:00
Glowbal
d293008586 Fixed indentation 2015-02-28 19:28:05 +01:00
Glowbal
451f8b6d0b Fixed advanced medical handleDamage chain. Now supports killing units. 2015-02-28 19:22:46 +01:00
Glowbal
f1445a4c45 Fixed script errors 2015-02-28 18:59:37 +01:00
Glowbal
9986fddf6b Fixed undefined _bloodPressure 2015-02-28 18:46:44 +01:00
Glowbal
5e65d5e9a8 Added support for displayText on treatment actions 2015-02-28 15:46:37 +01:00
KoffeinFlummi
8c6df1b00c Fix indentation in treatment 2015-02-28 15:23:12 +01:00
KoffeinFlummi
bde6ec1996 Indentation in CfgVehicles 2015-02-28 15:19:49 +01:00
KoffeinFlummi
2873bdf0ed Add basic anims; add system for prone/self anims 2015-02-28 15:10:58 +01:00
Glowbal
cff3e23d38 More work done on medical 
Added TODOs for remoteFuncExecs to be replaced by event system
Added usage of displayTextStructed events
Fixed useItem calls instead of useItems
 2015-02-28 13:17:17 +01:00
Glowbal
65137b347b Replaced quote(func for quote(dfunc 2015-02-28 13:02:05 +01:00
Glowbal
bbc2a62476 Rewrite of unconscious. Now supports basic method of unconsciousness. 2015-02-28 12:05:22 +01:00
Glowbal
1e377d460e now also resets used medication on init 2015-02-28 11:48:11 +01:00
Glowbal
6d01a00901 Added storage for all logs 2015-02-28 11:47:35 +01:00
Glowbal
05d2d9de6b Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
 2015-02-28 11:43:38 +01:00
Glowbal
49e04ae7bb Added more treatment options and variables to init 2015-02-28 11:41:27 +01:00
KoffeinFlummi
fe79e624ff Derp 2015-02-26 07:41:56 +01:00
KoffeinFlummi
ddadabc661 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
	addons/medical/config.cpp
	addons/medical/equipment/Atropin-pen_used.p3d
	addons/medical/equipment/Bandage-Pack.p3d
	addons/medical/equipment/Bandage-elastic.p3d
	addons/medical/functions/fnc_ActionCheckPulse.sqf
	addons/medical/functions/fnc_ActioncheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCarryUnit.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
	addons/medical/functions/fnc_actionCheckResponse.sqf
	addons/medical/functions/fnc_actionDragUnit.sqf
	addons/medical/functions/fnc_actionLoadUnit.sqf
	addons/medical/functions/fnc_actionPlaceInBodyBag.sqf
	addons/medical/functions/fnc_actionRemoveTourniquet.sqf
	addons/medical/functions/fnc_actionUnloadUnit.sqf
	addons/medical/functions/fnc_cleanUpCopyOfBody.sqf
	addons/medical/functions/fnc_getBloodVolumeChange.sqf
	addons/medical/functions/fnc_getUnconsciousCondition.sqf
	addons/medical/functions/fnc_handleDropUnit.sqf
	addons/medical/functions/fnc_handleHeal.sqf
	addons/medical/functions/fnc_handleTreatment_Action_AirwayLocal.sqf
	addons/medical/functions/fnc_handleTreatment_Action_BandageLocal.sqf
	addons/medical/functions/fnc_handleTreatment_Action_CPR.sqf
	addons/medical/functions/fnc_handleTreatment_Action_Stitching.sqf
	addons/medical/functions/fnc_handleTreatment_Action_fullHeal.sqf
	addons/medical/functions/fnc_handleTreatment_Action_fullHealLocal.sqf
	addons/medical/functions/fnc_handleTreatment_Category_Advanced.sqf
	addons/medical/functions/fnc_handleTreatment_Category_Airway.sqf
	addons/medical/functions/fnc_handleTreatment_Category_Bandaging.sqf
	addons/medical/functions/fnc_handleTreatment_Category_Medication.sqf
	addons/medical/functions/fnc_handleUnitVitals.sqf
	addons/medical/functions/fnc_initalizeModuleCMS.sqf
	addons/medical/functions/fnc_makeCopyOfBody.sqf
	addons/medical/functions/fnc_moduleAssignMedicalEquipment.sqf
	addons/medical/functions/fnc_moduleBasicRevive.sqf
	addons/medical/functions/fnc_onKilled.sqf
	addons/medical/functions/fnc_onStartMovingUnit.sqf
	addons/medical/functions/fnc_onTreatmentCompleted.sqf
	addons/medical/functions/fnc_registerUnconsciousCondition.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/ui/define.hpp
	addons/medical/ui/menu.hpp
 2015-02-24 22:35:05 +01:00
KoffeinFlummi
daff184f75 More work on basic callbacks. 2015-02-24 22:09:31 +01:00
Glowbal
65eb69fece Added examine actions 2015-02-23 20:35:36 +01:00
Glowbal
4a64716420 Added support for displaying a treatment icon for the action 2015-02-23 18:19:35 +01:00
Glowbal
fe0363ab48 Now dynamically collects the available damageTypes 2015-02-23 16:18:33 +01:00
Glowbal
bb89816a70 Replaced FUNC for DFUNC 2015-02-23 10:23:09 +01:00
Glowbal
df710235d5 Added useItems 
Fixed header on hasItems
 2015-02-22 19:50:14 +01:00
Glowbal
bcb5bb59f6 Basic actions can now use any of the advanced treatment items. 2015-02-22 18:46:49 +01:00
Glowbal
cbfb413f22 Changed: an array now means that it can be any of the given items 2015-02-22 18:42:30 +01:00
Glowbal
8b3e5ac8e2 Added hasItems function 2015-02-22 18:38:06 +01:00
Glowbal
2b061e8de3 Added itemConsumed attribute 2015-02-22 18:34:59 +01:00
Glowbal
b05e09ccb8 Added advanced treatment actions 2015-02-22 18:33:46 +01:00
KoffeinFlummi
ca930a5717 Add basic treatments, rename onProgress 2015-02-22 17:45:46 +01:00
Glowbal
ab6bc998c2 Added canAccessMedicalEquipment check 2015-02-22 15:01:31 +01:00
Glowbal
7f6a647b4d Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 2015-02-22 12:26:19 +01:00
Glowbal
56dad70a9e Removed redundant level checks 2015-02-22 12:26:08 +01:00
Kieran
c8bf9d2ce1 Changed 'impacted' to 'crushed' 
Changed "Impacted Tissue" to "Crushed tissue", as its a bit more to-the-point (less chance for confusion), and still accurate
 2015-02-22 21:25:28 +10:00
Kieran
7ea31f8b05 Added causes to contusions - ace_med_treatment.hpp 
Added vehiclecrash and falling to contusion causes.
(As those two situations commonly do result in bruising)
 2015-02-22 21:21:27 +10:00
Glowbal
9dc33c659d Now takes selections into account 2015-02-22 10:56:46 +01:00
Glowbal
bdaec01112 Added medication overdose and wearoff. 2015-02-22 10:27:57 +01:00
Glowbal
fa2d0c6b06 Specified bleeding rate more accurately for subclasses 2015-02-22 09:40:36 +01:00
Glowbal
8e539bfb56 Added ability to use subclasses for injuries. 
Allows for usage of minor, medium and large injury variants.
 2015-02-22 09:27:01 +01:00
Glowbal
e091ba1fd1 Added hasMedicalEnabled 2015-02-22 00:49:38 +01:00
Glowbal
e21046459e Fixed location checking in treatment call 2015-02-22 00:47:14 +01:00
Glowbal
ab045e49c8 Fixed incorrect function calls for location 2015-02-22 00:45:58 +01:00
Glowbal
1781629c13 Added isMedic, isMedicalVehicle, isInMedicalFacility and hasTourniquetAppliedTo functions. 2015-02-22 00:44:11 +01:00
Glowbal
b9213e8abc Added use and has item functions for medical 2015-02-22 00:34:16 +01:00
Glowbal
c2b8e9031f Increased the type and causes of injuries for advanced medical. 2015-02-22 00:25:07 +01:00
Glowbal
73c91af533 Added separate config parsing for basic and advanced 2015-02-22 00:24:50 +01:00
Glowbal
3f12af8b21 Added onTreatmentCompleted event calls 2015-02-21 23:17:20 +01:00
Glowbal
e5941e55fc Added reactionToDamage and onTreatmentCompleted event 2015-02-21 23:14:21 +01:00
Glowbal
925aa094c7 Added place in bodybag function 2015-02-21 21:53:07 +01:00
Glowbal
46f28763b6 Added triage card and activity log 2015-02-21 21:47:10 +01:00
Glowbal
0d24ad5c0a Removed outdated injury defines file 2015-02-21 21:33:07 +01:00
Glowbal
95ff4b151c Added addHeartRateAdjustment function 2015-02-21 21:32:25 +01:00
Glowbal
72e2690b81 Fixed incorrect animation function call 2015-02-21 21:28:59 +01:00
Glowbal
909a87fdd3 Added tourniquet treatment functions 2015-02-21 21:26:39 +01:00
Glowbal
308e165cb6 Fixed headers 2015-02-21 21:25:37 +01:00
Glowbal
ead5f2ee79 Added new injury and treatment systems for advanced medical 2015-02-21 21:10:57 +01:00
Glowbal
b3e7431e67 Added new treatment framework 2015-02-21 21:09:57 +01:00
KoffeinFlummi
3482633fb1 Basic treatment structure 2015-02-20 22:04:01 +01:00
Glowbal
ab6879845c Merge branch 'master' into standardize_ui 2015-02-19 21:42:47 +01:00
KoffeinFlummi
7e9a02089f Merge branch 'medical-visuals' into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
 2015-02-18 19:26:30 +01:00
KoffeinFlummi
3aae72aa70 Cleanup 2015-02-18 19:22:35 +01:00
KoffeinFlummi
58873e1c97 Pain Effect 2015-02-18 19:01:25 +01:00
Glowbal
13c2127574 Clean up of old CSE code 
Removed all _F suffixes
Reorganized the RPEP list.
Removed unnecessary functions.
 2015-02-14 20:29:07 +01:00
Glowbal
155503d4a1 Merged GUI into common. 
Removed unnecessary GUI functions.
Updated displayIcon function to be more dynamic
Added client side settings for displaying icons.
 2015-02-14 20:06:55 +01:00
Glowbal
cd5b06da78 Added _returnDamage parameter to damageCaching. 2015-02-13 23:00:23 +01:00
Glowbal
4441b7d0a5 Added missing include 2015-02-13 22:58:48 +01:00
Glowbal
4896198ec2 Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
 2015-02-13 22:57:43 +01:00
Glowbal
5b507ed9f5 Combined medium and advanced into one, with options to turn on other features. 
Changed wounds for a more diverse variation.
Added handleDamage caching for advanced.
 2015-02-13 22:55:13 +01:00
KoffeinFlummi
89a505ea44 Remove old effects code 2015-02-10 23:14:56 +01:00
KoffeinFlummi
675b89f360 Add blinding effect to wakeup 2015-02-10 23:14:39 +01:00
KoffeinFlummi
28dbd857c2 Fix generic error 2015-02-10 23:14:11 +01:00
KoffeinFlummi
faa7e1fb63 Merge alive and Zeus conditions 2015-02-10 23:13:52 +01:00
KoffeinFlummi
4ec19429ae Fix initial value of bloodVolume 2015-02-10 23:13:14 +01:00
KoffeinFlummi
fe0eac7896 First port of AGM's visual loop. 2015-02-10 18:17:26 +01:00
KoffeinFlummi
fba44f490d First draft of death prevention 2015-02-10 13:33:40 +01:00
Glowbal
a609d00730 Implemented a setDead function. Allows for interception of all kills and using a revive script instead. 
Added playInjuredSound for damaged units.
Fixed some mistakes with variable names.
 2015-02-08 13:18:08 +01:00
Glowbal
a3c4c60b7f Added possibility to add unconscious conditions. 2015-02-08 13:06:44 +01:00
Glowbal
633037c1b4 Replaced injuredCollection array for separate PFH for each unit. 2015-02-08 11:34:20 +01:00
Glowbal
3be442c31a Added initial draft of new player effects handling. 2015-02-08 11:24:36 +01:00
Glowbal
0a161319d2 Added initial draft of setUnconscious 2015-02-08 10:25:03 +01:00
Glowbal
bf762bbdf1 Updated headers to correct format 
Reorganized function names.
Added unit vitals loop
 2015-02-08 10:01:32 +01:00
Glowbal
35de875382 Added cardiac arrest 2015-02-08 00:08:36 +01:00
Glowbal
b8be7775bd Updated open wounds injuries to newest CMS version. 2015-02-08 00:07:49 +01:00
Glowbal
aadb289962 Added initial rewrite of CMS vitals script for medium and advanced medical. 2015-02-07 23:55:48 +01:00
Glowbal
26527489d6 Added initial medium wounds. 
Fixed merge conflict.
 2015-02-07 23:48:24 +01:00
KoffeinFlummi
35386f19d6 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_handleDamage.sqf
 2015-02-06 13:48:28 +01:00
KoffeinFlummi
a2ee41f01d First draft of basic damage handling. 2015-02-06 13:47:17 +01:00
Glowbal
596d018f45 Added function PREPs. 2015-02-03 21:48:53 +01:00
Glowbal
0a403ff422 Added initial advanced medical handleDamage functionality. 2015-02-03 21:48:08 +01:00
Glowbal
a50276ddaf Added a getTypeOfDamage function. 2015-02-03 21:47:45 +01:00
KoffeinFlummi
79aa8d1c7a Use macros, remove var assignments 2015-02-03 20:14:34 +01:00
KoffeinFlummi
930fb51a20 Medical: First Draft 2015-02-03 20:09:25 +01:00
Nicolás Badano
74d0ae95ff Change ACE_Settings from modules 2015-02-03 02:53:02 -03:00
PabstMirror
b38bd016f5 Semicolon and bad p3d data paths 
P3d's had bad \data\ folder, Models not actually used anywhere, but
pboProject complains
 2015-02-02 20:15:45 -06:00
PabstMirror
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
Thomas Kooi
f52417cc3b Added readme file 2015-01-27 17:10:16 +01:00
Thomas Kooi
b28fa367cb Fixed unconscious. Now functions properly again after move from common to medical. 2015-01-25 16:40:47 +01:00
Thomas Kooi
3c60af5a14 Fixed: Changed medicClass to isMedic. 2015-01-25 16:05:09 +01:00
Thomas Kooi
69c45cf54d Fixed assignMedicalEquipment module 2015-01-25 16:02:49 +01:00
Thomas Kooi
5f8a00a45f Removed last remaining spawns and sleeps in medical. 2015-01-25 15:41:29 +01:00
Thomas Kooi
8045ebb6ab Fixed damage parsing for AI & non medical enabled units 2015-01-25 15:02:14 +01:00
Thomas Kooi
73d3869a04 Minor improvements made to handleDamage functions 2015-01-25 14:00:51 +01:00
Thomas Kooi
95cfe5ce3a Minor code refactor 2015-01-24 21:16:51 +01:00
Thomas Kooi
8d34f98909 Moved relevant functions from common to medical. 
Removed unnecessary event function.
 2015-01-24 17:18:38 +01:00
Thomas Kooi
e06c5010bb Moved GUI functionality to medical 2015-01-24 16:34:39 +01:00
Thomas Kooi
80f90751cd Removed some spawns 2015-01-22 23:47:06 +01:00
Thomas Kooi
dce0b61d57 Added damage threshold module 
Removed debug prints
 2015-01-22 23:29:18 +01:00
Thomas Kooi
dc1098233e Added broadcast flag to addOpenWounds, so we can stack call it followed by a broadcast. 
Improvements made to assignOpenWounds, now better results for single hits.
 2015-01-22 22:28:04 +01:00
Thomas Kooi
b173b21c51 Fixed advancedLocal treatment function. Now also selects primary weapon of caller when performing treatment. 2015-01-22 22:25:59 +01:00
Thomas Kooi
e7ebcbe3fb Added new unconscious condition for bleeding 2015-01-22 22:25:24 +01:00
Thomas Kooi
8137080bbc Minor code clean up 2015-01-22 22:00:37 +01:00
Thomas Kooi
68ab7b5143 Added AGM handleDamage caching 2015-01-22 22:00:04 +01:00
Thomas Kooi
23f8b8a9ad Added AGM config changes 2015-01-22 21:59:34 +01:00
Thomas Kooi
183b36d55e Menu now opens for ACE_player instead of player 2015-01-22 13:33:12 +01:00
Thomas Kooi
0c221c2912 Changed effects only display while in curator view 2015-01-22 13:28:45 +01:00
Thomas Kooi
ae5996bcd2 Fixed animations for carry/drag 2015-01-22 13:12:46 +01:00
Thomas Kooi
7020a8ef30 Replaced some PFH by waitandExecute 2015-01-21 21:37:03 +01:00
Thomas Kooi
77bd8f753d Added AGM blood volume greyness effect 2015-01-21 16:04:34 +01:00
Thomas Kooi
dcd42f55e8 Minor improvements to handleTreatment 2015-01-21 15:53:18 +01:00
Thomas Kooi
7e5806b834 Improved drag and carry actions. 2015-01-21 15:52:59 +01:00
Thomas Kooi
9a0b73bf3a Changed drag/carry to event driven architecture 2015-01-20 18:57:33 +01:00
Glowbal
8554cf7e6c Can now also remove a medic class through setMedic 2015-01-20 11:57:16 +01:00
Glowbal
72ae6eb08f Updated playInjured 
Removed sleep.
Made use of waitUnitl execute.
Changed MP sound broadcasting. No longer using the broadcastSound_F function.
 2015-01-20 11:56:00 +01:00
Glowbal
1337c2c562 Made unit loop flag public 2015-01-20 11:36:52 +01:00
Thomas Kooi
29c4676b20 Added missing variables to private array. 2015-01-19 00:59:19 +01:00
Thomas Kooi
e4b1265a84 Fixed incorrect parameter passing in treatment actions 2015-01-19 00:58:36 +01:00
Thomas Kooi
76e877067c Fixed examine actions 2015-01-19 00:58:17 +01:00
Thomas Kooi
a890400c55 Fixed tourniquet treatment actions. 2015-01-18 23:58:10 +01:00
Thomas Kooi
5745408647 Added hold and release functionality for CMS menu. 2015-01-18 23:44:32 +01:00
Thomas Kooi
920453e150 Fixed incorrect personal aid kit model. 2015-01-18 22:37:26 +01:00
Thomas Kooi
e468832324 Added initial port of CSE medical (CMS) 2015-01-18 22:16:35 +01:00