diff --git a/.gitignore b/.gitignore index 77dd7b2..b55a748 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,5 @@ releases/* sqfvm.exe texHeaders.bin Thumbs.db -tools/temp \ No newline at end of file +tools/temp +*.7z diff --git a/.hemtt/project.toml b/.hemtt/project.toml index f4c591e..c30a6dc 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -1,5 +1,5 @@ name = "TunCon" -prefix = "TunCon" +prefix = "tuncon" author = "Tuntematon" mainprefix = "x" @@ -22,6 +22,7 @@ enabled = false workshop = [ "450814997", "463939057", + "623475643", ] parameters = [ "-skipIntro", # These parameters are passed to the Arma 3 executable @@ -29,5 +30,5 @@ parameters = [ "-showScriptErrors", # You can add additional parameters here "-debug", "-filePatching", - "C:\\Users\\mikal\\Documents\\Arma 3 - Other Profiles\\Tuntematon\\missions\\startmarkers.Enoch\\mission.sqm", # Launch into existing Editor Mission - \\ needed + "C:\\Users\\mikal\\Documents\\Arma 3 - Other Profiles\\Tuntematon\\missions\\unconTest.enoch\\mission.sqm", # Launch into existing Editor Mission - \\ needed ] \ No newline at end of file diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index ce77f7e..ca0de1a 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 1 #define MINOR 3 -#define PATCH 0 +#define PATCH 1 #define BUILD 1 \ No newline at end of file diff --git a/addons/unconinfo/Stringtable.xml b/addons/unconinfo/Stringtable.xml index c304f4d..5d30f50 100644 --- a/addons/unconinfo/Stringtable.xml +++ b/addons/unconinfo/Stringtable.xml @@ -92,6 +92,54 @@ ¡Te estan ayudando! あなたは治療を受けている! + + Enable showing if player is treated concious + Enable showing if player is treated concious + + + Enables showing text that player is being treated while concious + Enables showing text that player is being treated while concious + + + %1 is %2 on your %3 + %1 is %2 on your %3 + + + %1 completed treatment %2 on %3 + %1 completed treatment %2 on %3 + + + %1 failed treatment %2 on %3 + %1 failed treatment %2 on %3 + + + Treatments: + Treatments: + + + %1 <t color='#008000'>completed</t> treatment %2 on %3 + %1 <t color='#008000'>completed</t> treatment %2 on %3 + + + %1 <t color='#CC0000'>failed</t> treatment %2 on %3 + %1 <t color='#CC0000'>failed</t> treatment %2 on %3 + + + Enable showing detailed list of treatments + Enable showing detailed list of treatments + + + Enable showing detailed list of all treatments made to you + Enable showing detailed list of all treatments made to you + + + Enable unconscious moaning + Enable unconscious moaning + + + Allow uncon players to make moaning sounds + Allow uncon players to make moaning sounds + @@ -115,118 +163,97 @@ Enables showing if there is nearby friendly units Enables showing if there is nearby friendly units - Enables showing if there is nearby friendly units 付近の友軍情報表示を有効化すると近くに味方がいるときにその情報を表示します Enable showing nearest unit distance Enable showing nearest unit distance - Enable showing nearest unit distance 付近の友軍距離表示を有効化 Enable showing closest friendlies distance Enable showing closest friendlies distance - Enable showing closest friendlies distance 付近の友軍距離表示を有効化すると近くにいる味方までの距離を表示します Distance for looking closest friendly Distance for looking closest friendly - Distance for looking closest friendly 情報表示する友軍までの距離 Distance in meters to find nearest friendly and medic Distance in meters to find nearest friendly and medic - Distance in meters to find nearest friendly and medic 情報表示することができる友軍までの最も遠い距離範囲(メートル) Text if no friendlies nearby and no vitals Text if no friendlies nearby and no vitals - Text if no friendlies nearby and no vitals 友軍不在でバイタル不安定時に表示するテキスト Text what is shown when player has bad vitals and no friendlies nearby Text what is shown when player has bad vitals and no friendlies nearby - Text what is shown when player has bad vitals and no friendlies nearby プレイヤーの近辺に友軍が不在でかつバイタルが不安定(目覚める可能性が無い)時に表示するテキスト Enable showing if player is treated Enable showing if player is treated - Enable showing if player is treated プレイヤーが治療を受けたことを表示 Enables showing text that player is being treated Enables showing text that player is being treated - Enables showing text that player is being treated プレイヤーが治療を受けていることをテキスト表示できるようにします Update interval Update interval - Update interval 更新間隔 Time between texts update. (Seconds) Time between texts update. (Seconds) - Time between texts update. (Seconds) 表示テキストの更新間隔。(秒) Enable showing Epinephrine Enable showing Epinephrine - Enable showing Epinephrine Enable showing text if player has Epinephrine in his system Enable showing text if player has Epinephrine in his system - Enable showing text if player has Epinephrine in his system Enable showing bleeding Enable showing bleeding - Enable showing bleeding Enable showing text that player is bleeding Enable showing text that player is bleeding - Enable showing text that player is bleeding Enable showing Cardiac arrest Enable showing Cardiac arrest - Enable showing Cardiac arrest Enable showing if player is in cardiac arrest Enable showing if player is in cardiac arrest - Enable showing if player is in cardiac arrest Enable showing heart rate Enable showing heart rate - Enable showing heart rate Enable showing heart rate for player Enable showing heart rate for player - Enable showing heart rate for player Enable showing stable vitals Enable showing stable vitals - Enable showing stable vitals Enable showing if player has stable or unstable vitals Enable showing if player has stable or unstable vitals - Enable showing if player has stable or unstable vitals diff --git a/addons/unconinfo/XEH_postInit_client.sqf b/addons/unconinfo/XEH_postInit_client.sqf index 1dcf041..029450c 100644 --- a/addons/unconinfo/XEH_postInit_client.sqf +++ b/addons/unconinfo/XEH_postInit_client.sqf @@ -50,4 +50,4 @@ [QGVAR(ace_treatmentToPatient), { params ["_event", "_medic", "_patient", "_bodyPart", "_classname"]; [_event, _medic, _patient, toLower _bodyPart, _classname] call FUNC(treatmentEH); -}] call CBA_fnc_addEventHandler; +}] call CBA_fnc_addEventHandler; \ No newline at end of file diff --git a/addons/unconinfo/XEH_preInit.sqf b/addons/unconinfo/XEH_preInit.sqf index fa260ae..cff1d14 100644 --- a/addons/unconinfo/XEH_preInit.sqf +++ b/addons/unconinfo/XEH_preInit.sqf @@ -16,6 +16,17 @@ PREP_RECOMPILE_END; true ] call CBA_Settings_fnc_init; +[ + QGVAR(enableMoan), + "CHECKBOX", + [localize "STR_TunCon_CBA_enableMoan", localize "STR_TunCon_CBA_enableMoanTooltip"], + ["Tun Utilities - Uncon Info", "Uncon Info"], + true, + 1, + {}, + true +] call CBA_Settings_fnc_init; + [ QGVAR(enableShowEpinephrine), "CHECKBOX", @@ -82,6 +93,28 @@ PREP_RECOMPILE_END; true ] call CBA_Settings_fnc_init; +[ + QGVAR(enableShowDetailedTreatment), + "CHECKBOX", + [localize "STR_TunCon_CBA_enableShowDetailedTreatment", localize "STR_TunCon_CBA_enableShowDetailedTreatmentTooltip"], + ["Tun Utilities - Uncon Info", "Uncon Info"], + true, + 1, + {}, + true +] call CBA_Settings_fnc_init; + +[ + QGVAR(enableShowIfTreatedConcious), + "CHECKBOX", + [localize "STR_TunCon_CBA_enableShowIfTreatedConcious", localize "STR_TunCon_CBA_enableShowIfTreatedConciousTooltip"], + ["Tun Utilities - Uncon Info", "Uncon Info"], + true, + 1, + {}, + true +] call CBA_Settings_fnc_init; + [ QGVAR(allowNearestUnit), "CHECKBOX", diff --git a/addons/unconinfo/XEH_prep.hpp b/addons/unconinfo/XEH_prep.hpp index 94bcb38..f2681e7 100644 --- a/addons/unconinfo/XEH_prep.hpp +++ b/addons/unconinfo/XEH_prep.hpp @@ -1,2 +1,4 @@ -PREP(unconInfo); -PREP(hideMessage); \ No newline at end of file +PREP(hideMessage); +PREP(moan); +PREP(treatmentEH); +PREP(unconInfo); \ No newline at end of file diff --git a/addons/unconinfo/functions/fnc_treatmentEH.sqf b/addons/unconinfo/functions/fnc_treatmentEH.sqf index 26d576a..4199f8d 100644 --- a/addons/unconinfo/functions/fnc_treatmentEH.sqf +++ b/addons/unconinfo/functions/fnc_treatmentEH.sqf @@ -14,7 +14,7 @@ */ #include "script_component.hpp" -params ["_event", "_medic", "_patient", "_bodyPart", "_classname"]; +params [["_event", "", [""]], ["_medic", objNull, [objNull]], ["_patient", objNull, [objNull]], ["_bodyPart", "", [""]], ["_classname", "", [""]]]; private _player = ace_player; if (_medic isEqualTo _patient || _player isNotEqualTo _patient) exitWith {}; diff --git a/addons/unconinfo/functions/fnc_unconInfo.sqf b/addons/unconinfo/functions/fnc_unconInfo.sqf index ed1bafc..0f3cfd7 100644 --- a/addons/unconinfo/functions/fnc_unconInfo.sqf +++ b/addons/unconinfo/functions/fnc_unconInfo.sqf @@ -114,7 +114,7 @@ if (GVAR(isBeingHelpedTime) > cba_missionTime && !GVAR(enableShowDetailedTreatme _text = ""+_text+""; private _treatmentList = GVAR(treatments); -if (_treatmentList isNotEqualTo []) then { +if (_treatmentList isNotEqualTo [] && GVAR(enableShowDetailedTreatment)) then { _text = _text + "
" + "" + "Treatments:" + ""; { _x params [ "_treatmenText", "_time"];