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

Update insertCargo.sqf

Browse Source 
Replace switch do block with call scope with if, exitWith. Add magazine selection to spawned weapons. This functions spawns weapons into  a container. It should also spawn a random amount of matching magazines.
This commit is contained in:
worldwidesorrow
2020-01-09 16:54:52 -06:00
committed by GitHub
parent a1618e0dcf
commit 292ce61378
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
SQF/dayz_code/loot/insertCargo.sqf
View File

@@ -11,24 +11,23 @@ Author:
Foxy Foxy
*/ */
#include "\z\addons\dayz_code\util\debug.hpp"
#include "Loot.hpp" #include "Loot.hpp"
//Maximum number of magazines spawned along with weapons
#define MAX_WEAPON_MAGAZINES 2
private ["_container","_group","_count","_type","_item","_magazines"];
_container = _this select 0;
_group = _this select 1;
_count = _this select 2;
{ {
switch (_x select 0) do _type = _x select 0;
{ _item = _x select 1;
case Loot_WEAPON:
{ call {
(_this select 0) addWeaponCargoGlobal [_x select 1, 1]; if (_type == Loot_MAGAZINE) exitWith {
Debug_Assert(typeName (_x select 1) == typeName "" && { (_x select 1) != "" });
//Debug_Log(String_Format2("DEBUG: Loot_Insert Weapon: %1 Vehicle: %2", _x select 1, _this select 0));
};
case Loot_MAGAZINE:
{
private "_item";
_item = _x select 1;
if (dayz_classicBloodBagSystem && _item in dayz_typedBags) then { if (dayz_classicBloodBagSystem && _item in dayz_typedBags) then {
if (_item in ["bloodTester","bloodBagAPOS","bloodBagABPOS"]) then { // reduce ItemBloodBag output slightly since typed bags spawn in bulk if (_item in ["bloodTester","bloodBagAPOS","bloodBagABPOS"]) then { // reduce ItemBloodBag output slightly since typed bags spawn in bulk
_item = ["ItemBandage","ItemPainkiller","ItemMorphine","ItemHeatPack","ItemAntibacterialWipe"] call BIS_fnc_selectRandom; _item = ["ItemBandage","ItemPainkiller","ItemMorphine","ItemHeatPack","ItemAntibacterialWipe"] call BIS_fnc_selectRandom;
@@ -36,13 +35,22 @@ Author:
_item = "ItemBloodbag"; _item = "ItemBloodbag";
}; };
}; };
(_this select 0) addMagazineCargoGlobal [_item, 1]; _container addMagazineCargoGlobal [_item, 1];
}; };
case Loot_BACKPACK: if (_type == Loot_WEAPON) exitWith {
{ _container addWeaponCargoGlobal [_item, 1];
(_this select 0) addBackpackCargoGlobal [_x select 1, 1];
_magazines = getArray (configFile >> "CfgWeapons" >> _item >> "magazines");
if (count _magazines > 0 && {getNumber (configFile >> "CfgWeapons" >> _item >> "melee") != 1}) then
{
_container addMagazineCargoGlobal [_magazines select 0, floor random (MAX_WEAPON_MAGAZINES + 1)];
};
};
if (_type == Loot_BACKPACK) exitWith {
_container addBackpackCargoGlobal [_item, 1];
}; };
}; };
} count Loot_Select(_this select 1, _this select 2); } count Loot_Select(_group,_count);
//foreach ([_this select 1, _this select 2] call loot_select);