W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-04-18 02:06:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update all cutText to dayz_rollingMessages

Browse Source
This commit is contained in:
ebaydayz
2016-04-16 15:47:49 -04:00
parent 993ce14da6
commit 5157228e67
137 changed files with 604 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/medical/drag.sqf
View File

@@ -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 {};

12
SQF/dayz_code/medical/fillBloodBag.sqf
View File

@@ -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;
};
};

2
SQF/dayz_code/medical/load/load_act.sqf
View File

@@ -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;

6
SQF/dayz_code/medical/publicEH/medTransfuse.sqf
View File

@@ -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;
};

6
SQF/dayz_code/medical/pulse.sqf
View File

@@ -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;
};
};

8
SQF/dayz_code/medical/selfbloodbag.sqf
View File

@@ -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;
};

2
SQF/dayz_code/medical/setup_functions_med.sqf
View File

@@ -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];
};

10
SQF/dayz_code/medical/transfusion.sqf
View File

@@ -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;

2
SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf
View File

@@ -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;