localization and displayText fixes

This commit is contained in:
Glowbal 2015-03-09 22:08:43 +01:00
parent 8a3eac2aa0
commit 8cc0361cb4
5 changed files with 177 additions and 20 deletions

View File

@ -28,32 +28,32 @@ _bloodPressureLow = _bloodPressure select 0;
_output = "";
_logOutPut = "";
if ([_caller] call FUNC(isMedic)) then {
_output = "STR_ACE_CHECK_BLOODPRESSURE_OUTPUT_1";
_output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_1";
_logOutPut = format["%1/%2",round(_bloodPressureHigh),round(_bloodPressureLow)];
} else {
if (_bloodPressureHigh > 20) then {
_output = "STR_ACE_CHECK_BLOODPRESSURE_OUTPUT_2";
_output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_2";
_logOutPut = "Low";
if (_bloodPressureHigh > 100) then {
_output = "STR_ACE_CHECK_BLOODPRESSURE_OUTPUT_3";
_output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_3";
_logOutPut = "Normal";
if (_bloodPressureHigh > 160) then {
_output = "STR_ACE_CHECK_BLOODPRESSURE_OUTPUT_4";
_output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_4";
_logOutPut = "High";
};
};
} else {
if (random(10) > 3) then {
_output = "STR_ACE_CHECK_BLOODPRESSURE_OUTPUT_5";
_output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_5";
_logOutPut = "No Blood Pressure";
} else {
_output = "STR_ACE_CHECK_BLOODPRESSURE_OUTPUT_6";
_output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_6";
};
};
};
["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.5, _caller]] call EFUNC(common,targetEvent);
["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent);
if (_logOutPut != "") then {
[_target,"examine", format["%1 checked Blood Pressure: %2", [_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog);

View File

@ -23,31 +23,30 @@ _heartRate = _unit getvariable [QGVAR(heartRate), 80];
if (!alive _unit) then {
_heartRate = 0;
};
_heartRateOutput = "STR_ACE_CHECK_PULSE_OUTPUT_5";
_heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_5";
_logOutPut = "No heart rate";
if (_heartRate > 1.0) then {
if ([_caller] call FUNC(isMedic)) then {
_heartRateOutput = "STR_ACE_CHECK_PULSE_OUTPUT_1";
_heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_1";
_logOutPut = format["%1",round(_heartRate)];
} else {
// non medical personel will only find a pulse/HR
_heartRateOutput = "STR_ACE_CHECK_PULSE_OUTPUT_2";
_heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_2";
_logOutPut = "Weak";
if (_heartRate > 60) then {
if (_heartRate > 100) then {
_heartRateOutput = "STR_ACE_CHECK_PULSE_OUTPUT_3";
_heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_3";
_logOutPut = "Strong";
} else {
_heartRateOutput = "STR_ACE_CHECK_PULSE_OUTPUT_4";
_heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_4";
_logOutPut = "Normal";
};
};
};
};
_content = ["STR_ACE_CHECK_PULSE_CHECKED_MEDIC",_heartRateOutput];
["displayTextStructured", [_caller], [[_content, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent);
["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent);
if (_logOutPut != "") then {
[_unit,"examine",format["%1 checked Heart Rate: %2",[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog);

View File

@ -20,11 +20,11 @@ _target = _this select 1;
_output = "";
if ([_target] call EFUNC(common,isAwake)) then {
_output = ["STR_ACE_CHECK_REPONSE_RESPONSIVE",[_target] call EFUNC(common,getName)];
_output = ["STR_ACE_MEDICAL_CHECK_REPONSE_RESPONSIVE",[_target] call EFUNC(common,getName)];
} else {
_output = ["STR_ACE_CHECK_REPONSE_UNRESPONSIVE",[_target] call EFUNC(common,getName)];
_output = ["STR_ACE_MEDICAL_CHECK_REPONSE_UNRESPONSIVE",[_target] call EFUNC(common,getName)];
};
["displayTextStructured", [_caller], [_output, 1.5, _caller]] call EFUNC(common,targetEvent);
["displayTextStructured", [_caller], [_output, 2, _caller]] call EFUNC(common,targetEvent);
[_target,"examine",_output] call FUNC(addToLog);

View File

@ -116,9 +116,9 @@ if (_show) then {
lbClear _logCtrl;
private ["_logs", "_log", "_message", "_moment", "_arguments", "_lbCtrl"];
_logs = _unit getvariable [QGVAR(allLogs), []];
_logs = _target getvariable [QGVAR(allLogs), []];
{
_log = _unit getvariable [_x, []];
_log = _target getvariable [_x, []];
{
// [_message,_moment,_type, _arguments]
_message = _x select 0;
@ -133,7 +133,6 @@ if (_show) then {
_arguments set [_foreachIndex, localize _x];
};
}foreach _arguments;
_message = format([_message] + _arguments);
_logCtrl lbAdd format["%1 %2", _moment, _message];
}foreach _log;

View File

@ -399,5 +399,164 @@
<Spanish>Bolsa para cadáveres</Spanish>
</Key>
</Container>
<Container name="Actions">
<Key ID="STR_ACE_MEDICAL_CHECK_BLOODPRESSURE">
<Original>Blood Pressure</Original>
<Russian>Артериальное давление</Russian>
<Spanish>Presión Arterial</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_CONTENT">
<Original>Checking Blood Pressure..</Original>
<Russian>Проверка артериального давления...</Russian>
<Spanish>Comprobando Presión Arterial...</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_CHECKED_MEDIC">
<Original>You checked %1</Original>
<Russian>Вы осмотрели раненого %1</Russian>
<Spanish>Examinando a %1</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_1">
<Original>You find a blood pressure of %2/%3</Original>
<Russian>Артериальное давление %2/%3</Russian>
<Spanish>La Presión Arterial es %2/%3</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_2">
<Original>You find a low blood pressure</Original>
<Russian>Давление низкое</Russian>
<Spanish>La Presión Arterial es baja</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_3">
<Original>You find a normal blood pressure</Original>
<Russian>Давление нормальное</Russian>
<Spanish>La Presión Arterial es normal</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_4">
<Original>You find a high blood pressure</Original>
<Russian>Давление высокое</Russian>
<Spanish>La Presión Arterial es alta</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_5">
<Original>You find no blood pressure</Original>
<Russian>Давления нет</Russian>
<Spanish>No hay Presión Arterial</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_6">
<Original>You fail to find a blood pressure</Original>
<Russian>Артериальное давление не определяется</Russian>
<Spanish>No puedes encontrar Presión Arterial</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_PULSE">
<Original>Pulse</Original>
<Russian>Пульс</Russian>
<Spanish>Pulso</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_PULSE_CONTENT">
<Original>Checking Heart Rate..</Original>
<Russian>Проверка пульса...</Russian>
<Spanish>Comprobando Pulso...</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_PULSE_CHECKED_MEDIC">
<Original>You checked %1</Original>
<Russian>Вы осмотрели раненого %1</Russian>
<Spanish>Examinando a %1</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_1">
<Original>You find a Heart Rate of %2</Original>
<Russian>Пульс %2 уд./мин.</Russian>
<Spanish>El Pulso es %2</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_2">
<Original>You find a weak Heart Rate</Original>
<Russian>Пульс слабый</Russian>
<Spanish>El Pulso es débil</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_3">
<Original>You find a strong Heart Rate</Original>
<Russian>Пульс учащенный</Russian>
<Spanish>El Pulso está acelerado</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_4">
<Original>You find a normal Heart Rate</Original>
<Russian>Пульс в норме</Russian>
<Spanish>El Pulso es bueno</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_5">
<Original>You find no Heart Rate</Original>
<Russian>Пульс не прощупывается</Russian>
<Spanish>No tiene Pulso</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_RESPONSE">
<Original>Response</Original>
<Russian>Реакция</Russian>
<Spanish>Reacciona</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_RESPONSE_CONTENT">
<Original>You check response of patient</Original>
<Russian>Вы проверяете реакцию раненого</Russian>
<Spanish>Compruebas si el paciente reacciona</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_REPONSE_RESPONSIVE">
<Original>%1 is responsive</Original>
<Russian>%1 реагирует на раздражители</Russian>
<Spanish>%1 ha reaccionado</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_REPONSE_UNRESPONSIVE">
<Original>%1 is not responsive</Original>
<Russian>%1 не реагирует</Russian>
<Spanish>%1 no reacciona</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_CHECK_REPONSE_YOU_CHECKED">
<Original>You checked %1</Original>
<Russian>Вы осмотрели раненого %1</Russian>
<Spanish>Examinas a %1</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_BANDAGING">
<Original>Bandaging</Original>
<Russian>Перевязка...</Russian>
<Spanish>Vendando</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_BANDAGED">
<Original>Bandaged</Original>
<Russian>Повязка наложена</Russian>
<Spanish>Vendado</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_APPLY_BANDAGE">
<Original>You bandage %1 (%2)</Original>
<Russian>Вы перевязали раненого %1 (%2)</Russian>
<Spanish>Aplicas vendaje a %1 en %2</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_IS_BANDAGING_YOU">
<Original>%1 is bandaging you</Original>
<Russian>%1 перевязывает вас</Russian>
<Spanish>%1 te está vendando</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_START_STITCHING_INJURIES">
<Original>You start stitching injures from %1 (%2)</Original>
<Russian>Вы зашиваете ранения от %1 (%2)</Russian>
<Spanish>Estás suturando heridas de %1 en %2</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_STITCHING">
<Original>Stitching</Original>
<Russian>Наложение швов</Russian>
<Spanish>Suturando</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_YOU_TREAT_AIRWAY">
<Original>You treat the airway of %1</Original>
<Russian>Вы интубируете раненого %1</Russian>
<Spanish>Estás intubando a %1</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_AIRWAY">
<Original>Airway</Original>
<Russian>Дыхательные пути</Russian>
<Spanish>Vías Aéreas</Spanish>
</Key>
<Key ID="STR_ACE_MEDICAL_IS_TREATING_YOUR_AIRWAY">
<Original>%1 is treating your airway</Original>
<Russian>%1 проводит вам интубацию</Russian>
<Spanish>%1 te está intubando</Spanish>
</Key>
</Container>
</Package>
</Project>