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

Add day (non night vision) version of the vector 21

Browse Source
This commit is contained in:
PabstMirror 2016-04-17 23:22:41 -05:00
parent f8fb75247d
commit 23632281cf
7 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/advanced_ballistics/functions/fnc_handleFired.sqf
View File

@ -88,7 +88,7 @@ if (GVAR(ammoTemperatureEnabled) || GVAR(barrelLengthInfluenceEnabled)) then {
_bulletTraceVisible = false; _bulletTraceVisible = false;
if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then {
if (currentWeapon ACE_player in ["ACE_Vector", "Binocular", "Rangefinder", "Laserdesignator"]) then { if (currentWeapon ACE_player in ["ACE_Vector", "ACE_VectorDay", "Binocular", "Rangefinder", "Laserdesignator"]) then {
_bulletTraceVisible = true; _bulletTraceVisible = true;
} else { } else {
if (currentWeapon ACE_player == primaryWeapon ACE_player && count primaryWeaponItems ACE_player > 2) then { if (currentWeapon ACE_player == primaryWeapon ACE_player && count primaryWeaponItems ACE_player > 2) then {

2
addons/dagr/functions/fnc_menuInit.sqf
View File

@ -522,7 +522,7 @@ GVAR(menuRun) = true;
(__dsp displayCtrl __mainText) ctrlSetText "Connecting..."; (__dsp displayCtrl __mainText) ctrlSetText "Connecting...";
}; };
if (ACE_time - GVAR(busyTimer) > 0.6) then { if (ACE_time - GVAR(busyTimer) > 0.6) then {
if (ACE_player hasWeapon "ACE_Vector") then { if ((ACE_player hasWeapon "ACE_Vector") || {ACE_player hasWeapon "ACE_VectorDay"}) then {
GVAR(displaySelection) = "VECTOR"; GVAR(displaySelection) = "VECTOR";
(__dsp displayCtrl __mainText) ctrlSetText "Vector Connected"; (__dsp displayCtrl __mainText) ctrlSetText "Vector Connected";
GVAR(vectorConnected) = true; GVAR(vectorConnected) = true;

5
addons/vector/CfgWeapons.hpp
View File

@ -13,4 +13,9 @@ class CfgWeapons {
opticsZoomMin = 0.06621; opticsZoomMin = 0.06621;
weaponInfoType = "ACE_RscOptics_vector"; weaponInfoType = "ACE_RscOptics_vector";
}; };
class ACE_VectorDay: ACE_Vector {
author = ECSTRING(common,ACETeam);
displayName = CSTRING(VectorDayName);
visionMode[] = {"Normal"};
};
}; };

2
addons/vector/config.cpp
View File

@ -3,7 +3,7 @@
class CfgPatches { class CfgPatches {
class ADDON { class ADDON {
units[] = {"ACE_Item_Vector"}; units[] = {"ACE_Item_Vector"};
weapons[] = {"ACE_Vector"}; weapons[] = {"ACE_Vector", "ACE_VectorDay"};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"}; requiredAddons[] = {"ace_common"};
author[] = {"Ghost","Hamburger SV","commy2","bux578"}; author[] = {"Ghost","Hamburger SV","commy2","bux578"};

2
addons/vector/functions/fnc_onKeyHold.sqf
View File

@ -7,7 +7,7 @@ PFH executed while holding a vector key down.
*/ */
#include "script_component.hpp" #include "script_component.hpp"
if (currentWeapon ACE_player != "ACE_Vector") exitWith { if (!(currentWeapon ACE_player in ["ACE_Vector", "ACE_VectorDay"])) exitWith {
[_this select 1] call CBA_fnc_removePerFrameHandler; [_this select 1] call CBA_fnc_removePerFrameHandler;
GVAR(currentMode) = ""; GVAR(currentMode) = "";

4
addons/vector/initKeybinds.sqf
View File

@ -5,7 +5,7 @@
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(currentWeapon ACE_player == "ACE_Vector" && {cameraView == "GUNNER"}) exitWith {false}; if !((currentWeapon ACE_player in ["ACE_Vector", "ACE_VectorDay"]) && {cameraView == "GUNNER"}) exitWith {false};
// prevent holding down // prevent holding down
if (GETGVAR(isDownStateKey1,false)) exitWith {false}; if (GETGVAR(isDownStateKey1,false)) exitWith {false};
@ -34,7 +34,7 @@
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(currentWeapon ACE_player == "ACE_Vector" && {cameraView == "GUNNER"}) exitWith {false}; if !((currentWeapon ACE_player in ["ACE_Vector", "ACE_VectorDay"]) && {cameraView == "GUNNER"}) exitWith {false};
// prevent holding down // prevent holding down
if (GETGVAR(isDownStateKey2,false)) exitWith {false}; if (GETGVAR(isDownStateKey2,false)) exitWith {false};

12
addons/vector/stringtable.xml
View File

@ -2,6 +2,18 @@
<Project name="ACE"> <Project name="ACE">
<Package name="Vector"> <Package name="Vector">
<Key ID="STR_ACE_Vector_VectorName"> <Key ID="STR_ACE_Vector_VectorName">
<English>Vector 21 Nite</English>
<German>Vector 21 Nite</German>
<Spanish>Vector 21 Nite</Spanish>
<French>Vector 21 Nite</French>
<Polish>Vector 21 Nite</Polish>
<Czech>Vector 21 Nite</Czech>
<Italian>Vector 21 Nite</Italian>
<Hungarian>Vector 21 Nite</Hungarian>
<Portuguese>Vector 21 Nite</Portuguese>
<Russian>Vector 21 Nite</Russian>
</Key>
<Key ID="STR_ACE_Vector_VectorDayName">
<English>Vector 21</English> <English>Vector 21</English>
<German>Vector 21</German> <German>Vector 21</German>
<Spanish>Vector 21</Spanish> <Spanish>Vector 21</Spanish>