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

Merge pull request #3911 from acemod/gunbagCleanup

Browse Source 
Gunbag cleanup
This commit is contained in:
commy2 2016-06-13 20:39:46 +02:00 committed by GitHub
commit 11dc3bd71a
15 changed files with 224 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
addons/gunbag/CfgVehicles.hpp
View File

@ -3,29 +3,29 @@ class CfgVehicles {
class CAManBase: Man { class CAManBase: Man {
class ACE_Actions { class ACE_Actions {
class ACE_MainActions { class ACE_MainActions {
class GVAR(WeapontoGunbag) { class GVAR(weaponTo) {
displayName = CSTRING(toGunbag); displayName = CSTRING(ToGunbag);
condition = QUOTE(([_target] call FUNC(hasGunbag)) && {[ARR_2(_player,_target)] call FUNC(canInteract) == 0}); condition = QUOTE(([_target] call FUNC(hasGunbag)) && {[ARR_2(_player,_target)] call FUNC(canInteract) == 0});
statement = QUOTE([ARR_2(_player,_target)] call FUNC(toGunbag)); statement = QUOTE([ARR_2(_player,_target)] call FUNC(toGunbag));
showDisabled = 0; showDisabled = 0;
priority = 1; priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa); icon = QPATHTOF(ui\gunbag_icon_ca.paa);
}; };
class GVAR(WeaponoffGunbag) { class GVAR(weaponOff) {
displayName = CSTRING(offGunbag); displayName = CSTRING(OffGunbag);
condition = QUOTE(([_target] call FUNC(hasGunbag)) && {[ARR_2(_player,_target)] call FUNC(canInteract) == 1}); condition = QUOTE(([_target] call FUNC(hasGunbag)) && {[ARR_2(_player,_target)] call FUNC(canInteract) == 1});
statement = QUOTE([ARR_2(_player,_target)] call FUNC(offGunbag)); statement = QUOTE([ARR_2(_player,_target)] call FUNC(offGunbag));
showDisabled = 0; showDisabled = 0;
priority = 1; priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa); icon = QPATHTOF(ui\gunbag_icon_ca.paa);
}; };
class GVAR(StatusGunbag) { class GVAR(status) {
displayName = CSTRING(Status); displayName = CSTRING(Status);
condition = QUOTE([_target] call FUNC(hasGunbag)); condition = QUOTE([_target] call FUNC(hasGunbag));
statement = QUOTE([_target] call FUNC(status)); statement = QUOTE([_target] call FUNC(status));
showDisabled = 0; showDisabled = 0;
priority = 2; priority = 2;
icon = PATHTOF(ui\gunbag_icon_ca.paa); icon = QPATHTOF(ui\gunbag_icon_ca.paa);
}; };
}; };
}; };
@ -33,35 +33,35 @@ class CfgVehicles {
class ACE_SelfActions { class ACE_SelfActions {
class ACE_Equipment { class ACE_Equipment {
class GVAR(actions) { class GVAR(actions) {
displayName = CSTRING(displayname); displayName = CSTRING(Displayname);
condition = QUOTE([_player] call FUNC(hasGunbag)); condition = QUOTE([_player] call FUNC(hasGunbag));
showDisabled = 0; showDisabled = 0;
priority = 0.1; priority = 0.1;
icon = PATHTOF(ui\gunbag_icon_ca.paa); icon = QPATHTOF(ui\gunbag_icon_ca.paa);
class GVAR(WeapontoGunbag) { class GVAR(weaponTo) {
displayName = CSTRING(toGunbag); displayName = CSTRING(ToGunbag);
condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 0); condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 0);
statement = QUOTE([ARR_2(_player,_player)] call FUNC(toGunbag)); statement = QUOTE([ARR_2(_player,_player)] call FUNC(toGunbag));
showDisabled = 0; showDisabled = 0;
priority = 1; priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa); icon = QPATHTOF(ui\gunbag_icon_ca.paa);
}; };
class GVAR(WeaponoffGunbag) { class GVAR(weaponOff) {
displayName = CSTRING(offGunbag); displayName = CSTRING(OffGunbag);
condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 1); condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 1);
statement = QUOTE([ARR_2(_player,_player)] call FUNC(offGunbag)); statement = QUOTE([ARR_2(_player,_player)] call FUNC(offGunbag));
showDisabled = 0; showDisabled = 0;
priority = 1; priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa); icon = QPATHTOF(ui\gunbag_icon_ca.paa);
}; };
class GVAR(StatusGunbag) { class GVAR(status) {
displayName = CSTRING(Status); displayName = CSTRING(Status);
condition = QUOTE([_player] call FUNC(hasGunbag)); condition = QUOTE([_player] call FUNC(hasGunbag));
statement = QUOTE([_player] call FUNC(status)); statement = QUOTE([_player] call FUNC(status));
showDisabled = 0; showDisabled = 0;
priority = 2; priority = 2;
icon = PATHTOF(ui\gunbag_icon_ca.paa); icon = QPATHTOF(ui\gunbag_icon_ca.paa);
}; };
}; };
}; };
@ -69,33 +69,33 @@ class CfgVehicles {
}; };
class Bag_Base; class Bag_Base;
class CLASSNAME: Bag_Base { class ADDON: Bag_Base {
_generalMacro = QUOTE(CLASSNAME); _generalMacro = QUOTE(ADDON);
author = "Ir0n1E"; author = "Ir0n1E";
scope = 2; scope = 2;
displayName = CSTRING(Displayname); displayName = CSTRING(Displayname);
model = PATHTOF(data\gunbag.p3d); model = QPATHTOF(data\ace_gunbag.p3d);
picture = PATHTOF(ui\gunbag_ca.paa); picture = QPATHTOF(ui\gunbag_ca.paa);
icon = PATHTOF(ui\gunbag_icon_ca.paa); icon = QPATHTOF(ui\gunbag_icon_ca.paa);
hiddenSelections[] = {QUOTE(Camo),QUOTE(insignia)}; hiddenSelections[] = {"Camo", "insignia"};
hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_co.paa)}; hiddenSelectionsTextures[] = {QPATHTOF(data\gunbag_co.paa)};
maximumLoad = 80; maximumLoad = 80;
mass = 11; mass = 11;
}; };
class DOUBLES(CLASSNAME,Tan): CLASSNAME { class GVAR(Tan): ADDON {
_generalMacro = QUOTE(DOUBLES(CLASSNAME,Tan)); _generalMacro = QGVAR(Tan);
author = "Ir0n1E"; author = "Ir0n1E";
displayName = CSTRING(Displayname_Tan); displayName = CSTRING(Displayname_Tan);
picture = PATHTOF(ui\gunbag_tan_ca.paa); picture = QPATHTOF(ui\gunbag_tan_ca.paa);
hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_tan_co.paa)}; hiddenSelectionsTextures[] = {QPATHTOF(data\gunbag_tan_co.paa)};
}; };
class Box_NATO_Support_F; class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportBackpacks { class TransportBackpacks {
MACRO_ADDBACKPACK(CLASSNAME,3); MACRO_ADDBACKPACK(ADDON,3);
MACRO_ADDBACKPACK(DOUBLES(CLASSNAME,Tan),3); MACRO_ADDBACKPACK(GVAR(Tan),3);
}; };
}; };
}; };

