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

Updated pathing for script_component.hpp and updated images to use PATHTOF.

Browse Source
This commit is contained in:
Garth L-H de Wet 2015-01-12 19:11:43 +02:00
parent f5772371bd
commit bfd9aedfa0
28 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/explosives/CfgACE_Triggers.hpp
View File

@ -10,28 +10,28 @@ class CfgACE_Triggers {
*/
class Command {
displayName = $STR_ACE_Explosives_clacker_displayName;
picture = "\ACE_Explosives\Data\UI\Clacker.paa";
picture = QUOTE( PATHTOF(Data\UI\Clacker.paa) );
onPlace = QUOTE( _this call FUNC(AddClacker);false );
requires[] = {"ACE_Clacker"};
};
class MK16_Transmitter:Command {
displayName = $STR_ACE_Explosives_MK16_displayName;
picture = "\ACE_Explosives\Data\UI\MK16_Reciever_ca.paa";
picture = QUOTE( PATHTOF(Data\UI\MK16_Reciever_ca.paa) );
requires[] = {"ACE_M26_Clacker"};
};
class DeadManSwitch:Command {
displayName = $STR_ACE_Explosives_DeadManSwitch_displayName;
picture = "\ACE_Explosives\Data\UI\DeadmanSwitch.paa";
picture = QUOTE( PATHTOF(Data\UI\DeadmanSwitch.paa) );
requires[] = {"ACE_DeadManSwitch"};
};
class PressurePlate {
displayName = $STR_ACE_Explosives_PressurePlate;
picture = "ACE_Explosives\data\UI\PressurePlate.paa";
picture = QUOTE( PATHTOF(Data\UI\PressurePlate.paa) );
onPlace = "_dist=GetNumber(ConfigFile >> 'CfgMagazines' >> (_this select 2) >> 'ACE_Triggers' >> 'PressurePlate' >> 'digDistance');_ex=_this select 1;_ex setPosATL ((getPosATL _ex) vectorDiff ((VectorUp _ex) vectorCrossProduct [0,0,_dist]));false";
};
class IRSensor {
displayName = $STR_ACE_Explosives_IRSensor;
picture = "ACE_Explosives\data\UI\PressurePlate.paa";
picture = QUOTE( PATHTOF(Data\UI\PressurePlate.paa) );
onPlace = "false";
};
class Timer {
@ -42,7 +42,7 @@ class CfgACE_Triggers {
};
class Tripwire {
displayName = $STR_ACE_Explosives_TripWire;
picture = "ACE_Explosives\data\UI\Tripwire.paa";
picture = QUOTE( PATHTOF(Data\UI\Tripwire.paa) );
onPlace = "false";
};
};

2
addons/explosives/CfgModule.hpp
View File

@ -6,7 +6,7 @@ class ACE_ModuleExplosive: Module_F {
function = QUOTE( FUNC(module) );
scope = 2;
isGlobal = 1;
icon = "\ACE_Explosives\UI\IconExplosives_ca.paa";
icon = QUOTE( PATHTOF(UI\IconExplosives_ca.paa) );
class Arguments {
class RequireSpecialist {
displayName = "Require specialists?";

8
addons/explosives/CfgVehicles.hpp
View File

@ -15,7 +15,7 @@ class CfgVehicles {
exceptions[] = {"ACE_Interaction_isNotSwimming"}; \
showDisabled = 1;
priority = 4;
icon = "ACE_Explosives\UI\Explosives_Menu_ca.paa";
icon = QUOTE( PATHTOF(UI\Explosives_Menu_ca.paa) );
subMenu[] = {"ACE_Explosives", 1};
hotkey = "X";
//Sub-menu items
@ -25,7 +25,7 @@ class CfgVehicles {
statement = QUOTE( [_player] call FUNC(openTransmitterUI); );
exceptions[] = {"ACE_Interaction_isNotSwimming"}; \
showDisabled = 1;
icon = "ACE_Explosives\UI\Explosives_Menu_ca.paa";
icon = QUOTE( PATHTOF(UI\Explosives_Menu_ca.paa) );
priority = 2;
hotkey = "T";
};
@ -35,7 +35,7 @@ class CfgVehicles {
statement = QUOTE( [_player] call FUNC(openPlaceUI); );
exceptions[] = {"ACE_Interaction_isNotSwimming"}; \
showDisabled = 1;
icon = "ACE_Explosives\UI\Place_Explosive_ca.paa";
icon = QUOTE( PATHTOF(UI\Place_Explosive_ca.paa) );
priority = 1;
hotkey = "P";
};
@ -45,7 +45,7 @@ class CfgVehicles {
statement = QUOTE( [_player, EGVAR(Interaction, Target)] call FUNC(startDefuse); );
exceptions[] = {"ACE_Interaction_isNotSwimming"}; \
showDisabled = 0;
icon = "ACE_Explosives\UI\Defuse_ca.paa";
icon = QUOTE( PATHTOF(UI\Defuse_ca.paa) );
priority = 0.8;
hotkey = "F";
};

8
addons/explosives/CfgWeapons.hpp
View File

@ -11,7 +11,7 @@ class CfgWeapons {
scope = 2;
displayName = $STR_ACE_Explosives_clacker_displayName;
descriptionShort = $STR_ACE_Explosives_clacker_description;
picture = "\ACE_Explosives\Data\UI\Clacker.paa";
picture = QUOTE( PATHTOF(Data\UI\Clacker.paa) );
model = "\A3\weapons_F\ammo\mag_univ.p3d";
ACE_Range = 250;
ACE_Detonator = 1;
@ -23,14 +23,14 @@ class CfgWeapons {
};
class ACE_M26_Clacker: ACE_Clacker {
displayName = $STR_ACE_Explosives_M26_displayName;
picture = "\ACE_Explosives\Data\UI\MK26_Transmitter_ca.paa";
picture = QUOTE( PATHTOF(Data\UI\MK26_Transmitter_ca.paa) );
ACE_Range = 5000;
};
class ACE_DefusalKit: ACE_ItemCore {
scope = 2;
displayName = $STR_ACE_Explosives_DefusalKit_displayName;
descriptionShort = $STR_ACE_Explosives_DefusalKit_description;
picture = "\ACE_Explosives\Data\UI\Pliers.paa";
picture = QUOTE( PATHTOF(Data\UI\Pliers.paa) );
model = "\A3\Structures_F\Items\Tools\Pliers_F.p3d";
class ItemInfo: ACE_ExplosiveItem {
@ -42,7 +42,7 @@ class CfgWeapons {
scope = 2;
displayName = $STR_ACE_Explosives_DeadManSwitch_displayName;
descriptionShort = $STR_ACE_Explosives_DeadManSwitch_description;
picture = "\ACE_Explosives\Data\UI\DeadmanSwitch.paa";
picture = QUOTE( PATHTOF(Data\UI\DeadmanSwitch.paa) );
model = "\A3\weapons_F\ammo\mag_univ.p3d";
ACE_Range = 100;
ACE_Detonator = 1;

2
addons/explosives/functions/fnc_addClacker.sqf
View File

@ -19,7 +19,7 @@
Example:
[_unit, _explosive, "SatchelCharge_Remote_Mag", [ConfigFile >> "CfgACE_Triggers" >> "Command"]] call ACE_Explosives_fnc_AddClacker;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_unit", "_explosive", "_clacker", "_config", "_magazineClass", "_requiredItems", "_hasRequired"];
_unit = _this select 0;
_explosive = _this select 1;

2
addons/explosives/functions/fnc_canDefuse.sqf
View File

@ -15,7 +15,7 @@
Example:
[player] call ACE_Explosives_fnc_CanDefuse;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private "_unit";
_unit = _this select 0;
if (vehicle _unit != _unit || {!("ACE_DefusalKit" in (items _unit))}) exitWith {false};

2
addons/explosives/functions/fnc_defuseExplosive.sqf
View File

@ -16,7 +16,7 @@
Example:
[player, ACE_Interaction_Target] call ACE_Explosives_fnc_defuseExplosive;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_unit", "_explosive"];
_unit = _this select 0;
_explosive = _this select 1;

2
addons/explosives/functions/fnc_detonateExplosive.sqf
View File

@ -21,7 +21,7 @@
// Clacker
[player, 100, [Explosive, 1]] call ACE_Explosives_fnc_detonateExplosive;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_item","_result", "_ignoreRange", "_unit", "_range"];
_unit = _this select 0;
_range = _this select 1;

2
addons/explosives/functions/fnc_getDetonators.sqf
View File

@ -16,7 +16,7 @@
Example:
_detonators = [player] call ACE_Explosives_fnc_getDetonators;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_unit", "_items", "_result", "_config"];
_unit = _this select 0;
_items = (items _unit);

2
addons/explosives/functions/fnc_getPlacedExplosives.sqf
View File

@ -17,7 +17,7 @@
_allExplosives = [player] call ACE_Explosives_fnc_getPlacedExplosives;
_deadmanExplosives = [player, "DeadManSwitch"] call ACE_Explosives_fnc_getPlacedExplosives;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_unit", "_clackerList", "_adjustedList", "_list", "_filter"];
_unit = _this select 0;
_filter = nil;

2
addons/explosives/functions/fnc_handleScrollWheel.sqf
View File

@ -16,7 +16,7 @@
Example:
1.2 call ACE_Explosives_fnc_HandleScrollWheel;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_obj"];
if (isNull(GVAR(Setup)) || {ACE_Modifier == 0} || !GVAR(pfeh_running)) exitWith {false};
_this = _this * 5;

2
addons/explosives/functions/fnc_hasExplosives.sqf
View File

@ -15,7 +15,7 @@
Example:
_hasExplosives = [player] call ACE_Explosives_fnc_hasExplosives;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_unit", "_result", "_magazines"];
_result = false;
_unit = _this select 0;

2
addons/explosives/functions/fnc_hasPlacedExplosives.sqf
View File

@ -15,5 +15,5 @@
Example:
_hasPLacedExplosives = [player] call ACE_Explosives_fnc_hasPlacedExplosives;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
(count (_this call FUNC(getPlacedExplosives)) > 0)

2
addons/explosives/functions/fnc_module.sqf
View File

@ -15,7 +15,7 @@
Example:
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
if !(isServer) exitWith {};
_logic = _this select 0;
_activated = _this select 2;

2
addons/explosives/functions/fnc_openDetonateUI.sqf
View File

@ -16,7 +16,7 @@
Example:
[player, "ACE_M26_Clacker"] call ACE_Explosives_fnc_openDetonateUI;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_unit","_result", "_item"];
call EFUNC(Interaction,hideMenu);
_unit = _this select 0;

4
addons/explosives/functions/fnc_openPlaceUI.sqf
View File

@ -15,7 +15,7 @@
Example:
[player] call ACE_Explosives_fnc_openPlaceUI;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_unit","_mags", "_item", "_index", "_actions"];
_unit = _this select 0;
call FUNC(place_Cancel);
@ -53,7 +53,7 @@ _actions = [localize "STR_ACE_Explosives_PlaceMenu", localize "STR_ACE_Explosive
},
{
call EFUNC(Interaction,hideMenu);
if !(profileNamespace getVariable ["ACE_Interaction_AutoCloseMenu", false]) then {
if !(profileNamespace getVariable [QUOTE( EGVAR(Interaction, AutoCloseMenu) ), false]) then {
"ACE_Explosives" call EFUNC(Interaction,openMenuSelf);
};
}

2
addons/explosives/functions/fnc_openTimerSetUI.sqf
View File

@ -15,7 +15,7 @@
Example:
[player] call ACE_Explosives_fnc_openTimerSetUI;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_mag"];
_mag = _this select 0;
createDialog "RscACE_SelectTimeUI";

4
addons/explosives/functions/fnc_openTransmitterUI.sqf
View File

@ -15,7 +15,7 @@
Example:
[player] call ACE_Explosives_fnc_openTransmitterUI;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_items", "_unit", "_count", "_actions", "_config"];
_unit = _this select 0;
_items = (items _unit);
@ -45,7 +45,7 @@ if (count _detonators == 0) then {
},
{
call EFUNC(Interaction,hideMenu);
if !(profileNamespace getVariable ["ACE_Interaction_AutoCloseMenu", false]) then {
if !(profileNamespace getVariable [QUOTE( EGVAR(Interaction, AutoCloseMenu) ), false]) then {
"ACE_Explosives" call EFUNC(Interaction,openMenuSelf);
};
}

2
addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
View File

@ -15,7 +15,7 @@
Example:
[lbData [8866, lbCurSel 8866]] call ACE_Explosives_fnc_openTriggerSelectionUI;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_magazine", "_hasRequiredItems","_triggerTypes", "_actions", "_detonators", "_required", "_magTriggers"];
_magazine = _this select 0;
_detonators = [ACE_player] call FUNC(getDetonators);

2
addons/explosives/functions/fnc_placeExplosive.sqf
View File

@ -21,7 +21,7 @@
Example:
_explosive = [player, player modelToWorld [0,0.5, 0.1], 134, "SatchelCharge_Remote_Mag", "Command", []] call ACE_Explosives_fnc_PlaceExplosive;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_pos", "_dir", "_magazineClass", "_ammo", "_triggerSpecificVars", "_unit", "_triggerConfig", "_explosive"];
_unit = _this select 0;
_pos = _this select 1;

2
addons/explosives/functions/fnc_place_Approve.sqf
View File

@ -16,7 +16,7 @@
Example:
call ACE_Explosives_fnc_Place_Approve;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
if (GVAR(pfeh_running)) then {
[QGVAR(Placement),"OnEachFrame"] call BIS_fnc_removeStackedEventHandler;
GVAR(pfeh_running) = false;

2
addons/explosives/functions/fnc_place_Cancel.sqf
View File

@ -16,7 +16,7 @@
Example:
call ACE_Explosives_fnc_Place_Cancel;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
if (GVAR(pfeh_running)) then {
[QGVAR(Placement),"OnEachFrame"] call BIS_fnc_removeStackedEventHandler;
GVAR(pfeh_running) = false;

2
addons/explosives/functions/fnc_selectTrigger.sqf
View File

@ -16,7 +16,7 @@
Example:
["SatchelCharge_Remote_Mag","Timer"] call ACE_Explosives_fnc_selectTrigger;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_magazine","_trigger"];
closeDialog 0;
_magazine = _this select 0;

2
addons/explosives/functions/fnc_setPosition.sqf
View File

@ -18,7 +18,7 @@
Example:
[_explosive, 150, 90] call ACE_Explosives_fnc_SetPos;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private "_ex";
_ex=_this select 0;
_ex setDir (_this select 1);

2
addons/explosives/functions/fnc_setupExplosive.sqf
View File

@ -19,7 +19,7 @@
Example:
[player, "SatchelCharge_Remote_Mag", "Command"] call ACE_Explosives_fnc_SetupExplosive;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_unit", "_class", "_config", "_timer"];
_unit = _this select 0;
_class = _this select 1;

2
addons/explosives/functions/fnc_startDefuse.sqf
View File

@ -16,7 +16,7 @@
Example:
[player, ACE_Interaction_Target] call ACE_Explosives_fnc_StartDefuse;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private ["_unit","_target"];
_unit = _this select 0;
_target = _this select 1;

2
addons/explosives/functions/fnc_startTimer.sqf
View File

@ -17,7 +17,7 @@
Example:
[_explosive, 10] call ACE_Explosives_fnc_startTimer;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
_this spawn { // TODO: use scheduled delay execution
private ["_explosive", "_timer"];
_explosive = _this select 0;

2
addons/explosives/functions/fnc_triggerType.sqf
View File

@ -16,7 +16,7 @@
Example:
_supports = ["SatchelCharge_Remote_Mag"] call ACE_Explosives_fnc_TriggerType;
*/
#include "script_component.hpp"
#include "\z\ace\explosives\script_component.hpp"
private "_result";
_result = [];
_config = getArray (ConfigFile >> "CfgMagazines" >> (_this select 0) >> "ACE_Triggers" >> "SupportedTriggers");