diff --git a/addons/gunbag/CfgEventHandlers.hpp b/addons/gunbag/CfgEventHandlers.hpp index 78f28a655e..b4342c6f0f 100644 --- a/addons/gunbag/CfgEventHandlers.hpp +++ b/addons/gunbag/CfgEventHandlers.hpp @@ -1,12 +1,12 @@ class Extended_PreStart_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preStart)); - }; + class ADDON { + init = QUOTE(call COMPILE_FILE(XEH_preStart)); + }; }; class Extended_PreInit_EventHandlers { - class ADDON { - init = QUOTE( call COMPILE_FILE(XEH_preInit) ); - }; + class ADDON { + init = QUOTE( call COMPILE_FILE(XEH_preInit) ); + }; }; diff --git a/addons/gunbag/CfgVehicles.hpp b/addons/gunbag/CfgVehicles.hpp index d59a114340..e0bfcd5e36 100644 --- a/addons/gunbag/CfgVehicles.hpp +++ b/addons/gunbag/CfgVehicles.hpp @@ -2,107 +2,107 @@ class CBA_Extended_EventHandlers; class CfgVehicles { - class Man; + class Man; class CAManBase: Man { - 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 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 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,_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); + 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); - hiddenSelections[] = {QUOTE(Camo),QUOTE(insignia)}; - hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_co.paa)}; - maximumLoad = 80; - transportMaxMagazines = 2; - transportMaxWeapons = 1; - transportMaxBackpacks = 0; - GVAR(gunbagswitch) = QUOTE(DOUBLES(CLASSNAME,Full)); + }; + 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); + }; + }; + }; - 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)}; - GVAR(gunbagswitch) = QUOTE(TRIPLES(CLASSNAME,Tan,Full)); - }; - class DOUBLES(CLASSNAME,Full): CLASSNAME { - scope = 1; - mass = 311; - GVAR(gunbagswitch) = QUOTE(CLASSNAME); - }; - class TRIPLES(CLASSNAME,Tan,Full): DOUBLES(CLASSNAME,Tan) { - scope = 1; - mass = 311; - GVAR(gunbagswitch) = QUOTE(DOUBLES(CLASSNAME,Tan)); - }; + + 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; + transportMaxMagazines = 2; + transportMaxWeapons = 1; + transportMaxBackpacks = 0; + GVAR(gunbagswitch) = QUOTE(DOUBLES(CLASSNAME,Full)); + + 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)}; + GVAR(gunbagswitch) = QUOTE(TRIPLES(CLASSNAME,Tan,Full)); + }; + class DOUBLES(CLASSNAME,Full): CLASSNAME { + scope = 1; + mass = 311; + GVAR(gunbagswitch) = QUOTE(CLASSNAME); + }; + class TRIPLES(CLASSNAME,Tan,Full): DOUBLES(CLASSNAME,Tan) { + scope = 1; + mass = 311; + GVAR(gunbagswitch) = QUOTE(DOUBLES(CLASSNAME,Tan)); + }; }; diff --git a/addons/gunbag/CfgWeapons.hpp b/addons/gunbag/CfgWeapons.hpp index 894d6a4bee..b866962068 100644 --- a/addons/gunbag/CfgWeapons.hpp +++ b/addons/gunbag/CfgWeapons.hpp @@ -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; + }; }; diff --git a/addons/gunbag/config.cpp b/addons/gunbag/config.cpp index 1cedd1edbe..a82e85085f 100644 --- a/addons/gunbag/config.cpp +++ b/addons/gunbag/config.cpp @@ -1,14 +1,14 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - units[] = {"ACE_Gunbag", "ACE_Gunbag_tan", "ACE_Gunbag_full", "ACE_Gunbag_tan_full"}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_interaction"}; - author[] = {"Ir0n1E"}; - VERSION_CONFIG; - }; + class ADDON { + units[] = {"ACE_Gunbag", "ACE_Gunbag_tan", "ACE_Gunbag_full", "ACE_Gunbag_tan_full"}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_interaction"}; + author[] = {"Ir0n1E"}; + VERSION_CONFIG; + }; }; #include "CfgEventHandlers.hpp" diff --git a/addons/gunbag/functions/fnc_toGunbag.sqf b/addons/gunbag/functions/fnc_toGunbag.sqf index 6c418f215f..7692abc03f 100644 --- a/addons/gunbag/functions/fnc_toGunbag.sqf +++ b/addons/gunbag/functions/fnc_toGunbag.sqf @@ -35,16 +35,16 @@ _items = _state select 0; if ((_magazine select 0) != "") then { - _unit addMagazine _magazine; + _unit addMagazine _magazine; }; _unit removeWeapon _weapon; for "_loop" from 0 to (count _state) -1 do { - if (typeName (_state select _loop) == QUOTE(STRING)) then { - _items pushBack (_state select _loop); - }; + if (typeName (_state select _loop) == QUOTE(STRING)) then { + _items pushBack (_state select _loop); + }; }; ([_target] call FUNC(switchBackpack)) setVariable [QGVAR(GunbagWeapon), [[_weapon], _items], true]; diff --git a/addons/gunbag/stringtable.xml b/addons/gunbag/stringtable.xml index 6729b9518e..23198a0b86 100644 --- a/addons/gunbag/stringtable.xml +++ b/addons/gunbag/stringtable.xml @@ -1,29 +1,29 @@ - - - Gunbag - Waffentasche - - - Gunbag (Tan) - Waffentasche (Tan) - - - Put weapon into gunbag - Lege Waffe in Waffentasche - - - Get weapon out of gunbag - Hole Waffe aus Waffentasche - - - Status Gunbag - Status Waffentasche - - - Gunbag Empty - Waffentasche leer - - + + + Gunbag + Waffentasche + + + Gunbag (Tan) + Waffentasche (Tan) + + + Put weapon into gunbag + Lege Waffe in Waffentasche + + + Get weapon out of gunbag + Hole Waffe aus Waffentasche + + + Status Gunbag + Status Waffentasche + + + Gunbag Empty + Waffentasche leer + + \ No newline at end of file