W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-25 01:49:19 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update and fix fill quiver in relattion to combine magazines

Browse Source 
Made by @Victor-the-Cleaner
This commit is contained in:
A Man
2022-06-02 09:42:35 +02:00
parent a0ab11fa41
commit 4d377f7e4e
3 changed files with 89 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
SQF/dayz_code/actions/player_fillQuiver.sqf
View File

@@ -1,24 +1,48 @@
private ["_qty_arrows","_qty_quivers","_control","_qty_quiverarrows","_qty_quiverfreeslots","_qty_arrows2add"];
disableSerialization;
call gear_ui_init;
_qty_arrows = {_x == "1Rnd_Arrow_Wood"} count magazines player;
_qty_quivers = {_x == "12Rnd_Quiver_Wood"} count magazines player;
local _quiver = "12Rnd_Quiver_Wood"; // quiver class
local _arrow = "1Rnd_Arrow_Wood"; // arrow class
local _arrows = {_x == _arrow} count magazines player; // qty of single arrows
local _control = uiNamespace getVariable 'uiControl'; // get item slot
local _qtyArrows = gearSlotAmmoCount _control; // ammo count of selected quiver
local _qtyFreeSlots = 12 - _qtyArrows; // ammo count remaining
_control = uiNamespace getVariable 'uiControl';
_qty_quiverarrows = gearSlotAmmoCount _control;
_qty_quiverfreeslots = 12-_qty_quiverarrows;
//if (_qty_quivers > 1) exitWith { localize "str_quiver_reachlimit" call dayz_rollingMessages;};
if (_qty_quiverfreeslots > 0) then {
_qty_arrows2add = _qty_quiverfreeslots min _qty_arrows;
player removeMagazine "12Rnd_Quiver_Wood";
for "_x" from 1 to _qty_arrows2add do {
player removeMagazine "1Rnd_Arrow_Wood";
if (_qtyFreeSlots > 0) then { // quiver is not full
if (_arrows == 0) exitWith { // player has no single arrows
localize "str_quiver_notenougharrows" call dayz_rollingMessages; // You do not have enough arrows.
};
player addMagazine ["12Rnd_Quiver_Wood",_qty_quiverarrows+_qty_arrows2add];
format[localize "str_quiver_addarrows",_qty_arrows2add] call dayz_rollingMessages;
local _qty_arrows2add = _qtyFreeSlots min _arrows; // max qty of arrows that can be added
local _dialog = findDisplay 106; // gear panel
local _qArray = []; // quiver ammo count array
for "_i" from 109 to 120 do { // loop through all primary magazine slots
local _control = _dialog displayCtrl _i; // get magazine slot
local _mag = gearSlotData _control; // get magazine name
if (_mag == _quiver) then {
_qArray set [count _qArray, gearSlotAmmoCount _control]; // record ammo count of all quivers
};
};
{
if (_x == _qtyArrows) exitWith {
_qArray set [_forEachIndex, _qtyArrows + _qty_arrows2add]; // top up ammo count for the appropriate quiver
};
} forEach _qArray;
player removeMagazines _quiver; // remove all quivers
for "_x" from 1 to _qty_arrows2add do {
player removeMagazine _arrow; // clear out single arrows
};
{
player addMagazine [_quiver, _x]; // recreate all quivers
} forEach _qArray;
reload player;
format [localize "str_quiver_addarrows", _qty_arrows2add] call dayz_rollingMessages; // You have added %1 arrows to the quiver.
} else {
localize "str_quiver_full" call dayz_rollingMessages;
localize "str_quiver_full" call dayz_rollingMessages; // The quiver is full.
};