diff --git a/Compositions/Cav_ATLAS_Attachment/composition.sqe b/Compositions/Cav_ATLAS_Attachment/composition.sqe index 0f664a7b7..6ebf05ba8 100644 --- a/Compositions/Cav_ATLAS_Attachment/composition.sqe +++ b/Compositions/Cav_ATLAS_Attachment/composition.sqe @@ -6,7 +6,7 @@ class items class Item0 { dataType="Layer"; - name="ATLAS Platoon [5.0]"; + name="ATLAS Platoon [DevBuild]"; class Entities { items=35; diff --git a/Compositions/Cav_ATLAS_Attachment/header.sqe b/Compositions/Cav_ATLAS_Attachment/header.sqe index 769e412d3..3ef3c6fee 100644 --- a/Compositions/Cav_ATLAS_Attachment/header.sqe +++ b/Compositions/Cav_ATLAS_Attachment/header.sqe @@ -1,5 +1,5 @@ version=54; -name="ATLAS Platoon [5.0]"; +name="ATLAS Platoon [DevBuild]"; author="=7Cav=2LT.Mazinski.H"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/Cav_Alpha_Company/composition.sqe b/Compositions/Cav_Alpha_Company/composition.sqe index 18d32cf34..dcb427225 100644 --- a/Compositions/Cav_Alpha_Company/composition.sqe +++ b/Compositions/Cav_Alpha_Company/composition.sqe @@ -6,7 +6,7 @@ class items class Item0 { dataType="Layer"; - name="ALPHA Company [5.0]"; + name="ALPHA Company [DevBuild]"; class Entities { items=45; diff --git a/Compositions/Cav_Alpha_Company/header.sqe b/Compositions/Cav_Alpha_Company/header.sqe index e07b3523f..35ad3379c 100644 --- a/Compositions/Cav_Alpha_Company/header.sqe +++ b/Compositions/Cav_Alpha_Company/header.sqe @@ -1,5 +1,5 @@ version=54; -name="ALPHA Company [5.0]"; +name="ALPHA Company [DevBuild]"; author="=7Cav=2LT.Mazinski.H"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/Cav_BANDIT_Platoon/composition.sqe b/Compositions/Cav_BANDIT_Platoon/composition.sqe index 68baa90fd..f5ad5ca12 100644 --- a/Compositions/Cav_BANDIT_Platoon/composition.sqe +++ b/Compositions/Cav_BANDIT_Platoon/composition.sqe @@ -6,7 +6,7 @@ class items class Item0 { dataType="Layer"; - name="BANDIT Platoon [5.0]"; + name="BANDIT Platoon [DevBuild]"; class Entities { items=40; diff --git a/Compositions/Cav_BANDIT_Platoon/header.sqe b/Compositions/Cav_BANDIT_Platoon/header.sqe index 605985c33..c4184078c 100644 --- a/Compositions/Cav_BANDIT_Platoon/header.sqe +++ b/Compositions/Cav_BANDIT_Platoon/header.sqe @@ -1,5 +1,5 @@ version=54; -name="BANDIT Platoon [5.0]"; +name="BANDIT Platoon [DevBuild]"; author="=7Cav=2LT.Mazinski.H"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/Cav_MISFIT_Platoon/composition.sqe b/Compositions/Cav_MISFIT_Platoon/composition.sqe index f52c89037..910629437 100644 --- a/Compositions/Cav_MISFIT_Platoon/composition.sqe +++ b/Compositions/Cav_MISFIT_Platoon/composition.sqe @@ -6,7 +6,7 @@ class items class Item0 { dataType="Layer"; - name="MISFIT Platoon [5.0]"; + name="MISFIT Platoon [DevBuild]"; class Entities { items=40; diff --git a/Compositions/Cav_MISFIT_Platoon/header.sqe b/Compositions/Cav_MISFIT_Platoon/header.sqe index 0dc241585..82febb6c3 100644 --- a/Compositions/Cav_MISFIT_Platoon/header.sqe +++ b/Compositions/Cav_MISFIT_Platoon/header.sqe @@ -1,5 +1,5 @@ version=54; -name="MISFIT Platoon [5.0]"; +name="MISFIT Platoon [DevBuild]"; author="=7Cav=2LT.Mazinski.H"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/Cav_S3_Staff/composition.sqe b/Compositions/Cav_S3_Staff/composition.sqe index 0ffdf1120..bb07e53ca 100644 --- a/Compositions/Cav_S3_Staff/composition.sqe +++ b/Compositions/Cav_S3_Staff/composition.sqe @@ -6,7 +6,7 @@ class items class Item0 { dataType="Layer"; - name="S3 MIssion Controllers [5.0]"; + name="S3 MIssion Controllers [DevBuild]"; class Entities { items=5; diff --git a/Compositions/Cav_S3_Staff/header.sqe b/Compositions/Cav_S3_Staff/header.sqe index 126dfbe1a..8300e6e38 100644 --- a/Compositions/Cav_S3_Staff/header.sqe +++ b/Compositions/Cav_S3_Staff/header.sqe @@ -1,5 +1,5 @@ version=54; -name="S3 Mission Controllers [5.0]"; +name="S3 Mission Controllers [DevBuild]"; author="=7Cav=2LT.Mazinski.H"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/Cav_SABER_Platoon/composition.sqe b/Compositions/Cav_SABER_Platoon/composition.sqe index 29058e730..c4cd4e795 100644 --- a/Compositions/Cav_SABER_Platoon/composition.sqe +++ b/Compositions/Cav_SABER_Platoon/composition.sqe @@ -6,7 +6,7 @@ class items class Item0 { dataType="Layer"; - name="SABER Platoon [5.0]"; + name="SABER Platoon [DevBuild]"; class Entities { items=15; diff --git a/Compositions/Cav_SABER_Platoon/header.sqe b/Compositions/Cav_SABER_Platoon/header.sqe index 6516b4e54..64b3dc57c 100644 --- a/Compositions/Cav_SABER_Platoon/header.sqe +++ b/Compositions/Cav_SABER_Platoon/header.sqe @@ -1,5 +1,5 @@ version=54; -name="SABER Platoon [5.0]"; +name="SABER Platoon [DevBuild]"; author="=7Cav=2LT.Mazinski.H"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/Compositions/Cav_VIKING_Platoon/composition.sqe b/Compositions/Cav_VIKING_Platoon/composition.sqe index 27d9138f1..8526b62b2 100644 --- a/Compositions/Cav_VIKING_Platoon/composition.sqe +++ b/Compositions/Cav_VIKING_Platoon/composition.sqe @@ -6,7 +6,7 @@ class items class Item0 { dataType="Layer"; - name="VIKING Platoon [5.0]"; + name="VIKING Platoon [DevBuild]"; class Entities { items=36; diff --git a/Compositions/Cav_VIKING_Platoon/header.sqe b/Compositions/Cav_VIKING_Platoon/header.sqe index 821b814be..79d2ef20e 100644 --- a/Compositions/Cav_VIKING_Platoon/header.sqe +++ b/Compositions/Cav_VIKING_Platoon/header.sqe @@ -1,5 +1,5 @@ version=54; -name="VIKING Platoon [5.0]"; +name="VIKING Platoon [DevBuild]"; author="=7Cav=2LT.Mazinski.H"; category="Cav_EdSubcat_Deploy_Platoon"; requiredAddons[]= diff --git a/cScripts/functions/modules/fn_zenModule_setDamage.sqf b/cScripts/functions/modules/fn_zenModule_setDamage.sqf new file mode 100644 index 000000000..d26578636 --- /dev/null +++ b/cScripts/functions/modules/fn_zenModule_setDamage.sqf @@ -0,0 +1,53 @@ +#include "..\script_component.hpp"; +/* + * Author: CPL.Brostrom.A + * This module function spawn a supply crate. + * + * Arguments: + * 0: modulePos + * 1: objectPos + * + * Example: + * [getPos logic, this] call cScripts_fnc_zenModule_createSupplyCrate + * + * Public: No + */ + +params ["_modulePos", "_objectPos"]; + +[ + "Unit injuries", + [ + ["CHECKBOX", ["Mak unit unconscious", ""], true, false], + ["LIST", ["Injurie", "Select type of injurie"], + [ + [ + 'Nothing' + '2 bullets in the cheast' + ], + [ + '' + 'twoBulletInChest' + ], + 0, + 1 + ], false], + ], + { + params ["_arg", "_pos"]; + _arg params ["_setUnconscious"]; + _pos params ["_objectPos"]; + + [_objectPos, _setUnconscious] call ace_medical_fnc_setUnconscious; + + switch () do { + case "twoBulletInChest": { + [_objectPos, 0.20, "hitbody", "bullet"] call ace_medical_fnc_addDamageToUnit; + [_objectPos, 0.20, "hitbody", "bullet"] call ace_medical_fnc_addDamageToUnit; + }; + default {}; + }; + }, + {}, + [_objectPos] +] call zen_dialog_fnc_create;