From d5e808e4d1600b3252342adedf5d4eb99f5b1af7 Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Fri, 31 Mar 2017 15:12:24 -0400 Subject: [PATCH] Lower group icons resource layer Following 12abbfa --- SQF/dayz_code/compile/player_death.sqf | 2 +- SQF/dayz_code/compile/player_traderCity.sqf | 2 +- SQF/dayz_code/compile/ui_updateControls.sqf | 4 ++-- .../external/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf | 4 ++-- SQF/dayz_code/groups/disband.sqf | 2 +- SQF/dayz_code/groups/groupMarkers.sqf | 2 +- SQF/dayz_code/groups/groupTags.sqf | 4 ++-- SQF/dayz_code/groups/handleInvite.sqf | 6 +++--- SQF/dayz_code/groups/leave.sqf | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index 73957f73a..266b921b0 100644 --- a/SQF/dayz_code/compile/player_death.sqf +++ b/SQF/dayz_code/compile/player_death.sqf @@ -152,7 +152,7 @@ _myGroup = group _body; [_body] joinSilent dayz_firstGroup; deleteGroup _myGroup; -80000 cutText ["","PLAIN"]; //Clear group tags +8 cutText ["","PLAIN"]; //Clear group tags 3 cutRsc ["default", "PLAIN",3]; 4 cutRsc ["default", "PLAIN",3]; diff --git a/SQF/dayz_code/compile/player_traderCity.sqf b/SQF/dayz_code/compile/player_traderCity.sqf index 34f892809..d6c269561 100644 --- a/SQF/dayz_code/compile/player_traderCity.sqf +++ b/SQF/dayz_code/compile/player_traderCity.sqf @@ -4,7 +4,7 @@ _traderName = _this select 0; _showText = _this select 1; _enterORleave = _this select 2; -// Do not show cutText when player changes clothes in trader area +// Do not show message when player changes clothes in trader area if ((dayz_lastClothesChange + 3 > diag_tickTime) or (player distance respawn_west_original < 100)) then { _showText = false; }; diff --git a/SQF/dayz_code/compile/ui_updateControls.sqf b/SQF/dayz_code/compile/ui_updateControls.sqf index 0605e85db..7662d29a4 100644 --- a/SQF/dayz_code/compile/ui_updateControls.sqf +++ b/SQF/dayz_code/compile/ui_updateControls.sqf @@ -16,9 +16,9 @@ _holdBreath = if (count (actionKeys "HoldBreath") > 1) then { [true,localize "ST _turboKey = if (count (actionKeys "Turbo") > 0) then { [true,localize "STR_UI_HOLD_TURBO"] } else { [false,""] }; if ((_holdBreath select 0) or (_turboKey select 0)) then { - 4100002 cutRsc ["DZ_BlackScreen","PLAIN"]; + 16 cutRsc ["DZ_BlackScreen","PLAIN"]; (uiNamespace getVariable "DZ_BlackScreen") displayCtrl 1 ctrlSetText format ["%1\n%2", (_holdBreath select 1), (_turboKey select 1)]; } else { - 4100002 cutText ["","PLAIN"]; + 16 cutText ["","PLAIN"]; }; */ \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 53296b5c0..e2cd11d29 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -25,7 +25,7 @@ R3F_TIRED_FNCT_Voile_Noir = { R3F_TIRED_ForceWalk = false; R3F_TIRED_FNCT_Overburdened = { - localize "STR_R3F_WEIGHT_Overburdened" call dayz_rollingMessages; + [localize "STR_R3F_WEIGHT_Overburdened",1] call dayz_rollingMessages; if (!R3F_TIRED_ForceWalk) then { R3F_TIRED_ForceWalk = true; @@ -44,7 +44,7 @@ R3F_TIRED_FNCT_Overburdened = { }; R3F_TIRED_ForceWalk = false; player forceWalk false; - cutText ["","PLAIN DOWN"]; // Clear overburdened message + ["",1] call dayz_rollingMessages; // Clear overburdened message }; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/groups/disband.sqf b/SQF/dayz_code/groups/disband.sqf index d9991dfe5..f4ec76e96 100644 --- a/SQF/dayz_code/groups/disband.sqf +++ b/SQF/dayz_code/groups/disband.sqf @@ -15,5 +15,5 @@ dayz_groupDisbandThread = _group spawn { deleteGroup _this; terminate dayz_groupTags; - 80000 cutText ["","PLAIN"]; + 8 cutText ["","PLAIN"]; }; \ No newline at end of file diff --git a/SQF/dayz_code/groups/groupMarkers.sqf b/SQF/dayz_code/groups/groupMarkers.sqf index 54f0f8ede..754eb2d7f 100644 --- a/SQF/dayz_code/groups/groupMarkers.sqf +++ b/SQF/dayz_code/groups/groupMarkers.sqf @@ -8,7 +8,7 @@ while {true} do { [player] joinSilent grpNull; if (!isNull findDisplay 80000) then {findDisplay 80000 closeDisplay 2;}; terminate dayz_groupTags; - 80000 cutText ["","PLAIN"]; + 8 cutText ["","PLAIN"]; localize "STR_EPOCH_LOST_RADIO_CONTACT" call dayz_rollingMessages; } else { if (_inGroup && scriptDone dayz_groupTags) then { diff --git a/SQF/dayz_code/groups/groupTags.sqf b/SQF/dayz_code/groups/groupTags.sqf index 0e9d72539..9d57fb0c9 100644 --- a/SQF/dayz_code/groups/groupTags.sqf +++ b/SQF/dayz_code/groups/groupTags.sqf @@ -41,12 +41,12 @@ _refresh = { while {true} do { waitUntil {uiSleep 1; DRAW_TAGS}; - 80000 cutRsc ["DZ_GroupTags","PLAIN"]; + 8 cutRsc ["DZ_GroupTags","PLAIN"]; while {DRAW_TAGS} do { call _refresh; //Must be called to finish in current frame uiSleep 0.01; }; - 80000 cutText ["","PLAIN"]; + 8 cutText ["","PLAIN"]; }; \ No newline at end of file diff --git a/SQF/dayz_code/groups/handleInvite.sqf b/SQF/dayz_code/groups/handleInvite.sqf index 33012959e..5051d23b3 100644 --- a/SQF/dayz_code/groups/handleInvite.sqf +++ b/SQF/dayz_code/groups/handleInvite.sqf @@ -15,7 +15,7 @@ if (typeName _add == "SCALAR") exitWith { if (_uid == getPlayerUID player) then { localize "STR_EPOCH_GROUP_KICKED" call dayz_rollingMessages; terminate dayz_groupTags; - 80000 cutText ["","PLAIN"]; + 8 cutText ["","PLAIN"]; } else { systemChat format[localize "STR_EPOCH_PLAYER_KICKED",name (_uid call dayz_getPlayer)]; }; @@ -24,13 +24,13 @@ if (typeName _add == "SCALAR") exitWith { systemChat format[localize "STR_EPOCH_PLAYER_LEFT",_uid]; if (count (player call dayz_filterGroup) == 1) then { terminate dayz_groupTags; - 80000 cutText ["","PLAIN"]; + 8 cutText ["","PLAIN"]; }; }; case 4: { localize "STR_EPOCH_GROUP_DISBANDED" call dayz_rollingMessages; terminate dayz_groupTags; - 80000 cutText ["","PLAIN"]; + 8 cutText ["","PLAIN"]; }; }; }; diff --git a/SQF/dayz_code/groups/leave.sqf b/SQF/dayz_code/groups/leave.sqf index bba4e430d..5eeeb2dd4 100644 --- a/SQF/dayz_code/groups/leave.sqf +++ b/SQF/dayz_code/groups/leave.sqf @@ -13,5 +13,5 @@ dayz_groupLeaveThread = [] spawn { [player] joinSilent grpNull; terminate dayz_groupTags; - 80000 cutText ["","PLAIN"]; + 8 cutText ["","PLAIN"]; }; \ No newline at end of file