Skip to content

Commit

Permalink
Merge pull request #823 from AndreasBrostrom/Updated-headers
Browse files Browse the repository at this point in the history
Updated headers
  • Loading branch information
AndreasBrostrom authored Jan 13, 2022
2 parents cdf42df + 94ccd7b commit 82e3141
Show file tree
Hide file tree
Showing 15 changed files with 67 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Compositions/Cav_ATLAS_Attachment/composition.sqe
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class items
class Item0
{
dataType="Layer";
name="ATLAS Platoon [5.0]";
name="ATLAS Platoon [DevBuild]";
class Entities
{
items=35;
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_ATLAS_Attachment/header.sqe
Original file line number Diff line number Diff line change
@@ -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[]=
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_Alpha_Company/composition.sqe
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class items
class Item0
{
dataType="Layer";
name="ALPHA Company [5.0]";
name="ALPHA Company [DevBuild]";
class Entities
{
items=45;
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_Alpha_Company/header.sqe
Original file line number Diff line number Diff line change
@@ -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[]=
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_BANDIT_Platoon/composition.sqe
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class items
class Item0
{
dataType="Layer";
name="BANDIT Platoon [5.0]";
name="BANDIT Platoon [DevBuild]";
class Entities
{
items=40;
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_BANDIT_Platoon/header.sqe
Original file line number Diff line number Diff line change
@@ -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[]=
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_MISFIT_Platoon/composition.sqe
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class items
class Item0
{
dataType="Layer";
name="MISFIT Platoon [5.0]";
name="MISFIT Platoon [DevBuild]";
class Entities
{
items=40;
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_MISFIT_Platoon/header.sqe
Original file line number Diff line number Diff line change
@@ -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[]=
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_S3_Staff/composition.sqe
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_S3_Staff/header.sqe
Original file line number Diff line number Diff line change
@@ -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[]=
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_SABER_Platoon/composition.sqe
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class items
class Item0
{
dataType="Layer";
name="SABER Platoon [5.0]";
name="SABER Platoon [DevBuild]";
class Entities
{
items=15;
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_SABER_Platoon/header.sqe
Original file line number Diff line number Diff line change
@@ -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[]=
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_VIKING_Platoon/composition.sqe
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class items
class Item0
{
dataType="Layer";
name="VIKING Platoon [5.0]";
name="VIKING Platoon [DevBuild]";
class Entities
{
items=36;
Expand Down
2 changes: 1 addition & 1 deletion Compositions/Cav_VIKING_Platoon/header.sqe
Original file line number Diff line number Diff line change
@@ -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[]=
Expand Down
53 changes: 53 additions & 0 deletions cScripts/functions/modules/fn_zenModule_setDamage.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#include "..\script_component.hpp";
/*
* Author: CPL.Brostrom.A
* This module function spawn a supply crate.
*
* Arguments:
* 0: modulePos <POSITION>
* 1: objectPos <OBJECT>
*
* 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;

0 comments on commit 82e3141

Please sign in to comment.