fixed idention tabs are 4 spaces now

This commit is contained in:
ir0n1e 2016-05-17 11:21:48 +02:00
parent 6d988524d3
commit c89163316c
8 changed files with 156 additions and 156 deletions

View File

@ -1,91 +1,91 @@
class CfgVehicles {
class Man;
class CAManBase: Man {
class ACE_Actions {
class ACE_MainActions {
class GVAR(WeapontoGunbag) {
displayName = CSTRING(toGunbag);
condition = QUOTE([ARR_2(_player,_target)] call FUNC(canInteract) == 0);
statement = QUOTE([ARR_2(_player,_target)] call FUNC(toGunbag));
showDisabled = 0;
priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
class Man;
class CAManBase: Man {
class ACE_Actions {
class ACE_MainActions {
class GVAR(WeapontoGunbag) {
displayName = CSTRING(toGunbag);
condition = QUOTE([ARR_2(_player,_target)] call FUNC(canInteract) == 0);
statement = QUOTE([ARR_2(_player,_target)] call FUNC(toGunbag));
showDisabled = 0;
priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
};
class GVAR(WeaponoffGunbag) {
displayName = CSTRING(offGunbag);
condition = QUOTE([ARR_2(_player,_target)] call FUNC(canInteract) == 1);
statement = QUOTE([ARR_2(_player,_target)] call FUNC(offGunbag));
showDisabled = 0;
priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
};
class GVAR(StatusGunbag) {
displayName = CSTRING(Status);
condition = QUOTE([_target] call FUNC(isGunbag));
statement = QUOTE([_target] call FUNC(status));
showDisabled = 0;
priority = 2;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
};
};
};
class GVAR(WeaponoffGunbag) {
displayName = CSTRING(offGunbag);
condition = QUOTE([ARR_2(_player,_target)] call FUNC(canInteract) == 1);
statement = QUOTE([ARR_2(_player,_target)] call FUNC(offGunbag));
showDisabled = 0;
priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
class ACE_SelfActions {
class ACE_Equipment {
class GVAR(actions) {
displayName = CSTRING(displayname);
condition = QUOTE([_player] call FUNC(isGunbag));
showDisabled = 0;
priority = 0.1;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
class GVAR(WeapontoGunbag) {
displayName = CSTRING(toGunbag);
condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 0);
statement = QUOTE([ARR_2(_player,_player)] call FUNC(toGunbag));
showDisabled = 0;
priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
};
class GVAR(WeaponoffGunbag) {
displayName = CSTRING(offGunbag);
condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 1);
statement = QUOTE([ARR_2(_player,_player)] call FUNC(offGunbag));
showDisabled = 0;
priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
};
class GVAR(StatusGunbag) {
displayName = CSTRING(Status);
condition = QUOTE([_player] call FUNC(isGunbag));
statement = QUOTE([_player] call FUNC(status));
showDisabled = 0;
priority = 2;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
};
};
};
};
class GVAR(StatusGunbag) {
displayName = CSTRING(Status);
condition = QUOTE([_target] call FUNC(isGunbag));
statement = QUOTE([_target] call FUNC(status));
showDisabled = 0;
priority = 2;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
};
};
};
class ACE_SelfActions {
class ACE_Equipment {
class GVAR(actions) {
displayName = CSTRING(displayname);
condition = QUOTE([_player] call FUNC(isGunbag));
showDisabled = 0;
priority = 0.1;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
class GVAR(WeapontoGunbag) {
displayName = CSTRING(toGunbag);
condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 0);
statement = QUOTE([ARR_2(_player,_player)] call FUNC(toGunbag));
showDisabled = 0;
priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
};
class GVAR(WeaponoffGunbag) {
displayName = CSTRING(offGunbag);
condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 1);
statement = QUOTE([ARR_2(_player,_player)] call FUNC(offGunbag));
showDisabled = 0;
priority = 1;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
};
class GVAR(StatusGunbag) {
displayName = CSTRING(Status);
condition = QUOTE([_player] call FUNC(isGunbag));
statement = QUOTE([_player] call FUNC(status));
showDisabled = 0;
priority = 2;
icon = PATHTOF(ui\gunbag_icon_ca.paa);
};
};
};
class Bag_Base;
class CLASSNAME: Bag_Base {
_generalMacro = QUOTE(CLASSNAME);
author = "Ir0n1E";
scope = 2;
displayName = CSTRING(Displayname);
model = PATHTOF(data\gunbag.p3d);
picture = PATHTOF(ui\gunbag_ca.paa);
icon = PATHTOF(ui\gunbag_icon_ca.paa);
hiddenSelections[] = {QUOTE(Camo),QUOTE(insignia)};
hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_co.paa)};
maximumLoad = 80;
mass = 11;
};
};
class Bag_Base;
class CLASSNAME: Bag_Base {
_generalMacro = QUOTE(CLASSNAME);
author = "Ir0n1E";
scope = 2;
displayName = CSTRING(Displayname);
model = PATHTOF(data\gunbag.p3d);
picture = PATHTOF(ui\gunbag_ca.paa);
icon = PATHTOF(ui\gunbag_icon_ca.paa);
hiddenSelections[] = {QUOTE(Camo),QUOTE(insignia)};
hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_co.paa)};
maximumLoad = 80;
mass = 11;
};
class DOUBLES(CLASSNAME,Tan): CLASSNAME {
displayName = CSTRING(Displayname_Tan);
picture = PATHTOF(ui\gunbag_tan_ca.paa);
hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_tan_co.paa)};
};
class DOUBLES(CLASSNAME,Tan): CLASSNAME {
displayName = CSTRING(Displayname_Tan);
picture = PATHTOF(ui\gunbag_tan_ca.paa);
hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_tan_co.paa)};
};
};

