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

unified ACE_Attachable config entry now ACE_Attachable its a string and hold the effect for the item

Browse Source
This commit is contained in:
Kavinsky 2015-04-10 04:36:28 +02:00
parent b49fec58e6
commit a118cae13d
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/attach/CfgMagazines.hpp
View File

@ -2,33 +2,31 @@
class CfgMagazines { class CfgMagazines {
class CA_Magazine; class CA_Magazine;
class B_IR_Grenade: CA_Magazine { class B_IR_Grenade: CA_Magazine {
ACE_Attachable = 1; ACE_Attachable = "B_IRStrobe";
ACE_attachable_effect = "B_IRStrobe";
}; };
class O_IR_Grenade: B_IR_Grenade { class O_IR_Grenade: B_IR_Grenade {
ACE_attachable_effect = "O_IRStrobe"; ACE_Attachable = "O_IRStrobe";
}; };
class I_IR_Grenade: B_IR_Grenade { class I_IR_Grenade: B_IR_Grenade {
ACE_attachable_effect = "I_IRStrobe"; ACE_Attachable = "I_IRStrobe";
}; };
class SmokeShell; class SmokeShell;
class Chemlight_green: SmokeShell { class Chemlight_green: SmokeShell {
ACE_Attachable = 1; ACE_Attachable = "Chemlight_green";
ACE_attachable_effect = "Chemlight_green";
}; };
class Chemlight_blue: Chemlight_green { class Chemlight_blue: Chemlight_green {
ACE_attachable_effect = "Chemlight_blue"; ACE_Attachable = "Chemlight_blue";
}; };
class Chemlight_red: Chemlight_green { class Chemlight_red: Chemlight_green {
ACE_attachable_effect = "Chemlight_red"; ACE_Attachable = "Chemlight_red";
}; };
class Chemlight_yellow: Chemlight_green { class Chemlight_yellow: Chemlight_green {
ACE_attachable_effect = "Chemlight_yellow"; ACE_Attachable = "Chemlight_yellow";
}; };
}; };

3
addons/attach/CfgWeapons.hpp
View File

@ -4,8 +4,7 @@ class CfgWeapons {
class InventoryItem_Base_F; class InventoryItem_Base_F;
class ACE_IR_Strobe_Item: ACE_ItemCore { class ACE_IR_Strobe_Item: ACE_ItemCore {
ACE_attachable = 1; ACE_attachable = "ACE_IR_Strobe_Effect";
ACE_attachable_effect = "ACE_IR_Strobe_Effect";
author = "$STR_ACE_Common_ACETeam"; author = "$STR_ACE_Common_ACETeam";
scope = 2; scope = 2;
displayName = "$STR_ACE_IrStrobe_Name"; displayName = "$STR_ACE_IrStrobe_Name";

6
addons/attach/functions/fnc_attach.sqf
View File

@ -27,15 +27,15 @@ if ((_itemClassname == "") || {!(_this call FUNC(canAttach))}) exitWith {ERROR("
_selfAttachPosition = [_unit, [-0.05, 0, 0.12], "rightshoulder"]; _selfAttachPosition = [_unit, [-0.05, 0, 0.12], "rightshoulder"];
_itemVehClass = getText (configFile >> "CfgWeapons" >> _itemClassname >> "ACE_attachable_effect"); _itemVehClass = getText (configFile >> "CfgWeapons" >> _itemClassname >> "ACE_Attachable");
_onAtachText = getText (configFile >> "CfgWeapons" >> _itemClassname >> "displayName"); _onAtachText = getText (configFile >> "CfgWeapons" >> _itemClassname >> "displayName");
if (_itemVehClass == "") then { if (_itemVehClass == "") then {
_itemVehClass = getText (configFile >> "CfgMagazines" >> _itemClassname >> "ACE_attachable_effect"); _itemVehClass = getText (configFile >> "CfgMagazines" >> _itemClassname >> "ACE_Attachable");
_onAtachText = getText (configFile >> "CfgMagazines" >> _itemClassname >> "displayName"); _onAtachText = getText (configFile >> "CfgMagazines" >> _itemClassname >> "displayName");
}; };
if (_itemVehClass == "") exitWith {ERROR("no ACE_attachable_effect for Item");}; if (_itemVehClass == "") exitWith {ERROR("no ACE_Attachable for Item");};
_onAtachText = format [localize "STR_ACE_Attach_Item_Attached", _onAtachText]; _onAtachText = format [localize "STR_ACE_Attach_Item_Attached", _onAtachText];

4
addons/attach/functions/fnc_getChildrenAttachActions.sqf
View File

@ -26,7 +26,7 @@ _actions = [];
if !(_x in _listed) then { if !(_x in _listed) then {
_listed pushBack _x; _listed pushBack _x;
_item = ConfigFile >> "CfgMagazines" >> _x; _item = ConfigFile >> "CfgMagazines" >> _x;
if (getNumber (_item >> "ACE_Attachable") == 1) then { if (getText (_item >> "ACE_Attachable") != "") then {
_displayName = getText(_item >> "displayName"); _displayName = getText(_item >> "displayName");
_picture = getText(_item >> "picture"); _picture = getText(_item >> "picture");
_action = [_x, _displayName, _picture, {_this call FUNC(attach)}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction); _action = [_x, _displayName, _picture, {_this call FUNC(attach)}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction);
@ -39,7 +39,7 @@ _actions = [];
if !(_x in _listed) then { if !(_x in _listed) then {
_listed pushBack _x; _listed pushBack _x;
_item = ConfigFile >> "CfgWeapons" >> _x; _item = ConfigFile >> "CfgWeapons" >> _x;
if (getNumber (_item >> "ACE_Attachable") == 1) then { if (getText (_item >> "ACE_Attachable") != "") then {
_displayName = getText(_item >> "displayName"); _displayName = getText(_item >> "displayName");
_picture = getText(_item >> "picture"); _picture = getText(_item >> "picture");
_action = [_x, _displayName, _picture, {_this call FUNC(attach)}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction); _action = [_x, _displayName, _picture, {_this call FUNC(attach)}, {_this call FUNC(canAttach)}, {}, [_x]] call EFUNC(interact_menu,createAction);