W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-04-17 09:53:21 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
vbawol
2013-04-28 16:59:47 -05:00
parent 53bb1b9075
commit cf43925627
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dayz_code/actions/player_chopWood.sqf
View File

@@ -52,7 +52,7 @@ if (_finished) then {
_i = 0; _i = 0;
// determine where the object name starts // determine where the object name starts
{ {
if (ASCII_COLON == _objInfo select _i) exitWith {}; if (58 == _objInfo select _i) exitWith {};
_i = _i + 1; _i = _i + 1;
} forEach _objInfo; } forEach _objInfo;
_i = _i + 2; // skip the ": " part _i = _i + 2; // skip the ": " part
@@ -60,7 +60,7 @@ if (_finished) then {
_objName = _objName + [_objInfo select _k]; _objName = _objName + [_objInfo select _k];
}; };
_objName = toLower(toString(_objName)); _objName = toLower(toString(_objName));
// Exit since we found a tree // Exit since we found a tree
if (_objName in _trees) exitWith { if (_objName in _trees) exitWith {
_findNearestTree set [(count _findNearestTree),_x]; _findNearestTree set [(count _findNearestTree),_x];

8
dayz_code/actions/remove.sqf
View File

@@ -121,21 +121,21 @@ if (_proceed) then {
dayzDeleteObj = [_objectID,_objectUID]; dayzDeleteObj = [_objectID,_objectUID];
publicVariableServer "dayzDeleteObj"; publicVariableServer "dayzDeleteObj";
_isWreck = typeOf _obj in ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"]; _isWreck = (typeOf _obj) in ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"];
deleteVehicle _obj; deleteVehicle _obj;
_selectedRemoveOutput = [];
if(_isWreck) then { if(_isWreck) then {
// Find one random part to give back // Find one random part to give back
_refundpart = ["PartEngine","PartGeneric","PartFueltank","PartWheel","PartGlass","ItemJerrycan"] call BIS_fnc_selectRandom; _refundpart = ["PartEngine","PartGeneric","PartFueltank","PartWheel","PartGlass","ItemJerrycan"] call BIS_fnc_selectRandom;
_selectedRemoveOutput = [_refundpart]; _selectedRemoveOutput set [count _selectedRemoveOutput,[_refundpart,1]];
} else { } else {
_selectedRemoveOutput = getArray (configFile >> "CfgVehicles" >> _objType >> "removeoutput"); _selectedRemoveOutput = getArray (configFile >> "CfgVehicles" >> _objType >> "removeoutput");
}; };
// give refund items // give refund items
if((count _selectedRemoveOutput) > 0) then { if((count _selectedRemoveOutput) > 0) then {
// Put items // Put itemsg
{ {
_itemOut = _x select 0; _itemOut = _x select 0;
_countOut = _x select 1; _countOut = _x select 1;

1
dayz_code/config.cpp
View File

@@ -1011,6 +1011,7 @@ class HeliCrash_No50s: Default {
0.06, //18 0.06, //18
0.01, //24 0.01, //24
0.01, //DZ_Backpack_EP1 24 0.01, //DZ_Backpack_EP1 24
0.01, //45
0.30, 0.30,
1.00, 1.00,
5.00, //military 5.00, //military

2
dayz_code/init/variables.sqf
View File

@@ -384,7 +384,7 @@ if(isNil "dayz_oldrefuel") then {
dayz_updateObjects = ["Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage","M240Nest_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ"]; dayz_updateObjects = ["Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage","M240Nest_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ"];
dayz_disallowedVault = ["TentStorage", "BuiltItems"]; dayz_disallowedVault = ["TentStorage", "BuiltItems"];
dayz_reveal = ["AllVehicles","WeaponHolder","TentStorage","VaultStorage","VaultStorageLocked","BuiltItems"]; dayz_reveal = ["AllVehicles","WeaponHolder","TentStorage","VaultStorage","VaultStorageLocked","BuiltItems"];
dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ"]; dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ","StickFence_DZ"];
dayz_spawnPos = getPosATL player; dayz_spawnPos = getPosATL player;

4
dayz_equip/config.cpp
View File

@@ -1543,11 +1543,11 @@ class CfgMagazines
scope = 2; scope = 2;
count = 1; count = 1;
type = 256; type = 256;
displayName = "Wood Plywood"; displayName = "Plywood";
// TODO make custom model and icon // TODO make custom model and icon
model = "\dayz_equip\models\woodPile.p3d"; model = "\dayz_equip\models\woodPile.p3d";
picture = "\dayz_equip\textures\equip_woodPile_ca.paa"; picture = "\dayz_equip\textures\equip_woodPile_ca.paa";
descriptionShort = "Wood Plywood"; descriptionShort = "Plywood";
class ItemActions { class ItemActions {
class Crafting class Crafting
{ {