+ Added Armored SUV to spawn tables
+ Lowered gear counts on armed suv to 400,20,10
+ Removed boats from takistan DVS table
+ Moved metals trader options to a "trade metals" menu on each trader.
+ Changed old metals trader to new Hero only trader, will have certain
clothes at first. and lower priced items.
+ Add crafting in progress lock to prevent duping.
+ changed wording of vault to safe
+ added Hero traders that only deal with 5000+ humanity
+ Updated to larger 10oz copper, silver, gold equipment icons.
+ Server Side changed allowed buildables to array
This commit is contained in:
vbawol
2013-02-23 08:45:41 -06:00
parent 16cfc75b26
commit 73594cc02c
29 changed files with 1028 additions and 259 deletions

View File

@@ -236,7 +236,7 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
//Allow owner to unlock vault
if(cursorTarget isKindOf "VaultStorageLocked" and _canDo and _ownerID != "0" and _ownerID == dayz_playerUID and !UnlockInprogress) then {
if (s_player_unlockvault < 0 and (player distance cursorTarget < 3)) then {
s_player_unlockvault = player addAction ["Unlock Vault", "\z\addons\dayz_code\actions\vault_unlock.sqf",cursorTarget, 0, false, true, "",""];
s_player_unlockvault = player addAction ["Unlock Safe", "\z\addons\dayz_code\actions\vault_unlock.sqf",cursorTarget, 0, false, true, "",""];
};
} else {
player removeAction s_player_unlockvault;
@@ -247,10 +247,10 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
if(cursorTarget isKindOf "VaultStorage" and _canDo and _ownerID != "0" and _ownerID == dayz_playerUID and (player distance cursorTarget < 3)) then {
if (s_player_lockvault < 0) then {
s_player_lockvault = player addAction ["Lock Vault", "\z\addons\dayz_code\actions\vault_lock.sqf",cursorTarget, 0, false, true, "",""];
s_player_lockvault = player addAction ["Lock Safe", "\z\addons\dayz_code\actions\vault_lock.sqf",cursorTarget, 0, false, true, "",""];
};
if (s_player_packvault < 0) then {
s_player_packvault = player addAction ["<t color='#ff0000'>Pack Vault</t>", "\z\addons\dayz_code\actions\vault_pack.sqf",cursorTarget, 0, false, true, "",""];
s_player_packvault = player addAction ["<t color='#ff0000'>Pack Safe</t>", "\z\addons\dayz_code\actions\vault_pack.sqf",cursorTarget, 0, false, true, "",""];
};
} else {
player removeAction s_player_packvault;
@@ -342,6 +342,12 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
_humanity_logic = true;
};
};
if((_traderMenu select 2) == "hero") then {
_low_high = "low";
if (_humanity < 5000) then {
_humanity_logic = true;
};
};
if(_humanity_logic) then {
_cancel = player addAction ["Your humanity is too " + _low_high + " this trader refuses to talk to you.", "\z\addons\dayz_code\actions\trade_cancel.sqf",["na"], 0, true, false, "",""];
s_player_parts set [count s_player_parts,_cancel];
@@ -361,7 +367,8 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
} forEach (_traderMenu select 0);
// Add static metals trader options under sub menu
_metals_trader = player addAction ["Trade Metals", "\z\addons\dayz_code\actions\trade_metals.sqf",["na"], 0, true, false, "",""];
s_player_parts set [count s_player_parts,_metals_trader];
};

View File

@@ -14,7 +14,7 @@ s_player_lockvault = -1;
if(_ownerID == dayz_playerUID) then {
_alreadyPacking = _obj getVariable["packing",0];
if (_alreadyPacking == 1) exitWith {cutText ["That vault is already being locked." , "PLAIN DOWN"]};
if (_alreadyPacking == 1) exitWith {cutText ["That Safe is already being locked." , "PLAIN DOWN"]};
_obj setVariable["packing",1];
@@ -53,7 +53,7 @@ if(_ownerID == dayz_playerUID) then {
_holder setVariable ["BackpackCargo", _backpacks, true];
};
cutText ["Your vault has been locked", "PLAIN DOWN"];
cutText ["Your Safe has been locked", "PLAIN DOWN"];
} else {
cutText ["You cannot lock this vault, it is not yours", "PLAIN DOWN"];
cutText ["You cannot lock this Safe, it is not yours", "PLAIN DOWN"];
};

View File

@@ -12,17 +12,17 @@ s_player_packvault = 1;
if(_ownerID == dayz_playerUID) then {
_alreadyPacking = _obj getVariable["packing",0];
if (_alreadyPacking == 1) exitWith {cutText ["That vault is already being packed." , "PLAIN DOWN"]};
if (_alreadyPacking == 1) exitWith {cutText ["That Safe is already being packed." , "PLAIN DOWN"]};
_obj setVariable["packing",1];
cutText ["Packing vault move from this position to cancel within 5 seconds.", "PLAIN DOWN"];
cutText ["Packing Safe move from this position to cancel within 5 seconds.", "PLAIN DOWN"];
sleep 1;
_location1 = getPosATL player;
sleep 5;
_location2 = getPosATL player;
if(_location1 distance _location2 > 0.1) exitWith {
cutText ["Packing vault canceled." , "PLAIN DOWN"]
cutText ["Packing Safe canceled." , "PLAIN DOWN"]
};
player playActionNow "Medic";
@@ -84,9 +84,9 @@ if(_ownerID == dayz_playerUID) then {
*/
cutText ["Your vault has been packed", "PLAIN DOWN"];
cutText ["Your Safe has been packed", "PLAIN DOWN"];
} else {
cutText ["You cannot pack this vault, it is not yours", "PLAIN DOWN"];
cutText ["You cannot pack this Safe, it is not yours", "PLAIN DOWN"];
};
s_player_packvault = -1;

View File

@@ -16,7 +16,7 @@ UnlockInprogress = true;
if (_ownerID == dayz_playerUID) then {
_alreadyPacking = _obj getVariable["packing",0];
if (_alreadyPacking == 1) exitWith {cutText ["That vault is already being unlocked." , "PLAIN DOWN"]};
if (_alreadyPacking == 1) exitWith {cutText ["That Safe is already being unlocked." , "PLAIN DOWN"]};
_obj setVariable["packing",1];
@@ -79,14 +79,14 @@ if (_ownerID == dayz_playerUID) then {
} forEach _objWpnTypes;
};
cutText ["Vault has been unlocked.", "PLAIN DOWN"];
cutText ["Safe has been unlocked.", "PLAIN DOWN"];
} else {
player playActionNow "Medic";
sleep 3;
[player,"repair",0,false] call dayz_zombieSpeak;
null = [player,25,true,(getPosATL player)] spawn player_alertZombies;
sleep 5;
cutText ["Combination incorrect, vault is still locked.", "PLAIN DOWN"];
cutText ["Combination incorrect, Safe is still locked.", "PLAIN DOWN"];
};
s_player_unlockvault = -1;