diff --git a/addons/frag/XEH_PREP.hpp b/addons/frag/XEH_PREP.hpp index 350a178038..7d261c91f4 100644 --- a/addons/frag/XEH_PREP.hpp +++ b/addons/frag/XEH_PREP.hpp @@ -27,7 +27,6 @@ PREP(doFragRandom); // Spall PREP(shouldSpall); PREP(doSpall); -PREP(doSpall); PREP(getMaterialInfo); // Explosive Reflection diff --git a/addons/frag/initSettings.inc.sqf b/addons/frag/initSettings.inc.sqf index 4c5c51849f..18f77fbc17 100644 --- a/addons/frag/initSettings.inc.sqf +++ b/addons/frag/initSettings.inc.sqf @@ -25,28 +25,41 @@ private _category = format ["ACE %1", localize LSTRING(Module_DisplayName)]; 1 ] call CBA_fnc_addSetting; - /// !*! TODO: add stringtable entries [ QGVAR(fragSimComplexity), "LIST", - // [LSTRING(FragMode), LSTRING(FragMode_Desc)] - ["Fragmentation mode", "Sets how fragments are generated"], + [LSTRING(FragMode), LSTRING(FragMode_Desc)], +// ["Fragmentation mode", "Sets how fragments are generated"], [_category, LSTRING(Frag)], - [[2, 1, 0], ["Targeted & random fragmentation ","Random fragmentation","Unit targeted fragmentation"], 2] + [[2, 1, 0], [LSTRING(FragMode_Opt2),LSTRING(FragMode_Opt1),LSTRING(FragMode_Opt0)], 2], +// [[2, 1, 0], ["Targeted & random fragmentation","Random fragmentation","Unit targeted fragmentation"], 2], + true ] call CBA_fnc_addSetting; [ QGVAR(atLeastOne), "CHECKBOX", - // [LSTRING(MinFrag), LSTRING(MinFrag_Desc)] - ["At least one round hit", "Spawn at least one fragment for units in fragmentation range, up to maximum fragments"], + [LSTRING(MinFrag), LSTRING(MinFrag_Desc)], +// ["At least one round hit", "Spawn at least one fragment for units in fragmentation range, up to maximum fragments"], [_category, LSTRING(Frag)], true ] call CBA_fnc_addSetting; [ QGVAR(BlackList), "EDITBOX", - // [LSTRING(DefBlackList), LSTRING(DefBlackList_Desc)] - ["Default BlackList", "Array of ammo classnames strings to blackist fragmentation for."], + [LSTRING(DefBlackList), LSTRING(DefBlackList_Desc)], +// ["Fragmentation BlackList", "Array of ammo classnames strings to blackist fragmentation for."], [_category, LSTRING(Frag)], - QUOTE(['B_556x45_Ball']) + QUOTE(['B_556x45_Ball']), + true, + nil, + true +] call CBA_fnc_addSetting; + + +[ + QGVAR(SpallIntensity), "SLIDER", + [LSTRING(SpallIntensity), LSTRING(SpallIntensity_Desc)], + [_category, LSTRING(Frag)], + [0.1, 2, 1, 1], + true ] call CBA_fnc_addSetting; diff --git a/addons/frag/initSettingsDebug.inc.sqf b/addons/frag/initSettingsDebug.inc.sqf index dfcb14f064..382d3ac4b2 100644 --- a/addons/frag/initSettingsDebug.inc.sqf +++ b/addons/frag/initSettingsDebug.inc.sqf @@ -2,17 +2,16 @@ private _category = format ["ACE %1", localize LSTRING(Module_DisplayName)]; [ QGVAR(debugOptions), "CHECKBOX", - // [LSTRING(DebugEnable), LSTRING(DebugEnable_Desc)] - ["Enable debug mode", "Enable debug tracing and spheres"], + [LSTRING(EnableDebugTrace), LSTRING(EnableDebugTrace_Desc)], [_category, LSTRING(Debug)], true ] call CBA_fnc_addSetting; -// debug options +//*** debug options ***// [ QGVAR(dbgSphere), "CHECKBOX", - // [LSTRING(DebugEnable), LSTRING(DebugEnable_Desc)] - "Create color coded spheres at ", + [LSTRING(HitSphereEnable), LSTRING(HitSphereEnable_Desc)], +// "Create color coded spheres at ", [_category, LSTRING(Debug)], false, 0, @@ -20,35 +19,10 @@ private _category = format ["ACE %1", localize LSTRING(Module_DisplayName)]; true ] call CBA_fnc_addSetting; -[ - QGVAR(frameHint), "CHECKBOX", - // [LSTRING(FrameHint), LSTRING(FrameHint_Desc)] - ["Show framerate hint", "Show 1/diag_frameTime as a hint"], - [_category, LSTRING(Debug)], - true -] call CBA_fnc_addSetting; - -[ - QGVAR(fadeRounds), "CHECKBOX", - // [LSTRING(FadeRounds), LSTRING(FadeRounds_Desc)] - ["Fade round traces over time", "Fade round traces for added round over time"], - [_category, LSTRING(Debug)], - true -] call CBA_fnc_addSetting; - -[ - QGVAR(dltTrace), "CHECKBOX", - // [LSTRING(FadeRounds), LSTRING(FadeRounds_Desc)] - ["Delete fire trace on fade", "Delete faded traces"], - [_category, LSTRING(Debug)], - true -] call CBA_fnc_addSetting; - [ QGVAR(drawHitBox),"CHECKBOX", - // [LSTRING(DrawHitBox), LSTRING(DrawHitBox_Desc)] - ["Draw unit hitboxes", "Draw added hitboxes each frame"], + [LSTRING(DrawHitBox), LSTRING(DrawHitBox_Desc)], +// ["Draw unit hitboxes", "Draw added hitboxes each frame"], [_category, LSTRING(Debug)], true -] call CBA_fnc_addSetting; - +] call CBA_fnc_addSetting; \ No newline at end of file diff --git a/addons/frag/stringtable.xml b/addons/frag/stringtable.xml index 79e4685611..83ac3bd855 100644 --- a/addons/frag/stringtable.xml +++ b/addons/frag/stringtable.xml @@ -123,6 +123,39 @@ <Chinese>啟用ACE模擬爆炸反射</Chinese> <Czech>Povolit ACE simulaci odrazu exploze</Czech> </Key> + <Key ID="STR_ACE_Frag_FragMode"> + <English>Simulation Mode</English> + </Key> + <Key ID="STR_ACE_Frag_FragMode_Desc"> + <English>Create a combination of random and/or unit targeted fragments</English> + </Key> + <Key ID="STR_ACE_Frag_FragMode_Opt0"> + <English>Unit targeted fragmentation</English> + </Key> + <Key ID="STR_ACE_Frag_FragMode_Opt1"> + <English>Random fragmentation</English> + </Key> + <Key ID="STR_ACE_Frag_FragMode_Opt2"> + <English>Random and targeted fragmentation</English> + </Key> + <Key ID="STR_ACE_Frag_MinFrag"> + <English>Disable Fragment Misses</English> + </Key> + <Key ID="STR_ACE_Frag_MinFrag_Desc"> + <English>For each unit a fragment could be shot towards, create it. This setting has no effect when "Random fragmentation" is selected.</English> + </Key> + <Key ID="STR_ACE_Frag_DefBlackList"> + <English>BlackListed Ammo Classnames</English> + </Key> + <Key ID="STR_ACE_Frag_DefBlackList_Desc"> + <English>Comma seperated cfgAmmo classnames to always skip. Loaded at mission start.</English> + </Key> + <Key ID="STR_ACE_Frag_SpallIntensity"> + <English>Spalling Intensity</English> + </Key> + <Key ID="STR_ACE_Frag_SpallIntensity_Desc"> + <English>Modifier to increase or decrease the number and intensity of spalling events. Increasing this value may cause performance degredation</English> + </Key> <Key ID="STR_ACE_Frag_MaxTrack"> <English>Maximum Projectiles Tracked</English> <Spanish>Máximos proyectiles rastreados</Spanish> @@ -188,36 +221,48 @@ <Chinese>設定在每一幀數內,系統最大可追蹤的碎片/剝落粒子數量。此設定可有效幫助系統減低計算壓力</Chinese> </Key> <Key ID="STR_ACE_Frag_EnableDebugTrace"> - <English>(SP Only) Frag/Spall Debug Tracing</English> - <Spanish>(Solo SP) Seguimiento de depuración de Fragmentación/Astillamiento </Spanish> - <Polish>(Tylko SP) Wizualny debug odł./odpr.</Polish> - <Czech>(Pouze SP) Debug sledování Frag/Úlomků</Czech> - <German>(nur SP) Splitter-/Explosions-Debug-Verfolgung</German> - <Portuguese>(Somente SP) Depuração de fragmentação e estilhaços traçantes</Portuguese> - <French>(SP uniquement) Fragmentation/éclat debug</French> - <Hungarian>(Csak SP) Repesz/Pattogzás debug követés</Hungarian> + <English>(Local only) Frag/Spall Debug Tracing</English> + <Spanish>(Solo !*!) Seguimiento de depuración de Fragmentación/Astillamiento </Spanish> + <Polish>(Tylko !*!) Wizualny debug odł./odpr.</Polish> + <Czech>(Pouze !*!) Debug sledování Frag/Úlomků</Czech> + <German>(nur !*!) Splitter-/Explosions-Debug-Verfolgung</German> + <Portuguese>(Somente !*!) Depuração de fragmentação e estilhaços traçantes</Portuguese> + <French>(!*! uniquement) Fragmentation/éclat debug</French> + <Hungarian>(Csak !*!) Repesz/Pattogzás debug követés</Hungarian> <Russian>(Только для одиночной игры) Отслеживаение/отладка осколков</Russian> - <Italian>(Solo SP) Debug Tracciamento Frag/Spall</Italian> - <Japanese>(SP のみ) 破片/剥離のデバッグ用表示</Japanese> + <Italian>(Solo !*!) Debug Tracciamento Frag/Spall</Italian> + <Japanese>(!*! のみ) 破片/剥離のデバッグ用表示</Japanese> <Korean>(싱글플레이 전용) 탄환파편/파편 디버그 추적화</Korean> <Chinesesimp>(仅单人)追踪显示破片粒子</Chinesesimp> <Chinese>(僅在單人模式) 碎片/剝落除錯追蹤</Chinese> </Key> <Key ID="STR_ACE_Frag_EnableDebugTrace_Desc"> - <English>(SP Only) Requires a mission/editor restart. Enables visual tracing of fragmentation and spalling rounds in SP game mode only.</English> - <Spanish>(Solo SP) Requiere un reinicio misión/editor. Permite el seguimiento visual de la fragmentación y astillamientos de los proyectiles en modo SP.</Spanish> - <Polish>(Tylko SP) Wymaga restartu misji/edytora. Aktywuje wizualne śledzenie odłamków oraz odprysków w trybie gry Single Player.</Polish> - <German>(nur SP) Splitter-/Explosions-Debugging</German> - <Czech>(Pouze SP) Vyžaduje restart mise/editoru. Aktivuje vizuální stopování fragmentace a úlomů pouze v režimu jednoho hráče.</Czech> - <Portuguese>(Somente SP) Requer um reinício de missão / editor. Habilita o rastreamento visual de projéteis de fragmentação e estilhaçamento apenas no modo de jogo SP.</Portuguese> - <French>(SP seulement) Requiert un redémarrage de mission ou de l'éditeur. Active les traceurs visuels de fragmentation et d'éclats en mode solo seulement.</French> - <Hungarian>(Csak SP) Küldetés/Editor újraindítás szükséges. Engedélyezi a repeszek és pattogzó lövedékek vizuális nyomkövetését, csak egyjátékos módok alatt.</Hungarian> + <English>(Local only) Requires a mission/editor restart. Enables visual tracing of fragmentation and spalling rounds in SP game mode only.</English> + <Spanish>(Solo !*!) Requiere un reinicio misión/editor. Permite el seguimiento visual de la fragmentación y astillamientos de los proyectiles en modo SP.</Spanish> + <Polish>(Tylko !*!) Wymaga restartu misji/edytora. Aktywuje wizualne śledzenie odłamków oraz odprysków w trybie gry Single Player.</Polish> + <German>(nur !*!) Splitter-/Explosions-Debugging</German> + <Czech>(Pouze !*!) Vyžaduje restart mise/editoru. Aktivuje vizuální stopování fragmentace a úlomů pouze v režimu jednoho hráče.</Czech> + <Portuguese>(Somente !*!) Requer um reinício de missão / editor. Habilita o rastreamento visual de projéteis de fragmentação e estilhaçamento apenas no modo de jogo SP.</Portuguese> + <French>(!*! seulement) Requiert un redémarrage de mission ou de l'éditeur. Active les traceurs visuels de fragmentation et d'éclats en mode solo seulement.</French> + <Hungarian>(Csak !*!) Küldetés/Editor újraindítás szükséges. Engedélyezi a repeszek és pattogzó lövedékek vizuális nyomkövetését, csak egyjátékos módok alatt.</Hungarian> <Russian>(Только для одиночной игры) Требует перезапуска миссии/редактора. Включает визуальные следы от осколков и обломков в режиме одиночной игры.</Russian> - <Italian>(Solo SP) Richiede un restart editor/missione. Abilita il tracciamento visivo di schegge da frammentazione/spalling in modalità Giocatore Singolo.</Italian> - <Japanese>(SP のみ) ミッションとエディタの再起動が必要です。有効化すると、シングルプレイでのみ破片と剥離の飛翔体が見えるようになります。</Japanese> + <Italian>(Solo !*!) Richiede un restart editor/missione. Abilita il tracciamento visivo di schegge da frammentazione/spalling in modalità Giocatore Singolo.</Italian> + <Japanese>(!*! のみ) ミッションとエディタの再起動が必要です。有効化すると、シングルプレイでのみ破片と剥離の飛翔体が見えるようになります。</Japanese> <Chinesesimp>(仅单人)激活后,只有在单人模式下才可观察到破片粒子的移动轨迹。</Chinesesimp> <Chinese>(僅在單人模式) 讓你在單人模式下可觀察到碎片/剝落粒子的移動軌跡</Chinese> - <Korean>(SP 전용) 임무 / 편집자가 다시 시작해야합니다. SP 게임 모드에서만 파편화 및 탄환파편의 시각적 추적을 가능하게 합니다.</Korean> + <Korean>(!*! 전용) 임무 / 편집자가 다시 시작해야합니다. SP 게임 모드에서만 파편화 및 탄환파편의 시각적 추적을 가능하게 합니다.</Korean> + </Key> + <Key ID="STR_ACE_Frag_HitSphereEnable"> + <English>Draw Event Spheres</English> + </Key> + <Key ID="STR_ACE_Frag_HitSphereEnable_Desc"> + <English>Draw color coded spheres at any event for tracked rounds.</English> + </Key> + <Key ID="STR_ACE_Frag_DrawHitBox"> + <English>Draw Hitboxes</English> + </Key> + <Key ID="STR_ACE_Frag_DrawHitBox_Desc"> + <English>Draw hitboxes on objects added using ace_frag_fnc_dev_trackHitBox.</English> </Key> </Package> </Project>