1
addons/gunbag/README.md
View File

@ -8,3 +8,4 @@ Adds a gunbag for DMRs.
The people responsible for merging changes to this component or answering potential questions. The people responsible for merging changes to this component or answering potential questions.
- [commy2](https://github.com/commy2)

6
addons/gunbag/config.cpp
View File

@ -2,11 +2,13 @@
class CfgPatches { class CfgPatches {
class ADDON { class ADDON {
units[] = {CLASSNAME, DOUBLES(CLASSNAME,Tan)}; units[] = {QUOTE(ADDON), QGVAR(Tan)};
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction", "ace_movement"}; requiredAddons[] = {"ace_interaction", "ace_movement"};
author[] = {"Ir0n1E"}; author = ECSTRING(common,ACETeam);
authors[] = {"Ir0n1E"};
url = ECSTRING(main,URL);
VERSION_CONFIG; VERSION_CONFIG;
}; };
}; };

0
addons/gunbag/data/gunbag.p3d → addons/gunbag/data/ace_gunbag.p3d
View File

278
addons/gunbag/data/model.cfg
View File

@ -1,148 +1,148 @@
class CfgSkeletons { class CfgSkeletons {
class Default { class Default {
isDiscrete = 1; isDiscrete = 1;
skeletonInherit = ""; skeletonInherit = "";
skeletonBones[] = {}; skeletonBones[] = {};
};
class OFP2_ManSkeleton {
isDiscrete = 0;
skeletonInherit = "";
skeletonBones[] = {
"Pelvis","",
"Spine","Pelvis",
"Spine1","Spine",
"Spine2","Spine1",
"Spine3","Spine2",
"Camera","Pelvis",
"weapon","Spine1",
"launcher","Spine1",
//Head skeleton in hierarchy
"neck","Spine3",
"neck1","neck",
"head","neck1",
//New facial features
"Face_Hub","head",
"Face_Jawbone","Face_Hub",
"Face_Jowl","Face_Jawbone",
"Face_chopRight","Face_Jawbone",
"Face_chopLeft","Face_Jawbone",
"Face_LipLowerMiddle","Face_Jawbone",
"Face_LipLowerLeft","Face_Jawbone",
"Face_LipLowerRight","Face_Jawbone",
"Face_Chin","Face_Jawbone",
"Face_Tongue","Face_Jawbone",
"Face_CornerRight","Face_Hub",
"Face_CheekSideRight","Face_CornerRight",
"Face_CornerLeft","Face_Hub",
"Face_CheekSideLeft","Face_CornerLeft",
"Face_CheekFrontRight","Face_Hub",
"Face_CheekFrontLeft","Face_Hub",
"Face_CheekUpperRight","Face_Hub",
"Face_CheekUpperLeft","Face_Hub",
"Face_LipUpperMiddle","Face_Hub",
"Face_LipUpperRight","Face_Hub",
"Face_LipUpperLeft","Face_Hub",
"Face_NostrilRight","Face_Hub",
"Face_NostrilLeft","Face_Hub",
"Face_Forehead","Face_Hub",
"Face_BrowFrontRight","Face_Forehead",
"Face_BrowFrontLeft","Face_Forehead",
"Face_BrowMiddle","Face_Forehead",
"Face_BrowSideRight","Face_Forehead",
"Face_BrowSideLeft","Face_Forehead",
"Face_Eyelids","Face_Hub",
"Face_EyelidUpperRight","Face_Hub",
"Face_EyelidUpperLeft","Face_Hub",
"Face_EyelidLowerRight","Face_Hub",
"Face_EyelidLowerLeft","Face_Hub",
"EyeLeft","Face_Hub",
"EyeRight","Face_Hub",
//Left upper side
"LeftShoulder","Spine3",
"LeftArm","LeftShoulder",
"LeftArmRoll","LeftArm",
"LeftForeArm","LeftArmRoll",
"LeftForeArmRoll","LeftForeArm",
"LeftHand","LeftForeArmRoll",
"LeftHandRing","LeftHand",
"LeftHandRing1","LeftHandRing",
"LeftHandRing2","LeftHandRing1",
"LeftHandRing3","LeftHandRing2",
"LeftHandPinky1","LeftHandRing",
"LeftHandPinky2","LeftHandPinky1",
"LeftHandPinky3","LeftHandPinky2",
"LeftHandMiddle1","LeftHand",
"LeftHandMiddle2","LeftHandMiddle1",
"LeftHandMiddle3","LeftHandMiddle2",
"LeftHandIndex1","LeftHand",
"LeftHandIndex2","LeftHandIndex1",
"LeftHandIndex3","LeftHandIndex2",
"LeftHandThumb1","LeftHand",
"LeftHandThumb2","LeftHandThumb1",
"LeftHandThumb3","LeftHandThumb2",
//Right upper side
"RightShoulder","Spine3",
"RightArm","RightShoulder",
"RightArmRoll","RightArm",
"RightForeArm","RightArmRoll",
"RightForeArmRoll","RightForeArm",
"RightHand","RightForeArmRoll",
"RightHandRing","RightHand",
"RightHandRing1","RightHandRing",
"RightHandRing2","RightHandRing1",
"RightHandRing3","RightHandRing2",
"RightHandPinky1","RightHandRing",
"RightHandPinky2","RightHandPinky1",
"RightHandPinky3","RightHandPinky2",
"RightHandMiddle1","RightHand",
"RightHandMiddle2","RightHandMiddle1",
"RightHandMiddle3","RightHandMiddle2",
"RightHandIndex1","RightHand",
"RightHandIndex2","RightHandIndex1",
"RightHandIndex3","RightHandIndex2",
"RightHandThumb1","RightHand",
"RightHandThumb2","RightHandThumb1",
"RightHandThumb3","RightHandThumb2",
//Left lower side
"LeftUpLeg","Pelvis",
"LeftUpLegRoll","LeftUpLeg",
"LeftLeg","LeftUpLegRoll",
"LeftLegRoll","LeftLeg",
"LeftFoot","LeftLegRoll",
"LeftToeBase","LeftFoot",
//Right lower side
"RightUpLeg","Pelvis",
"RightUpLegRoll","RightUpLeg",
"RightLeg","RightUpLegRoll",
"RightLegRoll","RightLeg",
"RightFoot","RightLegRoll",
"RightToeBase","RightFoot"
}; };
// location of pivot points (local axes) for hierarchical animation class OFP2_ManSkeleton {
pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d"; isDiscrete = 0;
skeletonInherit = "";
skeletonBones[] = {
"Pelvis","",
"Spine","Pelvis",
"Spine1","Spine",
"Spine2","Spine1",
"Spine3","Spine2",
"Camera","Pelvis",
"weapon","Spine1",
"launcher","Spine1",
//Head skeleton in hierarchy
"neck","Spine3",
"neck1","neck",
"head","neck1",
//New facial features
"Face_Hub","head",
"Face_Jawbone","Face_Hub",
"Face_Jowl","Face_Jawbone",
"Face_chopRight","Face_Jawbone",
"Face_chopLeft","Face_Jawbone",
"Face_LipLowerMiddle","Face_Jawbone",
"Face_LipLowerLeft","Face_Jawbone",
"Face_LipLowerRight","Face_Jawbone",
"Face_Chin","Face_Jawbone",
"Face_Tongue","Face_Jawbone",
"Face_CornerRight","Face_Hub",
"Face_CheekSideRight","Face_CornerRight",
"Face_CornerLeft","Face_Hub",
"Face_CheekSideLeft","Face_CornerLeft",
"Face_CheekFrontRight","Face_Hub",
"Face_CheekFrontLeft","Face_Hub",
"Face_CheekUpperRight","Face_Hub",
"Face_CheekUpperLeft","Face_Hub",
"Face_LipUpperMiddle","Face_Hub",
"Face_LipUpperRight","Face_Hub",
"Face_LipUpperLeft","Face_Hub",
"Face_NostrilRight","Face_Hub",
"Face_NostrilLeft","Face_Hub",
"Face_Forehead","Face_Hub",
"Face_BrowFrontRight","Face_Forehead",
"Face_BrowFrontLeft","Face_Forehead",
"Face_BrowMiddle","Face_Forehead",
"Face_BrowSideRight","Face_Forehead",
"Face_BrowSideLeft","Face_Forehead",
"Face_Eyelids","Face_Hub",
"Face_EyelidUpperRight","Face_Hub",
"Face_EyelidUpperLeft","Face_Hub",
"Face_EyelidLowerRight","Face_Hub",
"Face_EyelidLowerLeft","Face_Hub",
"EyeLeft","Face_Hub",
"EyeRight","Face_Hub",
//Left upper side
"LeftShoulder","Spine3",
"LeftArm","LeftShoulder",
"LeftArmRoll","LeftArm",
"LeftForeArm","LeftArmRoll",
"LeftForeArmRoll","LeftForeArm",
"LeftHand","LeftForeArmRoll",
"LeftHandRing","LeftHand",
"LeftHandRing1","LeftHandRing",
"LeftHandRing2","LeftHandRing1",
"LeftHandRing3","LeftHandRing2",
"LeftHandPinky1","LeftHandRing",
"LeftHandPinky2","LeftHandPinky1",
"LeftHandPinky3","LeftHandPinky2",
"LeftHandMiddle1","LeftHand",
"LeftHandMiddle2","LeftHandMiddle1",
"LeftHandMiddle3","LeftHandMiddle2",
"LeftHandIndex1","LeftHand",
"LeftHandIndex2","LeftHandIndex1",
"LeftHandIndex3","LeftHandIndex2",
"LeftHandThumb1","LeftHand",
"LeftHandThumb2","LeftHandThumb1",
"LeftHandThumb3","LeftHandThumb2",
//Right upper side
"RightShoulder","Spine3",
"RightArm","RightShoulder",
"RightArmRoll","RightArm",
"RightForeArm","RightArmRoll",
"RightForeArmRoll","RightForeArm",
"RightHand","RightForeArmRoll",
"RightHandRing","RightHand",
"RightHandRing1","RightHandRing",
"RightHandRing2","RightHandRing1",
"RightHandRing3","RightHandRing2",
"RightHandPinky1","RightHandRing",
"RightHandPinky2","RightHandPinky1",
"RightHandPinky3","RightHandPinky2",
"RightHandMiddle1","RightHand",
"RightHandMiddle2","RightHandMiddle1",
"RightHandMiddle3","RightHandMiddle2",
"RightHandIndex1","RightHand",
"RightHandIndex2","RightHandIndex1",
"RightHandIndex3","RightHandIndex2",
"RightHandThumb1","RightHand",
"RightHandThumb2","RightHandThumb1",
"RightHandThumb3","RightHandThumb2",
//Left lower side
"LeftUpLeg","Pelvis",
"LeftUpLegRoll","LeftUpLeg",
"LeftLeg","LeftUpLegRoll",
"LeftLegRoll","LeftLeg",
"LeftFoot","LeftLegRoll",
"LeftToeBase","LeftFoot",
//Right lower side
"RightUpLeg","Pelvis",
"RightUpLegRoll","RightUpLeg",
"RightLeg","RightUpLegRoll",
"RightLegRoll","RightLeg",
"RightFoot","RightLegRoll",
"RightToeBase","RightFoot"
};
// location of pivot points (local axes) for hierarchical animation
pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d";
}; };
}; };
class CfgModels { class CfgModels {
class Default { class Default {
sectionsInherit=""; sectionsInherit="";
sections[] = {}; sections[] = {};
skeletonName = ""; skeletonName = "";
};
class ArmaMan: Default {
htMin = 60; // Minimum half-cooling time (in seconds)
htMax = 1800; // Maximum half-cooling time (in seconds)
afMax = 30; // Maximum temperature in case the model is alive (in celsius)
mfMax = 0; // Maximum temperature when the model is moving (in celsius)
mFact = 1; // Metabolism factor - number from interval <0, 1> (0 - metabolism has no influence, 1 - metabolism has full influence (no other temperature source will be considered)).
tBody = 37; // Metabolism temperature of the model (in celsius)
sections[] = {
"osobnost","Head_Injury","Body_Injury","l_leg_injury","l_arm_injury","r_arm_injury","r_leg_injury","injury_body", "injury_legs", "injury_hands",
"clan","clan_sign","Camo","CamoB","Camo1","Camo2","personality","hl", "injury_head", "insignia"
}; };
skeletonName = "OFP2_ManSkeleton"; class ArmaMan: Default {
}; htMin = 60; // Minimum half-cooling time (in seconds)
htMax = 1800; // Maximum half-cooling time (in seconds)
afMax = 30; // Maximum temperature in case the model is alive (in celsius)
mfMax = 0; // Maximum temperature when the model is moving (in celsius)
mFact = 1; // Metabolism factor - number from interval <0, 1> (0 - metabolism has no influence, 1 - metabolism has full influence (no other temperature source will be considered)).
tBody = 37; // Metabolism temperature of the model (in celsius)
class gunbag: ArmaMan {}; sections[] = {
"osobnost","Head_Injury","Body_Injury","l_leg_injury","l_arm_injury","r_arm_injury","r_leg_injury","injury_body", "injury_legs", "injury_hands",
"clan","clan_sign","Camo","CamoB","Camo1","Camo2","personality","hl", "injury_head", "insignia"
};
skeletonName = "OFP2_ManSkeleton";
};
class ace_gunbag: ArmaMan {};
}; };

