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

Laser - Revert default code to 1111 (#9588)

Browse Source
This commit is contained in:
BroBeans 2023-11-07 04:16:03 +08:00 committed by GitHub
parent 163d750a0d
commit 4fb9da7b08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/laser/XEH_preInit.sqf
View File

@ -7,8 +7,8 @@ PREP_RECOMPILE_START;
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
// Laser default variables // Laser default variables
ACE_DEFAULT_LASER_CODE = 1688; ACE_DEFAULT_LASER_CODE = 1111;
ACE_DEFAULT_LASER_WAVELENGTH = 1064; ACE_DEFAULT_LASER_WAVELENGTH = 1550;
ACE_DEFAULT_LASER_BEAMSPREAD = 1; ACE_DEFAULT_LASER_BEAMSPREAD = 1;
GVAR(laserEmitters) = createHashMap; GVAR(laserEmitters) = createHashMap;

2
addons/laser/functions/fnc_dev_drawVisibleLaserTargets.sqf
View File

@ -38,7 +38,7 @@ private _testSeekerDir = vectorDirVisual _seekerVehicle;
drawLine3D [ASLtoAGL _testSeekerPosASL, ASLtoAGL _resultPos, [0,0,1,1]]; drawLine3D [ASLtoAGL _testSeekerPosASL, ASLtoAGL _resultPos, [0,0,1,1]];
drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\select_target_ca.paa", [0,0,1,1], (ASLtoAGL _resultPos), 1.5, 1.5, 45, format ["%1 from %2", _code, _results select 1], 0.5, 0.025, "TahomaB"]; drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\select_target_ca.paa", [0,0,1,1], (ASLtoAGL _resultPos), 1.5, 1.5, 45, format ["%1 from %2", _code, _results select 1], 0.5, 0.025, "TahomaB"];
}; };
} forEach [1111, ACE_DEFAULT_LASER_CODE]; // Scan at codes 1111 and 1688 } forEach [ACE_DEFAULT_LASER_CODE, 1688]; // Scan at codes 1111 and 1688
// Draw all lasers // Draw all lasers

6
addons/laser/functions/fnc_laserOn.sqf
View File

@ -7,7 +7,7 @@
* 0: Emitter <OBJECT> * 0: Emitter <OBJECT>
* 1: Owner <OBJECT> * 1: Owner <OBJECT>
* 2: Method, can be code, which emitter and owner are passed to, a string function name, an array with a position memory point and weapon name, or an array with a position memory point, a vector begining memory point, and vector ending memory point. <STRING><CODE><ARRAY> * 2: Method, can be code, which emitter and owner are passed to, a string function name, an array with a position memory point and weapon name, or an array with a position memory point, a vector begining memory point, and vector ending memory point. <STRING><CODE><ARRAY>
* 3: Wavelength (1064nm is typical) <NUMBER> * 3: Wavelength (1550nm is typical) <NUMBER>
* 4: Laser code <NUMBER> * 4: Laser code <NUMBER>
* 5: Beam divergence (in mils off beam center) <NUMBER> * 5: Beam divergence (in mils off beam center) <NUMBER>
* 6: Method Args <ANY> (default: nil) * 6: Method Args <ANY> (default: nil)
@ -16,8 +16,8 @@
* UUID for sending to laserOff function <STRING> * UUID for sending to laserOff function <STRING>
* *
* Example: * Example:
* [hmg, hmg, [[0,0,1], "HMG_static"], 1064, 1688, 1] call ace_laser_fnc_laserOn * [hmg, hmg, [[0,0,1], "HMG_static"], 1550, 1111, 1] call ace_laser_fnc_laserOn
* [player, player, "ace_laser_fnc_findLaserSource", 1064, 1688, 1, ["pilot"]] call ace_laser_fnc_laserOn * [player, player, "ace_laser_fnc_findLaserSource", 1550, 1111, 1, ["pilot"]] call ace_laser_fnc_laserOn
* *
* Public: No * Public: No
*/ */

4
addons/laser/functions/fnc_seekerFindLaserSpot.sqf
View File

@ -9,7 +9,7 @@
* 1: Direction vector (will be normalized) <ARRAY> * 1: Direction vector (will be normalized) <ARRAY>
* 2: Seeker FOV in degrees <NUMBER> * 2: Seeker FOV in degrees <NUMBER>
* 3: Seeker max distance in meters <NUMBER> * 3: Seeker max distance in meters <NUMBER>
* 4: Seeker wavelength sensitivity range, [1064,1064] is common <ARRAY> * 4: Seeker wavelength sensitivity range, [1550,1550] is common <ARRAY>
* 5: Seeker laser code. <NUMBER> * 5: Seeker laser code. <NUMBER>
* 6: Ignore 1 (e.g. Player's vehicle) <OBJECT> (default: objNull) * 6: Ignore 1 (e.g. Player's vehicle) <OBJECT> (default: objNull)
* 7: Ignore 2 (e.g. Attached object) <OBJECT> (default: objNull) * 7: Ignore 2 (e.g. Attached object) <OBJECT> (default: objNull)
@ -19,7 +19,7 @@
* [Strongest compatible laser spot ASL pos, owner object] Nil array values if nothing found <ARRAY> * [Strongest compatible laser spot ASL pos, owner object] Nil array values if nothing found <ARRAY>
* *
* Example: * Example:
* [getPosASL player, [0,1,0], 90, [1064, 1064], 1688, player] call ace_laser_fnc_seekerFindLaserSpot * [getPosASL player, [0,1,0], 90, [1550, 1550], 1111, player] call ace_laser_fnc_seekerFindLaserSpot
* *
* Public: No * Public: No
*/ */