From 91669fae74a16d55f958f8816dbc05888302f400 Mon Sep 17 00:00:00 2001
From: oiad <oiad@skeleton.net.nz>
Date: Tue, 26 Dec 2017 11:58:36 +1300
Subject: [PATCH] Fix Overwatch G3 glitch for combining

Fix
https://github.com/EpochModTeam/DayZ-Epoch/issues/1995#issuecomment-348188066
---
 SQF/dayz_code/actions/player_reloadMags.sqf | 3 ++-
 SQF/dayz_code/init/variables.sqf            | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/SQF/dayz_code/actions/player_reloadMags.sqf b/SQF/dayz_code/actions/player_reloadMags.sqf
index 2b6eca255..a9ab3f7f0 100644
--- a/SQF/dayz_code/actions/player_reloadMags.sqf
+++ b/SQF/dayz_code/actions/player_reloadMags.sqf
@@ -17,7 +17,8 @@ if (!(_item in magazines player)) exitWith {dayz_actionInProgress = false;};
 _config = configFile >> "CfgMagazines" >> _item;
 
 _use = getArray (_config >> "ItemActions" >> "ReloadMag" >> "use");
-_consume = _use select 0;
+_consume = if (_item in (DZE_replaceMagazines select 0)) then {(DZE_replaceMagazines select 1) select ((DZE_replaceMagazines select 0) find _item)} else {_use select 0};
+
 _create = getArray (_config >> "ItemActions" >> "ReloadMag" >> "output") select 0;
 
 _item_ammo = gearSlotAmmoCount (uiNamespace getVariable 'uiControl');
diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf
index 2902bd2b3..78f39a6f2 100644
--- a/SQF/dayz_code/init/variables.sqf
+++ b/SQF/dayz_code/init/variables.sqf
@@ -499,6 +499,7 @@ DZE_Lock_Door = "";
 DZE_HeliAllowTowFrom = ["CH_47F_EP1_DZE","CH_47F_EP1_DZ","CH_47F_BAF","CH_47F_EP1","BAF_Merlin_DZE","CH53_DZE"];
 DZE_HeliAllowToTow = ["hilux1_civil_1_open","HMMWV_Base","Lada_base","Offroad_DSHKM_base","Pickup_PK_base","SkodaBase","tractor","VWGolf","Volha_TK_CIV_Base_EP1","S1203_TK_CIV_EP1","SUV_Base_EP1","ArmoredSUV_Base_PMC","UAZ_Base","LandRover_Base","Ship"];
 DZE_REPLACE_WEAPONS = [["Crossbow","DMR","M14_EP1","SVD","SVD_CAMO"],["Crossbow_DZ","DMR_DZ","M14_CCO_DZ","SVD_DZ","SVD_Gh_DZ"]];
+DZE_replaceMagazines = [["vil_20Rnd_762x51_G3"],["vil_20Rnd_762x51_G3"]];
 DZE_LockableStorage = ["VaultStorage","VaultStorageLocked","LockboxStorageLocked","LockboxStorage"];
 DZE_LockedStorage = ["VaultStorageLocked","LockboxStorageLocked"];
 DZE_UnLockedStorage = ["VaultStorage","LockboxStorage"];