W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-24 17:39:18 +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

91
SQF/dayz_code/actions/player_combineMags.sqf
View File

@@ -1,84 +1,87 @@
if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; };
dayz_actionInProgress = true;
private ["_config","_create","_name","_create_magsize","_type","_magCount","_slotstart","_slotend","_dialog","_qty_total_ammo","_control","_mag","_qtynew_create_mags_full","_qtynew_create_ammo_rest","_magFull","_magFullSingular","_magAmmunition","_i"];
disableSerialization;
call gear_ui_init;
closeDialog 0;
_create = _this;
local _create = _this;
if (!(_create in magazines player)) exitWith {dayz_actionInProgress = false;};
if !(_create in magazines player) exitWith {dayz_actionInProgress = false;};
player playActionNow "PutDown";
//player playActionNow "PutDown";
_config = configFile >> "CfgMagazines" >> _create;
_create_magsize = getNumber(_config >> "count");
_type = getNumber(_config >> "type");
_name = getText(_config >> "displayName");
_magCount = {_x == _create} count magazines player;
local _config = configFile >> "CfgMagazines" >> _create;
local _magSize = getNumber(_config >> "count");
local _type = getNumber(_config >> "type");
local _name = getText(_config >> "displayName");
local _magCount = {_x == _create} count magazines player;
if (_magCount == 1) exitWith {
[format[localize "str_cannotCombine", _name],1] call dayz_rollingMessages;
[format [localize "str_cannotCombine", _name], 1] call dayz_rollingMessages;
dayz_actionInProgress = false;
};
//primary/secondary mags?
_slotstart = 0;
_slotend = 0;
if ((_type == 256) || {_type == 256*2}) then {
_slotstart = 109;
_slotend = 120;
};
if (_type == 16) then {
_slotstart = 122;
_slotend = 129;
//primary/secondary mags
local _slotStart = 0;
local _slotEnd = 0;
call {
if ((_type == 256) || {_type == 512}) exitWith {
_slotStart = 109;
_slotEnd = 120;
};
if (_type == 16) exitWith {
_slotStart = 122;
_slotEnd = 129;
};
};
_dialog = findDisplay 106;
local _dialog = findDisplay 106;
local _qty_total_ammo = 0;
for "_i" from _slotStart to _slotEnd do {
local _control = _dialog displayCtrl _i;
local _mag = gearSlotData _control;
_qty_total_ammo = 0;
for "_i" from _slotstart to _slotend do {
_control = _dialog displayCtrl _i;
_mag = gearSlotData _control;
if (_mag == _create) then {
_qty_total_ammo = _qty_total_ammo + gearSlotAmmoCount _control;
};
};
_qtynew_create_mags_full = 0;
_qtynew_create_ammo_rest = 0;
_qtynew_create_mags_full = floor(_qty_total_ammo/_create_magsize);
_qtynew_create_ammo_rest = _qty_total_ammo - (_qtynew_create_mags_full*_create_magsize);
local _qtynew_create_mags_full = floor (_qty_total_ammo / _magSize);
local _qtynew_create_ammo_rest = _qty_total_ammo - (_qtynew_create_mags_full * _magSize);
player removeMagazines _create;
for "_i" from 1 to _qtynew_create_mags_full do {
player addMagazine _create;
};
if (_qtynew_create_ammo_rest != 0) then {
player addMagazine [_create,_qtynew_create_ammo_rest];
player addMagazine [_create, _qtynew_create_ammo_rest];
};
local _magFull = localize "str_combineMagazines";
local _magFullSingular = localize "str_combineMagazine";
local _magAmmunition = localize "str_combineBullets";
// Check if quiver
if(_create == "Quiver") then {
_magFull = localize "str_combineQuivers";
_magFullSingular = localize "str_combineQuiver";
_magAmmunition = localize "str_combineArrows";
} else {
_magFull = localize "str_combineMagazines";
_magFullSingular = localize "str_combineMagazine";
_magAmmunition = localize "str_combineBullets";
if (_create == "Quiver") then {
_magFull = localize "str_combineQuivers";
_magFullSingular = localize "str_combineQuiver";
_magAmmunition = localize "str_combineArrows";
};
call {
if (_qtynew_create_ammo_rest == 0) exitwith {
format[localize "str_combineDoneFull",_magCount, _name, _qtynew_create_mags_full,_magFull] call dayz_rollingMessages;
};
if (_qtynew_create_mags_full == 0) exitwith {
[format[localize "str_combineDonePartialOne",_magCount, _name, _qtynew_create_ammo_rest,_magAmmunition],1] call dayz_rollingMessages;
if (_qtynew_create_ammo_rest == 0) exitWith {
format[localize "str_combineDoneFull", _magCount, _name, _qtynew_create_mags_full, _magFull] call dayz_rollingMessages;
};
[format[localize "str_combineDonePartial",_magCount, _name, _qtynew_create_mags_full, _qtynew_create_ammo_rest,_magAmmunition,_magFullSingular,_magFull],1] call dayz_rollingMessages;
if (_qtynew_create_mags_full == 0) exitWith {
[format[localize "str_combineDonePartialOne", _magCount, _name, _qtynew_create_ammo_rest, _magAmmunition], 1] call dayz_rollingMessages;
};
[format[localize "str_combineDonePartial", _magCount, _name, _qtynew_create_mags_full, _qtynew_create_ammo_rest, _magAmmunition, _magFullSingular, _magFull], 1] call dayz_rollingMessages;
};
reload player;
uiSleep 1;
dayz_actionInProgress = false;

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.
};