Skip to content

Commit

Permalink
Merge pull request #6 from tuntematonjr/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@tuntematonjr
tuntematonjr authored Sep 24, 2023
2 parents 6ef7f35 + da6ffc6 commit e7ff5ad
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 51 deletions.
72 changes: 36 additions & 36 deletions addons/unconInfo/Stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,28 +63,28 @@
<German>You have stable vitals (you can wake up)</German>
</Key>
<Key ID="STR_TunCon_notStableVitals">
<Original>You don't have stable vitals (you can't wake up)</Original>
<English>You don't have stable vitals (you can't wake up)</English>
<Czech>You don't have stable vitals (you can't wake up)</Czech>
<French>You don't have stable vitals (you can't wake up)</French>
<Original>You don't have stable vitals (This prevents you from waking up)</Original>
<English>You don't have stable vitals (This prevents you from waking up)</English>
<Czech>You don't have stable vitals (This prevents you from waking up)</Czech>
<French>You don't have stable vitals (This prevents you from waking up)</French>
<Spanish>No tienes las vitales estables (No puedes despertar)</Spanish>
<Italian>You don't have stable vitals (you can't wake up)</Italian>
<Polish>You don't have stable vitals (you can't wake up)</Polish>
<Portuguese>You don't have stable vitals (you can't wake up)</Portuguese>
<Russian>You don't have stable vitals (you can't wake up)</Russian>
<German>You don't have stable vitals (you can't wake up)</German>
<Italian>You don't have stable vitals (This prevents you from waking up)</Italian>
<Polish>You don't have stable vitals (This prevents you from waking up)</Polish>
<Portuguese>You don't have stable vitals (This prevents you from waking up)</Portuguese>
<Russian>You don't have stable vitals (This prevents you from waking up)</Russian>
<German>You don't have stable vitals (This prevents you from waking up)</German>
</Key>
<Key ID="STR_TunCon_hasepinEphrine">
<Original>You have epinephrine in your system (A huge increase in the chance of waking up.)</Original>
<English>You have epinephrine in your system (A huge increase in the chance of waking up.)</English>
<Czech>You have epinephrine in your system (A huge increase in the chance of waking up.)</Czech>
<French>You have epinephrine in your system (A huge increase in the chance of waking up.)</French>
<Original>You have epinephrine in your system (Significantly higher chance of waking up)</Original>
<English>You have epinephrine in your system (Significantly higher chance of waking up)</English>
<Czech>You have epinephrine in your system (Significantly higher chance of waking up)</Czech>
<French>You have epinephrine in your system (Significantly higher chance of waking up)</French>
<Spanish>Tienes epinefrina en tu sistema (tus probabilidades de despertar aumentan)</Spanish>
<Italian>You have epinephrine in your system (A huge increase in the chance of waking up.)</Italian>
<Polish>You have epinephrine in your system (A huge increase in the chance of waking up.)</Polish>
<Portuguese>You have epinephrine in your system (A huge increase in the chance of waking up.)</Portuguese>
<Russian>You have epinephrine in your system (A huge increase in the chance of waking up.)</Russian>
<German>You have epinephrine in your system (A huge increase in the chance of waking up.)</German>
<Italian>You have epinephrine in your system (Significantly higher chance of waking up)</Italian>
<Polish>You have epinephrine in your system (Significantly higher chance of waking up)</Polish>
<Portuguese>You have epinephrine in your system (Significantly higher chance of waking up)</Portuguese>
<Russian>You have epinephrine in your system (Significantly higher chance of waking up)</Russian>
<German>You have epinephrine in your system (Significantly higher chance of waking up)</German>
</Key>
<Key ID="STR_TunCon_noFriends">
<Original>There are no friendlies nearby</Original>
Expand All @@ -99,28 +99,28 @@
<German>There are no friendlies nearby</German>
</Key>
<Key ID="STR_TunCon_closestUnitWithDistance">
<Original>%1Closest unit is %2 and is also medic (%3m)</Original>
<English>%1Closest unit is %2 and is also medic (%3m)</English>
<Czech>%1Closest unit is %2 and is also medic (%3m)</Czech>
<French>%1Closest unit is %2 and is also medic (%3m)</French>
<Original>%1Closest unit is %2 and %2 medic (%3m)</Original>
<English>%1Closest unit is %2 and %2 medic (%3m)</English>
<Czech>%1Closest unit is %2 and %2 medic (%3m)</Czech>
<French>%1Closest unit is %2 and %2 medic (%3m)</French>
<Spanish>%1El aliado mas cercano es %2 y es medico (%3m)</Spanish>
<Italian>%1Closest unit is %2 and is also medic (%3m)</Italian>
<Polish>%1Closest unit is %2 and is also medic (%3m)</Polish>
<Portuguese>%1Closest unit is %2 and is also medic (%3m)</Portuguese>
<Russian>%1Closest unit is %2 and is also medic (%3m)</Russian>
<German>%1Closest unit is %2 and is also medic (%3m)</German>
<Italian>%1Closest unit is %2 and %2 medic (%3m)</Italian>
<Polish>%1Closest unit is %2 and %2 medic (%3m)</Polish>
<Portuguese>%1Closest unit is %2 and %2 medic (%3m)</Portuguese>
<Russian>%1Closest unit is %2 and %2 medic (%3m)</Russian>
<German>%1Closest unit is %2 and %2 medic (%3m)</German>
</Key>
<Key ID="STR_TunCon_closestUnitWithOutDistance">
<Original>%1Closest unit is %2 and is also medic</Original>
<English>%1Closest unit is %2 and is also medic</English>
<Czech>%1Closest unit is %2 and is also medic</Czech>
<French>%1Closest unit is %2 and is also medic</French>
<Original>%1Closest unit is %2 and %2 medic</Original>
<English>%1Closest unit is %2 and %2 medic</English>
<Czech>%1Closest unit is %2 and %2 medic</Czech>
<French>%1Closest unit is %2 and %2 medic</French>
<Spanish>%1El aliado mas cercano es %2 y tambien es medico</Spanish>
<Italian>%1Closest unit is %2 and is also medic</Italian>
<Polish>%1Closest unit is %2 and is also medic</Polish>
<Portuguese>%1Closest unit is %2 and is also medic</Portuguese>
<Russian>%1Closest unit is %2 and is also medic</Russian>
<German>%1Closest unit is %2 and is also medic</German>
<Italian>%1Closest unit is %2 and %2 medic</Italian>
<Polish>%1Closest unit is %2 and %2 medic</Polish>
<Portuguese>%1Closest unit is %2 and %2 medic</Portuguese>
<Russian>%1Closest unit is %2 and %2 medic</Russian>
<German>%1Closest unit is %2 and %2 medic</German>
</Key>
<Key ID="STR_TunCon_closestUnitAndMedicWithDistance">
<Original>%1Closest unit is %2 (%3m)&lt;br/&gt;Closest medic is %4 (%5m)</Original>
Expand Down
2 changes: 1 addition & 1 deletion addons/unconInfo/XEH_preInit.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private _category = ["Tun Utilities - Uncon Info", "Uncon Info"];
"EDITBOX",
[localize "STR_TunCon_CBA_noFriends", localize "STR_TunCon_CBA_noFriendsTooltip"],
_category,
"Your current sitsuation is not looking very good, you can try and wait or feel free to just press Esc -> Respawn.",
"Your current situation is not looking very good, you could wait or feel free to just press Esc -> Respawn.",
1,
{},
true
Expand Down
27 changes: 14 additions & 13 deletions addons/unconInfo/functions/fnc_unconInfo.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,28 @@

