destory != destroy

This commit is contained in:
[VB]AWOL
2013-10-31 11:59:03 -05:00
parent 81aab209b3
commit f8dde10b40
4 changed files with 62 additions and 3 deletions

View File

@@ -0,0 +1,56 @@
class V3S_Base;
class V3S_Civ: V3S_Base {
crew = "";
faction = "CIV";
rarityurban = 0.3;
scope = 2;
side = 3;
typicalcargo[] = {};
class Library {
libtextdesc = "The V3S is a Czech-made military 6x6 cargo truck capable of carrying cargo up to 5 tons, or up to 3 tons in rough terrain.<br/>This one is a harmless civilian vehicle.";
};
};
class V3S_Base_EP1;
class V3S_TK_EP1_DZE: V3S_Base_EP1
{
scope = 2;
side = 0;
faction = "BIS_TK";
crew = "";
typicalCargo[] = {};
model = "\ca\wheeled_E\V3S\V3S_transport";
displayname = "V3S";
driverAction = "V3S_Driver_EP1";
class TransportMagazines {};
class TransportWeapons {};
};
class V3S_RA_TK_GUE_EP1_DZE: V3S_Base_EP1
{
scope = 2;
side = 2;
faction = "BIS_TK_GUE";
crew = "";
//armor = 40;
typicalCargo[] = {};
vehicleClass = "Support";
displayname = "V3S Reammo";
model = "\ca\wheeled_E\V3S\V3S_Repair";
Icon = "\CA\wheeled_e\data\UI\Icon_V3S_repair_CA.paa";
Picture = "\CA\wheeled_e\data\UI\Picture_V3S_repair_CA.paa";
MapSize = 7;
driverAction = "V3S_Driver_EP1";
transportSoldier = 2;
class TransportMagazines {};
class TransportWeapons {};
type = 0;
threat[] = {0,0,0};
hiddenSelections[] = {"Camo1","Camo2","Camo3","Camo4"};
hiddenSelectionsTextures[] = {"ca\wheeled_E\V3S\Data\v3s_kabpar_EGUE_co","ca\wheeled_E\V3S\Data\v3s_intkor_EGUE_co","ca\wheeled_E\V3S\Data\v3s_koloint02_EGUE_co","ca\wheeled_E\V3S\Data\v3s_repair_EGUE_co"};
//transportMaxMagazines = 200;
//transportMaxWeapons = 50;
//transportMaxBackpacks = 8;
//terrainCoef = 2.5;
};

View File

@@ -392,7 +392,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
} else {
if(("ItemJerrycan" in _magazinesPlayer) and ("ItemMatchbox_DZE" in weapons player)) then {
if (s_player_packtent < 0) then {
s_player_packtent = player addAction ["Destory Tent", "\z\addons\dayz_code\actions\remove.sqf",_cursorTarget, 1, true, true, "", ""];
s_player_packtent = player addAction ["Destroy Tent", "\z\addons\dayz_code\actions\remove.sqf",_cursorTarget, 1, true, true, "", ""];
};
};
};

View File

@@ -2,8 +2,8 @@ private ["_empty","_playerwasNearby","_character","_magazines","_force","_charac
_character = _this select 0;
// prevent sending more than 12 magazine items
_magazines = [(_this select 1),12] call array_reduceSize;
// prevent saving more than 20 magazine items
_magazines = [(_this select 1),20] call array_reduceSize;
//_force = _this select 2;
_forceGear = _this select 3;

View File

@@ -57,6 +57,7 @@ array_reduceSizeReverse = {
array_reduceSize = {
private["_array","_count","_num","_newarray","_startnum","_index"];
_array = _this select 0;
diag_log format ["array_reduceSize IN: %1", _array];
_newarray = [];
_count = _this select 1;
_num = count _array;
@@ -68,7 +69,9 @@ array_reduceSize = {
};
_array = _newarray;
};
diag_log format ["array_reduceSize OUT: %1", _array];
_array
};
vehicle_handleServerKilled = {