W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-15 20:52:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

0.87

Browse Source 
added cancel to repair and salvage menus, added message to salvage when
player does not, fixed bulk crates selling of weapons and backpacks, Can
no longer place vaults on roads or within 50m of trader citys, Added now
entering/leaving messages to trader citys, Added kill messages from f0rt
and stapo.
This commit is contained in:
vbawol
2013-02-01 16:05:05 -06:00
parent d8883bbf93
commit 15f091ef44
17 changed files with 91 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dayz_code/actions/repair_cancel.sqf Normal file
View File

@@ -0,0 +1,3 @@
private [];
{dayz_myCursorTarget removeAction _x} forEach s_player_repairActions;s_player_repairActions = [];
s_player_repair_crtl = -1;

7
dayz_code/actions/repair_vehicle.sqf
View File

@@ -60,5 +60,10 @@ if (_allFixed) then {
_vehicle setDamage 0;
};
if(count _hitpoints > 0 ) then {
s_player_repair_crtl = 1;
_cancel = dayz_myCursorTarget addAction ["Cancel", "\z\addons\dayz_code\actions\repair_cancel.sqf","repair", 0, true, false, "",""];
s_player_repairActions set [count s_player_repairActions,_cancel];
s_player_repair_crtl = 1;
};

2
dayz_code/actions/salvage.sqf
View File

@@ -43,6 +43,8 @@ if (_hasToolbox) then {
cutText [format["You have successfully removed %1 from the %2",_namePart,_nameType], "PLAIN DOWN"];
} else {
cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"];
};

8
dayz_code/actions/salvage_vehicle.sqf
View File

@@ -57,6 +57,10 @@ _hitpoints = _vehicle call vehicle_getHitpoints;
} forEach _hitpoints;
if(count _hitpoints > 0 ) then {
_cancel = dayz_myCursorTarget addAction ["Cancel", "\z\addons\dayz_code\actions\repair_cancel.sqf","repair", 0, true, false, "",""];
s_player_repairActions set [count s_player_repairActions,_cancel];
s_player_repair_crtl = 1;
s_player_repair_crtl = 1;
};

1
dayz_code/actions/trade_backpacks.sqf
View File

@@ -12,6 +12,7 @@ _textPartIn = (_this select 3) select 5;
_textPartOut = (_this select 3) select 6;
_traderID = (_this select 3) select 7;
_bos = 0;
_bulkqty = 0;
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;

12
dayz_code/actions/trade_weapons.sqf
View File

@@ -1,5 +1,5 @@
private["_iarray","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_isOk"];
// [part_out,part_in, qty_out, qty_in,"buy"];
private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_bulkItem","_bulkqty","_gold_out","_gold_qty_out","_partial_qty_out","_silver_qty_out","_needed","_activatingPlayer","_textPartIn","_textPartOut"];
// [part_out,part_in, qty_out, qty_in,"buy"];
_activatingPlayer = _this select 1;
@@ -12,6 +12,7 @@ _textPartIn = (_this select 3) select 5;
_textPartOut = (_this select 3) select 6;
_traderID = (_this select 3) select 7;
_bos = 0;
_bulkqty = 0;
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
@@ -48,8 +49,6 @@ if (_bulkqty >= 1) then {
};
};
_qty_out = _qty_out * 12;
// gold = 36 copper
@@ -96,11 +95,6 @@ if (_bulkqty >= 1) then {
player addMagazine _part_out;
};
};
cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];

5
dayz_code/actions/vault_pitch.sqf
View File

@@ -4,7 +4,7 @@ call gear_ui_init;
_playerPos = getPosATL player;
_item = _this;
_hastentitem = _this in magazines player;
_location = player modeltoworld [0,2.5,0];
_location = player modeltoworld [0,1,0];
_location set [2,0];
_building = nearestObject [(vehicle player), "HouseBase"];
_isOk = [(vehicle player),_building] call fnc_isInsideBuilding;
@@ -19,6 +19,9 @@ if (!_hastentitem) exitWith {cutText [format[(localize "str_player_31"),_text,"p
//blocked
if (["concrete",dayz_surfaceType] call fnc_inString) then { _isOk = true; diag_log ("surface concrete"); };
if (isOnRoad _playerPos) then { _isOk = true; diag_log ("surface is road"); };
if(!placevault) then { _isOk = true; diag_log ("is trader city"); };
//Block Tents in pounds
_objectsPond = nearestObjects [_playerPos, [], 10];
{