From bae9f432011bf8e9511b9a1af6a8e0c98f06012a Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Sun, 2 Feb 2014 19:13:37 +0100 Subject: [PATCH] Updated Crashmodels --- SQF/dayz_server/compile/server_spawnCrashSite.sqf | 12 ++++++------ SQF/dayz_server/modules/crash_spawner.sqf | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/SQF/dayz_server/compile/server_spawnCrashSite.sqf b/SQF/dayz_server/compile/server_spawnCrashSite.sqf index 9e392859a..7405360ea 100644 --- a/SQF/dayz_server/compile/server_spawnCrashSite.sqf +++ b/SQF/dayz_server/compile/server_spawnCrashSite.sqf @@ -20,11 +20,11 @@ while {true} do { // Allows the variance to act as +/- from the spawn frequency timer _timeAdjust = round((random(_variance * 2)) - _variance); _timeToSpawn = time + _frequency + _timeAdjust; - + //Adding some Random systems - _crashModel = ["UH60Wreck_DZ","UH1Wreck_DZ","Mass_grave_DZ"] call BIS_fnc_selectRandom; - - + _crashModel = ["UH60Wreck_DZ","UH1Wreck_DZ","UH60_NAVY_Wreck_DZ","UH60_ARMY_Wreck_DZ","UH60_NAVY_Wreck_burned_DZ","UH60_ARMY_Wreck_burned_DZ","Mass_grave_DZ"] call BIS_fnc_selectRandom; + + if(_crashModel == "Mass_grave_DZ") then { _lootTable = "MassGrave"; } else { @@ -34,7 +34,7 @@ while {true} do { //Table without 50 cals //_lootTable = ["Military","HeliCrash_No50s","MilitarySpecial"] call BIS_fnc_selectRandom; }; - + _crashName = getText (configFile >> "CfgVehicles" >> _crashModel >> "displayName"); diag_log(format["CRASHSPAWNER: %1%2 chance to spawn '%3' with loot table '%4' in %5 seconds", round(_spawnChance * 100), '%', _crashName, _lootTable, _timeToSpawn]); @@ -113,7 +113,7 @@ while {true} do { _itemType = _itemTypes select _index; [_itemType select 0, _itemType select 1, _position, 5] call spawn_loot; - diag_log(format["CRASHSPAWNER: Loot spawn at '%1' with loot table '%2'", _crashName, _lootTable]); + diag_log(format["CRASHSPAWNER: Loot spawn at '%1' with loot table '%2'", _crashName, _lootTable]); // ReammoBox is preferred parent class here, as WeaponHolder wouldn't match MedBox0 and other such items. _nearby = _position nearObjects ["ReammoBox", sizeOf(_crashModel)]; diff --git a/SQF/dayz_server/modules/crash_spawner.sqf b/SQF/dayz_server/modules/crash_spawner.sqf index 23f23ac67..d68288d39 100644 --- a/SQF/dayz_server/modules/crash_spawner.sqf +++ b/SQF/dayz_server/modules/crash_spawner.sqf @@ -11,8 +11,8 @@ _fadeFire = false; _spawnRoll = random 1; if (_spawnRoll <= _spawnChance) then { - - _crashModel = ["UH60Wreck_DZ","UH1Wreck_DZ","Mass_grave_DZ"] call BIS_fnc_selectRandom; + + _crashModel = ["UH60Wreck_DZ","UH1Wreck_DZ","UH60_NAVY_Wreck_DZ","UH60_ARMY_Wreck_DZ","UH60_NAVY_Wreck_burned_DZ","UH60_ARMY_Wreck_burned_DZ","Mass_grave_DZ"] call BIS_fnc_selectRandom; if(_crashModel == "Mass_grave_DZ") then { _lootTable = "MassGrave"; @@ -21,7 +21,7 @@ if (_spawnRoll <= _spawnChance) then { }; _crashName = getText (configFile >> "CfgVehicles" >> _crashModel >> "displayName"); - + // Loop for a new location without any vehicles _needsrelocated = true; while {_needsrelocated} do { @@ -73,7 +73,7 @@ if (_spawnRoll <= _spawnChance) then { publicVariable "PVDZE_obj_Fire"; _crash setvariable ["fadeFire",_fadeFire,true]; }; - + _config = configFile >> "CfgBuildingLoot" >> _lootTable; if (DZE_MissionLootTable) then { _config = missionConfigFile >> "CfgBuildingLoot" >> _lootTable;; @@ -89,9 +89,9 @@ if (_spawnRoll <= _spawnChance) then { _index = _weights select _index; _itemType = _itemTypes select _index; [_itemType select 0, _itemType select 1, _position, 5] call spawn_loot; - //diag_log(format["CRASHSPAWNER: Loot spawn at '%1' with loot table '%2'", _crashName, _lootTable]); + //diag_log(format["CRASHSPAWNER: Loot spawn at '%1' with loot table '%2'", _crashName, _lootTable]); }; - + // ReammoBox is preferred parent class here, as WeaponHolder wouldn't match MedBox0 and other such items. _nearby = _position nearObjects ["ReammoBox", sizeOf(_crashModel)]; {