Skip to content
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.

Sign up for GitHub

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

Magazine Repack - Add idle animation when a player starts repacking magazines #8825

Merged
merged 5 commits into from
Mar 7, 2022
Merged

Magazine Repack - Add idle animation when a player starts repacking magazines #8825

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98704e2
Added Gear gesture animation when a player starts repacking magazines
JonBons Feb 19, 2022
10611fa
Added Repack Animation ACE Setting for allow for disabling of idle an…
JonBons Feb 19, 2022
ca741ee
Corrected Polish translation for setting name
JonBons Feb 19, 2022
6e1dfd8
Corrected German translation for setting name
JonBons Feb 19, 2022
e3bf441
Removed French translation until someone can provide one
JonBons Feb 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions addons/magazinerepack/functions/fnc_startRepackingMagazine.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ if (count _startingAmmoCounts < 2) exitWith {ERROR("Not Enough Mags to Repack");
private _simEvents = [_fullMagazineCount, _startingAmmoCounts, _isBelt] call FUNC(simulateRepackEvents);
private _totalTime = _simEvents select (count _simEvents - 1) select 0;

if (GVAR(repackAnimation)) then {
[_player, "Gear"] call EFUNC(common,doGesture);
};

[
_totalTime,
[_magazineClassname, _startingAmmoCounts, _simEvents],
Expand Down
8 changes: 8 additions & 0 deletions addons/magazinerepack/initSettings.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,11 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)];
true,
0
] call CBA_fnc_addSetting;

[
QGVAR(repackAnimation), "CHECKBOX",
LSTRING(repackAnimation),
_category,
true,
0
] call CBA_fnc_addSetting;
6 changes: 6 additions & 0 deletions addons/magazinerepack/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,5 +186,11 @@
<Chinesesimp>重新整理弹匣，武器未上膛</Chinesesimp>
<Korean>탄창 다시 채우는 중, 무기에서 탄창 뺌</Korean>
</Key>
<Key ID="STR_ACE_MagazineRepack_repackAnimation">
<English>Repack Animation</English>
<French>Remplir l'animation</French>
<German>Animation umpacken</German>
JonBons marked this conversation as resolved.
Show resolved Hide resolved
<Polish>Animacja przepakowywania</Polish>
</Key>
</Package>
</Project>