diff --git a/SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp b/SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp index d2de1979e..089075f89 100644 --- a/SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp @@ -212,7 +212,7 @@ class TraderDialog y = 0.720064 * safezoneH + safezoneY; w = 0.1287436 * safezoneW; h = 0.055016 * safezoneH; - onButtonClick = "[[],0] call epoch_returnChange; ((ctrlParent (_this select 0)) closeDisplay 9000); cutText [localize ""STR_EPOCH_PLAYER_307"",""PLAIN DOWN""];"; + onButtonClick = "[[],0] call epoch_returnChange; ((ctrlParent (_this select 0)) closeDisplay 9000); localize ""STR_EPOCH_PLAYER_307"" call dayz_rollingMessages;"; }; class RscTextTraderDialog_1003: RscTextTraderDialog { diff --git a/SQF/dayz_code/actions/ammo.sqf b/SQF/dayz_code/actions/ammo.sqf index d72f9fab8..fc0794b58 100644 --- a/SQF/dayz_code/actions/ammo.sqf +++ b/SQF/dayz_code/actions/ammo.sqf @@ -20,7 +20,7 @@ if (_ammo != "") then { _vehicle removeMagazineTurret [_ammo,_turret]; _vehicle addMagazineTurret [_ammo,_turret]; player removeMagazine _ammo; - cutText [format [localize "str_player_ammo_successful",_ammoType], "PLAIN DOWN"]; + format[localize "str_player_ammo_successful",_ammoType] call dayz_rollingMessages; } else { - cutText [format [localize "str_player_ammo_fail",_text], "PLAIN DOWN"]; + format[localize "str_player_ammo_fail",_text] call dayz_rollingMessages; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/boil.sqf b/SQF/dayz_code/actions/boil.sqf index 55a8d40c0..b2d561684 100644 --- a/SQF/dayz_code/actions/boil.sqf +++ b/SQF/dayz_code/actions/boil.sqf @@ -1,6 +1,6 @@ private ["_bottletext","_tin1text","_tin2text","_tintext","_hasbottleitem","_hastinitem","_qty","_dis","_sfx","_bottleInfected","_msg"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_22","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_22" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _bottletext = getText (configFile >> "CfgMagazines" >> "ItemWaterBottle" >> "displayName"); @@ -19,8 +19,8 @@ _bottleInfected = if ("ItemWaterBottleInfected" in magazines player) then {true} if (_x in magazines player) exitWith {_hastinitem = true;}; } count boil_tin_cans; -if (!_hasbottleitem) exitWith {cutText [format [localize "str_player_31",_bottletext,localize "str_player_31_fill"] , "PLAIN DOWN"]; a_player_boil = false;}; -if (!_hastinitem) exitWith {cutText [format [localize "str_player_31",_tintext,localize "str_player_31_fill"] , "PLAIN DOWN"]; a_player_boil = false;}; +if (!_hasbottleitem) exitWith {format[localize "str_player_31",_bottletext,localize "str_player_31_fill"] call dayz_rollingMessages; a_player_boil = false;}; +if (!_hastinitem) exitWith {format[localize "str_player_31",_tintext,localize "str_player_31_fill"] call dayz_rollingMessages; a_player_boil = false;}; if (_hasbottleitem and _hastinitem) then { _qty = 0; @@ -56,11 +56,11 @@ if (_hasbottleitem and _hastinitem) then { player addMagazine "ItemWaterBottleBoiled"; }; }; - //cutText [format [localize "str_player_boiledwater",_qty], "PLAIN DOWN"]; + //format[localize "str_player_boiledwater",_qty] call dayz_rollingMessages; _msg = format [localize "str_player_boiledwater",_qty]; _msg call dayz_rollingMessages; } else { - //cutText [localize "str_player_02", "PLAIN DOWN"]; + //localize "str_player_02" call dayz_rollingMessages; _msg = format [localize "str_player_boiledwater",_qty]; _msg = localize "str_player_02"; _msg call dayz_rollingMessages; diff --git a/SQF/dayz_code/actions/cook.sqf b/SQF/dayz_code/actions/cook.sqf index bc26c4658..e77016060 100644 --- a/SQF/dayz_code/actions/cook.sqf +++ b/SQF/dayz_code/actions/cook.sqf @@ -1,5 +1,5 @@ private ["_rawmeat","_cookedmeat","_meat","_meatcooked","_text","_qty","_dis","_sfx"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_23","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_23" call dayz_rollingMessages;}; DZE_ActionInProgress = true; //diag_log ("Cook Enabled"); player removeAction s_player_cook; @@ -26,9 +26,9 @@ a_player_cooking = true; for "_x" from 1 to _qty do { player removeMagazine _meat; player addMagazine _meatcooked; - if !(_meat in magazines player) exitWith {cutText [format [localize "str_player_31",_text,localize "str_player_31_cook"] , "PLAIN DOWN"]}; + if !(_meat in magazines player) exitWith {format[localize "str_player_31",_text,localize "str_player_31_cook"] call dayz_rollingMessages;}; }; - cutText [format [localize "str_success_cooked",_qty,_text], "PLAIN DOWN"]; + format[localize "str_success_cooked",_qty,_text] call dayz_rollingMessages; }; } forEach _rawmeat; diff --git a/SQF/dayz_code/actions/dog/feed.sqf b/SQF/dayz_code/actions/dog/feed.sqf index dc10cf3c0..55ac4d7b8 100644 --- a/SQF/dayz_code/actions/dog/feed.sqf +++ b/SQF/dayz_code/actions/dog/feed.sqf @@ -4,7 +4,7 @@ _handle = _array select 0; _type = _array select 1; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {cutText [localize "str_player_21","PLAIN DOWN"]}; +if (_onLadder) exitWith {localize "str_player_21" call dayz_rollingMessages;}; player playActionNow "PutDown"; diff --git a/SQF/dayz_code/actions/dog/player_tameDog.sqf b/SQF/dayz_code/actions/dog/player_tameDog.sqf index 994df173f..7bfe5bd75 100644 --- a/SQF/dayz_code/actions/dog/player_tameDog.sqf +++ b/SQF/dayz_code/actions/dog/player_tameDog.sqf @@ -18,7 +18,7 @@ if ((_hasRawMeat) && (_hasdog == "false")) then { _target removeAction _id; player setvariable ["dogid", _fsmid]; } else { - cutText [localize "str_epoch_player_18","PLAIN DOWN"]; + localize "str_epoch_player_18" call dayz_rollingMessages; }; //handle publicVariables here later. diff --git a/SQF/dayz_code/actions/dog/tame_dog.sqf b/SQF/dayz_code/actions/dog/tame_dog.sqf index 70f1cc7cd..67a09186d 100644 --- a/SQF/dayz_code/actions/dog/tame_dog.sqf +++ b/SQF/dayz_code/actions/dog/tame_dog.sqf @@ -56,8 +56,8 @@ if(_removed == _countIn) then { _dog setVariable ["fsm_handle", _fsmid]; _dog setVariable ["CharacterID", dayz_characterID, true]; - cutText [format[(localize "str_epoch_player_173"),_textRemoved], "PLAIN DOWN"]; + format[localize "str_epoch_player_173",_textRemoved] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_174"),_textRemoved], "PLAIN DOWN"]; + format[localize "str_epoch_player_174",_textRemoved] call dayz_rollingMessages; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/fill_nearestVehicle.sqf b/SQF/dayz_code/actions/fill_nearestVehicle.sqf index c1dc5c6ef..e01de3b5d 100644 --- a/SQF/dayz_code/actions/fill_nearestVehicle.sqf +++ b/SQF/dayz_code/actions/fill_nearestVehicle.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_isMedic","_abort","_canSize","_configVeh","_capacity","_nameText","_isOk","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle","_isVehicle","_configSrcVeh","_capacitySrc","_nameTextSrc","_isFillok","_curFuelSrc","_newFuelSrc","_vehicleSrc"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_24","PLAIN DOWN"]}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_24" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _isVehicle = false; @@ -47,7 +47,7 @@ if(_IsNearVehicle >= 1) then { // qty to add per loop _canSize = (_capacity / 10); - cutText [format[(localize "str_epoch_player_131"),_nameText], "PLAIN DOWN"]; + format[localize "str_epoch_player_131",_nameText] call dayz_rollingMessages; // alert zombies [player,20,true,(getPosATL player)] spawn player_alertZombies; @@ -138,7 +138,7 @@ if(_IsNearVehicle >= 1) then { // Play sound [player,"refuel",0,false] call dayz_zombieSpeak; - cutText [format[(localize "str_epoch_player_132"),_nameText,round(_newFuel*100)], "PLAIN DOWN"]; + format[localize "str_epoch_player_132",_nameText,round(_newFuel*100)] call dayz_rollingMessages; }; }; @@ -147,6 +147,6 @@ if(_IsNearVehicle >= 1) then { }; } else { - cutText [localize "str_epoch_player_27","PLAIN DOWN"]; + localize "str_epoch_player_27" call dayz_rollingMessages; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/fill_startGenerator.sqf b/SQF/dayz_code/actions/fill_startGenerator.sqf index 3273fb168..793ea019a 100644 --- a/SQF/dayz_code/actions/fill_startGenerator.sqf +++ b/SQF/dayz_code/actions/fill_startGenerator.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_started","_finished","_animState","_isMedic","_soundSource"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_24","PLAIN DOWN"]}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_24" call dayz_rollingMessages;}; DZE_ActionInProgress = true; player removeAction s_player_fillgen; @@ -19,7 +19,7 @@ r_doLoop = true; _started = false; _finished = false; -cutText [localize "str_epoch_player_25","PLAIN DOWN"]; +localize "str_epoch_player_25" call dayz_rollingMessages; [player,50,true,(getPosATL player)] spawn player_alertZombies; @@ -46,7 +46,7 @@ if(!_finished) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_26","PLAIN DOWN"]; + localize "str_epoch_player_26" call dayz_rollingMessages; }; if (_finished) then { @@ -69,10 +69,9 @@ if (_finished) then { _vehicle setVariable ["GeneratorSound", _soundSource,true]; - cutText [localize "str_epoch_player_28","PLAIN DOWN"]; + localize "str_epoch_player_28" call dayz_rollingMessages; }; - } else { - + } else { // Start generator _vehicle setVariable ["GeneratorRunning", true,true]; @@ -82,8 +81,7 @@ if (_finished) then { _vehicle setVariable ["GeneratorSound", _soundSource,true]; - cutText [localize "str_epoch_player_28","PLAIN DOWN"]; - + localize "str_epoch_player_28" call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/fire_pack.sqf b/SQF/dayz_code/actions/fire_pack.sqf index ab9aaa630..d7d4b7a2e 100644 --- a/SQF/dayz_code/actions/fire_pack.sqf +++ b/SQF/dayz_code/actions/fire_pack.sqf @@ -9,6 +9,6 @@ if (_obj isKindOf "Land_fire") then { deleteVehicle _obj; }; -cutText [localize "str_fireplace_removed", "PLAIN DOWN"]; +localize "str_fireplace_removed" call dayz_rollingMessages; player removeAction s_player_fireout; s_player_fireout = -1; \ No newline at end of file diff --git a/SQF/dayz_code/actions/gather_meat.sqf b/SQF/dayz_code/actions/gather_meat.sqf index 2ebf628e2..253e22599 100644 --- a/SQF/dayz_code/actions/gather_meat.sqf +++ b/SQF/dayz_code/actions/gather_meat.sqf @@ -1,5 +1,5 @@ private ["_item","_type","_hasHarvested","_config","_knifeArray","_PlayerNear","_isListed","_activeKnife","_text","_dis","_sfx","_sharpnessRemaining","_qty","_chance","_msg","_string"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_29","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_29" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _item = _this select 3; @@ -13,7 +13,7 @@ player removeAction s_player_butcher; s_player_butcher = -1; _PlayerNear = {isPlayer _x} count ((getPosATL _item) nearEntities ["CAManBase", 10]) > 1; -if (_PlayerNear) exitWith {cutText [localize "str_pickup_limit_5", "PLAIN DOWN"]; DZE_ActionInProgress = false;}; +if (_PlayerNear) exitWith {localize "str_pickup_limit_5" call dayz_rollingMessages; DZE_ActionInProgress = false;}; //Count how many active tools the player has { @@ -22,7 +22,7 @@ if (_PlayerNear) exitWith {cutText [localize "str_pickup_limit_5", "PLAIN DOWN"] }; } count Dayz_Gutting; -if ((count _knifeArray) < 1) exitwith { cutText [localize "str_cannotgut", "PLAIN DOWN"]; DZE_ActionInProgress = false; }; +if ((count _knifeArray) < 1) exitWith { localize "str_cannotgut" call dayz_rollingMessages; DZE_ActionInProgress = false; }; if ((count _knifeArray > 0) and !_hasHarvested) then { @@ -90,7 +90,6 @@ if ((count _knifeArray > 0) and !_hasHarvested) then { _string = format[localize "str_success_gutted_animal",_text,_qty]; closeDialog 0; uiSleep 0.02; - //cutText [_string, "PLAIN DOWN"]; _string call dayz_rollingMessages; }; DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/gather_zparts.sqf b/SQF/dayz_code/actions/gather_zparts.sqf index b98c838e3..d30d55181 100644 --- a/SQF/dayz_code/actions/gather_zparts.sqf +++ b/SQF/dayz_code/actions/gather_zparts.sqf @@ -1,5 +1,5 @@ private ["_item","_type","_hasHarvested","_config","_knifeArray","_playerNear","_isListed","_activeKnife","_text","_sharpnessRemaining","_qty","_chance","_msg","_string"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_31","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_31" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _item = _this select 3; @@ -11,14 +11,14 @@ player removeAction s_player_butcher; s_player_butcher = -1; _playerNear = {isPlayer _x} count ((getPosATL _item) nearEntities ["CAManBase", 10]) > 1; -if (_playerNear) exitWith {cutText [localize "str_pickup_limit_5","PLAIN DOWN"]; DZE_ActionInProgress = false;}; +if (_playerNear) exitWith {localize "str_pickup_limit_5" call dayz_rollingMessages; DZE_ActionInProgress = false;}; //Count how many active tools the player has { if (_x in items player) then {_knifeArray set [count _knifeArray, _x];}; } count Dayz_Gutting; -if ((count _knifeArray) < 1) exitWith {cutText [localize "str_cannotgut","PLAIN DOWN"]; DZE_ActionInProgress = false; }; +if ((count _knifeArray) < 1) exitWith {localize "str_cannotgut" call dayz_rollingMessages; DZE_ActionInProgress = false; }; if ((count _knifeArray > 0) && !_hasHarvested) then { private "_qty"; @@ -79,7 +79,6 @@ if ((count _knifeArray > 0) && !_hasHarvested) then { _string = format[localize "str_success_gutted_animal",_text,_qty]; //%1 has been gutted, %2 meat steaks now on the carcass closeDialog 0; uiSleep 0.02; - //cutText [_string, "PLAIN DOWN"]; _string call dayz_rollingMessages; }; DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/hotwire_veh.sqf b/SQF/dayz_code/actions/hotwire_veh.sqf index 00bd4bfce..e386ea25f 100644 --- a/SQF/dayz_code/actions/hotwire_veh.sqf +++ b/SQF/dayz_code/actions/hotwire_veh.sqf @@ -1,7 +1,7 @@ private ["_vehicle","_removed"]; _vehicle = _this select 3; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_32","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_32" call dayz_rollingMessages;}; DZE_ActionInProgress = true; {player removeAction _x} count s_player_lockunlock;s_player_lockunlock = []; @@ -25,7 +25,7 @@ if (_removed == 1) then { }; }; } else { - cutText [localize "str_epoch_player_33","PLAIN DOWN"]; + localize "str_epoch_player_33" call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/jerry_fill.sqf b/SQF/dayz_code/actions/jerry_fill.sqf index 14bc7eb21..a8b84c309 100644 --- a/SQF/dayz_code/actions/jerry_fill.sqf +++ b/SQF/dayz_code/actions/jerry_fill.sqf @@ -1,4 +1,4 @@ -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_34","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_34" call dayz_rollingMessages;}; DZE_ActionInProgress = true; private ["_qty","_dis","_sfx","_started","_finished","_animState","_isRefuel","_fuelcans","_qty20","_qty5","_qty40"]; @@ -58,8 +58,8 @@ if (("ItemJerrycanEmpty" in magazines player) or ("ItemFuelcanEmpty" in magazine }; }; - cutText [format [localize "str_player_09",_qty], "PLAIN DOWN"]; + format[localize "str_player_09",_qty] call dayz_rollingMessages; } else { - cutText [localize "str_player_10", "PLAIN DOWN"]; + localize "str_player_10" call dayz_rollingMessages; }; DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/list_playerDeaths.sqf b/SQF/dayz_code/actions/list_playerDeaths.sqf index fd04ffdc5..1906562b9 100644 --- a/SQF/dayz_code/actions/list_playerDeaths.sqf +++ b/SQF/dayz_code/actions/list_playerDeaths.sqf @@ -9,6 +9,6 @@ if((count PVDZE_plr_DeathBResult) > 0) then { // load death message board ui call EpochDeathBoardLoad; } else { - cutText [localize "str_epoch_player_36","PLAIN DOWN"]; + localize "str_epoch_player_36" call dayz_rollingMessages; PVDZE_plr_DeathBResult = nil; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/list_playerDeathsAlt.sqf b/SQF/dayz_code/actions/list_playerDeathsAlt.sqf index c94c9ec3e..6cf86176f 100644 --- a/SQF/dayz_code/actions/list_playerDeathsAlt.sqf +++ b/SQF/dayz_code/actions/list_playerDeathsAlt.sqf @@ -11,6 +11,6 @@ if((count PVDZE_plr_DeathBResult) > 0) then { // load death message board ui call EpochDeathBoardLoad; } else { - cutText [localize "str_epoch_player_36","PLAIN DOWN"]; + localize "str_epoch_player_36" call dayz_rollingMessages; PVDZE_plr_DeathBResult = nil; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/lock_veh.sqf b/SQF/dayz_code/actions/lock_veh.sqf index d40860529..f3fd7bafe 100644 --- a/SQF/dayz_code/actions/lock_veh.sqf +++ b/SQF/dayz_code/actions/lock_veh.sqf @@ -1,7 +1,7 @@ private["_vehicle"]; _vehicle = _this select 3; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_37","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_37" call dayz_rollingMessages;}; DZE_ActionInProgress = true; {player removeAction _x} count s_player_lockunlock;s_player_lockunlock = []; diff --git a/SQF/dayz_code/actions/maintain_area.sqf b/SQF/dayz_code/actions/maintain_area.sqf index 8624893d9..42d4eddcb 100644 --- a/SQF/dayz_code/actions/maintain_area.sqf +++ b/SQF/dayz_code/actions/maintain_area.sqf @@ -1,7 +1,7 @@ //Code developed by Axe Cop - Massiv improvments and performance tunes by Skaronator private ["_missing","_missingQty","_proceed","_itemIn","_countIn","_qty","_num_removed","_uniqueID","_removed","_removed_total","_tobe_removed_total","_obj","_objectID","_objectUID","_classname","_location","_dir","_objectCharacterID","_object","_temp_removed_array","_textMissing","_target","_objectClasses","_range","_objects","_requirements","_count","_cost","_itemText","_option"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "STR_EPOCH_ACTIONS_2","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "STR_EPOCH_ACTIONS_2" call dayz_rollingMessages;}; DZE_ActionInProgress = true; player removeAction s_player_maintain_area; @@ -28,7 +28,7 @@ _objects = _objects_filtered; _count = count _objects; if (_count == 0) exitWith { - cutText [format[(localize "STR_EPOCH_ACTIONS_22"), _count], "PLAIN DOWN"]; + format[localize "STR_EPOCH_ACTIONS_22",_count] call dayz_rollingMessages; DZE_ActionInProgress = false; s_player_maintain_area = -1; s_player_maintain_area_preview = -1; @@ -96,16 +96,16 @@ switch _option do { // all required items removed from player gear if (_tobe_removed_total == _removed_total) then { - cutText [format[(localize "STR_EPOCH_ACTIONS_4"), _count], "PLAIN DOWN", 5]; + format[localize "STR_EPOCH_ACTIONS_4",_count] call dayz_rollingMessages; PVDZE_maintainArea = [player,1,_target]; publicVariableServer "PVDZE_maintainArea"; } else { {player addMagazine _x;} count _temp_removed_array; - cutText [format[(localize "STR_EPOCH_PLAYER_145"),_removed_total,_tobe_removed_total], "PLAIN DOWN"]; + format[localize "STR_EPOCH_PLAYER_145",_removed_total,_tobe_removed_total] call dayz_rollingMessages; }; } else { _textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName"); - cutText [format[(localize "STR_EPOCH_ACTIONS_6"), _missingQty, _textMissing], "PLAIN DOWN"]; + format[localize "STR_EPOCH_ACTIONS_6",_missingQty,_textMissing] call dayz_rollingMessages; }; }; case "preview": { @@ -119,7 +119,7 @@ switch _option do { }; _cost = _cost + (str(_countIn) + " of " + _itemText); } count _requirements; - cutText [format[(localize "STR_EPOCH_ACTIONS_7"), _count, _cost], "PLAIN DOWN"]; + format[localize "STR_EPOCH_ACTIONS_7",_count,_cost] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/modular_build.sqf b/SQF/dayz_code/actions/modular_build.sqf index cf0961d52..60e68ebfa 100644 --- a/SQF/dayz_code/actions/modular_build.sqf +++ b/SQF/dayz_code/actions/modular_build.sqf @@ -3,7 +3,7 @@ if (!isNil "_this" && {typeName _this == "ARRAY"} && {count _this > 0}) exitWith private ["_classname","_classnametmp","_require","_text","_ghost","_lockable","_requireplot","_isAllowedUnderGround","_offset","_isPole","_isLandFireDZ","_hasRequired","_hasrequireditem","_reason","_buildObject","_location1","_object","_objectHelper","_position","_controls","_cancel","_dir","_cnt","_pos","_distance","_buildables","_onLadder","_vehicle","_inVehicle","_abort","_needNear","_isNear","_needText","_findNearestPoles","_findNearestPole","_IsNearPlot","_canBuildOnPlot","_nearestPole","_ownerID","_friendlies","_missing","_checkMag","_enableGhost","_helperColor","_canDo","_objHDiff","_isOk","_zheightchanged","_zheightdirection","_rotate","_location2","_lastDir","_objectHelperDir","_objectHelperPos","_tmpbuilt","_limit","_proceed","_counter","_dis","_sfx","_started","_finished","_animState","_isMedic","_num_removed","_combinationDisplay","_combination_1","_combination_2","_combination_3","_combination_4","_combination","_combination_1_Display"]; //Check if building already in progress, exit if so. -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_40","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_40" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _pos = [player] call FNC_GetPos; @@ -32,10 +32,10 @@ DZE_cancelBuilding = false; call gear_ui_init; closeDialog 1; -if (dayz_isSwimming) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_26","PLAIN DOWN"];}; -if (_inVehicle) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_42","PLAIN DOWN"];}; -if (_onLadder) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_21","PLAIN DOWN"];}; -if (player getVariable["combattimeout",0] >= diag_tickTime) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_43","PLAIN DOWN"];}; +if (dayz_isSwimming) exitWith {DZE_ActionInProgress = false; localize "str_player_26" call dayz_rollingMessages;}; +if (_inVehicle) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_42" call dayz_rollingMessages;}; +if (_onLadder) exitWith {DZE_ActionInProgress = false; localize "str_player_21" call dayz_rollingMessages;}; +if (player getVariable["combattimeout",0] >= diag_tickTime) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_43" call dayz_rollingMessages;}; DZE_buildItem = _this; //This is a magazine! It's global to allow access to it from outside functions @@ -78,7 +78,7 @@ _needNear = getArray (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActi } forEach _needNear; if (_abort) exitWith { - cutText [format[(localize "str_epoch_player_135"),_reason,_distance], "PLAIN DOWN"]; + format[localize "str_epoch_player_135",_reason,_distance] call dayz_rollingMessages; DZE_ActionInProgress = false; }; @@ -135,7 +135,7 @@ _findNearestPole = []; //must define an empty array to avoid problems _IsNearPlot = count (_findNearestPole); //count our new array of non-destroyed plotpoles. Empty array will return 0 // End script if item is plot pole and another one exists within defined radius -if(_isPole && _IsNearPlot > 0) exitWith {DZE_ActionInProgress = false;cutText [(format [localize "str_epoch_player_44",_distance]),"PLAIN DOWN"];}; +if(_isPole && _IsNearPlot > 0) exitWith {DZE_ActionInProgress = false; format[localize "str_epoch_player_44",_distance] call dayz_rollingMessages;}; if(_IsNearPlot == 0) then { //No live plotpoles were found nearby // Allow building of plot @@ -168,12 +168,12 @@ if(_IsNearPlot == 0) then { //No live plotpoles were found nearby }; }; -if(!_canBuildOnPlot) exitWith { DZE_ActionInProgress = false;cutText [format[(localize "STR_EPOCH_PLAYER_135"),_needText,_distance],"PLAIN DOWN"];}; +if(!_canBuildOnPlot) exitWith { DZE_ActionInProgress = false; format[localize "STR_EPOCH_PLAYER_135",_needText,_distance] call dayz_rollingMessages;}; _buildables = DZE_maintainClasses + DZE_LockableStorage + ["DZ_buildables"]; _buildables set [count _buildables,"TentStorage"]; _center = if (isNull _nearestPole) then {_pos} else {_nearestPole}; -if ((count (nearestObjects [_center,_buildables,_distance])) >= DZE_BuildingLimit) exitWith {DZE_ActionInProgress = false;cutText [(format [localize "str_epoch_player_41",_distance]),"PLAIN DOWN"];}; +if ((count (nearestObjects [_center,_buildables,_distance])) >= DZE_BuildingLimit) exitWith {DZE_ActionInProgress = false; format[localize "str_epoch_player_41",_distance] call dayz_rollingMessages;}; _missing = ""; _hasrequireditem = true; @@ -183,9 +183,9 @@ _hasrequireditem = true; } count _require; //count each item in requirements array _hasbuilditem = DZE_buildItem in magazines player; -if (!_hasbuilditem) exitWith {DZE_ActionInProgress = false;cutText [format[(localize "str_player_31"),_text,"build"],"PLAIN DOWN"];}; +if (!_hasbuilditem) exitWith {DZE_ActionInProgress = false; format[localize "str_player_31",_text,"build"] call dayz_rollingMessages;}; -if (!_hasrequireditem) exitWith {DZE_ActionInProgress = false;cutText [format[(localize "str_epoch_player_137"),_missing],"PLAIN DOWN"];}; +if (!_hasrequireditem) exitWith {DZE_ActionInProgress = false; format[localize "str_epoch_player_137",_missing] call dayz_rollingMessages;}; if (_hasrequireditem) then { _objectHelper = objNull; @@ -450,7 +450,7 @@ if (_hasrequireditem) then { _tmpbuilt setPosATL _location; }; - cutText [format[(localize "str_epoch_player_138"),_text], "PLAIN DOWN"]; + format[localize "str_epoch_player_138",_text] call dayz_rollingMessages; _limit = 3; //times it takes to build by default @@ -509,7 +509,7 @@ if (_hasrequireditem) then { _counter = _counter + 1; }; - cutText [format[(localize "str_epoch_player_139"),_text, _counter,_limit], "PLAIN DOWN"]; //report how many steps are done out of total limit + format[localize "str_epoch_player_139",_text, _counter,_limit] call dayz_rollingMessages; //report how many steps are done out of total limit if(_counter == _limit) exitWith { //if all steps done proceed with next step, otherwise cancel publish _isOk = false; @@ -523,7 +523,7 @@ if (_hasrequireditem) then { _num_removed = ([player,DZE_buildItem] call BIS_fnc_invRemove); //remove item's magazine from inventory if(_num_removed == 1) then { - cutText [format[localize "str_build_01",_text], "PLAIN DOWN"]; + format[localize "str_build_01",_text] call dayz_rollingMessages; if (_isPole) then { //if item was a plotpole, build a visual radius around it [] spawn player_plotPreview; @@ -581,8 +581,8 @@ if (_hasrequireditem) then { PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],[]]; publicVariableServer "PVDZ_obj_Publish"; - cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5]; //display new combination - systemChat format [(localize "str_epoch_player_140"),_combinationDisplay,_text]; + format[localize "str_epoch_player_140",_combinationDisplay,_text] call dayz_rollingMessages; //display new combination + systemChat format[localize "str_epoch_player_140",_combinationDisplay,_text]; } else { //if not lockable item _tmpbuilt setVariable ["CharacterID",dayz_characterID,true]; @@ -597,7 +597,7 @@ if (_hasrequireditem) then { }; } else { //if magazine was not removed, cancel publish deleteVehicle _tmpbuilt; - cutText [localize "str_epoch_player_46","PLAIN DOWN"]; + localize "str_epoch_player_46" call dayz_rollingMessages; }; } else { //if player was interrupted, cancel publish and stop build animations @@ -609,11 +609,11 @@ if (_hasrequireditem) then { deleteVehicle _tmpbuilt; - cutText [localize "str_epoch_player_46","PLAIN DOWN"]; + localize "str_epoch_player_46" call dayz_rollingMessages; }; } else { //cancel build if passed _cancel arg was true or building on roads/trader city - cutText [format[(localize "str_epoch_player_47"),_text,_reason], "PLAIN DOWN"]; + format[localize "str_epoch_player_47",_text,_reason] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/object_build.sqf b/SQF/dayz_code/actions/object_build.sqf index a78c34941..b59c9363c 100644 --- a/SQF/dayz_code/actions/object_build.sqf +++ b/SQF/dayz_code/actions/object_build.sqf @@ -79,7 +79,7 @@ if (_build) then { publicVariableServer "PVDZ_obj_Publish"; diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; - cutText [format [localize "str_build_01",_text], "PLAIN DOWN"]; + format[localize "str_build_01",_text] call dayz_rollingMessages; r_action_count = 0; } else { r_action_count = 0; @@ -91,7 +91,7 @@ if (_build) then { player addMagazine _x; }; } foreach _items; - cutText [format [localize "str_build_failed_02",_text], "PLAIN DOWN"]; + format[localize "str_build_failed_02",_text] call dayz_rollingMessages; }; diff --git a/SQF/dayz_code/actions/object_disassembly.sqf b/SQF/dayz_code/actions/object_disassembly.sqf index a3a5f4edb..ec49ce667 100644 --- a/SQF/dayz_code/actions/object_disassembly.sqf +++ b/SQF/dayz_code/actions/object_disassembly.sqf @@ -12,7 +12,7 @@ if ((isNil "_cursorTarget") or {(isNull _cursorTarget)}) then { }; if(isNull _cursorTarget) exitWith { - //cutText [localize "str_disassembleNoOption", "PLAIN DOWN"]; + //localize "str_disassembleNoOption" call dayz_rollingMessages; _msg = localize "str_disassembleNoOption"; _msg call dayz_rollingMessages; }; @@ -65,7 +65,7 @@ for "_i" from 1 to 20 do { } count _requiredTools; if (!_toolsOK) exitWith { - //cutText [format [localize "str_disassembleMissingTool",getText (configFile >> "CfgWeapons" >> _x >> "displayName"),_displayname], "PLAIN DOWN"];//["Missing %1 to disassemble %2." + //format[localize "str_disassembleMissingTool",getText (configFile >> "CfgWeapons" >> _x >> "displayName"),_displayname] call dayz_rollingMessages;//["Missing %1 to disassemble %2." _msg = format [localize "str_disassembleMissingTool",getText (configFile >> "CfgWeapons" >> _x >> "displayName"),_displayname]; _msg call dayz_rollingMessages; }; @@ -169,7 +169,7 @@ if (!_realObjectStillThere) then { _msg = localize "str_disassembleDone"; _msg call dayz_rollingMessages; -//cutText [localize "str_disassembleDone", "PLAIN DOWN"]; +//localize "str_disassembleDone" call dayz_rollingMessages; _cursorTarget setVariable["ObjectLocked",0,true]; diff --git a/SQF/dayz_code/actions/object_dismantle.sqf b/SQF/dayz_code/actions/object_dismantle.sqf index 166ecaf1f..835495352 100644 --- a/SQF/dayz_code/actions/object_dismantle.sqf +++ b/SQF/dayz_code/actions/object_dismantle.sqf @@ -33,7 +33,7 @@ _tools = getArray (configFile >> "CfgVehicles" >> (typeOf _object) >> "dismantle { private ["_end"]; - if ((_x select 0) in items player) then {_end = false;} else { cutText [format ["Missing tool %1 to dismantle",(_x select 0)] , "PLAIN DOWN"]; _end = true; _proceed = false; }; + if ((_x select 0) in items player) then {_end = false;} else { format["Missing tool %1 to dismantle",(_x select 0)] call dayz_rollingMessages; _end = true; _proceed = false; }; if (_end) exitwith { _exit = true; }; } foreach _tools; @@ -47,8 +47,8 @@ _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animati _isWater = (surfaceIsWater (getPosATL player)) or dayz_isSwimming; if(_isWater or _onLadder) exitWith { - //cutText ["unable to upgrade at this time", "PLAIN DOWN"]; - titleText [localize "str_CannotUpgrade"]; + //"unable to upgrade at this time" call dayz_rollingMessages; + localize "str_CannotUpgrade" call dayz_rollingMessages; }; //Start loop @@ -60,7 +60,7 @@ while {_isOk} do { //Check if we have the tools to start { private ["_end"]; - if ((_x select 0) in items player) then {_end = false;} else { cutText [format ["Missing tool %1 to dismantle",_x] , "PLAIN DOWN"]; _end = true; _proceed = false; }; + if ((_x select 0) in items player) then {_end = false;} else { format["Missing tool %1 to dismantle",_x] call dayz_rollingMessages; _end = true; _proceed = false; }; if (_end) exitwith { _exit = true; }; }foreach _tools; @@ -68,7 +68,7 @@ while {_isOk} do { _claimedBy = _object getVariable["claimed","0"]; - if (_claimedBy != _playerID) exitWith { cutText [format [localize "str_player_beinglooted",_text] , "PLAIN DOWN"]; }; + if (_claimedBy != _playerID) exitWith { format[localize "str_player_beinglooted",_text] call dayz_rollingMessages; }; //Run animation player playActionNow "Medic"; @@ -133,7 +133,7 @@ while {_isOk} do { if ([(_x select 1)] call fn_chance) then { player removeWeapon (_x select 0); player addWeapon (_x select 2); - titleText ["Your tool has been damaged." , "PLAIN DOWN"]; + "Your tool has been damaged." call dayz_rollingMessages; }; }foreach _tools; }; @@ -145,7 +145,7 @@ while {_isOk} do { _proceed = true; }; - titleText [format["Dismantle attempt (%1 of %2).", _counter,_limit], "PLAIN DOWN"]; + format["Dismantle attempt (%1 of %2).",_counter,_limit] call dayz_rollingMessages; uiSleep 0.10; }; @@ -153,9 +153,9 @@ while {_isOk} do { if (_proceed) then { _claimedBy = _object getVariable["claimed","0"]; - if (_claimedBy != _playerID) exitWith { cutText [format [localize "str_player_beinglooted",_text] , "PLAIN DOWN"]; }; + if (_claimedBy != _playerID) exitWith { format[localize "str_player_beinglooted",_text] call dayz_rollingMessages; }; - titleText [format["Dismantled, (%1).", (typeOf _object)], "PLAIN DOWN"]; + format["Dismantled, (%1).",typeOf _object] call dayz_rollingMessages; _activatingPlayer = player; PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer]; diff --git a/SQF/dayz_code/actions/object_maintenance.sqf b/SQF/dayz_code/actions/object_maintenance.sqf index 544b880d0..8273a82d5 100644 --- a/SQF/dayz_code/actions/object_maintenance.sqf +++ b/SQF/dayz_code/actions/object_maintenance.sqf @@ -16,7 +16,7 @@ if ((isNil "_cursorTarget") or {(isNull _cursorTarget)}) then { }; if(isNull _cursorTarget) exitWith { - cutText ["No maintenance options", "PLAIN DOWN"]; + "No maintenance options" call dayz_rollingMessages; }; //Remove action Menu @@ -46,13 +46,13 @@ _upgradeParts = []; _startMaintenance = true; if(_isWater or _onLadder) exitWith { - cutText ["Unable to proceed", "PLAIN DOWN"]; + "Unable to proceed" call dayz_rollingMessages; }; // lets check player has requiredTools for upgrade { if (!(_x IN items player)) exitWith { - cutText[ format[ localize "str_maintenanceMissingTool",_x], "PLAIN DOWN"]; //"Missing %1 to do maintenance %2." + format[localize "str_maintenanceMissingTool",_x] call dayz_rollingMessages; //"Missing %1 to do maintenance %2." _startMaintenance = false; }; } count _requiredTools; @@ -60,7 +60,7 @@ if(_isWater or _onLadder) exitWith { // lets check player has requiredParts for upgrade { if (!(_x IN magazines player)) exitWith { - cutText[ format[ localize "str_maintenanceMissingPart",_x,_displayname], "PLAIN DOWN"]; //"Missing %1 to maintenance %2." + format[localize "str_maintenanceMissingPart",_x,_displayname] call dayz_rollingMessages; //"Missing %1 to maintenance %2." _startMaintenance = false; }; } count _requiredParts; @@ -107,6 +107,6 @@ if (_startMaintenance) then { PVDZ_object_replace = [_cursorTarget]; publicVariableServer "PVDZ_object_replace"; }; - cutText [localize "str_maintenanceDone", "PLAIN DOWN"]; + localize "str_maintenanceDone" call dayz_rollingMessages; }; diff --git a/SQF/dayz_code/actions/object_pickup.sqf b/SQF/dayz_code/actions/object_pickup.sqf index bb62c4904..cadd38936 100644 --- a/SQF/dayz_code/actions/object_pickup.sqf +++ b/SQF/dayz_code/actions/object_pickup.sqf @@ -15,9 +15,9 @@ _text = getText (configFile >> _type >> _classname >> "displayName"); if (!canPickup) exitwith { if (pickupInit) then { - cutText [localize "str_pickup_limit_2","PLAIN DOWN"]; + localize "str_pickup_limit_2" call dayz_rollingMessages; } else { - cutText [localize "str_pickup_limit_3","PLAIN DOWN"]; + localize "str_pickup_limit_3" call dayz_rollingMessages; }; }; @@ -35,17 +35,17 @@ player playActionNow "PutDown"; //Adding random chance of arrow is re-usable on pickup _broken = if ((_classname == "WoodenArrow") && {[0.15] call fn_chance}) then {true} else {false}; -if (_broken) exitWith { deleteVehicle _holder; cutText [localize "str_broken_arrow", "PLAIN DOWN"]; }; +if (_broken) exitWith { deleteVehicle _holder; localize "str_broken_arrow" call dayz_rollingMessages; }; uiSleep 0.25; //Why are we waiting? Animation _claimedBy = _holder getVariable["claimed","0"]; -if (_claimedBy != _playerID) exitWith { cutText [format [localize "str_player_beinglooted",_text] , "PLAIN DOWN"]; }; +if (_claimedBy != _playerID) exitWith { format[localize "str_player_beinglooted",_text] call dayz_rollingMessages; }; if (_classname isKindOf "Bag_Base_EP1") exitWith { _PlayerNear = {isPlayer _x} count ((getPosATL _holder) nearEntities ["CAManBase", 10]) > 1; - if (_PlayerNear) exitWith {cutText [localize "str_pickup_limit_4", "PLAIN DOWN"]}; + if (_PlayerNear) exitWith {localize "str_pickup_limit_4" call dayz_rollingMessages;}; diag_log("Picked up a bag: " + _classname); @@ -80,7 +80,7 @@ if (_isOk) then { } else { if (!_isOk) exitWith { _holder setVariable["claimed",0,true]; - cutText [localize "str_player_24", "PLAIN DOWN"]; + localize "str_player_24" call dayz_rollingMessages; }; }; uiSleep 3; diff --git a/SQF/dayz_code/actions/object_upgradeFireplace.sqf b/SQF/dayz_code/actions/object_upgradeFireplace.sqf index ae4e7818b..8a9a03339 100644 --- a/SQF/dayz_code/actions/object_upgradeFireplace.sqf +++ b/SQF/dayz_code/actions/object_upgradeFireplace.sqf @@ -60,7 +60,7 @@ _upgradeParts = []; _startUpgrade = true; if(_isWater or _onLadder) exitWith { - //cutText [localize "str_CannotUpgrade", "PLAIN DOWN"]; + //localize "str_CannotUpgrade" call dayz_rollingMessages; _msg = localize "str_CannotUpgrade"; _msg call dayz_rollingMessages; //systemchat[localize "str_CannotUpgrade"]; @@ -115,7 +115,7 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then { _alreadyupgrading = _cursorTarget getVariable["alreadyupgrading",0]; if (_alreadyupgrading == 1) exitWith { - //cutText [localize "str_upgradeInProgress", "PLAIN DOWN"] + //localize "str_upgradeInProgress" call dayz_rollingMessages; _msg = localize "str_upgradeInProgress"; _msg call dayz_rollingMessages; }; @@ -184,11 +184,11 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then { publicVariableServer "PVDZ_obj_Publish"; diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; - //cutText [localize "str_upgradeDone", "PLAIN DOWN"]; + //localize "str_upgradeDone" call dayz_rollingMessages; _msg = localize "str_upgradeDone"; _msg call dayz_rollingMessages; /* } else { - cutText ["Object has no upgrade option.", "PLAIN DOWN"]; + "Object has no upgrade option." call dayz_rollingMessages; */ }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/object_upgradeStorage.sqf b/SQF/dayz_code/actions/object_upgradeStorage.sqf index 2479afd82..fcba49a99 100644 --- a/SQF/dayz_code/actions/object_upgradeStorage.sqf +++ b/SQF/dayz_code/actions/object_upgradeStorage.sqf @@ -54,7 +54,7 @@ _upgradeParts = []; _startUpgrade = true; if(_isWater or _onLadder) exitWith { - //cutText ["unable to upgrade at this time", "PLAIN DOWN"]; + //"unable to upgrade at this time" call dayz_rollingMessages; _msg = localize "str_CannotUpgrade"; _msg call dayz_rollingMessages; }; @@ -109,7 +109,7 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then { _alreadyupgrading = _cursorTarget getVariable["alreadyupgrading",0]; if (_alreadyupgrading == 1) exitWith { - //cutText [localize "str_upgradeInProgress", "PLAIN DOWN"] + //localize "str_upgradeInProgress" call dayz_rollingMessages; _msg = localize "str_upgradeInProgress"; _msg call dayz_rollingMessages; }; @@ -203,11 +203,11 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then { publicVariableServer "PVDZ_obj_Publish"; diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; - //cutText [localize "str_upgradeDone", "PLAIN DOWN"]; + //localize "str_upgradeDone" call dayz_rollingMessages; _msg = localize "str_upgradeDone"; _msg call dayz_rollingMessages; /* } else { - cutText ["Object has no upgrade option.", "PLAIN DOWN"]; + "Object has no upgrade option." call dayz_rollingMessages; */ }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/object_upgradebuilding.sqf b/SQF/dayz_code/actions/object_upgradebuilding.sqf index 375a34ff8..cd5a55b30 100644 --- a/SQF/dayz_code/actions/object_upgradebuilding.sqf +++ b/SQF/dayz_code/actions/object_upgradebuilding.sqf @@ -44,7 +44,7 @@ if (isArray(configFile >> "CfgVehicles" >> _type >> "Upgrade" >> "randomcreate") _upgradeClass = configFile >> "CfgVehicles" >> _upgradeType; if (!isClass _upgradeClass) exitWith { - //cutText [localize "str_upgradeNoOption", "PLAIN DOWN"]; + //localize "str_upgradeNoOption" call dayz_rollingMessages; _msg = localize "str_upgradeNoOption"; _msg call dayz_rollingMessages; }; @@ -96,7 +96,7 @@ if (!_ok) exitWith { //Upgrade Started if ((player getVariable["alreadyBuilding",0]) == 1) exitWith { { player addMagazine _x; } foreach _upgradeParts; - //cutText [localize "str_upgradeInProgress" , "PLAIN DOWN"] + //localize "str_upgradeInProgress" call dayz_rollingMessages; _msg = localize "str_upgradeInProgress"; _msg call dayz_rollingMessages; }; @@ -178,7 +178,7 @@ player reveal _object; //Make sure its unlocked player setVariable["alreadyBuilding",0]; -//cutText [localize "str_upgradeDone", "PLAIN DOWN"]; +//localize "str_upgradeDone" call dayz_rollingMessages; _msg = localize "str_upgradeDone"; _msg call dayz_rollingMessages; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_Constructionitem.sqf b/SQF/dayz_code/actions/player_Constructionitem.sqf index b54da290b..6f9816ccd 100644 --- a/SQF/dayz_code/actions/player_Constructionitem.sqf +++ b/SQF/dayz_code/actions/player_Constructionitem.sqf @@ -46,7 +46,7 @@ _hasInput = true; if (_avail < _amount) exitWith { _hasInput = false; _itemName = getText(configFile >> _selection >> _item >> "displayName"); - cutText [format [localize "str_crafting_missing",(_amount - _avail),_itemName], "PLAIN DOWN"]; + format[localize "str_crafting_missing",(_amount - _avail),_itemName] call dayz_rollingMessages; }; } forEach (_input + _required); diff --git a/SQF/dayz_code/actions/player_addToolbelt.sqf b/SQF/dayz_code/actions/player_addToolbelt.sqf index cdd21986e..b992ac7dd 100644 --- a/SQF/dayz_code/actions/player_addToolbelt.sqf +++ b/SQF/dayz_code/actions/player_addToolbelt.sqf @@ -1,4 +1,4 @@ -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_39","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_39" call dayz_rollingMessages;}; DZE_ActionInProgress = true; private ["_item","_config","_onLadder","_hastoolweapon","_onBack","_text","_create","_config2","_melee2tb","_isOk"]; @@ -8,11 +8,11 @@ _config = configFile >> "cfgWeapons" >> _item; _onBack = dayz_onBack in MeleeWeapons; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {cutText [localize "str_player_21", "PLAIN DOWN"]; DZE_ActionInProgress = false;}; +if (_onLadder) exitWith {localize "str_player_21" call dayz_rollingMessages; DZE_ActionInProgress = false;}; _hastoolweapon = _item in weapons player; _text = getText (_config >> "displayName"); -if (!_hastoolweapon and !_onBack) exitWith {cutText [format [localize "str_player_30",_text] , "PLAIN DOWN"]; DZE_ActionInProgress = false;}; +if (!_hastoolweapon and !_onBack) exitWith {format[localize "str_player_30",_text] call dayz_rollingMessages; DZE_ActionInProgress = false;}; call gear_ui_init; @@ -61,6 +61,6 @@ if (_isOk) then { }; } else { closeDialog 0; - cutText [localize "str_player_24", "PLAIN DOWN"]; + localize "str_player_24" call dayz_rollingMessages; }; DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_addtoBack.sqf b/SQF/dayz_code/actions/player_addtoBack.sqf index 6a7faf260..d85b48d4d 100644 --- a/SQF/dayz_code/actions/player_addtoBack.sqf +++ b/SQF/dayz_code/actions/player_addtoBack.sqf @@ -5,12 +5,12 @@ _config = configFile >> "cfgWeapons" >> _item; call gear_ui_init; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {cutText [localize "str_player_21", "PLAIN DOWN"]}; +if (_onLadder) exitWith {localize "str_player_21" call dayz_rollingMessages;}; _hastoolweapon = _item in weapons player; _text = getText (_config >> "displayName"); -if (!_hastoolweapon) exitWith {cutText [format [localize "str_player_30",_text] , "PLAIN DOWN"]}; -if (dayZ_OnBack != "") exitWith {closeDialog 0; cutText [format [localize "str_player_toback_fail",_text] , "PLAIN DOWN"]}; +if (!_hastoolweapon) exitWith {format[localize "str_player_30",_text] call dayz_rollingMessages;}; +if (dayZ_OnBack != "") exitWith {closeDialog 0; format[localize "str_player_toback_fail",_text] call dayz_rollingMessages;}; call gear_ui_init; diff --git a/SQF/dayz_code/actions/player_attach_bomb.sqf b/SQF/dayz_code/actions/player_attach_bomb.sqf index 478df4157..00b0fc1da 100644 --- a/SQF/dayz_code/actions/player_attach_bomb.sqf +++ b/SQF/dayz_code/actions/player_attach_bomb.sqf @@ -6,15 +6,15 @@ _hasCrowbar = "ItemCrowbar" in items player; _hasCarBomb = "ItemCarBomb" in magazines player; _alreadyBombed = _vehicle getVariable["hasBomb",false]; if(!_hasToolbox or !_hasCrowbar) exitWith { - cutText [localize "str_bombToolMissing", "PLAIN DOWN"]; + localize "str_bombToolMissing" call dayz_rollingMessages; }; if(!_hasCarBomb) exitWith { - cutText [localize "str_bombMissing", "PLAIN DOWN"]; + localize "str_bombMissing" call dayz_rollingMessages; }; /* if(_vehicle getVariable["hasBomb",false]) exitWith { - cutText [localize "str_bombAlready", "PLAIN DOWN"]; + localize "str_bombAlready" call dayz_rollingMessages; }; */ @@ -35,4 +35,4 @@ if(!_alreadyBombed) then { PVDZ_dayzCarBomb = [_vehicle,getPlayerUID player]; publicVariableServer "PVDZ_dayzCarBomb"; }; -cutText [localize "str_bombAttached", "PLAIN DOWN"]; \ No newline at end of file +localize "str_bombAttached" call dayz_rollingMessages; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_breakin.sqf b/SQF/dayz_code/actions/player_breakin.sqf index 12934a26a..310d9f767 100644 --- a/SQF/dayz_code/actions/player_breakin.sqf +++ b/SQF/dayz_code/actions/player_breakin.sqf @@ -9,12 +9,12 @@ _hasSledgeHammer = "ItemSledge" in items player; _hasCrowbar = "ItemCrowbar" in items player; if (!_hasSledgeHammer) exitWith { - titleText ["You need a SledgeHammer to break into this compound" , "PLAIN DOWN"]; + "You need a SledgeHammer to break into this compound" call dayz_rollingMessages; uiSleep 1; }; if (!_hasCrowbar) exitWith { - titleText ["You need a crowbar to break into this compound." , "PLAIN DOWN"]; + "You need a crowbar to break into this compound." call dayz_rollingMessages; uiSleep 1; }; @@ -30,13 +30,13 @@ while {_isOk} do { if (!_hasSledgeHammer) exitWith { _proceed = nil; - titleText ["You need a sledge hammer to break into a gate." , "PLAIN DOWN"]; + "You need a sledge hammer to break into a gate." call dayz_rollingMessages; uiSleep 1; }; if (!_hasCrowbar) exitWith { _proceed = nil; - titleText ["You need a crowbar to break into a gate." , "PLAIN DOWN"]; + "You need a crowbar to break into a gate." call dayz_rollingMessages; uiSleep 1; }; @@ -106,13 +106,13 @@ while {_isOk} do { player removeWeapon "ItemSledge"; player addMagazine "ItemSledgeHandle"; player addMagazine "ItemSledgeHead"; - titleText ["Your SledgeHammer handle has snapped." , "PLAIN DOWN"]; + "Your SledgeHammer handle has snapped." call dayz_rollingMessages; }; if ([0.04] call fn_chance) then { player removeWeapon "ItemCrowbar"; player addWeapon "ItemCrowbarBent"; - titleText ["Your crowbar has bent." , "PLAIN DOWN"]; + "Your crowbar has bent." call dayz_rollingMessages; }; }; @@ -123,7 +123,7 @@ while {_isOk} do { _proceed = true; }; - titleText [format["Breaking into compound, attempt (%1 of %2).", _counter,_limit], "PLAIN DOWN"]; + format["Breaking into compound, attempt (%1 of %2).", _counter,_limit] call dayz_rollingMessages; uiSleep 0.03; }; //Tool issues @@ -136,7 +136,7 @@ if (!_proceed) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - titleText ["Break in cancelled." , "PLAIN DOWN"]; + "Break in cancelled." call dayz_rollingMessages; }; // Working-Factor for chopping wood. @@ -144,11 +144,11 @@ if (!_proceed) then { //Completed but no success. if (_proceed and !_brokein) then { - titleText [format["Break in attempt completed with little success", _counter,_limit], "PLAIN DOWN"]; + format["Break in attempt completed with little success", _counter,_limit] call dayz_rollingMessages; }; //Completed and successful if (_proceed and _brokein) then { - titleText ["Break in attempt successful.", "PLAIN DOWN", 0.3]; + "Break in attempt successful." call dayz_rollingMessages; //Open Gate. _target animate ["DoorR", 1]; diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index 5a0c7c424..e25fce6b8 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -6,7 +6,7 @@ if (!isNil "_this" && {typeName _this == "ARRAY"} && {count _this > 0}) exitWith */ private ["_location","_pos","_dir","_classname","_item","_hasrequireditem","_missing","_hastoolweapon","_cancel","_reason","_started","_finished","_animState","_isMedic","_dis","_sfx","_hasbuilditem","_tmpbuilt","_onLadder","_isWater","_require","_text","_offset","_IsNearPlot","_isOk","_location1","_location2","_counter","_limit","_proceed","_num_removed","_position","_object","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_findNearestPoles","_findNearestPole","_distance","_classnametmp","_ghost","_isPole","_needText","_lockable","_zheightchanged","_rotate","_combination_1","_combination_2","_combination_3","_combination_4","_combination","_combination_1_Display","_combinationDisplay","_zheightdirection","_abort","_isNear","_need","_needNear","_vehicle","_inVehicle","_requireplot","_objHDiff","_isLandFireDZ","_isTankTrap","_center","_buildables"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_40","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_40" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _pos = [player] call FNC_GetPos; @@ -37,10 +37,10 @@ DZE_cancelBuilding = false; call gear_ui_init; closeDialog 1; -if (_isWater) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_26", "PLAIN DOWN"];}; -if (_inVehicle) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_42","PLAIN DOWN"];}; -if (_onLadder) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_21", "PLAIN DOWN"];}; -if (player getVariable["combattimeout",0] >= diag_tickTime) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_43","PLAIN DOWN"];}; +if (_isWater) exitWith {DZE_ActionInProgress = false; localize "str_player_26" call dayz_rollingMessages;}; +if (_inVehicle) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_42" call dayz_rollingMessages;}; +if (_onLadder) exitWith {DZE_ActionInProgress = false; localize "str_player_21" call dayz_rollingMessages;}; +if (player getVariable["combattimeout",0] >= diag_tickTime) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_43" call dayz_rollingMessages;}; _item = _this; @@ -84,7 +84,7 @@ _needNear = getArray (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> if(_abort) exitWith { - cutText [format[(localize "str_epoch_player_135"),_reason,_distance], "PLAIN DOWN"]; + format[localize "str_epoch_player_135",_reason,_distance] call dayz_rollingMessages; DZE_ActionInProgress = false; }; @@ -141,7 +141,7 @@ _findNearestPole = []; _IsNearPlot = count (_findNearestPole); // If item is plot pole and another one exists within 45m -if(_isPole && _IsNearPlot > 0) exitWith { DZE_ActionInProgress = false; cutText [(format [localize "str_epoch_player_44",_distance]), "PLAIN DOWN"]; }; +if(_isPole && _IsNearPlot > 0) exitWith { DZE_ActionInProgress = false; format[localize "str_epoch_player_44",_distance] call dayz_rollingMessages; }; if(_IsNearPlot == 0) then { @@ -181,12 +181,12 @@ if(_IsNearPlot == 0) then { }; // _message -if(!_canBuildOnPlot) exitWith { DZE_ActionInProgress = false; cutText [format[(localize "STR_EPOCH_PLAYER_135"),_needText,_distance] , "PLAIN DOWN"]; }; +if(!_canBuildOnPlot) exitWith { DZE_ActionInProgress = false; format[localize "STR_EPOCH_PLAYER_135",_needText,_distance] call dayz_rollingMessages; }; _buildables = DZE_maintainClasses + DZE_LockableStorage + ["DZ_buildables"]; _buildables set [count _buildables,"TentStorage"]; _center = if (isNull _nearestPole) then {_pos} else {_nearestPole}; -if ((count (nearestObjects [_center,_buildables,_distance])) >= DZE_BuildingLimit) exitWith {DZE_ActionInProgress = false;cutText [(format [localize "str_epoch_player_41",_distance]),"PLAIN DOWN"];}; +if ((count (nearestObjects [_center,_buildables,_distance])) >= DZE_BuildingLimit) exitWith {DZE_ActionInProgress = false; format[localize "str_epoch_player_41",_distance] call dayz_rollingMessages;}; _missing = ""; _hasrequireditem = true; @@ -196,9 +196,9 @@ _hasrequireditem = true; } count _require; _hasbuilditem = _this in magazines player; -if (!_hasbuilditem) exitWith {DZE_ActionInProgress = false; cutText [format[(localize "str_player_31"),_text,"build"] , "PLAIN DOWN"]; }; +if (!_hasbuilditem) exitWith {DZE_ActionInProgress = false; format[localize "str_player_31",_text,"build"] call dayz_rollingMessages; }; -if (!_hasrequireditem) exitWith {DZE_ActionInProgress = false; cutText [format[(localize "str_epoch_player_137"),_missing] , "PLAIN DOWN"]; }; +if (!_hasrequireditem) exitWith {DZE_ActionInProgress = false; format[localize "str_epoch_player_137",_missing] call dayz_rollingMessages; }; if (_hasrequireditem) then { _location = [0,0,0]; @@ -217,7 +217,7 @@ if (_hasrequireditem) then { _position = getPosATL _object; - cutText [localize "str_epoch_player_45","PLAIN DOWN"]; + localize "str_epoch_player_45" call dayz_rollingMessages; _objHDiff = 0; @@ -393,7 +393,7 @@ if (_hasrequireditem) then { _tmpbuilt setPosATL _location; - cutText [format[(localize "str_epoch_player_138"),_text], "PLAIN DOWN"]; + format[localize "str_epoch_player_138",_text] call dayz_rollingMessages; _limit = 3; @@ -455,7 +455,7 @@ if (_hasrequireditem) then { _counter = _counter + 1; }; - cutText [format[(localize "str_epoch_player_139"),_text, _counter,_limit], "PLAIN DOWN"]; + format[localize "str_epoch_player_139",_text, _counter,_limit] call dayz_rollingMessages; if(_counter == _limit) exitWith { _isOk = false; @@ -469,7 +469,7 @@ if (_hasrequireditem) then { _num_removed = ([player,_item] call BIS_fnc_invRemove); if(_num_removed == 1) then { - cutText [format[localize "str_build_01",_text], "PLAIN DOWN"]; + format[localize "str_build_01",_text] call dayz_rollingMessages; if (_isPole) then { [] spawn player_plotPreview; @@ -527,8 +527,8 @@ if (_hasrequireditem) then { PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],[]]; publicVariableServer "PVDZ_obj_Publish"; - cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5]; - systemChat format [(localize "str_epoch_player_140"),_combinationDisplay,_text]; + format[localize "str_epoch_player_140",_combinationDisplay,_text] call dayz_rollingMessages; + systemChat format[localize "str_epoch_player_140",_combinationDisplay,_text]; } else { _tmpbuilt setVariable ["CharacterID",dayz_characterID,true]; @@ -543,7 +543,7 @@ if (_hasrequireditem) then { }; } else { deleteVehicle _tmpbuilt; - cutText [localize "str_epoch_player_46","PLAIN DOWN"]; + localize "str_epoch_player_46" call dayz_rollingMessages; }; } else { @@ -555,11 +555,11 @@ if (_hasrequireditem) then { deleteVehicle _tmpbuilt; - cutText [localize "str_epoch_player_46","PLAIN DOWN"]; + localize "str_epoch_player_46" call dayz_rollingMessages; }; } else { - cutText [format[(localize "str_epoch_player_47"),_text,_reason], "PLAIN DOWN"]; + format[localize "str_epoch_player_47",_text,_reason] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/player_buildVanilla.sqf b/SQF/dayz_code/actions/player_buildVanilla.sqf index 9dd618a1b..95aa9738a 100644 --- a/SQF/dayz_code/actions/player_buildVanilla.sqf +++ b/SQF/dayz_code/actions/player_buildVanilla.sqf @@ -48,7 +48,7 @@ _isWater = {(surfaceIsWater (getPosATL _object)) or dayz_isSwimming}; if (0 != count Dayz_constructionContext) then { r_action_count = 0; - //cutText [localize "str_already_building", "PLAIN DOWN"]; + //localize "str_already_building" call dayz_rollingMessages; _msg = localize "str_already_building"; _msg call dayz_rollingMessages; diag_log [ diag_ticktime, __FILE__, 'already building, exiting', Dayz_constructionContext, typeName Dayz_constructionContext]; @@ -61,7 +61,7 @@ if (isClass (configFile >> _isClass >> _item)) then { case (_item isKindOf "Land_A_tent"): {"str_player_31_pitch"}; default {"str_player_31_build"}; }; - //cutText [format [localize "str_player_31",_text,(localize _string)] , "PLAIN DOWN"]; + //format[localize "str_player_31",_text,(localize _string)] call dayz_rollingMessages; _msg = format [localize "str_player_31",_text,(localize _string)]; _msg call dayz_rollingMessages; //diag_log(format["player_build: item:%1 require:%2 Player items:%3 magazines:%4", _item, _requiredTools, (items player), (magazines player)]); @@ -81,7 +81,7 @@ _missing = ""; if (!_ok) exitWith { r_action_count = 0; - //cutText [format [localize "str_player_31_missingtools",_text,_missing] , "PLAIN DOWN"]; + //format[localize "str_player_31_missingtools",_text,_missing] call dayz_rollingMessages; _msg = format [localize "str_player_31_missingtools",_text,_missing]; _msg call dayz_rollingMessages; }; @@ -102,13 +102,13 @@ _upgradeParts = []; if (!_ok) exitWith { { player addMagazine _x; } foreach _upgradeParts; r_action_count = 0; - // cutText [format [localize "str_player_31", _missing, localize "str_player_31_build"] , "PLAIN DOWN"]; + // format[localize "str_player_31", _missing, localize "str_player_31_build"] call dayz_rollingMessages; _msg = format [localize "str_player_31", _missing, localize "str_player_31_build"]; _msg call dayz_rollingMessages; }; -//cutText [localize "str_player_build_rotate", "PLAIN DOWN"]; +//localize "str_player_build_rotate" call dayz_rollingMessages; _msg = localize "str_player_build_rotate"; _msg call dayz_rollingMessages; diff --git a/SQF/dayz_code/actions/player_buildingDowngrade.sqf b/SQF/dayz_code/actions/player_buildingDowngrade.sqf index c8366df05..e47a58e2b 100644 --- a/SQF/dayz_code/actions/player_buildingDowngrade.sqf +++ b/SQF/dayz_code/actions/player_buildingDowngrade.sqf @@ -4,7 +4,7 @@ */ private ["_location","_dir","_classname","_text","_object","_objectID","_objectUID","_newclassname","_refund","_obj","_upgrade","_objectCharacterID","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_distance","_needText","_findNearestPoles","_findNearestPole","_IsNearPlot","_i","_invResult","_itemOut","_countOut","_abortInvAdd","_addedItems"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_48","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_48" call dayz_rollingMessages;}; DZE_ActionInProgress = true; player removeAction s_player_downgrade_build; @@ -52,7 +52,7 @@ if(_IsNearPlot == 0) then { }; // exit if not allowed due to plot pole -if(!_canBuildOnPlot) exitWith { DZE_ActionInProgress = false; cutText [format[(localize "str_epoch_player_141"),_needText,_distance] , "PLAIN DOWN"]; }; +if(!_canBuildOnPlot) exitWith { DZE_ActionInProgress = false; format[localize "str_epoch_player_141",_needText,_distance] call dayz_rollingMessages; }; // get cursortarget from addaction _obj = _this select 3; @@ -60,7 +60,7 @@ _obj = _this select 3; // Current charID _objectCharacterID = _obj getVariable ["CharacterID","0"]; -if (DZE_Lock_Door != _objectCharacterID) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_49","PLAIN DOWN"];}; +if (DZE_Lock_Door != _objectCharacterID) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_49" call dayz_rollingMessages;}; // Find objectID _objectID = _obj getVariable ["ObjectID","0"]; @@ -68,7 +68,7 @@ _objectID = _obj getVariable ["ObjectID","0"]; // Find objectUID _objectUID = _obj getVariable ["ObjectUID","0"]; -if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_upgrade_build = -1; cutText [localize "str_epoch_player_50","PLAIN DOWN"];}; +if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_upgrade_build = -1; localize "str_epoch_player_50" call dayz_rollingMessages;}; // Get classname _classname = typeOf _obj; @@ -114,7 +114,6 @@ if ((count _upgrade) > 0) then { // all parts added proceed if(_i != 0) then { - // Get position _location = _obj getVariable["OEMPos",(getposATL _obj)]; @@ -139,23 +138,20 @@ if ((count _upgrade) > 0) then { _object setPosATL _location; - cutText [format[(localize "str_epoch_player_142"),_text], "PLAIN DOWN", 5]; + format[localize "str_epoch_player_142",_text] call dayz_rollingMessages; PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location],_classname,_obj,player]; publicVariableServer "PVDZE_obj_Swap"; player reveal _object; - } else { - cutText [format[(localize "str_epoch_player_143"), _i,(getText(configFile >> "CfgMagazines" >> _itemOut >> "displayName"))], "PLAIN DOWN"]; + format[localize "str_epoch_player_143",_i,getText(configFile >> "CfgMagazines" >> _itemOut >> "displayName")] call dayz_rollingMessages; { [player,(_x select 0),(_x select 1)] call BIS_fnc_invRemove; } count _addedItems; - }; - } else { - cutText [localize "str_epoch_player_51","PLAIN DOWN"]; + localize "str_epoch_player_51" call dayz_rollingMessages; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_buildingMaint.sqf b/SQF/dayz_code/actions/player_buildingMaint.sqf index 094ce42db..8076f7217 100644 --- a/SQF/dayz_code/actions/player_buildingMaint.sqf +++ b/SQF/dayz_code/actions/player_buildingMaint.sqf @@ -4,7 +4,7 @@ */ private ["_location","_dir","_classname","_missing","_text","_proceed","_num_removed","_object","_missingQty","_itemIn","_countIn","_qty","_removed","_removed_total","_tobe_removed_total","_objectID","_objectUID","_temp_removed_array","_textMissing","_requirements","_obj","_upgrade","_objectCharacterID"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_52","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_52" call dayz_rollingMessages;}; DZE_ActionInProgress = true; player removeAction s_player_maint_build; @@ -19,7 +19,7 @@ _objectID = _obj getVariable ["ObjectID","0"]; // Find objectUID _objectUID = _obj getVariable ["ObjectUID","0"]; -if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_maint_build = -1; cutText [localize "str_epoch_player_50","PLAIN DOWN"];}; +if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_maint_build = -1; localize "str_epoch_player_50" call dayz_rollingMessages;}; // Get classname _classname = typeOf _obj; @@ -71,28 +71,22 @@ if (_proceed) then { if(_num_removed >= 1) then { _temp_removed_array set [count _temp_removed_array,_x]; }; - }; - + }; } forEach magazines player; - } forEach _requirements; // all parts removed proceed if (_tobe_removed_total == _removed_total) then { - - cutText [format[(localize "STR_EPOCH_ACTIONS_4"), 1], "PLAIN DOWN", 5]; + format[localize "STR_EPOCH_ACTIONS_4",1] call dayz_rollingMessages; PVDZE_maintainArea = [player,2,_obj]; publicVariableServer "PVDZE_maintainArea"; - - } else { - + } else { {player addMagazine _x;} count _temp_removed_array; - cutText [format[(localize "str_epoch_player_145"),_removed_total,_tobe_removed_total], "PLAIN DOWN"]; - + format[localize "str_epoch_player_145",_removed_total,_tobe_removed_total] call dayz_rollingMessages; }; } else { _textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName"); - cutText [format[(localize "STR_EPOCH_ACTIONS_6"),_missingQty, _textMissing], "PLAIN DOWN"]; + format[localize "STR_EPOCH_ACTIONS_6",_missingQty, _textMissing] call dayz_rollingMessages; }; diff --git a/SQF/dayz_code/actions/player_chopWood.sqf b/SQF/dayz_code/actions/player_chopWood.sqf index 59a8ec879..dc44c2155 100644 --- a/SQF/dayz_code/actions/player_chopWood.sqf +++ b/SQF/dayz_code/actions/player_chopWood.sqf @@ -45,7 +45,7 @@ if (["forest",dayz_surfaceType] call fnc_inString) then { if (!isNull _findNearestTree) then { _woodCutting = true; } else { - cutText [localize "str_player_23", "PLAIN DOWN"]; + localize "str_player_23" call dayz_rollingMessages; }; }; @@ -128,15 +128,15 @@ if (_woodCutting) then { if ((_counter == _countOut) || _breaking) exitWith { if (_breaking) then { - cutText [localize "str_HatchetHandleBreaks", "PLAIN DOWN"]; + localize "str_HatchetHandleBreaks" call dayz_rollingMessages; } else { - cutText [localize "str_player_24_Stoped", "PLAIN DOWN"]; + localize "str_player_24_Stoped" call dayz_rollingMessages; }; _isOk = false; _proceed = true; uiSleep 1; }; - cutText [format [localize "str_player_24_progress", _counter,_countOut], "PLAIN DOWN"]; + format[localize "str_player_24_progress", _counter,_countOut] call dayz_rollingMessages; }; if (_proceed) then { @@ -145,10 +145,10 @@ if (_woodCutting) then { PVDZ_objgather_Knockdown = [_findNearestTree,player]; publicVariableServer "PVDZ_objgather_Knockdown"; }; - //cutText [format["\n\nChopping down tree.], "PLAIN DOWN"]; - //cutText [localize "str_player_25", "PLAIN DOWN"]; + //"Chopping down tree." call dayz_rollingMessages; + //localize "str_player_25" call dayz_rollingMessages; } else { - cutText [localize "str_player_24_Stoped", "PLAIN DOWN"]; + localize "str_player_24_Stoped" call dayz_rollingMessages; r_interrupt = false; diff --git a/SQF/dayz_code/actions/player_combineMags.sqf b/SQF/dayz_code/actions/player_combineMags.sqf index a20caa9dd..52ac9846f 100644 --- a/SQF/dayz_code/actions/player_combineMags.sqf +++ b/SQF/dayz_code/actions/player_combineMags.sqf @@ -3,7 +3,7 @@ disableSerialization; call gear_ui_init; closeDialog 0; -if (r_action_count != 1) exitWith { cutText [localize "str_player_actionslimit", "PLAIN DOWN"]; }; +if (r_action_count != 1) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; _create = _this; @@ -19,7 +19,7 @@ _name = getText(configFile >> "CfgMagazines" >> _create >> "displayName"); _magCount = {_x == _create} count magazines player; if (_magCount == 1) exitWith { - cutText [format [localize "str_cannotCombine", _name], "PLAIN DOWN"]; + format[localize "str_cannotCombine", _name] call dayz_rollingMessages; r_action_count = 0; }; @@ -71,13 +71,13 @@ if(_create == "Quiver") then { switch true do { case (_qtynew_create_ammo_rest == 0) : { - cutText [format [localize "str_combineDoneFull",_magCount, _name, _qtynew_create_mags_full,_magFull], "PLAIN DOWN"]; + format[localize "str_combineDoneFull",_magCount, _name, _qtynew_create_mags_full,_magFull] call dayz_rollingMessages; }; case (_qtynew_create_mags_full == 0) : { - cutText [format [localize "str_combineDonePartialOne",_magCount, _name, _qtynew_create_ammo_rest,_magAmmunition], "PLAIN DOWN"]; + format[localize "str_combineDonePartialOne",_magCount, _name, _qtynew_create_ammo_rest,_magAmmunition] call dayz_rollingMessages; }; default { - cutText [format [localize "str_combineDonePartial",_magCount, _name, _qtynew_create_mags_full, _qtynew_create_ammo_rest,_magAmmunition,_magFullSingular,_magFull], "PLAIN DOWN"]; + format[localize "str_combineDonePartial",_magCount, _name, _qtynew_create_mags_full, _qtynew_create_ammo_rest,_magAmmunition,_magFullSingular,_magFull] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/player_copyKey.sqf b/SQF/dayz_code/actions/player_copyKey.sqf index 44c49bb78..9f545a2d2 100644 --- a/SQF/dayz_code/actions/player_copyKey.sqf +++ b/SQF/dayz_code/actions/player_copyKey.sqf @@ -1,30 +1,30 @@ private ["_item","_config","_pos","_onLadder","_create","_started","_finished","_animState","_isMedic","_num_removed","_text","_haskey","_hastoolweapon","_isNear","_hasTinBar"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_56","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_56" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _item = _this; _config = configFile >> "cfgWeapons" >> _item; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_21","PLAIN DOWN"]}; +if (_onLadder) exitWith {DZE_ActionInProgress = false; localize "str_player_21" call dayz_rollingMessages;}; _text = getText (_config >> "displayName"); _haskey = _this in weapons player; -if (!_haskey) exitWith {DZE_ActionInProgress = false; cutText [format[(localize "str_player_30"),_text] , "PLAIN DOWN"]}; +if (!_haskey) exitWith {DZE_ActionInProgress = false; format[localize "str_player_30",_text] call dayz_rollingMessages;}; _hastoolweapon = "ItemKeyKit" in weapons player; -if (!_hastoolweapon) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_57","PLAIN DOWN"]}; +if (!_hastoolweapon) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_57" call dayz_rollingMessages;}; _pos = [player] call FNC_GetPos; _isNear = {inflamed _x} count (_pos nearObjects 3); -if (_isNear == 0) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_58","PLAIN DOWN"]}; +if (_isNear == 0) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_58" call dayz_rollingMessages;}; call gear_ui_init; // require one tin bar per key _hasTinBar = "ItemTinBar" in magazines player; -if (!_hasTinBar) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_59","PLAIN DOWN"]}; +if (!_hasTinBar) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_59" call dayz_rollingMessages;}; ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; @@ -62,7 +62,7 @@ if(_finished) then { _create = _item; _create call player_addDuplicateTool; } else { - cutText [localize "str_epoch_player_61","PLAIN DOWN"]; + localize "str_epoch_player_61" call dayz_rollingMessages; }; } else { r_interrupt = false; @@ -70,6 +70,6 @@ if(_finished) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_61","PLAIN DOWN"]; + localize "str_epoch_player_61" call dayz_rollingMessages; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_craftItem.sqf b/SQF/dayz_code/actions/player_craftItem.sqf index cd6fa9aa4..327e053a8 100644 --- a/SQF/dayz_code/actions/player_craftItem.sqf +++ b/SQF/dayz_code/actions/player_craftItem.sqf @@ -25,7 +25,7 @@ class ItemActions */ private ["_tradeComplete","_onLadder","_canDo","_selectedRecipeOutput","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut","_started","_finished","_animState","_isMedic","_removed","_tobe_removed_total","_textCreate","_textMissing","_selectedRecipeInput","_selectedRecipeInputStrict","_num_removed","_removed_total","_temp_removed_array","_abort","_waterLevel","_waterLevel_lowest","_reason","_isNear","_missingTools","_hastoolweapon","_selectedRecipeTools","_distance","_crafting","_needNear","_item","_baseClass","_num_removed_weapons","_outputWeapons","_inputWeapons","_randomOutput","_craft_doLoop","_selectedWeapon","_selectedMag","_sfx"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_63","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_63" call dayz_rollingMessages;}; DZE_ActionInProgress = true; // This is used to find correct recipe based what itemaction was click allows multiple recipes per item. @@ -63,7 +63,7 @@ if("workshop" in _needNear) then { }; }; if(_abort) exitWith { - cutText [format[(localize "str_epoch_player_149"),_reason,_distance], "PLAIN DOWN"]; + format[localize "str_epoch_player_149",_reason,_distance] call dayz_rollingMessages; DZE_ActionInProgress = false; }; @@ -122,7 +122,7 @@ if (_canDo) then { // If all parts proceed if (_proceed) then { - cutText [localize "str_epoch_player_62","PLAIN DOWN"]; + localize "str_epoch_player_62" call dayz_rollingMessages; ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; @@ -245,7 +245,7 @@ if (_canDo) then { }; _textCreate = getText(configFile >> "CfgMagazines" >> _itemOut >> "displayName"); // Add crafted item - cutText [format[(localize "str_epoch_player_150"),_textCreate,_countOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_150",_textCreate,_countOut] call dayz_rollingMessages; // sleep here uiSleep 1; } forEach _selectedRecipeOutput; @@ -256,7 +256,7 @@ if (_canDo) then { } else { // Refund parts since we failed {player addMagazine _x; } forEach _temp_removed_array; - cutText [format[(localize "STR_EPOCH_PLAYER_145"),_removed_total,_tobe_removed_total], "PLAIN DOWN"]; + format[localize "STR_EPOCH_PLAYER_145",_removed_total,_tobe_removed_total] call dayz_rollingMessages; }; } else { @@ -265,22 +265,22 @@ if (_canDo) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_64","PLAIN DOWN"]; + localize "str_epoch_player_64" call dayz_rollingMessages; _craft_doLoop = false; }; } else { _textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName"); - cutText [format[(localize "str_epoch_player_152"),_missingQty, _textMissing,_tradeComplete], "PLAIN DOWN"]; + format[localize "str_epoch_player_152",_missingQty, _textMissing,_tradeComplete] call dayz_rollingMessages; _craft_doLoop = false; }; } else { _textMissing = getText(configFile >> "CfgWeapons" >> _missing >> "displayName"); - cutText [format[(localize "STR_EPOCH_PLAYER_137"),_textMissing], "PLAIN DOWN"]; + format[localize "STR_EPOCH_PLAYER_137",_textMissing] call dayz_rollingMessages; _craft_doLoop = false; }; }; } else { - cutText [localize "str_epoch_player_64","PLAIN DOWN"]; + localize "str_epoch_player_64" call dayz_rollingMessages; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_craftItemVanilla.sqf b/SQF/dayz_code/actions/player_craftItemVanilla.sqf index 3a62dcd0c..0ec6ee735 100644 --- a/SQF/dayz_code/actions/player_craftItemVanilla.sqf +++ b/SQF/dayz_code/actions/player_craftItemVanilla.sqf @@ -82,7 +82,7 @@ if(!r_drag_sqf and !r_player_unconscious and !_onLadder) then { if (_avail < _amount) exitWith { _hasInput = false; _itemName = getText(configFile >> _selection >> _item >> "displayName"); - cutText [format [localize "str_crafting_missing",(_amount - _avail),_itemName], "PLAIN DOWN"]; + format[localize "str_crafting_missing",(_amount - _avail),_itemName] call dayz_rollingMessages; }; } forEach (_input); @@ -112,7 +112,7 @@ if(!r_drag_sqf and !r_player_unconscious and !_onLadder) then { _freeSlots set[_j, ((_freeSlots select _j) - (_slotType select _j))]; if (_freeSlots select _j < 0) exitWith { _availabeSpace = false; - cutText [localize "str_crafting_space", "PLAIN DOWN"]; + localize "str_crafting_space" call dayz_rollingMessages; }; }; }; @@ -172,10 +172,10 @@ if(!r_drag_sqf and !r_player_unconscious and !_onLadder) then { player addBackpack _item; }; }; - cutText [format [localize "str_crafting_success",_itemName], "PLAIN DOWN"]; + format[localize "str_crafting_success",_itemName] call dayz_rollingMessages; //uiSleep 2; } else { - cutText [format [localize "str_crafting_failed",_itemName], "PLAIN DOWN"]; + format[localize "str_crafting_failed",_itemName] call dayz_rollingMessages; //uiSleep 2; }; }; diff --git a/SQF/dayz_code/actions/player_craftitemGUI.sqf b/SQF/dayz_code/actions/player_craftitemGUI.sqf index d02f56015..bab4b4bf0 100644 --- a/SQF/dayz_code/actions/player_craftitemGUI.sqf +++ b/SQF/dayz_code/actions/player_craftitemGUI.sqf @@ -71,7 +71,7 @@ if (count _nearByPile > 0) then { if (_avail < _amount) exitWith { _hasInput = false; _itemName = getText(configFile >> _selection >> _item >> "displayName"); - cutText [format [localize "str_crafting_missing",(_amount - _avail),_itemName], "PLAIN DOWN"]; + format[localize "str_crafting_missing",(_amount - _avail),_itemName] call dayz_rollingMessages; }; } forEach (_input + _required); @@ -101,7 +101,7 @@ if (count _nearByPile > 0) then { _freeSlots set[_j, ((_freeSlots select _j) - (_slotType select _j))]; if (_freeSlots select _j < 0) exitWith { _availabeSpace = false; - cutText [localize "str_crafting_space", "PLAIN DOWN"]; + localize "str_crafting_space" call dayz_rollingMessages; }; }; }; @@ -151,10 +151,10 @@ if (count _nearByPile > 0) then { player addBackpack _item; }; }; - cutText [format [localize "str_crafting_success",_itemName], "PLAIN DOWN"]; + format[localize "str_crafting_success",_itemName] call dayz_rollingMessages; //uiSleep 2; } else { - cutText [format [localize "str_crafting_failed",_itemName], "PLAIN DOWN"]; + format[localize "str_crafting_failed",_itemName] call dayz_rollingMessages; //uiSleep 2; }; }; diff --git a/SQF/dayz_code/actions/player_createQuiver.sqf b/SQF/dayz_code/actions/player_createQuiver.sqf index 9a32cab52..44f1048ec 100644 --- a/SQF/dayz_code/actions/player_createQuiver.sqf +++ b/SQF/dayz_code/actions/player_createQuiver.sqf @@ -4,8 +4,8 @@ call gear_ui_init; _qty_arrows = {_x == "WoodenArrow"} count magazines player; _qty_quivers = {_x == "Quiver"} count magazines player; -//if (_qty_quivers > 0) exitWith { cutText [localize "str_quiver_reachlimit","PLAIN DOWN"];}; -if (_qty_arrows < 2) exitWith { cutText [localize "str_quiver_notenougharrows","PLAIN DOWN"];}; //Not enough arrows to create quiver +//if (_qty_quivers > 0) exitWith { localize "str_quiver_reachlimit" call dayz_rollingMessages;}; +if (_qty_arrows < 2) exitWith { localize "str_quiver_notenougharrows" call dayz_rollingMessages;}; //Not enough arrows to create quiver _qty_quiverarrows = _qty_arrows min 6; @@ -13,4 +13,4 @@ for "_x" from 1 to _qty_quiverarrows do { player removeMagazine "WoodenArrow"; }; player addMagazine ["Quiver",_qty_quiverarrows]; -cutText [format [localize "str_quiver_createsuccess",_qty_quiverarrows], "PLAIN DOWN"]; +format[localize "str_quiver_createsuccess",_qty_quiverarrows] call dayz_rollingMessages; diff --git a/SQF/dayz_code/actions/player_createstash.sqf b/SQF/dayz_code/actions/player_createstash.sqf index 2bb8981d8..f6f330f40 100644 --- a/SQF/dayz_code/actions/player_createstash.sqf +++ b/SQF/dayz_code/actions/player_createstash.sqf @@ -4,7 +4,7 @@ private ["_playerPos","_item","_location","_config","_text","_dir","_dis","_sfx" call gear_ui_init; closeDialog 1; -if (r_action_count != 1) exitWith { cutText [localize "str_player_actionslimit", "PLAIN DOWN"]; }; +if (r_action_count != 1) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; //Player Pos _playerPos = getPosATL player; @@ -27,7 +27,7 @@ _stashname = getText (configFile >> "CfgVehicles" >> _stashtype >> "displayName" // Items are missing if ((!(_consume IN magazines player))) exitWith { r_action_count = 0; - cutText [format [localize "str_player_31_stash",_consumetext] , "PLAIN DOWN"]; + format[localize "str_player_31_stash",_consumetext] call dayz_rollingMessages; }; _location = player modeltoworld [0,2.5,0]; @@ -67,8 +67,8 @@ if ((count _worldspace) == 2) then { diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; r_action_count = 0; - cutText [format [localize "str_success_stash_pitch",_stashname], "PLAIN DOWN"]; + format[localize "str_success_stash_pitch",_stashname] call dayz_rollingMessages; } else { r_action_count = 0; - cutText [format [localize "str_fail_stash_pitch",_stashname], "PLAIN DOWN"]; + format[localize "str_fail_stash_pitch",_stashname] call dayz_rollingMessages; }; diff --git a/SQF/dayz_code/actions/player_destroyTent.sqf b/SQF/dayz_code/actions/player_destroyTent.sqf index 28b08be9b..41a283e36 100644 --- a/SQF/dayz_code/actions/player_destroyTent.sqf +++ b/SQF/dayz_code/actions/player_destroyTent.sqf @@ -37,7 +37,7 @@ s_player_destorytent = -1; //Make sure you can only destory once _alreadyDestorying = _obj getVariable["alreadyDestorying",0]; -if (_alreadyDestorying == 1) exitWith {cutText [localize "str_TentAlreadyLit" , "PLAIN DOWN"]}; +if (_alreadyDestorying == 1) exitWith {localize "str_TentAlreadyLit" call dayz_rollingMessages;}; _obj setVariable["alreadyDestorying",1]; @@ -107,4 +107,4 @@ publicVariable "PVDZ_obj_Fire"; _obj inflame true; //_obj spawn player_fireMonitor; -cutText [localize "str_success_tent_destoryed", "PLAIN DOWN"]; \ No newline at end of file +localize "str_success_tent_destoryed" call dayz_rollingMessages; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_drinkWater.sqf b/SQF/dayz_code/actions/player_drinkWater.sqf index 47c228cb7..0ed3696ee 100644 --- a/SQF/dayz_code/actions/player_drinkWater.sqf +++ b/SQF/dayz_code/actions/player_drinkWater.sqf @@ -12,7 +12,7 @@ _pondPos = []; _objectsWell = []; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {cutText [localize "str_player_21", "PLAIN DOWN"]}; +if (_onLadder) exitWith {localize "str_player_21" call dayz_rollingMessages;}; _itemorignal = _this; //diag_log(str(_itemorignal)); @@ -77,7 +77,7 @@ if (_canFill) then { }; }; }; - cutText [localize "str_drinkwithhands", "PLAIN DOWN"]; + localize "str_drinkwithhands" call dayz_rollingMessages; } else { - cutText [localize "str_player_32", "PLAIN DOWN"]; + localize "str_player_32" call dayz_rollingMessages; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_dropWeapon.sqf b/SQF/dayz_code/actions/player_dropWeapon.sqf index 85495c9db..5eeb98cc1 100644 --- a/SQF/dayz_code/actions/player_dropWeapon.sqf +++ b/SQF/dayz_code/actions/player_dropWeapon.sqf @@ -6,8 +6,8 @@ _config = configFile >> "CfgWeapons" >> _item; _droppedType = getText (_config >> "droppeditem"); _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith { cutText [localize "str_player_21", "PLAIN DOWN"]; r_action_count = 0; }; -if (r_action_count != 1) exitWith { cutText [localize "str_player_actionslimit", "PLAIN DOWN"]; }; +if (_onLadder) exitWith { localize "str_player_21" call dayz_rollingMessages; r_action_count = 0; }; +if (r_action_count != 1) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; call gear_ui_init; diff --git a/SQF/dayz_code/actions/player_fillQuiver.sqf b/SQF/dayz_code/actions/player_fillQuiver.sqf index ffb4db1db..ee0a5fcd2 100644 --- a/SQF/dayz_code/actions/player_fillQuiver.sqf +++ b/SQF/dayz_code/actions/player_fillQuiver.sqf @@ -10,7 +10,7 @@ _control = uiNamespace getVariable 'uiControl'; _qty_quiverarrows = gearSlotAmmoCount _control; _qty_quiverfreeslots = 12-_qty_quiverarrows; -//if (_qty_quivers > 1) exitWith { cutText [localize "str_quiver_reachlimit", "PLAIN DOWN"];}; +//if (_qty_quivers > 1) exitWith { localize "str_quiver_reachlimit" call dayz_rollingMessages;}; if (_qty_quiverfreeslots > 0) then { _qty_arrows2add = _qty_quiverfreeslots min _qty_arrows; player removeMagazine "Quiver"; @@ -18,7 +18,7 @@ if (_qty_quiverfreeslots > 0) then { player removeMagazine "WoodenArrow"; }; player addMagazine ["Quiver",_qty_quiverarrows+_qty_arrows2add]; - cutText [format [localize "str_quiver_addarrows",_qty_arrows2add], "PLAIN DOWN"]; + format[localize "str_quiver_addarrows",_qty_arrows2add] call dayz_rollingMessages; } else { - cutText [localize "str_quiver_full", "PLAIN DOWN"]; + localize "str_quiver_full" call dayz_rollingMessages; }; diff --git a/SQF/dayz_code/actions/player_fixBottle.sqf b/SQF/dayz_code/actions/player_fixBottle.sqf index 435aa019d..553549950 100644 --- a/SQF/dayz_code/actions/player_fixBottle.sqf +++ b/SQF/dayz_code/actions/player_fixBottle.sqf @@ -15,7 +15,7 @@ if (_tape in magazines player) then { player removeMagazine _bottle; player removeMagazine _tape; player addMagazine _fixedBottle; - cutText [localize "str_fix_water_bottle", "PLAIN DOWN"]; + localize "str_fix_water_bottle" call dayz_rollingMessages; } else { //If the player doesn't have the tape - cutText [localize "str_fix_water_bottle_fail", "PLAIN DOWN"]; + localize "str_fix_water_bottle_fail" call dayz_rollingMessages; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_fixTools.sqf b/SQF/dayz_code/actions/player_fixTools.sqf index cfbe6e026..584e1ffaf 100644 --- a/SQF/dayz_code/actions/player_fixTools.sqf +++ b/SQF/dayz_code/actions/player_fixTools.sqf @@ -25,16 +25,16 @@ if ((_tape in magazines player) && (_handle in magazines player)) then { player removeMagazine _tape; player removeMagazine _handle; player addWeapon _fixedItem; - cutText [format [localize "str_fixToolSuccess", _dName], "PLAIN DOWN"]; + format[localize "str_fixToolSuccess", _dName] call dayz_rollingMessages; } else { //If the player doesn't have the mats. if (!(_tape in magazines player)) then { if (!(_handle in magazines player)) then { - cutText [localize "str_fixToolFail", "PLAIN DOWN"]; + localize "str_fixToolFail" call dayz_rollingMessages; } else { - cutText [localize "str_fixtoolMissingTape", "PLAIN DOWN"]; + localize "str_fixtoolMissingTape" call dayz_rollingMessages; }; } else { - cutText [localize "str_fixtoolMissingHandle", "PLAIN DOWN"]; + localize "str_fixtoolMissingHandle" call dayz_rollingMessages; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_goFishing.sqf b/SQF/dayz_code/actions/player_goFishing.sqf index a474f9198..b398356fc 100644 --- a/SQF/dayz_code/actions/player_goFishing.sqf +++ b/SQF/dayz_code/actions/player_goFishing.sqf @@ -14,7 +14,7 @@ _vehicle removeAction (_this select 2); s_player_fishing = -1; s_player_fishing_veh = -1; -if(dayz_fishingInprogress) exitWith { cutText [localize "str_fishing_inprogress", "PLAIN DOWN"];}; +if(dayz_fishingInprogress) exitWith { localize "str_fishing_inprogress" call dayz_rollingMessages;}; dayz_fishingInprogress = true; //line distance @@ -63,7 +63,7 @@ for "_i" from 1 to 10 do { if (!_isOk) exitWith { dayz_fishingInprogress = false; - cutText [localize "str_fishing_watercheck" , "PLAIN DOWN"]; + localize "str_fishing_watercheck" call dayz_rollingMessages; }; _counter = 0; @@ -76,14 +76,14 @@ player playActionNow "GestureSwing"; r_interrupt = false; while {_isOk} do { - if(dayz_isSwimming) exitWith {cutText [localize "str_player_26", "PLAIN DOWN"];_isOk = false;}; + if(dayz_isSwimming) exitWith {localize "str_player_26" call dayz_rollingMessages;_isOk = false;}; if !((currentWeapon player) in Dayz_fishingItems or (player != vehicle player and !((vehicle player) isKindOf "Ship"))) exitwith { - cutText [localize "str_fishing_canceled", "PLAIN DOWN"]; + localize "str_fishing_canceled" call dayz_rollingMessages; _isOk = false; }; if (r_interrupt) then { _isOk = false; - cutText [localize "str_fishing_canceled", "PLAIN DOWN"]; + localize "str_fishing_canceled" call dayz_rollingMessages; } else { //make sure the player isnt swimming uiSleep 2; // wait for animation @@ -117,7 +117,7 @@ while {_isOk} do { _itemtodrop = _itemOut; _item addMagazineCargoGlobal [_itemtodrop,1]; //Let the player know what he caught - cutText [format [localize "str_fishing_success",_text], "PLAIN DOWN"]; + format[localize "str_fishing_success",_text] call dayz_rollingMessages; } else { call gear_ui_init; //Remove melee magazines (BIS_fnc_invAdd fix) @@ -125,9 +125,9 @@ while {_isOk} do { _result = [player,_itemOut] call BIS_fnc_invAdd; if (_result) then { //Let the player know what he caught - cutText [format [localize "str_fishing_success",_text], "PLAIN DOWN"]; + format[localize "str_fishing_success",_text] call dayz_rollingMessages; } else { - cutText [format [localize "str_fishing_noroom",_text], "PLAIN DOWN"]; + format[localize "str_fishing_noroom",_text] call dayz_rollingMessages; }; //adding melee mags back if needed call dayz_meleeMagazineCheck; @@ -138,17 +138,17 @@ while {_isOk} do { _isOk = false; } else { switch (true) do { - case (_counter == 0) : { cutText [format [localize "str_fishing_cast",_num], "PLAIN DOWN"]; }; - case (_counter == 4) : { cutText [localize "str_fishing_pull", "PLAIN DOWN"]; player playActionNow "GesturePoint"; }; - case (_counter == 8) : { cutText [localize "str_fishing_pull", "PLAIN DOWN"]; player playActionNow "GesturePoint"; }; - default { cutText [localize "str_fishing_nibble", "PLAIN DOWN"]; }; + case (_counter == 0) : { format[localize "str_fishing_cast",_num] call dayz_rollingMessages; }; + case (_counter == 4) : { localize "str_fishing_pull" call dayz_rollingMessages; player playActionNow "GesturePoint"; }; + case (_counter == 8) : { localize "str_fishing_pull" call dayz_rollingMessages; player playActionNow "GesturePoint"; }; + default { localize "str_fishing_nibble" call dayz_rollingMessages; }; }; _counter = _counter + 1; if (_counter == 12) then { _isOk = false; uiSleep 1; - cutText [localize "str_fishing_failed", "PLAIN DOWN"]; + localize "str_fishing_failed" call dayz_rollingMessages; }; }; }; diff --git a/SQF/dayz_code/actions/player_harvestPlant.sqf b/SQF/dayz_code/actions/player_harvestPlant.sqf index 98826f34e..69fd14c0e 100644 --- a/SQF/dayz_code/actions/player_harvestPlant.sqf +++ b/SQF/dayz_code/actions/player_harvestPlant.sqf @@ -5,7 +5,7 @@ */ private ["_isOk","_i","_objName","_started","_finished","_animState","_isMedic","_proceed","_itemOut","_countOut","_tree","_trees","_findNearestTree","_index","_invResult","_treesOutput","_text"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_72","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_72" call dayz_rollingMessages;}; DZE_ActionInProgress = true; // allowed trees list move this later @@ -112,9 +112,9 @@ if (count(_findNearestTree) >= 1) then { }; //diag_log format["DEBUG TREE DAMAGE: %1", _tree]; - cutText [format[(localize "str_epoch_player_154"), _i,_text], "PLAIN DOWN"]; + format[localize "str_epoch_player_154",_i,_text] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_143"), _i,_text], "PLAIN DOWN"]; + format[localize "str_epoch_player_143",_i,_text] call dayz_rollingMessages; }; } else { r_interrupt = false; @@ -122,12 +122,12 @@ if (count(_findNearestTree) >= 1) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_73","PLAIN DOWN"]; + localize "str_epoch_player_73" call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_74","PLAIN DOWN"]; + localize "str_epoch_player_74" call dayz_rollingMessages; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_heliLift.sqf b/SQF/dayz_code/actions/player_heliLift.sqf index d656da26d..c02abe0c2 100644 --- a/SQF/dayz_code/actions/player_heliLift.sqf +++ b/SQF/dayz_code/actions/player_heliLift.sqf @@ -8,9 +8,9 @@ player removeAction s_player_heli_lift; s_player_heli_lift = -1; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {cutText ["You can't perform this action while on a ladder!" , "PLAIN DOWN"]}; +if (_onLadder) exitWith {localize "str_player_21" call dayz_rollingMessages;}; -if (vehicle player != player) exitWith {cutText ["You can't perform this action while in a vehicle", "PLAIN DOWN"]}; +if (vehicle player != player) exitWith {"You can't perform this action while in a vehicle" call dayz_rollingMessages;}; _liftUseTime = 6; _dis=10; @@ -88,17 +88,17 @@ if(_finished) then { if(_moved) then { player switchMove ""; player playActionNow "stop"; - cutText [format["the lift heli moved to much from the vehicle that was being lifted!"], "PLAIN DOWN"]; //display text at bottom center of screen on interrupt + "The lift heli moved too much from the vehicle that was being lifted!" call dayz_rollingMessages; //display text at bottom center of screen on interrupt } else { if((typeName _attached == "OBJECT") || (typeName _hasAttached == "OBJECT")) then { player switchMove ""; player playActionNow "stop"; - cutText [format["Another vehicle was attached || the vehicle was attached to another heli!"], "PLAIN DOWN"]; //display text at bottom center of screen on interrupt + "Another vehicle was attached or the vehicle was attached to another heli!" call dayz_rollingMessages; } else { r_interrupt = false; player switchMove ""; player playActionNow "stop"; - cutText [format["You have interrupted lifting a vehicle!"], "PLAIN DOWN"]; //display text at bottom center of screen on interrupt + "You have interrupted lifting a vehicle!" call dayz_rollingMessages; }; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_loadCrate.sqf b/SQF/dayz_code/actions/player_loadCrate.sqf index 60d9ade56..e8b278fda 100644 --- a/SQF/dayz_code/actions/player_loadCrate.sqf +++ b/SQF/dayz_code/actions/player_loadCrate.sqf @@ -1,18 +1,18 @@ private ["_dir","_classname","_b0x1337","_location","_item","_config","_create_raw","_create","_qty","_type","_hasCrate","_hasTool"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_75","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_75" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _hasTool = "ItemCrowbar" in items player; if(!_hasTool) exitWith { - cutText [localize "str_epoch_player_76","PLAIN DOWN"]; + localize "str_epoch_player_76" call dayz_rollingMessages; DZE_ActionInProgress = false; }; _item = _this; _hasCrate = _item in magazines player; if (!_hasCrate) exitWith { - cutText [localize "str_epoch_player_77","PLAIN DOWN"]; + localize "str_epoch_player_77" call dayz_rollingMessages; DZE_ActionInProgress = false; }; @@ -63,6 +63,6 @@ player reveal _b0x1337; player action ["Gear", _b0x1337]; -cutText [localize "str_epoch_player_78","PLAIN DOWN"]; +localize "str_epoch_player_78" call dayz_rollingMessages; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_makefire.sqf b/SQF/dayz_code/actions/player_makefire.sqf index db0a2688a..ac3a5e201 100644 --- a/SQF/dayz_code/actions/player_makefire.sqf +++ b/SQF/dayz_code/actions/player_makefire.sqf @@ -11,7 +11,7 @@ _text = getText (_config >> "displayName"); // item is missing or tools are missing if (!(_item in magazines player) && !(_itemPile in magazines player)) exitWith { - //cutText [localize "str_player_22", "PLAIN DOWN"]; + //localize "str_player_22" call dayz_rollingMessages; (localize "str_player_22") call dayz_rollingMessages; }; @@ -19,10 +19,10 @@ _booleans = []; //testonLadder, testSea, testPond, testBuilding, testSlope, test _worldspace = ["Land_Fire_DZ", player, _booleans] call fn_niceSpot; // player on ladder or in a vehicle -if (_booleans select 0) exitWith { cutText [localize "str_player_21", "PLAIN DOWN"]; }; +if (_booleans select 0) exitWith { localize "str_player_21" call dayz_rollingMessages; }; // object would be in the water (pool or sea) -if ((_booleans select 1) OR (_booleans select 2)) exitWith { cutText [localize "str_player_26", "PLAIN DOWN"]; }; +if ((_booleans select 1) OR (_booleans select 2)) exitWith { localize "str_player_26" call dayz_rollingMessages; }; if ((count _worldspace) == 2) then { if (_item in magazines player) then { @@ -60,9 +60,9 @@ if ((count _worldspace) == 2) then { achievement = [14, player, dayz_characterID]; publicVariableServer "achievement"; }; - //cutText [localize "str_fireplace_01", "PLAIN DOWN"]; + //localize "str_fireplace_01" call dayz_rollingMessages; (localize "str_fireplace_01") call dayz_rollingMessages; } else { - //cutText [localize "str_fireplace_02", "PLAIN DOWN"]; + //localize "str_fireplace_02" call dayz_rollingMessages; (localize "str_fireplace_0") call dayz_rollingMessages; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_mineStone.sqf b/SQF/dayz_code/actions/player_mineStone.sqf index e0f9da0b2..1f70375a4 100644 --- a/SQF/dayz_code/actions/player_mineStone.sqf +++ b/SQF/dayz_code/actions/player_mineStone.sqf @@ -5,7 +5,7 @@ _item = _this; call gear_ui_init; closeDialog 1; -if(dayz_workingInprogress) exitWith { cutText ["Mining already in progress!", "PLAIN DOWN"];}; +if(dayz_workingInprogress) exitWith { "Mining already in progress!" call dayz_rollingMessages;}; dayz_workingInprogress = true; // allowed rocks list move this later @@ -115,19 +115,19 @@ if (!isNull _findNearestRock) then { if ((_counter >= _countOut) || _breaking) exitWith { if (_breaking) then { - cutText [localize "str_PickAxeHandleBreaks", "PLAIN DOWN"]; + localize "str_PickAxeHandleBreaks" call dayz_rollingMessages; } else { - cutText [localize "str_mining_finished", "PLAIN DOWN"]; + localize "str_mining_finished" call dayz_rollingMessages; }; _isOk = false; _proceed = true; uiSleep 1; }; - cutText [format[localize "str_mining_progress", _counter,(_countOut - _counter)], "PLAIN DOWN"]; + format[localize "str_mining_progress", _counter,(_countOut - _counter)] call dayz_rollingMessages; }; if (!_proceed) then { - cutText [localize "str_mining_canceled", "PLAIN DOWN"]; + localize "str_mining_canceled" call dayz_rollingMessages; r_interrupt = false; @@ -146,7 +146,7 @@ if (!isNull _findNearestRock) then { case "MeleeSledge": {player addMagazine 'Sledge_Swing';}; }; } else { - cutText [localize "str_mining_no_rocks", "PLAIN DOWN"]; + localize "str_mining_no_rocks" call dayz_rollingMessages; }; dayz_workingInprogress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_operate.sqf b/SQF/dayz_code/actions/player_operate.sqf index b6706d466..388d1374e 100644 --- a/SQF/dayz_code/actions/player_operate.sqf +++ b/SQF/dayz_code/actions/player_operate.sqf @@ -32,14 +32,14 @@ _fn_Lockold = { _target animate ["DoorR", 0]; _target animate ["DoorL", 0]; _target setVariable ["isOpen", "0", true]; - cutText ["Gates locked.", "PLAIN DOWN"]; + "Gates locked." call dayz_rollingMessages; }; }; _fn_UnLockold = { if (typeOf _target in ["WoodenGate_2","WoodenGate_3","WoodenGate_4"]) then { _target setVariable ["isOpen", "1", true]; - cutText ["Gates Unlocked.", "PLAIN DOWN"]; + "Gates Unlocked." call dayz_rollingMessages; }; }; @@ -47,7 +47,7 @@ _fn_Open = { if (typeOf _target in ["WoodenGate_1","WoodenGate_2","WoodenGate_3","WoodenGate_4"]) then { _target animate ["DoorR", 1]; _target animate ["DoorL", 1]; - cutText ["Gates Opened.", "PLAIN DOWN"]; + "Gates Opened." call dayz_rollingMessages; }; }; @@ -55,7 +55,7 @@ _fn_Closed = { if (typeOf _target in ["WoodenGate_1","WoodenGate_2","WoodenGate_3","WoodenGate_4"]) then { _target animate ["DoorR", 0]; _target animate ["DoorL", 0]; - cutText ["Gates Closed.", "PLAIN DOWN"]; + "Gates Closed." call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/player_recombineMagazine.sqf b/SQF/dayz_code/actions/player_recombineMagazine.sqf index 266270f71..e7cdb4bfd 100644 --- a/SQF/dayz_code/actions/player_recombineMagazine.sqf +++ b/SQF/dayz_code/actions/player_recombineMagazine.sqf @@ -8,7 +8,7 @@ call gear_ui_init; //note - one slot ammo can be used! r_action_count = r_action_count + 1; -if (r_action_count != 1) exitWith { cutText [localize "str_player_actionslimit", "PLAIN DOWN"]; }; +if (r_action_count != 1) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; _item = _this; @@ -26,7 +26,7 @@ _item_ammo = gearSlotAmmoCount (uiNamespace getVariable 'uiControl'); if (currentWeapon player != "") then { _mags = [] + getArray (configFile >> "cfgWeapons" >> (currentWeapon player) >> "magazines"); }; -if !(_create in _mags) exitWith {cutText [localize "str_must_have_weapon", "PLAIN DOWN"];}; +if !(_create in _mags) exitWith {localize "str_must_have_weapon" call dayz_rollingMessages;}; */ player playActionNow "PutDown"; @@ -97,7 +97,7 @@ if (_consume_magsize > _create_magsize) then { if ((_qtynew_create_mags + _qtynew_consume_mags) > (_qty_create_mags + _qty_consume_mags + _qty_free_slots)) exitWith { r_action_count = 0; - cutText [localize "str_player_24", "PLAIN DOWN"]; + localize "str_player_24" call dayz_rollingMessages; }; _qtynew_consume_mags_full = floor(_qtynew_consume_ammo/_consume_magsize); _qtynew_create_mags_full = floor(_qtynew_create_ammo/_create_magsize); diff --git a/SQF/dayz_code/actions/player_reloadMags.sqf b/SQF/dayz_code/actions/player_reloadMags.sqf index d717c4432..84e3cd174 100644 --- a/SQF/dayz_code/actions/player_reloadMags.sqf +++ b/SQF/dayz_code/actions/player_reloadMags.sqf @@ -8,7 +8,7 @@ call gear_ui_init; //note - one slot ammo can be used! r_action_count = r_action_count + 1; -if (r_action_count != 1) exitWith { cutText [localize "str_player_actionslimit", "PLAIN DOWN"]; }; +if (r_action_count != 1) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; _item = _this; @@ -26,7 +26,7 @@ _item_ammo = gearSlotAmmoCount (uiNamespace getVariable 'uiControl'); if (currentWeapon player != "") then { _mags = [] + getArray (configFile >> "cfgWeapons" >> (currentWeapon player) >> "magazines"); }; -if !(_create in _mags) exitWith {cutText [localize "str_must_have_weapon", "PLAIN DOWN"];}; +if !(_create in _mags) exitWith {localize "str_must_have_weapon" call dayz_rollingMessages;}; */ player playActionNow "PutDown"; @@ -97,7 +97,7 @@ if (_consume_magsize > _create_magsize) then { if ((_qtynew_create_mags + _qtynew_consume_mags) > (_qty_create_mags + _qty_consume_mags + _qty_free_slots)) exitWith { r_action_count = 0; - cutText [localize "str_player_24", "PLAIN DOWN"]; + localize "str_player_24" call dayz_rollingMessages; }; _qtynew_consume_mags_full = floor(_qtynew_consume_ammo/_consume_magsize); _qtynew_create_mags_full = floor(_qtynew_create_ammo/_create_magsize); diff --git a/SQF/dayz_code/actions/player_setTrap.sqf b/SQF/dayz_code/actions/player_setTrap.sqf index 379f117cb..85f638935 100644 --- a/SQF/dayz_code/actions/player_setTrap.sqf +++ b/SQF/dayz_code/actions/player_setTrap.sqf @@ -3,10 +3,10 @@ private ["_item","_config","_onLadder","_classname","_text","_consume","_hastrap _item = _this; _config = configFile >> "CfgWeapons" >> _item; -if (r_action_count != 1) exitWith { cutText [localize "str_player_actionslimit", "PLAIN DOWN"]; }; +if (r_action_count != 1) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith { r_action_count = 0; cutText [localize "str_player_21", "PLAIN DOWN"]}; +if (_onLadder) exitWith { r_action_count = 0; localize "str_player_21" call dayz_rollingMessages;}; call gear_ui_init; @@ -16,7 +16,7 @@ _consume = ([] + getArray (_config >> "magazines")) select 0; _hastrapitem = _item in magazines player; -if (!_hastrapitem) exitWith { r_action_count = 0; cutText [format [localize "str_player_31",_text,localize "str_player_31_place"] , "PLAIN DOWN"]}; +if (!_hastrapitem) exitWith { r_action_count = 0; format[localize "str_player_31",_text,localize "str_player_31_place"] call dayz_rollingMessages;}; player removeMagazine _item; _location = getPosATL player; @@ -36,4 +36,4 @@ diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hiv player reveal _object; r_action_count = 0; -cutText [format [localize "str_build_01",_text], "PLAIN DOWN"]; \ No newline at end of file +format[localize "str_build_01",_text] call dayz_rollingMessages; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_sharpen.sqf b/SQF/dayz_code/actions/player_sharpen.sqf index c52d38404..f3c92efc4 100644 --- a/SQF/dayz_code/actions/player_sharpen.sqf +++ b/SQF/dayz_code/actions/player_sharpen.sqf @@ -24,7 +24,6 @@ if (isNil "_waterUsed") exitWith { // item is missing or tools are missing if (!(_item IN items player)) exitWith { _displayName = getText (configFile >> "CfgWeapons" >> _item >> "displayName"); - //cutText [format["Missing Item",_displayName], "PLAIN DOWN"]; _msg = format["Missing %1",_displayName]; _msg call dayz_rollingMessages; }; @@ -47,8 +46,6 @@ if (player hasWeapon _item) then { //Remove Later player removeMagazine "equip_brick"; - - //cutText [format ["%1 has been Sharpened",_displayName], "PLAIN DOWN"]; _msg = format ["%1 has been Sharpened",_displayName]; _msg call dayz_rollingMessages; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_sleep.sqf b/SQF/dayz_code/actions/player_sleep.sqf index 19d9669c6..0869144fa 100644 --- a/SQF/dayz_code/actions/player_sleep.sqf +++ b/SQF/dayz_code/actions/player_sleep.sqf @@ -50,7 +50,7 @@ while {r_doLoop} do { } else { _infectedStatus = if (r_player_infected) then { "Infected" } else { "Cured" }; _cureAttempt = _cureAttempt + 0.01; - cutText [format [localize "str_sleepInfection",r_player_blood,_infectedStatus], "PLAIN DOWN"]; + format[localize "str_sleepInfection",r_player_blood,_infectedStatus] call dayz_rollingMessages; }; }; }; @@ -74,7 +74,7 @@ while {r_doLoop} do { _timer = diag_tickTime; _infectedStatus = if (r_player_infected) then { "Yes" } else { "Cured" }; - cutText [format [localize "str_sleepStats",_blood,r_player_blood], "PLAIN DOWN"]; + format[localize "str_sleepStats",_blood,r_player_blood] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/player_tagFriendly.sqf b/SQF/dayz_code/actions/player_tagFriendly.sqf index 60fd12e82..c7ff44e98 100644 --- a/SQF/dayz_code/actions/player_tagFriendly.sqf +++ b/SQF/dayz_code/actions/player_tagFriendly.sqf @@ -15,7 +15,7 @@ if ((_callerID != "0") && (_targetID != "0")) then { _rfriendlies = _target getVariable ["friendlies", []]; if !(_callerID in _rfriendlies) then { - titleText [(localize "STR_EPOCH_ACTIONS_8"), "PLAIN DOWN"]; //To Caller + localize "STR_EPOCH_ACTIONS_8" call dayz_rollingMessages; //To Caller /* PVS/PVC - Skaronator */ PVDZ_send = [_target,"tagFriendly",[_target]]; //To Target publicVariableServer "PVDZ_send"; diff --git a/SQF/dayz_code/actions/player_takeArrow.sqf b/SQF/dayz_code/actions/player_takeArrow.sqf index ee6d28330..93f420df8 100644 --- a/SQF/dayz_code/actions/player_takeArrow.sqf +++ b/SQF/dayz_code/actions/player_takeArrow.sqf @@ -13,14 +13,14 @@ _qty_quiverarrows = gearSlotAmmoCount _control; _empty = [player] call BIS_fnc_invSlotsEmpty; _emptymagslotcount = _empty select 4; //empty magazines slots -if (_qty_quivers > 1) exitWith { cutText [localize "str_quiver_reachlimit", "PLAIN DOWN"];}; +if (_qty_quivers > 1) exitWith { localize "str_quiver_reachlimit" call dayz_rollingMessages;}; if (_qty_quiverarrows == 2) then { //remove quiver - add 2 arrows if (_emptymagslotcount > 0) then { player removeMagazine "Quiver"; player addMagazine "WoodenArrow"; player addMagazine "WoodenArrow"; } else { - cutText [localize "str_player_24", "PLAIN DOWN"]; //Error + localize "str_player_24" call dayz_rollingMessages; //Error }; } else { if (_emptymagslotcount > 0) then { @@ -28,6 +28,6 @@ if (_qty_quiverarrows == 2) then { //remove quiver - add 2 arrows player addMagazine "WoodenArrow"; player addMagazine ["Quiver",_qty_quiverarrows-1]; } else { - cutText [localize "str_player_24", "PLAIN DOWN"]; //Error + localize "str_player_24" call dayz_rollingMessages; //Error }; }; diff --git a/SQF/dayz_code/actions/player_tearClothes.sqf b/SQF/dayz_code/actions/player_tearClothes.sqf index 986a68976..2ddaadda1 100644 --- a/SQF/dayz_code/actions/player_tearClothes.sqf +++ b/SQF/dayz_code/actions/player_tearClothes.sqf @@ -18,16 +18,16 @@ player removeMagazine _skin; switch (_rounded) do { case 0: { - cutText [localize "str_tear_clothes_0", "PLAIN DOWN"]; + localize "str_tear_clothes_0" call dayz_rollingMessages; }; case 1: { - cutText [localize "str_tear_clothes_1", "PLAIN DOWN"]; + localize "str_tear_clothes_1" call dayz_rollingMessages; }; case 2: { - cutText [localize "str_tear_clothes_2", "PLAIN DOWN"]; + localize "str_tear_clothes_2" call dayz_rollingMessages; }; case 3: { - cutText [localize "str_tear_clothes_3", "PLAIN DOWN"]; + localize "str_tear_clothes_3" call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/player_upgrade.sqf b/SQF/dayz_code/actions/player_upgrade.sqf index 44b6499b1..ac813a379 100644 --- a/SQF/dayz_code/actions/player_upgrade.sqf +++ b/SQF/dayz_code/actions/player_upgrade.sqf @@ -4,7 +4,7 @@ */ private ["_location","_dir","_classname","_missing","_text","_proceed","_num_removed","_object","_missingQty","_itemIn","_countIn","_qty","_removed","_removed_total","_tobe_removed_total","_objectID","_objectUID","_temp_removed_array","_textMissing","_newclassname","_requirements","_obj","_upgrade","_lockable","_combination_1","_combination_2","_combination_3","_combination","_objectCharacterID","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_distance","_needText","_findNearestPoles","_findNearestPole","_IsNearPlot"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_52","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_52" call dayz_rollingMessages;}; DZE_ActionInProgress = true; player removeAction s_player_upgrade_build; @@ -53,7 +53,7 @@ if(_IsNearPlot == 0) then { }; // exit if not allowed due to plot pole -if(!_canBuildOnPlot) exitWith { DZE_ActionInProgress = false; cutText [format[(localize "str_epoch_player_157"),_needText,_distance] , "PLAIN DOWN"]; }; +if(!_canBuildOnPlot) exitWith { DZE_ActionInProgress = false; format[localize "str_epoch_player_157",_needText,_distance] call dayz_rollingMessages; }; // get cursortarget from addaction _obj = _this select 3; @@ -64,7 +64,7 @@ _objectID = _obj getVariable ["ObjectID","0"]; // Find objectUID _objectUID = _obj getVariable ["ObjectUID","0"]; -if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_upgrade_build = -1; cutText [localize "str_epoch_player_50","PLAIN DOWN"];}; +if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_upgrade_build = -1; localize "str_epoch_player_50" call dayz_rollingMessages;}; // Get classname _classname = typeOf _obj; @@ -159,9 +159,9 @@ if ((count _upgrade) > 0) then { _objectCharacterID = _combination; - cutText [format[(localize "str_epoch_player_158"),_combination,_text], "PLAIN DOWN", 5]; + format[localize "str_epoch_player_158",_combination,_text] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_159"),_text], "PLAIN DOWN", 5]; + format[localize "str_epoch_player_159",_text] call dayz_rollingMessages; }; PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location],_classname,_obj,player]; @@ -172,16 +172,16 @@ if ((count _upgrade) > 0) then { } else { {player addMagazine _x;} count _temp_removed_array; - cutText [format[(localize "str_epoch_player_145"),_removed_total,_tobe_removed_total], "PLAIN DOWN"]; + format[localize "str_epoch_player_145",_removed_total,_tobe_removed_total] call dayz_rollingMessages; }; } else { _textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName"); - cutText [format[(localize "STR_EPOCH_ACTIONS_6"),_missingQty, _textMissing], "PLAIN DOWN"]; + format[localize "STR_EPOCH_ACTIONS_6",_missingQty, _textMissing] call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_82","PLAIN DOWN"]; + localize "str_epoch_player_82" call dayz_rollingMessages; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_useAttchment.sqf b/SQF/dayz_code/actions/player_useAttchment.sqf index 72f2b55f2..7f8492886 100644 --- a/SQF/dayz_code/actions/player_useAttchment.sqf +++ b/SQF/dayz_code/actions/player_useAttchment.sqf @@ -18,8 +18,8 @@ _text = getText (_config >> "displayName"); _hasitem = _item in magazines player; //fail saves -if (!_hasitem) exitWith { cutText [localize "str_missingAttachment", "PLAIN DOWN"]}; -if (_onLadder) exitWith { cutText [localize "str_player_21", "PLAIN DOWN"] }; +if (!_hasitem) exitWith { localize "str_missingAttachment" call dayz_rollingMessages;}; +if (_onLadder) exitWith { localize "str_player_21" call dayz_rollingMessages; }; if (_removeWeapon in (weapons player)) then { player removeMagazine _item; @@ -33,5 +33,5 @@ if (_removeWeapon in (weapons player)) then { } else { closedialog 0; uiSleep 0.2; - cutText [format[ localize "str_missingweapon", _text, _removeWeapon] , "PLAIN DOWN"] + format[ localize "str_missingweapon", _text, _removeWeapon] call dayz_rollingMessages; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_useMeds.sqf b/SQF/dayz_code/actions/player_useMeds.sqf index 0acb938d3..4295f04ec 100644 --- a/SQF/dayz_code/actions/player_useMeds.sqf +++ b/SQF/dayz_code/actions/player_useMeds.sqf @@ -4,14 +4,14 @@ _item = _this; call gear_ui_init; closeDialog 0; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {cutText [localize "str_player_21", "PLAIN DOWN"]}; +if (_onLadder) exitWith {localize "str_player_21" call dayz_rollingMessages;}; _hasmeditem = _item in magazines player; _config = configFile >> "CfgMagazines" >> _item; _text = getText (_config >> "displayName"); -if (!_hasmeditem) exitWith {cutText [format [localize "str_player_31",_text,localize "str_player_31_use"] , "PLAIN DOWN"]}; +if (!_hasmeditem) exitWith {format[localize "str_player_31",_text,localize "str_player_31_use"] call dayz_rollingMessages;}; switch (_item) do { case "ItemBandage": { @@ -54,7 +54,7 @@ switch (_item) do { case "ItemHeatPack": { player removeMagazine "ItemHeatPack"; dayz_temperatur = (dayz_temperatur + 5) min dayz_temperaturmax; - cutText [localize "str_player_27", "PLAIN DOWN"]; + localize "str_player_27" call dayz_rollingMessages; }; case "bloodTester": { _id = [0,0,0,[player]] execVM "\z\addons\dayz_code\medical\blood_test.sqf"; diff --git a/SQF/dayz_code/actions/player_wearClothes.sqf b/SQF/dayz_code/actions/player_wearClothes.sqf index f38dfc44c..72ad70510 100644 --- a/SQF/dayz_code/actions/player_wearClothes.sqf +++ b/SQF/dayz_code/actions/player_wearClothes.sqf @@ -1,5 +1,5 @@ -if (_this in DZE_RestrictSkins) exitWith { cutText [format[localize "str_epoch_player_315",_this], "PLAIN DOWN"] }; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_83","PLAIN DOWN"]}; +if (_this in DZE_RestrictSkins) exitWith { format[localize "str_epoch_player_315",_this] call dayz_rollingMessages; }; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_83" call dayz_rollingMessages;}; DZE_ActionInProgress = true; /* _item call player_wearClothes; @@ -12,17 +12,17 @@ _item = _this; call gear_ui_init; r_action_count = 0; //reset for strange glitch _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {cutText [localize "str_player_21", "PLAIN DOWN"]; DZE_ActionInProgress = false;}; +if (_onLadder) exitWith {localize "str_player_21" call dayz_rollingMessages; DZE_ActionInProgress = false;}; _hasclothesitem = _this in magazines player; _config = configFile >> "CfgMagazines"; _text = getText (_config >> _item >> "displayName"); -if (!_hasclothesitem) exitWith {cutText [format [localize "str_player_31",_text,localize "str_player_31_wear"] , "PLAIN DOWN"]; DZE_ActionInProgress = false;}; +if (!_hasclothesitem) exitWith {format[localize "str_player_31",_text,localize "str_player_31_wear"] call dayz_rollingMessages; DZE_ActionInProgress = false;}; -if (vehicle player != player) exitWith {cutText [localize "str_player_fail_wear1", "PLAIN DOWN"]; DZE_ActionInProgress = false;}; -//if (!isNull (unitBackpack player)) exitWith {DZE_ActionInProgress = false; cutText [localize "STR_EPOCH_ACTIONS_9","PLAIN DOWN"]}; -if ("CSGAS" in (magazines player)) exitWith {DZE_ActionInProgress = false; cutText [localize "STR_EPOCH_ACTIONS_10","PLAIN DOWN"]}; +if (vehicle player != player) exitWith {localize "str_player_fail_wear1" call dayz_rollingMessages; DZE_ActionInProgress = false;}; +//if (!isNull (unitBackpack player)) exitWith {DZE_ActionInProgress = false; localize "STR_EPOCH_ACTIONS_9" call dayz_rollingMessages;}; +if ("CSGAS" in (magazines player)) exitWith {DZE_ActionInProgress = false; localize "STR_EPOCH_ACTIONS_10" call dayz_rollingMessages;}; _myModel = (typeOf player); _humanity = player getVariable ["humanity",0]; @@ -50,7 +50,7 @@ if ( (isClass(_config >> _itemNew)) ) then { }; } else { - cutText [localize "str_epoch_player_86","PLAIN DOWN"]; + localize "str_epoch_player_86" call dayz_rollingMessages; }; }; }; diff --git a/SQF/dayz_code/actions/pzombie/call_zombies.sqf b/SQF/dayz_code/actions/pzombie/call_zombies.sqf index b34b44aa8..3545c1944 100644 --- a/SQF/dayz_code/actions/pzombie/call_zombies.sqf +++ b/SQF/dayz_code/actions/pzombie/call_zombies.sqf @@ -20,4 +20,4 @@ uiSleep 3; // allow menu again s_player_callzombies = -1; -// cutText [localize "STR_EPOCH_ACTIONS_1","PLAIN DOWN"]; +// localize "STR_EPOCH_ACTIONS_1" call dayz_rollingMessages; diff --git a/SQF/dayz_code/actions/pzombie/pz_feed.sqf b/SQF/dayz_code/actions/pzombie/pz_feed.sqf index 9396eba9c..c8c33b01a 100644 --- a/SQF/dayz_code/actions/pzombie/pz_feed.sqf +++ b/SQF/dayz_code/actions/pzombie/pz_feed.sqf @@ -87,7 +87,7 @@ if !(alive _item) then { _control ctrlShow true; - cutText [format[(localize "str_player_consumed"),(getText (configFile >> "CfgVehicles" >> _animalType >> "displayName"))], "PLAIN DOWN"]; + format[localize "str_player_consumed",getText(configFile >> "CfgVehicles" >> _animalType >> "displayName")] call dayz_rollingMessages; player switchmove ""; }; diff --git a/SQF/dayz_code/actions/pzombie/pz_vision_ap.sqf b/SQF/dayz_code/actions/pzombie/pz_vision_ap.sqf index 3f5dd900a..2bab839de 100644 --- a/SQF/dayz_code/actions/pzombie/pz_vision_ap.sqf +++ b/SQF/dayz_code/actions/pzombie/pz_vision_ap.sqf @@ -25,4 +25,4 @@ if(_NVOn == "ON") then { } else { player setVariable ["NV", ["ON", _newap]]; }; -cutText [format["%1 %2","NV",_newap], "PLAIN DOWN"]; \ No newline at end of file +format["%1 %2","NV",_newap] call dayz_rollingMessages; \ No newline at end of file diff --git a/SQF/dayz_code/actions/pzombie/pz_vision_rbg1.sqf b/SQF/dayz_code/actions/pzombie/pz_vision_rbg1.sqf index f8073defa..17343296c 100644 --- a/SQF/dayz_code/actions/pzombie/pz_vision_rbg1.sqf +++ b/SQF/dayz_code/actions/pzombie/pz_vision_rbg1.sqf @@ -22,7 +22,7 @@ _index = 0; // set rgb + m player setVariable [_NVx, _NV]; -cutText [format["%1 %2",_NVx,_NV], "PLAIN DOWN"]; +format["%1 %2",_NVx,_NV] call dayz_rollingMessages; _NV = player getvariable ["NV",["OFF", 0.1]]; _NVOn = (_NV select 0); diff --git a/SQF/dayz_code/actions/refuel.sqf b/SQF/dayz_code/actions/refuel.sqf index 9c7c6de6d..49e8b47fd 100644 --- a/SQF/dayz_code/actions/refuel.sqf +++ b/SQF/dayz_code/actions/refuel.sqf @@ -1,4 +1,4 @@ -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_24","PLAIN DOWN"]}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_24" call dayz_rollingMessages;}; DZE_ActionInProgress = true; private ["_vehicle","_canSize","_configVeh","_capacity","_nameType","_curFuel","_newFuel","_dis","_sfx","_fueling","_array","_cantype", "_emptycan","_isMan","_isAnimal","_isZombie","_started","_finished","_animState","_isRefuel"]; @@ -18,7 +18,7 @@ _isMan = _vehicle isKindOf "Man"; _isAnimal = _vehicle isKindOf "Animal"; _isZombie = _vehicle isKindOf "zZombie_base"; -if (_isMan or _isAnimal or _isZombie) exitWith { cutText [localize "str_refuel_notvehicle", "PLAIN DOWN"]; DZE_ActionInProgress = false;}; +if (_isMan or _isAnimal or _isZombie) exitWith { localize "str_refuel_notvehicle" call dayz_rollingMessages; DZE_ActionInProgress = false;}; if (fuel _vehicle == 1) exitWith {DZE_ActionInProgress = false;}; player removeAction s_player_fillfuel + _capacity; @@ -68,13 +68,13 @@ if (!_fueling) then { publicVariableServer "PVDZ_send"; }; - cutText [format [localize "str_player_05",_nameType,_canSize], "PLAIN DOWN"]; + format[localize "str_player_05",_nameType,_canSize] call dayz_rollingMessages; uiSleep 1; call fnc_usec_medic_removeActions; }; [player] allowGetIn true; } else { - cutText [localize "str_refuel_fail","PLAIN DOWN"]; + localize "str_refuel_fail" call dayz_rollingMessages; }; a_player_jerryfilling = false; r_action = false; diff --git a/SQF/dayz_code/actions/remove.sqf b/SQF/dayz_code/actions/remove.sqf index 28db08cce..721595878 100644 --- a/SQF/dayz_code/actions/remove.sqf +++ b/SQF/dayz_code/actions/remove.sqf @@ -1,4 +1,4 @@ -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_88","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_88" call dayz_rollingMessages;}; DZE_ActionInProgress = true; /* delete object from db with extra waiting by [VB]AWOL @@ -14,8 +14,8 @@ _activatingPlayer = player; _objOwnerID = _obj getVariable["CharacterID","0"]; _isOwnerOfObj = (_objOwnerID == dayz_characterID); -if (_obj in DZE_DoorsLocked) exitWith {DZE_ActionInProgress = false; cutText [localize "STR_EPOCH_ACTIONS_20","PLAIN DOWN"];}; -if (_obj getVariable ["GeneratorRunning", false]) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_89","PLAIN DOWN"];}; +if (_obj in DZE_DoorsLocked) exitWith {DZE_ActionInProgress = false; localize "STR_EPOCH_ACTIONS_20" call dayz_rollingMessages;}; +if (_obj getVariable ["GeneratorRunning", false]) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_89" call dayz_rollingMessages;}; _objectID = _obj getVariable ["ObjectID","0"]; _objectUID = _obj getVariable ["ObjectUID","0"]; @@ -68,11 +68,11 @@ if(_IsNearPlot >= 1) then { _nameVehicle = getText(configFile >> "CfgVehicles" >> _objType >> "displayName"); -cutText [format[(localize "str_epoch_player_162"),_nameVehicle], "PLAIN DOWN"]; +format[localize "str_epoch_player_162",_nameVehicle] call dayz_rollingMessages; if (_isModular) then { //allow previous cutText to show, then show this if modular. - cutText [localize "STR_EPOCH_ACTIONS_21","PLAIN DOWN"]; + localize "STR_EPOCH_ACTIONS_21" call dayz_rollingMessages; }; // Alert zombies once. @@ -137,7 +137,7 @@ while {_isOk} do { _proceed = false; }; - cutText [format[(localize "str_epoch_player_163"), _nameVehicle, _counter,_limit], "PLAIN DOWN"]; + format[localize "str_epoch_player_163",_nameVehicle,_counter,_limit] call dayz_rollingMessages; if(_counter == _limit) exitWith { _isOk = false; @@ -155,7 +155,7 @@ if(_brokenTool) then { _removeTool = ["ItemCrowbar","ItemToolbox"] call BIS_fnc_selectRandom; }; if(([player,_removeTool,1] call BIS_fnc_invRemove) > 0) then { - cutText [format[(localize "str_epoch_player_164"),getText(configFile >> "CfgWeapons" >> _removeTool >> "displayName"),_nameVehicle], "PLAIN DOWN"]; + format[localize "str_epoch_player_164",getText(configFile >> "CfgWeapons" >> _removeTool >> "displayName"),_nameVehicle] call dayz_rollingMessages; }; }; @@ -175,7 +175,7 @@ if (_proceed) then { publicVariableServer "PVDZ_obj_Destroy"; }; - cutText [format[(localize "str_epoch_player_165"),_nameVehicle], "PLAIN DOWN"]; + format[localize "str_epoch_player_165",_nameVehicle] call dayz_rollingMessages; _preventRefund = false; @@ -195,7 +195,7 @@ if (_proceed) then { }; if ((count _selectedRemoveOutput) <= 0) then { - cutText [localize "str_epoch_player_90","PLAIN DOWN"]; + localize "str_epoch_player_90" call dayz_rollingMessages; }; if (_ipos select 2 < 0) then { @@ -231,7 +231,7 @@ if (_proceed) then { player action ["Gear", _item]; }; } else { - cutText [localize "str_epoch_player_91","PLAIN DOWN"]; + localize "str_epoch_player_91" call dayz_rollingMessages; }; } else { diff --git a/SQF/dayz_code/actions/repair.sqf b/SQF/dayz_code/actions/repair.sqf index f81e6120a..15bf0050a 100644 --- a/SQF/dayz_code/actions/repair.sqf +++ b/SQF/dayz_code/actions/repair.sqf @@ -1,4 +1,4 @@ -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_92","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_92" call dayz_rollingMessages;}; DZE_ActionInProgress = true; private ["_array","_vehicle","_part","_hitpoint","_type","_hasToolbox","_section","_nameType","_namePart","_damage","_selection","_dis","_sfx","_hitpoints","_allFixed","__FILE__"]; @@ -48,11 +48,11 @@ if (_section and _hasToolbox) then { _vehicle setvelocity [0,0,1]; //Success! - cutText [format [localize "str_player_04",_namePart,_nameType], "PLAIN DOWN"]; + format[localize "str_player_04",_namePart,_nameType] call dayz_rollingMessages; } else { player addMagazine _part; }; } else { - cutText [format [localize "str_player_03",_namePart], "PLAIN DOWN"]; + format[localize "str_player_03",_namePart] call dayz_rollingMessages; }; DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/salvage.sqf b/SQF/dayz_code/actions/salvage.sqf index 8f671c3f9..80c588246 100644 --- a/SQF/dayz_code/actions/salvage.sqf +++ b/SQF/dayz_code/actions/salvage.sqf @@ -1,6 +1,6 @@ private ["_array","_vehicle","_part","_hitpoint","_type","_isOK","_brokenPart","_started","_finished","_hasToolbox","_nameType","_namePart","_animState","_isMedic","_damage","_BreakableParts","_selection","_wpn","_classname","_ismelee"]; -if (dayz_salvageInProgress) exitWith { cutText [localize "str_salvage_inprogress", "PLAIN DOWN"]; }; +if (dayz_salvageInProgress) exitWith { localize "str_salvage_inprogress" call dayz_rollingMessages; }; dayz_salvageInProgress = true; _array = _this select 3; @@ -73,12 +73,12 @@ if (_hasToolbox) then { _vehicle call fnc_veh_ResetEH; _vehicle setvelocity [0,0,1]; if(_brokenPart) then { - cutText [format [localize "str_salvage_destroyed",_namePart,_nameType], "PLAIN DOWN"]; + format[localize "str_salvage_destroyed",_namePart,_nameType] call dayz_rollingMessages; } else { - cutText [format [localize "str_salvage_removed",_namePart,_nameType], "PLAIN DOWN"]; + format[localize "str_salvage_removed",_namePart,_nameType] call dayz_rollingMessages; }; } else { - cutText [localize "str_player_24", "PLAIN DOWN"]; + localize "str_player_24" call dayz_rollingMessages; }; }; } else { @@ -87,10 +87,10 @@ if (_hasToolbox) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_salvage_canceled", "PLAIN DOWN"]; + localize "str_salvage_canceled" call dayz_rollingMessages; }; } else { - cutText [format [localize "str_salvage_toolbox",_namePart], "PLAIN DOWN"]; + format[localize "str_salvage_toolbox",_namePart] call dayz_rollingMessages; }; dayz_myCursorTarget = objNull; diff --git a/SQF/dayz_code/actions/salvage_vehicle.sqf b/SQF/dayz_code/actions/salvage_vehicle.sqf index aa1cb3331..1d6ee55d1 100644 --- a/SQF/dayz_code/actions/salvage_vehicle.sqf +++ b/SQF/dayz_code/actions/salvage_vehicle.sqf @@ -5,7 +5,7 @@ _vehicle = _this select 3; {dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = []; _PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 10]) > 1; -if (_PlayerNear) exitWith {dayz_myCursorTarget = objNull; cutText [localize "str_pickup_limit_5", "PLAIN DOWN"];}; +if (_PlayerNear) exitWith {dayz_myCursorTarget = objNull; localize "str_pickup_limit_5" call dayz_rollingMessages;}; dayz_myCursorTarget = _vehicle; _hitpoints = _vehicle call vehicle_getHitpoints; diff --git a/SQF/dayz_code/actions/show_dialog.sqf b/SQF/dayz_code/actions/show_dialog.sqf index 314fd407c..e4c21c9ae 100644 --- a/SQF/dayz_code/actions/show_dialog.sqf +++ b/SQF/dayz_code/actions/show_dialog.sqf @@ -1,6 +1,6 @@ private ["_trader_data", "_dialog"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "STR_EPOCH_PLAYER_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "STR_EPOCH_PLAYER_103" call dayz_rollingMessages;}; _trader_data = (_this select 3); diff --git a/SQF/dayz_code/actions/siphonFuel.sqf b/SQF/dayz_code/actions/siphonFuel.sqf index 9e8ff10ed..5cf841ae7 100644 --- a/SQF/dayz_code/actions/siphonFuel.sqf +++ b/SQF/dayz_code/actions/siphonFuel.sqf @@ -5,10 +5,10 @@ private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_ player removeAction s_player_siphonfuel; _hasHose = "equip_hose" in magazines player; -if (dayz_siphonFuelInProgress) exitWith { cutText [localize "str_siphon_inprogress", "PLAIN DOWN"] }; -if (!_hasHose) exitWith {cutText [localize "str_siphon_hose", "PLAIN DOWN"] }; +if (dayz_siphonFuelInProgress) exitWith { localize "str_siphon_inprogress" call dayz_rollingMessages; }; +if (!_hasHose) exitWith {localize "str_siphon_hose" call dayz_rollingMessages; }; _PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 10]) > 1; -if (_PlayerNear) exitWith {cutText [localize "str_pickup_limit_5", "PLAIN DOWN"];}; +if (_PlayerNear) exitWith {localize "str_pickup_limit_5" call dayz_rollingMessages;}; dayz_siphonFuelInProgress = true; _vehicle = _this select 3; @@ -22,7 +22,7 @@ _isMan = _vehicle isKindOf "Man"; _isAnimal = _vehicle isKindOf "Animal"; _isZombie = _vehicle isKindOf "zZombie_base"; -if (_isMan or _isAnimal or _isZombie) exitWith { cutText [localize "str_siphon_notvehicle", "PLAIN DOWN"] }; +if (_isMan or _isAnimal or _isZombie) exitWith { localize "str_siphon_notvehicle" call dayz_rollingMessages; }; // Loop to find containers that can could hold fuel and fill them { @@ -51,7 +51,7 @@ if (_isMan or _isAnimal or _isZombie) exitWith { cutText [localize "str_siphon_n }; if (_newFuel > 0) then { - cutText [format [localize "str_siphon_preparing",_canTypeEmpty], "PLAIN DOWN"]; + format[localize "str_siphon_preparing",_canTypeEmpty] call dayz_rollingMessages; _finished = false; // alert zombies @@ -130,7 +130,7 @@ if (_isMan or _isAnimal or _isZombie) exitWith { cutText [localize "str_siphon_n // Added Nutrition-Factor for work ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; - cutText [format [localize "str_siphon_drained",_nameText,_canSize], "PLAIN DOWN"]; + format[localize "str_siphon_drained",_nameText,_canSize] call dayz_rollingMessages; call fnc_usec_medic_removeActions; r_action = false; @@ -140,15 +140,15 @@ if (_isMan or _isAnimal or _isZombie) exitWith { cutText [localize "str_siphon_n _abort = true; }; } else { - cutText [format [localize "str_siphon_notenough",_nameText], "PLAIN DOWN"]; + format[localize "str_siphon_notenough",_nameText] call dayz_rollingMessages; _abort = true; }; } else { - cutText [localize "str_siphon_canceled", "PLAIN DOWN"]; + localize "str_siphon_canceled" call dayz_rollingMessages; _abort = true; }; } else { - cutText [format [localize "str_siphon_notenough",_nameText], "PLAIN DOWN"]; + format[localize "str_siphon_notenough",_nameText] call dayz_rollingMessages; _abort = true; }; }; diff --git a/SQF/dayz_code/actions/stopGenerator.sqf b/SQF/dayz_code/actions/stopGenerator.sqf index 62c6f1ac7..65e72c69e 100644 --- a/SQF/dayz_code/actions/stopGenerator.sqf +++ b/SQF/dayz_code/actions/stopGenerator.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_started","_finished","_animState","_isMedic","_soundObject"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_99","PLAIN DOWN"]}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_99" call dayz_rollingMessages;}; DZE_ActionInProgress = true; player removeAction s_player_fillgen; @@ -19,7 +19,7 @@ r_doLoop = true; _started = false; _finished = false; -cutText [localize "str_epoch_player_100","PLAIN DOWN"]; +localize "str_epoch_player_100" call dayz_rollingMessages; [player,50,true,(getPosATL player)] spawn player_alertZombies; @@ -46,7 +46,7 @@ if(!_finished) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_26","PLAIN DOWN"]; + localize "str_epoch_player_26" call dayz_rollingMessages; }; if (_finished) then { @@ -59,7 +59,7 @@ if (_finished) then { // Stop generator _vehicle setVariable ["GeneratorRunning", false,true]; - cutText [localize "str_epoch_player_101","PLAIN DOWN"]; + localize "str_epoch_player_101" call dayz_rollingMessages; }; diff --git a/SQF/dayz_code/actions/study_body.sqf b/SQF/dayz_code/actions/study_body.sqf index 7a3037f89..553dbedd9 100644 --- a/SQF/dayz_code/actions/study_body.sqf +++ b/SQF/dayz_code/actions/study_body.sqf @@ -5,4 +5,4 @@ _name = _body getVariable["bodyName","unknown"]; _method = _body getVariable["deathType","unknown"]; _methodStr = localize format ["str_death_%1",_method]; -cutText [format [localize "str_player_studybody",_name,_methodStr], "PLAIN DOWN"]; +format[localize "str_player_studybody",_name,_methodStr] call dayz_rollingMessages; diff --git a/SQF/dayz_code/actions/tent_pitch.sqf b/SQF/dayz_code/actions/tent_pitch.sqf index 721738f1c..497595175 100644 --- a/SQF/dayz_code/actions/tent_pitch.sqf +++ b/SQF/dayz_code/actions/tent_pitch.sqf @@ -13,12 +13,12 @@ _classname = getText (_config >> "tentmodel"); //diag_log ("Classname: "+str(_classname)); //diag_log ("Item: "+str(_item)); -if (r_action_count != 1) exitWith { cutText [localize "str_player_actionslimit", "PLAIN DOWN"]; }; +if (r_action_count != 1) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; // item is missing or tools are missing if ((!(_item IN magazines player))) exitWith { r_action_count = 0; - cutText [format [localize "str_player_31",_text,localize "str_player_31_pitch"] , "PLAIN DOWN"]; + format[localize "str_player_31",_text,localize "str_player_31_pitch"] call dayz_rollingMessages; }; _booleans = []; //testonLadder, testSea, testPond, testBuilding, testSlope, testDistance @@ -40,7 +40,7 @@ _booleans = []; //testonLadder, testSea, testPond, testBuilding, testSlope, test //sleep 5; - cutText [localize "str_player_build_rotate", "PLAIN DOWN"]; + localize "str_player_build_rotate" call dayz_rollingMessages; _location = getMarkerpos "respawn_west"; _object = createVehicle [_classname, _location, [], 0, "NONE"]; @@ -66,7 +66,7 @@ _booleans = []; //testonLadder, testSea, testPond, testBuilding, testSlope, test }; if (speed player > 10 or speed player <= -8) then { - cutText [localize "str_player_build_movingfast", "PLAIN DOWN"]; + localize "str_player_build_movingfast" call dayz_rollingMessages; player playMove "amovpercmstpssurwnondnon"; }; @@ -93,12 +93,12 @@ _booleans = []; //testonLadder, testSea, testPond, testBuilding, testSlope, test PVDZ_obj_Publish = [dayz_characterID,_tent,[_dir,_location],_classname]; publicVariableServer "PVDZ_obj_Publish"; - cutText [localize "str_success_tent_pitch", "PLAIN DOWN"]; + localize "str_success_tent_pitch" call dayz_rollingMessages; sleep 1; r_action_count = 0; } else { r_action_count = 0; - cutText [localize "str_fail_tent_pitch", "PLAIN DOWN"]; + localize "str_fail_tent_pitch" call dayz_rollingMessages; }; */ diff --git a/SQF/dayz_code/actions/tow_AttachStraps.sqf b/SQF/dayz_code/actions/tow_AttachStraps.sqf index c97ef9eb8..0a5e16cf6 100644 --- a/SQF/dayz_code/actions/tow_AttachStraps.sqf +++ b/SQF/dayz_code/actions/tow_AttachStraps.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_started","_finished","_animState","_isMedic","_abort","_configVeh","_nameText","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle","_towTruck","_towTruckSize","_allowedSize"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_96","PLAIN DOWN"]}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_96" call dayz_rollingMessages;}; DZE_ActionInProgress = true; player removeAction s_player_towing; @@ -83,14 +83,14 @@ if(_IsNearVehicle >= 1) then { _vehicle attachTo [_towTruck,[1.3,-2,2.3]]; _towTruck setVariable ["DZEinTow", true, true]; _towTruck setVariable ["DZEvehicleInTow", _vehicle, true]; - cutText [format[(localize "str_epoch_player_175"),_nameText], "PLAIN DOWN"]; + format[localize "str_epoch_player_175",_nameText] call dayz_rollingMessages; }; } else { - cutText [format[(localize "str_epoch_player_176"),_nameText], "PLAIN DOWN"]; + format[localize "str_epoch_player_176",_nameText] call dayz_rollingMessages; }; } else { - cutText [format[(localize "str_epoch_player_177"),_nameText], "PLAIN DOWN"]; + format[localize "str_epoch_player_177",_nameText] call dayz_rollingMessages; }; }; @@ -98,7 +98,7 @@ if(_IsNearVehicle >= 1) then { } else { - cutText [localize "str_epoch_player_27","PLAIN DOWN"]; + localize "str_epoch_player_27" call dayz_rollingMessages; }; DZE_ActionInProgress = false; s_player_towing = -1; \ No newline at end of file diff --git a/SQF/dayz_code/actions/tow_DetachStraps.sqf b/SQF/dayz_code/actions/tow_DetachStraps.sqf index 0be35d60a..e52719dd4 100644 --- a/SQF/dayz_code/actions/tow_DetachStraps.sqf +++ b/SQF/dayz_code/actions/tow_DetachStraps.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_started","_finished","_animState","_isMedic","_configVeh","_nameText","_towTruck","_inTow"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_96","PLAIN DOWN"]}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_96" call dayz_rollingMessages;}; DZE_ActionInProgress = true; player removeAction s_player_towing; @@ -68,7 +68,7 @@ if(_inTow) then { detach _vehicle; _towTruck setVariable ["DZEinTow", false, true]; _towTruck setVariable ["DZEvehicleInTow", objNull, true]; - cutText [format[(localize "str_epoch_player_178"),_nameText], "PLAIN DOWN"]; + format[localize "str_epoch_player_178",_nameText] call dayz_rollingMessages; _vehicle setvelocity [0,0,1]; }; @@ -77,7 +77,7 @@ if(_inTow) then { _towTruck setVariable ["DZEvehicleInTow", objNull, true]; }; } else { - cutText [localize "str_epoch_player_102","PLAIN DOWN"]; + localize "str_epoch_player_102" call dayz_rollingMessages; }; DZE_ActionInProgress = false; s_player_towing = -1; \ No newline at end of file diff --git a/SQF/dayz_code/actions/trade_any_bicycle.sqf b/SQF/dayz_code/actions/trade_any_bicycle.sqf index ee5c71413..dff5e7a91 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle.sqf @@ -1,6 +1,6 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; // [part_out,part_in, qty_out, qty_in, loc]; @@ -21,7 +21,7 @@ if(_buy_o_sell == "sell") then { _bos = 1; }; -cutText [localize "str_epoch_player_105","PLAIN DOWN"]; +localize "str_epoch_player_105" call dayz_rollingMessages; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation @@ -56,7 +56,7 @@ if (!_finished) exitWith { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; DZE_ActionInProgress = false; }; @@ -135,11 +135,11 @@ if (_finished) then { PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,true,dayz_characterID,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; - cutText [format[(localize "STR_EPOCH_PLAYER_180"),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"]; + format[localize "STR_EPOCH_PLAYER_180",_qty_in,_textPartIn,_textPartOut] call dayz_rollingMessages; }; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; } else { @@ -209,14 +209,14 @@ if (_finished) then { // payout _canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange; - cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_182",_textPartIn] call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_245","PLAIN DOWN"]; + localize "str_epoch_player_245" call dayz_rollingMessages; }; }; }; @@ -226,9 +226,9 @@ if (_finished) then { if(_buy_o_sell == "buy") then { _qty = {_x == _part_in} count magazines player; _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_185",_textPartIn] call dayz_rollingMessages; }; }; }; diff --git a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf index 7812f02cb..19ff0287c 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf @@ -1,6 +1,6 @@ private ["_veh","_location","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; // [part_out,part_in, qty_out, qty_in, loc]; @@ -27,7 +27,7 @@ if(_buy_o_sell == "buy") then { if (_qty >= _qty_in) then { - cutText [localize "str_epoch_player_105","PLAIN DOWN"]; + localize "str_epoch_player_105" call dayz_rollingMessages; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation @@ -62,7 +62,7 @@ if (_qty >= _qty_in) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; }; if (_finished) then { @@ -114,7 +114,7 @@ if (_qty >= _qty_in) then { player reveal _veh; - cutText [format[(localize "str_epoch_player_180"),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_180",_qty_in,_textPartIn,_textPartOut] call dayz_rollingMessages; }; } else { @@ -164,13 +164,13 @@ if (_qty >= _qty_in) then { deleteVehicle _obj; - cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; }; } else { - cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_182",_textPartIn] call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_245","PLAIN DOWN"]; + localize "str_epoch_player_245" call dayz_rollingMessages; }; }; @@ -178,7 +178,7 @@ if (_qty >= _qty_in) then { s_player_parts_crtl = -1; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; dayzTradeResult = nil; }; @@ -187,9 +187,9 @@ if (_qty >= _qty_in) then { } else { _needed = _qty_in - _qty; if(_buy_o_sell == "buy") then { - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_185",_textPartIn] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/trade_any_boat.sqf b/SQF/dayz_code/actions/trade_any_boat.sqf index 0f499a874..bc02a472e 100644 --- a/SQF/dayz_code/actions/trade_any_boat.sqf +++ b/SQF/dayz_code/actions/trade_any_boat.sqf @@ -1,11 +1,11 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; // Test cannot lock while another player is nearby //_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_104","PLAIN DOWN"];}; +//if(_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_104" call dayz_rollingMessages;}; // [part_out,part_in, qty_out, qty_in, loc]; @@ -25,7 +25,7 @@ if(_buy_o_sell == "sell") then { _bos = 1; }; -cutText [localize "str_epoch_player_105","PLAIN DOWN"]; +localize "str_epoch_player_105" call dayz_rollingMessages; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation @@ -60,7 +60,7 @@ if (!_finished) exitWith { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; DZE_ActionInProgress = false; }; @@ -125,7 +125,7 @@ if (_finished) then { _keyNumber = (floor(random 2500)) + 1; // Combine to key (eg.ItemKeyYellow2494) classname - _keySelected = format[("ItemKey%1%2"),_keyColor,_keyNumber]; + _keySelected = format["ItemKey%1%2",_keyColor,_keyNumber]; _isKeyOK = isClass(configFile >> "CfgWeapons" >> _keySelected); @@ -157,14 +157,14 @@ if (_finished) then { PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; - cutText [format[(localize "STR_EPOCH_ACTIONS_11"),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"]; + format[localize "STR_EPOCH_ACTIONS_11",_qty_in,_textPartIn,_textPartOut] call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_107","PLAIN DOWN"]; + localize "str_epoch_player_107" call dayz_rollingMessages; }; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; } else { @@ -202,10 +202,10 @@ if (_finished) then { // payout _canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange; - cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; } else { - cutText [localize "str_epoch_player_245","PLAIN DOWN"]; + localize "str_epoch_player_245" call dayz_rollingMessages; }; }; }; @@ -215,9 +215,9 @@ if (_finished) then { if(_buy_o_sell == "buy") then { _qty = {_x == _part_in} count magazines player; _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_185",_textPartIn] call dayz_rollingMessages; }; }; }; diff --git a/SQF/dayz_code/actions/trade_any_boat_old.sqf b/SQF/dayz_code/actions/trade_any_boat_old.sqf index 544772938..a3709ee0c 100644 --- a/SQF/dayz_code/actions/trade_any_boat_old.sqf +++ b/SQF/dayz_code/actions/trade_any_boat_old.sqf @@ -1,11 +1,11 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_okToSell","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; // Test cannot lock while another player is nearby //_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_104","PLAIN DOWN"];}; +//if(_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_104" call dayz_rollingMessages;}; // [part_out,part_in, qty_out, qty_in, loc]; @@ -32,7 +32,7 @@ if(_buy_o_sell == "buy") then { if (_qty >= _qty_in) then { - cutText [localize "str_epoch_player_105","PLAIN DOWN"]; + localize "str_epoch_player_105" call dayz_rollingMessages; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation @@ -67,7 +67,7 @@ if (_qty >= _qty_in) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; }; if (_finished) then { @@ -105,7 +105,7 @@ if (_qty >= _qty_in) then { _keyNumber = (floor(random 2500)) + 1; // Combine to key (eg.ItemKeyYellow2494) classname - _keySelected = format[("ItemKey%1%2"),_keyColor,_keyNumber]; + _keySelected = format["ItemKey%1%2",_keyColor,_keyNumber]; _isKeyOK = isClass(configFile >> "CfgWeapons" >> _keySelected); @@ -135,12 +135,12 @@ if (_qty >= _qty_in) then { player reveal _veh; - cutText [format[("Bought %3 for %1 %2, key added to toolbelt."),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"]; + format["Bought %3 for %1 %2, key added to toolbelt.",_qty_in,_textPartIn,_textPartOut] call dayz_rollingMessages; } else { player removeMagazine _keySelected; }; } else { - cutText [localize "str_epoch_player_107","PLAIN DOWN"]; + localize "str_epoch_player_107" call dayz_rollingMessages; }; } else { @@ -165,9 +165,9 @@ if (_qty >= _qty_in) then { deleteVehicle _obj; - cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; } else { - cutText [localize "str_epoch_player_245","PLAIN DOWN"]; + localize "str_epoch_player_245" call dayz_rollingMessages; }; }; @@ -175,7 +175,7 @@ if (_qty >= _qty_in) then { s_player_parts_crtl = -1; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; dayzTradeResult = nil; }; @@ -184,9 +184,9 @@ if (_qty >= _qty_in) then { } else { _needed = _qty_in - _qty; if(_buy_o_sell == "buy") then { - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_185",_textPartIn] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/trade_any_vehicle.sqf b/SQF/dayz_code/actions/trade_any_vehicle.sqf index ec6e66bd4..33c324a7f 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle.sqf @@ -1,11 +1,11 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_temp_keys","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; // Test cannot lock while another player is nearby //_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_104","PLAIN DOWN"];}; +//if(_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_104" call dayz_rollingMessages;}; // [part_out,part_in, qty_out, qty_in, loc]; @@ -25,7 +25,7 @@ if(_buy_o_sell == "sell") then { _bos = 1; }; -cutText [localize "str_epoch_player_105","PLAIN DOWN"]; +localize "str_epoch_player_105" call dayz_rollingMessages; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation @@ -60,7 +60,7 @@ if (!_finished) exitWith { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; DZE_ActionInProgress = false; }; @@ -124,7 +124,7 @@ if (_finished) then { _keyNumber = (floor(random 2500)) + 1; // Combine to key (eg.ItemKeyYellow2494) classname - _keySelected = format[("ItemKey%1%2"),_keyColor,_keyNumber]; + _keySelected = format["ItemKey%1%2",_keyColor,_keyNumber]; _isKeyOK = isClass(configFile >> "CfgWeapons" >> _keySelected); @@ -156,14 +156,14 @@ if (_finished) then { PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; - cutText [format[(localize "STR_EPOCH_ACTIONS_11"),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"]; + format[localize "STR_EPOCH_ACTIONS_11",_qty_in,_textPartIn,_textPartOut] call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_107","PLAIN DOWN"]; + localize "str_epoch_player_107" call dayz_rollingMessages; }; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; } else { @@ -243,14 +243,14 @@ if (_finished) then { // payout _canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange; - cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_182",_textPartIn] call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_245","PLAIN DOWN"]; + localize "str_epoch_player_245" call dayz_rollingMessages; }; }; }; @@ -259,9 +259,9 @@ if (_finished) then { if(_buy_o_sell == "buy") then { _qty = {_x == _part_in} count magazines player; _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_185",_textPartIn] call dayz_rollingMessages; }; }; }; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf index 2965995a6..590568a73 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf @@ -1,11 +1,11 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; // Test cannot lock while another player is nearby //_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_104","PLAIN DOWN"];}; +//if(_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_104" call dayz_rollingMessages;}; // [part_out,part_in, qty_out, qty_in, loc]; @@ -25,7 +25,7 @@ if(_buy_o_sell == "sell") then { _bos = 1; }; -cutText [localize "str_epoch_player_105","PLAIN DOWN"]; +localize "str_epoch_player_105" call dayz_rollingMessages; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation @@ -60,7 +60,7 @@ if (!_finished) exitWith { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; DZE_ActionInProgress = false; }; @@ -140,7 +140,7 @@ if (_finished) then { }; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; } else { @@ -210,14 +210,14 @@ if (_finished) then { // payout _canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange; - cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_182",_textPartIn] call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_245","PLAIN DOWN"]; + localize "str_epoch_player_245" call dayz_rollingMessages; }; }; }; @@ -226,9 +226,9 @@ if (_finished) then { if(_buy_o_sell == "buy") then { _qty = {_x == _part_in} count magazines player; _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_185",_textPartIn] call dayz_rollingMessages; }; }; }; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf index 20e3b9388..7e830e513 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf @@ -1,11 +1,11 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; // Test cannot lock while another player is nearby //_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_104","PLAIN DOWN"];}; +//if(_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_104" call dayz_rollingMessages;}; // [part_out,part_in, qty_out, qty_in, loc]; @@ -36,7 +36,7 @@ if(_buy_o_sell == "buy") then { if (_qty >= _qty_in) then { - cutText [localize "str_epoch_player_105","PLAIN DOWN"]; + localize "str_epoch_player_105" call dayz_rollingMessages; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation @@ -71,7 +71,7 @@ if (_qty >= _qty_in) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; }; if (_finished) then { @@ -112,7 +112,7 @@ if (_qty >= _qty_in) then { _keyNumber = (floor(random 2500)) + 1; // Combine to key (eg.ItemKeyYellow2494) classname - _keySelected = format[("ItemKey%1%2"),_keyColor,_keyNumber]; + _keySelected = format["ItemKey%1%2",_keyColor,_keyNumber]; _isKeyOK = isClass(configFile >> "CfgWeapons" >> _keySelected); @@ -140,12 +140,12 @@ if (_qty >= _qty_in) then { PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; - cutText [format[("Bought %3 for %1 %2, key added to toolbelt."),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"]; + format["Bought %3 for %1 %2, key added to toolbelt.",_qty_in,_textPartIn,_textPartOut] call dayz_rollingMessages; } else { player removeMagazine _keySelected; }; } else { - cutText [localize "str_epoch_player_107","PLAIN DOWN"]; + localize "str_epoch_player_107" call dayz_rollingMessages; }; } else { @@ -193,13 +193,13 @@ if (_qty >= _qty_in) then { deleteVehicle _obj; - cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_182",_textPartIn] call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_245","PLAIN DOWN"]; + localize "str_epoch_player_245" call dayz_rollingMessages; }; }; @@ -208,7 +208,7 @@ if (_qty >= _qty_in) then { s_player_parts_crtl = -1; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; dayzTradeResult = nil; }; @@ -217,9 +217,9 @@ if (_qty >= _qty_in) then { } else { _needed = _qty_in - _qty; if(_buy_o_sell == "buy") then { - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_185",_textPartIn] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/trade_backpacks.sqf b/SQF/dayz_code/actions/trade_backpacks.sqf index a7eadb936..663f3d74b 100644 --- a/SQF/dayz_code/actions/trade_backpacks.sqf +++ b/SQF/dayz_code/actions/trade_backpacks.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_bos","_bag","_class","_started","_finished","_animState","_isMedic","_num_removed","_needed","_activatingPlayer","_buy_o_sell","_textPartIn","_textPartOut","_traderID"]; // [part_out,part_in, qty_out, qty_in,]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -22,7 +22,7 @@ if(_buy_o_sell == "sell") then { _bos = 1; }; -cutText [localize "str_epoch_player_105","PLAIN DOWN"]; +localize "str_epoch_player_105" call dayz_rollingMessages; // force animation player playActionNow "Medic"; @@ -58,7 +58,7 @@ if (!_finished) exitWith { player playActionNow "stop"; }; DZE_ActionInProgress = false; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; }; if (_finished) then { @@ -116,20 +116,20 @@ if (_finished) then { if (_done) then { removeBackpack player; player addBackpack _part_out; - cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_186",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; }; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; } else { - cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_186",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; }; dayzTradeResult = nil; } else { _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/trade_backpacks_old.sqf b/SQF/dayz_code/actions/trade_backpacks_old.sqf index 83d6e7be6..134dd9344 100644 --- a/SQF/dayz_code/actions/trade_backpacks_old.sqf +++ b/SQF/dayz_code/actions/trade_backpacks_old.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_bos","_bag","_class","_started","_finished","_animState","_isMedic","_num_removed","_needed","_activatingPlayer","_buy_o_sell","_textPartIn","_textPartOut","_traderID"]; // [part_out,part_in, qty_out, qty_in,]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -30,7 +30,7 @@ if(_buy_o_sell == "buy") then { if (_qty >= _qty_in) then { - cutText [localize "str_epoch_player_105","PLAIN DOWN"]; + localize "str_epoch_player_105" call dayz_rollingMessages; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation @@ -65,7 +65,7 @@ if (_qty >= _qty_in) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; }; if (_finished) then { @@ -114,13 +114,13 @@ if (_qty >= _qty_in) then { }; }; - cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_186",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; {player removeAction _x} count s_player_parts;s_player_parts = []; s_player_parts_crtl = -1; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; dayzTradeResult = nil; }; @@ -128,7 +128,7 @@ if (_qty >= _qty_in) then { } else { _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; }; DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/trade_items.sqf b/SQF/dayz_code/actions/trade_items.sqf index efebd0bbb..dae790b59 100644 --- a/SQF/dayz_code/actions/trade_items.sqf +++ b/SQF/dayz_code/actions/trade_items.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_textPartIn","_textPartOut","_bos","_needed","_started","_finished","_animState","_isMedic","_total_parts_out","_abort","_removed","_activatingPlayer","_traderID","_done"]; // [part_out,part_in, qty_out, qty_in,]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"]}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -30,7 +30,7 @@ while {r_autoTrade} do { // check if current magazine count is greater than 20 - if ((count (magazines player)) > 20) exitWith {cutText [localize "str_player_24","PLAIN DOWN"]; r_autoTrade = false}; + if ((count (magazines player)) > 20) exitWith {localize "str_player_24" call dayz_rollingMessages; r_autoTrade = false}; _canAfford = false; if(_bos == 1) then { @@ -55,11 +55,11 @@ while {r_autoTrade} do { if(!_canAfford) exitWith { _qty = {_x == _part_in} count magazines player; _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; r_autoTrade = false }; - cutText [localize "str_epoch_player_105","PLAIN DOWN"]; + localize "str_epoch_player_105" call dayz_rollingMessages; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; player playActionNow "Medic"; @@ -98,7 +98,7 @@ while {r_autoTrade} do { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; }; if (_finished) then { @@ -126,11 +126,11 @@ while {r_autoTrade} do { for "_x" from 1 to _qty_out do { player addMagazine _part_out; }; - cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_186",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; }; } else { _abort = true; - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; } else { _part_inClass = configFile >> "CfgMagazines" >> _part_in; @@ -138,7 +138,7 @@ while {r_autoTrade} do { if (_removed == _qty_in) then { [[[_part_out,_qty_out]],1] call epoch_returnChange; }; - cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_186",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; }; dayzTradeResult = nil; }; diff --git a/SQF/dayz_code/actions/trade_items_old.sqf b/SQF/dayz_code/actions/trade_items_old.sqf index b4c53af7b..cee8a9abd 100644 --- a/SQF/dayz_code/actions/trade_items_old.sqf +++ b/SQF/dayz_code/actions/trade_items_old.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_textPartIn","_textPartOut","_bos","_needed","_started","_finished","_animState","_isMedic","_total_parts_out","_abort","_removed","_tradeCounter","_next_highest_bar","_third_highest_bar","_next_highest_conv","_third_highest_conv","_third_parts_out_raw","_third_parts_out","_remainder","_next_parts_out_raw","_next_parts_out","_activatingPlayer","_traderID","_total_trades"]; // [part_out,part_in, qty_out, qty_in,]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"]}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _total_parts_out = 0; @@ -35,7 +35,7 @@ _abort = false; if(_total_trades < 1) exitWith { _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; DZE_ActionInProgress = false; }; @@ -45,11 +45,11 @@ for "_x" from 1 to _total_trades do { _removed = 0; _tradeCounter = _tradeCounter + 1; - // cutText ["Starting trade, stand still to complete.", "PLAIN DOWN"]; + // "Starting trade, stand still to complete." call dayz_rollingMessages; if(_total_trades == 1) then { - cutText [format[(localize "str_epoch_player_105"),_tradeCounter,_total_trades] , "PLAIN DOWN"]; + format[localize "str_epoch_player_105",_tradeCounter,_total_trades] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_187"),_tradeCounter,_total_trades] , "PLAIN DOWN"]; + format[localize "str_epoch_player_187",_tradeCounter,_total_trades] call dayz_rollingMessages; }; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; player playActionNow "Medic"; @@ -88,7 +88,7 @@ for "_x" from 1 to _total_trades do { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; }; if (_finished) then { @@ -114,10 +114,10 @@ for "_x" from 1 to _total_trades do { // total of all parts _total_parts_out = _total_parts_out + _qty_out; - cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_186",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; _abort = true; // Return items taken @@ -140,7 +140,7 @@ for "_x" from 1 to _total_trades do { } else { _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/trade_items_wo_db.sqf b/SQF/dayz_code/actions/trade_items_wo_db.sqf index feabb0996..40e15ebfc 100644 --- a/SQF/dayz_code/actions/trade_items_wo_db.sqf +++ b/SQF/dayz_code/actions/trade_items_wo_db.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_textPartIn","_textPartOut","_qty","_needed","_started","_finished","_animState","_isMedic","_abort","_removed","_tradeCounter","_total_trades","_humanityGain","_humanity"]; // [part_out,part_in, qty_out, qty_in,]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; //_activatingPlayer = [player] call FNC_GetPlayerUID; @@ -22,7 +22,7 @@ _total_trades = floor (_qty / _qty_in); if(_total_trades < 1) exitWith { _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; DZE_ActionInProgress = false; }; @@ -37,9 +37,9 @@ for "_x" from 1 to _total_trades do { _tradeCounter = _tradeCounter + 1; if(_total_trades == 1) then { - cutText [format[(localize "str_epoch_player_105"),_tradeCounter,_total_trades] , "PLAIN DOWN"]; + format[localize "str_epoch_player_105",_tradeCounter,_total_trades] call dayz_rollingMessages; } else { - cutText [format[(localize "str_epoch_player_187"),_tradeCounter,_total_trades] , "PLAIN DOWN"]; + format[localize "str_epoch_player_187",_tradeCounter,_total_trades] call dayz_rollingMessages; }; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; player playActionNow "Medic"; @@ -73,7 +73,7 @@ for "_x" from 1 to _total_trades do { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; }; _qty = {_x == _part_in} count magazines player; @@ -97,7 +97,7 @@ for "_x" from 1 to _total_trades do { player setVariable["humanity",_humanity,true]; }; - cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_186",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; } else { @@ -110,7 +110,7 @@ for "_x" from 1 to _total_trades do { } else { _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; }; uiSleep 1; diff --git a/SQF/dayz_code/actions/trade_metals.sqf b/SQF/dayz_code/actions/trade_metals.sqf index 959645237..67090d007 100644 --- a/SQF/dayz_code/actions/trade_metals.sqf +++ b/SQF/dayz_code/actions/trade_metals.sqf @@ -1,6 +1,6 @@ private ["_buy","_metals_conversion","_cancel"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; {player removeAction _x} count s_player_parts;s_player_parts = []; diff --git a/SQF/dayz_code/actions/trade_weapons.sqf b/SQF/dayz_code/actions/trade_weapons.sqf index c24238d7d..13a76dded 100644 --- a/SQF/dayz_code/actions/trade_weapons.sqf +++ b/SQF/dayz_code/actions/trade_weapons.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_needed","_activatingPlayer","_textPartIn","_textPartOut","_started","_finished","_animState","_isMedic","_removed"]; // [part_out,part_in, qty_out, qty_in,"buy"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -69,11 +69,11 @@ if(_buy_o_sell == "sell") then { }; if (_abort) exitWith { - cutText [_msg, "PLAIN DOWN"]; + _msg call dayz_rollingMessages; DZE_ActionInProgress = false; }; -cutText [localize "str_epoch_player_105","PLAIN DOWN"]; +localize "str_epoch_player_105" call dayz_rollingMessages; // force animation player playActionNow "Medic"; @@ -109,7 +109,7 @@ if (!_finished) exitWith { player playActionNow "stop"; }; DZE_ActionInProgress = false; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; }; if (_finished) then { @@ -162,15 +162,15 @@ if (_finished) then { _done = [[[_part_in,_qty_in]],0] call epoch_returnChange; if (_done) then { player addWeapon _part_out; - cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_186",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; }; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; } else { // selling - cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_186",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; }; dayzTradeResult = nil; @@ -181,7 +181,7 @@ if (_finished) then { _qty = {_x == _part_in} count weapons player; }; _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/actions/trade_weapons_old.sqf b/SQF/dayz_code/actions/trade_weapons_old.sqf index 6841b6418..f378ab70c 100644 --- a/SQF/dayz_code/actions/trade_weapons_old.sqf +++ b/SQF/dayz_code/actions/trade_weapons_old.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_needed","_activatingPlayer","_textPartIn","_textPartOut","_started","_finished","_animState","_isMedic","_removed"]; // [part_out,part_in, qty_out, qty_in,"buy"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_103" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -26,7 +26,7 @@ if(_buy_o_sell == "buy") then { if (_qty >= _qty_in) then { - cutText [localize "str_epoch_player_105","PLAIN DOWN"]; + localize "str_epoch_player_105" call dayz_rollingMessages; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; // force animation @@ -66,7 +66,7 @@ if (_qty >= _qty_in) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [localize "str_epoch_player_106","PLAIN DOWN"]; + localize "str_epoch_player_106" call dayz_rollingMessages; }; if (_finished) then { @@ -101,7 +101,7 @@ if (_qty >= _qty_in) then { player addMagazine _part_out; }; }; - cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; + format[localize "str_epoch_player_186",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; }; @@ -110,7 +110,7 @@ if (_qty >= _qty_in) then { s_player_parts_crtl = -1; } else { - cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; + format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; }; dayzTradeResult = nil; }; @@ -118,7 +118,7 @@ if (_qty >= _qty_in) then { } else { _needed = _qty_in - _qty; - cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; + format[localize "str_epoch_player_184",_needed,_textPartIn] call dayz_rollingMessages; }; DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/unlock_veh.sqf b/SQF/dayz_code/actions/unlock_veh.sqf index b15c8316e..90a1610e4 100644 --- a/SQF/dayz_code/actions/unlock_veh.sqf +++ b/SQF/dayz_code/actions/unlock_veh.sqf @@ -2,7 +2,7 @@ private["_vehicle","_key"]; _vehicle = (_this select 3) select 0; _key = (_this select 3) select 1; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_37","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_37" call dayz_rollingMessages;}; DZE_ActionInProgress = true; {player removeAction _x} count s_player_lockunlock;s_player_lockunlock = []; @@ -18,7 +18,7 @@ if(player distance _vehicle < 10) then { publicVariable "PVDZE_veh_Lock"; }; - cutText [format["%1 used to unlock vehicle.",_key], "PLAIN"]; + format["%1 used to unlock vehicle.",_key] call dayz_rollingMessages; }; s_player_lockUnlock_crtl = -1; diff --git a/SQF/dayz_code/actions/vault_combination_1.sqf b/SQF/dayz_code/actions/vault_combination_1.sqf index 4e7994840..eae12981a 100644 --- a/SQF/dayz_code/actions/vault_combination_1.sqf +++ b/SQF/dayz_code/actions/vault_combination_1.sqf @@ -1,6 +1,6 @@ private ["_ok"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "STR_EPOCH_PLAYER_21","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "STR_EPOCH_PLAYER_21" call dayz_rollingMessages;}; DZE_ActionInProgress = true; dayz_selectedVault = _this select 3; diff --git a/SQF/dayz_code/actions/vault_pitch.sqf b/SQF/dayz_code/actions/vault_pitch.sqf index 1b7c3803d..6e5d19266 100644 --- a/SQF/dayz_code/actions/vault_pitch.sqf +++ b/SQF/dayz_code/actions/vault_pitch.sqf @@ -5,7 +5,7 @@ private ["_tent","_location","_isOk","_cancel","_location3","_location4","_location1","_location2","_counter","_pondPos","_isPond","_ppos","_hastentitem","_dir","_building","_isBuilding","_playerPos","_item","_offset_x","_offset_y","_offset_z","_offset_z_attach","_config","_text","_tmpvault","_vault_location","_objectsPond","_combination_1","_combination_2","_combination_3","_combination_4","_combination","_removed"]; //check if can pitch here -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_108","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_108" call dayz_rollingMessages;}; DZE_ActionInProgress = true; //disableSerialization; @@ -29,7 +29,7 @@ _isOk = true; _config = configFile >> "CfgMagazines" >> _item; _text = getText (_config >> "displayName"); -if (!_hastentitem) exitWith {cutText [format[(localize "str_player_31"),_text,"pitch"] , "PLAIN DOWN"]}; +if (!_hastentitem) exitWith {format[localize "str_player_31",_text,"pitch"] call dayz_rollingMessages;}; // blocked // Allow on concrete since we dont force to ground. @@ -52,7 +52,7 @@ _counter = 0; while {_isOk} do { if(_counter == 0) then { - cutText [localize "str_epoch_player_109","PLAIN DOWN"]; + localize "str_epoch_player_109" call dayz_rollingMessages; uiSleep 5; _location1 = getPosATL player; uiSleep 5; @@ -60,7 +60,7 @@ while {_isOk} do { if(_location1 distance _location2 < 0.1) exitWith { - cutText [localize "str_epoch_player_109","PLAIN DOWN"]; + localize "str_epoch_player_109" call dayz_rollingMessages; _location3 = getPosATL player; uiSleep 5; _location4 = getPosATL player; @@ -111,7 +111,7 @@ if(!_cancel) then { //remove safe _hastentitem = _this in magazines player; - if (!_hastentitem) exitWith {cutText [format[(localize "str_player_31"),_text,"pitch"] , "PLAIN DOWN"]}; + if (!_hastentitem) exitWith {format[localize "str_player_31",_text,"pitch"] call dayz_rollingMessages;}; _removed = ([player,_item] call BIS_fnc_invRemove); @@ -162,15 +162,15 @@ if(!_cancel) then { PVDZ_obj_Publish = [_combination,_tent,[_dir,_location],[]]; publicVariableServer "PVDZ_obj_Publish"; - cutText [format[(localize "str_epoch_player_179"),_combination], "PLAIN DOWN", 5]; + format[localize "str_epoch_player_179",_combination] call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_110","PLAIN DOWN"]; + localize "str_epoch_player_110" call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_111","PLAIN DOWN"]; + localize "str_epoch_player_111" call dayz_rollingMessages; }; DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/compile/fn_addDuplicateTool.sqf b/SQF/dayz_code/compile/fn_addDuplicateTool.sqf index 1cc9ecd10..0fcf51c24 100644 --- a/SQF/dayz_code/compile/fn_addDuplicateTool.sqf +++ b/SQF/dayz_code/compile/fn_addDuplicateTool.sqf @@ -16,7 +16,7 @@ private ["_bag","_dropOnFloor"]; _dropOnFloor = { private ["_location","_object"]; - systemChat format[(localize "str_epoch_player_314"),_this]; + systemChat format[localize "str_epoch_player_314",_this]; _location = player modeltoworld [0,0.3,0]; if ((_location select 2) < 0) then {_location set [2,0];}; _object = createVehicle ["WeaponHolder",_location,[],0,"CAN_COLLIDE"]; @@ -28,14 +28,14 @@ _dropOnFloor = { if (_this in items player) then { _bag = unitBackpack player; if (!isNull _bag) then { - systemChat format[(localize "str_epoch_player_313"),_this]; + systemChat format[localize "str_epoch_player_313",_this]; _bag addWeaponCargoGlobal [_this,1]; } else { _this call _dropOnFloor; }; } else { if !([player,_this] call BIS_fnc_invAdd) then { - systemChat (localize "str_epoch_player_107"); + systemChat localize "str_epoch_player_107"; _this call _dropOnFloor; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/compile/fn_buildCamera.sqf b/SQF/dayz_code/compile/fn_buildCamera.sqf index 6a7205d42..e1c327aac 100644 --- a/SQF/dayz_code/compile/fn_buildCamera.sqf +++ b/SQF/dayz_code/compile/fn_buildCamera.sqf @@ -13,7 +13,7 @@ if (0 != count Dayz_constructionContext) then { Dayz_BuildCamera camsetrelpos [-1,0,60]; Dayz_BuildCamera camcommit 0; Dayz_constructionContext set [3, true]; - cutText [localize "str_buildCameraOn", "PLAIN DOWN"]; + localize "str_buildCameraOn" call dayz_rollingMessages; }; } else { @@ -22,7 +22,7 @@ if (0 != count Dayz_constructionContext) then { player switchCamera (Dayz_constructionContext select 2); camdestroy Dayz_BuildCamera; Dayz_constructionContext set [3, false]; - cutText [localize "str_buildCameraOff", "PLAIN DOWN"]; + localize "str_buildCameraOff" call dayz_rollingMessages; }; _handled = true; // used by keyboard.sqf }; \ No newline at end of file diff --git a/SQF/dayz_code/compile/fn_checkItems.sqf b/SQF/dayz_code/compile/fn_checkItems.sqf index 1b8a81595..1d5200569 100644 --- a/SQF/dayz_code/compile/fn_checkItems.sqf +++ b/SQF/dayz_code/compile/fn_checkItems.sqf @@ -39,7 +39,7 @@ _hasItems = true; _missingQty = (_countIn - _qty); _hasItems = false; _textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName"); - cutText [format[(localize "STR_EPOCH_ACTIONS_6"), _missingQty, _textMissing], "PLAIN DOWN"]; + format[localize "STR_EPOCH_ACTIONS_6",_missingQty,_textMissing] call dayz_rollingMessages; }; } forEach _items; _hasItems diff --git a/SQF/dayz_code/compile/fn_damageHandler.sqf b/SQF/dayz_code/compile/fn_damageHandler.sqf index d4805b46c..97bb36e6b 100644 --- a/SQF/dayz_code/compile/fn_damageHandler.sqf +++ b/SQF/dayz_code/compile/fn_damageHandler.sqf @@ -83,7 +83,7 @@ if (_unit == player) then [_unit] spawn { private ["_unit"]; _unit = _this select 0; - cutText [localize "str_player_tranquilized", "PLAIN DOWN"]; + localize "str_player_tranquilized" call dayz_rollingMessages; //systemChat format ["YOU HAVE BEEN TRANQUILISED"]; //uiSleep 2; // 0 fadeSound 0.05; @@ -102,7 +102,7 @@ if (_unit == player) then if ((_isHeadHit) and (_ammo in ["Crowbar_Swing_Ammo","Bat_Swing_Ammo","Sledge_Swing_Ammo"])) then { [_unit] spawn { _unit = _this select 0; - cutText ["you have been knocked out", "PLAIN DOWN"]; + "you have been knocked out" call dayz_rollingMessages; [_unit,0.01] call fnc_usec_damageUnconscious; _unit setVariable ["NORRN_unconscious", true, true]; r_player_timeout = 20 + round(random 60); diff --git a/SQF/dayz_code/compile/fn_gearMenuChecks.sqf b/SQF/dayz_code/compile/fn_gearMenuChecks.sqf index 8165770c2..2c8e7aa18 100644 --- a/SQF/dayz_code/compile/fn_gearMenuChecks.sqf +++ b/SQF/dayz_code/compile/fn_gearMenuChecks.sqf @@ -8,7 +8,7 @@ if ((vehicle player) == player) then { _dis = if (_cTarget isKindOf "USEC_ch53_E" || _cTarget isKindOf "MV22") then {25} else {12}; if ((locked _cTarget) && {(_cTarget isKindOf "LandVehicle") or {_cTarget isKindOf "Air"} or {_cTarget isKindOf "Ship"}} && {(player distance _cTarget) < _dis}) then { - cutText [localize "str_epoch_player_7","PLAIN DOWN"]; + localize "str_epoch_player_7" call dayz_rollingMessages; _display closeDisplay 1; }; @@ -16,7 +16,7 @@ if ((vehicle player) == player) then { _friendlies = player getVariable ["friendlies",[]]; _rcharID = _cTarget getVariable ["CharacterID","0"]; if (!canbuild && {_cTarget isKindOf "Man"} && {alive _cTarget} && {!((typeOf _cTarget) in serverTraders)} && {!(_rcharID in _friendlies)} && {(player distance _cTarget) < 12}) then { - cutText [localize "STR_EPOCH_PLAYER_316","PLAIN DOWN"]; + localize "STR_EPOCH_PLAYER_316" call dayz_rollingMessages; _display closeDisplay 1; }; }; diff --git a/SQF/dayz_code/compile/fn_hasTools.sqf b/SQF/dayz_code/compile/fn_hasTools.sqf index 1b817710d..233ca0bb5 100644 --- a/SQF/dayz_code/compile/fn_hasTools.sqf +++ b/SQF/dayz_code/compile/fn_hasTools.sqf @@ -20,7 +20,7 @@ _hasTools = true; if (!(_x in _items)) exitWith { _hasTools = false; _missing = getText (configFile >> "cfgWeapons" >> _x >> "displayName"); - cutText [format[(localize "STR_EPOCH_PLAYER_137"), _missing] , "PLAIN DOWN"]; + format[localize "STR_EPOCH_PLAYER_137",_missing] call dayz_rollingMessages; }; } count _tools; _hasTools diff --git a/SQF/dayz_code/compile/fn_removeItems.sqf b/SQF/dayz_code/compile/fn_removeItems.sqf index fb2e8c007..bc9ed04f8 100644 --- a/SQF/dayz_code/compile/fn_removeItems.sqf +++ b/SQF/dayz_code/compile/fn_removeItems.sqf @@ -50,5 +50,5 @@ _tobe_removed_total = 0; if (_tobe_removed_total == _removed_total) exitWith { true }; // missing parts { player addMagazine _x; } count _temp_removed_array; -cutText [format[(localize "STR_EPOCH_PLAYER_145"), _removed_total, _tobe_removed_total], "PLAIN DOWN"]; +format[localize "STR_EPOCH_PLAYER_145",_removed_total,_tobe_removed_total] call dayz_rollingMessages; false diff --git a/SQF/dayz_code/compile/object_removeNearby.sqf b/SQF/dayz_code/compile/object_removeNearby.sqf index 03e7bf418..68e144b90 100644 --- a/SQF/dayz_code/compile/object_removeNearby.sqf +++ b/SQF/dayz_code/compile/object_removeNearby.sqf @@ -10,12 +10,12 @@ _canDo = (!r_drag_sqf && !r_player_unconscious && !_onLadder); _nearByObjects = nearestObjects [player,_objects,_range]; if (count _nearByObjects == 0) exitWith { - cutText [localize _error,"PLAIN DOWN"]; + localize _error call dayz_rollingMessages; }; _targetObject = _nearByObjects select 0; if (!isNull _targetObject && _canDo) then { [0,1,2,_targetObject] spawn player_removeObject; } else { - cutText [localize _error,"PLAIN DOWN"]; + localize _error call dayz_rollingMessages; }; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_antiWall.sqf b/SQF/dayz_code/compile/player_antiWall.sqf index deb1c1b94..38adb7fe6 100644 --- a/SQF/dayz_code/compile/player_antiWall.sqf +++ b/SQF/dayz_code/compile/player_antiWall.sqf @@ -39,31 +39,31 @@ if(_activated) then { // this method is said to be faster than switch, lets try it. call { if (DZE_AntiWallCounter == DZE_AntiWallLimit) exitWith { - cutText [localize "str_epoch_player_9","PLAIN DOWN"]; + localize "str_epoch_player_9" call dayz_rollingMessages; _id = [player,"crushed"] spawn player_death; }; if ((_vehicle emptyPositions "driver") > 0) exitWith { - cutText [localize "STR_EPOCH_ACTIONS_15","PLAIN DOWN"]; + localize "STR_EPOCH_ACTIONS_15" call dayz_rollingMessages; player moveInDriver _vehicle; DZE_AntiWallCounter = DZE_AntiWallCounter + 1; }; if ((_vehicle emptyPositions "gunner") > 0) exitWith { - cutText [localize "STR_EPOCH_ACTIONS_15","PLAIN DOWN"]; + localize "STR_EPOCH_ACTIONS_15" call dayz_rollingMessages; player moveInGunner _vehicle; DZE_AntiWallCounter = DZE_AntiWallCounter + 1; }; if ((_vehicle emptyPositions "commander") > 0) exitWith { - cutText [localize "STR_EPOCH_ACTIONS_15","PLAIN DOWN"]; + localize "STR_EPOCH_ACTIONS_15" call dayz_rollingMessages; player moveInCommander _vehicle; DZE_AntiWallCounter = DZE_AntiWallCounter + 1; }; if ((_vehicle emptyPositions "cargo") > 0) exitWith { - cutText [localize "STR_EPOCH_ACTIONS_15","PLAIN DOWN"]; + localize "STR_EPOCH_ACTIONS_15" call dayz_rollingMessages; player moveInCargo _vehicle; DZE_AntiWallCounter = DZE_AntiWallCounter + 1; }; // kill player if none of the above are matched - cutText [localize "str_epoch_player_9","PLAIN DOWN"]; + localize "str_epoch_player_9" call dayz_rollingMessages; _id = [player,"crushed"] spawn player_death; }; diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index 998411692..fa6afa4e0 100644 --- a/SQF/dayz_code/compile/player_death.sqf +++ b/SQF/dayz_code/compile/player_death.sqf @@ -138,7 +138,7 @@ playMusic "dayz_track_death_1"; uiSleep 2; for "_x" from 5 to 1 step -1 do { - titleText [format[localize "str_return_lobby", _x], "PLAIN DOWN", 1]; + format[localize "str_return_lobby",_x] call dayz_rollingMessages; uiSleep 1; }; diff --git a/SQF/dayz_code/compile/player_lockVault.sqf b/SQF/dayz_code/compile/player_lockVault.sqf index b7a972072..ac9616fc8 100644 --- a/SQF/dayz_code/compile/player_lockVault.sqf +++ b/SQF/dayz_code/compile/player_lockVault.sqf @@ -5,7 +5,7 @@ */ private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_holder","_weapons","_magazines","_backpacks","_alreadyPacking","_lockedClass","_text","_playerNear"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_10","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_10" call dayz_rollingMessages;}; DZE_ActionInProgress = true; player removeAction s_player_lockvault; @@ -26,16 +26,16 @@ uiSleep 1; uiSleep 5; _playerNear = _obj call dze_isnearest_player; -if (_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_11","PLAIN DOWN"];}; +if (_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_11" call dayz_rollingMessages;}; _ownerID = _obj getVariable["CharacterID","0"]; _objectID = _obj getVariable["ObjectID","0"]; _objectUID = _obj getVariable["ObjectUID","0"]; -if((_ownerID != dayz_combination) && (_ownerID != dayz_playerUID)) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; cutText [format[(localize "str_epoch_player_115"),_text], "PLAIN DOWN"]; }; +if((_ownerID != dayz_combination) && (_ownerID != dayz_playerUID)) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; format[localize "str_epoch_player_115",_text] call dayz_rollingMessages; }; _alreadyPacking = _obj getVariable["packing",0]; -if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; cutText [format[(localize "str_epoch_player_116"),_text], "PLAIN DOWN"]}; +if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; format[localize "str_epoch_player_116",_text] call dayz_rollingMessages;}; _obj setVariable["packing",1]; _dir = direction _obj; @@ -71,7 +71,7 @@ if (!isNull _obj) then { _holder setVariable ["MagazineCargo", _magazines, true]; _holder setVariable ["BackpackCargo", _backpacks, true]; - cutText [format[(localize "str_epoch_player_117"),_text], "PLAIN DOWN"]; + format[localize "str_epoch_player_117",_text] call dayz_rollingMessages; }; s_player_lockvault = -1; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/compile/player_onPause.sqf b/SQF/dayz_code/compile/player_onPause.sqf index 05dc19987..babb35596 100644 --- a/SQF/dayz_code/compile/player_onPause.sqf +++ b/SQF/dayz_code/compile/player_onPause.sqf @@ -30,12 +30,12 @@ while {(!isNull _display) && !r_player_dead} do { case (_playerCheck) : { _btnAbort ctrlEnable false; _btnAbort ctrlSetText format["%1 (in 30)", _btnAbortText]; - cutText [localize "str_abort_playerclose", "PLAIN DOWN"]; + localize "str_abort_playerclose" call dayz_rollingMessages; }; case (_zedCheck) : { _btnAbort ctrlEnable false; _btnAbort ctrlSetText format["%1 (in 10)", _btnAbortText]; - cutText [localize "str_abort_zedsclose", "PLAIN DOWN"]; + localize "str_abort_zedsclose" call dayz_rollingMessages; }; case (_inCombat && !_zedCheck && !_playerCheck) : { _btnAbort ctrlEnable false; @@ -43,7 +43,7 @@ while {(!isNull _display) && !r_player_dead} do { }; case (isInTraderCity) : { _btnAbort ctrlEnable false; - cutText [localize "str_epoch_player_12","PLAIN DOWN"]; + localize "str_epoch_player_12" call dayz_rollingMessages; }; default { _btnAbort ctrlEnable true; diff --git a/SQF/dayz_code/compile/player_packTent.sqf b/SQF/dayz_code/compile/player_packTent.sqf index 3be748091..5f11deab3 100644 --- a/SQF/dayz_code/compile/player_packTent.sqf +++ b/SQF/dayz_code/compile/player_packTent.sqf @@ -1,7 +1,7 @@ /* [_obj] call player_packTent; */ -if (DZE_ActionInProgress) exitWith {cutText [localize "str_player_beingpacked","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_player_beingpacked" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _obj = _this; _ownerID = _obj getVariable["CharacterID","0"]; @@ -22,7 +22,7 @@ if (_ownerID == dayz_characterID or (typeOf _obj in _campItems)) then { _pickup if (_pickup) then { _alreadyPacking = _obj getVariable["packing",0]; - if (_alreadyPacking == 1) exitWith {cutText [format [localize "str_player_beingpacked"],"PLAIN DOWN"]; DZE_ActionInProgress = false;}; + if (_alreadyPacking == 1) exitWith {localize "str_player_beingpacked" call dayz_rollingMessages; DZE_ActionInProgress = false;}; _obj setVariable["packing",1]; _dir = direction _obj; @@ -76,8 +76,8 @@ if (_pickup) then { _countr = _countr + 1; } count _objWpnTypes; - cutText [localize "str_success_tent_pack", "PLAIN DOWN"]; + localize "str_success_tent_pack" call dayz_rollingMessages; } else { - cutText [localize "str_fail_tent_pack", "PLAIN DOWN"]; + localize "str_fail_tent_pack" call dayz_rollingMessages; }; DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_packVault.sqf b/SQF/dayz_code/compile/player_packVault.sqf index e91c3a627..6abf69712 100644 --- a/SQF/dayz_code/compile/player_packVault.sqf +++ b/SQF/dayz_code/compile/player_packVault.sqf @@ -3,7 +3,7 @@ */ private ["_activatingPlayer","_obj","_ownerID","_objectID","_objectUID","_alreadyPacking","_location1","_location2","_dir","_pos","_bag","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_packedClass","_text","_playerNear"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_15","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_15" call dayz_rollingMessages;}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -19,7 +19,7 @@ if(isNull _obj || !(alive _obj)) exitWith { DZE_ActionInProgress = false; }; _playerNear = _obj call dze_isnearest_player; -if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_16","PLAIN DOWN"];}; +if(_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_16" call dayz_rollingMessages;}; _ownerID = _obj getVariable["CharacterID","0"]; _objectID = _obj getVariable["ObjectID","0"]; @@ -28,23 +28,23 @@ _objectUID = _obj getVariable["ObjectUID","0"]; player removeAction s_player_packvault; s_player_packvault = 1; -if(_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_packvault = -1; cutText [format[(localize "str_epoch_player_118"),_text], "PLAIN DOWN"];}; +if(_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_packvault = -1; format[localize "str_epoch_player_118",_text] call dayz_rollingMessages;}; -if((_ownerID != dayz_combination) && (_ownerID != dayz_playerUID)) exitWith { DZE_ActionInProgress = false; s_player_packvault = -1; cutText [format[(localize "str_epoch_player_119"),_text], "PLAIN DOWN"];}; +if((_ownerID != dayz_combination) && (_ownerID != dayz_playerUID)) exitWith { DZE_ActionInProgress = false; s_player_packvault = -1; format[localize "str_epoch_player_119",_text] call dayz_rollingMessages;}; _alreadyPacking = _obj getVariable["packing",0]; -if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; s_player_packvault = -1; cutText [format[(localize "str_epoch_player_120"),_text] , "PLAIN DOWN"]}; +if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; s_player_packvault = -1; format[localize "str_epoch_player_120",_text] call dayz_rollingMessages;}; _obj setVariable["packing",1]; -cutText [format[(localize "str_epoch_player_121"),_text], "PLAIN DOWN"]; +format[localize "str_epoch_player_121",_text] call dayz_rollingMessages; uiSleep 1; _location1 = getPosATL player; uiSleep 5; _location2 = getPosATL player; if(_location1 distance _location2 > 0.1) exitWith { - cutText [format[(localize "str_epoch_player_122"),_text] , "PLAIN DOWN"]; + format[localize "str_epoch_player_122",_text] call dayz_rollingMessages; _obj setVariable["packing",0]; s_player_packvault = -1; DZE_ActionInProgress = false; @@ -114,7 +114,7 @@ if(!isNull _obj && alive _obj) then { _countr = _countr + 1; } count _objWpnTypes; - cutText [format[(localize "str_epoch_player_123"),_text], "PLAIN DOWN"]; + format[localize "str_epoch_player_123",_text] call dayz_rollingMessages; player action ["Gear", _holder]; }; diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf index e6c5401ff..7a8d51d53 100644 --- a/SQF/dayz_code/compile/player_switchModel.sqf +++ b/SQF/dayz_code/compile/player_switchModel.sqf @@ -15,7 +15,7 @@ _playerUID = [player] call FNC_GetPlayerUID; //BackUp Weapons and Mags _weapons = weapons player; _magazines = call player_countMagazines; //magazines player; -if ((_playerUID == dayz_playerUID) && (count _magazines == 0) && (count (magazines player) > 0)) exitWith {cutText [localize "str_actions_switchmodel_fail", "PLAIN DOWN"]}; +if ((_playerUID == dayz_playerUID) && (count _magazines == 0) && (count (magazines player) > 0)) exitWith {localize "str_actions_switchmodel_fail" call dayz_rollingMessages;}; _primweapon = primaryWeapon player; _secweapon = secondaryWeapon player; diff --git a/SQF/dayz_code/compile/player_traderCity.sqf b/SQF/dayz_code/compile/player_traderCity.sqf index 2cb3586ca..65c3bca6c 100644 --- a/SQF/dayz_code/compile/player_traderCity.sqf +++ b/SQF/dayz_code/compile/player_traderCity.sqf @@ -7,7 +7,7 @@ _enterORleave = _this select 2; switch _enterORleave do { case "enter": { if (_showText) then { - cutText [format [localize "STR_EPOCH_TRADER_ENTER", _traderName], "PLAIN DOWN"]; + format[localize "STR_EPOCH_TRADER_ENTER", _traderName] call dayz_rollingMessages; }; canbuild = false; inTraderCity = _traderName; @@ -16,7 +16,7 @@ switch _enterORleave do { case "leave": { if (_showText) then { - cutText [format [localize "STR_EPOCH_TRADER_LEAVE", _traderName], "PLAIN DOWN"]; + format[localize "STR_EPOCH_TRADER_LEAVE", _traderName] call dayz_rollingMessages; }; canbuild = true; diff --git a/SQF/dayz_code/compile/player_traderMenuConfig.sqf b/SQF/dayz_code/compile/player_traderMenuConfig.sqf index 441742cd9..ae35f1aa8 100644 --- a/SQF/dayz_code/compile/player_traderMenuConfig.sqf +++ b/SQF/dayz_code/compile/player_traderMenuConfig.sqf @@ -212,7 +212,7 @@ TraderDialogBuy = { private ["_index", "_item", "_data"]; _index = _this select 0; if (_index < 0) exitWith { - cutText [localize "str_epoch_player_6","PLAIN DOWN"]; + localize "str_epoch_player_6" call dayz_rollingMessages; }; _item = TraderItemList select _index; _data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8]; @@ -224,7 +224,7 @@ TraderDialogSell = { private ["_index", "_item", "_data"]; _index = _this select 0; if (_index < 0) exitWith { - cutText [localize "str_epoch_player_6","PLAIN DOWN"]; + localize "str_epoch_player_6" call dayz_rollingMessages; }; _item = TraderItemList select _index; _data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8]; diff --git a/SQF/dayz_code/compile/player_traderMenuHive.sqf b/SQF/dayz_code/compile/player_traderMenuHive.sqf index 4eca5687e..1f5bbb885 100644 --- a/SQF/dayz_code/compile/player_traderMenuHive.sqf +++ b/SQF/dayz_code/compile/player_traderMenuHive.sqf @@ -201,7 +201,7 @@ TraderDialogBuy = { private ["_index", "_item", "_data"]; _index = _this select 0; if (_index < 0) exitWith { - cutText [localize "str_epoch_player_6","PLAIN DOWN"]; + localize "str_epoch_player_6" call dayz_rollingMessages; }; _item = TraderItemList select _index; _data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8]; @@ -213,7 +213,7 @@ TraderDialogSell = { private ["_index", "_item", "_data"]; _index = _this select 0; if (_index < 0) exitWith { - cutText [localize "str_epoch_player_6","PLAIN DOWN"]; + localize "str_epoch_player_6" call dayz_rollingMessages; }; _item = TraderItemList select _index; _data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8]; diff --git a/SQF/dayz_code/compile/player_unlockDoor.sqf b/SQF/dayz_code/compile/player_unlockDoor.sqf index fd4ab4abf..a568e71ca 100644 --- a/SQF/dayz_code/compile/player_unlockDoor.sqf +++ b/SQF/dayz_code/compile/player_unlockDoor.sqf @@ -5,7 +5,7 @@ */ private ["_display","_obj","_objectCharacterID"]; -if (!isNil "DZE_DYN_UnlockDoorInprogress") exitWith {cutText [localize "str_epoch_player_21","PLAIN DOWN"];}; +if (!isNil "DZE_DYN_UnlockDoorInprogress") exitWith {localize "str_epoch_player_21" call dayz_rollingMessages;}; DZE_DYN_UnlockDoorInprogress = true; @@ -24,7 +24,7 @@ if (!isNull dayz_selectedDoor) then { // close display since another player is closer _display = findDisplay 41144; _display closeDisplay 3000; - cutText [localize "STR_EPOCH_ACTIONS_16","PLAIN DOWN"]; + localize "STR_EPOCH_ACTIONS_16" call dayz_rollingMessages; } else { // get object combination _objectCharacterID = _obj getVariable ["CharacterID","0"]; @@ -57,7 +57,7 @@ if (!isNull dayz_selectedDoor) then { if (!isNil 'KeyCodeTryTimer') then {KeyCodeTryTimer = diag_tickTime+10;}; if (KeyCodeTry >= ((round(random 4)) + 4)) then { if (isNil 'KeyCodeTryTimer') then {KeyCodeTryTimer = diag_tickTime+10;}; - cutText [localize "str_epoch_player_19","PLAIN DOWN"]; + localize "str_epoch_player_19" call dayz_rollingMessages; _display = findDisplay 41144; _display closeDisplay 3000; }; diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf index 268671aee..0c7c21e22 100644 --- a/SQF/dayz_code/compile/player_unlockVault.sqf +++ b/SQF/dayz_code/compile/player_unlockVault.sqf @@ -5,7 +5,7 @@ */ private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_alreadyPacking","_playerNear","_playerID","_claimedBy","_unlockedClass","_text","_nul","_objType"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_21","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_21" call dayz_rollingMessages;}; DZE_ActionInProgress = true; {player removeAction _x} count s_player_combi; @@ -21,7 +21,7 @@ if !(_objType in DZE_LockedStorage) exitWith { }; _playerNear = _obj call dze_isnearest_player; -if (_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_20","PLAIN DOWN"];}; +if (_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_20" call dayz_rollingMessages;}; // Silently exit if object no longer exists || alive if (isNull _obj || !(alive _obj)) exitWith { DZE_ActionInProgress = false; }; @@ -33,7 +33,7 @@ _alreadyPacking = _obj getVariable["packing",0]; _claimedBy = _obj getVariable["claimed","0"]; _ownerID = _obj getVariable["CharacterID","0"]; -if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; cutText [format[(localize "str_epoch_player_124"),_text], "PLAIN DOWN"]}; +if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; format[localize "str_epoch_player_124",_text] call dayz_rollingMessages;}; // Promt user for password if _ownerID != dayz_playerUID if ((_ownerID == dayz_combination) || (_ownerID == dayz_playerUID)) then { @@ -123,11 +123,11 @@ if ((_ownerID == dayz_combination) || (_ownerID == dayz_playerUID)) then { } count _objWpnTypes; }; - cutText [format[(localize "str_epoch_player_125"),_text], "PLAIN DOWN"]; + format[localize "str_epoch_player_125",_text] call dayz_rollingMessages; }; } else { DZE_ActionInProgress = false; - cutText [format[(localize "str_player_beinglooted"),_text] , "PLAIN DOWN"]; + format[localize "str_player_beinglooted",_text] call dayz_rollingMessages; }; } else { ["Working",0,[100,15,10,0]] call dayz_NutritionSystem; @@ -136,7 +136,7 @@ if ((_ownerID == dayz_combination) || (_ownerID == dayz_playerUID)) then { [player,"repair",0,false] call dayz_zombieSpeak; [player,25,true,(getPosATL player)] spawn player_alertZombies; uiSleep 5; - cutText [format[(localize "str_epoch_player_126"),_text], "PLAIN DOWN"]; + format[localize "str_epoch_player_126",_text] call dayz_rollingMessages; }; s_player_unlockvault = -1; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/compile/player_upgradeVehicle.sqf b/SQF/dayz_code/compile/player_upgradeVehicle.sqf index 50568b3c1..d254bf226 100644 --- a/SQF/dayz_code/compile/player_upgradeVehicle.sqf +++ b/SQF/dayz_code/compile/player_upgradeVehicle.sqf @@ -4,13 +4,13 @@ */ private ["_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_removed","_tobe_removed_total","_textMissing","_num_removed","_removed_total","_temp_removed_array","_countr","_objectID","_objectUID","_location","_dir","_objectCharacterID","_weapons","_magazines","_backpacks","_classname","_object","_holder","_objWpnTypes","_objWpnQty","_newclassname","_requirements","_upgrade","_vehicle","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle"]; -if (DZE_ActionInProgress) exitWith {cutText [localize "STR_EPOCH_PLAYER_52","PLAIN DOWN"];}; +if (DZE_ActionInProgress) exitWith {localize "STR_EPOCH_PLAYER_52" call dayz_rollingMessages;}; DZE_ActionInProgress = true; // This is used to find correct upgrade based what upgrades was called allows multiple upgrades per vehicle. _upgrade = _this; -if (vehicle player != player) exitWith {DZE_ActionInProgress = false; cutText [localize "STR_EPOCH_ACTIONS_18","PLAIN DOWN"]}; +if (vehicle player != player) exitWith {DZE_ActionInProgress = false; localize "STR_EPOCH_ACTIONS_18" call dayz_rollingMessages;}; // look for nearest empty vehicle _findNearestVehicles = player nearEntities [["LandVehicle"],10]; @@ -113,7 +113,7 @@ if (_IsNearVehicle >= 1) then { _objectUID = _vehicle getVariable ["ObjectUID","0"]; if(_objectID == "0" && _objectUID == "0") then { - cutText [localize "str_epoch_player_50","PLAIN DOWN"]; + localize "str_epoch_player_50" call dayz_rollingMessages; } else { // Get position @@ -128,31 +128,31 @@ if (_IsNearVehicle >= 1) then { PVDZE_veh_Upgrade = [_vehicle,[_dir,_location],_newclassname,true,_objectCharacterID,player]; publicVariableServer "PVDZE_veh_Upgrade"; - cutText [localize "STR_EPOCH_VEHUP_SUCCESS","PLAIN DOWN"]; + localize "STR_EPOCH_VEHUP_SUCCESS" call dayz_rollingMessages; {player reveal _x;} count (player nearEntities [["LandVehicle"],10]); }; } else { {player addMagazine _x;} count _temp_removed_array_mag; {player addWeapon _x;} count _temp_removed_array_wep; - cutText [format[(localize "str_epoch_player_145"),_removed_total,_tobe_removed_total], "PLAIN DOWN"]; + format[localize "str_epoch_player_145",_removed_total,_tobe_removed_total] call dayz_rollingMessages; }; } else { _textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName"); - cutText [format[(localize "STR_EPOCH_ACTIONS_6"),_missingQty, _textMissing], "PLAIN DOWN"]; + format[localize "STR_EPOCH_ACTIONS_6",_missingQty, _textMissing] call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_82","PLAIN DOWN"]; + localize "str_epoch_player_82" call dayz_rollingMessages; }; } else { - cutText [localize "str_epoch_player_245","PLAIN DOWN"]; + localize "str_epoch_player_245" call dayz_rollingMessages; }; } else { - cutText [localize "STR_EPOCH_PLAYER_27","PLAIN DOWN"]; + localize "STR_EPOCH_PLAYER_27" call dayz_rollingMessages; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/compile/vehicle_getOut.sqf b/SQF/dayz_code/compile/vehicle_getOut.sqf index d384118c7..e1cda5488 100644 --- a/SQF/dayz_code/compile/vehicle_getOut.sqf +++ b/SQF/dayz_code/compile/vehicle_getOut.sqf @@ -23,7 +23,7 @@ if (_unit == player) then { PVDZ_Server_LogIt = format["Player %1 exited a vehicle(%2) close to buildable object as %3",_unit, (typeof _vehicle), _position]; publicVariableServer "PVDZ_Server_LogIt"; - cutText ["Unable to exit vehicle too close to buildables objects", "PLAIN DOWN"]; + "Unable to exit vehicle too close to buildables objects" call dayz_rollingMessages; }; }; 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 8c270c568..a22222340 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 @@ -26,6 +26,6 @@ R3F_TIRED_FNCT_DoBlackVanish = { [player,0.1] call fnc_usec_damageUnconscious; _refObj = player; [_refObj,"scream",3,false] call dayz_zombieSpeak; - cutText ["You are overburdened.", "PLAIN DOWN"]; + "You are overburdened." call dayz_rollingMessages; }; diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index 9cbe6fea3..862a18520 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -323,7 +323,7 @@ if (!isDedicated) then { "PVDZ_obj_Fire" addPublicVariableEventHandler {(_this select 1) spawn BIS_Effects_Burn}; "PVDZ_dayzFlies" addPublicVariableEventHandler {(_this select 1) call spawn_flies}; "PVCDZ_plr_Humanity" addPublicVariableEventHandler {(_this select 1) spawn player_humanityChange}; - "PVDZE_plr_FriendRQ" addPublicVariableEventHandler {if (player == ((_this select 1) select 0)) then {cutText[localize "str_epoch_player_2","PLAIN DOWN"];};}; + "PVDZE_plr_FriendRQ" addPublicVariableEventHandler {if (player == ((_this select 1) select 0)) then {localize "str_epoch_player_2" call dayz_rollingMessages;};}; //Medical "PVCDZ_hlt_Morphine" addPublicVariableEventHandler {(_this select 1) call player_medMorphine}; @@ -370,16 +370,16 @@ if (!isDedicated) then { _object setVariable ["dayz_padlockLockStatus", false,true]; _object setVariable ["isOpen", "1", true]; _object setVariable ["dayz_padlockHistory", [], true]; - titleText [format["%1 unlocked", typeOf _object],"PLAIN DOWN"]; + format["%1 unlocked",typeOf _object] call dayz_rollingMessages; } else { - titleText ["Incorrect combination", "PLAIN DOWN"]; + "Incorrect combination" call dayz_rollingMessages; _object setVariable ["dayz_padlockHistory", _codeGuess, true]; }; }; "PVCDZ_Client_processAccessCode" addPublicVariableEventHandler { _codeGuess = (_this select 1) select 0; - titleText [format["You have set the combination to %1", _codeGuess],"PLAIN DOWN"]; + format["You have set the combination to %1",_codeGuess] call dayz_rollingMessages; }; // flies and swarm sound sync diff --git a/SQF/dayz_code/medical/drag.sqf b/SQF/dayz_code/medical/drag.sqf index 7092115b7..110a45102 100644 --- a/SQF/dayz_code/medical/drag.sqf +++ b/SQF/dayz_code/medical/drag.sqf @@ -57,7 +57,7 @@ while {r_drag_sqf} do { if (vehicle player != player) then { player action ["eject", vehicle player]; - cutText [localize "str_actions_medical_dragbody_veh","PLAIN DOWN"]; + localize "str_actions_medical_dragbody_veh" call dayz_rollingMessages; [cursorTarget, _unit, _unconscious, _dragee] execVM "\z\addons\dayz_code\medical\drop_body.sqf"; }; if (!r_drag_sqf) exitWith {}; diff --git a/SQF/dayz_code/medical/fillBloodBag.sqf b/SQF/dayz_code/medical/fillBloodBag.sqf index d0bfd3838..917e23c2a 100644 --- a/SQF/dayz_code/medical/fillBloodBag.sqf +++ b/SQF/dayz_code/medical/fillBloodBag.sqf @@ -22,9 +22,9 @@ _bloodDrained = false; _forceExit = false; _UID = getPlayerUID player; if ((isNil "_UID") or (_UID == "0")) exitWith {}; -if (!_hasEmptyBag) exitWith { cutText [localize "str_actions_medical_bagEmpty", "PLAIN DOWN"]; }; +if (!_hasEmptyBag) exitWith { localize "str_actions_medical_bagEmpty" call dayz_rollingMessages; }; -if (_bloodLevel <= 4200) exitWith {cutText [localize "str_actions_medical_bagMissingBlood", "PLAIN DOWN"];}; +if (_bloodLevel <= 4200) exitWith {localize "str_actions_medical_bagMissingBlood" call dayz_rollingMessages;}; if (!(alive _victim)) then { _bloodDrained = _victim getVariable ["bloodTaken", false]; @@ -32,7 +32,7 @@ if (!(alive _victim)) then { _victim setVariable ["bloodTaken", true, true]; }; -if (_forceExit) exitWith {cutText [localize "str_actions_medical_bagMissingBlood", "PLAIN DOWN"];}; +if (_forceExit) exitWith {localize "str_actions_medical_bagMissingBlood" call dayz_rollingMessages;}; if (vehicle player == player) then { //not in a vehicle @@ -45,7 +45,7 @@ while {r_doLoop and (_i < 25)} do { if (_isMedic and !_started) then { player removeMagazine "emptyBloodBag"; - cutText [localize "str_actions_medical_transfusion_start", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_start" call dayz_rollingMessages; [player,_victim,"loc",rTITLETEXT,localize "str_actions_medical_transfusion_start","PLAIN DOWN"] call RE; _started = true; }; @@ -68,7 +68,7 @@ while {r_doLoop and (_i < 25)} do { _bloodAfter = (_blood - 4000); if ((_blood <= _bloodAfter) or (_i == 25)) then { - cutText [localize "str_actions_medical_bagDone", "PLAIN DOWN"]; + localize "str_actions_medical_bagDone" call dayz_rollingMessages; [player,_victim,"loc",rTITLETEXT,localize "str_actions_medical_bagDone","PLAIN DOWN"] call RE; //_victim setVariable ["USEC_BloodQty", _bloodAfter, true]; r_doLoop = false; @@ -80,7 +80,7 @@ while {r_doLoop and (_i < 25)} do { if (!_isClose) then { r_doLoop = false; r_interrupt = true; - cutText [localize "str_actions_medical_bagInterrupted", "PLAIN DOWN"]; + localize "str_actions_medical_bagInterrupted" call dayz_rollingMessages; [player,_victim,"loc",rTITLETEXT,localize "str_actions_medical_bagInterrupted","PLAIN DOWN"] call RE; }; }; diff --git a/SQF/dayz_code/medical/load/load_act.sqf b/SQF/dayz_code/medical/load/load_act.sqf index c27739914..09ee3bb9f 100644 --- a/SQF/dayz_code/medical/load/load_act.sqf +++ b/SQF/dayz_code/medical/load/load_act.sqf @@ -26,6 +26,6 @@ if ((_vcl emptyPositions "cargo") > 0) then publicVariable "PVDZ_drg_RLact"; player removeAction NORRN_dropAction; } else { - cutText [localize "str_dragnospace", "PLAIN DOWN"];//hint "No space left in vehicle"; + localize "str_dragnospace" call dayz_rollingMessages;//hint "No space left in vehicle"; }; NORRN_load_wounded_action = true; diff --git a/SQF/dayz_code/medical/publicEH/medTransfuse.sqf b/SQF/dayz_code/medical/publicEH/medTransfuse.sqf index a03eb246f..df51e3bb3 100644 --- a/SQF/dayz_code/medical/publicEH/medTransfuse.sqf +++ b/SQF/dayz_code/medical/publicEH/medTransfuse.sqf @@ -27,7 +27,7 @@ while {r_doLoop} do { if (_amount > 0) then { _amount = _amount - 500; }; - cutText [localize "str_actions_medical_transfusion_start", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_start" call dayz_rollingMessages; //Make sure the unit is a player and update stats based on whats being sent (should mimic 500 units of blood being sent) if (_unit == player) then { @@ -62,12 +62,12 @@ while {r_doLoop} do { //diag_log format["Player Blood %1 - %2, - %3, - %4",_blood,_unit,_medic,(_unit getVariable "USEC_BloodQty")]; if (_blood >= r_player_bloodTotal or _amount == 0) then { - cutText [localize "str_actions_medical_transfusion_successful", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_successful" call dayz_rollingMessages; r_doLoop = false; }; if (r_interrupt) then { - cutText [localize "str_actions_medical_transfusion_interrupted", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_interrupted" call dayz_rollingMessages; r_doLoop = false; }; diff --git a/SQF/dayz_code/medical/pulse.sqf b/SQF/dayz_code/medical/pulse.sqf index 459d18d24..036672f7e 100644 --- a/SQF/dayz_code/medical/pulse.sqf +++ b/SQF/dayz_code/medical/pulse.sqf @@ -5,11 +5,11 @@ _isCardiac = _unit getVariable["USEC_isCardiac",false]; uiSleep 1; if (_isDead) then { - cutText [localize "str_pulse_extremely_weak","PLAIN DOWN"]; + localize "str_pulse_extremely_weak" call dayz_rollingMessages; } else { if (_isCardiac) then { - cutText [localize "str_pulse_weak","PLAIN DOWN"]; + localize "str_pulse_weak" call dayz_rollingMessages; } else { - cutText [localize "str_pulse_strong","PLAIN DOWN"]; + localize "str_pulse_strong" call dayz_rollingMessages; }; }; diff --git a/SQF/dayz_code/medical/selfbloodbag.sqf b/SQF/dayz_code/medical/selfbloodbag.sqf index bc2c82ea6..55b6a2f4d 100644 --- a/SQF/dayz_code/medical/selfbloodbag.sqf +++ b/SQF/dayz_code/medical/selfbloodbag.sqf @@ -10,7 +10,7 @@ _injured = _unit getVariable ["USEC_injured", false]; _inPain = _unit getVariable ["USEC_inPain", false]; _lastused = _unit getVariable ["LastTransfusion", -(DZE_selfTransfuse_Values select 2)]; -if (round(time - _lastused) <= DZE_selfTransfuse_Values select 2) exitWith {cutText [localize "str_actions_medical_18","PLAIN DOWN"]}; +if (round(time - _lastused) <= DZE_selfTransfuse_Values select 2) exitWith {localize "str_actions_medical_18" call dayz_rollingMessages;}; call gear_ui_init; closeDialog 0; @@ -86,7 +86,7 @@ while {r_doLoop and (_i < 12)} do { if (_bagToRemove in magazines player) then { _bagFound = true; }; }; if (!_bagFound) then {_forceClose = true;} else { player removeMagazine _bagToRemove;}; - cutText [localize "str_actions_medical_transfusion_start", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_start" call dayz_rollingMessages; _started = true; }; @@ -130,7 +130,7 @@ while {r_doLoop and (_i < 12)} do { diag_log format ["TRANSFUSION: completed blood transfusion successfully (_i = %1)", _i]; _unit setVariable ["LastTransfusion",time]; if (_TransfusionInfection) then {r_player_infected = true; player setVariable["USEC_infected",true,true];}; - cutText [localize "str_actions_medical_transfusion_successful", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_successful" call dayz_rollingMessages; r_doLoop = false; }; @@ -138,7 +138,7 @@ while {r_doLoop and (_i < 12)} do { if (r_interrupt or !_isClose or _forceClose) then { diag_log format ["TRANSFUSION: transfusion was interrupted (r_interrupt: %1 | distance: %2 (%3) | _i = %4)", r_interrupt, player distance _unit, _isClose, _i]; - cutText [localize "str_actions_medical_transfusion_interrupted", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_interrupted" call dayz_rollingMessages; r_doLoop = false; }; diff --git a/SQF/dayz_code/medical/setup_functions_med.sqf b/SQF/dayz_code/medical/setup_functions_med.sqf index 8d6c8147d..b9b5e9390 100644 --- a/SQF/dayz_code/medical/setup_functions_med.sqf +++ b/SQF/dayz_code/medical/setup_functions_med.sqf @@ -166,7 +166,7 @@ fnc_usec_calculateBloodPerSec = { if ((_time < 1) and (isNil "sepsisStarted")) then { //if (isNil "sepsisStarted") then { - //cutText [localize "str_medical_sepsis_warning","PLAIN DOWN",5]; + //localize "str_medical_sepsis_warning" call dayz_rollingMessages; systemChat (localize "str_medical_sepsis_warning"); player setVariable ["sepsisStarted", _time]; }; diff --git a/SQF/dayz_code/medical/transfusion.sqf b/SQF/dayz_code/medical/transfusion.sqf index 586fe7a8d..8744549b0 100644 --- a/SQF/dayz_code/medical/transfusion.sqf +++ b/SQF/dayz_code/medical/transfusion.sqf @@ -21,7 +21,7 @@ _bagFound = false; _forceClose = false; //End if the player does not have a transfusion kit -//if (!_hasTransfusionKit) exitWith { cutText [localize "str_actions_medical_transfusion_failed_transfusionkit", "PLAIN DOWN"]; }; +//if (!_hasTransfusionKit) exitWith { localize "str_actions_medical_transfusion_failed_transfusionkit" call dayz_rollingMessages; }; //Unconscious timeout for receving unit _duration = if (_blood <= 4000) then { 3 } else { 2 }; @@ -128,7 +128,7 @@ while {r_doLoop} do { }; }; if (!_bagFound) then {_forceClose = true;} else { player removeMagazine _bagToRemove;}; - cutText [localize "str_actions_medical_transfusion_start", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_start" call dayz_rollingMessages; //see Note 1 //[player,_unit,"loc",rTITLETEXT,format["Transfusion of %1 in progress, remain still...",_bagToRemove],"PLAIN DOWN"] call RE; _started = true; @@ -175,7 +175,7 @@ while {r_doLoop} do { }; }; - cutText [localize "str_actions_medical_transfusion_start", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_start" call dayz_rollingMessages; //see Note 1 //[player,_unit,"loc",rTITLETEXT,format["Transfusion of %1 in progress, remain still...",_bagToRemove],"PLAIN DOWN"] call RE; @@ -189,7 +189,7 @@ while {r_doLoop} do { if (_blood >= r_player_bloodTotal or _bloodAmount == 0) then { diag_log format ["TRANSFUSION: completed blood transfusion successfully (_i = %1)", _i]; - cutText [localize "str_actions_medical_transfusion_successful", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_successful" call dayz_rollingMessages; //see Note 1 //[player,_unit,"loc",rTITLETEXT,localize "str_actions_medical_transfusion_successful","PLAIN DOWN"] call RE; if (!_badBag and _bagFound) then { [player,_humanityAwarded] call player_humanityChange; }; @@ -200,7 +200,7 @@ while {r_doLoop} do { if (r_interrupt or !_isClose or _forceClose) then { diag_log format ["TRANSFUSION: transfusion was interrupted (r_interrupt: %1 | distance: %2 (%3) | _i = %4)", r_interrupt, player distance _unit, _isClose, _i]; - cutText [localize "str_actions_medical_transfusion_interrupted", "PLAIN DOWN"]; + localize "str_actions_medical_transfusion_interrupted" call dayz_rollingMessages; //see Note 1 //[player,_unit,"loc",rTITLETEXT,localize "str_actions_medical_transfusion_interrupted","PLAIN DOWN"] call RE; r_doLoop = false; diff --git a/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf b/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf index e15ba490e..bf4b98058 100644 --- a/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf +++ b/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf @@ -6,7 +6,7 @@ _unit = (_this select 3) select 0; //_inPain = _unit getVariable ["USEC_inPain", false]; //_lastused = _unit getVariable ["LastTransfusion", -(DZE_selfTransfuse_Values select 2)]; -// if (_lastused - time < 60) exitwith {cutText [format[(localize "str_actions_medical_18"),_text] , "PLAIN DOWN"]}; +// if (_lastused - time < 60) exitwith {format[localize "str_actions_medical_18",_text] call dayz_rollingMessages;}; call fnc_usec_medic_removeActions; r_action = false; diff --git a/SQF/dayz_code/system/player_spawn_2.sqf b/SQF/dayz_code/system/player_spawn_2.sqf index 4d4df2339..d56e4de79 100644 --- a/SQF/dayz_code/system/player_spawn_2.sqf +++ b/SQF/dayz_code/system/player_spawn_2.sqf @@ -437,7 +437,7 @@ while {1 == 1} do { //Two primary guns pickup exploit fix if ((primaryWeapon player != "") && (!(primaryWeapon player in MeleeWeapons)) && (dayz_onBack != "") && (!(dayz_onBack in MeleeWeapons)) && (isNull (findDisplay 106)) && (animationState player != "amovpknlmstpslowwrfldnon_amovpknlmstpsraswrfldnon" OR animationState player != "amovpercmstpslowwrfldnon_amovpercmstpsraswrfldnon" OR animationState player != "amovpercmstpslowwrfldnon_amovpercmstpsraswrfldnon")) then { - cutText [localize "str_player_ammo_2primary","PLAIN DOWN"]; + localize "str_player_ammo_2primary" call dayz_rollingMessages; player playActionNow "stop"; player action ["dropWeapon", player, primaryWeapon player]; //sleep 3;