From d1e9d3989fed2775ba97190941e9218b66c3fbe0 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Thu, 24 Oct 2024 10:23:46 +0300 Subject: [PATCH 1/6] Sort stringtable --- addons/unconinfo/Stringtable.xml | 396 +++++++++++++++---------------- 1 file changed, 198 insertions(+), 198 deletions(-) diff --git a/addons/unconinfo/Stringtable.xml b/addons/unconinfo/Stringtable.xml index ec76229..136d93d 100644 --- a/addons/unconinfo/Stringtable.xml +++ b/addons/unconinfo/Stringtable.xml @@ -2,83 +2,84 @@ - - You sense that - You sense that - Sientes que - あなたが感じていることは次の通り + + Delay before information is shown + Delay before information is shown - - You are bleeding - You are bleeding - Estas sangrando - あなたは出血している + + Delay before information is displayed after a player becomes unconscious + Delay before information is displayed after a player becomes unconscious - - You still have pulse - You still have pulse - Todavia tienes pulsa - あなたはまだ脈拍がある + + Detailed treatment delay + Detailed treatment delay - - You are in cardiac arrest - You are in cardiac arrest - Estas en parada cardiaca - あなたは心停止している + + Delay before treatment appears in the treatment list while unconscious + Delay before treatment appears in the treatment list while unconscious - - You have stable vitals (you can wake up) - You have stable vitals (you can wake up) - Tienes las vitales estables (Puedes despertar) - あなたのバイタルは安定している (目覚める可能性がある) + + Distance for looking closest friendly + Distance for looking closest friendly + 情報表示する友軍までの距離 - - You don't have stable vitals (This prevents you from waking up) - You don't have stable vitals (This prevents you from waking up) - No tienes las vitales estables (No puedes despertar) - あなたのバイタルは安定していない (目覚めることは出来ない) + + Distance in meters to find nearest friendly and medic + Distance in meters to find nearest friendly and medic + 情報表示することができる友軍までの最も遠い距離範囲(メートル) - - You have epinephrine in your system (Significantly higher chance of waking up) - You have epinephrine in your system (Significantly higher chance of waking up) - Tienes epinefrina en tu sistema (tus probabilidades de despertar aumentan) - あなたはアドレナリンを打たれている (目覚める確率が上がっている) + + Enable unconscious moaning + Enable unconscious moaning - - There are no friendlies nearby - There are no friendlies nearby - No hay aliados cerca - 友軍は付近に居ないようです + + Allow uncon players to make moaning sounds + Allow uncon players to make moaning sounds - - %1 is medic and the nearest soldier - %1 is medic and the nearest soldier - El aliado mas cercano es %1 y es medico - 最も近い友軍は %1 で衛生兵です + + Enable showing bleeding + Enable showing bleeding - - The closest friendly soldier is %1 - The closest friendly soldier is %1 - El aliado mas cercano es %1 - 最も近い友軍は %1 です + + Enable showing text that player is bleeding + Enable showing text that player is bleeding - - The nearest medic is %1 - The nearest medic is %1 - El medico mas cercano es %1 - 最も近い衛生兵は %1 です + + Enable showing Cardiac arrest + Enable showing Cardiac arrest - - but no medics nearby - but no medics nearby - pero no hay ningun medico cerca - しかし付近に衛生兵はいません + + Enable showing if player is in cardiac arrest + Enable showing if player is in cardiac arrest - - You are being helped! - You are being helped! - ¡Te estan ayudando! - あなたは治療を受けている! + + 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 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 heart rate + Enable showing heart rate + + + Enable showing heart rate for player + Enable showing heart rate for player + + + Enable showing if player is treated + Enable showing if player is treated + プレイヤーが治療を受けたことを表示 Enable showing if player is treated concious @@ -88,61 +89,55 @@ 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: + + Enables showing text that player is being treated + Enables showing text that player is being treated + プレイヤーが治療を受けていることをテキスト表示できるようにします - - %1 <t color='#008000'>completed</t> treatment %2 on %3 - %1 <t color='#008000'>completed</t> treatment %2 on %3 + + Enable showing player is in vehicle + Enable showing player is in vehicle - - %1 <t color='#CC0000'>failed</t> treatment %2 on %3 - %1 <t color='#CC0000'>failed</t> treatment %2 on %3 + + Enable showing others are in vehicle + Enable showing others are in vehicle - - Enable showing detailed list of treatments - Enable showing detailed list of treatments + + Enable displaying whether the friendly units are inside vehicle + Enable displaying whether the friendly units are inside vehicle - - Enable showing detailed list of all treatments made to you - Enable showing detailed list of all treatments made to you + + Enable displaying whether the player is inside vehicle + Enable displaying whether the player is inside vehicle - - Enable unconscious moaning - Enable unconscious moaning + + Enable showing stable vitals + Enable showing stable vitals - - Allow uncon players to make moaning sounds - Allow uncon players to make moaning sounds + + Enable showing if player has stable or unstable vitals + Enable showing if player has stable or unstable vitals - - Detailed treatment delay - Detailed treatment delay + + Enable showing nearest unit distance + Enable showing nearest unit distance + 付近の友軍距離表示を有効化 - - Delay before treatment appears in the treatment list while unconscious - Delay before treatment appears in the treatment list while unconscious + + Enable showing closest friendlies distance + Enable showing closest friendlies distance + 付近の友軍距離表示を有効化すると近くにいる味方までの距離を表示します - - Delay before information is shown - Delay before information is shown + + Enable showing nearest unit + Enable showing nearest unit + Activar mostrar el aliado mas cercano + 付近の友軍情報表示を有効化 - - Delay before information is displayed after a player becomes unconscious - Delay before information is displayed after a player becomes unconscious + + Enables showing if there is nearby friendly units + Enables showing if there is nearby friendly units + 付近の友軍情報表示を有効化すると近くに味方がいるときにその情報を表示します Enable uncon info @@ -156,37 +151,6 @@ Permite que uncon sepa que pasa alrededor. Tus propias vitales y si hay aliados cerca アンコン インフォを有効化すると気絶中に付近の友軍の有無や自分のバイタルを感じることができます。 - - Enable showing nearest unit - Enable showing nearest unit - Activar mostrar el aliado mas cercano - 付近の友軍情報表示を有効化 - - - 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 closest friendlies distance - Enable showing closest friendlies distance - 付近の友軍距離表示を有効化すると近くにいる味方までの距離を表示します - - - 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 - 情報表示することができる友軍までの最も遠い距離範囲(メートル) - Text if no friendlies nearby and no vitals Text if no friendlies nearby and no vitals @@ -197,16 +161,6 @@ 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 - プレイヤーが治療を受けたことを表示 - - - Enables showing text that player is being treated - Enables showing text that player is being treated - プレイヤーが治療を受けていることをテキスト表示できるようにします - Update interval Update interval @@ -217,70 +171,116 @@ Time between text updates while unconscious 表示テキストの更新間隔。(秒) - - Enable showing Epinephrine - Enable showing Epinephrine + + %1 failed treatment %2 on %3 + %1 failed treatment %2 on %3 - - Enable showing text if player has Epinephrine in his system - Enable showing text if player has Epinephrine in his system + + %1 <t color='#CC0000'>failed</t> treatment %2 on %3 + %1 <t color='#CC0000'>failed</t> treatment %2 on %3 - - Enable showing bleeding - Enable showing bleeding + + %1 is %2 on your %3 + %1 is %2 on your %3 - - Enable showing text that player is bleeding - Enable showing text that player is bleeding + + %1 completed treatment %2 on %3 + %1 completed treatment %2 on %3 - - Enable showing Cardiac arrest - Enable showing Cardiac arrest + + %1 <t color='#008000'>completed</t> treatment %2 on %3 + %1 <t color='#008000'>completed</t> treatment %2 on %3 - - Enable showing if player is in cardiac arrest - Enable showing if player is in cardiac arrest + + The nearest medic is %1 + The nearest medic is %1 + El medico mas cercano es %1 + 最も近い衛生兵は %1 です - - Enable showing heart rate - Enable showing heart rate + + The closest friendly soldier is %1 + The closest friendly soldier is %1 + El aliado mas cercano es %1 + 最も近い友軍は %1 です - - Enable showing heart rate for player - Enable showing heart rate for player + + %1 is medic and the nearest soldier + %1 is medic and the nearest soldier + El aliado mas cercano es %1 y es medico + 最も近い友軍は %1 で衛生兵です - - Enable showing stable vitals - Enable showing stable vitals + + You sense that + You sense that + Sientes que + あなたが感じていることは次の通り - - Enable showing if player has stable or unstable vitals - Enable showing if player has stable or unstable vitals + + You still have pulse + You still have pulse + Todavia tienes pulsa + あなたはまだ脈拍がある - - inside of a %1 - inside of a %1 + + You have stable vitals (you can wake up) + You have stable vitals (you can wake up) + Tienes las vitales estables (Puedes despertar) + あなたのバイタルは安定している (目覚める可能性がある) - - Enable showing player is in vehicle - Enable showing player is in vehicle + + You have epinephrine in your system (Significantly higher chance of waking up) + You have epinephrine in your system (Significantly higher chance of waking up) + Tienes epinefrina en tu sistema (tus probabilidades de despertar aumentan) + あなたはアドレナリンを打たれている (目覚める確率が上がっている) - - Enable displaying whether the player is inside vehicle - Enable displaying whether the player is inside vehicle + + You are in cardiac arrest + You are in cardiac arrest + Estas en parada cardiaca + あなたは心停止している - You are inside %1 You are inside %1 + You are inside %1 - - Enable showing others are in vehicle - Enable showing others are in vehicle + + You are being helped! + You are being helped! + ¡Te estan ayudando! + あなたは治療を受けている! - - Enable displaying whether the friendly units are inside vehicle - Enable displaying whether the friendly units are inside vehicle + + You are bleeding + You are bleeding + Estas sangrando + あなたは出血している + + + inside of a %1 + inside of a %1 + + + There are no friendlies nearby + There are no friendlies nearby + No hay aliados cerca + 友軍は付近に居ないようです + + + but no medics nearby + but no medics nearby + pero no hay ningun medico cerca + しかし付近に衛生兵はいません + + + You don't have stable vitals (This prevents you from waking up) + You don't have stable vitals (This prevents you from waking up) + No tienes las vitales estables (No puedes despertar) + あなたのバイタルは安定していない (目覚めることは出来ない) + + + Treatments: + Treatments: - + \ No newline at end of file From ad304541c2cb43311f985c87d2837d066da1d729 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Thu, 24 Oct 2024 10:24:20 +0300 Subject: [PATCH 2/6] Using `setMarker*Local` on all except the last call reduces network updates --- addons/planningmode/functions/fnc_planningModeServer.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/planningmode/functions/fnc_planningModeServer.sqf b/addons/planningmode/functions/fnc_planningModeServer.sqf index 3038fca..46fd40b 100644 --- a/addons/planningmode/functions/fnc_planningModeServer.sqf +++ b/addons/planningmode/functions/fnc_planningModeServer.sqf @@ -33,8 +33,8 @@ if !(GVAR(isRunning)) then { //Start planning mode { private _unit = _x; private _marker = createMarker [format["%1_%2", QGVAR(playerPosMarker),_unit], position _unit]; - _marker setMarkerText name _unit ; - _marker setMarkerType "mil_triangle"; + _marker setMarkerTextLocal name _unit ; + _marker setMarkerTypeLocal "mil_triangle"; _marker setMarkerDir direction _unit; GVAR(playerPositionMarkers) pushBack _marker; } forEach allPlayers; From e9e4b228eb9efc03e7a2a828aed5c0a0ef1e92c2 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Thu, 28 Nov 2024 22:59:10 +0200 Subject: [PATCH 3/6] update includes --- .../cba/addons/main/script_macros_common.hpp | 34 +++++----- include/x/cba/addons/xeh/script_xeh.hpp | 66 +++++++++++-------- include/z/ace/addons/main/script_debug.hpp | 4 +- include/z/ace/addons/main/script_macros.hpp | 25 +++++-- 4 files changed, 78 insertions(+), 51 deletions(-) diff --git a/include/x/cba/addons/main/script_macros_common.hpp b/include/x/cba/addons/main/script_macros_common.hpp index be13021..2683f3b 100644 --- a/include/x/cba/addons/main/script_macros_common.hpp +++ b/include/x/cba/addons/main/script_macros_common.hpp @@ -15,7 +15,7 @@ - Provide a solid structure that can be dynamic and easy editable (Which sometimes means we cannot adhere to Aim #1 ;-) An example is the path that is built from defines. Some available in this file, others in mods and addons. - Follows Standard: + Follows Standard: Object variables: PREFIX_COMPONENT Main-object variables: PREFIX_main Paths: MAINPREFIX\PREFIX\SUBPREFIX\COMPONENT\SCRIPTNAME.sqf @@ -29,6 +29,10 @@ and include your mod's script_macros.hpp In your scripts you can then include the addon's component.hpp with relative path) + use in subcomponents (subconfigs) + define SUBCOMPONENT and include parent component's script_component.hpp + currently only supported by SUBADDON, additional macros may be added in the future + TODO: - Try only to use 1 string type " vs ' - Evaluate double functions, and simplification @@ -54,6 +58,10 @@ #define ADDON DOUBLES(PREFIX,COMPONENT) #define MAIN_ADDON DOUBLES(PREFIX,main) +#ifdef SUBCOMPONENT + #define SUBADDON DOUBLES(ADDON,SUBCOMPONENT) +#endif + /* ------------------------------------------- Macro: VERSION_CONFIG Define CBA Versioning System config entries. @@ -857,15 +865,10 @@ Macro: ISNILS() #define COMPILE_SCRIPT(var1) compileScript ['PATHTO_SYS(PREFIX,COMPONENT_F,var1)'] -#define VERSIONING_SYS(var1) class CfgSettings \ -{ \ - class CBA \ - { \ - class Versioning \ - { \ - class var1 \ - { \ - }; \ +#define VERSIONING_SYS(var1) class CfgSettings { \ + class CBA { \ + class Versioning { \ + class var1 {}; \ }; \ }; \ }; @@ -1032,12 +1035,9 @@ Macro: PATHTO_FNC() #define QQEFUNC(var1,var2) QUOTE(QEFUNC(var1,var2)) #ifndef PRELOAD_ADDONS - #define PRELOAD_ADDONS class CfgAddons \ -{ \ - class PreloadAddons \ - { \ - class ADDON \ - { \ + #define PRELOAD_ADDONS class CfgAddons { \ + class PreloadAddons { \ + class ADDON { \ list[]={ QUOTE(ADDON) }; \ }; \ }; \ @@ -1275,9 +1275,11 @@ Macro: xSTRING() #define ELSTRING(var1,var2) QUOTE(TRIPLES(STR,DOUBLES(PREFIX,var1),var2)) #define CSTRING(var1) QUOTE(TRIPLES($STR,ADDON,var1)) #define ECSTRING(var1,var2) QUOTE(TRIPLES($STR,DOUBLES(PREFIX,var1),var2)) + #define SUBCSTRING(var1) QUOTE(TRIPLES($STR,SUBADDON,var1)) #define LLSTRING(var1) localize QUOTE(TRIPLES(STR,ADDON,var1)) #define LELSTRING(var1,var2) localize QUOTE(TRIPLES(STR,DOUBLES(PREFIX,var1),var2)) + #define LSUBLSTRING(var1) localize QUOTE(TRIPLES(STR,SUBADDON,var1)) #endif diff --git a/include/x/cba/addons/xeh/script_xeh.hpp b/include/x/cba/addons/xeh/script_xeh.hpp index 2eba000..9b483e8 100644 --- a/include/x/cba/addons/xeh/script_xeh.hpp +++ b/include/x/cba/addons/xeh/script_xeh.hpp @@ -14,23 +14,29 @@ fired = "call cba_xeh_fnc_fired"; \ animChanged = "call cba_xeh_fnc_animChanged"; \ animDone = "call cba_xeh_fnc_animDone"; \ animStateChanged = "call cba_xeh_fnc_animStateChanged"; \ +cargoLoaded = "call cba_xeh_fnc_cargoLoaded"; \ +cargoUnloaded = "call cba_xeh_fnc_cargoUnloaded"; \ containerClosed = "call cba_xeh_fnc_containerClosed"; \ containerOpened = "call cba_xeh_fnc_containerOpened"; \ controlsShifted = "call cba_xeh_fnc_controlsShifted"; \ dammaged = "call cba_xeh_fnc_dammaged"; \ +deleted = "call cba_xeh_fnc_deleted"; \ +disassembled = "call cba_xeh_fnc_disassembled"; \ engine = "call cba_xeh_fnc_engine"; \ epeContact = "call cba_xeh_fnc_epeContact"; \ epeContactEnd = "call cba_xeh_fnc_epeContactEnd"; \ epeContactStart = "call cba_xeh_fnc_epeContactStart"; \ explosion = "call cba_xeh_fnc_explosion"; \ +firedMan = "call cba_xeh_fnc_firedMan"; \ firedNear = "call cba_xeh_fnc_firedNear"; \ fuel = "call cba_xeh_fnc_cba_xeh_fuel"; \ gear = "call cba_xeh_fnc_gear"; \ +gestureChanged = "call cba_xeh_fnc_gestureChanged"; \ +gestureDone = "call cba_xeh_fnc_gestureDone"; \ getIn = "call cba_xeh_fnc_getIn"; \ getInMan = "call cba_xeh_fnc_getInMan"; \ getOut = "call cba_xeh_fnc_getOut"; \ getOutMan = "call cba_xeh_fnc_getOutMan"; \ -handleHeal = "call cba_xeh_fnc_handleHeal"; \ hit = "call cba_xeh_fnc_hit"; \ hitPart = "call cba_xeh_fnc_hitPart"; \ incomingMissile = "call cba_xeh_fnc_incomingMissile"; \ @@ -40,25 +46,27 @@ killed = "call cba_xeh_fnc_killed"; \ landedTouchDown = "call cba_xeh_fnc_landedTouchDown"; \ landedStopped = "call cba_xeh_fnc_landedStopped"; \ local = "call cba_xeh_fnc_local"; \ -respawn = "call cba_xeh_fnc_respawn"; \ +opticsModeChanged = "call cba_xeh_fnc_opticsModeChanged"; \ +opticsSwitch = "call cba_xeh_fnc_opticsSwitch"; \ put = "call cba_xeh_fnc_put"; \ -take = "call cba_xeh_fnc_take"; \ +reloaded = "call cba_xeh_fnc_reloaded"; \ +respawn = "call cba_xeh_fnc_respawn"; \ +ropeAttach = "call cba_xeh_fnc_ropeAttach"; \ +ropeBreak = "call cba_xeh_fnc_ropeBreak"; \ seatSwitched = "call cba_xeh_fnc_seatSwitched"; \ seatSwitchedMan = "call cba_xeh_fnc_seatSwitchedMan"; \ +slotItemChanged = "call cba_xeh_fnc_slotItemChanged"; \ +suppressed = "call cba_xeh_fnc_suppressed"; \ soundPlayed = "call cba_xeh_fnc_soundPlayed"; \ +take = "call cba_xeh_fnc_take"; \ +turnIn = "call cba_xeh_fnc_turnIn"; \ +turnOut = "call cba_xeh_fnc_turnOut"; \ +visionModeChanged = "call cba_xeh_fnc_visionModeChanged"; \ weaponAssembled = "call cba_xeh_fnc_weaponAssembled"; \ weaponDisassembled = "call cba_xeh_fnc_weaponDisassembled"; \ weaponDeployed = "call cba_xeh_fnc_weaponDeployed"; \ -weaponRested = "call cba_xeh_fnc_weaponRested"; \ -reloaded = "call cba_xeh_fnc_reloaded"; \ -firedMan = "call cba_xeh_fnc_firedMan"; \ -turnIn = "call cba_xeh_fnc_turnIn"; \ -turnOut = "call cba_xeh_fnc_turnOut"; \ -deleted = "call cba_xeh_fnc_deleted"; \ -disassembled = "call cba_xeh_fnc_disassembled"; \ -Suppressed = "call cba_xeh_fnc_Suppressed"; \ -gestureChanged = "call cba_xeh_fnc_gestureChanged"; \ -gestureDone = "call cba_xeh_fnc_gestureDone"; +weaponRested = "call cba_xeh_fnc_weaponRested"; + /* MACRO: DELETE_EVENTHANDLERS @@ -71,23 +79,29 @@ fired = ""; \ animChanged = ""; \ animDone = ""; \ animStateChanged = ""; \ +cargoLoaded = ""; \ +cargoUnloaded = ""; \ containerClosed = ""; \ containerOpened = ""; \ controlsShifted = ""; \ dammaged = ""; \ +deleted = ""; \ +disassembled = ""; \ engine = ""; \ epeContact = ""; \ epeContactEnd = ""; \ epeContactStart = ""; \ explosion = ""; \ +firedMan = ""; \ firedNear = ""; \ fuel = ""; \ gear = ""; \ +gestureChanged = ""; \ +gestureDone = "" \ getIn = ""; \ getInMan = ""; \ getOut = ""; \ getOutMan = ""; \ -handleHeal = ""; \ hit = ""; \ hitPart = ""; \ incomingMissile = ""; \ @@ -97,22 +111,22 @@ killed = ""; \ landedTouchDown = ""; \ landedStopped = ""; \ local = ""; \ -respawn = ""; \ +opticsModeChanged = ""; \ +opticsSwitch = ""; \ put = ""; \ -take = ""; \ +reloaded = ""; \ +respawn = ""; \ +ropeAttach = ""; \ +ropeBreak = ""; \ seatSwitched = ""; \ seatSwitchedMan = ""; \ soundPlayed = ""; \ +suppressed = ""; \ +take = ""; \ +turnIn = ""; \ +turnOut = ""; \ +visionModeChanged = ""; \ weaponAssembled = ""; \ weaponDisassembled = ""; \ weaponDeployed = ""; \ -weaponRested = ""; \ -reloaded = ""; \ -firedMan = ""; \ -turnIn = ""; \ -turnOut = ""; \ -deleted = ""; \ -disassembled = ""; \ -Suppressed = ""; \ -gestureChanged = ""; \ -gestureDone = "" +weaponRested = ""; diff --git a/include/z/ace/addons/main/script_debug.hpp b/include/z/ace/addons/main/script_debug.hpp index 72b6657..eda2f03 100644 --- a/include/z/ace/addons/main/script_debug.hpp +++ b/include/z/ace/addons/main/script_debug.hpp @@ -6,8 +6,8 @@ Fast Recompiling via function #ifdef DISABLE_COMPILE_CACHE #define LINKFUNC(x) {_this call FUNC(x)} - #define PREP_RECOMPILE_START if (isNil "ACE_PREP_RECOMPILE") then {ACE_RECOMPILES = []; ACE_PREP_RECOMPILE = {{call _x} forEach ACE_RECOMPILES;}}; private _recomp = { - #define PREP_RECOMPILE_END }; call _recomp; ACE_RECOMPILES pushBack _recomp; + #define PREP_RECOMPILE_START if (isNil "ACE_PREP_RECOMPILE") then {Ace_RECOMPILES = []; ACE_PREP_RECOMPILE = {{call _x} forEach Ace_RECOMPILES;}}; private _recomp = { + #define PREP_RECOMPILE_END }; call _recomp; Ace_RECOMPILES pushBack _recomp; #else #define LINKFUNC(x) FUNC(x) #define PREP_RECOMPILE_START ; /* disabled */ diff --git a/include/z/ace/addons/main/script_macros.hpp b/include/z/ace/addons/main/script_macros.hpp index 96d96f5..495d592 100644 --- a/include/z/ace/addons/main/script_macros.hpp +++ b/include/z/ace/addons/main/script_macros.hpp @@ -99,7 +99,11 @@ #define TYPE_SCUBA 604 // not implemented #define TYPE_HEADGEAR 605 #define TYPE_FACTOR 607 +#define TYPE_MAP 608 +#define TYPE_COMPASS 609 +#define TYPE_WATCH 610 #define TYPE_RADIO 611 +#define TYPE_GPS 612 #define TYPE_HMD 616 #define TYPE_BINOCULAR 617 #define TYPE_MEDIKIT 619 @@ -138,13 +142,20 @@ #define SD_TO_MIN_MAX(d) ((d) * 3.371) // Standard deviation -> min / max of random [min, mid, max] // Angular unit conversion -#define MRAD_TO_MOA(d) ((d) * 3.43774677) // Conversion factor: 54 / (5 * PI) -#define MOA_TO_MRAD(d) ((d) * 0.29088821) // Conversion factor: (5 * PI) / 54 -#define DEG_TO_MOA(d) ((d) * 60) // Conversion factor: 60 -#define MOA_TO_DEG(d) ((d) / 60) // Conversion factor: 1 / 60 -#define DEG_TO_MRAD(d) ((d) * 17.45329252) // Conversion factor: (50 * PI) / 9 -#define MRAD_TO_DEG(d) ((d) / 17.45329252) // Conversion factor: 9 / (50 * PI) -#define MOA_TO_RAD(d) ((d) * 0.00029088) // Conversion factor: PI / 10800 +// Conversion factor: 54 / (5 * PI) +#define MRAD_TO_MOA(d) ((d) * 3.43774677) +// Conversion factor: (5 * PI) / 54 +#define MOA_TO_MRAD(d) ((d) * 0.29088821) +// Conversion factor: 60 +#define DEG_TO_MOA(d) ((d) * 60) +// Conversion factor: 1 / 60 +#define MOA_TO_DEG(d) ((d) / 60) +// Conversion factor: (50 * PI) / 9 +#define DEG_TO_MRAD(d) ((d) * 17.45329252) +// Conversion factor: 9 / (50 * PI) +#define MRAD_TO_DEG(d) ((d) / 17.45329252) +// Conversion factor: PI / 10800 +#define MOA_TO_RAD(d) ((d) * 0.00029088) #define ZEUS_ACTION_CONDITION ([_target, {QUOTE(QUOTE(ADDON)) in curatorAddons _this}, missionNamespace, QUOTE(QGVAR(zeusCheck)), 1E11, 'ace_interactMenuClosed'] call EFUNC(common,cachedCall)) From f77a6552050619e7e07ac11e94c93c73cc2d3ebd Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 7 Dec 2024 20:07:11 +0200 Subject: [PATCH 4/6] Revert "Sort stringtable" This reverts commit d1e9d3989fed2775ba97190941e9218b66c3fbe0. --- addons/unconinfo/Stringtable.xml | 396 +++++++++++++++---------------- 1 file changed, 198 insertions(+), 198 deletions(-) diff --git a/addons/unconinfo/Stringtable.xml b/addons/unconinfo/Stringtable.xml index 136d93d..ec76229 100644 --- a/addons/unconinfo/Stringtable.xml +++ b/addons/unconinfo/Stringtable.xml @@ -2,84 +2,83 @@ - - Delay before information is shown - Delay before information is shown - - - Delay before information is displayed after a player becomes unconscious - Delay before information is displayed after a player becomes unconscious - - - Detailed treatment delay - Detailed treatment delay - - - Delay before treatment appears in the treatment list while unconscious - Delay before treatment appears in the treatment list while unconscious - - - 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 - 情報表示することができる友軍までの最も遠い距離範囲(メートル) - - - Enable unconscious moaning - Enable unconscious moaning + + You sense that + You sense that + Sientes que + あなたが感じていることは次の通り - - Allow uncon players to make moaning sounds - Allow uncon players to make moaning sounds + + You are bleeding + You are bleeding + Estas sangrando + あなたは出血している - - Enable showing bleeding - Enable showing bleeding + + You still have pulse + You still have pulse + Todavia tienes pulsa + あなたはまだ脈拍がある - - Enable showing text that player is bleeding - Enable showing text that player is bleeding + + You are in cardiac arrest + You are in cardiac arrest + Estas en parada cardiaca + あなたは心停止している - - Enable showing Cardiac arrest - Enable showing Cardiac arrest + + You have stable vitals (you can wake up) + You have stable vitals (you can wake up) + Tienes las vitales estables (Puedes despertar) + あなたのバイタルは安定している (目覚める可能性がある) - - Enable showing if player is in cardiac arrest - Enable showing if player is in cardiac arrest + + You don't have stable vitals (This prevents you from waking up) + You don't have stable vitals (This prevents you from waking up) + No tienes las vitales estables (No puedes despertar) + あなたのバイタルは安定していない (目覚めることは出来ない) - - Enable showing detailed list of treatments - Enable showing detailed list of treatments + + You have epinephrine in your system (Significantly higher chance of waking up) + You have epinephrine in your system (Significantly higher chance of waking up) + Tienes epinefrina en tu sistema (tus probabilidades de despertar aumentan) + あなたはアドレナリンを打たれている (目覚める確率が上がっている) - - Enable showing detailed list of all treatments made to you - Enable showing detailed list of all treatments made to you + + There are no friendlies nearby + There are no friendlies nearby + No hay aliados cerca + 友軍は付近に居ないようです - - Enable showing Epinephrine - Enable showing Epinephrine + + %1 is medic and the nearest soldier + %1 is medic and the nearest soldier + El aliado mas cercano es %1 y es medico + 最も近い友軍は %1 で衛生兵です - - Enable showing text if player has Epinephrine in his system - Enable showing text if player has Epinephrine in his system + + The closest friendly soldier is %1 + The closest friendly soldier is %1 + El aliado mas cercano es %1 + 最も近い友軍は %1 です - - Enable showing heart rate - Enable showing heart rate + + The nearest medic is %1 + The nearest medic is %1 + El medico mas cercano es %1 + 最も近い衛生兵は %1 です - - Enable showing heart rate for player - Enable showing heart rate for player + + but no medics nearby + but no medics nearby + pero no hay ningun medico cerca + しかし付近に衛生兵はいません - - Enable showing if player is treated - Enable showing if player is treated - プレイヤーが治療を受けたことを表示 + + You are being helped! + You are being helped! + ¡Te estan ayudando! + あなたは治療を受けている! Enable showing if player is treated concious @@ -89,55 +88,61 @@ Enables showing text that player is being treated while concious Enables showing text that player is being treated while concious - - Enables showing text that player is being treated - Enables showing text that player is being treated - プレイヤーが治療を受けていることをテキスト表示できるようにします + + %1 is %2 on your %3 + %1 is %2 on your %3 - - Enable showing player is in vehicle - Enable showing player is in vehicle + + %1 completed treatment %2 on %3 + %1 completed treatment %2 on %3 - - Enable showing others are in vehicle - Enable showing others are in vehicle + + %1 failed treatment %2 on %3 + %1 failed treatment %2 on %3 - - Enable displaying whether the friendly units are inside vehicle - Enable displaying whether the friendly units are inside vehicle + + Treatments: + Treatments: - - Enable displaying whether the player is inside vehicle - Enable displaying whether the player is inside vehicle + + %1 <t color='#008000'>completed</t> treatment %2 on %3 + %1 <t color='#008000'>completed</t> treatment %2 on %3 - - Enable showing stable vitals - Enable showing stable vitals + + %1 <t color='#CC0000'>failed</t> treatment %2 on %3 + %1 <t color='#CC0000'>failed</t> treatment %2 on %3 - - Enable showing if player has stable or unstable vitals - Enable showing if player has stable or unstable vitals + + Enable showing detailed list of treatments + Enable showing detailed list of treatments - - Enable showing nearest unit distance - Enable showing nearest unit distance - 付近の友軍距離表示を有効化 + + Enable showing detailed list of all treatments made to you + Enable showing detailed list of all treatments made to you - - Enable showing closest friendlies distance - Enable showing closest friendlies distance - 付近の友軍距離表示を有効化すると近くにいる味方までの距離を表示します + + Enable unconscious moaning + Enable unconscious moaning - - Enable showing nearest unit - Enable showing nearest unit - Activar mostrar el aliado mas cercano - 付近の友軍情報表示を有効化 + + Allow uncon players to make moaning sounds + Allow uncon players to make moaning sounds - - Enables showing if there is nearby friendly units - Enables showing if there is nearby friendly units - 付近の友軍情報表示を有効化すると近くに味方がいるときにその情報を表示します + + Detailed treatment delay + Detailed treatment delay + + + Delay before treatment appears in the treatment list while unconscious + Delay before treatment appears in the treatment list while unconscious + + + Delay before information is shown + Delay before information is shown + + + Delay before information is displayed after a player becomes unconscious + Delay before information is displayed after a player becomes unconscious Enable uncon info @@ -151,6 +156,37 @@ Permite que uncon sepa que pasa alrededor. Tus propias vitales y si hay aliados cerca アンコン インフォを有効化すると気絶中に付近の友軍の有無や自分のバイタルを感じることができます。 + + Enable showing nearest unit + Enable showing nearest unit + Activar mostrar el aliado mas cercano + 付近の友軍情報表示を有効化 + + + 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 closest friendlies distance + Enable showing closest friendlies distance + 付近の友軍距離表示を有効化すると近くにいる味方までの距離を表示します + + + 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 + 情報表示することができる友軍までの最も遠い距離範囲(メートル) + Text if no friendlies nearby and no vitals Text if no friendlies nearby and no vitals @@ -161,6 +197,16 @@ 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 + プレイヤーが治療を受けたことを表示 + + + Enables showing text that player is being treated + Enables showing text that player is being treated + プレイヤーが治療を受けていることをテキスト表示できるようにします + Update interval Update interval @@ -171,116 +217,70 @@ Time between text updates while unconscious 表示テキストの更新間隔。(秒) - - %1 failed treatment %2 on %3 - %1 failed treatment %2 on %3 + + Enable showing Epinephrine + Enable showing Epinephrine - - %1 <t color='#CC0000'>failed</t> treatment %2 on %3 - %1 <t color='#CC0000'>failed</t> treatment %2 on %3 + + Enable showing text if player has Epinephrine in his system + Enable showing text if player has Epinephrine in his system - - %1 is %2 on your %3 - %1 is %2 on your %3 + + Enable showing bleeding + Enable showing bleeding - - %1 completed treatment %2 on %3 - %1 completed treatment %2 on %3 + + Enable showing text that player is bleeding + Enable showing text that player is bleeding - - %1 <t color='#008000'>completed</t> treatment %2 on %3 - %1 <t color='#008000'>completed</t> treatment %2 on %3 + + Enable showing Cardiac arrest + Enable showing Cardiac arrest - - The nearest medic is %1 - The nearest medic is %1 - El medico mas cercano es %1 - 最も近い衛生兵は %1 です + + Enable showing if player is in cardiac arrest + Enable showing if player is in cardiac arrest - - The closest friendly soldier is %1 - The closest friendly soldier is %1 - El aliado mas cercano es %1 - 最も近い友軍は %1 です + + Enable showing heart rate + Enable showing heart rate - - %1 is medic and the nearest soldier - %1 is medic and the nearest soldier - El aliado mas cercano es %1 y es medico - 最も近い友軍は %1 で衛生兵です + + Enable showing heart rate for player + Enable showing heart rate for player - - You sense that - You sense that - Sientes que - あなたが感じていることは次の通り + + Enable showing stable vitals + Enable showing stable vitals - - You still have pulse - You still have pulse - Todavia tienes pulsa - あなたはまだ脈拍がある + + Enable showing if player has stable or unstable vitals + Enable showing if player has stable or unstable vitals - - You have stable vitals (you can wake up) - You have stable vitals (you can wake up) - Tienes las vitales estables (Puedes despertar) - あなたのバイタルは安定している (目覚める可能性がある) + + inside of a %1 + inside of a %1 - - You have epinephrine in your system (Significantly higher chance of waking up) - You have epinephrine in your system (Significantly higher chance of waking up) - Tienes epinefrina en tu sistema (tus probabilidades de despertar aumentan) - あなたはアドレナリンを打たれている (目覚める確率が上がっている) + + Enable showing player is in vehicle + Enable showing player is in vehicle - - You are in cardiac arrest - You are in cardiac arrest - Estas en parada cardiaca - あなたは心停止している + + Enable displaying whether the player is inside vehicle + Enable displaying whether the player is inside vehicle - You are inside %1 You are inside %1 + You are inside %1 - - You are being helped! - You are being helped! - ¡Te estan ayudando! - あなたは治療を受けている! - - - You are bleeding - You are bleeding - Estas sangrando - あなたは出血している - - - inside of a %1 - inside of a %1 - - - There are no friendlies nearby - There are no friendlies nearby - No hay aliados cerca - 友軍は付近に居ないようです - - - but no medics nearby - but no medics nearby - pero no hay ningun medico cerca - しかし付近に衛生兵はいません - - - You don't have stable vitals (This prevents you from waking up) - You don't have stable vitals (This prevents you from waking up) - No tienes las vitales estables (No puedes despertar) - あなたのバイタルは安定していない (目覚めることは出来ない) + + Enable showing others are in vehicle + Enable showing others are in vehicle - - Treatments: - Treatments: + + Enable displaying whether the friendly units are inside vehicle + Enable displaying whether the friendly units are inside vehicle - \ No newline at end of file + From 50c365d588ae70d5e96c3f4b033224bbd6bae2e7 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 7 Dec 2024 20:13:48 +0200 Subject: [PATCH 5/6] Update fnc_createLine.sqf --- addons/planningmode/functions/fnc_createLine.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/planningmode/functions/fnc_createLine.sqf b/addons/planningmode/functions/fnc_createLine.sqf index 5292c02..c3c8a8b 100644 --- a/addons/planningmode/functions/fnc_createLine.sqf +++ b/addons/planningmode/functions/fnc_createLine.sqf @@ -19,7 +19,7 @@ params ["_lineStart", "_lineEnd", "_color"]; private _lineDistance = (_lineEnd distance2D _lineStart) / 2; private _lineDir = _lineStart getDir _lineEnd; private _lineMiddlePos = _lineStart getPos [_lineDistance, _lineDir]; -private _markerLine = createMarkerLocal [format["%%3_%1-%2", _lineStart, _lineEnd, QGVAR(losCheckMarker)], _lineMiddlePos]; +private _markerLine = createMarkerLocal [format["%3_%1-%2", _lineStart, _lineEnd, QGVAR(losCheckMarker)], _lineMiddlePos]; _markerLine setMarkerDirLocal _lineDir; _markerLine setMarkerShapeLocal "RECTANGLE"; _markerLine setMarkerBrushLocal "SolidBorder"; From 9cab3aa11f122d0a828239ff8939a58e7e1894d3 Mon Sep 17 00:00:00 2001 From: tuntematonjr Date: Sat, 7 Dec 2024 20:14:31 +0200 Subject: [PATCH 6/6] Update script_version.hpp --- addons/main/script_version.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 3c65b93..6ccad02 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 1 -#define MINOR 4 -#define PATCH 4 +#define MINOR 5 +#define PATCH 0 #define BUILD 1 \ No newline at end of file