private _text = localize "STR_TunCon_firstLine" + "<br/>";
private _bleeding = player getvariable ["ace_medical_woundBleeding", 0];
private _hasStableVitals = [player] call ace_medical_status_fnc_hasStableVitals;

if (_bleeding > 0) then {
_text = _text + localize "STR_TunCon_isBleeding" + "<br/>";
};

if (player getvariable ["ace_medical_heartRate", 0] > 0) then {
_text = _text + localize "STR_TunCon_hasPulse" + "<br/>";
};

if (player getvariable ["ace_medical_inCardiacArrest", false]) then {
_text = _text + localize "STR_TunCon_inCardiacArrest" + "<br/>";
};

private _hasStableVitals = [player] call ace_medical_status_fnc_hasStableVitals;
if (_hasStableVitals) then {
_text = _text + localize "STR_TunCon_hasStableVitals" + "<br/>";
} else {
_text = _text + localize "STR_TunCon_notStableVitals" + "<br/>";
};
if (player getvariable ["ace_medical_heartRate", 0] > 0) then {
_text = _text + localize "STR_TunCon_hasPulse" + "<br/>";
};

if (_hasStableVitals) then {
_text = _text + localize "STR_TunCon_hasStableVitals" + "<br/>";

if ([player, "Epinephrine"] call ace_medical_status_fnc_getMedicationCount > 0) then {
_text = _text + localize "STR_TunCon_hasepinEphrine" + "<br/>";
if ([player, "Epinephrine"] call ace_medical_status_fnc_getMedicationCount > 0) then {
_text = _text + localize "STR_TunCon_hasepinEphrine" + "<br/>";
};
} else {
_text = _text + localize "STR_TunCon_notStableVitals" + "<br/>";
};
};

if (GVAR(allowNearestUnit)) then {
Expand Down
2 changes: 1 addition & 1 deletion addons/utilitiesmain/script_component.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#define MAJOR 1
#define MINOR 2
#define PATCHLVL 3
#define PATCHLVL 4
#define BUILD 24092023

#define VERSION MAJOR.MINOR.PATCHLVL.BUILD
Expand Down

0 comments on commit e7ff5ad

Please sign in to comment.