diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp
index 19ac89946..3b5ed435f 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp
@@ -28,6 +28,10 @@ class ItemAntibiotic : ItemAntibiotic_base
text = $STR_TAKE_ANTIBIOTIC;
script = "spawn player_useMeds;";
};
+ class Combine {
+ text = $STR_ANTIBIOTICS_COMBINE;
+ script = "spawn player_combineAntibiotics;";
+ };
};
};
diff --git a/SQF/dayz_code/actions/player_combineAntibiotics.sqf b/SQF/dayz_code/actions/player_combineAntibiotics.sqf
new file mode 100644
index 000000000..ac48a1968
--- /dev/null
+++ b/SQF/dayz_code/actions/player_combineAntibiotics.sqf
@@ -0,0 +1,21 @@
+private ["_total", "_full", "_remain", "_amount"];
+_total = 0;
+{
+ if(configName inheritsFrom (configfile >> "CfgMagazines" >> _x) == "ItemAntibiotic") then {
+ _amount = getNumber(configFile >> "CfgMagazines" >> _x >> "medical" >> "amount");
+ if(_amount > 0) then {
+ _total = _total + _amount;
+ player removeMagazine _x;
+ };
+ };
+} count (magazines player);
+_full = floor(_total / 6);
+_remain = _total % 6;
+for "_i" from 1 to _full do
+{
+ player addMagazine "ItemAntibiotic6";
+};
+
+if(_remain > 0 ) then {
+ player addMagazine "ItemAntibiotic" + str(_remain);
+};
diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf
index 8050a5a95..3ce47c7bd 100644
--- a/SQF/dayz_code/init/compiles.sqf
+++ b/SQF/dayz_code/init/compiles.sqf
@@ -107,6 +107,7 @@ if (!isDedicated) then {
//player_flipvehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_flipvehicle.sqf";
//player_sleep = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_sleep.sqf";
player_combineMag = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_combineMags.sqf";
+ player_combineAntibiotics = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_combineAntibiotics.sqf";
player_createquiver = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_createQuiver.sqf";
player_fillquiver = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_fillQuiver.sqf";
//player_takearrow = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_takeArrow.sqf";
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 13f6ddebc..b865b2593 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -6647,6 +6647,12 @@
Tato sada obsahuje tětivu a lučiště. Součást nutná pro výrobu kuše.
Ein Armbrust-Selbstbau-Kit zum Herstellen einer Armbrust.
+
+ Combine
+ Объединить
+ Kombinovat
+ Vereinigen
+