5
addons/gunbag/functions/fnc_calculateMass.sqf
View File

@ -1,6 +1,6 @@
/* /*
* Author: Ir0n1E * Author: Ir0n1E
* calculate mass of weapon an items * Calculate mass of weapon an items.
* *
* Arguments: * Arguments:
* 0: Weapon <STRING> * 0: Weapon <STRING>
@ -10,6 +10,9 @@
* Return Value: * Return Value:
* Mass <NUMBER> * Mass <NUMBER>
* *
* Example:
* ["weapon", ["item1", "item2"], ["mag1", "mag2"]] call ace_gunbag_fnc_calculateMass
*
* Public: No * Public: No
*/ */
#include "script_component.hpp" #include "script_component.hpp"

5
addons/gunbag/functions/fnc_canInteract.sqf
View File

@ -1,6 +1,6 @@
/* /*
* Author: Ir0n1E * Author: Ir0n1E
* Check if client able to interact with gunbag * Check if client able to interact with gunbag.
* *
* Arguments: * Arguments:
* 0: Unit <OBJECT> * 0: Unit <OBJECT>
@ -9,6 +9,9 @@
* Return Value: * Return Value:
* <NUMBER> -1: can't interact 0: empty gunbag 1: full gunbag * <NUMBER> -1: can't interact 0: empty gunbag 1: full gunbag
* *
* Example:
* _canInteract = [player, target] call ace_gunbag_fnc_canInteract
*
* Public: No * Public: No
*/ */
#include "script_component.hpp" #include "script_component.hpp"

