From d020ab3ff8fc339cc7d417e237a7425565f4278a Mon Sep 17 00:00:00 2001 From: A Clark Date: Sat, 8 Dec 2012 17:58:19 -0600 Subject: [PATCH] fix typo --- dayz_code/compile/fn_selfActions.sqf | 61 +++++++++------------------ dayz_server/system/server_monitor.sqf | 1 + 2 files changed, 20 insertions(+), 42 deletions(-) diff --git a/dayz_code/compile/fn_selfActions.sqf b/dayz_code/compile/fn_selfActions.sqf index ed7c79543..259aac681 100644 --- a/dayz_code/compile/fn_selfActions.sqf +++ b/dayz_code/compile/fn_selfActions.sqf @@ -417,50 +417,20 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4)) _buy = player addAction ["Buy Car", "\z\addons\dayz_code\actions\buy_db.sqf",[41], 99, true, false, "",""]; _sell = player addAction ["Sell Car", "\z\addons\dayz_code\actions\sell_db.sqf",[41], 98, true, false, "",""]; - _buy1 = player addAction ["Buy Truck", "\z\addons\dayz_code\actions\buy_db.sqf",[42], 99, true, false, "",""]; - _sell1 = player addAction ["Sell Truck", "\z\addons\dayz_code\actions\sell_db.sqf",[42], 98, true, false, "",""]; + _buy1 = player addAction ["Buy Truck", "\z\addons\dayz_code\actions\buy_db.sqf",[42], 97, true, false, "",""]; + _sell1 = player addAction ["Sell Truck", "\z\addons\dayz_code\actions\sell_db.sqf",[42], 96, true, false, "",""]; - _buy2 = player addAction ["Buy Offroad", "\z\addons\dayz_code\actions\buy_db.sqf",[43], 99, true, false, "",""]; - _sell2 = player addAction ["Sell Offroad", "\z\addons\dayz_code\actions\sell_db.sqf",[43], 98, true, false, "",""]; + _buy5 = player addAction ["Buy Utility", "\z\addons\dayz_code\actions\buy_db.sqf",[46], 95, true, false, "",""]; + _sell5 = player addAction ["Sell Utility", "\z\addons\dayz_code\actions\sell_db.sqf",[46], 94, true, false, "",""]; + + _buy2 = player addAction ["Buy Offroad", "\z\addons\dayz_code\actions\buy_db.sqf",[43], 93, true, false, "",""]; + _sell2 = player addAction ["Sell Offroad", "\z\addons\dayz_code\actions\sell_db.sqf",[43], 92, true, false, "",""]; - _buy2 = player addAction ["Buy Helicopter", "\z\addons\dayz_code\actions\buy_db.sqf",[44], 99, true, false, "",""]; - _sell2 = player addAction ["Sell Helicopter", "\z\addons\dayz_code\actions\sell_db.sqf",[44], 98, true, false, "",""]; + _buy3 = player addAction ["Buy Helicopter", "\z\addons\dayz_code\actions\buy_db.sqf",[44], 91, true, false, "",""]; + _sell3 = player addAction ["Sell Helicopter", "\z\addons\dayz_code\actions\sell_db.sqf",[44], 90, true, false, "",""]; - _buy2 = player addAction ["Buy Helicopter", "\z\addons\dayz_code\actions\buy_db.sqf",[44], 99, true, false, "",""]; - _sell2 = player addAction ["Sell Helicopter", "\z\addons\dayz_code\actions\sell_db.sqf",[44], 98, true, false, "",""]; - - s_player_parts set [count s_player_parts,_buy]; - s_player_parts set [count s_player_parts,_sell]; - s_player_parts set [count s_player_parts,_buy1]; - s_player_parts set [count s_player_parts,_sell1]; - s_player_parts set [count s_player_parts,_buy2]; - s_player_parts set [count s_player_parts,_sell2]; - - s_player_parts_crtl = 1; - }; - - }; - - //auto_trader_2 - if (_isMan and _traderType == auto_trader_2) then { - - if (s_player_parts_crtl < 0) then { - - // [_trader_id, _category, ]; - _buy = player addAction ["Buy Car", "\z\addons\dayz_code\actions\buy_db.sqf",[41], 99, true, false, "",""]; - _sell = player addAction ["Sell Car", "\z\addons\dayz_code\actions\sell_db.sqf",[41], 98, true, false, "",""]; - - _buy1 = player addAction ["Buy Truck", "\z\addons\dayz_code\actions\buy_db.sqf",[42], 99, true, false, "",""]; - _sell1 = player addAction ["Sell Truck", "\z\addons\dayz_code\actions\sell_db.sqf",[42], 98, true, false, "",""]; - - _buy2 = player addAction ["Buy Offroad", "\z\addons\dayz_code\actions\buy_db.sqf",[43], 99, true, false, "",""]; - _sell2 = player addAction ["Sell Offroad", "\z\addons\dayz_code\actions\sell_db.sqf",[43], 98, true, false, "",""]; - - _buy2 = player addAction ["Buy Helicopter", "\z\addons\dayz_code\actions\buy_db.sqf",[44], 99, true, false, "",""]; - _sell2 = player addAction ["Sell Helicopter", "\z\addons\dayz_code\actions\sell_db.sqf",[44], 98, true, false, "",""]; - - _buy2 = player addAction ["Buy Helicopter", "\z\addons\dayz_code\actions\buy_db.sqf",[45], 99, true, false, "",""]; - _sell2 = player addAction ["Sell Helicopter", "\z\addons\dayz_code\actions\sell_db.sqf",[45], 98, true, false, "",""]; + _buy4 = player addAction ["Buy Military", "\z\addons\dayz_code\actions\buy_db.sqf",[45], 89, true, false, "",""]; + _sell4 = player addAction ["Sell Military", "\z\addons\dayz_code\actions\sell_db.sqf",[45], 88, true, false, "",""]; s_player_parts set [count s_player_parts,_buy]; s_player_parts set [count s_player_parts,_sell]; @@ -468,6 +438,12 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4)) s_player_parts set [count s_player_parts,_sell1]; s_player_parts set [count s_player_parts,_buy2]; s_player_parts set [count s_player_parts,_sell2]; + s_player_parts set [count s_player_parts,_buy3]; + s_player_parts set [count s_player_parts,_sell3]; + s_player_parts set [count s_player_parts,_buy4]; + s_player_parts set [count s_player_parts,_sell4]; + s_player_parts set [count s_player_parts,_buy5]; + s_player_parts set [count s_player_parts,_sell5]; s_player_parts_crtl = 1; }; @@ -511,12 +487,13 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4)) _metals2 = player addAction ["Trade 1 Silver for 6 Copper", "\z\addons\dayz_code\actions\trade_items.sqf",["ItemCopperBar","ItemSilverBar",6,1,"buy","Silver","Copper"], 98, true, true, "",""]; _metals4 = player addAction ["Trade 6 Silver for 1 Gold", "\z\addons\dayz_code\actions\trade_items.sqf",["ItemGoldBar","ItemSilverBar",1,6,"buy","Silver","Gold"], 97, true, true, "",""]; _metals3 = player addAction ["Trade 1 Gold for 6 Silver", "\z\addons\dayz_code\actions\trade_items.sqf",["ItemSilverBar","ItemGoldBar",6,1,"buy","Gold","Silver"], 97, true, true, "",""]; - + _metals5 = player addAction ["Buy Vault for 12 Gold", "\z\addons\dayz_code\actions\trade_items.sqf",["ItemVault","ItemGoldBar",1,12,"buy","Vault","Gold"], 96, true, true, "",""]; s_player_parts set [count s_player_parts,_metals1]; s_player_parts set [count s_player_parts,_metals2]; s_player_parts set [count s_player_parts,_metals3]; s_player_parts set [count s_player_parts,_metals4]; + s_player_parts set [count s_player_parts,_metals5]; ; s_player_parts_crtl = 1; }; diff --git a/dayz_server/system/server_monitor.sqf b/dayz_server/system/server_monitor.sqf index 5c6c8248a..81dd07c98 100644 --- a/dayz_server/system/server_monitor.sqf +++ b/dayz_server/system/server_monitor.sqf @@ -144,6 +144,7 @@ diag_log "HIVE: Starting"; _countr = _countr + 1; } forEach _objWpnTypes; }; + }; if (_object isKindOf "AllVehicles") then { {