From 72650224187dd9f11b9a62949c83e4785fcb73d9 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 14 Sep 2024 20:30:14 +0300 Subject: [PATCH 01/10] unfuck last update --- .gitignore | 3 +- addons/unconinfo/Stringtable.xml | 61 +++++++++++++++++++++----------- addons/unconinfo/XEH_preInit.sqf | 22 ++++++++++++ addons/unconinfo/XEH_prep.hpp | 6 ++-- 4 files changed, 68 insertions(+), 24 deletions(-) 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/addons/unconinfo/Stringtable.xml b/addons/unconinfo/Stringtable.xml index c304f4d..6ecee51 100644 --- a/addons/unconinfo/Stringtable.xml +++ b/addons/unconinfo/Stringtable.xml @@ -92,6 +92,46 @@ ¡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 + @@ -115,118 +155,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_preInit.sqf b/addons/unconinfo/XEH_preInit.sqf index fa260ae..30c434b 100644 --- a/addons/unconinfo/XEH_preInit.sqf +++ b/addons/unconinfo/XEH_preInit.sqf @@ -82,6 +82,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 From d1179fb9f303063002eb68dd9fbfd06366440c0b Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 14 Sep 2024 20:32:29 +0300 Subject: [PATCH 02/10] fix missing --- addons/unconinfo/XEH_postInit_client.sqf | 11 ++++++----- addons/unconinfo/XEH_preInit.sqf | 11 +++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/addons/unconinfo/XEH_postInit_client.sqf b/addons/unconinfo/XEH_postInit_client.sqf index 1dcf041..685bb9d 100644 --- a/addons/unconinfo/XEH_postInit_client.sqf +++ b/addons/unconinfo/XEH_postInit_client.sqf @@ -1,7 +1,6 @@ #include "script_component.hpp" -//Add uncon info EH -["ace_unconscious", { +//Add uncon info Epriva["ace_unconscious", { _this params ["_unit", "_state"]; if ( _state && _unit isEqualTo ace_player && GVAR(enableUnconInfo)) then { GVAR(isBeingHelped) = false; @@ -19,7 +18,9 @@ [_handle] call CBA_fnc_removePerFrameHandler; }; - [_player, round random 2] call FUNC(moan); + if (GVAR(enableMoan)) then { + [_player] call FUNC(moan); + }; //Dont run at curator screen if (isNull curatorCamera) then { @@ -43,11 +44,11 @@ ["ace_treatmentFailed", { params ["_medic", "_patient", "_bodyPart", "_classname"]; - [QGVAR(ace_treatmentToPatient), [3, _medic, _patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; +atient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; }] call CBA_fnc_addEventHandler; //event to transfer local events to patients [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 30c434b..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", From e06f9a4b8554c9761e9a4008f8ee163f4be46c90 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 14 Sep 2024 20:32:47 +0300 Subject: [PATCH 03/10] versio --- addons/main/script_version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c0e95024c6a99d00bf4d2230f93300acd532c326 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 14 Sep 2024 20:37:17 +0300 Subject: [PATCH 04/10] fix --- addons/unconinfo/XEH_postInit_client.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/unconinfo/XEH_postInit_client.sqf b/addons/unconinfo/XEH_postInit_client.sqf index 685bb9d..9566d8a 100644 --- a/addons/unconinfo/XEH_postInit_client.sqf +++ b/addons/unconinfo/XEH_postInit_client.sqf @@ -1,6 +1,7 @@ #include "script_component.hpp" -//Add uncon info Epriva["ace_unconscious", { +//Add uncon info EH +private _id = ["ace_unconscious", { _this params ["_unit", "_state"]; if ( _state && _unit isEqualTo ace_player && GVAR(enableUnconInfo)) then { GVAR(isBeingHelped) = false; From 54994a747ed55a96b4a13f81a3c9367bf0fe4e4f Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 14 Sep 2024 20:37:25 +0300 Subject: [PATCH 05/10] fix --- addons/unconinfo/XEH_postInit_client.sqf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/unconinfo/XEH_postInit_client.sqf b/addons/unconinfo/XEH_postInit_client.sqf index 9566d8a..13a6394 100644 --- a/addons/unconinfo/XEH_postInit_client.sqf +++ b/addons/unconinfo/XEH_postInit_client.sqf @@ -19,9 +19,7 @@ private _id = ["ace_unconscious", { [_handle] call CBA_fnc_removePerFrameHandler; }; - if (GVAR(enableMoan)) then { - [_player] call FUNC(moan); - }; + [_player, round random 2] call FUNC(moan); //Dont run at curator screen if (isNull curatorCamera) then { @@ -45,7 +43,7 @@ private _id = ["ace_unconscious", { ["ace_treatmentFailed", { params ["_medic", "_patient", "_bodyPart", "_classname"]; -atient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; + [QGVAR(ace_treatmentToPatient), [3, _medic, _patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; }] call CBA_fnc_addEventHandler; //event to transfer local events to patients From ef70186d9757165d5d4fe47ac1302991046be895 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 14 Sep 2024 20:42:55 +0300 Subject: [PATCH 06/10] hemtt update --- .hemtt/project.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 From 685c60138734f1a40c1e679bc70ba80eaf756201 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 14 Sep 2024 20:46:14 +0300 Subject: [PATCH 07/10] missing stringtable --- addons/unconinfo/Stringtable.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/unconinfo/Stringtable.xml b/addons/unconinfo/Stringtable.xml index 6ecee51..5d30f50 100644 --- a/addons/unconinfo/Stringtable.xml +++ b/addons/unconinfo/Stringtable.xml @@ -132,6 +132,14 @@ 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 + From 3c16d30b51e1307501c007098849be6dba6b01a7 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 14 Sep 2024 20:47:31 +0300 Subject: [PATCH 08/10] additional conditio --- addons/unconinfo/functions/fnc_unconInfo.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"]; From 9cf444685d8f3cc80420e4932a3b09008691e2dd Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 14 Sep 2024 20:55:23 +0300 Subject: [PATCH 09/10] param checks --- addons/unconinfo/XEH_postInit_client.sqf | 2 +- addons/unconinfo/functions/fnc_treatmentEH.sqf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/unconinfo/XEH_postInit_client.sqf b/addons/unconinfo/XEH_postInit_client.sqf index 13a6394..029450c 100644 --- a/addons/unconinfo/XEH_postInit_client.sqf +++ b/addons/unconinfo/XEH_postInit_client.sqf @@ -1,7 +1,7 @@ #include "script_component.hpp" //Add uncon info EH -private _id = ["ace_unconscious", { +["ace_unconscious", { _this params ["_unit", "_state"]; if ( _state && _unit isEqualTo ace_player && GVAR(enableUnconInfo)) then { GVAR(isBeingHelped) = false; diff --git a/addons/unconinfo/functions/fnc_treatmentEH.sqf b/addons/unconinfo/functions/fnc_treatmentEH.sqf index 26d576a..6333676 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 {}; From 932881d4619e0e00ab9b98eea02db4792206344c Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 14 Sep 2024 20:57:39 +0300 Subject: [PATCH 10/10] Case --- addons/unconinfo/functions/fnc_treatmentEH.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/unconinfo/functions/fnc_treatmentEH.sqf b/addons/unconinfo/functions/fnc_treatmentEH.sqf index 6333676..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", objNull, [objnull]], ["_patient", objNull, [objnull]], ["_bodyPart", "", [""]], ["_classname", "", [""]]]; +params [["_event", "", [""]], ["_medic", objNull, [objNull]], ["_patient", objNull, [objNull]], ["_bodyPart", "", [""]], ["_classname", "", [""]]]; private _player = ace_player; if (_medic isEqualTo _patient || _player isNotEqualTo _patient) exitWith {};