9
addons/gunbag/functions/fnc_hasGunbag.sqf
View File

@ -1,12 +1,15 @@
/* /*
* Author: Ir0n1E * Author: Ir0n1E
* switches gunbag full/empty for mass calculation * Switches gunbag full/empty for mass calculation.
* *
* Arguments: * Arguments:
* 0: Unit <OBJECT> * 0: Unit <OBJECT>
* *
* Return Value: * Return Value:
* (BOOL) * Has Gunbag <BOOL>
*
* Example:
* [player] call ace_gunbag_fnc_hasGunbag
* *
* Public: No * Public: No
*/ */
@ -14,4 +17,4 @@
params ["_unit"]; params ["_unit"];
backpackContainer _unit isKindOf QUOTE(CLASSNAME) (backpackContainer _unit) isKindOf QUOTE(ADDON)

9
addons/gunbag/functions/fnc_offGunbag.sqf
View File

@ -1,13 +1,16 @@
/* /*
* Author: Ir0n1E * Author: Ir0n1E
* get weapon out of gunbag * Get weapon out of gunbag.
* *
* Arguments: * Arguments:
* 0: Unit <OBJECT> * 0: Unit <OBJECT>
* 1: Target <OBJECT> * 1: Target <OBJECT>
* *
* Return Value: * Return Value:
* Nothing * None
*
* Example:
* [player, target] call ace_gunbag_fnc_toGunbag
* *
* Public: No * Public: No
*/ */
@ -20,7 +23,7 @@ private _gunbag = backpackContainer _target;
_unit call EFUNC(common,goKneeling); _unit call EFUNC(common,goKneeling);
// play sound // play sound
if (!isNil "ACE_Backpacks") then { if (["ace_backpacks"] call EFUNC(common,isModLoaded)) then {
[_target, _gunbag] call EFUNC(backpacks,backpackOpened); [_target, _gunbag] call EFUNC(backpacks,backpackOpened);
}; };

