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 branch 'master' of https://github.com/KoffeinFlummi/ACE3

Browse Source
This commit is contained in:
ulteq 2015-05-01 10:26:48 +02:00
commit d3b36c2b56
8 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/goggles/XEH_postInit.sqf
View File

@ -17,7 +17,7 @@
#include "script_component.hpp"
if (!hasInterface) exitWith {};
["ACE3", QGVAR(wipeGlasses), localize "STR_ACE_Goggles_WipeGlasses",
["ACE3 Common", QGVAR(wipeGlasses), localize "STR_ACE_Goggles_WipeGlasses",
{
if (!(GETVAR(ace_player,ACE_isUnconscious,false))) exitWith {
call FUNC(clearGlasses);

4
addons/interact_menu/XEH_clientInit.sqf
View File

@ -28,7 +28,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)];
};
["ACE3", QGVAR(InteractKey), (localize "STR_ACE_Interact_Menu_InteractKey"),
["ACE3 Common", QGVAR(InteractKey), (localize "STR_ACE_Interact_Menu_InteractKey"),
{
// Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false};
@ -37,7 +37,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)];
},{[0,false] call FUNC(keyUp)},
[219, [false, false, false]], false] call cba_fnc_addKeybind; //Left Windows Key
["ACE3", QGVAR(SelfInteractKey), (localize "STR_ACE_Interact_Menu_SelfInteractKey"),
["ACE3 Common", QGVAR(SelfInteractKey), (localize "STR_ACE_Interact_Menu_SelfInteractKey"),
{
// Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false};

6
addons/interaction/XEH_postInit.sqf
View File

@ -22,7 +22,7 @@ GVAR(isOpeningDoor) = false;
// Add keybinds
["ACE3", QGVAR(openDoor), localize "STR_ACE_Interaction_OpenDoor",
["ACE3 Common", QGVAR(openDoor), localize "STR_ACE_Interaction_OpenDoor",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -42,7 +42,7 @@ GVAR(isOpeningDoor) = false;
[57, [false, true, false]], false] call cba_fnc_addKeybind; //Key CTRL+Space
["ACE3", QGVAR(tapShoulder), localize "STR_ACE_Interaction_TapShoulder",
["ACE3 Common", QGVAR(tapShoulder), localize "STR_ACE_Interaction_TapShoulder",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
@ -56,7 +56,7 @@ GVAR(isOpeningDoor) = false;
{false},
[20, [true, false, false]], false] call cba_fnc_addKeybind;
["ACE3", QGVAR(modifierKey), localize "STR_ACE_Interaction_ModifierKey",
["ACE3 Common", QGVAR(modifierKey), localize "STR_ACE_Interaction_ModifierKey",
{
// Conditions: canInteract
//if !([ACE_player, objNull, ["isNotDragging"]] call EFUNC(common,canInteractWith)) exitWith {false}; // not needed

4
addons/laserpointer/CfgWeapons.hpp
View File

@ -20,6 +20,8 @@ class CfgWeapons {
ACE_nextModeClass = "acc_pointer_IR";
ACE_modeDescription = "$STR_ACE_Laserpointer_Laser";
ACE_laserpointer = 1;
author = "$STR_ACE_Common_ACETeam";
_generalMacro = "ACE_acc_pointer_red";
scope = 1;
@ -79,6 +81,8 @@ class CfgWeapons {
ACE_nextModeClass = "ACE_acc_pointer_green_IR";
ACE_modeDescription = "$STR_ACE_Laserpointer_Laser";
ACE_laserpointer = 2;
author = "$STR_ACE_Common_ACETeam";
_generalMacro = "ACE_acc_pointer_green";
scope = 2;

13
addons/laserpointer/functions/fnc_onDraw.sqf
View File

@ -25,10 +25,17 @@ _isIR = _isIR == 1;
default {""};
};
_laserID = ["ACE_acc_pointer_red", "ACE_acc_pointer_green"] find _laser;
if (_laser != "") then {
_cacheName = format [QGVAR(laser_%1), _laser];
_laserID = missionNamespace getVariable [_cacheName, -1];
if (missionNamespace getVariable [_cacheName, -1] == -1) then {
_laserID = getNumber (configFile >> "CfgWeapons" >> _laser >> "ACE_laserpointer");
missionNamespace setVariable [_cacheName, _laserID];
};
if (_laserID > -1 && {_x isFlashlightOn _weapon}) then {
[_x, 50, _laserID == 1 || _isIR] call FUNC(drawLaserpoint);
if (_laserID > 0 && {_x isFlashlightOn _weapon}) then {
[_x, 50, _laserID == 2 || _isIR] call FUNC(drawLaserpoint);
};
};
} forEach GVAR(nearUnits);

2
addons/nametags/XEH_postInit.sqf
View File

@ -8,7 +8,7 @@ if (!hasInterface) exitWith {};
GVAR(ShowNamesTime) = -10;
// Add keybinds
["ACE3", QGVAR(showNameTags), localize "STR_ACE_NameTags_ShowNames",
["ACE3 Common", QGVAR(showNameTags), localize "STR_ACE_NameTags_ShowNames",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

2
addons/weather/XEH_postInit.sqf
View File

@ -25,7 +25,7 @@ GVAR(rain_period_start_time) = time;
};
};
["ACE3", QGVAR(WindInfoKey), localize "STR_ACE_Weather_WindInfoKey",
["ACE3 Common", QGVAR(WindInfoKey), localize "STR_ACE_Weather_WindInfoKey",
{
// Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

3
documentation/development/ace3-config-entries.md
View File

@ -54,6 +54,9 @@ ace_detonator
ace_barrelTwist
ace_twistDirection
ace_barrelLength
ace_laserpointer
ace_nextmodeclass
ace_modedescription
```