diff --git a/addons/cookoff/ACE_Settings.hpp b/addons/cookoff/ACE_Settings.hpp index 304aaf48e0..ba4447dba9 100644 --- a/addons/cookoff/ACE_Settings.hpp +++ b/addons/cookoff/ACE_Settings.hpp @@ -1,40 +1,18 @@ class ACE_Settings { class GVAR(enable) { - category = CSTRING(displayName); - displayName = CSTRING(enable_name); - description = CSTRING(enable_tooltip); - value = 0; - typeName = "BOOL"; + movedToSqf = 1; }; class GVAR(enableAmmobox) { - category = CSTRING(displayName); - displayName = CSTRING(enableBoxCookoff_name); - description = CSTRING(enableBoxCookoff_tooltip); - value = 1; - typeName = "BOOL"; + movedToSQF = 1; }; class GVAR(enableAmmoCookoff) { // For CBA Setting Switch: we can eliminate and just use (ammoCookoffDuration == 0) - category = CSTRING(displayName); - displayName = CSTRING(enableAmmoCookoff_name); - description = CSTRING(enableAmmoCookoff_tooltip); - value = 1; - typeName = "BOOL"; + movedToSQF = 1; }; class GVAR(ammoCookoffDuration) { - category = CSTRING(displayName); - displayName = CSTRING(ammoCookoffDuration_name); - description = CSTRING(ammoCookoffDuration_tooltip); - value = 1; - typeName = "SCALAR"; - sliderSettings[] = {0, 5, 1, 1}; + movedToSQF = 1; }; class GVAR(probabilityCoef) { - category = CSTRING(displayName); - displayName = CSTRING(probabilityCoef_name); - description = CSTRING(probabilityCoef_tooltip); - value = 1; - typeName = "SCALAR"; - sliderSettings[] = {0, 5, 1, 1}; + movedToSQF = 1; }; }; diff --git a/addons/cookoff/CfgEden.hpp b/addons/cookoff/CfgEden.hpp index 04e7762a41..caffc6b90b 100644 --- a/addons/cookoff/CfgEden.hpp +++ b/addons/cookoff/CfgEden.hpp @@ -7,8 +7,8 @@ class Cfg3DEN { class GVAR(enable) { property = QGVAR(enable); control = "Checkbox"; - displayName = CSTRING(enable_name); - tooltip = CSTRING(enable_tooltip); + displayName = CSTRING(enable_hd_name); + tooltip = CSTRING(enable_hd_tooltip); expression = QUOTE(if !(_value) then {_this setVariable [ARR_3('%s',_value,true)];};); typeName = "BOOL"; condition = "objectVehicle"; diff --git a/addons/cookoff/XEH_preInit.sqf b/addons/cookoff/XEH_preInit.sqf index b47cf6628d..9361d05015 100644 --- a/addons/cookoff/XEH_preInit.sqf +++ b/addons/cookoff/XEH_preInit.sqf @@ -6,4 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; +#include "initSettings.sqf" + ADDON = true; diff --git a/addons/cookoff/initSettings.sqf b/addons/cookoff/initSettings.sqf new file mode 100644 index 0000000000..b29d213427 --- /dev/null +++ b/addons/cookoff/initSettings.sqf @@ -0,0 +1,51 @@ +// CBA Settings [ADDON: ace_cookoff]: + +[ + QGVAR(enable), "CHECKBOX", + [LSTRING(enable_hd_name), LSTRING(enable_hd_tooltip)], + LSTRING(category_displayName), + false, // default value + true, // isGlobal + {[QGVAR(enable), _this] call EFUNC(common,cbaSettings_settingChanged)}, + true // Needs mission restart +] call CBA_settings_fnc_init; + +[ + QGVAR(enableAmmobox), "CHECKBOX", + [LSTRING(enableBoxCookoff_name), LSTRING(enableBoxCookoff_tooltip)], + LSTRING(category_displayName), + true, // default value + true, // isGlobal + {[QGVAR(enableAmmobox), _this] call EFUNC(common,cbaSettings_settingChanged)}, + true // Needs mission restart +] call CBA_settings_fnc_init; + +[ + QGVAR(enableAmmoCookoff), "CHECKBOX", + [LSTRING(enableAmmoCookoff_name), LSTRING(enableAmmoCookoff_tooltip)], + LSTRING(category_displayName), + true, // default value + true, // isGlobal + {[QGVAR(enableAmmoCookoff), _this] call EFUNC(common,cbaSettings_settingChanged)}, + true // Needs mission restart +] call CBA_settings_fnc_init; + +[ + QGVAR(ammoCookoffDuration), "SLIDER", + [LSTRING(ammoCookoffDuration_name), LSTRING(ammoCookoffDuration_tooltip)], + LSTRING(category_displayName), + [0,5,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)] + true, // isGlobal + {[QGVAR(ammoCookoffDuration), _this] call EFUNC(common,cbaSettings_settingChanged)}, + true // Needs mission restart +] call CBA_settings_fnc_init; + +[ + QGVAR(probabilityCoef), "SLIDER", + [LSTRING(probabilityCoef_name), LSTRING(probabilityCoef_tooltip)], + LSTRING(category_displayName), + [0,5,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)] + true, // isGlobal + {[QGVAR(probabilityCoef), _this] call EFUNC(common,cbaSettings_settingChanged)}, + true // Needs mission restart +] call CBA_settings_fnc_init; diff --git a/addons/cookoff/stringtable.xml b/addons/cookoff/stringtable.xml index b561d0b89b..536700cc87 100644 --- a/addons/cookoff/stringtable.xml +++ b/addons/cookoff/stringtable.xml @@ -1,42 +1,22 @@ - - Cook off - Esplosione - 殉爆效果 - 殉爆效果 - 誘爆 - 쿡오프 - Durchzündung - Cook off - Samozapłon + + ACE Cook off + ACE Esplosione + ACE 殉爆效果 + ACE 殉爆效果 + ACE 誘爆 + ACE 쿡오프 + ACE Durchzündung + ACE Cook off + ACE Samozapłon - - Enable cook off - Durchzündung ermöglichen - Povolit explozi munice - Включить воспламенение - 誘爆を有効化 - 쿡오프 현상 활성화 - Aktywuj efekty samozapłonu amunicji - Activer le cook off - Abilita Esplosione - 開啟殉爆效果 - 开启殉爆效果 + + Damage handling and turret effects - - Enables cook off and related vehicle destruction effects. - Ermöglicht Durchzündung und zugehörige Fahrzeug-Zerstörungseffekte. - Povolí explozi munice a její následné ničivé efekty. - Включает воспламенение и сопутствующие эффекты повреждения техники. - 誘爆を有効化し、車両が誘爆によって破壊されていきます。 - 쿡오프 현상을 활성화 하고 관련된 차량에 폭발 이펙트를 적용합니다. - Aktywuje efekt samozapłonu amunicji na zniszczonych pojazdach. - Active le cook-off (autocombustion des munitions) et les effets de destruction liés. - Abilita l'esplosione e i relativi effetti di distruzione del veicolo. - 開啟此功能後，將使有關載具在損毀時有殉爆的效果 - 开启此功能后，将使有关载具在损毁时有殉爆的效果。 + + Changes damage handling for cook off and turret explosion effects Wreck (Turret)