9
addons/gunbag/functions/fnc_offGunbagCallback.sqf
View File

@ -1,13 +1,16 @@
/* /*
* Author: Ir0n1E * Author: Ir0n1E
* get weapon out of gunbag * Get weapon out of gunbag.
* *
* Arguments: * Arguments:
* 0: Unit <OBJECT> * 0: Unit <OBJECT>
* 1: Target <OBJECT> * 1: Target <OBJECT>
* *
* Return Value: * Return Value:
* Nothing * None
*
* Example:
* [player, target] call ace_gunbag_fnc_offGunbagCallback
* *
* Public: No * Public: No
*/ */
@ -43,6 +46,6 @@ private _mass = [_weapon, _items, _magazines] call FUNC(calculateMass);
_gunbag setVariable [QGVAR(gunbagWeapon), [], true]; _gunbag setVariable [QGVAR(gunbagWeapon), [], true];
// play sound // play sound
if (!isNil "ACE_Backpacks") then { if (["ace_backpacks"] call EFUNC(common,isModLoaded)) then {
[_target, _gunbag] call EFUNC(backpacks,backpackOpened); [_target, _gunbag] call EFUNC(backpacks,backpackOpened);
}; };

7
addons/gunbag/functions/fnc_status.sqf
View File

@ -1,12 +1,15 @@
/* /*
* Author: Ir0n1E * Author: Ir0n1E
* check gunbag status full/empty * Check gunbag status full/empty.
* *
* Arguments: * Arguments:
* 0: Unit <OBJECT> * 0: Unit <OBJECT>
* *
* Return Value: * Return Value:
* Nothing * None
*
* Example:
* [player] call ace_gunbag_fnc_status
* *
* Public: No * Public: No
*/ */

