-
Notifications
You must be signed in to change notification settings - Fork 148
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add CBA_fnc_binocularMagazine #325
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
21f328f
add CBA_fnc_binocularMagazine
commy2 dfad3c4
add CBA_fnc_removeBinocularMagazine
commy2 6f82117
add CBA_fnc_addBinocularMagazine
commy2 e0a72b4
add note/warning about magazine IDs
commy2 7ad1e38
simplify
commy2 c67b52c
add empty line to function header for function description expport sc…
commy2 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* ---------------------------------------------------------------------------- | ||
Function: CBA_fnc_addBinocularMagazine | ||
|
||
Description: | ||
Adds a magazine to the units rangefinder. | ||
|
||
Note that this breaks the unique magazine ids due to the usage of setUnitLoadout. | ||
|
||
Parameters: | ||
_unit - A unit <OBJECT> | ||
_magazine - The magazine to add <STRING> | ||
_ammo - Ammo count of the magazine (optional, default: full magazine) <NUMBER> | ||
|
||
Returns: | ||
None | ||
|
||
Examples: | ||
(begin example) | ||
player addWeapon "Laserdesignator"; | ||
[player, "Laserbatteries"] call CBA_fnc_addBinocularMagazine; | ||
(end) | ||
|
||
Author: | ||
commy2 | ||
---------------------------------------------------------------------------- */ | ||
#include "script_component.hpp" | ||
SCRIPT(addBinocularMagazine); | ||
|
||
params [["_unit", objNull, [objNull]], ["_magazine", "", [""]], ["_ammo", nil, [0]]]; | ||
|
||
if (!local _unit) exitWith {}; | ||
|
||
if (isNil "_ammo") then { | ||
_ammo = getNumber (configFile >> "CfgMagazines" >> _magazine >> "count"); | ||
}; | ||
|
||
private _loadout = getUnitLoadout _unit; | ||
(_loadout select 8) set [4, [_magazine, _ammo]]; | ||
|
||
_unit setUnitLoadout _loadout; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* ---------------------------------------------------------------------------- | ||
Function: CBA_fnc_binocularMagazine | ||
|
||
Description: | ||
Returns the magazine of the units rangefinder. | ||
|
||
Parameters: | ||
_unit - A unit <OBJECT> | ||
|
||
Returns: | ||
Magazine of the units binocular <STRING> | ||
|
||
Examples: | ||
(begin example) | ||
player call CBA_fnc_binocularMagazine | ||
(end) | ||
|
||
Author: | ||
commy2 | ||
---------------------------------------------------------------------------- */ | ||
#include "script_component.hpp" | ||
SCRIPT(binocularMagazine); | ||
|
||
params [["_unit", objNull, [objNull]]]; | ||
|
||
private _binocular = binocular _unit; | ||
private _magazine = ""; | ||
|
||
{ | ||
if ((_x select 0) isEqualTo _binocular) exitWith { | ||
// note: if there is no magazine, _x(4,0) will be nil | ||
_magazine = (_x select 4) param [0, ""]; | ||
}; | ||
} forEach weaponsitems _unit; | ||
|
||
_magazine |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* ---------------------------------------------------------------------------- | ||
Function: CBA_fnc_removeBinocularMagazine | ||
|
||
Description: | ||
Removes the magazine of the units rangefinder. | ||
|
||
Parameters: | ||
_unit - A unit <OBJECT> | ||
|
||
Returns: | ||
None | ||
|
||
Examples: | ||
(begin example) | ||
player call CBA_fnc_removeBinocularMagazine | ||
(end) | ||
|
||
Author: | ||
commy2 | ||
---------------------------------------------------------------------------- */ | ||
#include "script_component.hpp" | ||
SCRIPT(removeBinocularMagazine); | ||
|
||
params [["_unit", objNull, [objNull]]]; | ||
|
||
if (!local _unit) exitWith {}; | ||
|
||
private _binocular = binocular _unit; | ||
private _selectBinocular = currentWeapon _unit isEqualTo _binocular; | ||
|
||
_unit addWeapon _binocular; | ||
|
||
if (_selectBinocular) then { | ||
_unit selectWeapon _binocular; | ||
}; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add an empty line after the first sentence. The first sentence can(*) then be used to generate a
description
field for CfgFunctions entries.(*) The old Ruby script that does this needs updating, but with the Description: paragraph in this form, automation is possible.