View File

@ -1,41 +1,41 @@
class CfgWeapons {
class Rifle_Long_Base_F;
class Rifle_Long_Base_F;
/* Long Rifles */
/* Long Rifles */
class GM6_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class GM6_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class LRR_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class LRR_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_06_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_06_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_05_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_05_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_04_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_04_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_03_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_03_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_02_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_02_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_01_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class DMR_01_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class EBR_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
class EBR_base_F: Rifle_Long_Base_F {
GVAR(allowGunbag) = 1;
};
};

View File

@ -1,14 +1,14 @@
#include "script_component.hpp"
class CfgPatches {
class ADDON {
units[] = {"ACE_Gunbag", "ACE_Gunbag_tan"};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction", "ace_movement"};
author[] = {"Ir0n1E"};
VERSION_CONFIG;
};
class ADDON {
units[] = {"ACE_Gunbag", "ACE_Gunbag_tan"};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction", "ace_movement"};
author[] = {"Ir0n1E"};
VERSION_CONFIG;
};
};
#include "CfgEventHandlers.hpp"

View File

@ -19,7 +19,7 @@ params ["_weapon","_items"];
private _mass = getNumber (configFile >> "CfgWeapons" >> _weapon >> "WeaponSlotsInfo" >> "mass");
{
_mass = _mass + getNumber (configFile >> "CfgWeapons" >> _x >> "ItemInfo" >> "mass");
_mass = _mass + getNumber (configFile >> "CfgWeapons" >> _x >> "ItemInfo" >> "mass");
} foreach _items;
(_mass / 22)
_mass

View File

@ -22,11 +22,11 @@ _result = -1;
_gunbag = backpackContainer _target;
if(count (_gunbag getVariable [QGVAR(GunbagWeapon),[]]) <= 0 && {primaryWeapon _unit != ""} && {getNumber (configFile >> "CfgWeapons" >> primaryWeapon _unit >> QGVAR(allowGunbag)) == 1}) then {
_result = 0;
_result = 0;
};
if(count (_gunbag getVariable [QGVAR(GunbagWeapon),[]]) >= 1 && {primaryWeapon _unit == ""}) then {
_result = 1;
_result = 1;
};
_result

View File

@ -18,9 +18,9 @@ params ["_unit"];
private _state = (backpackContainer _unit) getVariable [QGVAR(GunbagWeapon),[]];
if (count _state <= 0) then {
[localize LSTRING(empty)] call EFUNC(common,displayTextStructured);
[localize LSTRING(empty)] call EFUNC(common,displayTextStructured);
} else {
private _weapon = (_state select 0) select 0;
[getText (configFile >> "CfgWeapons" >> _weapon >> "displayname"),
getText (configFile >> "CfgWeapons" >> _weapon >> "picture")] call EFUNC(common,displayTextPicture);
private _weapon = (_state select 0) select 0;
[getText (configFile >> "CfgWeapons" >> _weapon >> "displayname"),
getText (configFile >> "CfgWeapons" >> _weapon >> "picture")] call EFUNC(common,displayTextPicture);
};

View File

@ -32,7 +32,7 @@ _items = [_state select 0, _state select 1, _state select 2, _state select 3];
if ((_magazine select 0) != "") then {
_unit addMagazine _magazine;
_unit addMagazine _magazine;
};
_unit removeWeapon _weapon;
@ -41,5 +41,5 @@ _unit removeWeapon _weapon;
_gunbag setVariable [QGVAR(GunbagWeapon), [[_weapon], _items], true];
if(["ACE_Backpacks"] call EFUNC(common,isModLoaded)) then {
[_unit, _target, backpackContainer _target] call EFUNC(backpacks,backpackOpened);
[_unit, _target, backpackContainer _target] call EFUNC(backpacks,backpackOpened);
};

View File

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