W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1769 from oiad/master

Browse Source 
Advanced trading bugfix, Snap building typo and snap point fixes
This commit is contained in:
ebaydayz
2016-09-24 12:25:14 -04:00
committed by GitHub
parent 40d419e475 c02053176d
commit 7ae35316ed
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SQF/dayz_code/Configs/CfgExtra/snappoints.hpp
View File

@@ -242,8 +242,8 @@ class SnapBuilding {
class Cinder_DZE: FloorsWallsStairs { //All cinder walls and doors class Cinder_DZE: FloorsWallsStairs { //All cinder walls and doors
points[] = { points[] = {
{0,0,0,"Pivot"}, {0,0,0,"Pivot"},
{-2.64, 0, 1.685,"Left"}, {-2.64, 0, 0,"Left"},
{2.64, 0, 1.685,"Right"}, {2.64, 0, 0,"Right"},
{0, 0, 3.37042,"Top"} {0, 0, 3.37042,"Top"}
}; };
radius = 10; radius = 10;
@@ -251,8 +251,8 @@ class SnapBuilding {
class CinderWall_Preview_DZ: Cinder_DZE { class CinderWall_Preview_DZ: Cinder_DZE {
points[] = { points[] = {
{0,0,0,"Pivot"}, {0,0,0,"Pivot"},
{-2.64, 0, 0,"Left"}, {-2.64, 0, -0.009,"Left"},
{2.64, 0, 0,"Right"}, {2.64, 0, -0.009,"Right"},
{0, 0, 1.685,"Top"}, {0, 0, 1.685,"Top"},
{0,0,-1.685,"Bottom"} {0,0,-1.685,"Bottom"}
}; };

2
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_fillBuyableList.sqf
View File

@@ -4,13 +4,13 @@ private ["_index","_count","_type","_name","_weapons","_typeOf"];
_weapons = weapons player; _weapons = weapons player;
_weapons set [count _weapons,dayz_onBack]; _weapons set [count _weapons,dayz_onBack];
_typeOf = typeOf (unitBackPack player); _typeOf = typeOf (unitBackPack player);
_count = 0;
{ {
_index = lbAdd [Z_AT_BUYABLELIST, _x select 3]; _index = lbAdd [Z_AT_BUYABLELIST, _x select 3];
lbSetPicture [Z_AT_BUYABLELIST, _index, _x select 4 ]; lbSetPicture [Z_AT_BUYABLELIST, _index, _x select 4 ];
_name = _x select 0; _name = _x select 0;
_type = _x select 1; _type = _x select 1;
_count = 0;
if (_type in DZE_tradeVehicle) then { if (_type in DZE_tradeVehicle) then {
_count = { local _x } count (nearestObjects [(getPosATL player), [_name], Z_VehicleDistance]); _count = { local _x } count (nearestObjects [(getPosATL player), [_name], Z_VehicleDistance]);

2
SQF/dayz_code/actions/snap_build.sqf
View File

@@ -203,7 +203,7 @@ fnc_initSnapTutorial = {
_bldTxtStringQE = format["<t %1%3%4%5>[Q / E]<t %2>: Rotate object 180 degrees while holding.</t></t><br />",_bldTxtClrO,_bldTxtClrW,_bldTxtSzT,_bldTxtShdw,_bldTxtAlgnL]; _bldTxtStringQE = format["<t %1%3%4%5>[Q / E]<t %2>: Rotate object 180 degrees while holding.</t></t><br />",_bldTxtClrO,_bldTxtClrW,_bldTxtSzT,_bldTxtShdw,_bldTxtAlgnL];
_bldTxtStringQEF = format["<t %1%3%4%5>[Q / E]<t %2>: Rotate object 45 degrees while dropped or snapped.</t></t><br /><br />",_bldTxtClrO,_bldTxtClrW,_bldTxtSzT,_bldTxtShdw,_bldTxtAlgnL]; _bldTxtStringQEF = format["<t %1%3%4%5>[Q / E]<t %2>: Rotate object 45 degrees while dropped or snapped.</t></t><br /><br />",_bldTxtClrO,_bldTxtClrW,_bldTxtSzT,_bldTxtShdw,_bldTxtAlgnL];
_bldTxtStringFD = format["<t %1%3%4%5>[F]<t %2>: Drop / Pick up object.</t></t><br />",_bldTxtClrO,_bldTxtClrW,_bldTxtSzT,_bldTxtShdw,_bldTxtAlgnL]; _bldTxtStringFD = format["<t %1%3%4%5>[F]<t %2>: Drop / Pick up object.</t></t><br />",_bldTxtClrO,_bldTxtClrW,_bldTxtSzT,_bldTxtShdw,_bldTxtAlgnL];
_bldTxtStringFS = format["<t %1%3%4%5>[F]<t %2>: Snap /Pick up object.</t></t><br />",_bldTxtClrO,_bldTxtClrW,_bldTxtSzT,_bldTxtShdw,_bldTxtAlgnL]; _bldTxtStringFS = format["<t %1%3%4%5>[F]<t %2>: Snap / Pick up object.</t></t><br />",_bldTxtClrO,_bldTxtClrW,_bldTxtSzT,_bldTxtShdw,_bldTxtAlgnL];
switch (_bldTxtSwitch) do { switch (_bldTxtSwitch) do {
case "init": { case "init": {
_bldTxtFinal = _bldTxtStringTitle + _bldTxtStringSD + _bldTxtStringPG + _bldTxtStringAPG + _bldTxtStringCPG + _bldTxtStringQE + _bldTxtStringQEF + _bldTxtStringFD; _bldTxtFinal = _bldTxtStringTitle + _bldTxtStringSD + _bldTxtStringPG + _bldTxtStringAPG + _bldTxtStringCPG + _bldTxtStringQE + _bldTxtStringQEF + _bldTxtStringFD;