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

Partly fix floating loot

Browse Source 
This commit fixes partly the floating loot issue. The whole problem is not fixable. It is a problem with different components. The main point is that the position can be half water and half not. The second is the building collision and the collision of the loot object. Normally setPosATL should do its work but the object moves on the placement. Adding a special handling for buildings that are mostly over water did the best job so far.
With fixWaterPos = 1; in the building class which has those floating loot problems, the position gets converted to ASL which is better over water but not always. Some loot objects are still floating a bit but I could reach all of them. It is a way better as before.
This commit is contained in:
AirwavesMan
2020-09-15 19:55:17 +02:00
parent 7f86b09f4c
commit 89bca2c94b
7 changed files with 84 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,10 +23,11 @@ Author:
#define INCREMENT_WEAPON_HOLDERS dayz_currentWeaponHolders = dayz_currentWeaponHolders + 1;
#endif
private ["_item","_isWater","_type","_lootInfo","_vehicle","_spawnCount","_magazines"];
private ["_item","_isWater","_type","_lootInfo","_vehicle","_spawnCount","_magazines","_fixWaterSpawn"];
_lootInfo = _this select 0;
_pos = _this select 1;
_class = ["",_this select 2] select (count _this > 2);
_type = _lootInfo select 0;
_item = _lootInfo select 1;
_isWater = surfaceIsWater _pos;
@@ -45,8 +46,13 @@ call {
_vehicle = "WeaponHolder" createVehicle [0,0,0];
_vehicle addMagazineCargoGlobal [_item, 1];
if (_isWater) then {
_vehicle setPos (_pos);
if (_isWater) then {
_fixWaterSpawn = getNumber(missionconfigFile >> "CfgLoot" >> "Buildings" >> _class >> "fixWaterPos");
if (_fixWaterSpawn == 1) then {
_vehicle setPosASL (_pos);
} else {
_vehicle setPos (_pos);
};
} else {
_vehicle setPosATL (_pos);
};
@@ -59,8 +65,13 @@ call {
_vehicle = "WeaponHolder" createVehicle [0,0,0];
_vehicle addWeaponCargoGlobal [_item, 1];
if (_isWater) then {
_vehicle setPos (_pos);
if (_isWater) then {
_fixWaterSpawn = getNumber(missionconfigFile >> "CfgLoot" >> "Buildings" >> _class >> "fixWaterPos");
if (_fixWaterSpawn == 1) then {
_vehicle setPosASL (_pos);
} else {
_vehicle setPos (_pos);
};
} else {
_vehicle setPosATL (_pos);
};
@@ -82,8 +93,13 @@ call {
// Fix floating backpacks by lowering z coordinate by .15 meters.
_pos set [2, ((_pos select 2) - .15)];
if (_isWater) then {
_vehicle setPos (_pos);
if (_isWater) then {
_fixWaterSpawn = getNumber(missionconfigFile >> "CfgLoot" >> "Buildings" >> _class >> "fixWaterPos");
if (_fixWaterSpawn == 1) then {
_vehicle setPosASL (_pos);
} else {
_vehicle setPos (_pos);
};
} else {
_vehicle setPosATL (_pos);
};
@@ -95,11 +111,17 @@ call {
_vehicle = "WeaponHolder" createVehicle [0,0,0];
Loot_InsertCargo(_vehicle, _item, _spawnCount);
if (_isWater) then {
_vehicle setPos (_pos);
if (_isWater) then {
_fixWaterSpawn = getNumber(missionconfigFile >> "CfgLoot" >> "Buildings" >> _class >> "fixWaterPos");
if (_fixWaterSpawn == 1) then {
_vehicle setPosASL (_pos);
} else {
_vehicle setPos (_pos);
};
} else {
_vehicle setPosATL (_pos);
};
INCREMENT_WEAPON_HOLDERS
};
@@ -108,8 +130,13 @@ call {
_vehicle = _item createVehicle [0,0,0];
_vehicle setDir random 360;
if (_isWater) then {
_vehicle setPos (_pos);
if (_isWater) then {
_fixWaterSpawn = getNumber(missionconfigFile >> "CfgLoot" >> "Buildings" >> _class >> "fixWaterPos");
if (_fixWaterSpawn == 1) then {
_vehicle setPosASL (_pos);
} else {
_vehicle setPos (_pos);
};
} else {
_vehicle setPosATL (_pos);
};
@@ -124,11 +151,17 @@ call {
Loot_InsertCargo(_vehicle, _lootInfo select 2, _spawnCount);
_vehicle setDir random 360;
if (_isWater) then {
_vehicle setPos (_pos);
if (_isWater) then {
_fixWaterSpawn = getNumber(missionconfigFile >> "CfgLoot" >> "Buildings" >> _class >> "fixWaterPos");
if (_fixWaterSpawn == 1) then {
_vehicle setPosASL (_pos);
} else {
_vehicle setPos (_pos);
};
} else {
_vehicle setPosATL (_pos);
};
INCREMENT_WEAPON_HOLDERS
};
@@ -138,8 +171,13 @@ call {
if ((typeName _vehicle) != "OBJECT") exitWith {};
if (!isNull _vehicle) then {
if (_isWater) then {
_vehicle setPos (_pos);
if (_isWater) then {
_fixWaterSpawn = getNumber(missionconfigFile >> "CfgLoot" >> "Buildings" >> _class >> "fixWaterPos");
if (_fixWaterSpawn == 1) then {
_vehicle setPosASL (_pos);
} else {
_vehicle setPos (_pos);
};
} else {
_vehicle setPosATL (_pos);
};