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

Change ItemGenerator to WeaponHolder_ItemGenerator

Browse Source 
With WeaponHolder_ItemGenerator we do not need the postion set up in the spawn.sqf
This commit is contained in:
AirwavesMan
2020-09-13 16:53:36 +02:00
parent 0b26ae1246
commit bf516a65e5
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp
View File

@@ -11,7 +11,6 @@ Church[] =
{Loot_GROUP, 4, backpacks}, {Loot_GROUP, 4, backpacks},
//Items //Items
// {Loot_MAGAZINE, 1, equip_Crossbow_Kit}, //not functional yet
{Loot_MAGAZINE, 4, ItemBookBible}, {Loot_MAGAZINE, 4, ItemBookBible},
//Groups //Groups

2
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
View File

@@ -1,6 +1,7 @@
Construction[] = Construction[] =
{ {
//Items //Items
{Loot_VEHICLE, 3, WeaponHolder_ItemGenerator},
{Loot_MAGAZINE, 1, ItemComboLock}, {Loot_MAGAZINE, 1, ItemComboLock},
{Loot_MAGAZINE, 6, ItemSandbag}, {Loot_MAGAZINE, 6, ItemSandbag},
{Loot_MAGAZINE, 1, ItemWire}, {Loot_MAGAZINE, 1, ItemWire},
@@ -8,7 +9,6 @@ Construction[] =
{Loot_MAGAZINE, 2, equip_hose}, {Loot_MAGAZINE, 2, equip_hose},
{Loot_MAGAZINE, 2, MortarBucket}, {Loot_MAGAZINE, 2, MortarBucket},
{Loot_MAGAZINE, 6, CinderBlocks}, {Loot_MAGAZINE, 6, CinderBlocks},
{Loot_MAGAZINE, 3, ItemGenerator},
{Loot_MAGAZINE, 1, fuel_pump_kit}, {Loot_MAGAZINE, 1, fuel_pump_kit},
//Other //Other

2
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
View File

@@ -3,12 +3,12 @@ Industrial[] =
//Tools //Tools
{Loot_GROUP, 15, ToolsBuilding}, {Loot_GROUP, 15, ToolsBuilding},
{Loot_VEHICLE, 8, WeaponHolder_ItemCrowbar}, {Loot_VEHICLE, 8, WeaponHolder_ItemCrowbar},
{Loot_VEHICLE, 3, WeaponHolder_ItemGenerator},
//Items //Items
{Loot_MAGAZINE, 2, MortarBucket}, {Loot_MAGAZINE, 2, MortarBucket},
{Loot_MAGAZINE, 6, CinderBlocks}, {Loot_MAGAZINE, 6, CinderBlocks},
{Loot_MAGAZINE, 3, ItemRSJ}, {Loot_MAGAZINE, 3, ItemRSJ},
{Loot_MAGAZINE, 3, ItemGenerator},
{Loot_MAGAZINE, 1, fuel_pump_kit}, {Loot_MAGAZINE, 1, fuel_pump_kit},
//Other //Other

8
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/MilitaryIndustrial.hpp
View File

@@ -13,7 +13,7 @@ MilitaryIndustrialRU[] = {
{Loot_MAGAZINE, 1, PartVRotor}, {Loot_MAGAZINE, 1, PartVRotor},
{Loot_MAGAZINE, 4, FoodMRE}, {Loot_MAGAZINE, 4, FoodMRE},
{Loot_GROUP, 1, FuelBarrel}, {Loot_GROUP, 1, FuelBarrel},
{Loot_MAGAZINE, 1, ItemGenerator}, {Loot_VEHICLE, 1, WeaponHolder_ItemGenerator},
{Loot_MAGAZINE, 1, fuel_pump_kit}, {Loot_MAGAZINE, 1, fuel_pump_kit},
{Loot_MAGAZINE, 1, ItemTankTrap}, {Loot_MAGAZINE, 1, ItemTankTrap},
{Loot_MAGAZINE, 4, ItemSandbag}, {Loot_MAGAZINE, 4, ItemSandbag},
@@ -33,7 +33,7 @@ MilitaryIndustrialUS[] = {
{Loot_MAGAZINE, 1, PartVRotor}, {Loot_MAGAZINE, 1, PartVRotor},
{Loot_MAGAZINE, 4, FoodMRE}, {Loot_MAGAZINE, 4, FoodMRE},
{Loot_GROUP, 1, FuelBarrel}, {Loot_GROUP, 1, FuelBarrel},
{Loot_MAGAZINE, 1, ItemGenerator}, {Loot_VEHICLE, 1, WeaponHolder_ItemGenerator},
{Loot_MAGAZINE, 1, fuel_pump_kit}, {Loot_MAGAZINE, 1, fuel_pump_kit},
{Loot_MAGAZINE, 1, ItemTankTrap}, {Loot_MAGAZINE, 1, ItemTankTrap},
{Loot_MAGAZINE, 4, ItemSandbag}, {Loot_MAGAZINE, 4, ItemSandbag},
@@ -53,7 +53,7 @@ MilitaryIndustrialEU[] = {
{Loot_MAGAZINE, 1, PartVRotor}, {Loot_MAGAZINE, 1, PartVRotor},
{Loot_MAGAZINE, 4, FoodMRE}, {Loot_MAGAZINE, 4, FoodMRE},
{Loot_GROUP, 1, FuelBarrel}, {Loot_GROUP, 1, FuelBarrel},
{Loot_MAGAZINE, 1, ItemGenerator}, {Loot_VEHICLE, 1, WeaponHolder_ItemGenerator},
{Loot_MAGAZINE, 1, fuel_pump_kit}, {Loot_MAGAZINE, 1, fuel_pump_kit},
{Loot_MAGAZINE, 1, ItemTankTrap}, {Loot_MAGAZINE, 1, ItemTankTrap},
{Loot_MAGAZINE, 4, ItemSandbag}, {Loot_MAGAZINE, 4, ItemSandbag},
@@ -73,7 +73,7 @@ MilitaryIndustrialCZ[] = {
{Loot_MAGAZINE, 1, PartVRotor}, {Loot_MAGAZINE, 1, PartVRotor},
{Loot_MAGAZINE, 4, FoodMRE}, {Loot_MAGAZINE, 4, FoodMRE},
{Loot_GROUP, 1, FuelBarrel}, {Loot_GROUP, 1, FuelBarrel},
{Loot_MAGAZINE, 1, ItemGenerator}, {Loot_VEHICLE, 1, WeaponHolder_ItemGenerator},
{Loot_MAGAZINE, 1, fuel_pump_kit}, {Loot_MAGAZINE, 1, fuel_pump_kit},
{Loot_MAGAZINE, 1, ItemTankTrap}, {Loot_MAGAZINE, 1, ItemTankTrap},
{Loot_MAGAZINE, 4, ItemSandbag}, {Loot_MAGAZINE, 4, ItemSandbag},

2
SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
View File

@@ -248,7 +248,7 @@ class WeaponHolder_ItemGenerator : WeaponHolderBase {
destrType = "DestructNo"; destrType = "DestructNo";
class eventHandlers { class eventHandlers {
delete init; init = "[(_this select 0),'cfgMagazines','ItemGenerator'] spawn object_pickupAction";
}; };
}; };

5
SQF/dayz_code/loot/spawn.sqf
View File

@@ -45,11 +45,6 @@ call {
_vehicle = "WeaponHolder" createVehicle [0,0,0]; _vehicle = "WeaponHolder" createVehicle [0,0,0];
_vehicle addMagazineCargoGlobal [_item, 1]; _vehicle addMagazineCargoGlobal [_item, 1];
// Fix generator spawning half way in the floor by raising z coordinate by .3 meters.
if (_item == "ItemGenerator") then {
_pos set [2, ((_pos select 2) + .3)];
};
if (_isWater) then { if (_isWater) then {
_vehicle setPos (_pos); _vehicle setPos (_pos);
} else { } else {