9
addons/gunbag/functions/fnc_toGunbag.sqf
View File

@ -1,13 +1,16 @@
/* /*
* Author: Ir0n1E * Author: Ir0n1E
* put weapon into gunbag * Put weapon into gunbag.
* *
* Arguments: * Arguments:
* 0: Unit <OBJECT> * 0: Unit <OBJECT>
* 1: Target <OBJECT> * 1: Target <OBJECT>
* *
* Return Value: * Return Value:
* Nothing * None
*
* Example:
* [player, target] call ace_gunbag_fnc_toGunbag
* *
* Public: No * Public: No
*/ */
@ -20,7 +23,7 @@ private _gunbag = backpackContainer _target;
_unit call EFUNC(common,goKneeling); _unit call EFUNC(common,goKneeling);
// play sound // play sound
if (!isNil "ACE_Backpacks") then { if (["ace_backpacks"] call EFUNC(common,isModLoaded)) then {
[_target, _gunbag] call EFUNC(backpacks,backpackOpened); [_target, _gunbag] call EFUNC(backpacks,backpackOpened);
}; };

9
addons/gunbag/functions/fnc_toGunbagCallback.sqf
View File

@ -1,13 +1,16 @@
/* /*
* Author: Ir0n1E * Author: Ir0n1E
* put weapon into gunbag * Put weapon into gunbag.
* *
* Arguments: * Arguments:
* 0: Unit <OBJECT> * 0: Unit <OBJECT>
* 1: Target <OBJECT> * 1: Target <OBJECT>
* *
* Return Value: * Return Value:
* Nothing * None
*
* Example:
* [player, target] call ace_gunbag_fnc_toGunbagCallback
* *
* Public: No * Public: No
*/ */
@ -40,6 +43,6 @@ _unit removeWeapon _weapon;
_gunbag setVariable [QGVAR(gunbagWeapon), [_weapon, _items, _magazines], true]; _gunbag setVariable [QGVAR(gunbagWeapon), [_weapon, _items, _magazines], true];
// play sound // play sound
if (!isNil "ACE_Backpacks") then { if (["ace_backpacks"] call EFUNC(common,isModLoaded)) then {
[_target, _gunbag] call EFUNC(backpacks,backpackOpened); [_target, _gunbag] call EFUNC(backpacks,backpackOpened);
}; };

1
addons/gunbag/script_component.hpp
View File

@ -16,5 +16,4 @@
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"
#define CLASSNAME ACE_Gunbag
#define PROGRESSBAR_TIME 5 #define PROGRESSBAR_TIME 5

12
addons/gunbag/stringtable.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="gunbag"> <Package name="Gunbag">
<Key ID="STR_ACE_Gunbag_DisplayName"> <Key ID="STR_ACE_Gunbag_DisplayName">
<English>Gunbag</English> <English>Gunbag</English>
<German>Waffentasche</German> <German>Waffentasche</German>
@ -9,19 +9,19 @@
<English>Gunbag (Tan)</English> <English>Gunbag (Tan)</English>
<German>Waffentasche (Tan)</German> <German>Waffentasche (Tan)</German>
</Key> </Key>
<Key ID="STR_ACE_Gunbag_toGunbag"> <Key ID="STR_ACE_Gunbag_ToGunbag">
<English>Put weapon into gunbag</English> <English>Put weapon into gunbag</English>
<German>Lege Waffe in Waffentasche</German> <German>Lege Waffe in Waffentasche</German>
</Key> </Key>
<Key ID="STR_ACE_Gunbag_offGunbag"> <Key ID="STR_ACE_Gunbag_OffGunbag">
<English>Get weapon out of gunbag</English> <English>Get weapon out of gunbag</English>
<German>Hole Waffe aus Waffentasche</German> <German>Hole Waffe aus Waffentasche</German>
</Key> </Key>
<Key ID="STR_ACE_Gunbag_Status"> <Key ID="STR_ACE_Gunbag_Status">
<English>Status Gunbag</English> <English>Status</English>
<German>Status Waffentasche</German> <German>Status</German>
</Key> </Key>
<Key ID="STR_ACE_Gunbag_empty"> <Key ID="STR_ACE_Gunbag_Empty">
<English>Gunbag Empty</English> <English>Gunbag Empty</English>
<German>Waffentasche leer</German> <German>Waffentasche leer</German>
</Key> </Key>